X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCC.y;h=7464b31baa52dc7df05d74851072c0db480c5629;hb=612786d8db68cae5630bfe055a15da9a7d4a962b;hp=9c9eee76f7dd8da977476c3385f7b229da95e30b;hpb=53638777280c2f658894958794c3e7886a4294b5;p=fw%2Fsdcc diff --git a/src/SDCC.y b/src/SDCC.y index 9c9eee76..7464b31b 100644 --- a/src/SDCC.y +++ b/src/SDCC.y @@ -87,25 +87,26 @@ bool uselessDecl = TRUE; %token MUL_ASSIGN DIV_ASSIGN MOD_ASSIGN ADD_ASSIGN %token SUB_ASSIGN LEFT_ASSIGN RIGHT_ASSIGN AND_ASSIGN %token XOR_ASSIGN OR_ASSIGN -%token TYPEDEF EXTERN STATIC AUTO REGISTER CODE EEPROM INTERRUPT SFR AT SBIT -%token REENTRANT USING XDATA DATA IDATA PDATA VAR_ARGS CRITICAL NONBANKED BANKED -%token CHAR SHORT INT LONG SIGNED UNSIGNED FLOAT DOUBLE CONST VOLATILE VOID BIT -%token STRUCT UNION ENUM ELIPSIS RANGE FAR +%token TYPEDEF EXTERN STATIC AUTO REGISTER CODE EEPROM INTERRUPT SFR SFR16 SFR32 +%token AT SBIT REENTRANT USING XDATA DATA IDATA PDATA VAR_ARGS CRITICAL +%token NONBANKED BANKED SHADOWREGS WPARAM +%token CHAR SHORT INT LONG SIGNED UNSIGNED FLOAT DOUBLE FIXED16X16 CONST VOLATILE VOID BIT +%token STRUCT UNION ENUM RANGE FAR %token CASE DEFAULT IF ELSE SWITCH WHILE DO FOR GOTO CONTINUE BREAK RETURN %token NAKED JAVANATIVE OVERLAY %token INLINEASM -%token IFX ADDRESS_OF GET_VALUE_AT_ADDRESS SPIL UNSPIL GETHBIT +%token IFX ADDRESS_OF GET_VALUE_AT_ADDRESS SPIL UNSPIL GETHBIT GETABIT GETBYTE GETWORD %token BITWISEAND UNARYMINUS IPUSH IPOP PCALL ENDFUNCTION JUMPTABLE %token RRC RLC %token CAST CALL PARAM NULLOP BLOCK LABEL RECEIVE SEND ARRAYINIT -%token DUMMY_READ_VOLATILE ENDCRITICAL SWAP +%token DUMMY_READ_VOLATILE ENDCRITICAL SWAP INLINE RESTRICT %type Interrupt_storage %type identifier declarator declarator2 declarator3 enumerator_list enumerator %type struct_declarator function_declarator function_declarator2 %type struct_declarator_list struct_declaration struct_declaration_list %type declaration init_declarator_list init_declarator -%type declaration_list identifier_list parameter_identifier_list +%type declaration_list identifier_list %type declarator2_function_attributes while do for critical %type pointer type_specifier_list type_specifier type_name %type storage_class_specifier struct_or_union_specifier @@ -132,8 +133,16 @@ bool uselessDecl = TRUE; %% file + : /* empty */ + { if (!options.lessPedantic) + werror(W_EMPTY_SOURCE_FILE); + } + | program + ; + +program : external_definition - | file external_definition + | program external_definition ; external_definition @@ -159,7 +168,7 @@ external_definition SPEC_EXTR($1->etype) = 1; } } - addSymChain ($1); + addSymChain (&$1); allocVariables ($1) ; cleanUpLevel (SymbolTab,1); } @@ -185,9 +194,9 @@ function_attribute ; function_attributes - : USING CONSTANT { + : USING constant_expr { $$ = newLink(SPECIFIER) ; - FUNC_REGBANK($$) = (int) floatFromVal($2); + FUNC_REGBANK($$) = (int) floatFromVal(constExprValue($2,TRUE)); } | REENTRANT { $$ = newLink (SPECIFIER); FUNC_ISREENT($$)=1; @@ -210,6 +219,12 @@ function_attributes werror(W_BANKED_WITH_NONBANKED); } } + | SHADOWREGS {$$ = newLink (SPECIFIER); + FUNC_ISSHADOWREGS($$) = 1; + } + | WPARAM {$$ = newLink (SPECIFIER); + FUNC_ISWPARAM($$) = 1; + } | BANKED {$$ = newLink (SPECIFIER); FUNC_BANKED($$) = 1; if (FUNC_NONBANKED($$)) { @@ -256,18 +271,20 @@ postfix_expr { $$ = newNode (CALL,$1,$3) ; $$->left->funcName = 1; } - | postfix_expr '.' identifier + | postfix_expr '.' { ignoreTypedefType = 1; } identifier { - $3 = newSymbol($3->name,NestLevel); - $3->implicit = 1; - $$ = newNode(PTR_OP,newNode('&',$1,NULL),newAst_VALUE(symbolVal($3))); -/* $$ = newNode('.',$1,newAst(EX_VALUE,symbolVal($3))) ; */ + ignoreTypedefType = 0; + $4 = newSymbol($4->name,NestLevel); + $4->implicit = 1; + $$ = newNode(PTR_OP,newNode('&',$1,NULL),newAst_VALUE(symbolVal($4))); +/* $$ = newNode('.',$1,newAst(EX_VALUE,symbolVal($4))) ; */ } - | postfix_expr PTR_OP identifier + | postfix_expr PTR_OP { ignoreTypedefType = 1; } identifier { - $3 = newSymbol($3->name,NestLevel); - $3->implicit = 1; - $$ = newNode(PTR_OP,$1,newAst_VALUE(symbolVal($3))); + ignoreTypedefType = 0; + $4 = newSymbol($4->name,NestLevel); + $4->implicit = 1; + $$ = newNode(PTR_OP,$1,newAst_VALUE(symbolVal($4))); } | postfix_expr INC_OP { $$ = newNode(INC_OP,$1,NULL);} @@ -325,40 +342,16 @@ shift_expr relational_expr : shift_expr - | relational_expr '<' shift_expr { - $$ = (port->lt_nge ? - newNode('!',newNode(GE_OP,$1,$3),NULL) : - newNode('<', $1,$3)); - } - | relational_expr '>' shift_expr { - $$ = (port->gt_nle ? - newNode('!',newNode(LE_OP,$1,$3),NULL) : - newNode('>',$1,$3)); - } - | relational_expr LE_OP shift_expr { - $$ = (port->le_ngt ? - newNode('!', newNode('>', $1 , $3 ), NULL) : - newNode(LE_OP,$1,$3)); - } - | relational_expr GE_OP shift_expr { - $$ = (port->ge_nlt ? - newNode('!', newNode('<', $1 , $3 ), NULL) : - newNode(GE_OP,$1,$3)); - } + | relational_expr '<' shift_expr { $$ = newNode('<', $1,$3);} + | relational_expr '>' shift_expr { $$ = newNode('>', $1,$3);} + | relational_expr LE_OP shift_expr { $$ = newNode(LE_OP,$1,$3);} + | relational_expr GE_OP shift_expr { $$ = newNode(GE_OP,$1,$3);} ; equality_expr : relational_expr - | equality_expr EQ_OP relational_expr { - $$ = (port->eq_nne ? - newNode('!',newNode(NE_OP,$1,$3),NULL) : - newNode(EQ_OP,$1,$3)); - } - | equality_expr NE_OP relational_expr { - $$ = (port->ne_neq ? - newNode('!', newNode(EQ_OP,$1,$3), NULL) : - newNode(NE_OP,$1,$3)); - } + | equality_expr EQ_OP relational_expr { $$ = newNode(EQ_OP,$1,$3);} + | equality_expr NE_OP relational_expr { $$ = newNode(NE_OP,$1,$3);} ; and_expr @@ -399,7 +392,7 @@ conditional_expr assignment_expr : conditional_expr - | unary_expr assignment_operator assignment_expr + | cast_expr assignment_operator assignment_expr { switch ($2) { @@ -407,45 +400,37 @@ assignment_expr $$ = newNode($2,$1,$3); break; case MUL_ASSIGN: - $$ = newNode('=',removePostIncDecOps(copyAst($1)), - newNode('*',removePreIncDecOps(copyAst($1)),$3)); + $$ = createRMW($1, '*', $3); break; case DIV_ASSIGN: - $$ = newNode('=',removePostIncDecOps(copyAst($1)), - newNode('/',removePreIncDecOps(copyAst($1)),$3)); + $$ = createRMW($1, '/', $3); break; case MOD_ASSIGN: - $$ = newNode('=',removePostIncDecOps(copyAst($1)), - newNode('%',removePreIncDecOps(copyAst($1)),$3)); + $$ = createRMW($1, '%', $3); break; case ADD_ASSIGN: - $$ = newNode('=',removePostIncDecOps(copyAst($1)), - newNode('+',removePreIncDecOps(copyAst($1)),$3)); + $$ = createRMW($1, '+', $3); break; case SUB_ASSIGN: - $$ = newNode('=',removePostIncDecOps(copyAst($1)), - newNode('-',removePreIncDecOps(copyAst($1)),$3)); + $$ = createRMW($1, '-', $3); break; case LEFT_ASSIGN: - $$ = newNode('=',removePostIncDecOps(copyAst($1)), - newNode(LEFT_OP,removePreIncDecOps(copyAst($1)),$3)); + $$ = createRMW($1, LEFT_OP, $3); break; case RIGHT_ASSIGN: - $$ = newNode('=',removePostIncDecOps(copyAst($1)), - newNode(RIGHT_OP,removePreIncDecOps(copyAst($1)),$3)); + $$ = createRMW($1, RIGHT_OP, $3); break; case AND_ASSIGN: - $$ = newNode('=',removePostIncDecOps(copyAst($1)), - newNode('&',removePreIncDecOps(copyAst($1)),$3)); + $$ = createRMW($1, '&', $3); break; case XOR_ASSIGN: - $$ = newNode('=',removePostIncDecOps(copyAst($1)), - newNode('^',removePreIncDecOps(copyAst($1)),$3)); + $$ = createRMW($1, '^', $3); break; case OR_ASSIGN: - /* $$ = newNode('=',$1,newNode('|',removeIncDecOps(copyAst($1)),$3)); */ - $$ = newNode('=',removePostIncDecOps(copyAst($1)), - newNode('|',removePreIncDecOps(copyAst($1)),$3)); +/* $$ = newNode('=',$1,newNode('|',removeIncDecOps(copyAst($1)),$3)); */ +/* $$ = newNode('=',removePostIncDecOps(copyAst($1)), + newNode('|',removePreIncDecOps(copyAst($1)),$3)); */ + $$ = createRMW($1, '|', $3); break; default : $$ = NULL; @@ -569,8 +554,8 @@ storage_class_specifier Interrupt_storage : INTERRUPT { $$ = INTNO_UNSPEC ; } - | INTERRUPT CONSTANT - { int intno = (int) floatFromVal($2); + | INTERRUPT constant_expr + { int intno = (int) floatFromVal(constExprValue($2,TRUE)); if ((intno >= 0) && (intno <= INTNO_MAX)) $$ = intno; else @@ -588,59 +573,64 @@ type_specifier /* add this to the storage class specifier */ SPEC_ABSA($1) = 1; /* set the absolute addr flag */ /* now get the abs addr from value */ - SPEC_ADDR($1) = (int) floatFromVal(constExprValue($3,TRUE)) ; + SPEC_ADDR($1) = (unsigned) floatFromVal(constExprValue($3,TRUE)) ; } ; type_specifier2 - : CHAR { - $$=newLink(SPECIFIER); - SPEC_NOUN($$) = V_CHAR ; - ignoreTypedefType = 1; - } - | SHORT { - $$=newLink(SPECIFIER); - $$->select.s._short = 1 ; - ignoreTypedefType = 1; - } - | INT { - $$=newLink(SPECIFIER); - SPEC_NOUN($$) = V_INT ; - ignoreTypedefType = 1; - } - | LONG { - $$=newLink(SPECIFIER); - SPEC_LONG($$) = 1 ; - ignoreTypedefType = 1; - } - | SIGNED { - $$=newLink(SPECIFIER); - $$->select.s._signed = 1; - ignoreTypedefType = 1; - } + : CHAR { + $$=newLink(SPECIFIER); + SPEC_NOUN($$) = V_CHAR ; + ignoreTypedefType = 1; + } + | SHORT { + $$=newLink(SPECIFIER); + SPEC_SHORT($$) = 1 ; + ignoreTypedefType = 1; + } + | INT { + $$=newLink(SPECIFIER); + SPEC_NOUN($$) = V_INT ; + ignoreTypedefType = 1; + } + | LONG { + $$=newLink(SPECIFIER); + SPEC_LONG($$) = 1 ; + ignoreTypedefType = 1; + } + | SIGNED { + $$=newLink(SPECIFIER); + $$->select.s.b_signed = 1; + ignoreTypedefType = 1; + } | UNSIGNED { - $$=newLink(SPECIFIER); - SPEC_USIGN($$) = 1 ; - ignoreTypedefType = 1; - } - | VOID { - $$=newLink(SPECIFIER); - SPEC_NOUN($$) = V_VOID ; - ignoreTypedefType = 1; - } - | CONST { - $$=newLink(SPECIFIER); - SPEC_CONST($$) = 1; - } + $$=newLink(SPECIFIER); + SPEC_USIGN($$) = 1 ; + ignoreTypedefType = 1; + } + | VOID { + $$=newLink(SPECIFIER); + SPEC_NOUN($$) = V_VOID ; + ignoreTypedefType = 1; + } + | CONST { + $$=newLink(SPECIFIER); + SPEC_CONST($$) = 1; + } | VOLATILE { - $$=newLink(SPECIFIER); - SPEC_VOLATILE($$) = 1 ; - } - | FLOAT { - $$=newLink(SPECIFIER); - SPEC_NOUN($$) = V_FLOAT; - ignoreTypedefType = 1; - } + $$=newLink(SPECIFIER); + SPEC_VOLATILE($$) = 1 ; + } + | FLOAT { + $$=newLink(SPECIFIER); + SPEC_NOUN($$) = V_FLOAT; + ignoreTypedefType = 1; + } + | FIXED16X16 { + $$=newLink(SPECIFIER); + SPEC_NOUN($$) = V_FIXED16X16; + ignoreTypedefType = 1; + } | XDATA { $$ = newLink (SPECIFIER); SPEC_SCLS($$) = S_XDATA ; @@ -649,7 +639,7 @@ type_specifier2 $$ = newLink (SPECIFIER) ; SPEC_SCLS($$) = S_CODE ; } - | EEPROM { + | EEPROM { $$ = newLink (SPECIFIER) ; SPEC_SCLS($$) = S_EEPROM ; } @@ -665,19 +655,19 @@ type_specifier2 $$ = newLink (SPECIFIER); SPEC_SCLS($$) = S_PDATA ; } - | BIT { - $$=newLink(SPECIFIER); - SPEC_NOUN($$) = V_BIT ; - SPEC_SCLS($$) = S_BIT ; - SPEC_BLEN($$) = 1; - SPEC_BSTR($$) = 0; - ignoreTypedefType = 1; - } + | BIT { + $$=newLink(SPECIFIER); + SPEC_NOUN($$) = V_BIT ; + SPEC_SCLS($$) = S_BIT ; + SPEC_BLEN($$) = 1; + SPEC_BSTR($$) = 0; + ignoreTypedefType = 1; + } | struct_or_union_specifier { uselessDecl = FALSE; $$ = $1 ; - ignoreTypedefType = 1; + ignoreTypedefType = 1; } | enum_specifier { cenum = NULL ; @@ -691,7 +681,7 @@ type_specifier2 sym_link *p ; sym = findSym(TypedefTab,NULL,$1) ; $$ = p = copyLinkChain(sym->type); - SPEC_TYPEDEF(getSpec(p)) = 0; + SPEC_TYPEDEF(getSpec(p)) = 0; ignoreTypedefType = 1; } | sfr_reg_bit @@ -702,7 +692,9 @@ sfr_reg_bit $$ = newLink(SPECIFIER) ; SPEC_NOUN($$) = V_SBIT; SPEC_SCLS($$) = S_SBIT; - ignoreTypedefType = 1; + SPEC_BLEN($$) = 1; + SPEC_BSTR($$) = 0; + ignoreTypedefType = 1; } | sfr_attributes ; @@ -714,7 +706,7 @@ sfr_attributes SPEC_NOUN($$) = V_CHAR; SPEC_SCLS($$) = S_SFR ; SPEC_USIGN($$) = 1 ; - ignoreTypedefType = 1; + ignoreTypedefType = 1; } | SFR BANKED { $$ = newLink(SPECIFIER) ; @@ -722,7 +714,30 @@ sfr_attributes SPEC_NOUN($$) = V_CHAR; SPEC_SCLS($$) = S_SFR ; SPEC_USIGN($$) = 1 ; - ignoreTypedefType = 1; + ignoreTypedefType = 1; + } + ; + +sfr_attributes + : SFR16 { + $$ = newLink(SPECIFIER) ; + FUNC_REGBANK($$) = 0; + SPEC_NOUN($$) = V_INT; + SPEC_SCLS($$) = S_SFR; + SPEC_USIGN($$) = 1 ; + ignoreTypedefType = 1; + } + ; + +sfr_attributes + : SFR32 { + $$ = newLink(SPECIFIER) ; + FUNC_REGBANK($$) = 0; + SPEC_NOUN($$) = V_INT; + SPEC_SCLS($$) = S_SFR; + SPEC_LONG($$) = 1; + SPEC_USIGN($$) = 1; + ignoreTypedefType = 1; } ; @@ -748,17 +763,19 @@ struct_or_union_specifier // check for errors in structure members for (sym=$5; sym; sym=sym->next) { if (IS_ABSOLUTE(sym->etype)) { - werrorfl(filename, sym->lineDef, E_NOT_ALLOWED, "'at'"); + werrorfl(sym->fileDef, sym->lineDef, E_NOT_ALLOWED, "'at'"); SPEC_ABSA(sym->etype) = 0; } if (IS_SPEC(sym->etype) && SPEC_SCLS(sym->etype)) { - werrorfl(filename, sym->lineDef, E_NOT_ALLOWED, "storage class"); + werrorfl(sym->fileDef, sym->lineDef, E_NOT_ALLOWED, "storage class"); + printTypeChainRaw (sym->type,NULL); SPEC_SCLS(sym->etype) = 0; } for (dsym=sym->next; dsym; dsym=dsym->next) { - if (strcmp(sym->name, dsym->name)==0) { - werrorfl(filename, sym->lineDef, E_DUPLICATE_MEMBER, + if (*dsym->name && strcmp(sym->name, dsym->name)==0) { + werrorfl(sym->fileDef, sym->lineDef, E_DUPLICATE_MEMBER, $1==STRUCT ? "struct" : "union", sym->name); + werrorfl(dsym->fileDef, dsym->lineDef, E_PREVIOUS_DEF); } } } @@ -767,7 +784,8 @@ struct_or_union_specifier sdef = $2 ; sdef->fields = reverseSyms($5) ; /* link the fields */ sdef->size = compStructSize($1,sdef); /* update size of */ - + promoteAnonStructs ($1, sdef); + /* Create the specifier */ $$ = newLink (SPECIFIER) ; SPEC_NOUN($$) = V_STRUCT; @@ -867,9 +885,9 @@ struct_declarator_list struct_declarator : declarator | ':' constant_expr { - int bitsize; + unsigned int bitsize; $$ = newSymbol (genSymName(NestLevel),NestLevel) ; - bitsize= (int) floatFromVal(constExprValue($2,TRUE)); + bitsize= (unsigned int) floatFromVal(constExprValue($2,TRUE)); if (bitsize > (port->s.int_size * 8)) { bitsize = port->s.int_size * 8; werror(E_BITFLD_SIZE, bitsize); @@ -880,8 +898,8 @@ struct_declarator } | declarator ':' constant_expr { - int bitsize; - bitsize= (int) floatFromVal(constExprValue($3,TRUE)); + unsigned int bitsize; + bitsize= (unsigned int) floatFromVal(constExprValue($3,TRUE)); if (bitsize > (port->s.int_size * 8)) { bitsize = port->s.int_size * 8; werror(E_BITFLD_SIZE, bitsize); @@ -894,45 +912,35 @@ struct_declarator else $1->bitVar = bitsize; } + | { $$ = newSymbol ("", NestLevel) ; } + ; enum_specifier : ENUM '{' enumerator_list '}' { - symbol *sym, *dsym; - char _error=0; - - // check for duplicate enums - for (sym=$3; sym; sym=sym->next) { - for (dsym=sym->next; dsym; dsym=dsym->next) { - if (strcmp(sym->name, dsym->name)==0) { - werrorfl(filename, sym->lineDef, E_DUPLICATE_MEMBER, "enum", sym->name); - _error++; - } - } - } - if (_error==0) { - $$ = copyLinkChain(cenum->type); - } else { - $$ = newIntLink(); - SPEC_NOUN($$)=0; - } + $$ = newEnumType ($3); //copyLinkChain(cenum->type); + SPEC_SCLS(getSpec($$)) = 0; } | ENUM identifier '{' enumerator_list '}' { symbol *csym ; + sym_link *enumtype; + + csym=findSym(enumTab,$2,$2->name); + if ((csym && csym->level == $2->level)) + { + werrorfl($2->fileDef, $2->lineDef, E_DUPLICATE_TYPEDEF,csym->name); + werrorfl(csym->fileDef, csym->lineDef, E_PREVIOUS_DEF); + } - $2->type = copyLinkChain(cenum->type); - $2->etype = getSpec($2->type); - /* add this to the enumerator table */ - if (!(csym=findSym(enumTab,$2,$2->name)) && - (csym && csym->level == $2->level)) - werror(E_DUPLICATE_TYPEDEF,csym->name); + enumtype = newEnumType ($4); //copyLinkChain(cenum->type); + SPEC_SCLS(getSpec(enumtype)) = 0; + $2->type = enumtype; - addSym ( enumTab,$2,$2->name,$2->level,$2->block, 0); - //addSymChain ($4); - //allocVariables (reverseSyms($4)); - $$ = copyLinkChain(cenum->type); - SPEC_SCLS(getSpec($$)) = 0 ; + /* add this to the enumerator table */ + if (!csym) + addSym ( enumTab,$2,$2->name,$2->level,$2->block, 0); + $$ = copyLinkChain(enumtype); } | ENUM identifier { symbol *csym ; @@ -944,8 +952,6 @@ enum_specifier $$ = newLink(SPECIFIER) ; SPEC_NOUN($$) = V_INT ; } - - SPEC_SCLS(getSpec($$)) = 0 ; } ; @@ -953,10 +959,22 @@ enumerator_list : enumerator | enumerator_list ',' { } - | enumerator_list ',' enumerator { - $3->next = $1 ; - $$ = $3 ; - } + | enumerator_list ',' enumerator + { + symbol *dsym; + + for (dsym=$1; dsym; dsym=dsym->next) + { + if (strcmp($3->name, dsym->name)==0) + { + werrorfl($3->fileDef, $3->lineDef, E_DUPLICATE_MEMBER, "enum", $3->name); + werrorfl(dsym->fileDef, dsym->lineDef, E_PREVIOUS_DEF); + } + } + + $3->next = $1 ; + $$ = $3 ; + } ; enumerator @@ -969,15 +987,22 @@ enumerator SPEC_ENUM($1->etype) = 1; $$ = $1 ; // do this now, so we can use it for the next enums in the list - addSymChain($1); + addSymChain(&$1); } ; opt_assign_expr : '=' constant_expr { value *val ; - - val = constExprValue($2,TRUE); + + val = constExprValue($2,TRUE); + if (!IS_INT(val->type) && !IS_CHAR(val->type)) + { + werror(E_ENUM_NON_INTEGER); + SNPRINTF(lbuff, sizeof(lbuff), + "%d",(int) floatFromVal(val)); + val = constVal(lbuff); + } $$ = cenum = val ; } | { @@ -1021,21 +1046,32 @@ declarator2_function_attributes : function_declarator2 { $$ = $1 ; } | function_declarator2 function_attribute { // copy the functionAttributes (not the args and hasVargs !!) - sym_link *funcType=$1->etype; - struct value *args=FUNC_ARGS(funcType); - unsigned hasVargs=FUNC_HASVARARGS(funcType); - - memcpy (&funcType->funcAttrs, &$2->funcAttrs, - sizeof($2->funcAttrs)); - - FUNC_ARGS(funcType)=args; - FUNC_HASVARARGS(funcType)=hasVargs; + struct value *args; + unsigned hasVargs; + sym_link *funcType=$1->type; - // just to be sure - memset (&$2->funcAttrs, 0, - sizeof($2->funcAttrs)); + while (funcType && !IS_FUNC(funcType)) + funcType = funcType->next; + + if (!funcType) + werror (E_FUNC_ATTR); + else + { + args=FUNC_ARGS(funcType); + hasVargs=FUNC_HASVARARGS(funcType); + + memcpy (&funcType->funcAttrs, &$2->funcAttrs, + sizeof($2->funcAttrs)); + + FUNC_ARGS(funcType)=args; + FUNC_HASVARARGS(funcType)=hasVargs; + + // just to be sure + memset (&$2->funcAttrs, 0, + sizeof($2->funcAttrs)); - addDecl ($1,0,$2); + addDecl ($1,0,$2); + } } ; @@ -1078,30 +1114,30 @@ function_declarator2 | declarator2 '(' { NestLevel++ ; currBlockno++; } parameter_type_list ')' { + sym_link *funcType; addDecl ($1,FUNCTION,NULL) ; + + funcType = $1->type; + while (funcType && !IS_FUNC(funcType)) + funcType = funcType->next; - FUNC_HASVARARGS($1->type) = IS_VARG($4); - FUNC_ARGS($1->type) = reverseVal($4); + assert (funcType); + + FUNC_HASVARARGS(funcType) = IS_VARG($4); + FUNC_ARGS(funcType) = reverseVal($4); /* nest level was incremented to take care of the parms */ NestLevel-- ; currBlockno--; // if this was a pointer (to a function) - if (IS_PTR($1->type)) { - // move the args and hasVargs to the function - FUNC_ARGS($1->etype)=FUNC_ARGS($1->type); - FUNC_HASVARARGS($1->etype)=FUNC_HASVARARGS($1->type); - memset (&$1->type->funcAttrs, 0, - sizeof($1->type->funcAttrs)); - // remove the symbol args (if any) + if (!IS_FUNC($1->type)) cleanUpLevel(SymbolTab,NestLevel+1); - } $$ = $1; } - | declarator2 '(' parameter_identifier_list ')' + | declarator2 '(' identifier_list ')' { werror(E_OLD_STYLE,$1->name) ; /* assume it returns an int */ @@ -1192,11 +1228,6 @@ type_specifier_list } ; -parameter_identifier_list - : identifier_list - | identifier_list ',' ELIPSIS - ; - identifier_list : identifier | identifier_list ',' identifier @@ -1227,7 +1258,7 @@ parameter_declaration pointerTypes($2->type,$1); addDecl ($2,0,$1); for (loop=$2;loop;loop->_isparm=1,loop=loop->next); - addSymChain ($2); + addSymChain (&$2); $$ = symbolVal($2); ignoreTypedefType = 0; } @@ -1313,12 +1344,17 @@ abstract_declarator2 FUNC_HASVARARGS(p) = IS_VARG($4); FUNC_ARGS(p) = reverseVal($4); - + /* nest level was incremented to take care of the parms */ NestLevel-- ; currBlockno--; - p->next = $1; - $$ = p; + if (!$1) { + /* ((void (code *) (void)) 0) () */ + $1=newLink(DECLARATOR); + DCL_TYPE($1)=CPOINTER; + $$ = $1; + } + $1->next=p; // remove the symbol args (if any) cleanUpLevel(SymbolTab,NestLevel+1); @@ -1374,20 +1410,21 @@ critical_statement labeled_statement // : identifier ':' statement { $$ = createLabel($1,$3); } - : identifier ':' { $$ = createLabel($1,NULL); } - | CASE constant_expr ':' statement + : identifier ':' { $$ = createLabel($1,NULL); + $1->isitmp = 0; } + | CASE constant_expr ':' { if (STACK_EMPTY(swStk)) - $$ = createCase(NULL,$2,$4); + $$ = createCase(NULL,$2,NULL); else - $$ = createCase(STACK_PEEK(swStk),$2,$4); + $$ = createCase(STACK_PEEK(swStk),$2,NULL); } - | DEFAULT { $$ = newNode(DEFAULT,NULL,NULL); } ':' statement + | DEFAULT { $$ = newNode(DEFAULT,NULL,NULL); } ':' { if (STACK_EMPTY(swStk)) - $$ = createDefault(NULL,$2,$4); + $$ = createDefault(NULL,$2,NULL); else - $$ = createDefault(STACK_PEEK(swStk),$2,$4); + $$ = createDefault(STACK_PEEK(swStk),$2,NULL); } ; @@ -1406,10 +1443,10 @@ compound_statement : start_block end_block { $$ = createBlock(NULL,NULL); } | start_block statement_list end_block { $$ = createBlock(NULL,$2) ; } | start_block - declaration_list { addSymChain($2); } + declaration_list { addSymChain(&$2); } end_block { $$ = createBlock($2,NULL) ; } | start_block - declaration_list { addSymChain ($2); } + declaration_list { addSymChain (&$2); } statement_list end_block {$$ = createBlock($2,$4) ; } | error ';' { $$ = NULL ; }