* Added support for doing shifts by helper functions

[fw/sdcc] / src / SDCC.lex

diff --git a/src/SDCC.lex b/src/SDCC.lex
index d80995fbc2a8469723bd28e6e623d0ea0c544e91..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,42 +306,24 @@ int checkCurrFile ( char *s)
     return 0;
 }
     
-void comment()
-{
-  char c, c1;
-  
- loop:
-  while ((c = input()) != '*' && c)
-    if ( c == '\n')
-      yylineno++ ;
-  
-  if (c && (c1 = input()) != '/') {
-    unput(c1);
-    goto loop;
-  }
-}
-   
-   
-
 int column = 0;
 int plineIdx=0;
 
 void count()
 {
-       int i;
-       for (i = 0; yytext[i] != '\0'; i++)   {                         
-               if (yytext[i] == '\n')      {         
-                  column = 0;
-                  lineno = ++yylineno ;
-               }
-               else 
-                       if (yytext[i] == '\t')
-                               column += 8 - (column % 8);
-                       else
-                               column++;
-   }
-         
-   /* ECHO; */
+  int i;
+  for (i = 0; yytext[i] != '\0'; i++)   {                              
+    if (yytext[i] == '\n')      {         
+      column = 0;
+      lineno = ++yylineno ;
+    }
+    else 
+      if (yytext[i] == '\t')
+       column += 8 - (column % 8);
+      else
+       column++;
+  }
+  /* ECHO; */
 }
 
 int check_type()
@@ -351,7 +339,7 @@ int check_type()
        }
 }
 
-char strLitBuff[2048]                  ;
+char strLitBuff[2048]; // TODO: this is asking for the next bug :)
 
 /*
  * Change by JTV 2001-05-19 to not concantenate strings
@@ -373,14 +361,24 @@ char *stringLiteral () {
     
     /* if it is a \ then escape char's are allowed */
     if (ch == '\\') {
-      *str++ = ch; /* backslash in place */
-      *str++=input(); /* get the escape char, no check */
+      ch=input();
+      if (ch=='\n') {
+       /* \<newline> is a continuator */
+       lineno=++yylineno;
+       column=0;
+       continue;
+      }
+      *str++ = '\\'; /* backslash in place */
+      *str++ = ch; /* get the escape char, no further check */
       continue; /* carry on */
     }
     
-    /* if new line we have a new line break */
+    /* if new line we have a new line break, which is illegal */
     if (ch == '\n') {
-      yylineno++;
+      werror (W_NEWLINE_IN_STRING);
+      *str++ = '\n';
+      lineno=++yylineno;
+      column=0;
       continue;
     }
     
@@ -389,11 +387,16 @@ char *stringLiteral () {
     /* if that is a double quote then carry on    */
     if (ch == '\"') {
       *str++  = ch ; /* Pass end of this string or substring to evaluator */
-      
       while ((ch = input()) && (isspace(ch) || ch=='\\')) {
        switch (ch) {
        case '\\':
-         werror (W_STRAY_BACKSLASH, filename, yylineno);
+         if ((ch=input())!='\n') {
+           werror (W_STRAY_BACKSLASH, column);
+           unput(ch);
+         } else {
+           lineno=++yylineno;
+           column=0;
+         }
          break;
        case '\n':
          yylineno++;
@@ -403,7 +406,7 @@ char *stringLiteral () {
 
       if (!ch) 
        break; 
-      
+
       if (ch != '\"') {
        unput(ch) ;
        break ;