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

diff --git a/src/parse.y b/src/parse.y
index 77e5692..46fdf6e 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include "tree.h"
+#include "main.h"
 
 #define _(x) (x)
 	
@@ -40,7 +41,8 @@ static GList *typestack = NULL;
 static int stars = 0;
 static GList *funcargs = NULL;
 static GList *checks = NULL;
-static int has_this = FALSE;
+static int has_self = FALSE;
+static int vararg = FALSE;
 
 static GList *gtktypes = NULL;
 
@@ -78,19 +80,19 @@ yyerror(char *str)
 }
 
 static void
-push_variable(char *name, int scope)
+push_variable(char *name, int scope, int line_no)
 {
 	Node *var;
 	Type *type = typestack->data;
 	typestack = g_list_remove(typestack,typestack->data);
 	
-	var = new_variable(scope,type,name);
+	var = new_variable(scope,type,name,line_no);
 	class_nodes = g_list_append(class_nodes, var);
 }
 
 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;
@@ -103,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;
 
@@ -141,7 +143,7 @@ push_init_arg(char *name, int is_class)
 }
 
 static void
-push_this(char *this)
+push_self(char *id)
 {
 	Node *node;
 	Node *type;
@@ -149,7 +151,7 @@ push_this(char *this)
 	type = new_type(1,g_strdup(((Class *)class)->otype));
 	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,this,ch);
+	node = new_funcarg((Type *)type,id,ch);
 	funcargs = g_list_prepend(funcargs, node);
 }
 
@@ -160,11 +162,12 @@ push_this(char *this)
 	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
@@ -218,10 +221,10 @@ classcode:	classcode method		{ ; }
 	;
 
 variable:	PUBLIC type TOKEN ';'		{
-			push_variable($<id>3,PUBLIC_SCOPE);
+			push_variable($<id>3,PUBLIC_SCOPE,$<line>1);
 						}
 	|	PRIVATE type TOKEN ';'	{
-			push_variable($<id>3,PRIVATE_SCOPE);
+			push_variable($<id>3,PRIVATE_SCOPE,$<line>1);
 						}
 	;
 argument:	ARGUMENT argflags TOKEN TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
@@ -231,7 +234,8 @@ argument:	ARGUMENT argflags TOKEN TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
 				g_free($<id>5); g_free($<id>8);
 				node = new_argument($<id>3,$<list>2,$<id>4,
 						    $<cbuf>7,$<line>6,
-						    $<cbuf>10,$<line>9);
+						    $<cbuf>10,$<line>9,
+						    $<line>1);
 				class_nodes = g_list_append(class_nodes,node);
 			} else if(strcmp($<id>5,"set")==0 &&
 				strcmp($<id>8,"get")==0) {
@@ -239,7 +243,8 @@ argument:	ARGUMENT argflags TOKEN TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
 				g_free($<id>5); g_free($<id>8);
 				node = new_argument($<id>3,$<list>2,$<id>4,
 						    $<cbuf>10,$<line>9,
-						    $<cbuf>7,$<line>6);
+						    $<cbuf>7,$<line>6,
+						    $<line>1);
 				class_nodes = g_list_append(class_nodes,node);
 			} else {
 				g_free($<id>3); g_free($<id>4);
@@ -256,13 +261,15 @@ argument:	ARGUMENT argflags TOKEN TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
 				Node *node;
 				g_free($<id>5);
 				node = new_argument($<id>3,$<list>2,$<id>4,
-						    $<cbuf>7,$<line>6,NULL,0);
+						    $<cbuf>7,$<line>6,NULL,0,
+						    $<line>1);
 				class_nodes = g_list_append(class_nodes,node);
 			} else if(strcmp($<id>5,"set")==0) {
 				Node *node;
 				g_free($<id>5);
 				node = new_argument($<id>3,$<list>2,$<id>4,
-						    NULL,0,$<cbuf>7,$<line>6);
+						    NULL,0,$<cbuf>7,$<line>6,
+						    $<line>1);
 				class_nodes = g_list_append(class_nodes,node);
 			} else {
 				g_free($<id>5); g_free($<id>3);
@@ -288,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			{
@@ -369,127 +385,126 @@ tspecifier:	ENUM				{
 stars:		'*' stars			{ stars++; }
 	|	'*'				{ stars++; }
 	;
-	
-sigtype:	TOKEN '(' tokenlist ')'		{
-			gtktypes = g_list_prepend(gtktypes,$<id>1);
-						}
-	;
 
-tokenlist:	tokenlist ',' TOKEN 		{
-			gtktypes = g_list_append(gtktypes,$<id>3);
-						}
-	|	TOKEN				{ 
-			gtktypes = g_list_append(gtktypes,$<id>1);
-       						}
-	;
-
-/*here CCODE will include the ending '}' */
-method:		SIGNAL TOKEN sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE {
-			int sigtype = SIGNAL_LAST_METHOD;
+fullsigtype:	PRIVATE TOKEN sigtype	{
 			if(strcmp($<id>2,"first")==0)
-				sigtype = SIGNAL_FIRST_METHOD;
+				$<sigtype>$ = PRIVATE_SIGNAL_FIRST_METHOD;
 			else if(strcmp($<id>2,"last")==0)
-				sigtype = SIGNAL_LAST_METHOD;
+				$<sigtype>$ = PRIVATE_SIGNAL_LAST_METHOD;
 			else {
 				yyerror(_("signal must be 'first' or 'last'"));
 				g_free($<id>2);
 				YYERROR;
 			}
 			g_free($<id>2);
-
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
-					  "first parameter"));
+					}
+	|	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;
 			}
-			push_function(sigtype,NULL,
-				      $<id>5, $<id>9, $<cbuf>11,$<line>1,$<line>10);
-									}
-	|	SIGNAL TOKEN sigtype type TOKEN '(' funcargs ')' onerror ';'	{
-			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;
+			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>2);
+				g_free($<id>1);
 				YYERROR;
 			}
-			g_free($<id>2);
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
+			g_free($<id>1);
+					}
+	|	sigtype			{
+			$<sigtype>$ = SIGNAL_LAST_METHOD;
+					}
+	;
+	
+sigtype:	TOKEN '(' tokenlist ')'		{
+			gtktypes = g_list_prepend(gtktypes,$<id>1);
+						}
+	;
+
+tokenlist:	tokenlist ',' TOKEN 		{
+			gtktypes = g_list_append(gtktypes,$<id>3);
+						}
+	|	TOKEN				{ 
+			gtktypes = g_list_append(gtktypes,$<id>1);
+       						}
+	;
+
+codenocode:	'{' CCODE			{ $<cbuf>$=$<cbuf>2; }
+	|	';'				{ $<cbuf>$ = NULL; }
+	;
+
+/*here CCODE will include the ending '}' */
+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, NULL,$<line>1,0);
+			push_function($<sigtype>2,NULL,
+				      $<id>4, $<id>8, $<cbuf>9,$<line>1,
+				      ccode_line,vararg);
 									}
-	|	SIGNAL sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE	{
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
+	|	VIRTUAL PRIVATE type TOKEN '(' funcargs ')' onerror codenocode	{
+			if(!has_self) {
+				yyerror(_("virtual method without 'self' as "
 					  "first parameter"));
 				YYERROR;
 			}
-			push_function(SIGNAL_LAST_METHOD, NULL,
-				      $<id>4, $<id>8, $<cbuf>10,$<line>1,$<line>9);
+			push_function(PRIVATE_VIRTUAL_METHOD, NULL, $<id>4,
+				      $<id>8, $<cbuf>9,$<line>1,
+				      ccode_line,vararg);
 									}
-	|	SIGNAL sigtype type TOKEN '(' funcargs ')' onerror ';'		{
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
+	|	VIRTUAL type TOKEN '(' funcargs ')' onerror codenocode	{
+			if(!has_self) {
+				yyerror(_("virtual method without 'self' as "
 					  "first parameter"));
 				YYERROR;
 			}
-			push_function(SIGNAL_LAST_METHOD, NULL, $<id>4,
-				      $<id>8, NULL,$<line>1,0);
-									}
-	|	VIRTUAL type TOKEN '(' funcargs ')' onerror '{' CCODE	{
-			push_function(VIRTUAL_METHOD, NULL, $<id>3,
-				      $<id>7, $<cbuf>9,$<line>1,$<line>8);
-									}
-	|	VIRTUAL type TOKEN '(' funcargs ')' onerror ';'		{
 			push_function(VIRTUAL_METHOD, NULL, $<id>3,
-				      $<id>7, NULL,$<line>1,0);
+				      $<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);
@@ -509,13 +524,12 @@ onerror:	ONERROR numtok		{ $<id>$ = $<id>2; }
 	|				{ $<id>$ = NULL; }
 	;
 	
-	
-
-funcargs:	VOID			{ has_this = FALSE; }
+funcargs:	VOID			{ vararg = FALSE; has_self = FALSE; }
 	|	TOKEN			{
-			has_this = TRUE;
-			if(strcmp($<id>1,"this")==0)
-				push_this($<id>1);
+			vararg = FALSE;
+			has_self = TRUE;
+			if(strcmp($<id>1,"self")==0)
+				push_self($<id>1);
 			else {
 				g_free($<id>1);
 				yyerror(_("parse error"));
@@ -523,19 +537,23 @@ funcargs:	VOID			{ has_this = FALSE; }
 			}
        					}
 	|	TOKEN ',' arglist	{
-			has_this = TRUE;
-			if(strcmp($<id>1,"this")==0)
-				push_this($<id>1);
+			has_self = TRUE;
+			if(strcmp($<id>1,"self")==0)
+				push_self($<id>1);
 			else {
 				g_free($<id>1);
 				yyerror(_("parse error"));
 				YYERROR;
 			}
 					}
-	|	arglist			{ has_this = FALSE; }
+	|	arglist			{ has_self = FALSE; }
+	;
+
+arglist:	arglist1 ',' THREEDOTS	{ vararg = TRUE; }
+	|	arglist1		{ vararg = FALSE; }
 	;
 	
-arglist:	arglist ',' arg		{ ; }
+arglist1:	arglist1 ',' arg	{ ; }
 	|	arg			{ ; }
 	;