Release 0.90.2

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

diff --git a/src/parse.y b/src/parse.y
index 449ef3c49e0bc7b1020641b4181d099afb4a9827..7648232b808c5eeea23a653c3aea2b7825840677 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -162,6 +162,7 @@ push_self(char *id)
        GString *cbuf;
        GList *list;
        int line;
+       int sigtype;
 }
 
 %token CLASS FROM
@@ -384,6 +385,50 @@ tspecifier:        ENUM                            {
 stars:         '*' stars                       { stars++; }
        |       '*'                             { stars++; }
        ;
+
+fullsigtype:   PRIVATE TOKEN sigtype   {
+                       if(strcmp($<id>2,"first")==0)
+                               $<sigtype>$ = PRIVATE_SIGNAL_FIRST_METHOD;
+                       else if(strcmp($<id>2,"last")==0)
+                               $<sigtype>$ = PRIVATE_SIGNAL_LAST_METHOD;
+                       else {
+                               yyerror(_("signal must be 'first' or 'last'"));
+                               g_free($<id>2);
+                               YYERROR;
+                       }
+                       g_free($<id>2);
+                                       }
+       |       TOKEN PRIVATE sigtype   {
+                       if(strcmp($<id>1,"first")==0)
+                               $<sigtype>$ = PRIVATE_SIGNAL_FIRST_METHOD;
+                       else if(strcmp($<id>1,"last")==0)
+                               $<sigtype>$ = PRIVATE_SIGNAL_LAST_METHOD;
+                       else {
+                               yyerror(_("signal must be 'first' or 'last'"));
+                               g_free($<id>1);
+                               YYERROR;
+                       }
+                       g_free($<id>1);
+                                       }
+       |       PRIVATE sigtype         {
+                       $<sigtype>$ = PRIVATE_SIGNAL_LAST_METHOD;
+                                       }
+       |       TOKEN sigtype           {
+                       if(strcmp($<id>1,"first")==0)
+                               $<sigtype>$ = SIGNAL_FIRST_METHOD;
+                       else if(strcmp($<id>1,"last")==0)
+                               $<sigtype>$ = SIGNAL_LAST_METHOD;
+                       else {
+                               yyerror(_("signal must be 'first' or 'last'"));
+                               g_free($<id>1);
+                               YYERROR;
+                       }
+                       g_free($<id>1);
+                                       }
+       |       sigtype                 {
+                       $<sigtype>$ = SIGNAL_LAST_METHOD;
+                                       }
+       ;
        
 sigtype:       TOKEN '(' tokenlist ')'         {
                        gtktypes = g_list_prepend(gtktypes,$<id>1);
@@ -403,36 +448,24 @@ codenocode:       '{' CCODE                       { $<cbuf>$=$<cbuf>2; }
        ;
 
 /*here CCODE will include the ending '}' */
-method:                SIGNAL TOKEN sigtype type TOKEN '(' funcargs ')' onerror codenocode {
-                       int sigtype = SIGNAL_LAST_METHOD;
-                       if(strcmp($<id>2,"first")==0)
-                               sigtype = SIGNAL_FIRST_METHOD;
-                       else if(strcmp($<id>2,"last")==0)
-                               sigtype = SIGNAL_LAST_METHOD;
-                       else {
-                               yyerror(_("signal must be 'first' or 'last'"));
-                               g_free($<id>2);
-                               YYERROR;
-                       }
-                       g_free($<id>2);
-
+method:                SIGNAL fullsigtype type TOKEN '(' funcargs ')' onerror codenocode {
                        if(!has_self) {
                                yyerror(_("signal without 'self' as "
                                          "first parameter"));
                                YYERROR;
                        }
-                       push_function(sigtype,NULL,
-                                     $<id>5, $<id>9, $<cbuf>10,$<line>1,
+                       push_function($<sigtype>2,NULL,
+                                     $<id>4, $<id>8, $<cbuf>9,$<line>1,
                                      ccode_line,vararg);
                                                                        }
-       |       SIGNAL sigtype type TOKEN '(' funcargs ')' onerror codenocode   {
+       |       VIRTUAL PRIVATE type TOKEN '(' funcargs ')' onerror codenocode  {
                        if(!has_self) {
-                               yyerror(_("signal without 'self' as "
+                               yyerror(_("virtual method without 'self' as "
                                          "first parameter"));
                                YYERROR;
                        }
-                       push_function(SIGNAL_LAST_METHOD, NULL,
-                                     $<id>4, $<id>8, $<cbuf>9,$<line>1,
+                       push_function(PRIVATE_VIRTUAL_METHOD, NULL, $<id>4,
+                                     $<id>8, $<cbuf>9,$<line>1,
                                      ccode_line,vararg);
                                                                        }
        |       VIRTUAL type TOKEN '(' funcargs ')' onerror codenocode  {
@@ -461,35 +494,17 @@ method:           SIGNAL TOKEN sigtype type TOKEN '(' funcargs ')' onerror codenocode {
                                      $<id>7, $<cbuf>9,$<line>1,$<line>8,
                                      vararg);
                                                                }
-       |       TOKEN '(' TOKEN ')' ';'         {
-                       if(strcmp($<id>1,"init")==0) {
-                               push_init_arg($<id>3,FALSE);
-                               push_function(INIT_METHOD, NULL, $<id>1, 
-                                             NULL, NULL,$<line>2,0,
-                                             FALSE);
-                       } else if(strcmp($<id>1,"class_init")==0) {
-                               push_init_arg($<id>3,TRUE);
-                               push_function(CLASS_INIT_METHOD, NULL,
-                                             $<id>1, NULL, NULL,$<line>2,0,
-                                             FALSE);
-                       } else {
-                               g_free($<id>1);
-                               g_free($<id>3);
-                               yyerror(_("parse error"));
-                               YYERROR;
-                       }
-                                               }
-       |       TOKEN '(' TOKEN ')' '{' CCODE   {
+       |       TOKEN '(' TOKEN ')' codenocode  {
                        if(strcmp($<id>1,"init")==0) {
                                push_init_arg($<id>3,FALSE);
                                push_function(INIT_METHOD, NULL,
-                                             $<id>1, NULL, $<cbuf>6,$<line>2,
-                                             $<line>5,FALSE);
+                                             $<id>1, NULL, $<cbuf>5,$<line>2,
+                                             ccode_line,FALSE);
                        } else if(strcmp($<id>1,"class_init")==0) {
                                push_init_arg($<id>3,TRUE);
                                push_function(CLASS_INIT_METHOD, NULL, 
-                                             $<id>1, NULL, $<cbuf>6,$<line>2,
-                                             $<line>5,FALSE);
+                                             $<id>1, NULL, $<cbuf>5,$<line>2,
+                                             ccode_line,FALSE);
                        } else {
                                g_free($<id>1);
                                g_free($<id>3);
@@ -509,8 +524,9 @@ onerror:    ONERROR numtok          { $<id>$ = $<id>2; }
        |                               { $<id>$ = NULL; }
        ;
        
-funcargs:      VOID                    { has_self = FALSE; }
+funcargs:      VOID                    { vararg = FALSE; has_self = FALSE; }
        |       TOKEN                   {
+                       vararg = FALSE;
                        has_self = TRUE;
                        if(strcmp($<id>1,"this")==0) {
                                push_self($<id>1);