/* GOB C Preprocessor
- * Copyright (C) 1999 the Free Software Foundation.
+ * Copyright (C) 1999-2000 the Free Software Foundation.
+ * Copyright (C) 2001 George Lebl
*
* Author: George Lebl
*
static GList *class_nodes = NULL;
Node *class = NULL;
-char *chunk_size = NULL;
+static char *chunk_size = NULL;
+static char *bonobo_x_class = NULL;
static GList *typestack = NULL;
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 gboolean destructor_unref = FALSE;
static char *destructor = NULL;
static int destructor_line = 0;
static gboolean destructor_simple = TRUE;
static GList *gtktypes = NULL;
+static Property *property = NULL;
+
/* this can be a global as we will only do one function at a time
anyway */
static int the_scope = NO_SCOPE;
}
static void
-push_variable(char *name, int scope, int line_no, char *postfix)
+push_variable (char *name, int scope, int line_no, char *postfix)
{
Node *var;
- Type *type = pop_type();
+ Type *type = pop_type ();
type->postfix = postfix;
- var = new_variable(scope, type, name, line_no,
- destructor, destructor_line,
- destructor_simple,
- initializer, initializer_line);
+ var = node_new (VARIABLE_NODE,
+ "scope", scope,
+ "vtype:steal", type,
+ "id:steal", name,
+ "line_no", line_no,
+ "destructor_unref", destructor_unref,
+ "destructor:steal", destructor,
+ "destructor_line", destructor_line,
+ "destructor_simple", destructor_simple,
+ "initializer:steal", initializer,
+ "initializer_line", initializer_line,
+ NULL);
class_nodes = g_list_append(class_nodes, var);
}
static void
-push_function(int scope, int method, char *oid, char *id,
- GString *cbuf, int line_no, int ccode_line,
- gboolean vararg, GList *flags)
+push_function (int scope, int method, char *oid, char *id,
+ GString *cbuf, int line_no, int ccode_line,
+ gboolean vararg, GList *flags)
{
Node *node;
Type *type;
g_assert(scope != CLASS_SCOPE);
if(method == INIT_METHOD || method == CLASS_INIT_METHOD) {
- type = (Type *)new_type(g_strdup("void"), NULL, NULL);
+ type = (Type *)node_new (TYPE_NODE,
+ "name", "void",
+ NULL);
} else {
type = pop_type();
}
} else
c_cbuf = NULL;
- node = new_method(scope, method, type, oid, gtktypes, flags,
- id, funcargs, onerror, defreturn, c_cbuf, line_no,
- ccode_line, vararg, method_unique_id++);
+ node = node_new (METHOD_NODE,
+ "scope", scope,
+ "method", method,
+ "mtype:steal", type,
+ "otype:steal", oid,
+ "gtktypes:steal", gtktypes,
+ "flags:steal", flags,
+ "id:steal", id,
+ "args:steal", funcargs,
+ "onerror:steal", onerror,
+ "defreturn:steal", defreturn,
+ "cbuf:steal", c_cbuf,
+ "line_no", line_no,
+ "ccode_line", ccode_line,
+ "vararg", vararg,
+ "unique_id", method_unique_id++,
+ NULL);
+
+ last_added_method = (Method *)node;
if(cbuf)
g_string_free(cbuf,
g_list_free(gtktypes);
gtktypes = NULL;
- free_node_list(funcargs);
+ node_list_free (funcargs);
funcargs = NULL;
}
type->postfix = postfix;
- node = new_funcarg(type, name, checks);
+ node = node_new (FUNCARG_NODE,
+ "atype:steal", type,
+ "name:steal", name,
+ "checks:steal", checks,
+ NULL);
checks = NULL;
funcargs = g_list_append(funcargs, node);
else
tn = g_strdup(((Class *)class)->otype);
- type = new_type(tn, g_strdup("*"), NULL);
- node = new_funcarg((Type *)type,name,NULL);
+ type = node_new (TYPE_NODE,
+ "name:steal", tn,
+ "pointer", "*",
+ NULL);
+ node = node_new (FUNCARG_NODE,
+ "atype:steal", (Type *)type,
+ "name:steal", name,
+ NULL);
funcargs = g_list_prepend(funcargs, node);
}
Node *node;
Node *type;
GList *ch = 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);
+ type = node_new (TYPE_NODE,
+ "name", ((Class *)class)->otype,
+ "pointer", constant ? "const *" : "*",
+ NULL);
+ ch = g_list_append (ch, node_new (CHECK_NODE,
+ "chtype", NULL_CHECK,
+ NULL));
+ ch = g_list_append (ch, node_new (CHECK_NODE,
+ "chtype", TYPE_CHECK,
+ NULL));
+ node = node_new (FUNCARG_NODE,
+ "atype:steal", (Type *)type,
+ "name:steal", id,
+ "checks:steal", ch,
+ NULL);
funcargs = g_list_prepend(funcargs, node);
}
return FALSE;
}
+static void
+export_accessors (const char *var_name,
+ gboolean do_get,
+ gboolean do_set,
+ int get_lineno,
+ int set_lineno,
+ Type *type,
+ const char *gtktype,
+ int lineno)
+{
+ Type *the_type;
+
+ if (type != NULL)
+ the_type = (Type *)node_copy ((Node *)type);
+ else
+ the_type = get_tree_type (gtktype, TRUE);
+
+ if (the_type == NULL) {
+ error_print (GOB_ERROR, line_no,
+ _("Cannot determine type of property or argument"));
+ return;
+ }
+
+ if (do_get) {
+ char *get_id = g_strdup_printf ("get_%s", var_name);
+ GString *get_cbuf = g_string_new (NULL);
+ Node *node1 = node_new (TYPE_NODE,
+ "name", the_type->name,
+ "pointer", the_type->pointer,
+ "postfix", the_type->postfix,
+ NULL);
+ Node *node3 = node_new (TYPE_NODE,
+ "name", class->class.otype,
+ "pointer", "*",
+ NULL);
+
+ g_string_sprintf (get_cbuf,
+ "\t%s%s val; "
+ "g_object_get (G_OBJECT (self), \"%s\", "
+ "&val, NULL); "
+ "return val;\n",
+ the_type->name,
+ the_type->pointer ? the_type->pointer : "",
+ var_name);
+
+ 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, get_lineno,
+ lineno, FALSE, NULL);
+ }
+
+ if (do_set) {
+ char *set_id = g_strdup_printf ("set_%s", var_name);
+ GString *set_cbuf = g_string_new (NULL);
+ Node *node1 = node_new (TYPE_NODE,
+ "name", the_type->name,
+ "pointer", the_type->pointer,
+ "postfix", the_type->postfix,
+ NULL);
+ Node *node2 = node_new (TYPE_NODE,
+ "name", "void",
+ NULL);
+ Node *node3 = node_new (TYPE_NODE,
+ "name", class->class.otype,
+ "pointer", "*",
+ NULL);
+
+ g_string_sprintf (set_cbuf,
+ "\tg_object_set (G_OBJECT (self), "
+ "\"%s\", val, NULL);\n",
+ var_name);
+
+ typestack = g_list_prepend (typestack, node2);
+ typestack = g_list_prepend (typestack, node1);
+ typestack = g_list_prepend (typestack, node3);
+
+ push_funcarg ("self", FALSE);
+ push_funcarg ("val", FALSE);
+
+ typestack = g_list_prepend (typestack, node2);
+ push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL,
+ set_id, set_cbuf, set_lineno,
+ lineno, FALSE, NULL);
+ }
+
+ node_free ((Node *)the_type);
+}
+
+static void
+property_link_and_export (Node *node)
+{
+ Property *prop = (Property *)node;
+
+ if (prop->link) {
+ const char *root;
+ char *get = NULL, *set = NULL;
+ Variable *var;
+
+ if (prop->set != NULL ||
+ prop->get != NULL) {
+ error_print (GOB_ERROR, prop->line_no,
+ _("Property linking requested, but "
+ "getters and setters exist"));
+ }
+
+ var = find_var_or_die (prop->name, prop->line_no);
+ if(var->scope == PRIVATE_SCOPE) {
+ root = "self->_priv";
+ } else if (var->scope == CLASS_SCOPE) {
+ root = "SELF_GET_CLASS(self)";
+ if (no_self_alias)
+ error_print (GOB_ERROR, prop->line_no,
+ _("Self aliases needed when autolinking to a classwide member"));
+ } else {
+ root = "self";
+ }
+
+ if (strcmp (prop->gtktype, "STRING") == 0) {
+ set = g_strdup_printf("g_free (%s->%s); "
+ "%s->%s = g_value_dup_string (VAL);",
+ root, prop->name,
+ root, prop->name);
+ 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; "
+ "} "
+ "if (___old != NULL) { "
+ "gtk_object_unref (GTK_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);
+ } else if (strcmp (prop->gtktype, "BOXED") == 0) {
+ 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); "
+ "if (___new != ___old) { "
+ "if (___old != NULL) g_boxed_free (%s, ___old); "
+ "if (___new != NULL) %s->%s = g_boxed_copy (%s, ___new); "
+ "else %s->%s = NULL;"
+ "} "
+ "}",
+ root, prop->name,
+ prop->extra_gtktype,
+ root, prop->name,
+ prop->extra_gtktype,
+ root, prop->name);
+ get = g_strdup_printf("g_value_set_object (VAL, %s->%s);",
+ root, prop->name);
+ } else {
+ char *set_func;
+ char *get_func;
+ 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);",
+ root, prop->name,
+ get_func);
+ get = g_strdup_printf("%s (VAL, %s->%s);",
+ set_func,
+ root, prop->name);
+
+ g_free (get_func);
+ g_free (set_func);
+ }
+
+ node_set (node,
+ "get:steal", get,
+ "get_line", prop->line_no,
+ "set:steal", set,
+ "set_line", prop->line_no,
+ NULL);
+ }
+
+ if (prop->export) {
+ export_accessors (prop->name,
+ prop->get != NULL, prop->get_line,
+ prop->set != NULL, prop->get_line,
+ prop->ptype,
+ prop->gtktype,
+ prop->line_no);
+ }
+}
+
+
+static char *
+debool (char *s)
+{
+ if (strcmp (s, "BOOL") == 0) {
+ error_print (GOB_WARN, line_no,
+ _("BOOL type is deprecated, please use BOOLEAN"));
+ g_free (s);
+ return g_strdup ("BOOLEAN");
+ } else {
+ return s;
+ }
+}
+
+static void
+ensure_property (void)
+{
+ if (property == NULL)
+ property = (Property *)node_new (PROPERTY_NODE, NULL);
+}
+
%}
%union {
%token CONST VOID STRUCT UNION ENUM THREEDOTS
%token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR
-%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM
-%token <cbuf> CCODE HTCODE PHCODE HCODE ACODE ATCODE
-%token <line> PUBLIC PRIVATE PROTECTED CLASSWIDE ARGUMENT VIRTUAL SIGNAL OVERRIDE
+%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM SINGLE_CHAR
+%token <cbuf> CCODE 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 FLAGS TYPE
+%token <line> FLAGS_TYPE ENUM_TYPE PARAM_TYPE BOXED_TYPE OBJECT_TYPE
%%
;
ccode: CCODE {
- Node *node = new_ccode(C_CCODE,($<cbuf>1)->str,
- ccode_line);
+ Node *node = node_new (CCODE_NODE,
+ "cctype", C_CCODE,
+ "cbuf:steal", ($<cbuf>1)->str,
+ "line_no", ccode_line,
+ NULL);
nodes = g_list_append(nodes,node);
g_string_free($<cbuf>1,FALSE);
}
| HCODE {
- Node *node = new_ccode(H_CCODE,($<cbuf>1)->str,
- ccode_line);
+ Node *node = node_new (CCODE_NODE,
+ "cctype", H_CCODE,
+ "cbuf:steal", ($<cbuf>1)->str,
+ "line_no", ccode_line,
+ NULL);
nodes = g_list_append(nodes,node);
g_string_free($<cbuf>1,FALSE);
}
| HTCODE {
- Node *node = new_ccode(HT_CCODE,($<cbuf>1)->str,
- ccode_line);
+ Node *node = node_new (CCODE_NODE,
+ "cctype", HT_CCODE,
+ "cbuf:steal", ($<cbuf>1)->str,
+ "line_no", ccode_line,
+ NULL);
nodes = g_list_append(nodes,node);
g_string_free($<cbuf>1,FALSE);
}
| PHCODE {
- Node *node = new_ccode(PH_CCODE,($<cbuf>1)->str,
- ccode_line);
+ Node *node = node_new (CCODE_NODE,
+ "cctype", PH_CCODE,
+ "cbuf:steal", ($<cbuf>1)->str,
+ "line_no", ccode_line,
+ NULL);
nodes = g_list_append(nodes,node);
g_string_free($<cbuf>1,FALSE);
}
| ACODE {
- Node *node = new_ccode(A_CCODE,($<cbuf>1)->str,
- ccode_line);
+ Node *node = node_new (CCODE_NODE,
+ "cctype", A_CCODE,
+ "cbuf:steal", ($<cbuf>1)->str,
+ "line_no", ccode_line,
+ NULL);
nodes = g_list_append(nodes,node);
g_string_free($<cbuf>1,FALSE);
}
| ATCODE {
- Node *node = new_ccode(AT_CCODE,($<cbuf>1)->str,
- ccode_line);
+ Node *node = node_new (CCODE_NODE,
+ "cctype", AT_CCODE,
+ "cbuf:steal", ($<cbuf>1)->str,
+ "line_no", ccode_line,
+ NULL);
nodes = g_list_append(nodes,node);
g_string_free($<cbuf>1,FALSE);
}
}
;
-classdec: CLASS TYPETOKEN FROM TYPETOKEN chunk {
- class = new_class($<id>2,$<id>4,chunk_size,NULL);
+classdec: CLASS TYPETOKEN FROM TYPETOKEN classflags {
+ class = node_new (CLASS_NODE,
+ "otype:steal", $<id>2,
+ "ptype:steal", $<id>4,
+ "bonobo_x_class:steal", bonobo_x_class,
+ "chunk_size:steal", chunk_size,
+ NULL);
}
;
-chunk:
- | '(' TOKEN TOKEN ')' {
+classflags:
+ | '(' TOKEN TOKEN ')' classflags {
if(strcmp($<id>2,"chunks") == 0) {
- chunk_size = g_strdup($<id>4);
+ 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 ')' {
+ | '(' TOKEN NUMBER ')' classflags {
if(strcmp($<id>2,"chunks") == 0) {
- if(atoi($<id>4) != 0)
- chunk_size = g_strdup($<id>4);
+ g_free (chunk_size);
+ if(atoi($<id>3) != 0)
+ chunk_size = g_strdup($<id>3);
+ else
+ chunk_size = NULL;
} else {
yyerror(_("parse error"));
YYERROR;
;
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 { ; }
+ | property { ; }
| ';' { ; }
;
;
destructor: TOKEN TOKEN {
- if(strcmp($<id>1, "destroywith")==0) {
- g_free($<id>1);
+ if (strcmp ($<id>1, "destroywith") == 0) {
+ g_free ($<id>1);
+ destructor_unref = FALSE;
+ destructor = $<id>2;
+ destructor_line = line_no;
+ destructor_simple = TRUE;
+ } else if (strcmp ($<id>1, "unrefwith") == 0) {
+ g_free ($<id>1);
+ destructor_unref = TRUE;
destructor = $<id>2;
destructor_line = line_no;
destructor_simple = TRUE;
} else {
- g_free($<id>1);
- g_free($<id>2);
- yyerror(_("parse error"));
+ g_free ($<id>1);
+ g_free ($<id>2);
+ yyerror (_("parse error"));
YYERROR;
}
}
| TOKEN '{' CCODE {
- if(strcmp($<id>1, "destroy")==0) {
+ if (strcmp ($<id>1, "destroy") == 0) {
g_free($<id>1);
+ destructor_unref = FALSE;
destructor = ($<cbuf>3)->str;
g_string_free($<cbuf>3, FALSE);
destructor_line = ccode_line;
destructor_simple = FALSE;
+ } else if (strcmp ($<id>1, "unref") == 0) {
+ g_free ($<id>1);
+ destructor_unref = TRUE;
+ destructor = ($<cbuf>3)->str;
+ g_string_free ($<cbuf>3, FALSE);
+ destructor_line = ccode_line;
+ destructor_simple = FALSE;
} else {
- g_free($<id>1);
- g_string_free($<cbuf>3, TRUE);
- yyerror(_("parse error"));
+ g_free ($<id>1);
+ g_string_free ($<cbuf>3, TRUE);
+ yyerror (_("parse error"));
YYERROR;
}
}
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) {
- Node *node;
+
+argument: ARGUMENT flags argtype TOKEN export TOKEN '{' CCODE TOKEN '{' CCODE ';' {
+ Node *node = NULL;
+ if(strcmp($<id>6,"get")==0 &&
+ strcmp($<id>9,"set")==0) {
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 = node_new (ARGUMENT_NODE,
+ "gtktype:steal", $<id>3,
+ "atype:steal", type,
+ "flags:steal", $<list>2,
+ "name:steal", $<id>4,
+ "get:steal", ($<cbuf>8)->str,
+ "get_line", $<line>7,
+ "set:steal", ($<cbuf>11)->str,
+ "set_line", $<line>10,
+ "line_no", $<line>1,
+ NULL);
+
class_nodes = g_list_append(class_nodes,node);
- } else if(strcmp($<id>5,"set")==0 &&
- strcmp($<id>8,"get")==0) {
- Node *node;
+
+ g_string_free ($<cbuf>8, FALSE);
+ g_string_free ($<cbuf>11, FALSE);
+
+ } else if(strcmp($<id>6,"set")==0 &&
+ strcmp($<id>9,"get")==0) {
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 = node_new (ARGUMENT_NODE,
+ "gtktype:steal", $<id>3,
+ "atype:steal", type,
+ "flags:steal", $<list>2,
+ "name:steal", $<id>4,
+ "get:steal", ($<cbuf>11)->str,
+ "get_line", $<line>10,
+ "set:steal", ($<cbuf>8)->str,
+ "set_line", $<line>7,
+ "line_no", $<line>1,
+ NULL);
+ 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_list_free($<list>2);
- 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;
}
+
+ if ($<id>5 != NULL) {
+ Argument *arg = (Argument *)node;
+ export_accessors (arg->name,
+ arg->get != NULL, arg->get_line,
+ arg->set != NULL, arg->set_line,
+ arg->atype,
+ arg->gtktype,
+ arg->line_no);
+ g_free ($<id>5);
+ }
+
}
- | ARGUMENT flags argtype TOKEN TOKEN '{' CCODE ';' {
- if(strcmp($<id>5, "get") == 0) {
- Node *node;
+ | ARGUMENT flags argtype TOKEN export TOKEN '{' CCODE ';' {
+ Node *node = NULL;
+ if(strcmp($<id>6, "get") == 0) {
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);
+ g_free ($<id>6);
+ node = node_new (ARGUMENT_NODE,
+ "gtktype:steal", $<id>3,
+ "atype:steal", type,
+ "flags:steal", $<list>2,
+ "name:steal", $<id>4,
+ "get:steal", ($<cbuf>8)->str,
+ "get_line", $<line>7,
+ "line_no", $<line>1,
+ NULL);
+
+ g_string_free ($<cbuf>8, FALSE);
class_nodes = g_list_append(class_nodes, node);
- } else if(strcmp($<id>5, "set") == 0) {
- Node *node;
+ } else if(strcmp($<id>6, "set") == 0) {
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 = node_new (ARGUMENT_NODE,
+ "gtktype:steal", $<id>3,
+ "atype:steal", type,
+ "flags:steal", $<list>2,
+ "name:steal", $<id>4,
+ "set:steal", ($<cbuf>8)->str,
+ "set_line", $<line>7,
+ "line_no", $<line>1,
+ NULL);
+
+ 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_list_free($<list>2);
- 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;
}
+
+ if ($<id>5 != NULL) {
+ Argument *arg = (Argument *)node;
+ export_accessors (arg->name,
+ arg->get != NULL, arg->get_line,
+ arg->set != NULL, arg->set_line,
+ arg->atype,
+ arg->gtktype,
+ arg->line_no);
+ g_free ($<id>5);
+ }
}
- | 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);
} 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) {
- set = g_strdup_printf("g_free(%s->%s); "
- "%s->%s = g_strdup(ARG);",
+ } 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,
+ "if (ARG != NULL) "
+ "g_object_ref (G_OBJECT (ARG)); "
+ "if (%s->%s != NULL) "
+ "g_object_unref (G_OBJECT (%s->%s)); "
+ "%s->%s = ARG;",
root, $<id>4,
root, $<id>4,
root, $<id>4);
g_assert_not_reached();
}
- if(strcmp($<id>5, "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);
+ get = g_strdup_printf("ARG = %s->%s;", root, $<id>4);
+
+ g_free ($<id>6);
+
+ if (type == NULL)
+ type = (Type *)node_copy ((Node *)var->vtype);
+
+ node = node_new (ARGUMENT_NODE,
+ "gtktype:steal", $<id>3,
+ "atype:steal", type,
+ "flags:steal", $<list>2,
+ "name:steal", $<id>4,
+ "get:steal", get,
+ "get_line", $<line>1,
+ "set:steal", set,
+ "set_line", $<line>1,
+ "line_no", $<line>1,
+ NULL);
+
+ if ($<id>5 != NULL) {
+ Argument *arg = (Argument *)node;
+ export_accessors (arg->name,
+ arg->get != NULL, arg->get_line,
+ arg->set != NULL, arg->set_line,
+ arg->atype,
+ arg->gtktype,
+ arg->line_no);
+ g_free ($<id>5);
+ }
+
+ class_nodes = g_list_append (class_nodes, node);
+ }
+ ;
- g_free($<id>5);
+export: '(' TOKEN ')' {
+ if (strcmp ($<id>2, "export")!=0) {
+ g_free ($<id>2);
+ yyerror (_("parse error"));
+ YYERROR;
+ }
+ $<id>$ = $<id>2;
+ }
+ | {
+ $<id>$ = NULL;
+ }
+ ;
+
+property: PROPERTY TOKEN TOKEN param_spec TOKEN '{' CCODE TOKEN '{' CCODE ';' {
+ ensure_property ();
+ node_set ((Node *)property,
+ "line_no", $<line>1,
+ "gtktype:steal", debool ($<id>2),
+ "name:steal", $<id>3,
+ NULL);
+ if (strcmp ($<id>5, "get") == 0 &&
+ strcmp ($<id>8, "set") == 0) {
+ node_set ((Node *)property,
+ "get:steal", ($<cbuf>7)->str,
+ "get_line", $<line>6,
+ "set:steal", ($<cbuf>10)->str,
+ "set_line", $<line>9,
+ NULL);
+ g_string_free ($<cbuf>7, FALSE);
+ g_string_free ($<cbuf>10, FALSE);
+ g_free ($<id>5);
+ g_free ($<id>8);
+ } else if (strcmp ($<id>5, "set") == 0 &&
+ strcmp ($<id>8, "get") == 0) {
+ node_set ((Node *)property,
+ "get:steal", ($<cbuf>10)->str,
+ "get_line", $<line>9,
+ "set:steal", ($<cbuf>7)->str,
+ "set_line", $<line>6,
+ NULL);
+ g_string_free ($<cbuf>7, FALSE);
+ g_string_free ($<cbuf>10, FALSE);
+ g_free ($<id>5);
+ g_free ($<id>8);
+ } else {
+ g_string_free ($<cbuf>7, TRUE);
+ g_string_free ($<cbuf>10, TRUE);
+ g_free ($<id>5);
+ g_free ($<id>8);
+ node_free ((Node *)property);
+ property = NULL;
+ yyerror (_("parse error"));
+ YYERROR;
+ }
+ property_link_and_export ((Node *)property);
+ if (property != NULL) {
+ class_nodes = g_list_append (class_nodes,
+ property);
+ property = NULL;
+ }
+ }
+ | PROPERTY TOKEN TOKEN param_spec TOKEN '{' CCODE ';' {
+ ensure_property ();
+ node_set ((Node *)property,
+ "line_no", $<line>1,
+ "gtktype:steal", debool ($<id>2),
+ "name:steal", $<id>3,
+ NULL);
+ if (strcmp ($<id>5, "get") == 0) {
+ node_set ((Node *)property,
+ "get:steal", ($<cbuf>7)->str,
+ "get_line", $<line>6,
+ NULL);
+ g_string_free ($<cbuf>7, FALSE);
+ g_free ($<id>5);
+ } else if (strcmp ($<id>5, "set") == 0) {
+ node_set ((Node *)property,
+ "set:steal", ($<cbuf>7)->str,
+ "set_line", $<line>6,
+ NULL);
+ g_string_free ($<cbuf>7, FALSE);
+ g_free ($<id>5);
+ } else {
+ g_string_free ($<cbuf>7, TRUE);
+ g_free ($<id>5);
+ node_free ((Node *)property);
+ property = NULL;
+ yyerror (_("parse error"));
+ YYERROR;
+ }
+ property_link_and_export ((Node *)property);
+ if (property != NULL) {
+ class_nodes = g_list_append (class_nodes,
+ property);
+ property = NULL;
+ }
+ }
+ | PROPERTY TOKEN TOKEN param_spec ';' {
+ ensure_property ();
+ node_set ((Node *)property,
+ "line_no", $<line>1,
+ "gtktype:steal", debool ($<id>2),
+ "name:steal", $<id>3,
+ NULL);
+ property_link_and_export ((Node *)property);
+ if (property != NULL) {
+ class_nodes = g_list_append (class_nodes,
+ property);
+ property = NULL;
+ }
+ }
+ ;
+param_spec: '(' param_spec_list ')' { ; }
+ | { ; }
+ ;
- if(!type)
- type = copy_type(var->vtype);
+param_spec_list: param_spec_list ',' param_spec_value { ; }
+ | param_spec_value { ; }
+ ;
- node = new_argument($<id>3, type, $<list>2,
- $<id>4, get, $<line>1,
- set, $<line>1, $<line>1);
- class_nodes = g_list_append(class_nodes,node);
- }
+string: STRING { $<id>$ = $<id>1; }
+ | TOKEN '(' STRING ')' {
+ if (strcmp ($<id>1, "_") != 0) {
+ g_free ($<id>1);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ g_free ($<id>1);
+ $<id>$ = g_strconcat ("_(", $<id>3, ")", NULL);
+ g_free ($<id>3);
+ }
+ ;
+
+anyval: numtok { $<id>$ = $<id>1; }
+ | string { $<id>$ = $<id>1; }
+ ;
+
+param_spec_value: NICK '=' string {
+ ensure_property ();
+ node_set ((Node *)property,
+ "nick:steal", $<id>3,
+ NULL);
+ }
+ | BLURB '=' string {
+ ensure_property ();
+ node_set ((Node *)property,
+ "blurb:steal", $<id>3,
+ NULL);
+ }
+ | MAXIMUM '=' numtok {
+ ensure_property ();
+ node_set ((Node *)property,
+ "maximum:steal", $<id>3,
+ NULL);
+ }
+ | MINIMUM '=' numtok {
+ ensure_property ();
+ node_set ((Node *)property,
+ "minimum:steal", $<id>3,
+ NULL);
+ }
+ | DEFAULT_VALUE '=' anyval {
+ ensure_property ();
+ node_set ((Node *)property,
+ "default_value:steal", $<id>3,
+ NULL);
+ }
+ | FLAGS '=' flaglist {
+ ensure_property ();
+ node_set ((Node *)property,
+ "flags:steal", $<list>3,
+ NULL);
+ }
+ | TYPE '=' type {
+ Type *type = pop_type ();
+ ensure_property ();
+ node_set ((Node *)property,
+ "ptype:steal", type,
+ NULL);
+ }
+ | FLAGS_TYPE '=' TOKEN {
+ 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 '=' TOKEN {
+ 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 '=' TOKEN {
+ ensure_property ();
+ node_set ((Node *)property,
+ "extra_gtktype:steal", $<id>3,
+ NULL);
+ }
+ | TOKEN {
+ ensure_property ();
+ if (strcmp ($<id>1, "link") == 0) {
+ g_free($<id>1);
+ node_set ((Node *)property,
+ "link", TRUE,
+ NULL);
+ } else if (strcmp ($<id>1, "export") == 0) {
+ g_free($<id>1);
+ node_set ((Node *)property,
+ "export", TRUE,
+ NULL);
+ } else {
+ g_free($<id>1);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ }
;
argtype: TOKEN '(' TOKEN type ')' {
yyerror(_("parse error"));
YYERROR;
}
- $<id>$ = $<id>1;
+ $<id>$ = debool ($<id>1);
}
| TOKEN {
- $<id>$ = $<id>1;
+ $<id>$ = debool ($<id>1);
typestack = g_list_prepend(typestack,NULL);
}
;
type: specifier_list pointer {
- Node *node = new_type($<id>1, $<id>2, NULL);
+ Node *node = node_new (TYPE_NODE,
+ "name:steal", $<id>1,
+ "pointer:steal", $<id>2,
+ NULL);
typestack = g_list_prepend(typestack,node);
}
| specifier_list {
- Node *node = new_type($<id>1, NULL, NULL);
+ Node *node = node_new (TYPE_NODE,
+ "name:steal", $<id>1,
+ NULL);
typestack = g_list_prepend(typestack,node);
}
;
;
sigtype: TOKEN '(' tokenlist ')' {
- gtktypes = g_list_prepend(gtktypes, $<id>1);
+ gtktypes = g_list_prepend(gtktypes, debool ($<id>1));
}
;
tokenlist: tokenlist ',' TOKEN {
- gtktypes = g_list_append(gtktypes, $<id>3);
+ gtktypes = g_list_append(gtktypes, debool ($<id>3));
}
| TOKEN {
- gtktypes = g_list_append(gtktypes, $<id>1);
+ gtktypes = g_list_append(gtktypes, debool ($<id>1));
}
;
check: TOKEN {
if(strcmp($<id>1,"type")==0) {
- Node *node = new_check(TYPE_CHECK,NULL);
+ Node *node = node_new (CHECK_NODE,
+ "chtype", TYPE_CHECK,
+ NULL);
checks = g_list_append(checks,node);
} else if(strcmp($<id>1,"null")==0) {
- Node *node = new_check(NULL_CHECK,NULL);
+ Node *node = node_new (CHECK_NODE,
+ "chtype", NULL_CHECK,
+ NULL);
checks = g_list_append(checks,node);
} else {
yyerror(_("parse error"));
g_free($<id>1);
}
| '>' numtok {
- Node *node = new_check(GT_CHECK,$<id>2);
+ Node *node = node_new (CHECK_NODE,
+ "chtype", GT_CHECK,
+ "number:steal", $<id>2,
+ NULL);
checks = g_list_append(checks,node);
}
| '<' numtok {
- Node *node = new_check(LT_CHECK,$<id>2);
+ Node *node = node_new (CHECK_NODE,
+ "chtype", LT_CHECK,
+ "number:steal", $<id>2,
+ NULL);
checks = g_list_append(checks,node);
}
| '>' '=' numtok {
- Node *node = new_check(GE_CHECK,$<id>3);
+ Node *node = node_new (CHECK_NODE,
+ "chtype", GE_CHECK,
+ "number:steal", $<id>3,
+ NULL);
checks = g_list_append(checks,node);
}
| '<' '=' numtok {
- Node *node = new_check(LE_CHECK,$<id>3);
+ Node *node = node_new (CHECK_NODE,
+ "chtype", LE_CHECK,
+ "number:steal", $<id>3,
+ NULL);
checks = g_list_append(checks,node);
}
| '=' '=' numtok {
- Node *node = new_check(EQ_CHECK,$<id>3);
+ Node *node = node_new (CHECK_NODE,
+ "chtype", EQ_CHECK,
+ "number:steal", $<id>3,
+ NULL);
checks = g_list_append(checks,node);
}
| '!' '=' numtok {
- Node *node = new_check(NE_CHECK,$<id>3);
+ Node *node = node_new (CHECK_NODE,
+ "chtype", NE_CHECK,
+ "number:steal", $<id>3,
+ NULL);
checks = g_list_append(checks,node);
}
;
$<id>$ = g_strconcat("-",$<id>2,NULL);
g_free($<id>2);
}
+ | SINGLE_CHAR { $<id>$ = $<id>1; }
| TOKEN { $<id>$ = $<id>1; }
;
projects / gob-dx.git / blobdiff