X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCC.y;h=adf00af5e642856e55aa64e2b5e90b53d4e38d96;hb=52f3ed005225f4a63ead32f77178139243437562;hp=7539a6728ca5ea3c4dc80d56c965da785c758fc8;hpb=6829053c2534aed16a8141dcf0651a4d33932a37;p=fw%2Fsdcc

diff --git a/src/SDCC.y b/src/SDCC.y
index 7539a672..adf00af5 100644
--- a/src/SDCC.y
+++ b/src/SDCC.y
@@ -85,7 +85,7 @@ value *cenum = NULL  ;  /* current enumeration  type chain*/
 %token CHAR SHORT INT LONG SIGNED UNSIGNED FLOAT DOUBLE CONST VOLATILE VOID BIT
 %token STRUCT UNION ENUM ELIPSIS RANGE FAR
 %token CASE DEFAULT IF ELSE SWITCH WHILE DO FOR GOTO CONTINUE BREAK RETURN
-%token NAKED
+%token NAKED JAVANATIVE OVERLAY
 %token <yyinline> INLINEASM
 %token IFX ADDRESS_OF GET_VALUE_AT_ADDRESS SPIL UNSPIL GETHBIT
 %token BITWISEAND UNARYMINUS IPUSH IPOP PCALL  ENDFUNCTION JUMPTABLE
@@ -192,6 +192,14 @@ function_attributes
                         $$->class = SPECIFIER   ;
 			FUNC_ISNAKED($$)=1;
                      }
+   |  JAVANATIVE     {  $$ = newLink ();
+                        $$->class = SPECIFIER   ;
+			FUNC_ISJAVANATIVE($$)=1;
+                     }
+   |  OVERLAY        {  $$ = newLink ();
+                        $$->class = SPECIFIER   ;
+			FUNC_ISOVERLAY($$)=1;
+                     }
    |  NONBANKED      {$$ = newLink ();
                         $$->class = SPECIFIER   ;
                         FUNC_NONBANKED($$) = 1;
@@ -398,34 +406,34 @@ assignment_expr
 				     $$ = newNode($2,$1,$3);
 				     break;
 			     case MUL_ASSIGN:
-				     $$ = newNode('=',$1,newNode('*',copyAst($1),$3));
+				     $$ = newNode('=',$1,newNode('*',removeIncDecOps(copyAst($1)),$3));
 				     break;
 			     case DIV_ASSIGN:
-				     $$ = newNode('=',$1,newNode('/',copyAst($1),$3));
+				     $$ = newNode('=',$1,newNode('/',removeIncDecOps(copyAst($1)),$3));
 				     break;
 			     case MOD_ASSIGN:
-			     	     $$ = newNode('=',$1,newNode('%',copyAst($1),$3));
+			     	     $$ = newNode('=',$1,newNode('%',removeIncDecOps(copyAst($1)),$3));
 				     break;
 			     case ADD_ASSIGN:
-				     $$ = newNode('=',$1,newNode('+',copyAst($1),$3));
+				     $$ = newNode('=',$1,newNode('+',removeIncDecOps(copyAst($1)),$3));
 				     break;
 			     case SUB_ASSIGN:
-				     $$ = newNode('=',$1,newNode('-',copyAst($1),$3));
+				     $$ = newNode('=',$1,newNode('-',removeIncDecOps(copyAst($1)),$3));
 				     break;
 			     case LEFT_ASSIGN:
-				     $$ = newNode('=',$1,newNode(LEFT_OP,copyAst($1),$3));
+				     $$ = newNode('=',$1,newNode(LEFT_OP,removeIncDecOps(copyAst($1)),$3));
 				     break;
 			     case RIGHT_ASSIGN:
-				     $$ = newNode('=',$1,newNode(RIGHT_OP,copyAst($1),$3));
+				     $$ = newNode('=',$1,newNode(RIGHT_OP,removeIncDecOps(copyAst($1)),$3));
 				     break;
 			     case AND_ASSIGN:
-				     $$ = newNode('=',$1,newNode('&',copyAst($1),$3));
+				     $$ = newNode('=',$1,newNode('&',removeIncDecOps(copyAst($1)),$3));
 				     break;
 			     case XOR_ASSIGN:
-				     $$ = newNode('=',$1,newNode('^',copyAst($1),$3));
+				     $$ = newNode('=',$1,newNode('^',removeIncDecOps(copyAst($1)),$3));
 				     break;
 			     case OR_ASSIGN:
-				     $$ = newNode('=',$1,newNode('|',copyAst($1),$3));
+				     $$ = newNode('=',$1,newNode('|',removeIncDecOps(copyAst($1)),$3));
 				     break;
 			     default :
 				     $$ = NULL;
@@ -791,8 +799,8 @@ struct_declarator
 
 enum_specifier
    : ENUM            '{' enumerator_list '}' {
-                                                addSymChain ($3);
-                                                allocVariables(reverseSyms($3)) ;
+                                                //addSymChain ($3);
+                                                //allocVariables(reverseSyms($3)) ;
                                                 $$ = copyLinkChain(cenum->type);
                                              }
    | ENUM identifier '{' enumerator_list '}' {
@@ -806,8 +814,8 @@ enum_specifier
                                                    werror(E_DUPLICATE_TYPEDEF,csym->name);
 
                                                 addSym ( enumTab,$2,$2->name,$2->level,$2->block, 0);
-						addSymChain ($4);
-                                                allocVariables (reverseSyms($4));
+						//addSymChain ($4);
+                                                //allocVariables (reverseSyms($4));
                                                 $$ = copyLinkChain(cenum->type);
                                                 SPEC_SCLS(getSpec($$)) = 0 ;
                                              }
@@ -838,15 +846,17 @@ enumerator_list
    ;
 
 enumerator
-   : identifier opt_assign_expr  {
-                                    /* make the symbol one level up */
-                                    $1->level-- ;
-                                    $1->type = copyLinkChain($2->type); 
-                                    $1->etype= getSpec($1->type);
-				    SPEC_ENUM($1->etype) = 1;
-                                    $$ = $1 ;
-
-                                 }
+   : identifier opt_assign_expr  
+     {
+       /* make the symbol one level up */
+       $1->level-- ;
+       $1->type = copyLinkChain($2->type); 
+       $1->etype= getSpec($1->type);
+       SPEC_ENUM($1->etype) = 1;
+       $$ = $1 ;
+       // do this now, so we can use it for the next enums in the list
+       addSymChain($1);
+     }
    ;
 
 opt_assign_expr
@@ -974,7 +984,7 @@ pointer
          {
 	     $$ = $1 ;		
 	     $$->next = $2 ;
-	     DCL_TYPE($2)=GPOINTER;
+	     DCL_TYPE($2)=port->unqualified_pointer;
 	 }
    | unqualified_pointer type_specifier_list pointer
          {
@@ -1005,6 +1015,7 @@ pointer
 		 default:
 		   // this could be just "constant" 
 		   // werror(W_PTR_TYPE_INVALID);
+		     ;
 		 }
 	     }
 	     else 
@@ -1136,6 +1147,12 @@ abstract_declarator2
      // $1 must be a pointer to a function
      sym_link *p=newLink();
      DCL_TYPE(p) = FUNCTION;
+     if (!$1) {
+       // ((void (code *) ()) 0) ()
+       $1=newLink();
+       DCL_TYPE($1)=CPOINTER;
+       $$ = $1;
+     }
      $1->next=p;
    }
    | abstract_declarator2 '(' parameter_type_list ')' {
@@ -1146,9 +1163,16 @@ abstract_declarator2
        // $1 must be a pointer to a function
        sym_link *p=newLink();
        DCL_TYPE(p) = FUNCTION;
+       if (!$1) {
+	 // ((void (code *) (void)) 0) ()
+	 $1=newLink();
+	 DCL_TYPE($1)=CPOINTER;
+	 $$ = $1;
+       }
        $1->next=p;
      }
    }
+   ;
 
 initializer
    : assignment_expr                { $$ = newiList(INIT_NODE,$1); }
@@ -1290,6 +1314,7 @@ while : WHILE  {  /* create and push the continue , break & body labels */
 		  sprintf (lbuff,"_whilebody_%d",Lblnum++);
 		  $$ = newSymbol(lbuff,NestLevel);
                }
+   ;
 
 do : DO {  /* create and push the continue , break & body Labels */
            static int Lblnum = 0 ;
@@ -1304,6 +1329,8 @@ do : DO {  /* create and push the continue , break & body Labels */
 	   sprintf (lbuff,"_dobody_%d",Lblnum++);
 	   $$ = newSymbol (lbuff,NestLevel);	   
         }
+   ;
+
 for : FOR { /* create & push continue, break & body labels */
             static int Lblnum = 0 ;
          
@@ -1320,6 +1347,7 @@ for : FOR { /* create & push continue, break & body labels */
 	    sprintf (lbuff,"_forcond_%d",Lblnum++);
 	    STACK_PUSH(forStack,newSymbol(lbuff,NestLevel));
           }
+   ;
 
 iteration_statement  
    : while '(' expr ')'  statement