X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCC.y;h=1196d705c150e0ba8aa2d3ccccfaf5e34f132d2c;hb=17475724ba3b307a3dd40764f224d4031666f6f2;hp=95f19b129f5fba708e23e8119df9df9ce44790e9;hpb=cbb3b0d63155a5866e6a2a877f7caa247cc9c0e8;p=fw%2Fsdcc

diff --git a/src/SDCC.y b/src/SDCC.y
index 95f19b12..1196d705 100644
--- a/src/SDCC.y
+++ b/src/SDCC.y
@@ -102,8 +102,7 @@ bool uselessDecl = TRUE;
 %token DUMMY_READ_VOLATILE ENDCRITICAL SWAP INLINE RESTRICT
 
 %type <yyint> Interrupt_storage
-%type <sym> identifier identifier_or_typename declarator declarator2 declarator3
-%type <sym> enumerator_list enumerator
+%type <sym> identifier declarator declarator2 declarator3 enumerator_list enumerator
 %type <sym> struct_declarator function_declarator function_declarator2
 %type <sym> struct_declarator_list struct_declaration struct_declaration_list
 %type <sym> declaration init_declarator_list init_declarator
@@ -521,14 +520,14 @@ declaration_specifiers
      else
        $$ = mergeSpec($1,$2, "type_specifier declaration_specifiers");
    }
-   | function_specifier				    { $$ = $1; }
+   | function_specifier                             { $$ = $1; }
    | function_specifier declaration_specifiers          { 
      /* if the decl $2 is not a specifier */
      /* find the spec and replace it      */
      if ( !IS_SPEC($2)) {
        sym_link *lnk = $2 ;
        while (lnk && !IS_SPEC(lnk->next))
-	 lnk = lnk->next;
+         lnk = lnk->next;
        lnk->next = mergeSpec($1,lnk->next, "function_specifier declaration_specifiers - skipped");
        $$ = $2 ;
      }
@@ -1116,23 +1115,32 @@ declarator2
          }
    | declarator3 '[' constant_expr ']'
          {
-            sym_link   *p ;
-                        value *tval;
+            sym_link *p;
+            value *tval;
+            int size;
 
-            tval = constExprValue($3,TRUE);
+            tval = constExprValue($3, TRUE);
             /* if it is not a constant then Error  */
             p = newLink (DECLARATOR);
-            DCL_TYPE(p) = ARRAY ;
-            if ( !tval || (SPEC_SCLS(tval->etype) != S_LITERAL)) {
-               werror(E_CONST_EXPECTED) ;
-               /* Assume a single item array to limit the cascade */
-               /* of additional errors. */
-               DCL_ELEM(p) = 1;
-            }
-            else {
-               DCL_ELEM(p) = (int) floatFromVal(tval) ;
-            }
-            addDecl($1,0,p);
+            DCL_TYPE(p) = ARRAY;
+
+            if (!tval || (SPEC_SCLS(tval->etype) != S_LITERAL))
+              {
+                werror(E_CONST_EXPECTED);
+                /* Assume a single item array to limit the cascade */
+                /* of additional errors. */
+                size = 1;
+              }
+            else
+              {
+                if ((size = (int)floatFromVal(tval)) < 0)
+                  {
+                    werror(E_NEGATIVE_ARRAY_SIZE, $1->name);
+                    size = 1;
+                  }
+              }
+            DCL_ELEM(p) = size;
+            addDecl($1, 0, p);
          }
    ;
 
@@ -1195,40 +1203,40 @@ pointer
          }
    | unqualified_pointer type_specifier_list pointer
          {
-	     $$ = $1 ;  	     
-	     if (IS_SPEC($2) && DCL_TYPE($3) == UPOINTER) {
-		 DCL_PTR_CONST($1) = SPEC_CONST($2);
-		 DCL_PTR_VOLATILE($1) = SPEC_VOLATILE($2);
-		 DCL_PTR_RESTRICT($1) = SPEC_RESTRICT($2);
-		 switch (SPEC_SCLS($2)) {
-		 case S_XDATA:
-		     DCL_TYPE($3) = FPOINTER;
-		     break;
-		 case S_IDATA:
-		     DCL_TYPE($3) = IPOINTER ;
-		     break;
-		 case S_PDATA:
-		     DCL_TYPE($3) = PPOINTER ;
-		     break;
-		 case S_DATA:
-		     DCL_TYPE($3) = POINTER ;
-		     break;
-		 case S_CODE:
-		     DCL_TYPE($3) = CPOINTER ;
-		     break;
-		 case S_EEPROM:
-		     DCL_TYPE($3) = EEPPOINTER;
-		     break;
-		 default:
-		   // this could be just "constant" 
-		   // werror(W_PTR_TYPE_INVALID);
-		     ;
-		 }
-	     }
-	     else 
-		 werror (W_PTR_TYPE_INVALID);
-	     $$->next = $3 ;
-	 }
+             $$ = $1 ;               
+             if (IS_SPEC($2) && DCL_TYPE($3) == UPOINTER) {
+                 DCL_PTR_CONST($1) = SPEC_CONST($2);
+                 DCL_PTR_VOLATILE($1) = SPEC_VOLATILE($2);
+                 DCL_PTR_RESTRICT($1) = SPEC_RESTRICT($2);
+                 switch (SPEC_SCLS($2)) {
+                 case S_XDATA:
+                     DCL_TYPE($3) = FPOINTER;
+                     break;
+                 case S_IDATA:
+                     DCL_TYPE($3) = IPOINTER ;
+                     break;
+                 case S_PDATA:
+                     DCL_TYPE($3) = PPOINTER ;
+                     break;
+                 case S_DATA:
+                     DCL_TYPE($3) = POINTER ;
+                     break;
+                 case S_CODE:
+                     DCL_TYPE($3) = CPOINTER ;
+                     break;
+                 case S_EEPROM:
+                     DCL_TYPE($3) = EEPPOINTER;
+                     break;
+                 default:
+                   // this could be just "constant" 
+                   // werror(W_PTR_TYPE_INVALID);
+                     ;
+                 }
+             }
+             else 
+                 werror (W_PTR_TYPE_INVALID);
+             $$->next = $3 ;
+         }
    ;
 
 unqualified_pointer
@@ -1718,17 +1726,4 @@ jump_statement
 identifier
    : IDENTIFIER   { $$ = newSymbol ($1,NestLevel) ; }
    ;
-
-identifier_or_typename
-    : identifier
-    | TYPE_NAME {
-        symbol *sym;
-        sym_link   *p  ;
-        sym = findSym(TypedefTab,NULL,$1) ;
-        $$ = p = copyLinkChain(sym->type);
-        SPEC_TYPEDEF(getSpec(p)) = 0;
-        ignoreTypedefType = 1;
-      }
-
 %%
-