Release 0.91.1

[gob-dx.git] / src / parse.y

diff --git a/src/parse.y b/src/parse.y
index 7d01a5df5b0bd07ed5c1089f30086dab4c45aa7c..b5d9f104f3018ced3241b370caff9817b87f74b4 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -80,11 +80,13 @@ yyerror(char *str)
 }
 
 static void
-push_variable(char *name, int scope, int line_no)
+push_variable(char *name, int scope, int line_no, char *postfix)
 {
        Node *var;
        Type *type = typestack->data;
        typestack = g_list_remove(typestack,typestack->data);
+
+       type->postfix = postfix;
        
        var = new_variable(scope,type,name,line_no);
        class_nodes = g_list_append(class_nodes, var);
@@ -101,7 +103,7 @@ push_function(int scope, char *oid, char *id, char *onerror,
                type = typestack->data;
                typestack = g_list_remove(typestack,typestack->data);
        } else {
-               type = (Type *)new_type(0,g_strdup("void"));
+               type = (Type *)new_type(0,g_strdup("void"),NULL);
        }
        
        /* a complicated and ugly test to figure out if we have
@@ -127,11 +129,13 @@ push_function(int scope, char *oid, char *id, char *onerror,
 }
 
 static void
-push_funcarg(char *name)
+push_funcarg(char *name, char *postfix)
 {
        Node *node;
        Type *type = typestack->data;
        typestack = g_list_remove(typestack,typestack->data);
+
+       type->postfix = postfix;
        
        node = new_funcarg(type,name,checks);
        checks = NULL;
@@ -151,7 +155,7 @@ push_init_arg(char *name, int is_class)
        else
                tn = g_strdup(((Class *)class)->otype);
 
-       type = new_type(1,tn);
+       type = new_type(1,tn,NULL);
        node = new_funcarg((Type *)type,name,NULL);
        funcargs = g_list_prepend(funcargs, node);
 }
@@ -162,7 +166,7 @@ push_self(char *id)
        Node *node;
        Node *type;
        GList *ch = NULL;
-       type = new_type(1,g_strdup(((Class *)class)->otype));
+       type = new_type(1,g_strdup(((Class *)class)->otype),NULL);
        ch = g_list_append(ch,new_check(NULL_CHECK,NULL));
        ch = g_list_append(ch,new_check(TYPE_CHECK,NULL));
        node = new_funcarg((Type *)type,id,ch);
@@ -184,7 +188,7 @@ push_self(char *id)
 %token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR
 %token ONERROR
 
-%token <id> TOKEN NUMBER TYPETOKEN
+%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM
 %token <cbuf> CCODE HCODE
 %token <line> PUBLIC PRIVATE ARGUMENT VIRTUAL SIGNAL OVERRIDE
 
@@ -235,11 +239,17 @@ classcode:        classcode method                { ; }
        ;
 
 variable:      PUBLIC type TOKEN ';'           {
-                       push_variable($<id>3,PUBLIC_SCOPE,$<line>1);
+                       push_variable($<id>3,PUBLIC_SCOPE,$<line>1,NULL);
                                                }
-       |       PRIVATE type TOKEN ';'  {
-                       push_variable($<id>3,PRIVATE_SCOPE,$<line>1);
+       |       PUBLIC type TOKEN ARRAY_DIM ';' {
+                       push_variable($<id>3,PUBLIC_SCOPE,$<line>1,$<id>4);
                                                }
+       |       PRIVATE type TOKEN ';'          {
+                       push_variable($<id>3,PRIVATE_SCOPE,$<line>1,NULL);
+                                               }
+       |       PRIVATE type TOKEN ARRAY_DIM ';' {
+                       push_variable($<id>3,PRIVATE_SCOPE,$<line>1,$<id>4);
+                                                }
        ;
 argument:      ARGUMENT argflags TOKEN TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
                        if(strcmp($<id>5,"get")==0 &&
@@ -319,11 +329,11 @@ type:             type1                           { ; }
        ;
 
 type1:         type2                           {
-                       Node *node = new_type(0,$<id>1);
+                       Node *node = new_type(0,$<id>1,NULL);
                        typestack = g_list_prepend(typestack,node);
                                                }
        |       type2 stars                     {
-                       Node *node = new_type(stars,$<id>1);
+                       Node *node = new_type(stars,$<id>1,NULL);
                        stars = 0;
                        typestack = g_list_prepend(typestack,node);
                                                }
@@ -572,7 +582,10 @@ arglist1:  arglist1 ',' arg        { ; }
        ;
 
 arg:           type TOKEN                                      {
-                       push_funcarg($<id>2);
+                       push_funcarg($<id>2,NULL);
+                                                               }
+       |       type TOKEN ARRAY_DIM                            {
+                       push_funcarg($<id>2,$<id>3);
                                                                }
        |       type TOKEN '(' TOKEN checklist ')'              {
                        if(strcmp($<id>4,"check")!=0) {
@@ -580,7 +593,15 @@ arg:               type TOKEN                                      {
                                YYERROR;
                        }
                        g_free($<id>4);
-                       push_funcarg($<id>2);
+                       push_funcarg($<id>2,NULL);
+                                                               }
+       |       type TOKEN ARRAY_DIM '(' TOKEN checklist ')'    {
+                       if(strcmp($<id>5,"check")!=0) {
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       g_free($<id>5);
+                       push_funcarg($<id>2,$<id>3);
                                                                }
        ;