X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/489e97ede850a8de01ca3bd653dce9c25dcd54a1..573256d3bc21896c54c511d5c0e6927f09b4209e:/src/parse.y

diff --git a/src/parse.y b/src/parse.y
index c7c0847..ded33fd 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;
 
@@ -501,7 +503,7 @@ property_link_and_export (Node *node)
 			if (prop->extra_gtktype != NULL) {
 				cast = remove_sep (prop->extra_gtktype);
 			} else {
-				cast = "void";
+				cast = g_strdup ("void");
 			}
 			set = g_strdup_printf("{ GObject *___old = (GObject *)%s->%s; "
 					      "%s->%s = (%s *)g_value_dup_object (VAL); "
@@ -517,6 +519,8 @@ property_link_and_export (Node *node)
 					       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 "
@@ -531,12 +535,13 @@ 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;
@@ -548,14 +553,16 @@ property_link_and_export (Node *node)
 			get_func = g_strdup_printf ("g_value_get_%s", prop->gtktype);
 			g_strdown (get_func);
 
-			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);
+			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);
+				}
 			}
 
 			set = g_strdup_printf("%s->%s = %s%s (VAL);",
@@ -1007,7 +1014,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 && 
@@ -1024,15 +1031,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;",
@@ -1704,8 +1712,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);
 					}
 	;