X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/346ae1bbcbbe87e79fe2db1f019f014ea64e2175..4cda31fc14f41746b4f3ced7015f9f15e0168dfc:/src/parse.y

diff --git a/src/parse.y b/src/parse.y
index 7ad3af5..a6471ce 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1,6 +1,7 @@
 /* GOB C Preprocessor
  * Copyright (C) 1999-2000 the Free Software Foundation.
- * Copyright (C) 2001 George Lebl
+ * Copyright (C) 2000 Eazel, Inc.
+ * Copyright (C) 2001-2004 George (Jiri) Lebl
  *
  * Author: George Lebl
  *
@@ -77,6 +78,7 @@ int yylex(void);
 
 extern int ccode_line;
 extern int line_no;
+extern gboolean for_cpp;
 
 extern char *yytext;
 
@@ -438,6 +440,28 @@ export_accessors (const char *var_name,
 	node_free ((Node *)the_type);
 }
 
+static char *
+get_prop_enum_flag_cast (Property *prop)
+{
+	char *tmp, *ret;
+	if (prop->extra_gtktype == NULL ||
+	/* HACK!  just in case someone made this
+	 * work with 2.0.0 by using the TYPE
+	 * macro directly */
+	    ((strstr (prop->extra_gtktype, "_TYPE_") != NULL ||
+	      strstr (prop->extra_gtktype, "TYPE_") == prop->extra_gtktype) &&
+	     strchr (prop->extra_gtktype, ':') == NULL)) {
+		if (prop->ptype != NULL)
+			return get_type (prop->ptype, TRUE);
+		else
+			return g_strdup ("");
+	}
+	tmp = remove_sep (prop->extra_gtktype);
+	ret = g_strdup_printf ("(%s) ", tmp);
+	g_free (tmp);
+	return ret;
+}
+
 static void
 property_link_and_export (Node *node)
 {
@@ -475,31 +499,35 @@ property_link_and_export (Node *node)
 			get = g_strdup_printf("g_value_set_string (VAL, %s->%s);",
 					      root, prop->name);
 		} else if (strcmp (prop->gtktype, "OBJECT") == 0) {
-			set = g_strdup_printf("{ GtkObject *___old = (GtkObject *)%s->%s; "
-					      "GtkObject *___new = (GtkObject *)gtk_value_get_object (VAL); "
-					      "if (___new != NULL) { "
-					        "gtk_object_ref (GTK_OBJECT (___new)); "
-					        "%s->%s = GTK_OBJECT (___new); "
-					      "} else { "
-					        "%s->%s = NULL; "
-					      "} "
+			char *cast;
+			if (prop->extra_gtktype != NULL) {
+				cast = remove_sep (prop->extra_gtktype);
+			} else {
+				cast = g_strdup ("void");
+			}
+			set = g_strdup_printf("{ GObject *___old = (GObject *)%s->%s; "
+					      "%s->%s = (%s *)g_value_dup_object (VAL); "
 					      "if (___old != NULL) { "
-					        "gtk_object_unref (GTK_OBJECT (___old)); "
+					        "g_object_unref (G_OBJECT (___old)); "
 					      "} "
 					      "}",
 					      root, prop->name,
 					      root, prop->name,
-					      root, prop->name);
-			get = g_strdup_printf("g_value_set_object (VAL, %s->%s);",
-					      root, prop->name);
+					      cast);
+			get = g_strdup_printf ("g_value_set_object (VAL, "
+					       "(gpointer)%s->%s);",
+					       root, prop->name);
+			g_free (cast);
 		} else if (strcmp (prop->gtktype, "BOXED") == 0) {
+			char *type = make_me_type (prop->extra_gtktype,
+						   "G_TYPE_BOXED");
 			if (prop->extra_gtktype == NULL) {
 				error_print (GOB_ERROR, prop->line_no,
 					     _("Property linking requested for BOXED, but "
 					       "boxed_type not set"));
 			}
 			set = g_strdup_printf("{ gpointer ___old = (gpointer)%s->%s; "
-					      "gpointer ___new = (gpointer)gtk_value_get_boxed (VAL); "
+					      "gpointer ___new = (gpointer)g_value_get_boxed (VAL); "
 					      "if (___new != ___old) { "
 					        "if (___old != NULL) g_boxed_free (%s, ___old); "
 					        "if (___new != NULL) %s->%s = g_boxed_copy (%s, ___new); "
@@ -507,29 +535,53 @@ property_link_and_export (Node *node)
 					      "} "
 					      "}",
 					      root, prop->name,
-					      prop->extra_gtktype,
+					      type,
 					      root, prop->name,
-					      prop->extra_gtktype,
+					      type,
 					      root, prop->name);
-			get = g_strdup_printf("g_value_set_object (VAL, %s->%s);",
+			get = g_strdup_printf("g_value_set_boxed (VAL, %s->%s);",
 					      root, prop->name);
+			g_free (type);
 		} else {
 			char *set_func;
 			char *get_func;
+			const char *getcast = "";
+			const char *setcast = "";
+			char *to_free = NULL;
 			set_func = g_strdup_printf ("g_value_set_%s", prop->gtktype);
 			g_strdown (set_func);
 			get_func = g_strdup_printf ("g_value_get_%s", prop->gtktype);
 			g_strdown (get_func);
 
-			set = g_strdup_printf("%s->%s = %s (VAL);",
+			if (for_cpp) {
+				if (strcmp (prop->gtktype, "FLAGS") == 0) {
+					setcast = "(guint) ";
+					getcast = to_free =
+						get_prop_enum_flag_cast (prop);
+				} else if (strcmp (prop->gtktype, "ENUM") == 0) {
+					setcast = "(gint) ";
+					getcast = to_free =
+						get_prop_enum_flag_cast (prop);
+                               }  else if (strcmp (prop->gtktype, "POINTER") == 0) {
+                                       setcast = "(gpointer) ";
+                                       getcast = g_strdup_printf ("(%s%s) ",
+								  prop->ptype->name,
+								  prop->ptype->pointer ? prop->ptype->pointer : "");
+				}
+			}
+
+			set = g_strdup_printf("%s->%s = %s%s (VAL);",
 					      root, prop->name,
+					      getcast,
 					      get_func);
-			get = g_strdup_printf("%s (VAL, %s->%s);",
+			get = g_strdup_printf("%s (VAL, %s%s->%s);",
 					      set_func,
+					      setcast,	
 					      root, prop->name);
 
 			g_free (get_func);
 			g_free (set_func);
+			g_free (to_free);
 		}
 
 		node_set (node,
@@ -967,7 +1019,7 @@ argument:	ARGUMENT flags argtype TOKEN export TOKEN '{' CCODE TOKEN '{' CCODE ';
 			char *get, *set = NULL;
 			Variable *var;
 			Type *type;
-			char *root;
+			const char *root;
 			
 			if(strcmp($<id>6, "link")!=0 &&
 			   strcmp($<id>6, "stringlink")!=0 && 
@@ -984,15 +1036,16 @@ argument:	ARGUMENT flags argtype TOKEN export TOKEN '{' CCODE TOKEN '{' CCODE ';
 			type = pop_type();
 
 			var = find_var_or_die($<id>4, $<line>1);
-			if(var->scope == PRIVATE_SCOPE)
+			if(var->scope == PRIVATE_SCOPE) {
 				root = "self->_priv";
-			else if(var->scope == CLASS_SCOPE) {
+			} 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
+			} else {
 				root = "self";
+			}
 
 			if(strcmp($<id>6, "link")==0) {
 				set = g_strdup_printf("%s->%s = ARG;",
@@ -1231,30 +1284,60 @@ param_spec_value: NICK '=' string		{
 			  "ptype:steal", type,
 			  NULL);
 		  }
+	|	FLAGS_TYPE '=' TYPETOKEN	{
+		ensure_property ();
+		node_set ((Node *)property,
+			  "extra_gtktype:steal", $<id>3,
+			  NULL);
+		  }
 	|	FLAGS_TYPE '=' TOKEN		{
 		ensure_property ();
 		node_set ((Node *)property,
 			  "extra_gtktype:steal", $<id>3,
 			  NULL);
 		  }
+	|	ENUM_TYPE '=' TYPETOKEN		{
+		ensure_property ();
+		node_set ((Node *)property,
+			  "extra_gtktype:steal", $<id>3,
+			  NULL);
+		  }
 	|	ENUM_TYPE '=' TOKEN		{
 		ensure_property ();
 		node_set ((Node *)property,
 			  "extra_gtktype:steal", $<id>3,
 			  NULL);
 		  }
+	|	PARAM_TYPE '=' TYPETOKEN	{
+		ensure_property ();
+		node_set ((Node *)property,
+			  "extra_gtktype:steal", $<id>3,
+			  NULL);
+		  }
 	|	PARAM_TYPE '=' TOKEN		{
 		ensure_property ();
 		node_set ((Node *)property,
 			  "extra_gtktype:steal", $<id>3,
 			  NULL);
 		  }
+	|	BOXED_TYPE '=' TYPETOKEN	{
+		ensure_property ();
+		node_set ((Node *)property,
+			  "extra_gtktype:steal", $<id>3,
+			  NULL);
+		  }
 	|	BOXED_TYPE '=' TOKEN		{
 		ensure_property ();
 		node_set ((Node *)property,
 			  "extra_gtktype:steal", $<id>3,
 			  NULL);
 		  }
+	|	OBJECT_TYPE '=' TYPETOKEN	{
+		ensure_property ();
+		node_set ((Node *)property,
+			  "extra_gtktype:steal", $<id>3,
+			  NULL);
+		  }
 	|	OBJECT_TYPE '=' TOKEN		{
 		ensure_property ();
 		node_set ((Node *)property,
@@ -1263,7 +1346,12 @@ param_spec_value: NICK '=' string		{
 		  }
 	|	TOKEN		{
 		ensure_property ();
-		if (strcmp ($<id>1, "link") == 0) {
+		if (strcmp ($<id>1, "override") == 0) {
+			g_free($<id>1);
+			node_set ((Node *)property,
+				  "override", TRUE,
+				  NULL);
+		} else if (strcmp ($<id>1, "link") == 0) {
 			g_free($<id>1);
 			node_set ((Node *)property,
 				  "link", TRUE,
@@ -1634,8 +1722,8 @@ returnvals:	TOKEN retcode		{
 
 retcode:	numtok			{ $<id>$ = $<id>1; }
 	|	'{' CCODE		{
-			$<id>$ = ($<cbuf>3)->str;
-			g_string_free($<cbuf>3, FALSE);
+			$<id>$ = ($<cbuf>2)->str;
+			g_string_free($<cbuf>2, FALSE);
 					}
 	;