X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/486240dc4c5d57b0afaddba60d87fe375112bed5..c9914e54f16c3315d47040f4cca2d3788228c504:/src/parse.y

diff --git a/src/parse.y b/src/parse.y
index 9764b67..f29f9de 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -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);
@@ -497,6 +498,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 +506,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 +547,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 +557,13 @@ 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)
+					print_error(FALSE,
+						    _("Self aliases needed when autolinking to a classwide member"),
+						    $<line>1);
+			} else
 				root = "self";
 
 			if(strcmp($<id>5, "link")==0) {
@@ -959,23 +967,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; }
 	;