Regression tests now pass on z80

[fw/sdcc] / src / SDCC.lex

diff --git a/src/SDCC.lex b/src/SDCC.lex
index 365d56f27498e162b65761eccb9af0d863f11418..92061f169ad503d380e5e4d61083acfd4329764d 100644 (file)
--- a/src/SDCC.lex
+++ b/src/SDCC.lex
@@ -39,12 +39,11 @@ IS       (u|U|l|L)*
 char *stringLiteral();
 char *currFname;
 
-extern int lineno                      ;
+extern int lineno, column;
 extern char *filename ;
 extern char *fullSrcFileName ;
 int   yylineno = 1               ;
 void count()                     ;
-void comment();
 int process_pragma(char *);
 #undef yywrap
 
@@ -118,7 +117,6 @@ struct options  save_options  ;
   }
   *asmp++ = '\n' ;
 }
-"/*"          { comment(); }
 "at"          { count(); TKEYWORD(AT)  ; }
 "auto"        { count(); return(AUTO); }
 "bit"         { count(); TKEYWORD(BIT) ; }
@@ -245,6 +243,14 @@ struct options  save_options  ;
 "\r\n"            { count(); }
 "\n"              { count(); }
 [ \t\v\f]      { count(); }
+\\ {
+  char ch=input();
+  if (ch!='\n') {
+    // that could have been removed by the preprocessor anyway
+    werror (W_STRAY_BACKSLASH, column);
+    unput(ch);
+  }
+}
 .                         { count()    ; }
 %%
    
@@ -300,25 +306,6 @@ int checkCurrFile ( char *s)
     return 0;
 }
     
-void comment()
-{
-  char c, c1;
-  
- loop:
-  while ((c = input()) != '*' && c) {
-    if ( c == '\n') {
-      lineno=++yylineno;
-    }
-  }
-  
-  if (c && (c1 = input()) != '/') {
-    unput(c1);
-    goto loop;
-  }
-}
-   
-   
-
 int column = 0;
 int plineIdx=0;
 
@@ -375,13 +362,10 @@ char *stringLiteral () {
     /* if it is a \ then escape char's are allowed */
     if (ch == '\\') {
       ch=input();
-      if (ch=='\r') {
-       // input() translates \n into \r\n
-       if ((ch=input())!='\n') {
-         unput (ch);
-       }
+      if (ch=='\n') {
        /* \<newline> is a continuator */
        lineno=++yylineno;
+       column=0;
        continue;
       }
       *str++ = '\\'; /* backslash in place */
@@ -390,14 +374,11 @@ char *stringLiteral () {
     }
     
     /* if new line we have a new line break, which is illegal */
-    if (ch == '\r') {
-      // input() translates \n into \r\n
-      if ((ch=input())!='\n') {
-       unput (ch);
-      }
+    if (ch == '\n') {
       werror (W_NEWLINE_IN_STRING);
       *str++ = '\n';
       lineno=++yylineno;
+      column=0;
       continue;
     }
     
@@ -409,7 +390,13 @@ char *stringLiteral () {
       while ((ch = input()) && (isspace(ch) || ch=='\\')) {
        switch (ch) {
        case '\\':
-         //werror (W_STRAY_BACKSLASH)
+         if ((ch=input())!='\n') {
+           werror (W_STRAY_BACKSLASH, column);
+           unput(ch);
+         } else {
+           lineno=++yylineno;
+           column=0;
+         }
          break;
        case '\n':
          yylineno++;
@@ -419,7 +406,7 @@ char *stringLiteral () {
 
       if (!ch) 
        break; 
-      
+
       if (ch != '\"') {
        unput(ch) ;
        break ;