X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/3e833eea9cb9822f04c639e143212c4b6f7940d4..c2cc7db1ccde3eb2ff723c4b7b213a055f56e8ae:/src/parse.y

diff --git a/src/parse.y b/src/parse.y
index b8792bb..1831ad0 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -70,6 +70,7 @@ static char *onerror = NULL;
 static char *defreturn = NULL;
 
 static GList *gtktypes = NULL;
+static char *signal_name=NULL;
 
 static Property *property = NULL;
 
@@ -92,9 +93,10 @@ yyerror(char *str)
 	char *out=NULL;
 	char *p;
 	
-	if(strcmp(yytext,"\n")==0) {
-		out=g_strconcat("Error: ",str," before newline",NULL);
-	} else if(yytext[0]=='\0') {
+	if (strcmp (yytext, "\n") == 0 ||
+	    strcmp (yytext, "\r") == 0) {
+		out = g_strconcat ("Error: ", str, " before end of line", NULL);
+	} else if (yytext[0] == '\0') {
 		out=g_strconcat("Error: ", str, " at end of input", NULL);
 	} else {
 		char *tmp = g_strdup(yytext);
@@ -156,7 +158,11 @@ push_function (int scope, int method, char *oid, char *id,
 
 	g_assert(scope != CLASS_SCOPE);
        
-	if(method == INIT_METHOD || method == CLASS_INIT_METHOD) {
+	if(method == INIT_METHOD ||
+	   method == CLASS_INIT_METHOD ||
+	   method == CONSTRUCTOR_METHOD ||
+	   method == DISPOSE_METHOD ||
+	   method == FINALIZE_METHOD) {
 		type = (Type *)node_new (TYPE_NODE,
 					 "name", "void",
 					 NULL);
@@ -197,6 +203,13 @@ push_function (int scope, int method, char *oid, char *id,
 	} else
 		c_cbuf = NULL;
 
+	if (signal_name == NULL )
+	{
+		GString * buffer=g_string_new("");
+		g_string_printf(buffer, "\"%s\"", id);
+		signal_name = buffer->str;
+		g_string_free(buffer, FALSE);
+	}
 	node = node_new (METHOD_NODE,
 			 "scope", scope,
 			 "method", method,
@@ -205,6 +218,7 @@ push_function (int scope, int method, char *oid, char *id,
 			 "gtktypes:steal", gtktypes,
 			 "flags:steal", flags,
 			 "id:steal", id,
+			 "signal_name:steal", signal_name,
 			 "args:steal", funcargs,
 			 "funcattrs:steal", funcattrs,
 			 "onerror:steal", onerror,
@@ -224,8 +238,8 @@ push_function (int scope, int method, char *oid, char *id,
 				above */
 			      c_cbuf?FALSE:TRUE);
 	gtktypes = NULL;
+	signal_name = NULL;
 	funcargs = NULL;
-
 	funcattrs = NULL;
 	onerror = NULL;
 	defreturn = NULL;
@@ -688,10 +702,10 @@ ensure_property (void)
 %token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR
 
 %token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM SINGLE_CHAR
-%token <cbuf> CCODE ADCODE HTCODE PHCODE HCODE ACODE ATCODE STRING
+%token <cbuf> CCODE CTCODE ADCODE HTCODE PHCODE HCODE ACODE ATCODE STRING
 %token <line> PUBLIC PRIVATE PROTECTED CLASSWIDE PROPERTY ARGUMENT
 %token <line> VIRTUAL SIGNAL OVERRIDE
-%token <line> NICK BLURB MAXIMUM MINIMUM DEFAULT_VALUE ERROR FLAGS TYPE
+%token <line> NAME NICK BLURB MAXIMUM MINIMUM DEFAULT_VALUE ERROR FLAGS TYPE
 %token <line> FLAGS_TYPE ENUM_TYPE PARAM_TYPE BOXED_TYPE OBJECT_TYPE
 
 %%
@@ -765,6 +779,15 @@ ccode:		CCODE			{
 			nodes = g_list_append(nodes,node);
 			g_string_free($<cbuf>1,FALSE);
 					}
+	|	CTCODE			{
+			Node *node = node_new (CCODE_NODE,
+					       "cctype", CT_CCODE,
+					       "cbuf:steal", ($<cbuf>1)->str,
+					       "line_no", ccode_line,
+					       NULL);
+			nodes = g_list_append(nodes,node);
+			g_string_free($<cbuf>1,FALSE);
+					}
 	;
 
 ccodes:		ccodes ccode		{ ; }
@@ -1355,7 +1378,13 @@ anyval:		numtok		{ $<id>$ = $<id>1; }
 	|	string		{ $<id>$ = $<id>1; }
 	;
 
-param_spec_value: NICK '=' string		{
+param_spec_value: NAME '=' string		{
+		ensure_property ();
+		node_set ((Node *)property,
+			  "canonical_name:steal", gob_str_delete_quotes($<id>3),
+			  NULL);
+		  }
+	|	NICK '=' string		{
 		ensure_property ();
 		node_set ((Node *)property,
 			  "nick:steal", $<id>3,
@@ -1669,6 +1698,10 @@ fullsigtype:	scope TOKEN sigtype	{
 sigtype:	TOKEN '(' tokenlist ')'		{
 			gtktypes = g_list_prepend(gtktypes, debool ($<id>1));
 						}
+	|	TOKEN STRING '(' tokenlist ')'		{
+			gtktypes = g_list_prepend(gtktypes, debool ($<id>1));
+			signal_name=$<id>2;
+						}
 	;
 
 tokenlist:	tokenlist ',' TOKEN 		{