X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/509cf0693fc440c71bdd3e71ea8947a6b4eb0bcf..5cfe51ee2287165feb0cf006901bbbc2b961f3b8:/src/parse.y

diff --git a/src/parse.y b/src/parse.y
index f052991..0bc9836 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -23,6 +23,7 @@
 #include "config.h"
 #include <glib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "treefuncs.h"
@@ -36,12 +37,14 @@ GList *nodes = NULL;
 static GList *class_nodes = NULL;
 Node *class = NULL;
 
+static char *chunk_size = NULL;
+static char *bonobo_x_class = NULL;
 static GList *typestack = NULL;
-static int stars = 0;
 static GList *funcargs = NULL;
 static GList *checks = NULL;
 static int has_self = FALSE;
 static int vararg = FALSE;
+static Method *last_added_method = NULL;
 
 /* destructor and initializer for variables */
 static char *destructor = NULL;
@@ -126,10 +129,10 @@ push_function(int scope, int method, char *oid, char *id,
 
 	g_assert(scope != CLASS_SCOPE);
        
-	if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) {
-		type = pop_type();
+	if(method == INIT_METHOD || method == CLASS_INIT_METHOD) {
+		type = (Type *)new_type(g_strdup("void"), NULL, NULL);
 	} else {
-		type = (Type *)new_type(0,g_strdup("void"),NULL);
+		type = pop_type();
 	}
 	
 	/* a complicated and ugly test to figure out if we have
@@ -140,18 +143,18 @@ push_function(int scope, int method, char *oid, char *id,
 	   !(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);
+		error_print(GOB_WARN, line_no,
+			    _("The number of GTK arguments and "
+			      "function arguments for a signal "
+			      "don't seem to match"));
 	}
 	if(g_list_length(gtktypes) > 2) {
 		GList *li;
 		for(li = gtktypes->next; li; li = li->next) {
 			if(strcmp(li->data, "NONE")==0) {
-				print_error(FALSE,
+				error_print(GOB_ERROR, line_no,
 					    _("NONE can only appear in an "
-					      "argument list by itself"),
-					    line_no);
+					      "argument list by itself"));
 			}
 		}
 	}
@@ -167,7 +170,10 @@ push_function(int scope, int method, char *oid, char *id,
 
 	node = new_method(scope, method, type, oid, gtktypes, flags,
 			  id, funcargs, onerror, defreturn, c_cbuf, line_no,
-			  ccode_line, vararg, method_unique_id++);
+			  ccode_line, vararg, method_unique_id++,
+			  FALSE);
+
+	last_added_method = (Method *)node;
 
 	if(cbuf)
 		g_string_free(cbuf,
@@ -191,6 +197,9 @@ free_all_global_state(void)
 	g_free(defreturn);
 	defreturn = NULL;
 
+	g_free(chunk_size);
+	chunk_size = NULL;
+	
 	g_list_foreach(gtktypes, (GFunc)g_free, NULL);
 	g_list_free(gtktypes);
 	gtktypes = NULL;
@@ -225,18 +234,19 @@ push_init_arg(char *name, int is_class)
 	else
 		tn = g_strdup(((Class *)class)->otype);
 
-	type = new_type(1,tn,NULL);
+	type = new_type(tn, g_strdup("*"), NULL);
 	node = new_funcarg((Type *)type,name,NULL);
 	funcargs = g_list_prepend(funcargs, node);
 }
 
 static void
-push_self(char *id)
+push_self(char *id, gboolean constant)
 {
 	Node *node;
 	Node *type;
 	GList *ch = NULL;
-	type = new_type(1,g_strdup(((Class *)class)->otype),NULL);
+	type = new_type(g_strdup(((Class *)class)->otype),
+			g_strdup(constant ? "const *" : "*"), 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,id,ch);
@@ -247,7 +257,6 @@ static Variable *
 find_var_or_die(const char *id, int line)
 {
 	GList *li;
-	char *s;
 
 	for(li = class_nodes; li != NULL; li = li->next) {
 		Variable *var;
@@ -259,8 +268,7 @@ find_var_or_die(const char *id, int line)
 			return var;
 	}
 
-	s = g_strdup_printf(_("Variable %s not defined here"), id);
-	print_error(FALSE, s, line);
+	error_printf(GOB_ERROR, line, _("Variable %s not defined here"), id);
 
 	g_assert_not_reached();
 	return NULL;
@@ -285,6 +293,87 @@ set_return_value(char *type, char *val)
 	return FALSE;
 }
 
+static void
+export_accessors (const char *var_name,
+		  const char *get_cbuf,
+		  int get_lineno,
+		  const char *set_cbuf,
+		  int set_lineno,
+		  Type *type,
+		  const char *gtktype,
+		  int lineno)
+{	
+	if (type == NULL) {
+		char *cast = g_strdup (get_cast (gtktype, FALSE));
+		char *p = strchr (cast, ' ');
+		if (p != NULL) {
+			*p = '\0';
+			p++;
+		}
+		/* leak, but we don't really care any more */
+		type = (Type *)new_type (cast,
+					 g_strdup (p),
+					 NULL);
+	}
+
+	if (get_cbuf != NULL) {
+		char *get_id = g_strdup_printf ("get_%s", var_name);
+		GString *get_cbuf_copy = g_string_new (get_cbuf);
+		char *tmp;
+		Node *node1 = new_type (g_strdup (type->name),
+					g_strdup (type->pointer),
+					g_strdup (type->postfix));
+		Node *node3 = new_type (g_strdup (class->class.otype),
+					g_strdup ("*"),
+					NULL);
+
+		tmp = g_strdup_printf ("\t%s%s ARG;\n", 
+				       type->name, 
+				       type->pointer ? type->pointer : "");
+		get_cbuf_copy = g_string_prepend (get_cbuf_copy, tmp);
+		g_free (tmp);
+		
+		tmp = g_strdup_printf ("\n\t\treturn ARG;\n");
+		get_cbuf_copy = g_string_append (get_cbuf_copy, tmp);
+		g_free (tmp);
+		
+		typestack = g_list_prepend (typestack, node1);
+		typestack = g_list_prepend (typestack, node3);
+		
+		push_funcarg ("self", FALSE);
+		
+		push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL,
+			       get_id, get_cbuf_copy, get_lineno,
+			       lineno, FALSE, NULL);
+	}
+	
+	if (set_cbuf != NULL) {
+		char *set_id = g_strdup_printf ("set_%s", var_name);
+		GString *set_cbuf_copy = g_string_new (set_cbuf);
+		Node *node1 = new_type (g_strdup (type->name),
+					g_strdup (type->pointer),
+					g_strdup (type->postfix));
+		Node *node2 = new_type (g_strdup ("void"),
+					NULL,
+					NULL);
+		Node *node3 = new_type (g_strdup (class->class.otype),
+					g_strdup ("*"),
+					NULL);
+
+		typestack = g_list_prepend (typestack, node2);
+		typestack = g_list_prepend (typestack, node1);
+		typestack = g_list_prepend (typestack, node3);
+		
+		push_funcarg ("self", FALSE);
+		push_funcarg ("ARG", FALSE);
+	
+		typestack = g_list_prepend (typestack, node2);
+		push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL,
+			       set_id, set_cbuf_copy, set_lineno,
+			       lineno, FALSE, NULL);
+	}
+}
+
 %}
 
 %union {
@@ -365,16 +454,52 @@ class:		classdec '{' classcode '}'	{
 						}
 	;
 
-classdec:	CLASS TYPETOKEN FROM TYPETOKEN	{
-			class = new_class($<id>2,$<id>4,NULL);
+classdec:	CLASS TYPETOKEN FROM TYPETOKEN	classflags {
+			class = new_class ($<id>2, $<id>4,
+					   bonobo_x_class, chunk_size, NULL);
 						}
 	;
-	
+
+classflags:
+	| '(' TOKEN TOKEN ')' classflags {
+			if(strcmp($<id>2,"chunks") == 0) {
+				g_free (chunk_size);
+				chunk_size = g_strdup($<id>3);
+			} else if(strcmp($<id>2,"BonoboX") == 0) {
+				g_free (bonobo_x_class);
+				bonobo_x_class = g_strdup($<id>3);
+			} else {
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+		}
+	| '(' TOKEN NUMBER ')' classflags {
+			if(strcmp($<id>2,"chunks") == 0) {
+				g_free (chunk_size);
+				if(atoi($<id>3) != 0)
+					chunk_size = g_strdup($<id>3);
+				else
+					chunk_size = NULL;
+			} else {
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+		}
+	;	
+
 classcode:	classcode thing			{ ; }
 	|	thing				{ ; }
 	;
 
 thing: 		method				{ ; }
+	|	TOKEN method			{
+			if (strcmp ($<id>1, "BonoboX") != 0) {
+				g_free($<id>1);
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+			last_added_method->bonobo_x_func = TRUE;
+						}
 	|	variable			{ ; }
 	|	argument			{ ; }
 	|	';'				{ ; }
@@ -444,82 +569,138 @@ variable:	scope type TOKEN varoptions ';'		{
 			push_variable($<id>3, the_scope, $<line>1, $<id>4);
 						}
 	;
-argument:	ARGUMENT flags argtype TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
-			if(strcmp($<id>5,"get")==0 &&
-			   strcmp($<id>8,"set")==0) {
+
+argument:	ARGUMENT flags argtype TOKEN export TOKEN '{' CCODE TOKEN '{' CCODE ';' {
+			if(strcmp($<id>6,"get")==0 &&
+			   strcmp($<id>9,"set")==0) {
 				Node *node;
 				Type *type = pop_type();
-				g_free($<id>5); g_free($<id>8);
-				node = new_argument($<id>3,type,$<list>2,$<id>4,
-						    ($<cbuf>7)->str,$<line>6,
-						    ($<cbuf>10)->str,$<line>9,
-						    $<line>1);
-				g_string_free($<cbuf>7,FALSE);
-				g_string_free($<cbuf>10,FALSE);
+				g_free ($<id>6); 
+				g_free ($<id>9);
+				node = new_argument ($<id>3, type, $<list>2, $<id>4,
+						     ($<cbuf>8)->str, $<line>7,
+						     ($<cbuf>11)->str,$<line>10,
+						     $<line>1);
+
 				class_nodes = g_list_append(class_nodes,node);
-			} else if(strcmp($<id>5,"set")==0 &&
-				strcmp($<id>8,"get")==0) {
+
+				if ($<id>5) {
+					export_accessors ($<id>4, 
+							  ($<cbuf>8)->str, $<line>7,
+							  ($<cbuf>11)->str, $<line>10,
+							  type,
+							  $<id>3,
+							  $<line>1);
+					g_free ($<id>5);
+				} 
+
+				g_string_free ($<cbuf>8, FALSE);
+				g_string_free ($<cbuf>11, FALSE);
+
+			} else if(strcmp($<id>6,"set")==0 &&
+				strcmp($<id>9,"get")==0) {
 				Node *node;
 				Type *type = pop_type();
-				g_free($<id>5); g_free($<id>8);
-				node = new_argument($<id>3,type,$<list>2,$<id>4,
-						    ($<cbuf>10)->str,$<line>9,
-						    ($<cbuf>7)->str,$<line>6,
-						    $<line>1);
-				g_string_free($<cbuf>10,FALSE);
-				g_string_free($<cbuf>7,FALSE);
+				g_free ($<id>6); 
+				g_free ($<id>9);
+				node = new_argument ($<id>3, type, $<list>2, $<id>4,
+						     ($<cbuf>11)->str,$<line>10,
+						     ($<cbuf>8)->str,$<line>7,
+						     $<line>1);
+
+				if ($<id>5) {
+					export_accessors ($<id>4, 
+							  ($<cbuf>11)->str, $<line>10,
+							  ($<cbuf>8)->str, $<line>7,
+							  type,
+							  $<id>3,
+							  $<line>1);
+					g_free ($<id>5);
+				} 
+
+				g_string_free ($<cbuf>11, FALSE);
+				g_string_free ($<cbuf>8, FALSE);
 				class_nodes = g_list_append(class_nodes,node);
 			} else {
-				g_free($<id>3); g_free($<id>4);
-				g_free($<id>5); g_free($<id>8);
-				g_list_foreach($<list>2,(GFunc)g_free,NULL);
-				g_string_free($<cbuf>10,TRUE);
-				g_string_free($<cbuf>7,TRUE);
-				yyerror(_("parse error"));
+				g_free ($<id>3); 
+				g_free ($<id>4);
+				g_free ($<id>6); 
+				g_free ($<id>9);
+				g_list_foreach ($<list>2, (GFunc)g_free, NULL);
+				g_list_free ($<list>2);
+				g_string_free ($<cbuf>11, TRUE);
+				g_string_free ($<cbuf>8, TRUE);
+				yyerror (_("parse error"));
 				YYERROR;
 			}
 						}
-	|	ARGUMENT flags argtype TOKEN TOKEN '{' CCODE ';' {
-			if(strcmp($<id>5,"get")==0) {
+	|	ARGUMENT flags argtype TOKEN export TOKEN '{' CCODE ';' {
+			if(strcmp($<id>6, "get") == 0) {
 				Node *node;
 				Type *type = pop_type();
-				g_free($<id>5);
-				node = new_argument($<id>3,type,$<list>2,$<id>4,
-						    ($<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) {
+				g_free ($<id>6);
+				node = new_argument ($<id>3, type, $<list>2, $<id>4,
+						     ($<cbuf>8)->str, $<line>7,
+						     NULL, 0, 
+						     $<line>1);
+				if ($<id>5) {
+					export_accessors ($<id>4, 
+							  ($<cbuf>8)->str, $<line>7,
+							  NULL, 0,
+							  type,
+							  $<id>3,
+							  $<line>1);
+					g_free ($<id>5);
+				} 
+
+				g_string_free ($<cbuf>8, FALSE);
+				class_nodes = g_list_append(class_nodes, node);
+			} else if(strcmp($<id>6, "set") == 0) {
 				Node *node;
 				Type *type = pop_type();
-				g_free($<id>5);
-				node = new_argument($<id>3,type,$<list>2,$<id>4,
-						    NULL,0,($<cbuf>7)->str,
-						    $<line>6, $<line>1);
-				g_string_free($<cbuf>7,FALSE);
-				class_nodes = g_list_append(class_nodes,node);
+				g_free ($<id>6);
+				node = new_argument ($<id>3, type, $<list>2, $<id>4,
+						     NULL, 0, 
+						     ($<cbuf>8)->str, $<line>7, 
+						     $<line>1);
+				if ($<id>5) {
+					export_accessors ($<id>4, 
+							  NULL, 0,
+							  ($<cbuf>8)->str, $<line>7,
+							  type,
+							  $<id>3,
+							  $<line>1);
+					g_free ($<id>5);
+				} 
+
+				g_string_free ($<cbuf>8, FALSE);
+				class_nodes = g_list_append (class_nodes, node);
 			} else {
-				g_free($<id>5); g_free($<id>3);
-				g_free($<id>4);
-				g_list_foreach($<list>2,(GFunc)g_free,NULL);
-				g_string_free($<cbuf>7,TRUE);
+				g_free ($<id>6); 
+				g_free ($<id>3);
+				g_free ($<id>4);
+				g_list_foreach ($<list>2, (GFunc)g_free, NULL);
+				g_list_free ($<list>2);
+				g_string_free ($<cbuf>8, TRUE);
 				yyerror(_("parse error"));
 				YYERROR;
 			}
 						}
-	|	ARGUMENT flags argtype TOKEN TOKEN {
+	|	ARGUMENT flags argtype TOKEN export TOKEN {
 			Node *node;
 			char *get, *set = NULL;
 			Variable *var;
 			Type *type;
 			char *root;
 			
-			if(strcmp($<id>5, "link")!=0 &&
-			   strcmp($<id>5, "stringlink")!=0 &&
-			   strcmp($<id>5, "objectlink")!=0) {
-				g_free($<id>5); g_free($<id>3);
+			if(strcmp($<id>6, "link")!=0 &&
+			   strcmp($<id>6, "stringlink")!=0 && 
+			   strcmp($<id>6, "objectlink")!=0) {
+				g_free($<id>6); 
+				g_free($<id>3);
 				g_free($<id>4);
 				g_list_foreach($<list>2,(GFunc)g_free,NULL);
+				g_list_free($<list>2);
 				yyerror(_("parse error"));
 				YYERROR;
 			}
@@ -529,31 +710,29 @@ argument:	ARGUMENT flags argtype TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
 			var = find_var_or_die($<id>4, $<line>1);
 			if(var->scope == PRIVATE_SCOPE)
 				root = "self->_priv";
-			else if(var->scope == CLASS_SCOPE)
-				root = "SELF_CLASS(GTK_OBJECT(self)->klass)";
-			else
+			else if(var->scope == CLASS_SCOPE) {
+				root = "SELF_GET_CLASS(self)";
+				if(no_self_alias)
+					error_print(GOB_ERROR, $<line>1,
+						    _("Self aliases needed when autolinking to a classwide member"));
+			} else
 				root = "self";
 
-			if(strcmp($<id>5, "link")==0) {
+			if(strcmp($<id>6, "link")==0) {
 				set = g_strdup_printf("%s->%s = ARG;",
 						      root, $<id>4);
-			} else if(strcmp($<id>5, "stringlink")==0) {
+			} else if(strcmp ($<id>6, "stringlink")==0) {
 				set = g_strdup_printf("g_free(%s->%s); "
 						      "%s->%s = g_strdup(ARG);",
 						      root, $<id>4,
 						      root, $<id>4);
-			} else if(strcmp($<id>5, "objectlink")==0) {
+			} else if(strcmp ($<id>6, "objectlink")==0) {
 				set = g_strdup_printf(
-				  "if(%s->%s) "
-				   "gtk_object_unref(GTK_OBJECT(%s->%s)); "
-				  "%s->%s = ARG; "
-				  "if(%s->%s) "
-				   "gtk_object_ref(GTK_OBJECT(%s->%s));",
-				  root, $<id>4,
-				  root, $<id>4,
-				  root, $<id>4,
-				  root, $<id>4,
-				  root, $<id>4,
+				  "if (ARG != NULL) "
+				   "gtk_object_ref (GTK_OBJECT (ARG)); "
+				  "if (%s->%s != NULL) "
+				   "gtk_object_unref (GTK_OBJECT (%s->%s)); "
+				  "%s->%s = ARG;",
 				  root, $<id>4,
 				  root, $<id>4,
 				  root, $<id>4);
@@ -561,22 +740,48 @@ argument:	ARGUMENT flags argtype TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
 				g_assert_not_reached();
 			}
 
-			/* get is the same for everything */
-			get = g_strdup_printf("ARG = %s->%s;", root, $<id>4);
+			if (strcmp ($<id>6, "stringlink")==0) {
+				get = g_strdup_printf("ARG = g_strdup(%s->%s);", root, $<id>4);
+			} else {
+				/* For everything else, get is just straight assignment */
+				get = g_strdup_printf("ARG = %s->%s;", root, $<id>4);
+			}
 
-			g_free($<id>5);
+			g_free ($<id>6);
 
 
 			if(!type)
 				type = copy_type(var->vtype);
 
-			node = new_argument($<id>3, type, $<list>2,
-					    $<id>4, get, $<line>1,
-					    set, $<line>1, $<line>1);
+			node = new_argument ($<id>3, type, $<list>2,
+					     $<id>4, 
+					     get, $<line>1,
+					     set, $<line>1, 
+					     $<line>1);
+			if ($<id>5) {
+				export_accessors ($<id>4, 
+						  get, $<line>1,
+						  set, $<line>1,
+						  type,
+						  $<id>3,
+						  $<line>1);
+				g_free ($<id>5);
+			} 
+
 			class_nodes = g_list_append(class_nodes,node);
 						}
 	;
 
+export:         '(' TOKEN ')'                   {
+ 	                                          if (strcmp ($<id>2, "export")!=0) {
+							  g_free ($<id>2); 
+							  yyerror (_("parse error"));
+							  YYERROR;
+						  }
+	                                          $<id>$ = $<id>2;
+                                                }
+         |                                      { $<id>$ = NULL; }
+      		  
 argtype:	TOKEN '(' TOKEN type ')' 	{
 			if(strcmp($<id>3,"type")!=0) {
 				g_free($<id>1);
@@ -605,95 +810,102 @@ flaglist:	TOKEN '|' flaglist		{
 	;
 
 
-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);
+type:		specifier_list pointer		 		{
+			Node *node = new_type($<id>1, $<id>2, NULL);
 			typestack = g_list_prepend(typestack,node);
-						}
-	|	type2 stars 			{
-			Node *node = new_type(stars,$<id>1,NULL);
-			stars = 0;
+							}
+	|	specifier_list				{
+			Node *node = new_type($<id>1, NULL, NULL);
 			typestack = g_list_prepend(typestack,node);
-						}
+							}
 	;
 
-type2:		UNSIGNED integer		{
-			$<id>$ = g_strconcat("unsigned ",$<id>2,NULL);
-						}
-	|	SIGNED integer			{
-			$<id>$ = g_strconcat("signed ",$<id>2,NULL);
-						}
-	|	integer				{
-			$<id>$ = g_strdup($<id>1);
-						}
-	|	UNSIGNED CHAR			{
-			$<id>$ = g_strdup("unsigned char");
-						}
-	|	SIGNED CHAR			{
-			$<id>$ = g_strdup("signed char");
-						}
-	|	CHAR				{
-			$<id>$ = g_strdup("char");
-						}
-	|	DOUBLE				{
-			$<id>$ = g_strdup("double");
-						}
-	|	FLOAT				{
-			$<id>$ = g_strdup("float");
-						}
-	|	TOKEN				{
+/* The special cases are neccessary to avoid conflicts */
+specifier_list:	spec_list				{
 			$<id>$ = $<id>1;
-						}
-	|	tspecifier TOKEN		{
-			$<id>$ = g_strconcat($<id>1,$<id>2,NULL);
-			g_free($<id>2);
-						}
-	|	TYPETOKEN			{
+							}
+	|	TOKEN					{
 			$<id>$ = $<id>1;
-						}
-	|	VOID				{
-			$<id>$ = g_strdup("void");
-						}
+							}
+	|	CONST TOKEN				{
+			$<id>$ = g_strconcat("const ", $<id>2, NULL);
+			g_free($<id>2);
+							}
+	|	TOKEN CONST				{
+			$<id>$ = g_strconcat($<id>1, " const", NULL);
+			g_free($<id>1);
+							}
+	|	strunionenum TOKEN			{
+			$<id>$ = g_strconcat($<id>1, " ", $<id>2, NULL);
+			g_free($<id>2);
+							}
+	|	CONST strunionenum TOKEN		{
+			$<id>$ = g_strconcat("const ", $<id>2, " ",
+					     $<id>3, NULL);
+			g_free($<id>3);
+							}
+	|	strunionenum TOKEN CONST		{
+			$<id>$ = g_strconcat($<id>1, " ",
+					     $<id>2, " const", NULL);
+			g_free($<id>2);
+							}
 	;
 
-integer:	LONG INT			{
-			$<id>$ = "long int";
-						}
-	|	LONG				{
-			$<id>$ = "long";
-						}
-	|	SHORT INT			{
-			$<id>$ = "short int";
-						}
-	|	SHORT				{
-			$<id>$ = "short";
-						}
-	|	INT				{
-			$<id>$ = "int";
-						}
+/* The special const cases take care of conflicts ! */
+spec_list:	specifier spec_list	 		{
+			$<id>$ = g_strconcat($<id>1, " ", $<id>2, NULL);
+			g_free($<id>2);
+							}
+	|	TYPETOKEN spec_list	 		{
+			$<id>$ = g_strconcat($<id>1, " ", $<id>2, NULL);
+			g_free($<id>1);
+			g_free($<id>2);
+							}
+	|	CONST spec_list		 		{
+			$<id>$ = g_strconcat("const ", $<id>2, NULL);
+			g_free($<id>2);
+							}
+	|	TYPETOKEN				{
+			$<id>$ = $<id>1;
+							}
+	|	TYPETOKEN CONST				{
+			$<id>$ = g_strconcat($<id>1, " const", NULL);
+			g_free($<id>1);
+							}
+	|	specifier				{
+			$<id>$ = g_strdup($<id>1);
+							}
+	|	specifier CONST				{
+			$<id>$ = g_strconcat($<id>1, " const", NULL);
+							}
 	;
-	
-tspecifier:	ENUM				{
-			$<id>$ = "enum ";
-						}
-	|	UNION				{
-			$<id>$ = "union ";
-						}
-	|	STRUCT				{
-			$<id>$ = "struct ";
-						}
+
+specifier:	VOID			{ $<id>$ = "void"; }
+        |	CHAR			{ $<id>$ = "char"; }
+        |	SHORT			{ $<id>$ = "short"; }
+        |	INT			{ $<id>$ = "int"; }
+        |	LONG			{ $<id>$ = "long"; }
+        |	FLOAT			{ $<id>$ = "float"; }
+        |	DOUBLE			{ $<id>$ = "double"; }
+        |	SIGNED			{ $<id>$ = "signed"; }
+        |	UNSIGNED		{ $<id>$ = "unsigned"; }
+        ;
+
+strunionenum:	STRUCT			{ $<id>$ = "struct"; }
+	|	UNION			{ $<id>$ = "union"; }
+	|	ENUM			{ $<id>$ = "enum"; }
 	;
-	
-stars:		'*' stars			{ stars++; }
-	|	'*'				{ stars++; }
+
+pointer:	'*'			{ $<id>$ = g_strdup("*"); }
+	|	'*' CONST		{ $<id>$ = g_strdup("* const"); }
+	|	'*' pointer		{
+				$<id>$ = g_strconcat("*", $<id>2, NULL);
+				g_free($<id>2);
+					}
+	|	'*' CONST pointer	{
+				$<id>$ = g_strconcat("* const", $<id>3, NULL);
+				g_free($<id>3);
+					}
 	;
 
 /* this never sets the_scope */
@@ -928,23 +1140,65 @@ funcargs:	VOID			{ vararg = FALSE; has_self = FALSE; }
 			vararg = FALSE;
 			has_self = TRUE;
 			if(strcmp($<id>1,"self")==0)
-				push_self($<id>1);
+				push_self($<id>1, FALSE);
 			else {
 				g_free($<id>1);
 				yyerror(_("parse error"));
 				YYERROR;
 			}
        					}
+	|	TOKEN CONST {
+			vararg = FALSE;
+			has_self = TRUE;
+			if(strcmp($<id>1,"self")==0)
+				push_self($<id>1, TRUE);
+			else {
+				g_free($<id>1);
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+       					}
+	|	CONST TOKEN {
+			vararg = FALSE;
+			has_self = TRUE;
+			if(strcmp($<id>2,"self")==0)
+				push_self($<id>2, TRUE);
+			else {
+				g_free($<id>2);
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+       					}
 	|	TOKEN ',' arglist	{
 			has_self = TRUE;
 			if(strcmp($<id>1,"self")==0)
-				push_self($<id>1);
+				push_self($<id>1, FALSE);
+			else {
+				g_free($<id>1);
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+					}
+	|	TOKEN CONST ',' arglist	{
+			has_self = TRUE;
+			if(strcmp($<id>1,"self")==0)
+				push_self($<id>1, TRUE);
 			else {
 				g_free($<id>1);
 				yyerror(_("parse error"));
 				YYERROR;
 			}
 					}
+	|	CONST TOKEN ',' arglist	{
+			has_self = TRUE;
+			if(strcmp($<id>2,"self")==0)
+				push_self($<id>2, TRUE);
+			else {
+				g_free($<id>2);
+				yyerror(_("parse error"));
+				YYERROR;
+			}
+					}
 	|	arglist			{ has_self = FALSE; }
 	;