added conversion to mac native filenames from local filesystem handler

[wxWidgets.git] / src / common / lexer.l

diff --git a/src/common/lexer.l b/src/common/lexer.l
index 4c90a2966cfd30a9008a711549e5a5498842dab3..8f8a1cdd9b7a7f34c013a7e420603dbe13300888 100644 (file)
--- a/src/common/lexer.l
+++ b/src/common/lexer.l
@@ -64,7 +64,7 @@ static int my_input(void);
 
 "'"{WORDCHAR}*"'"                {int len = strlen(yytext);
                                    yytext[len-1] = 0;
 
 "'"{WORDCHAR}*"'"                {int len = strlen(yytext);
                                    yytext[len-1] = 0;

-                                   yylval.s = strdup(yytext+1); 
+                                   yylval.s = strdup(yytext+1);

                                    Return(WORD);}
 
 \"({STRINGCHAR}|\\\"|\|\\\\|\\)*\"  {yylval.s = strdup(yytext); Return(STRING);}
                                    Return(WORD);}
 
 \"({STRINGCHAR}|\\\"|\|\\\\|\\)*\"  {yylval.s = strdup(yytext); Return(STRING);}


@@ -123,7 +123,7 @@ static int lex_input() {
 # define input() my_input()
 static int my_unput(char c)
 {
 # define input() my_input()
 static int my_unput(char c)
 {

-  if (lex_read_from_string) {
+  if (lex_read_from_string != 0) {

     /* Make sure we have something */
     if (lex_string_ptr) {
       if (c == '\n') yylineno--;
     /* Make sure we have something */
     if (lex_string_ptr) {
       if (c == '\n') yylineno--;


@@ -138,7 +138,7 @@ static int my_unput(char c)
 
 #endif
 
 
 #endif
 

-/* Public */ 
+/* Public */

 void LexFromFile(FILE *fd)
 {
   lex_read_from_string = 0;
 void LexFromFile(FILE *fd)
 {
   lex_read_from_string = 0;