X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCC.lex;h=4eddd3ee77a507cd4513327bcce86108b9577e48;hb=5df1b9a579235d42fcec8a8884808334ed99a246;hp=365d56f27498e162b65761eccb9af0d863f11418;hpb=7bcf5c2d729ccd9c2bcd05b5f8033b1507707a74;p=fw%2Fsdcc

diff --git a/src/SDCC.lex b/src/SDCC.lex
index 365d56f2..4eddd3ee 100644
--- 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
 
@@ -92,7 +91,7 @@ struct options  save_options  ;
 <asm>"_endasm" { 
   count();
   *asmp = '\0';
-  yylval.yyinline = Safe_calloc (1, strlen(asmbuff)+1);
+  yylval.yyinline = Safe_alloc (strlen(asmbuff)+1);
   strcpy(yylval.yyinline,asmbuff);
   BEGIN(INITIAL);
   return (INLINEASM);
@@ -118,7 +117,6 @@ struct options  save_options  ;
   }
   *asmp++ = '\n' ;
 }
-"/*"	       { comment(); }
 "at"	       { count(); TKEYWORD(AT)  ; }
 "auto"	       { count(); return(AUTO); }
 "bit"	       { count(); TKEYWORD(BIT) ; }
@@ -172,16 +170,6 @@ struct options  save_options  ;
 "_naked"       { count(); TKEYWORD(NAKED); }
 "while"        { count(); return(WHILE); }
 "xdata"        { count(); TKEYWORD(XDATA); }
-"_data"	       { count(); TKEYWORD(_NEAR); }
-"_code"	       { count(); TKEYWORD(_CODE); }
-"_eeprom"      { count(); TKEYWORD(_EEPROM); }
-"_flash"       { count(); TKEYWORD(_CODE); }
-"_generic"     { count(); TKEYWORD(_GENERIC); }
-"_near"	       { count(); TKEYWORD(_NEAR); }
-"_sram"        { count(); TKEYWORD(_XDATA);}
-"_xdata"       { count(); TKEYWORD(_XDATA);}
-"_pdata"       { count(); TKEYWORD(_PDATA); }
-"_idata"       { count(); TKEYWORD(_IDATA); }
 "..."	       { count(); return(VAR_ARGS);}
 {L}({L}|{D})*  { count(); return(check_type()); }
 0[xX]{H}+{IS}? { count(); yylval.val = constVal(yytext); return(CONSTANT); }
@@ -245,6 +233,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()	; }
 %%
    
@@ -275,8 +271,8 @@ int checkCurrFile ( char *s)
     /* set the current line number to   */
     /* line number if printFlag is on   */
     if (!*s) {		
-	yylineno = lNum ;
-	return 0;
+      lineno = yylineno = lNum ;
+      return 0;
     }
     
     /* if we have a filename then check */
@@ -285,40 +281,21 @@ int checkCurrFile ( char *s)
     s++ ;
 
     if ( strncmp(s,fullSrcFileName,strlen(fullSrcFileName)) == 0) {
-	    yylineno = lNum - 2;					
-	    currFname = fullSrcFileName ;
+      lineno = yylineno = lNum;					
+      currFname = fullSrcFileName ;
     }  else {
 	char *sb = s;
 	/* mark the end of the filename */
 	while (*s != '"') s++;
 	*s = '\0';
-	currFname = Safe_calloc(1,strlen(sb)+1);
+	currFname = Safe_alloc (strlen(sb)+1);
 	strcpy(currFname,sb);
-	yylineno = lNum - 2;
+	lineno = yylineno = lNum;
     }
     filename = currFname ;
     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 +352,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 +364,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 +380,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 +396,7 @@ char *stringLiteral () {
 
       if (!ch) 
 	break; 
-      
+
       if (ch != '\"') {
 	unput(ch) ;
 	break ;
@@ -560,7 +537,7 @@ int process_pragma(char *s)
     }
 
     if (strncmp(cp,PRAGMA_NOLOOPREV,strlen(PRAGMA_NOLOOPREV)) == 0) {
-	doPragma(P_EXCLUDE,NULL);
+	doPragma(P_LOOPREV,NULL);
 	return 0;
     }