static GList *funcargs = NULL;
static GList *checks = NULL;
static int has_self = FALSE;
+static int vararg = FALSE;
static GList *gtktypes = NULL;
}
static void
-push_variable(char *name, int scope, int line_no)
+push_variable(char *name, int scope, int line_no, char *postfix)
{
Node *var;
Type *type = typestack->data;
typestack = g_list_remove(typestack,typestack->data);
+
+ type->postfix = postfix;
var = new_variable(scope,type,name,line_no);
class_nodes = g_list_append(class_nodes, var);
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;
type = typestack->data;
typestack = g_list_remove(typestack,typestack->data);
} else {
- type = (Type *)new_type(0,g_strdup("void"));
+ type = (Type *)new_type(0,g_strdup("void"),NULL);
}
+ /* a complicated and ugly test to figure out if we have
+ the wrong number of types for a signal */
+ if((scope == SIGNAL_FIRST_METHOD ||
+ scope == SIGNAL_LAST_METHOD ||
+ scope == PRIVATE_SIGNAL_FIRST_METHOD ||
+ scope == PRIVATE_SIGNAL_LAST_METHOD) &&
+ g_list_length(gtktypes) != g_list_length(funcargs) &&
+ !(g_list_length(funcargs) == 1 &&
+ g_list_length(gtktypes) == 2 &&
+ 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);
+ }
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;
}
static void
-push_funcarg(char *name)
+push_funcarg(char *name, char *postfix)
{
Node *node;
Type *type = typestack->data;
typestack = g_list_remove(typestack,typestack->data);
+
+ type->postfix = postfix;
node = new_funcarg(type,name,checks);
checks = NULL;
else
tn = g_strdup(((Class *)class)->otype);
- type = new_type(1,tn);
+ type = new_type(1,tn,NULL);
node = new_funcarg((Type *)type,name,NULL);
funcargs = g_list_prepend(funcargs, node);
}
Node *node;
Node *type;
GList *ch = NULL;
- type = new_type(1,g_strdup(((Class *)class)->otype));
+ type = new_type(1,g_strdup(((Class *)class)->otype),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);
GString *cbuf;
GList *list;
int line;
+ int sigtype;
}
%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
+%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM
%token <cbuf> CCODE HCODE
%token <line> PUBLIC PRIVATE ARGUMENT VIRTUAL SIGNAL OVERRIDE
;
variable: PUBLIC type TOKEN ';' {
- push_variable($<id>3,PUBLIC_SCOPE,$<line>1);
+ push_variable($<id>3,PUBLIC_SCOPE,$<line>1,NULL);
}
- | PRIVATE type TOKEN ';' {
- push_variable($<id>3,PRIVATE_SCOPE,$<line>1);
+ | PUBLIC type TOKEN ARRAY_DIM ';' {
+ push_variable($<id>3,PUBLIC_SCOPE,$<line>1,$<id>4);
}
+ | PRIVATE type TOKEN ';' {
+ push_variable($<id>3,PRIVATE_SCOPE,$<line>1,NULL);
+ }
+ | PRIVATE type TOKEN ARRAY_DIM ';' {
+ push_variable($<id>3,PRIVATE_SCOPE,$<line>1,$<id>4);
+ }
;
argument: ARGUMENT argflags TOKEN TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
if(strcmp($<id>5,"get")==0 &&
;
-type: type1 {
- Node *node = new_type(0,$<id>1);
+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,NULL);
typestack = g_list_prepend(typestack,node);
}
- | type1 stars {
- Node *node = new_type(stars,$<id>1);
+ | type2 stars {
+ Node *node = new_type(stars,$<id>1,NULL);
stars = 0;
typestack = g_list_prepend(typestack,node);
}
;
-type1: UNSIGNED integer {
+type2: UNSIGNED integer {
$<id>$ = g_strconcat("unsigned ",$<id>2,NULL);
}
| SIGNED integer {
stars: '*' stars { stars++; }
| '*' { stars++; }
;
+
+fullsigtype: PRIVATE TOKEN sigtype {
+ if(strcmp($<id>2,"first")==0)
+ $<sigtype>$ = PRIVATE_SIGNAL_FIRST_METHOD;
+ else if(strcmp($<id>2,"last")==0)
+ $<sigtype>$ = PRIVATE_SIGNAL_LAST_METHOD;
+ else {
+ yyerror(_("signal must be 'first' or 'last'"));
+ g_free($<id>2);
+ YYERROR;
+ }
+ g_free($<id>2);
+ }
+ | TOKEN PRIVATE sigtype {
+ if(strcmp($<id>1,"first")==0)
+ $<sigtype>$ = PRIVATE_SIGNAL_FIRST_METHOD;
+ else if(strcmp($<id>1,"last")==0)
+ $<sigtype>$ = PRIVATE_SIGNAL_LAST_METHOD;
+ else {
+ yyerror(_("signal must be 'first' or 'last'"));
+ g_free($<id>1);
+ YYERROR;
+ }
+ g_free($<id>1);
+ }
+ | PRIVATE sigtype {
+ $<sigtype>$ = PRIVATE_SIGNAL_LAST_METHOD;
+ }
+ | TOKEN sigtype {
+ if(strcmp($<id>1,"first")==0)
+ $<sigtype>$ = SIGNAL_FIRST_METHOD;
+ else if(strcmp($<id>1,"last")==0)
+ $<sigtype>$ = SIGNAL_LAST_METHOD;
+ else {
+ yyerror(_("signal must be 'first' or 'last'"));
+ g_free($<id>1);
+ YYERROR;
+ }
+ g_free($<id>1);
+ }
+ | sigtype {
+ $<sigtype>$ = SIGNAL_LAST_METHOD;
+ }
+ ;
sigtype: TOKEN '(' tokenlist ')' {
gtktypes = g_list_prepend(gtktypes,$<id>1);
;
/*here CCODE will include the ending '}' */
-method: SIGNAL TOKEN sigtype type TOKEN '(' funcargs ')' onerror codenocode {
- int sigtype = SIGNAL_LAST_METHOD;
- if(strcmp($<id>2,"first")==0)
- sigtype = SIGNAL_FIRST_METHOD;
- else if(strcmp($<id>2,"last")==0)
- sigtype = SIGNAL_LAST_METHOD;
- else {
- yyerror(_("signal must be 'first' or 'last'"));
- g_free($<id>2);
- YYERROR;
- }
- g_free($<id>2);
-
+method: SIGNAL fullsigtype type TOKEN '(' funcargs ')' onerror codenocode {
if(!has_self) {
yyerror(_("signal without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(sigtype,NULL,
- $<id>5, $<id>9, $<cbuf>10,$<line>1,ccode_line);
+ push_function($<sigtype>2,NULL,
+ $<id>4, $<id>8, $<cbuf>9,$<line>1,
+ ccode_line,vararg);
}
- | SIGNAL sigtype type TOKEN '(' funcargs ')' onerror codenocode {
+ | VIRTUAL PRIVATE type TOKEN '(' funcargs ')' onerror codenocode {
if(!has_self) {
- yyerror(_("signal without 'self' as "
+ yyerror(_("virtual method without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(SIGNAL_LAST_METHOD, NULL,
- $<id>4, $<id>8, $<cbuf>9,$<line>1,ccode_line);
+ push_function(PRIVATE_VIRTUAL_METHOD, NULL, $<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);
- } 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);
- } else {
- g_free($<id>1);
- g_free($<id>3);
- yyerror(_("parse error"));
- YYERROR;
- }
- }
- | TOKEN '(' TOKEN ')' '{' CCODE {
+ | TOKEN '(' TOKEN ')' codenocode {
if(strcmp($<id>1,"init")==0) {
push_init_arg($<id>3,FALSE);
push_function(INIT_METHOD, NULL,
- $<id>1, NULL, $<cbuf>6,$<line>2,
- $<line>5);
+ $<id>1, NULL, $<cbuf>5,$<line>2,
+ ccode_line,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);
+ $<id>1, NULL, $<cbuf>5,$<line>2,
+ ccode_line,FALSE);
} else {
g_free($<id>1);
g_free($<id>3);
| { $<id>$ = NULL; }
;
-
-
-funcargs: VOID { has_self = FALSE; }
+funcargs: VOID { vararg = FALSE; has_self = FALSE; }
| TOKEN {
+ vararg = FALSE;
has_self = TRUE;
- if(strcmp($<id>1,"this")==0) {
- push_self($<id>1);
- print_error(TRUE,_("Use of 'this' is "
- "depreciated, use 'self' "
- "instead"),line_no);
- } else if(strcmp($<id>1,"self")==0)
+ if(strcmp($<id>1,"self")==0)
push_self($<id>1);
else {
g_free($<id>1);
}
| TOKEN ',' arglist {
has_self = TRUE;
- if(strcmp($<id>1,"this")==0) {
- push_self($<id>1);
- print_error(TRUE,_("Use of 'this' is "
- "depreciated, use 'self' "
- "instead"),line_no);
- } else if(strcmp($<id>1,"self")==0)
+ if(strcmp($<id>1,"self")==0)
push_self($<id>1);
else {
g_free($<id>1);
}
| arglist { has_self = FALSE; }
;
+
+arglist: arglist1 ',' THREEDOTS { vararg = TRUE; }
+ | arglist1 { vararg = FALSE; }
+ ;
-arglist: arglist ',' arg { ; }
+arglist1: arglist1 ',' arg { ; }
| arg { ; }
;
arg: type TOKEN {
- push_funcarg($<id>2);
+ push_funcarg($<id>2,NULL);
+ }
+ | type TOKEN ARRAY_DIM {
+ push_funcarg($<id>2,$<id>3);
}
| type TOKEN '(' TOKEN checklist ')' {
if(strcmp($<id>4,"check")!=0) {
YYERROR;
}
g_free($<id>4);
- push_funcarg($<id>2);
+ push_funcarg($<id>2,NULL);
+ }
+ | type TOKEN ARRAY_DIM '(' TOKEN checklist ')' {
+ if(strcmp($<id>5,"check")!=0) {
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ g_free($<id>5);
+ push_funcarg($<id>2,$<id>3);
}
;
projects / gob-dx.git / blobdiff