X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/64034bc2613afefb289d1450411e69a0de4bce4e..a611f21fab136f64bbf979bd62b2fc6ecb62933c:/src/parse.y

diff --git a/src/parse.y b/src/parse.y
index 449ef3c..7d01a5d 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -104,6 +104,20 @@ push_function(int scope, char *oid, char *id, char *onerror,
 		type = (Type *)new_type(0,g_strdup("void"));
 	}
 	
+	/* a complicated and ugly test to figure out if we have
+	   the wrong number of types for a signal */
+	if((scope == SIGNAL_FIRST_METHOD ||
+	    scope == SIGNAL_LAST_METHOD ||
+	    scope == PRIVATE_SIGNAL_FIRST_METHOD ||
+	    scope == PRIVATE_SIGNAL_LAST_METHOD) &&
+	   g_list_length(gtktypes) != g_list_length(funcargs) &&
+	   !(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);
+	}
 	node = new_method(scope,type,oid,gtktypes,id,funcargs,
 			  onerror,cbuf,line_no,ccode_line,vararg);
 	gtktypes = NULL;
@@ -162,6 +176,7 @@ push_self(char *id)
 	GString *cbuf;
 	GList *list;
 	int line;
+	int sigtype;
 }
 
 %token CLASS FROM
@@ -384,6 +399,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 +462,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 +508,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,15 +538,11 @@ 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);
-				print_error(TRUE,_("Use of 'this' is "
-						   "depreciated, use 'self' "
-						   "instead"),line_no);
-			} else if(strcmp($<id>1,"self")==0)
+			if(strcmp($<id>1,"self")==0)
 				push_self($<id>1);
 			else {
 				g_free($<id>1);
@@ -527,12 +552,7 @@ funcargs:	VOID			{ has_self = FALSE; }
        					}
 	|	TOKEN ',' arglist	{
 			has_self = TRUE;
-			if(strcmp($<id>1,"this")==0) {
-				push_self($<id>1);
-				print_error(TRUE,_("Use of 'this' is "
-						   "depreciated, use 'self' "
-						   "instead"),line_no);
-			} else if(strcmp($<id>1,"self")==0)
+			if(strcmp($<id>1,"self")==0)
 				push_self($<id>1);
 			else {
 				g_free($<id>1);