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

diff --git a/src/parse.y b/src/parse.y
index 9ce92de..6e17c96 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -20,11 +20,13 @@
  */
 %{
 
+#include "config.h"
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "tree.h"
+#include "main.h"
 
 #define _(x) (x)
 	
@@ -39,13 +41,14 @@ 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 GList *gtktypes = NULL;
 
 void free(void *ptr);
 int yylex(void);
 
+extern int ccode_line;
 extern int line_no;
 
 extern char *yytext;
@@ -76,19 +79,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)
+	      GString *cbuf,int line_no, int ccode_line)
 {
 	Node *node;
 	Type *type;
@@ -101,7 +104,7 @@ push_function(int scope, char *oid, char *id, char *onerror,
 	}
 	
 	node = new_method(scope,type,oid,gtktypes,id,funcargs,
-			  onerror,cbuf,line_no);
+			  onerror,cbuf,line_no,ccode_line);
 	gtktypes = NULL;
 	funcargs = NULL;
 
@@ -139,7 +142,7 @@ push_init_arg(char *name, int is_class)
 }
 
 static void
-push_this(char *this)
+push_self(char *id)
 {
 	Node *node;
 	Node *type;
@@ -147,7 +150,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);
 }
 
@@ -163,7 +166,7 @@ push_this(char *this)
 %token CLASS FROM
 %token VOID STRUCT UNION ENUM SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR
 %token FIRST LAST
-%token CHECK CNULL TYPE ONERROR
+%token ONERROR
 
 %token <id> TOKEN NUMBER TYPETOKEN
 %token <cbuf> CCODE HCODE
@@ -178,19 +181,19 @@ prog:		ccodes class ccodes	{ ; }
 	;
 
 ccodes:		ccodes CCODE		{
-			Node *node = new_ccode(FALSE,$<cbuf>2);
+			Node *node = new_ccode(FALSE,$<cbuf>2,ccode_line);
 			nodes = g_list_append(nodes,node);
 					}
 	|	ccodes HCODE		{
-			Node *node = new_ccode(TRUE,$<cbuf>2);
+			Node *node = new_ccode(TRUE,$<cbuf>2,ccode_line);
 			nodes = g_list_append(nodes,node);
 					}
 	|	CCODE			{
-			Node *node = new_ccode(FALSE,$<cbuf>1);
+			Node *node = new_ccode(FALSE,$<cbuf>1,ccode_line);
 			nodes = g_list_append(nodes,node);
 					}
 	|	HCODE			{
-			Node *node = new_ccode(TRUE,$<cbuf>1);
+			Node *node = new_ccode(TRUE,$<cbuf>1,ccode_line);
 			nodes = g_list_append(nodes,node);
 					}
 	;
@@ -216,10 +219,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 ';' {
@@ -228,14 +231,18 @@ argument:	ARGUMENT argflags TOKEN TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
 				Node *node;
 				g_free($<id>5); g_free($<id>8);
 				node = new_argument($<id>3,$<list>2,$<id>4,
-						    $<cbuf>7,$<cbuf>10);
+						    $<cbuf>7,$<line>6,
+						    $<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) {
 				Node *node;
 				g_free($<id>5); g_free($<id>8);
 				node = new_argument($<id>3,$<list>2,$<id>4,
-						    $<cbuf>10,$<cbuf>7);
+						    $<cbuf>10,$<line>9,
+						    $<cbuf>7,$<line>6,
+						    $<line>1);
 				class_nodes = g_list_append(class_nodes,node);
 			} else {
 				g_free($<id>3); g_free($<id>4);
@@ -252,13 +259,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,NULL);
+						    $<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,$<cbuf>7);
+						    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);
@@ -310,6 +319,9 @@ type1:		UNSIGNED integer		{
 	|	SIGNED CHAR			{
 			$<id>$ = g_strdup("signed char");
 						}
+	|	CHAR				{
+			$<id>$ = g_strdup("char");
+						}
 	|	DOUBLE				{
 			$<id>$ = g_strdup("double");
 						}
@@ -376,90 +388,71 @@ tokenlist:	tokenlist ',' TOKEN 		{
        						}
 	;
 
+codenocode:	'{' CCODE			{ $<cbuf>$=$<cbuf>2; }
+	|	';'				{ $<cbuf>$ = NULL; }
+	;
+
 /*here CCODE will include the ending '}' */
-method:		SIGNAL LAST sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE {
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
-					  "first parameter"));
-				YYERROR;
-			}
-			push_function(SIGNAL_LAST_METHOD,NULL,
-				      $<id>5, $<id>9, $<cbuf>11,$<line>1);
-									}
-	|	SIGNAL LAST sigtype type TOKEN '(' funcargs ')' onerror ';'	{
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
-					  "first parameter"));
-				YYERROR;
-			}
-			push_function(SIGNAL_LAST_METHOD, NULL,
-				      $<id>5, $<id>9, NULL,$<line>1);
-									}
-	|	SIGNAL FIRST sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE {
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
-					  "first parameter"));
+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;
 			}
-			push_function(SIGNAL_FIRST_METHOD, NULL,
-				      $<id>5, $<id>9, $<cbuf>11,$<line>1);
-									}
-	|	SIGNAL FIRST sigtype type TOKEN '(' funcargs ')' onerror ';'	{
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
+			g_free($<id>2);
+
+			if(!has_self) {
+				yyerror(_("signal without 'self' as "
 					  "first parameter"));
 				YYERROR;
 			}
-			push_function(SIGNAL_FIRST_METHOD, NULL, $<id>5,
-				      $<id>9, NULL,$<line>1);
+			push_function(sigtype,NULL,
+				      $<id>5, $<id>9, $<cbuf>10,$<line>1,ccode_line);
 									}
-	|	SIGNAL sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE	{
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
+	|	SIGNAL sigtype type TOKEN '(' funcargs ')' onerror codenocode	{
+			if(!has_self) {
+				yyerror(_("signal without 'self' as "
 					  "first parameter"));
 				YYERROR;
 			}
 			push_function(SIGNAL_LAST_METHOD, NULL,
-				      $<id>4, $<id>8, $<cbuf>10,$<line>1);
+				      $<id>4, $<id>8, $<cbuf>9,$<line>1,ccode_line);
 									}
-	|	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);
-									}
-	|	VIRTUAL type TOKEN '(' funcargs ')' onerror '{' CCODE	{
-			push_function(VIRTUAL_METHOD, NULL, $<id>3,
-				      $<id>7, $<cbuf>9,$<line>1);
-									}
-	|	VIRTUAL type TOKEN '(' funcargs ')' onerror ';'		{
 			push_function(VIRTUAL_METHOD, NULL, $<id>3,
-				      $<id>7, NULL,$<line>1);
+				      $<id>7, $<cbuf>8,$<line>1,ccode_line);
 									}
 	|	OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' onerror '{' CCODE	{
 			push_function(OVERRIDE_METHOD, $<id>3,
-				      $<id>6, $<id>10, $<cbuf>12,$<line>1);
+				      $<id>6, $<id>10, $<cbuf>12,$<line>1,$<line>11);
 									}
 	|	PUBLIC type TOKEN '(' funcargs ')' onerror '{' CCODE	{
 			push_function(PUBLIC_SCOPE, NULL, $<id>3,
-				      $<id>7, $<cbuf>9,$<line>1);
+				      $<id>7, $<cbuf>9,$<line>1,$<line>8);
 								}
 	|	PRIVATE type TOKEN '(' funcargs ')' onerror '{' CCODE	{
 			push_function(PRIVATE_SCOPE, NULL, $<id>3,
-				      $<id>7, $<cbuf>9,$<line>1);
+				      $<id>7, $<cbuf>9,$<line>1,$<line>8);
 								}
 	|	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);
+					      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);
+					      $<id>1, NULL, NULL,$<line>2,0);
 			} else {
 				g_free($<id>1);
 				g_free($<id>3);
@@ -471,11 +464,13 @@ method:		SIGNAL LAST sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE {
 			if(strcmp($<id>1,"init")==0) {
 				push_init_arg($<id>3,FALSE);
 				push_function(INIT_METHOD, NULL,
-					      $<id>1, NULL, $<cbuf>6,$<line>2);
+					      $<id>1, NULL, $<cbuf>6,$<line>2,
+					      $<line>5);
 			} 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);
+					      $<id>1, NULL, $<cbuf>6,$<line>2,
+					      $<line>5);
 			} else {
 				g_free($<id>1);
 				g_free($<id>3);
@@ -486,8 +481,7 @@ method:		SIGNAL LAST sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE {
 						}
 	;
 	
-onerror:	ONERROR TOKEN		{ $<id>$ = $<id>2; }
-	|	ONERROR number		{ $<id>$ = $<id>2; }
+onerror:	ONERROR numtok		{ $<id>$ = $<id>2; }
 	|	ONERROR	'{' CCODE	{
 			$<id>$ = ($<cbuf>3)->str;
 			g_string_free($<cbuf>3,FALSE);
@@ -498,11 +492,16 @@ onerror:	ONERROR TOKEN		{ $<id>$ = $<id>2; }
 	
 	
 
-funcargs:	VOID			{ has_this = FALSE; }
+funcargs:	VOID			{ has_self = FALSE; }
 	|	TOKEN			{
-			has_this = TRUE;
-			if(strcmp($<id>1,"this")==0)
-				push_this($<id>1);
+			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)
+				push_self($<id>1);
 			else {
 				g_free($<id>1);
 				yyerror(_("parse error"));
@@ -510,16 +509,21 @@ 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,"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)
+				push_self($<id>1);
 			else {
 				g_free($<id>1);
 				yyerror(_("parse error"));
 				YYERROR;
 			}
 					}
-	|	arglist			{ has_this = FALSE; }
+	|	arglist			{ has_self = FALSE; }
 	;
 	
 arglist:	arglist ',' arg		{ ; }
@@ -529,7 +533,12 @@ arglist:	arglist ',' arg		{ ; }
 arg:		type TOKEN					{
 			push_funcarg($<id>2);
 								}
-	|	type TOKEN '(' CHECK checklist ')'		{
+	|	type TOKEN '(' TOKEN checklist ')'		{
+			if(strcmp($<id>4,"check")!=0) {
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+			g_free($<id>4);
 			push_funcarg($<id>2);
 								}
 	;
@@ -538,45 +547,51 @@ checklist:	checklist check 	{ ; }
 	|	check			{ ; }
 	;
 
-check:		CNULL			{
-			Node *node = new_check(NULL_CHECK,NULL);
-			checks = g_list_append(checks,node);
-					}
-	|	TYPE			{
-			Node *node = new_check(TYPE_CHECK,NULL);
-			checks = g_list_append(checks,node);
+check:		TOKEN			{
+			if(strcmp($<id>1,"type")==0) {
+				Node *node = new_check(TYPE_CHECK,NULL);
+				checks = g_list_append(checks,node);
+			} else if(strcmp($<id>1,"null")==0) {
+				Node *node = new_check(NULL_CHECK,NULL);
+				checks = g_list_append(checks,node);
+			} else {
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+			g_free($<id>1);
 					}
-	|	'>' number		{
+	|	'>' numtok		{
 			Node *node = new_check(GT_CHECK,$<id>2);
 			checks = g_list_append(checks,node);
 					}
-	|	'<' number		{
+	|	'<' numtok		{
 			Node *node = new_check(LT_CHECK,$<id>2);
 			checks = g_list_append(checks,node);
 					}
-	|	'>' '=' number		{
+	|	'>' '=' numtok		{
 			Node *node = new_check(GE_CHECK,$<id>3);
 			checks = g_list_append(checks,node);
 					}
-	|	'<' '=' number		{
+	|	'<' '=' numtok		{
 			Node *node = new_check(LE_CHECK,$<id>3);
 			checks = g_list_append(checks,node);
 					}
-	|	'=' '=' number		{
+	|	'=' '=' numtok		{
 			Node *node = new_check(EQ_CHECK,$<id>3);
 			checks = g_list_append(checks,node);
 					}
-	|	'!' '=' number		{
+	|	'!' '=' numtok		{
 			Node *node = new_check(NE_CHECK,$<id>3);
 			checks = g_list_append(checks,node);
 					}
 	;
 	
-number:		NUMBER			{ $<id>$ = $<id>1; }
+numtok:		NUMBER			{ $<id>$ = $<id>1; }
 	|	'-' NUMBER		{
 			$<id>$ = g_strconcat("-",$<id>2,NULL);
 			g_free($<id>2);
 					}
+	|	TOKEN			{ $<id>$ = $<id>1; }
 	;
 	
 %%