Release 1.0.4

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

diff --git a/src/parse.y b/src/parse.y
index 9764b677f3937773fecfba2d0949ef243e365270..ba4615b50c16a3f04f5c22a23c307be3d8799ceb 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -141,18 +141,18 @@ push_function(int scope, int method, char *oid, char *id,
           !(g_list_length(funcargs) == 1 &&
             g_list_length(gtktypes) == 2 &&
             strcmp(gtktypes->next->data, "NONE")==0)) {
-               print_error(TRUE, _("The number of GTK arguments and "
-                                   "function arguments for a signal "
-                                   "don't seem to match"), line_no);
+               error_print(GOB_WARN, line_no,
+                           _("The number of GTK arguments and "
+                             "function arguments for a signal "
+                             "don't seem to match"));
        }
        if(g_list_length(gtktypes) > 2) {
                GList *li;
                for(li = gtktypes->next; li; li = li->next) {
                        if(strcmp(li->data, "NONE")==0) {
-                               print_error(FALSE,
+                               error_print(GOB_ERROR, line_no,
                                            _("NONE can only appear in an "
-                                             "argument list by itself"),
-                                           line_no);
+                                             "argument list by itself"));
                        }
                }
        }
@@ -235,12 +235,13 @@ push_init_arg(char *name, int is_class)
 }
 
 static void
-push_self(char *id)
+push_self(char *id, gboolean constant)
 {
        Node *node;
        Node *type;
        GList *ch = NULL;
-       type = new_type(g_strdup(((Class *)class)->otype), g_strdup("*"), NULL);
+       type = new_type(g_strdup(((Class *)class)->otype),
+                       g_strdup(constant ? "const *" : "*"), 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);
@@ -251,7 +252,6 @@ static Variable *
 find_var_or_die(const char *id, int line)
 {
        GList *li;
-       char *s;
 
        for(li = class_nodes; li != NULL; li = li->next) {
                Variable *var;
@@ -263,8 +263,7 @@ find_var_or_die(const char *id, int line)
                        return var;
        }
 
-       s = g_strdup_printf(_("Variable %s not defined here"), id);
-       print_error(FALSE, s, line);
+       error_printf(GOB_ERROR, line, _("Variable %s not defined here"), id);
 
        g_assert_not_reached();
        return NULL;
@@ -497,6 +496,7 @@ argument:   ARGUMENT flags argtype TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
                                g_free($<id>3); g_free($<id>4);
                                g_free($<id>5); g_free($<id>8);
                                g_list_foreach($<list>2,(GFunc)g_free,NULL);
+                               g_list_free($<list>2);
                                g_string_free($<cbuf>10,TRUE);
                                g_string_free($<cbuf>7,TRUE);
                                yyerror(_("parse error"));
@@ -504,29 +504,30 @@ argument: ARGUMENT flags argtype TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
                        }
                                                }
        |       ARGUMENT flags argtype TOKEN TOKEN '{' CCODE ';' {
-                       if(strcmp($<id>5,"get")==0) {
+                       if(strcmp($<id>5, "get") == 0) {
                                Node *node;
                                Type *type = pop_type();
                                g_free($<id>5);
-                               node = new_argument($<id>3,type,$<list>2,$<id>4,
-                                                   ($<cbuf>7)->str,$<line>6,
-                                                   NULL,0, $<line>1);
-                               g_string_free($<cbuf>7,FALSE);
-                               class_nodes = g_list_append(class_nodes,node);
-                       } else if(strcmp($<id>5,"set")==0) {
+                               node = new_argument($<id>3, type, $<list>2, $<id>4,
+                                                   ($<cbuf>7)->str, $<line>6,
+                                                   NULL, 0, $<line>1);
+                               g_string_free($<cbuf>7, FALSE);
+                               class_nodes = g_list_append(class_nodes, node);
+                       } else if(strcmp($<id>5, "set") == 0) {
                                Node *node;
                                Type *type = pop_type();
                                g_free($<id>5);
-                               node = new_argument($<id>3,type,$<list>2,$<id>4,
-                                                   NULL,0,($<cbuf>7)->str,
+                               node = new_argument($<id>3, type, $<list>2, $<id>4,
+                                                   NULL, 0, ($<cbuf>7)->str,
                                                    $<line>6, $<line>1);
-                               g_string_free($<cbuf>7,FALSE);
-                               class_nodes = g_list_append(class_nodes,node);
+                               g_string_free($<cbuf>7, FALSE);
+                               class_nodes = g_list_append(class_nodes, node);
                        } else {
                                g_free($<id>5); g_free($<id>3);
                                g_free($<id>4);
-                               g_list_foreach($<list>2,(GFunc)g_free,NULL);
-                               g_string_free($<cbuf>7,TRUE);
+                               g_list_foreach($<list>2, (GFunc)g_free, NULL);
+                               g_list_free($<list>2);
+                               g_string_free($<cbuf>7, TRUE);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
@@ -544,6 +545,7 @@ argument:   ARGUMENT flags argtype TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
                                g_free($<id>5); g_free($<id>3);
                                g_free($<id>4);
                                g_list_foreach($<list>2,(GFunc)g_free,NULL);
+                               g_list_free($<list>2);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
@@ -553,9 +555,12 @@ argument:  ARGUMENT flags argtype TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
                        var = find_var_or_die($<id>4, $<line>1);
                        if(var->scope == PRIVATE_SCOPE)
                                root = "self->_priv";
-                       else if(var->scope == CLASS_SCOPE)
-                               root = "SELF_CLASS(GTK_OBJECT(self)->klass)";
-                       else
+                       else if(var->scope == CLASS_SCOPE) {
+                               root = "SELF_GET_CLASS(self)";
+                               if(no_self_alias)
+                                       error_print(GOB_ERROR, $<line>1,
+                                                   _("Self aliases needed when autolinking to a classwide member"));
+                       } else
                                root = "self";
 
                        if(strcmp($<id>5, "link")==0) {
@@ -959,23 +964,65 @@ funcargs: VOID                    { vararg = FALSE; has_self = FALSE; }
                        vararg = FALSE;
                        has_self = TRUE;
                        if(strcmp($<id>1,"self")==0)
-                               push_self($<id>1);
+                               push_self($<id>1, FALSE);
                        else {
                                g_free($<id>1);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
                                                }
+       |       TOKEN CONST {
+                       vararg = FALSE;
+                       has_self = TRUE;
+                       if(strcmp($<id>1,"self")==0)
+                               push_self($<id>1, TRUE);
+                       else {
+                               g_free($<id>1);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                               }
+       |       CONST TOKEN {
+                       vararg = FALSE;
+                       has_self = TRUE;
+                       if(strcmp($<id>2,"self")==0)
+                               push_self($<id>2, TRUE);
+                       else {
+                               g_free($<id>2);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                               }
        |       TOKEN ',' arglist       {
                        has_self = TRUE;
                        if(strcmp($<id>1,"self")==0)
-                               push_self($<id>1);
+                               push_self($<id>1, FALSE);
                        else {
                                g_free($<id>1);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
                                        }
+       |       TOKEN CONST ',' arglist {
+                       has_self = TRUE;
+                       if(strcmp($<id>1,"self")==0)
+                               push_self($<id>1, TRUE);
+                       else {
+                               g_free($<id>1);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                       }
+       |       CONST TOKEN ',' arglist {
+                       has_self = TRUE;
+                       if(strcmp($<id>2,"self")==0)
+                               push_self($<id>2, TRUE);
+                       else {
+                               g_free($<id>2);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                       }
        |       arglist                 { has_self = FALSE; }
        ;