#include <stdio.h>
#include <string.h>
-#include "tree.h"
+#include "treefuncs.h"
#include "main.h"
#include "util.h"
static char *initializer = NULL;
static int initializer_line = 0;
+static char *onerror = NULL;
+static char *defreturn = NULL;
+
static GList *gtktypes = NULL;
/* this can be a global as we will only do one function at a time
if(strcmp(yytext,"\n")==0) {
out=g_strconcat("Error: ",str," before newline",NULL);
} else if(yytext[0]=='\0') {
- out=g_strconcat("Error: ",str," at end of input",NULL);
+ out=g_strconcat("Error: ", str, " at end of input", NULL);
} else {
char *tmp = g_strdup(yytext);
- while((p=strchr(tmp,'\n')))
+ while((p=strchr(tmp, '\n')))
*p='.';
- out=g_strconcat("Error: ",str," before '",tmp,"'",NULL);
+ out=g_strconcat("Error: ", str, " before '", tmp, "'", NULL);
g_free(tmp);
}
- fprintf(stderr,"%s:%d: %s\n",filename,line_no,out);
+ fprintf(stderr, "%s:%d: %s\n", filename, line_no, out);
g_free(out);
exit(1);
}
static void
-push_function(int scope, int method, char *oid, char *id, char *onerror,
- 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_list_length(gtktypes) != g_list_length(funcargs) &&
!(g_list_length(funcargs) == 1 &&
g_list_length(gtktypes) == 2 &&
- strcmp(gtktypes->next->data,"NONE")==0)) {
+ 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);
+ "don't seem to match"), line_no);
+ }
+ 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,
+ _("NONE can only appear in an "
+ "argument list by itself"),
+ line_no);
+ }
+ }
}
if(cbuf) {
char *p;
c_cbuf = NULL;
node = new_method(scope, method, type, oid, gtktypes, flags,
- id, funcargs, onerror, c_cbuf, line_no,
+ id, funcargs, onerror, defreturn, c_cbuf, line_no,
ccode_line, vararg);
if(cbuf)
gtktypes = NULL;
funcargs = NULL;
+ onerror = NULL;
+ defreturn = NULL;
+
class_nodes = g_list_append(class_nodes, node);
}
+static void
+free_all_global_state(void)
+{
+ g_free(onerror);
+ onerror = NULL;
+ g_free(defreturn);
+ defreturn = NULL;
+
+ g_list_foreach(gtktypes, (GFunc)g_free, NULL);
+ g_list_free(gtktypes);
+ gtktypes = NULL;
+
+ free_node_list(funcargs);
+ funcargs = NULL;
+}
+
static void
push_funcarg(char *name, char *postfix)
{
type->postfix = postfix;
- node = new_funcarg(type,name,checks);
+ node = new_funcarg(type, name, checks);
checks = NULL;
funcargs = g_list_append(funcargs, node);
return NULL;
}
+static gboolean
+set_return_value(char *type, char *val)
+{
+ if(strcmp(type, "onerror")==0) {
+ if(!onerror) {
+ onerror = val;
+ return TRUE;
+ } else
+ return FALSE;
+ } else if(strcmp(type, "defreturn")==0) {
+ if(!defreturn) {
+ defreturn = val;
+ return TRUE;
+ } else
+ return FALSE;
+ }
+ return FALSE;
+}
+
%}
%union {
%token CLASS FROM
%token CONST VOID STRUCT UNION ENUM THREEDOTS
%token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR
-%token ONERROR
%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM
%token <cbuf> CCODE HTCODE PHCODE HCODE ACODE ATCODE
if(strcmp($<id>1, "destroywith")==0) {
g_free($<id>1);
destructor = $<id>2;
- destructor_line = ccode_line;
+ destructor_line = line_no;
destructor_simple = TRUE;
} else {
g_free($<id>1);
}
| ARGUMENT flags argtype TOKEN TOKEN {
Node *node;
- char *get, *set;
+ char *get, *set = NULL;
Variable *var;
Type *type;
char *root;
/* this never sets the_scope */
simplesigtype: TOKEN sigtype {
- if(strcmp($<id>1,"first")==0)
+ if(strcmp($<id>1, "first")==0)
$<sigtype>$ = SIGNAL_FIRST_METHOD;
- else if(strcmp($<id>1,"last")==0)
+ else if(strcmp($<id>1, "last")==0)
$<sigtype>$ = SIGNAL_LAST_METHOD;
else {
yyerror(_("signal must be 'first' or 'last'"));
;
sigtype: TOKEN '(' tokenlist ')' {
- gtktypes = g_list_prepend(gtktypes,$<id>1);
+ gtktypes = g_list_prepend(gtktypes, $<id>1);
}
;
tokenlist: tokenlist ',' TOKEN {
- gtktypes = g_list_append(gtktypes,$<id>3);
+ gtktypes = g_list_append(gtktypes, $<id>3);
}
| TOKEN {
- gtktypes = g_list_append(gtktypes,$<id>1);
+ gtktypes = g_list_append(gtktypes, $<id>1);
}
;
;
/*here CCODE will include the ending '}' */
-method: SIGNAL flags fullsigtype type TOKEN '(' funcargs ')' onerror codenocode {
+method: SIGNAL flags fullsigtype type TOKEN '(' funcargs ')' returnvals codenocode {
if(!has_self) {
yyerror(_("signal without 'self' as "
"first parameter"));
+ free_all_global_state();
YYERROR;
}
push_function(the_scope, $<sigtype>3,NULL,
- $<id>5, $<id>9, $<cbuf>10,$<line>1,
+ $<id>5, $<cbuf>10,$<line>1,
ccode_line, vararg, $<list>2);
}
- | scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' onerror codenocode {
+ | scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' returnvals codenocode {
if(!has_self) {
yyerror(_("signal without 'self' as "
"first parameter"));
+ free_all_global_state();
YYERROR;
}
push_function(the_scope, $<sigtype>4, NULL,
- $<id>6, $<id>10, $<cbuf>11, $<line>2,
+ $<id>6, $<cbuf>11, $<line>2,
ccode_line, vararg, $<list>3);
}
- | VIRTUAL scope type TOKEN '(' funcargs ')' onerror codenocode {
+ | VIRTUAL scope type TOKEN '(' funcargs ')' returnvals codenocode {
if(!has_self) {
yyerror(_("virtual method without 'self' as "
"first parameter"));
+ free_all_global_state();
YYERROR;
}
push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4,
- $<id>8, $<cbuf>9, $<line>1,
+ $<cbuf>9, $<line>1,
ccode_line, vararg, NULL);
}
- | scope VIRTUAL type TOKEN '(' funcargs ')' onerror codenocode {
+ | scope VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode {
if(!has_self) {
yyerror(_("virtual method without 'self' as "
"first parameter"));
+ free_all_global_state();
YYERROR;
}
push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4,
- $<id>8, $<cbuf>9, $<line>2,
+ $<cbuf>9, $<line>2,
ccode_line, vararg, NULL);
}
- | VIRTUAL type TOKEN '(' funcargs ')' onerror codenocode {
+ | VIRTUAL type TOKEN '(' funcargs ')' returnvals codenocode {
if(!has_self) {
yyerror(_("virtual method without 'self' as "
"first parameter"));
+ free_all_global_state();
YYERROR;
}
push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL,
- $<id>3, $<id>7, $<cbuf>8, $<line>1,
+ $<id>3, $<cbuf>8, $<line>1,
ccode_line, vararg, NULL);
}
- | OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' onerror codenocode {
+ | OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' returnvals codenocode {
push_function(NO_SCOPE, OVERRIDE_METHOD, $<id>3,
- $<id>6, $<id>10, $<cbuf>11,
+ $<id>6, $<cbuf>11,
$<line>1, ccode_line,
vararg, NULL);
}
- | scope type TOKEN '(' funcargs ')' onerror codenocode {
+ | scope type TOKEN '(' funcargs ')' returnvals codenocode {
push_function(the_scope, REGULAR_METHOD, NULL, $<id>3,
- $<id>7, $<cbuf>8, $<line>1, ccode_line,
+ $<cbuf>8, $<line>1, ccode_line,
vararg, NULL);
}
| TOKEN '(' TOKEN ')' codenocode {
- if(strcmp($<id>1,"init")==0) {
+ if(strcmp($<id>1, "init")==0) {
push_init_arg($<id>3,FALSE);
push_function(NO_SCOPE, INIT_METHOD, NULL,
- $<id>1, NULL, $<cbuf>5, $<line>2,
+ $<id>1, $<cbuf>5, $<line>2,
ccode_line, FALSE, NULL);
- } else if(strcmp($<id>1,"class_init")==0) {
+ } else if(strcmp($<id>1, "class_init")==0) {
push_init_arg($<id>3,TRUE);
push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL,
- $<id>1, NULL, $<cbuf>5, $<line>2,
+ $<id>1, $<cbuf>5, $<line>2,
ccode_line, FALSE, NULL);
} else {
g_free($<id>1);
}
}
;
-
-onerror: ONERROR numtok { $<id>$ = $<id>2; }
- | ONERROR '{' CCODE {
+
+returnvals: TOKEN retcode {
+ g_free(onerror); onerror = NULL;
+ g_free(defreturn); defreturn = NULL;
+ if(!set_return_value($<id>1, $<id>2)) {
+ g_free($<id>1);
+ g_free($<id>2);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ g_free($<id>1);
+ }
+ | TOKEN retcode TOKEN retcode {
+ g_free(onerror); onerror = NULL;
+ g_free(defreturn); defreturn = NULL;
+ if(!set_return_value($<id>1, $<id>2)) {
+ g_free($<id>1); g_free($<id>2);
+ g_free($<id>3); g_free($<id>4);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ if(!set_return_value($<id>3, $<id>4)) {
+ onerror = defreturn = NULL;
+ g_free($<id>1); g_free($<id>2);
+ g_free($<id>3); g_free($<id>4);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ g_free($<id>1);
+ g_free($<id>3);
+ }
+ | {
+ g_free(onerror); onerror = NULL;
+ g_free(defreturn); defreturn = NULL;
+ }
+ ;
+
+retcode: numtok { $<id>$ = $<id>1; }
+ | '{' CCODE {
$<id>$ = ($<cbuf>3)->str;
- g_string_free($<cbuf>3,FALSE);
+ g_string_free($<cbuf>3, FALSE);
}
- | { $<id>$ = NULL; }
;
funcargs: VOID { vararg = FALSE; has_self = FALSE; }
projects / gob-dx.git / blobdiff