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

diff --git a/src/parse.y b/src/parse.y
index 9ce92de..f4c4a40 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,19 @@ 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;
 
+/* this can be a global as we will only do one function at a time
+   anyway */
+static int the_scope = NO_SCOPE;
+
 void free(void *ptr);
 int yylex(void);
 
+extern int ccode_line;
 extern int line_no;
 
 extern char *yytext;
@@ -76,32 +84,63 @@ yyerror(char *str)
 }
 
 static void
-push_variable(char *name, int scope)
+push_variable(char *name, int scope, int line_no, char *postfix)
 {
 	Node *var;
 	Type *type = typestack->data;
 	typestack = g_list_remove(typestack,typestack->data);
+
+	type->postfix = postfix;
 	
-	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)
+push_function(int scope, int method, char *oid, char *id, char *onerror,
+	      GString *cbuf,int line_no, int ccode_line, int vararg)
 {
 	Node *node;
 	Type *type;
+	char *c_cbuf;
        
-	if(scope!=INIT_METHOD && scope!=CLASS_INIT_METHOD) {
+	if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) {
 		type = typestack->data;
 		typestack = g_list_remove(typestack,typestack->data);
 	} else {
-		type = (Type *)new_type(0,g_strdup("void"));
+		type = (Type *)new_type(0,g_strdup("void"),NULL);
 	}
 	
-	node = new_method(scope,type,oid,gtktypes,id,funcargs,
-			  onerror,cbuf,line_no);
+	/* a complicated and ugly test to figure out if we have
+	   the wrong number of types for a signal */
+	if((method == SIGNAL_FIRST_METHOD ||
+	    method == 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);
+	}
+	if(cbuf) {
+		char *p;
+		c_cbuf = p = cbuf->str;
+		while(p && *p && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))
+			p++;
+		if(!p || !*p)
+			c_cbuf = NULL;
+	} else
+		c_cbuf = NULL;
+
+	node = new_method(scope,method,type,oid,gtktypes,id,funcargs,
+			  onerror,c_cbuf,line_no,ccode_line,vararg);
+
+	if(cbuf)
+		g_string_free(cbuf,
+			      /*only free segment if we haven't passed it
+				above */
+			      c_cbuf?FALSE:TRUE);
 	gtktypes = NULL;
 	funcargs = NULL;
 
@@ -109,11 +148,13 @@ push_function(int scope, char *oid, char *id, char *onerror,
 }
 
 static void
-push_funcarg(char *name)
+push_funcarg(char *name, char *postfix)
 {
 	Node *node;
 	Type *type = typestack->data;
 	typestack = g_list_remove(typestack,typestack->data);
+
+	type->postfix = postfix;
 	
 	node = new_funcarg(type,name,checks);
 	checks = NULL;
@@ -133,21 +174,21 @@ push_init_arg(char *name, int is_class)
 	else
 		tn = g_strdup(((Class *)class)->otype);
 
-	type = new_type(1,tn);
+	type = new_type(1,tn,NULL);
 	node = new_funcarg((Type *)type,name,NULL);
 	funcargs = g_list_prepend(funcargs, node);
 }
 
 static void
-push_this(char *this)
+push_self(char *id)
 {
 	Node *node;
 	Node *type;
 	GList *ch = NULL;
-	type = new_type(1,g_strdup(((Class *)class)->otype));
+	type = new_type(1,g_strdup(((Class *)class)->otype),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,this,ch);
+	node = new_funcarg((Type *)type,id,ch);
 	funcargs = g_list_prepend(funcargs, node);
 }
 
@@ -158,16 +199,17 @@ 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 CHECK CNULL TYPE ONERROR
+%token CONST VOID STRUCT UNION ENUM THREEDOTS
+%token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR
+%token ONERROR
 
-%token <id> TOKEN NUMBER TYPETOKEN
+%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM
 %token <cbuf> CCODE HCODE
-%token <line> PUBLIC PRIVATE ARGUMENT VIRTUAL SIGNAL OVERRIDE
+%token <line> PUBLIC PRIVATE PROTECTED ARGUMENT VIRTUAL SIGNAL OVERRIDE
 
 %%
 
@@ -178,20 +220,26 @@ prog:		ccodes class ccodes	{ ; }
 	;
 
 ccodes:		ccodes CCODE		{
-			Node *node = new_ccode(FALSE,$<cbuf>2);
+			Node *node = new_ccode(FALSE,($<cbuf>2)->str,
+					       ccode_line);
 			nodes = g_list_append(nodes,node);
+			g_string_free($<cbuf>2,FALSE);
 					}
 	|	ccodes HCODE		{
-			Node *node = new_ccode(TRUE,$<cbuf>2);
+			Node *node = new_ccode(TRUE,($<cbuf>2)->str,ccode_line);
 			nodes = g_list_append(nodes,node);
+			g_string_free($<cbuf>2,FALSE);
 					}
 	|	CCODE			{
-			Node *node = new_ccode(FALSE,$<cbuf>1);
+			Node *node = new_ccode(FALSE,($<cbuf>1)->str,
+					       ccode_line);
 			nodes = g_list_append(nodes,node);
+			g_string_free($<cbuf>1,FALSE);
 					}
 	|	HCODE			{
-			Node *node = new_ccode(TRUE,$<cbuf>1);
+			Node *node = new_ccode(TRUE,($<cbuf>1)->str,ccode_line);
 			nodes = g_list_append(nodes,node);
+			g_string_free($<cbuf>1,FALSE);
 					}
 	;
 
@@ -200,6 +248,11 @@ class:		classdec '{' classcode '}'	{
 			class_nodes = NULL;
 			nodes = g_list_append(nodes,class);
 						}
+	|	classdec '{' '}'		{
+			((Class *)class)->nodes = NULL;
+			class_nodes = NULL;
+			nodes = g_list_append(nodes,class);
+						}
 	;
 
 classdec:	CLASS TYPETOKEN FROM TYPETOKEN	{
@@ -215,11 +268,16 @@ classcode:	classcode method		{ ; }
 	|	argument			{ ; }
 	;
 
-variable:	PUBLIC type TOKEN ';'		{
-			push_variable($<id>3,PUBLIC_SCOPE);
+scope:		PUBLIC			{ the_scope = PUBLIC_SCOPE; }
+	|	PRIVATE			{ the_scope = PRIVATE_SCOPE; }
+	|	PROTECTED		{ the_scope = PROTECTED_SCOPE; }
+	;
+
+variable:	scope type TOKEN ';'		{
+			push_variable($<id>3,the_scope,$<line>1,NULL);
 						}
-	|	PRIVATE type TOKEN ';'	{
-			push_variable($<id>3,PRIVATE_SCOPE);
+	|	scope type TOKEN ARRAY_DIM ';'	{
+			push_variable($<id>3,the_scope,$<line>1,$<id>4);
 						}
 	;
 argument:	ARGUMENT argflags TOKEN TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
@@ -228,14 +286,22 @@ 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)->str,$<line>6,
+						    ($<cbuf>10)->str,$<line>9,
+						    $<line>1);
+				g_string_free($<cbuf>7,FALSE);
+				g_string_free($<cbuf>10,FALSE);
 				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)->str,$<line>9,
+						    ($<cbuf>7)->str,$<line>6,
+						    $<line>1);
+				g_string_free($<cbuf>10,FALSE);
+				g_string_free($<cbuf>7,FALSE);
 				class_nodes = g_list_append(class_nodes,node);
 			} else {
 				g_free($<id>3); g_free($<id>4);
@@ -252,13 +318,17 @@ 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)->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;
 				g_free($<id>5);
 				node = new_argument($<id>3,$<list>2,$<id>4,
-						    NULL,$<cbuf>7);
+						    NULL,0,($<cbuf>7)->str,
+						    $<line>6, $<line>1);
+				g_string_free($<cbuf>7,FALSE);
 				class_nodes = g_list_append(class_nodes,node);
 			} else {
 				g_free($<id>5); g_free($<id>3);
@@ -284,18 +354,27 @@ flaglist:	TOKEN '|' flaglist		{
 	;
 
 
-type:		type1		 		{
-			Node *node = new_type(0,$<id>1);
+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,NULL);
 			typestack = g_list_prepend(typestack,node);
 						}
-	|	type1 stars 			{
-			Node *node = new_type(stars,$<id>1);
+	|	type2 stars 			{
+			Node *node = new_type(stars,$<id>1,NULL);
 			stars = 0;
 			typestack = g_list_prepend(typestack,node);
 						}
 	;
 
-type1:		UNSIGNED integer		{
+type2:		UNSIGNED integer		{
 			$<id>$ = g_strconcat("unsigned ",$<id>2,NULL);
 						}
 	|	SIGNED integer			{
@@ -310,6 +389,9 @@ type1:		UNSIGNED integer		{
 	|	SIGNED CHAR			{
 			$<id>$ = g_strdup("signed char");
 						}
+	|	CHAR				{
+			$<id>$ = g_strdup("char");
+						}
 	|	DOUBLE				{
 			$<id>$ = g_strdup("double");
 						}
@@ -362,6 +444,58 @@ tspecifier:	ENUM				{
 stars:		'*' stars			{ stars++; }
 	|	'*'				{ stars++; }
 	;
+
+/* this never sets the_scope */
+simplesigtype:	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;
+					}
+	;
+
+/* this always sets the_scope */
+fullsigtype:	scope TOKEN sigtype	{
+			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);
+					}
+	|	TOKEN scope 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);
+					}
+	|	scope sigtype		{
+			$<sigtype>$ = SIGNAL_LAST_METHOD;
+					}
+	|	simplesigtype		{
+			/* the_scope was default thus public */
+			the_scope = PUBLIC_SCOPE;
+					}
+	;
 	
 sigtype:	TOKEN '(' tokenlist ')'		{
 			gtktypes = g_list_prepend(gtktypes,$<id>1);
@@ -376,106 +510,83 @@ 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 "
+method:		SIGNAL fullsigtype type TOKEN '(' funcargs ')' onerror codenocode {
+			if(!has_self) {
+				yyerror(_("signal without 'self' as "
 					  "first parameter"));
 				YYERROR;
 			}
-			push_function(SIGNAL_LAST_METHOD,NULL,
-				      $<id>5, $<id>9, $<cbuf>11,$<line>1);
+			push_function(the_scope, $<sigtype>2,NULL,
+				      $<id>4, $<id>8, $<cbuf>9,$<line>1,
+				      ccode_line,vararg);
 									}
-	|	SIGNAL LAST sigtype type TOKEN '(' funcargs ')' onerror ';'	{
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
+	|	scope SIGNAL simplesigtype type TOKEN '(' funcargs ')' onerror codenocode {
+			if(!has_self) {
+				yyerror(_("signal without 'self' as "
 					  "first parameter"));
 				YYERROR;
 			}
-			push_function(SIGNAL_LAST_METHOD, NULL,
-				      $<id>5, $<id>9, NULL,$<line>1);
+			push_function(the_scope, $<sigtype>3,NULL,
+				      $<id>5, $<id>9, $<cbuf>10,$<line>2,
+				      ccode_line,vararg);
 									}
-	|	SIGNAL FIRST sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE {
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
+	|	VIRTUAL scope type TOKEN '(' funcargs ')' onerror codenocode	{
+			if(!has_self) {
+				yyerror(_("virtual method without 'self' as "
 					  "first parameter"));
 				YYERROR;
 			}
-			push_function(SIGNAL_FIRST_METHOD, NULL,
-				      $<id>5, $<id>9, $<cbuf>11,$<line>1);
+			push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4,
+				      $<id>8, $<cbuf>9,$<line>1,
+				      ccode_line,vararg);
 									}
-	|	SIGNAL FIRST sigtype type TOKEN '(' funcargs ')' onerror ';'	{
-			if(!has_this) {
-				yyerror(_("signal without 'this' as "
+	|	scope VIRTUAL type TOKEN '(' funcargs ')' onerror codenocode	{
+			if(!has_self) {
+				yyerror(_("virtual method without 'self' as "
 					  "first parameter"));
 				YYERROR;
 			}
-			push_function(SIGNAL_FIRST_METHOD, NULL, $<id>5,
-				      $<id>9, NULL,$<line>1);
+			push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4,
+				      $<id>8, $<cbuf>9,$<line>2,
+				      ccode_line,vararg);
 									}
-	|	SIGNAL sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE	{
-			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, $<cbuf>10,$<line>1);
+			push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL,
+				      $<id>3, $<id>7, $<cbuf>8,$<line>1,
+				      ccode_line,vararg);
 									}
-	|	SIGNAL sigtype type TOKEN '(' funcargs ')' onerror ';'		{
-			if(!has_this) {
-				yyerror(_("signal without 'this' 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);
+	|	OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' onerror codenocode	{
+			push_function(NO_SCOPE, OVERRIDE_METHOD, $<id>3,
+				      $<id>6, $<id>10, $<cbuf>11,
+				      $<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);
-									}
-	|	PUBLIC type TOKEN '(' funcargs ')' onerror '{' CCODE	{
-			push_function(PUBLIC_SCOPE, NULL, $<id>3,
-				      $<id>7, $<cbuf>9,$<line>1);
-								}
-	|	PRIVATE type TOKEN '(' funcargs ')' onerror '{' CCODE	{
-			push_function(PRIVATE_SCOPE, NULL, $<id>3,
-				      $<id>7, $<cbuf>9,$<line>1);
+	|	scope type TOKEN '(' funcargs ')' onerror codenocode	{
+			push_function(the_scope, REGULAR_METHOD, NULL, $<id>3,
+				      $<id>7, $<cbuf>8,$<line>1,ccode_line,
+				      vararg);
 								}
-	|	TOKEN '(' TOKEN ')' ';'		{
+	|	TOKEN '(' TOKEN ')' codenocode	{
 			if(strcmp($<id>1,"init")==0) {
 				push_init_arg($<id>3,FALSE);
-				push_function(INIT_METHOD, NULL, $<id>1, 
-					      NULL, NULL,$<line>2);
+				push_function(NO_SCOPE, INIT_METHOD, NULL,
+					      $<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, NULL,$<line>2);
-			} else {
-				g_free($<id>1);
-				g_free($<id>3);
-				yyerror(_("parse error"));
-				YYERROR;
-			}
-						}
-	|	TOKEN '(' TOKEN ')' '{' 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);
-			} 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);
+				push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL,
+					      $<id>1, NULL, $<cbuf>5,$<line>2,
+					      ccode_line,FALSE);
 			} else {
 				g_free($<id>1);
 				g_free($<id>3);
@@ -486,23 +597,20 @@ 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);
 					}
-	|	'=' '1'			{ ; }
 	|				{ $<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"));
@@ -510,27 +618,47 @@ 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			{ ; }
 	;
 
 arg:		type TOKEN					{
-			push_funcarg($<id>2);
+			push_funcarg($<id>2,NULL);
 								}
-	|	type TOKEN '(' CHECK checklist ')'		{
-			push_funcarg($<id>2);
+	|	type TOKEN ARRAY_DIM				{
+			push_funcarg($<id>2,$<id>3);
+								}
+	|	type TOKEN '(' TOKEN checklist ')'		{
+			if(strcmp($<id>4,"check")!=0) {
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+			g_free($<id>4);
+			push_funcarg($<id>2,NULL);
+								}
+	|	type TOKEN ARRAY_DIM '(' TOKEN checklist ')'	{
+			if(strcmp($<id>5,"check")!=0) {
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+			g_free($<id>5);
+			push_funcarg($<id>2,$<id>3);
 								}
 	;
 	
@@ -538,45 +666,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; }
 	;
 	
 %%