X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/daead564b9592e78d418deb56a211cd5ea399f76..2310330e7d4d724bf6641339836be8523f95c916:/src/parse.y

diff --git a/src/parse.y b/src/parse.y
index 6e17c96..46fdf6e 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -42,6 +42,7 @@ static int stars = 0;
 static GList *funcargs = NULL;
 static GList *checks = NULL;
 static int has_self = FALSE;
+static int vararg = FALSE;
 
 static GList *gtktypes = NULL;
 
@@ -91,7 +92,7 @@ push_variable(char *name, int scope, int line_no)
 
 static void
 push_function(int scope, char *oid, char *id, char *onerror,
-	      GString *cbuf,int line_no, int ccode_line)
+	      GString *cbuf,int line_no, int ccode_line, int vararg)
 {
 	Node *node;
 	Type *type;
@@ -104,7 +105,7 @@ push_function(int scope, char *oid, char *id, char *onerror,
 	}
 	
 	node = new_method(scope,type,oid,gtktypes,id,funcargs,
-			  onerror,cbuf,line_no,ccode_line);
+			  onerror,cbuf,line_no,ccode_line,vararg);
 	gtktypes = NULL;
 	funcargs = NULL;
 
@@ -161,11 +162,12 @@ push_self(char *id)
 	GString *cbuf;
 	GList *list;
 	int line;
+	int sigtype;
 }
 
 %token CLASS FROM
-%token VOID STRUCT UNION ENUM SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR
-%token FIRST LAST
+%token CONST VOID STRUCT UNION ENUM THREEDOTS
+%token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR
 %token ONERROR
 
 %token <id> TOKEN NUMBER TYPETOKEN
@@ -293,18 +295,27 @@ flaglist:	TOKEN '|' flaglist		{
 	;
 
 
-type:		type1		 		{
+type:		type1		 		{ ; }
+	|	CONST type1			{
+			Type *type = typestack->data;
+			char *oldname = type->name;
+			type->name = g_strconcat("const ",oldname,NULL);
+			g_free(oldname);
+						}
+	;
+
+type1:		type2		 		{
 			Node *node = new_type(0,$<id>1);
 			typestack = g_list_prepend(typestack,node);
 						}
-	|	type1 stars 			{
+	|	type2 stars 			{
 			Node *node = new_type(stars,$<id>1);
 			stars = 0;
 			typestack = g_list_prepend(typestack,node);
 						}
 	;
 
-type1:		UNSIGNED integer		{
+type2:		UNSIGNED integer		{
 			$<id>$ = g_strconcat("unsigned ",$<id>2,NULL);
 						}
 	|	SIGNED integer			{
@@ -374,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);
@@ -393,35 +448,25 @@ 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,ccode_line);
+			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,ccode_line);
+			push_function(PRIVATE_VIRTUAL_METHOD, NULL, $<id>4,
+				      $<id>8, $<cbuf>9,$<line>1,
+				      ccode_line,vararg);
 									}
 	|	VIRTUAL type TOKEN '(' funcargs ')' onerror codenocode	{
 			if(!has_self) {
@@ -430,47 +475,36 @@ method:		SIGNAL TOKEN sigtype type TOKEN '(' funcargs ')' onerror codenocode {
 				YYERROR;
 			}
 			push_function(VIRTUAL_METHOD, NULL, $<id>3,
-				      $<id>7, $<cbuf>8,$<line>1,ccode_line);
+				      $<id>7, $<cbuf>8,$<line>1,
+				      ccode_line,vararg);
 									}
 	|	OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' onerror '{' CCODE	{
 			push_function(OVERRIDE_METHOD, $<id>3,
-				      $<id>6, $<id>10, $<cbuf>12,$<line>1,$<line>11);
+				      $<id>6, $<id>10, $<cbuf>12,
+				      $<line>1,$<line>11,
+				      vararg);
 									}
 	|	PUBLIC type TOKEN '(' funcargs ')' onerror '{' CCODE	{
 			push_function(PUBLIC_SCOPE, NULL, $<id>3,
-				      $<id>7, $<cbuf>9,$<line>1,$<line>8);
+				      $<id>7, $<cbuf>9,$<line>1,$<line>8,
+				      vararg);
 								}
 	|	PRIVATE type TOKEN '(' funcargs ')' onerror '{' CCODE	{
 			push_function(PRIVATE_SCOPE, NULL, $<id>3,
-				      $<id>7, $<cbuf>9,$<line>1,$<line>8);
+				      $<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);
-			} 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);
-			} 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);
+					      $<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);
+					      $<id>1, NULL, $<cbuf>5,$<line>2,
+					      ccode_line,FALSE);
 			} else {
 				g_free($<id>1);
 				g_free($<id>3);
@@ -490,17 +524,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);
@@ -510,12 +538,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);
@@ -525,8 +548,12 @@ funcargs:	VOID			{ has_self = FALSE; }
 					}
 	|	arglist			{ has_self = FALSE; }
 	;
+
+arglist:	arglist1 ',' THREEDOTS	{ vararg = TRUE; }
+	|	arglist1		{ vararg = FALSE; }
+	;
 	
-arglist:	arglist ',' arg		{ ; }
+arglist1:	arglist1 ',' arg	{ ; }
 	|	arg			{ ; }
 	;