static GList *funcargs = NULL;
static GList *checks = NULL;
static int has_self = FALSE;
+static int vararg = FALSE;
static GList *gtktypes = NULL;
static void
push_function(int scope, char *oid, char *id, char *onerror,
- GString *cbuf,int line_no, int ccode_line)
+ GString *cbuf,int line_no, int ccode_line, int vararg)
{
Node *node;
Type *type;
}
node = new_method(scope,type,oid,gtktypes,id,funcargs,
- onerror,cbuf,line_no,ccode_line);
+ onerror,cbuf,line_no,ccode_line,vararg);
gtktypes = NULL;
funcargs = NULL;
}
%token CLASS FROM
-%token VOID STRUCT UNION ENUM SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR
-%token FIRST LAST
+%token CONST VOID STRUCT UNION ENUM THREEDOTS
+%token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR
%token ONERROR
%token <id> TOKEN NUMBER TYPETOKEN
;
-type: type1 {
+type: type1 { ; }
+ | CONST type1 {
+ Type *type = typestack->data;
+ char *oldname = type->name;
+ type->name = g_strconcat("const ",oldname,NULL);
+ g_free(oldname);
+ }
+ ;
+
+type1: type2 {
Node *node = new_type(0,$<id>1);
typestack = g_list_prepend(typestack,node);
}
- | type1 stars {
+ | type2 stars {
Node *node = new_type(stars,$<id>1);
stars = 0;
typestack = g_list_prepend(typestack,node);
}
;
-type1: UNSIGNED integer {
+type2: UNSIGNED integer {
$<id>$ = g_strconcat("unsigned ",$<id>2,NULL);
}
| SIGNED integer {
YYERROR;
}
push_function(sigtype,NULL,
- $<id>5, $<id>9, $<cbuf>10,$<line>1,ccode_line);
+ $<id>5, $<id>9, $<cbuf>10,$<line>1,
+ ccode_line,vararg);
}
| SIGNAL sigtype type TOKEN '(' funcargs ')' onerror codenocode {
if(!has_self) {
YYERROR;
}
push_function(SIGNAL_LAST_METHOD, NULL,
- $<id>4, $<id>8, $<cbuf>9,$<line>1,ccode_line);
+ $<id>4, $<id>8, $<cbuf>9,$<line>1,
+ ccode_line,vararg);
}
| VIRTUAL type TOKEN '(' funcargs ')' onerror codenocode {
if(!has_self) {
YYERROR;
}
push_function(VIRTUAL_METHOD, NULL, $<id>3,
- $<id>7, $<cbuf>8,$<line>1,ccode_line);
+ $<id>7, $<cbuf>8,$<line>1,
+ ccode_line,vararg);
}
| OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' onerror '{' CCODE {
push_function(OVERRIDE_METHOD, $<id>3,
- $<id>6, $<id>10, $<cbuf>12,$<line>1,$<line>11);
+ $<id>6, $<id>10, $<cbuf>12,
+ $<line>1,$<line>11,
+ vararg);
}
| PUBLIC type TOKEN '(' funcargs ')' onerror '{' CCODE {
push_function(PUBLIC_SCOPE, NULL, $<id>3,
- $<id>7, $<cbuf>9,$<line>1,$<line>8);
+ $<id>7, $<cbuf>9,$<line>1,$<line>8,
+ vararg);
}
| PRIVATE type TOKEN '(' funcargs ')' onerror '{' CCODE {
push_function(PRIVATE_SCOPE, NULL, $<id>3,
- $<id>7, $<cbuf>9,$<line>1,$<line>8);
+ $<id>7, $<cbuf>9,$<line>1,$<line>8,
+ vararg);
}
| TOKEN '(' TOKEN ')' ';' {
if(strcmp($<id>1,"init")==0) {
push_init_arg($<id>3,FALSE);
push_function(INIT_METHOD, NULL, $<id>1,
- NULL, NULL,$<line>2,0);
+ NULL, NULL,$<line>2,0,
+ FALSE);
} else if(strcmp($<id>1,"class_init")==0) {
push_init_arg($<id>3,TRUE);
push_function(CLASS_INIT_METHOD, NULL,
- $<id>1, NULL, NULL,$<line>2,0);
+ $<id>1, NULL, NULL,$<line>2,0,
+ FALSE);
} else {
g_free($<id>1);
g_free($<id>3);
push_init_arg($<id>3,FALSE);
push_function(INIT_METHOD, NULL,
$<id>1, NULL, $<cbuf>6,$<line>2,
- $<line>5);
+ $<line>5,FALSE);
} else if(strcmp($<id>1,"class_init")==0) {
push_init_arg($<id>3,TRUE);
push_function(CLASS_INIT_METHOD, NULL,
$<id>1, NULL, $<cbuf>6,$<line>2,
- $<line>5);
+ $<line>5,FALSE);
} else {
g_free($<id>1);
g_free($<id>3);
| { $<id>$ = NULL; }
;
-
-
funcargs: VOID { has_self = FALSE; }
| TOKEN {
has_self = TRUE;
}
| arglist { has_self = FALSE; }
;
+
+arglist: arglist1 ',' THREEDOTS { vararg = TRUE; }
+ | arglist1 { vararg = FALSE; }
+ ;
-arglist: arglist ',' arg { ; }
+arglist1: arglist1 ',' arg { ; }
| arg { ; }
;