X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCC.lex;h=c7bb9181c0d6ff9a0a45fe88a0dd6ff30d4c013f;hb=4db4740164fed3cb25145cfdaadb986fc0690507;hp=9359359179ac991aabd4c1a0ffa8232bb575646a;hpb=01e7d333890a89b0fcf4a17e30ce8347ce1b5209;p=fw%2Fsdcc diff --git a/src/SDCC.lex b/src/SDCC.lex index 93593591..c7bb9181 100644 --- a/src/SDCC.lex +++ b/src/SDCC.lex @@ -22,16 +22,14 @@ what you give them. Help stamp out software-hoarding! -------------------------------------------------------------------------*/ -%option noyywrap - -D [0-9] -L [a-zA-Z_] -H [a-fA-F0-9] -E [Ee][+-]?{D}+ -FS (f|F|l|L) -IS (u|U|l|L)* -%{ +D [0-9] +L [a-zA-Z_] +H [a-fA-F0-9] +E [Ee][+-]?{D}+ +FS (f|F|l|L) +IS (u|U|l|L)* +%{ #include #include #include @@ -39,127 +37,131 @@ IS (u|U|l|L)* #include "newalloc.h" #include "dbuf.h" -static char *stringLiteral(void); -char *currFname; - -extern int lineno, column; -extern char *filename; -int mylineno = 1; -static void count(void); -static int process_pragma(char *); -#undef yywrap - -#ifndef YYPROTO +#define TKEYWORD(token) return (isTargetKeyword(yytext) ? token :\ + check_type()) -#ifdef YY_USE_PROTOS -#define YY_PROTO(proto) proto -#else -#define YY_PROTO(proto) () -#endif +#define TKEYWORDSDCC(token) return (options.std_sdcc && isTargetKeyword(yytext)\ + ? token : check_type()) -#endif +#define TKEYWORD99(token) return (options.std_c99 ? token : check_type()) -int yywrap YY_PROTO((void)) -{ - return(1); -} +extern int lineno, column; +extern char *filename; -static void yyunput (int, char *); +/* global definitions */ +char *currFname; +int mylineno = 1; -static void my_unput(char c) -{ - yyunput(c, (yytext_ptr)); -} +/* local definitions */ +static struct dbuf_s asmbuff; -#define TKEYWORD(token) return (isTargetKeyword(yytext) ? token :\ - check_type()) -char *asmbuff=NULL; -int asmbuffSize=0; -char *asmp ; +/* forward declarations */ +static char *stringLiteral(void); +static void count(void); +static int process_pragma(char *); static int check_type(void); static int isTargetKeyword(char *s); -static int checkCurrFile (char *s); -struct optimize save_optimize; -struct options save_options; +static int checkCurrFile(char *s); %} %x asm %% -"_asm" { - count(); - asmp = asmbuff = realloc (asmbuff, INITIAL_INLINEASM); - asmbuffSize=INITIAL_INLINEASM; - BEGIN(asm) ; +_?"_asm" { + count(); + if (!options.std_sdcc && yytext[1] != '_') + return check_type(); + assert(asmbuff.alloc == 0 && asmbuff.len == 0 && asmbuff.buf == NULL); + dbuf_init(&asmbuff, INITIAL_INLINEASM); + BEGIN(asm); } -"_endasm" { +_?"_endasm" { count(); - *asmp = '\0'; - yylval.yyinline = strdup (asmbuff); - BEGIN(INITIAL); - return (INLINEASM); + if (!options.std_sdcc && yytext[1] != '_') + { + dbuf_append(&asmbuff, yytext, strlen(yytext)); + } + else + { + yylval.yyinline = dbuf_c_str(&asmbuff); + dbuf_detach(&asmbuff); + BEGIN(INITIAL); + return (INLINEASM); + } } -. { - if (asmp-asmbuff >= asmbuffSize-2) { - /* increase the buffersize with 50% */ - int size=asmp-asmbuff; - asmbuffSize=asmbuffSize*3/2; - asmbuff = realloc (asmbuff, asmbuffSize); - asmp=asmbuff+size; - } - *asmp++ = yytext[0]; +\n { + count(); + dbuf_append(&asmbuff, yytext, 1); } -\n { - count(); - if (asmp-asmbuff >= asmbuffSize-3) { - /* increase the buffersize with 50% */ - int size=asmp-asmbuff; - asmbuffSize=asmbuffSize*3/2; - asmbuff = realloc (asmbuff, asmbuffSize); - asmp=asmbuff+size; - } - *asmp++ = '\n' ; +. { + dbuf_append(&asmbuff, yytext, 1); } -"at" { count(); TKEYWORD(AT) ; } -"auto" { count(); return(AUTO); } -"bit" { count(); TKEYWORD(BIT) ; } +"at" { count(); TKEYWORDSDCC(AT); } +"__at" { count(); TKEYWORD(AT); } +"auto" { count(); return(AUTO); } +"bit" { count(); TKEYWORDSDCC(BIT); } +"__bit" { count(); TKEYWORD(BIT); } "break" { count(); return(BREAK); } "case" { count(); return(CASE); } "char" { count(); return(CHAR); } -"code" { count(); TKEYWORD(CODE); } +"code" { count(); TKEYWORDSDCC(CODE); } +"__code" { count(); TKEYWORD(CODE); } "const" { count(); return(CONST); } "continue" { count(); return(CONTINUE); } -"critical" { count(); TKEYWORD(CRITICAL); } -"data" { count(); TKEYWORD(DATA); } +"critical" { count(); TKEYWORDSDCC(CRITICAL); } +"__critical" { count(); TKEYWORD(CRITICAL); } +"data" { count(); TKEYWORDSDCC(DATA); } +"__data" { count(); TKEYWORD(DATA); } "default" { count(); return(DEFAULT); } "do" { count(); return(DO); } "double" { count(); werror(W_DOUBLE_UNSUPPORTED);return(FLOAT); } "else" { count(); return(ELSE); } "enum" { count(); return(ENUM); } "extern" { count(); return(EXTERN); } -"far" { count(); TKEYWORD(XDATA); } -"eeprom" { count(); TKEYWORD(EEPROM); } +"far" { count(); TKEYWORDSDCC(XDATA); } +"__far" { count(); TKEYWORD(XDATA); } +"eeprom" { count(); TKEYWORDSDCC(EEPROM); } +"__eeprom" { count(); TKEYWORD(EEPROM); } "float" { count(); return(FLOAT); } -"flash" { count(); TKEYWORD(CODE);} +"flash" { count(); TKEYWORDSDCC(CODE); } +"__flash" { count(); TKEYWORD(CODE); } "for" { count(); return(FOR); } -"goto" { count(); return(GOTO); } -"idata" { count(); TKEYWORD(IDATA);} +"goto" { count(); return(GOTO); } +"idata" { count(); TKEYWORDSDCC(IDATA); } +"__idata" { count(); TKEYWORD(IDATA); } "if" { count(); return(IF); } "int" { count(); return(INT); } -"interrupt" { count(); return(INTERRUPT);} -"nonbanked" { count(); TKEYWORD(NONBANKED);} -"banked" { count(); TKEYWORD(BANKED);} -"long" { count(); return(LONG); } -"near" { count(); TKEYWORD(DATA);} -"pdata" { count(); TKEYWORD(PDATA); } -"reentrant" { count(); TKEYWORD(REENTRANT);} +"interrupt" { count(); TKEYWORDSDCC(INTERRUPT); } +"__interrupt" { count(); TKEYWORD(INTERRUPT); } +"nonbanked" { count(); TKEYWORDSDCC(NONBANKED); } +"__nonbanked" { count(); TKEYWORD(NONBANKED); } +"banked" { count(); TKEYWORDSDCC(BANKED); } +"__banked" { count(); TKEYWORD(BANKED); } +"long" { count(); return(LONG); } +"near" { count(); TKEYWORDSDCC(DATA); } +"__near" { count(); TKEYWORD(DATA); } +"pdata" { count(); TKEYWORDSDCC(PDATA); } +"__pdata" { count(); TKEYWORD(PDATA); } +"reentrant" { count(); TKEYWORDSDCC(REENTRANT); } +"__reentrant" { count(); TKEYWORD(REENTRANT); } +"shadowregs" { count(); TKEYWORDSDCC(SHADOWREGS); } +"__shadowregs" { count(); TKEYWORD(SHADOWREGS); } +"wparam" { count(); TKEYWORDSDCC(WPARAM); } +"__wparam" { count(); TKEYWORD(WPARAM); } "register" { count(); return(REGISTER); } "return" { count(); return(RETURN); } -"sfr" { count(); TKEYWORD(SFR) ; } -"sbit" { count(); TKEYWORD(SBIT) ; } +"sfr" { count(); TKEYWORDSDCC(SFR); } +"__sfr" { count(); TKEYWORD(SFR); } +"sfr16" { count(); TKEYWORDSDCC(SFR16); } +"__sfr16" { count(); TKEYWORD(SFR16); } +"sfr32" { count(); TKEYWORDSDCC(SFR32); } +"__sfr32" { count(); TKEYWORD(SFR32); } +"sbit" { count(); TKEYWORDSDCC(SBIT); } +"__sbit" { count(); TKEYWORD(SBIT); } "short" { count(); return(SHORT); } "signed" { count(); return(SIGNED); } "sizeof" { count(); return(SIZEOF); } -"sram" { count(); TKEYWORD(XDATA);} +"sram" { count(); TKEYWORDSDCC(XDATA); } +"__sram" { count(); TKEYWORD(XDATA); } "static" { count(); return(STATIC); } "struct" { count(); return(STRUCT); } "switch" { count(); return(SWITCH); } @@ -168,33 +170,39 @@ struct options save_options; "unsigned" { count(); return(UNSIGNED); } "void" { count(); return(VOID); } "volatile" { count(); return(VOLATILE); } -"using" { count(); TKEYWORD(USING); } -"_naked" { count(); TKEYWORD(NAKED); } +"using" { count(); TKEYWORDSDCC(USING); } +"__using" { count(); TKEYWORD(USING); } +"_naked" { count(); TKEYWORDSDCC(NAKED); } +"__naked" { count(); TKEYWORD(NAKED); } "while" { count(); return(WHILE); } -"xdata" { count(); TKEYWORD(XDATA); } -"..." { count(); return(VAR_ARGS);} -"__typeof" { count(); return TYPEOF;} -"_JavaNative" { count(); TKEYWORD(JAVANATIVE);} -"_overlay" { count(); TKEYWORD(OVERLAY);} +"xdata" { count(); TKEYWORDSDCC(XDATA); } +"__xdata" { count(); TKEYWORD(XDATA); } +"..." { count(); return(VAR_ARGS); } +"__typeof" { count(); return TYPEOF; } +"_JavaNative" { count(); TKEYWORD(JAVANATIVE); } +"_overlay" { count(); TKEYWORDSDCC(OVERLAY); } +"__overlay" { count(); TKEYWORD(OVERLAY); } +"inline" { count(); TKEYWORD99(INLINE); } +"restrict" { count(); TKEYWORD99(RESTRICT); } {L}({L}|{D})* { count(); return(check_type()); } 0[xX]{H}+{IS}? { count(); yylval.val = constVal(yytext); return(CONSTANT); } -0{D}+{IS}? { count(); yylval.val = constVal(yytext); return(CONSTANT); } -{D}+{IS}? { count(); yylval.val = constVal(yytext); return(CONSTANT); } -'(\\.|[^\\'])+' { count();yylval.val = charVal (yytext); return(CONSTANT); /* ' make syntax highliter happy */} +0[0-7]*{IS}? { count(); yylval.val = constVal(yytext); return(CONSTANT); } +[1-9]{D}*{IS}? { count(); yylval.val = constVal(yytext); return(CONSTANT); } +'(\\.|[^\\'])+' { count();yylval.val = charVal (yytext); return(CONSTANT); /* ' make syntax highliter happy */ } {D}+{E}{FS}? { count(); yylval.val = constFloatVal(yytext);return(CONSTANT); } {D}*"."{D}+({E})?{FS}? { count(); yylval.val = constFloatVal(yytext);return(CONSTANT); } -{D}+"."{D}*({E})?{FS}? { count(); yylval.val = constFloatVal(yytext);return(CONSTANT); } -\" { count(); yylval.val=strVal(stringLiteral()); return(STRING_LITERAL);} +{D}+"."{D}*({E})?{FS}? { count(); yylval.val = constFloatVal(yytext);return(CONSTANT); } +\" { count(); yylval.val=strVal(stringLiteral()); return(STRING_LITERAL); } ">>=" { count(); yylval.yyint = RIGHT_ASSIGN ; return(RIGHT_ASSIGN); } -"<<=" { count(); yylval.yyint = LEFT_ASSIGN ; return(LEFT_ASSIGN) ; } -"+=" { count(); yylval.yyint = ADD_ASSIGN ; return(ADD_ASSIGN) ; } -"-=" { count(); yylval.yyint = SUB_ASSIGN ; return(SUB_ASSIGN) ; } -"*=" { count(); yylval.yyint = MUL_ASSIGN ; return(MUL_ASSIGN) ; } -"/=" { count(); yylval.yyint = DIV_ASSIGN ; return(DIV_ASSIGN) ; } -"%=" { count(); yylval.yyint = MOD_ASSIGN ; return(MOD_ASSIGN) ; } -"&=" { count(); yylval.yyint = AND_ASSIGN ; return(AND_ASSIGN) ; } -"^=" { count(); yylval.yyint = XOR_ASSIGN ; return(XOR_ASSIGN) ; } -"|=" { count(); yylval.yyint = OR_ASSIGN ; return(OR_ASSIGN) ; } +"<<=" { count(); yylval.yyint = LEFT_ASSIGN ; return(LEFT_ASSIGN); } +"+=" { count(); yylval.yyint = ADD_ASSIGN ; return(ADD_ASSIGN); } +"-=" { count(); yylval.yyint = SUB_ASSIGN ; return(SUB_ASSIGN); } +"*=" { count(); yylval.yyint = MUL_ASSIGN ; return(MUL_ASSIGN); } +"/=" { count(); yylval.yyint = DIV_ASSIGN ; return(DIV_ASSIGN); } +"%=" { count(); yylval.yyint = MOD_ASSIGN ; return(MOD_ASSIGN); } +"&=" { count(); yylval.yyint = AND_ASSIGN ; return(AND_ASSIGN); } +"^=" { count(); yylval.yyint = XOR_ASSIGN ; return(XOR_ASSIGN); } +"|=" { count(); yylval.yyint = OR_ASSIGN ; return(OR_ASSIGN); } ">>" { count(); return(RIGHT_OP); } "<<" { count(); return(LEFT_OP); } "++" { count(); return(INC_OP); } @@ -207,12 +215,12 @@ struct options save_options; "==" { count(); return(EQ_OP); } "!=" { count(); return(NE_OP); } ";" { count(); return(';'); } -"{" { count(); NestLevel++ ; return('{'); } -"}" { count(); NestLevel--; return('}'); } +"{" { count(); NestLevel++ ; ignoreTypedefType = 0; return('{'); } +"}" { count(); NestLevel--; return('}'); } "," { count(); return(','); } ":" { count(); return(':'); } "=" { count(); return('='); } -"(" { count(); return('('); } +"(" { count(); ignoreTypedefType = 0; return('('); } ")" { count(); return(')'); } "[" { count(); return('['); } "]" { count(); return(']'); } @@ -230,114 +238,127 @@ struct options save_options; "^" { count(); return('^'); } "|" { count(); return('|'); } "?" { count(); return('?'); } -^#line.*"\n" { count(); checkCurrFile(yytext); } -^#pragma.*"\n" { count(); process_pragma(yytext); } +^#pragma.*"\n" { count(); process_pragma(yytext); } +^(#line.*"\n")|(#.*"\n") { count(); checkCurrFile(yytext); } -^[^(]+"("[0-9]+") : error"[^\n]+ { werror(E_PRE_PROC_FAILED,yytext);count(); } -^[^(]+"("[0-9]+") : warning"[^\n]+ { werror(W_PRE_PROC_WARNING,yytext);count(); } -"\r\n" { count(); } -"\n" { count(); } +^[^(]+"("[0-9]+") : error"[^\n]+ { werror(E_PRE_PROC_FAILED, yytext); count(); } +^[^(]+"("[0-9]+") : warning"[^\n]+ { werror(W_PRE_PROC_WARNING, yytext); count(); } +"\r\n" { count(); } +"\n" { count(); } [ \t\v\f] { count(); } \\ { - char ch=input(); - if (ch!='\n') { + int ch = input(); + if (ch != '\n') { /* that could have been removed by the preprocessor anyway */ werror (W_STRAY_BACKSLASH, column); - my_unput(ch); + unput(ch); } } -. { count() ; } +. { count(); } %% +/* flex 2.5.31 undefines yytext_ptr, so we have to define it again */ +#ifndef yytext_ptr +#define yytext_ptr yytext +#endif + + static int checkCurrFile (char *s) { - char lineNum[10] ; - int lNum ; - char *tptr ; - - /* first check if this is a #line */ - if ( strncmp(s,"#line",5) ) - return 0 ; - - /* get to the line number */ - while (!isdigit(*s)) - s++ ; - tptr = lineNum ; - while (isdigit(*s)) - *tptr++ = *s++ ; - *tptr = '\0'; - sscanf(lineNum,"%d",&lNum); - + int lNum; + char *tptr; + + /* skip '#' character */ + if (*s++ != '#') + return 0; + + /* check if this is a #line + this is not standard and can be removed in the future */ +#define LINE_STR "line" +#define LINE_LEN ((sizeof LINE_STR) - 1) + + if (strncmp(s, LINE_STR, LINE_LEN) == 0) + s += LINE_LEN; + + /* get the line number */ + lNum = strtol(s, &tptr, 10); + if (tptr == s || !isspace(*tptr)) + return 0; + s = tptr; + /* now see if we have a file name */ - while (*s != '\"' && *s) - s++ ; - + while (*s != '\"' && *s) + s++; + /* if we don't have a filename then */ /* set the current line number to */ /* line number if printFlag is on */ - if (!*s) { - lineno = mylineno = lNum ; + if (!*s) { + lineno = mylineno = lNum; return 0; } - + /* if we have a filename then check */ /* if it is "standard in" if yes then */ /* get the currentfile name info */ s++ ; /* in c1mode fullSrcFileName is NULL */ - if ( fullSrcFileName && - strncmp(s,fullSrcFileName,strlen(fullSrcFileName)) == 0) { - lineno = mylineno = lNum; - currFname = fullSrcFileName ; - } else { - char *sb = s; - /* mark the end of the filename */ - while (*s != '"') s++; - *s = '\0'; - currFname = strdup (sb); - lineno = mylineno = lNum; + if (fullSrcFileName && + strncmp(s, fullSrcFileName, strlen(fullSrcFileName)) == 0) { + lineno = mylineno = lNum; + currFname = fullSrcFileName; + } else { + char *sb = s; + /* mark the end of the filename */ + while (*s != '"') s++; + *s = '\0'; + currFname = strdup (sb); + lineno = mylineno = lNum; } filename = currFname ; return 0; } - + int column = 0; int plineIdx =0; static void count(void) { int i; - for (i = 0; yytext[i] != '\0'; i++) { - if (yytext[i] == '\n') { + for (i = 0; yytext[i] != '\0'; i++) { + if (yytext[i] == '\n') { column = 0; - lineno = ++mylineno ; + lineno = ++mylineno; } - else + else if (yytext[i] == '\t') - column += 8 - (column % 8); + column += 8 - (column % 8); else - column++; + column++; } /* ECHO; */ } static int check_type(void) { - /* check if it is in the typedef table */ - if (findSym(TypedefTab,NULL,yytext)) { - strncpyz(yylval.yychar,yytext, SDCC_NAME_MAX); - return (TYPE_NAME) ; - } - else { - strncpyz (yylval.yychar,yytext, SDCC_NAME_MAX); - return(IDENTIFIER); - } + symbol *sym = findSym(SymbolTab, NULL, yytext); + + /* check if it is in the table as a typedef */ + if (!ignoreTypedefType && sym && IS_SPEC (sym->etype) + && SPEC_TYPEDEF (sym->etype)) { + strncpyz(yylval.yychar, yytext, SDCC_NAME_MAX); + return (TYPE_NAME); + } + else { + strncpyz (yylval.yychar, yytext, SDCC_NAME_MAX); + return(IDENTIFIER); + } } /* * Change by JTV 2001-05-19 to not concantenate strings - * to support ANSI hex and octal escape sequences in string liteals + * to support ANSI hex and octal escape sequences in string literals */ static char *stringLiteral(void) @@ -352,7 +373,6 @@ static char *stringLiteral(void) else dbuf_set_size(&dbuf, 0); - dbuf_append(&dbuf, "\"", 1); /* put into the buffer till we hit the first \" */ @@ -386,12 +406,12 @@ static char *stringLiteral(void) /* find the next non whitespace character */ /* if that is a double quote then carry on */ dbuf_append(&dbuf, "\"", 1); /* Pass end of this string or substring to evaluator */ - while ((ch = input()) && (isspace(ch) || ch=='\\')) { + while ((ch = input()) && (isspace(ch) || ch == '\\')) { switch (ch) { case '\\': if ((ch = input()) != '\n') { werror(W_STRAY_BACKSLASH, column); - my_unput(ch); + unput(ch); } else { lineno = ++mylineno; @@ -405,11 +425,11 @@ static char *stringLiteral(void) } } - if (!ch) + if (!ch) goto out; if (ch != '\"') { - my_unput(ch) ; + unput(ch); goto out; } break; @@ -427,21 +447,29 @@ out: enum pragma_id { P_SAVE = 1, - P_RESTORE , + P_RESTORE, P_NOINDUCTION, P_NOINVARIANT, - P_INDUCTION , - P_STACKAUTO , - P_NOJTBOUND , - P_NOOVERLAY , + P_INDUCTION, + P_STACKAUTO, + P_NOJTBOUND, + P_NOOVERLAY, P_LESSPEDANTIC, - P_NOGCSE , + P_NOGCSE, P_CALLEE_SAVES, - P_EXCLUDE , - P_NOIV , - P_LOOPREV , - P_OVERLAY_ /* I had a strange conflict with P_OVERLAY while */ + P_EXCLUDE, + P_NOIV, + P_LOOPREV, + P_OVERLAY_, /* I had a strange conflict with P_OVERLAY while */ /* cross-compiling for MINGW32 with gcc 3.2 */ + P_DISABLEWARN, + P_OPTCODESPEED, + P_OPTCODESIZE, + P_OPTCODEBALANCED, + P_STD_C89, + P_STD_C99, + P_STD_SDCC89, + P_STD_SDCC99 }; @@ -450,6 +478,7 @@ enum pragma_id { STACK_DCL(options_stack, struct options *, SAVE_RESTORE_SIZE) STACK_DCL(optimize_stack, struct optimize *, SAVE_RESTORE_SIZE) +STACK_DCL(SDCCERRG_stack, struct SDCCERRG *, SAVE_RESTORE_SIZE) /* * cloneXxx functions should be updated every time a new set is @@ -478,7 +507,7 @@ static struct optimize *cloneOptimize(struct optimize *opt) { struct optimize *new_opt; - new_opt = Safe_malloc(sizeof (struct options)); + new_opt = Safe_malloc(sizeof (struct optimize)); /* clone scalar values */ *new_opt = *opt; @@ -486,6 +515,18 @@ static struct optimize *cloneOptimize(struct optimize *opt) return new_opt; } +static struct SDCCERRG *cloneSDCCERRG (struct SDCCERRG *val) +{ + struct SDCCERRG *new_val; + + new_val = Safe_malloc(sizeof (struct SDCCERRG)); + + /* clone scalar values */ + *new_val = *val; + + return new_val; +} + static void copyAndFreeOptions(struct options *dest, struct options *src) { /* delete dest sets */ @@ -494,7 +535,7 @@ static void copyAndFreeOptions(struct options *dest, struct options *src) /* not implemented yet: */ /* deleteSet(&dest->olaysSet); */ - /* dopy src to dest */ + /* copy src to dest */ *dest = *src; Safe_free(src); @@ -502,7 +543,15 @@ static void copyAndFreeOptions(struct options *dest, struct options *src) static void copyAndFreeOptimize(struct optimize *dest, struct optimize *src) { - /* dopy src to dest */ + /* copy src to dest */ + *dest = *src; + + Safe_free(src); +} + +static void copyAndFreeSDCCERRG(struct SDCCERRG *dest, struct SDCCERRG *src) +{ + /* copy src to dest */ *dest = *src; Safe_free(src); @@ -510,11 +559,14 @@ static void copyAndFreeOptimize(struct optimize *dest, struct optimize *src) static void doPragma(int op, char *cp) { + int i; + switch (op) { case P_SAVE: { STACK_PUSH(options_stack, cloneOptions(&options)); STACK_PUSH(optimize_stack, cloneOptimize(&optimize)); + STACK_PUSH(SDCCERRG_stack, cloneSDCCERRG(&_SDCCERRG)); } break; @@ -522,25 +574,29 @@ static void doPragma(int op, char *cp) { struct options *optionsp; struct optimize *optimizep; + struct SDCCERRG *sdccerrgp; optionsp = STACK_POP(options_stack); copyAndFreeOptions(&options, optionsp); optimizep = STACK_POP(optimize_stack); copyAndFreeOptimize(&optimize, optimizep); + + sdccerrgp = STACK_POP(SDCCERRG_stack); + copyAndFreeSDCCERRG(&_SDCCERRG, sdccerrgp); } break; case P_NOINDUCTION: - optimize.loopInduction = 0 ; + optimize.loopInduction = 0; break; case P_NOINVARIANT: - optimize.loopInvariant = 0 ; + optimize.loopInvariant = 0; break; case P_INDUCTION: - optimize.loopInduction = 1 ; + optimize.loopInduction = 1; break; case P_STACKAUTO: @@ -561,6 +617,7 @@ static void doPragma(int op, char *cp) case P_LESSPEDANTIC: options.lessPedantic = 1; + setErrorLogLevel(ERROR_LEVEL_WARNING); break; case P_CALLEE_SAVES: @@ -586,66 +643,150 @@ static void doPragma(int op, char *cp) case P_OVERLAY_: break; /* notyet */ + + case P_DISABLEWARN: + if (sscanf(cp, "%d", &i) && (iprocess_pragma && !port->process_pragma(cp)) return 0; - for (i = 0; i < NELEM(pragma_tbl); i++) { - /* now compare and do what needs to be done */ - size_t len = strlen(pragma_tbl[i].name); + for (i = 0; i < NELEM(pragma_tbl); i++) + { + /* now compare and do what needs to be done */ + size_t len = strlen(pragma_tbl[i].name); - if (strncmp(cp, pragma_tbl[i].name, len) == 0) { - doPragma(pragma_tbl[i].id, cp + len); - return 0; + if (strncmp(cp, pragma_tbl[i].name, len) == 0) + { + if (pragma_tbl[i].deprecated != 0) + werror(W_DEPRECATED_PRAGMA, pragma_tbl[i].name); + + doPragma(pragma_tbl[i].id, s); + return 0; + } } - } - werror(W_UNKNOWN_PRAGMA,cp); + werror(W_UNKNOWN_PRAGMA, cp); return 0; } @@ -653,34 +794,58 @@ static int process_pragma(char *s) of a target specific keyword */ static int isTargetKeyword(char *s) { - int i; - - if (port->keywords == NULL) - return 0; - for ( i = 0 ; port->keywords[i] ; i++ ) { - if (strcmp(port->keywords[i],s) == 0) - return 1; - } - + int i; + + if (port->keywords == NULL) return 0; + + if (s[0] == '_' && s[1] == '_') + { + /* Keywords in the port's array have either 0 or 1 underscore, */ + /* so skip over the appropriate number of chars when comparing */ + for (i = 0 ; port->keywords[i] ; i++ ) + { + if (port->keywords[i][0] == '_' && + strcmp(port->keywords[i],s+1) == 0) + return 1; + else if (strcmp(port->keywords[i],s+2) == 0) + return 1; + } + } + else + { + for (i = 0 ; port->keywords[i] ; i++ ) + { + if (strcmp(port->keywords[i],s) == 0) + return 1; + } + } + + return 0; +} + +int yywrap(void) +{ + if (!STACK_EMPTY(options_stack) || !STACK_EMPTY(optimize_stack)) + werror(W_SAVE_RESTORE); + + return 1; } int yyerror(char *s) { - fflush(stdout); - - if (mylineno && filename) { - if(options.vc_err_style) - fprintf(stdout,"\n%s(%d) : %s: token -> '%s' ; column %d\n", - filename,mylineno, - s,yytext,column); - else - fprintf(stdout,"\n%s:%d: %s: token -> '%s' ; column %d\n", - filename,mylineno, - s,yytext,column); - fatalError++; - } else { - /* this comes from an empy file, no problem */ - } - return 0; + fflush(stdout); + + if (mylineno && filename) { + if(options.vc_err_style) + fprintf(stderr, "\n%s(%d) : %s: token -> '%s' ; column %d\n", + filename, mylineno, s, yytext, column); + else + fprintf(stderr, "\n%s:%d: %s: token -> '%s' ; column %d\n", + filename, mylineno, s ,yytext, column); + fatalError++; + } else { + /* this comes from an empy file, no problem */ + } + return 0; }