X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCC.lex;h=92061f169ad503d380e5e4d61083acfd4329764d;hb=6efdb0c5dd65f90e09768d5e6fb562d47545c783;hp=a668b0aed4f095474c602d77bdab90de8b8f56e1;hpb=aed2b39c46fcdfdd017adbf9e50c254efc5dea42;p=fw%2Fsdcc diff --git a/src/SDCC.lex b/src/SDCC.lex index a668b0ae..92061f16 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 @@ -54,7 +53,8 @@ int yywrap YY_PROTO((void)) } #define TKEYWORD(token) return (isTargetKeyword(yytext) ? token :\ check_type(yytext)) -char asmbuff[MAX_INLINEASM] ; +char *asmbuff=NULL; +int asmbuffSize=0; char *asmp ; extern int check_type (); extern int isTargetKeyword (); @@ -82,15 +82,41 @@ struct options save_options ; %} %x asm %% -"_asm" { count(); asmp = asmbuff ;BEGIN(asm) ;} -"_endasm" { count() ; - *asmp = '\0' ; - strcpy(yylval.yyinline,asmbuff) ; - BEGIN(INITIAL) ; - return (INLINEASM) ; } -. { *asmp++ = yytext[0] ; } -\n { count(); *asmp++ = '\n' ;} -"/*" { comment(); } +"_asm" { + count(); + asmp = asmbuff = Safe_realloc (asmbuff, INITIAL_INLINEASM); + asmbuffSize=INITIAL_INLINEASM; + BEGIN(asm) ; +} +"_endasm" { + count(); + *asmp = '\0'; + yylval.yyinline = Safe_calloc (1, strlen(asmbuff)+1); + strcpy(yylval.yyinline,asmbuff); + BEGIN(INITIAL); + return (INLINEASM); +} +. { + if (asmp-asmbuff >= asmbuffSize-2) { + // increase the buffersize with 50% + int size=asmp-asmbuff; + asmbuffSize=asmbuffSize*3/2; + asmbuff = Safe_realloc (asmbuff, asmbuffSize); + asmp=asmbuff+size; + } + *asmp++ = yytext[0]; +} +\n { + count(); + if (asmp-asmbuff >= asmbuffSize-3) { + // increase the buffersize with 50% + int size=asmp-asmbuff; + asmbuffSize=asmbuffSize*3/2; + asmbuff = Safe_realloc (asmbuff, asmbuffSize); + asmp=asmbuff+size; + } + *asmp++ = '\n' ; +} "at" { count(); TKEYWORD(AT) ; } "auto" { count(); return(AUTO); } "bit" { count(); TKEYWORD(BIT) ; } @@ -141,6 +167,7 @@ struct options save_options ; "void" { count(); return(VOID); } "volatile" { count(); return(VOLATILE); } "using" { count(); TKEYWORD(USING); } +"_naked" { count(); TKEYWORD(NAKED); } "while" { count(); return(WHILE); } "xdata" { count(); TKEYWORD(XDATA); } "_data" { count(); TKEYWORD(_NEAR); } @@ -216,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() ; } %% @@ -263,7 +298,7 @@ int checkCurrFile ( char *s) /* mark the end of the filename */ while (*s != '"') s++; *s = '\0'; - currFname = Safe_calloc(strlen(sb)+1); + currFname = Safe_calloc(1,strlen(sb)+1); strcpy(currFname,sb); yylineno = lNum - 2; } @@ -271,46 +306,24 @@ int checkCurrFile ( char *s) return 0; } -void comment() -{ - char c, c1; - -loop: - while ((c = input()) != '*' && c != 0) - if ( c == '\n') - yylineno++ ; - - if ((c1 = input()) != '/' && c != 0) { - if ( c1 == '\n' ) - yylineno++ ; - - 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() @@ -326,49 +339,84 @@ int check_type() } } -char strLitBuff[2048] ; +char strLitBuff[2048]; // TODO: this is asking for the next bug :) -char *stringLiteral () -{ - int ch; - char *str = strLitBuff ; - - *str++ = '\"' ; - /* put into the buffer till we hit the */ - /* first \" */ - while (1) { - - ch = input() ; - if (!ch) break ; /* end of input */ - /* if it is a \ then everything allowed */ - if (ch == '\\') { - *str++ = ch ; /* backslash in place */ - *str++ = input() ; /* following char in place */ - continue ; /* carry on */ - } - - /* if new line we have a new line break */ - if (ch == '\n') break ; - - /* if this is a quote then we have work to do */ - /* find the next non whitespace character */ - /* if that is a double quote then carry on */ - if (ch == '\"') { - - while ((ch = input()) && isspace(ch)) ; - if (!ch) break ; - if (ch != '\"') { - unput(ch) ; - break ; - } - - continue ; - } - *str++ = ch; - } - *str++ = '\"' ; - *str = '\0'; - return strLitBuff ; +/* + * Change by JTV 2001-05-19 to not concantenate strings + * to support ANSI hex and octal escape sequences in string liteals + */ + +char *stringLiteral () { + int ch; + char *str = strLitBuff; + + *str++ = '\"'; + /* put into the buffer till we hit the first \" */ + + while (1) { + ch = input(); + + if (!ch) + break; /* end of input */ + + /* if it is a \ then escape char's are allowed */ + if (ch == '\\') { + ch=input(); + if (ch=='\n') { + /* \ 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, which is illegal */ + if (ch == '\n') { + werror (W_NEWLINE_IN_STRING); + *str++ = '\n'; + lineno=++yylineno; + column=0; + continue; + } + + /* if this is a quote then we have work to do */ + /* find the next non whitespace character */ + /* 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 '\\': + if ((ch=input())!='\n') { + werror (W_STRAY_BACKSLASH, column); + unput(ch); + } else { + lineno=++yylineno; + column=0; + } + break; + case '\n': + yylineno++; + break; + } + } + + if (!ch) + break; + + if (ch != '\"') { + unput(ch) ; + break ; + } + } + *str++ = ch; /* Put next substring introducer into output string */ + } + *str = '\0'; + + return strLitBuff; } void doPragma (int op, char *cp)