*/
%{
+#include "config.h"
#include <glib.h>
#include <stdio.h>
#include <string.h>
#include "tree.h"
+#include "main.h"
+#include "util.h"
#define _(x) (x)
-extern char *filename;
-
GList *nodes = NULL;
static GList *class_nodes = NULL;
static int stars = 0;
static GList *funcargs = NULL;
static GList *checks = NULL;
-static int has_this = FALSE;
+static int has_self = FALSE;
+static int vararg = FALSE;
+
+/* destructor and initializer for variables */
+static char *destructor = NULL;
+static int destructor_line = 0;
+static gboolean destructor_simple = TRUE;
+static char *initializer = NULL;
+static int initializer_line = 0;
static GList *gtktypes = NULL;
+/* this can be a global as we will only do one function at a time
+ anyway */
+static int the_scope = NO_SCOPE;
+
void free(void *ptr);
int yylex(void);
+extern int ccode_line;
extern int line_no;
extern char *yytext;
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_variable(char *name, int scope)
+static Type *
+pop_type(void)
{
- Node *var;
Type *type = typestack->data;
typestack = g_list_remove(typestack,typestack->data);
+ return type;
+}
+
+static void
+push_variable(char *name, int scope, int line_no, char *postfix)
+{
+ Node *var;
+ Type *type = pop_type();
+
+ type->postfix = postfix;
- var = new_variable(scope,type,name);
+ var = new_variable(scope, type, name, line_no,
+ destructor, destructor_line,
+ destructor_simple,
+ initializer, initializer_line);
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)
+push_function(int scope, int method, char *oid, char *id, char *onerror,
+ GString *cbuf, int line_no, int ccode_line, gboolean vararg,
+ GList *flags)
{
Node *node;
Type *type;
+ char *c_cbuf;
- if(scope!=INIT_METHOD && scope!=CLASS_INIT_METHOD) {
- type = typestack->data;
- typestack = g_list_remove(typestack,typestack->data);
+ if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) {
+ type = pop_type();
} else {
- type = (Type *)new_type(0,g_strdup("void"));
+ type = (Type *)new_type(0,g_strdup("void"),NULL);
}
- node = new_method(scope,type,oid,gtktypes,id,funcargs,
- onerror,cbuf,line_no);
+ /* a complicated and ugly test to figure out if we have
+ the wrong number of types for a signal */
+ if((method == SIGNAL_FIRST_METHOD ||
+ method == 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);
+ }
+ if(cbuf) {
+ char *p;
+ c_cbuf = p = cbuf->str;
+ while(p && *p && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))
+ p++;
+ if(!p || !*p)
+ c_cbuf = NULL;
+ } else
+ c_cbuf = NULL;
+
+ node = new_method(scope, method, type, oid, gtktypes, flags,
+ id, funcargs, onerror, c_cbuf, line_no,
+ ccode_line, vararg);
+
+ if(cbuf)
+ g_string_free(cbuf,
+ /*only free segment if we haven't passed it
+ above */
+ c_cbuf?FALSE:TRUE);
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 *type = pop_type();
+
+ 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);
}
static void
-push_this(char *this)
+push_self(char *id)
{
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,this,ch);
+ node = new_funcarg((Type *)type,id,ch);
funcargs = g_list_prepend(funcargs, node);
}
+static Variable *
+find_var_or_die(const char *id, int line)
+{
+ GList *li;
+ char *s;
+
+ for(li = class_nodes; li != NULL; li = li->next) {
+ Variable *var;
+ Node *node = li->data;
+ if(node->type != VARIABLE_NODE)
+ continue;
+ var = li->data;
+ if(strcmp(var->id, id)==0)
+ return var;
+ }
+
+ s = g_strdup_printf(_("Variable %s not defined here"), id);
+ print_error(FALSE, s, line);
+
+ g_assert_not_reached();
+ return NULL;
+}
+
%}
%union {
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 CHECK CNULL TYPE ONERROR
+%token CONST VOID STRUCT UNION ENUM THREEDOTS
+%token SIGNED UNSIGNED LONG SHORT INT FLOAT DOUBLE CHAR
+%token ONERROR
-%token <id> TOKEN NUMBER TYPETOKEN
-%token <cbuf> CCODE HCODE
-%token <line> PUBLIC PRIVATE ARGUMENT VIRTUAL SIGNAL OVERRIDE
+%token <id> TOKEN NUMBER TYPETOKEN ARRAY_DIM
+%token <cbuf> CCODE HTCODE PHCODE HCODE ACODE ATCODE
+%token <line> PUBLIC PRIVATE PROTECTED ARGUMENT VIRTUAL SIGNAL OVERRIDE
%%
| class { ; }
;
-ccodes: ccodes CCODE {
- Node *node = new_ccode(FALSE,$<cbuf>2);
+ccode: CCODE {
+ Node *node = new_ccode(C_CCODE,($<cbuf>1)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free($<cbuf>1,FALSE);
}
- | ccodes HCODE {
- Node *node = new_ccode(TRUE,$<cbuf>2);
+ | HCODE {
+ Node *node = new_ccode(H_CCODE,($<cbuf>1)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free($<cbuf>1,FALSE);
}
- | CCODE {
- Node *node = new_ccode(FALSE,$<cbuf>1);
+ | HTCODE {
+ Node *node = new_ccode(HT_CCODE,($<cbuf>1)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free($<cbuf>1,FALSE);
}
- | HCODE {
- Node *node = new_ccode(TRUE,$<cbuf>1);
+ | PHCODE {
+ Node *node = new_ccode(PH_CCODE,($<cbuf>1)->str,
+ ccode_line);
+ nodes = g_list_append(nodes,node);
+ g_string_free($<cbuf>1,FALSE);
+ }
+ | ACODE {
+ Node *node = new_ccode(A_CCODE,($<cbuf>1)->str,
+ ccode_line);
+ nodes = g_list_append(nodes,node);
+ g_string_free($<cbuf>1,FALSE);
+ }
+ | ATCODE {
+ Node *node = new_ccode(AT_CCODE,($<cbuf>1)->str,
+ ccode_line);
nodes = g_list_append(nodes,node);
+ g_string_free($<cbuf>1,FALSE);
}
;
+ccodes: ccodes ccode { ; }
+ | ccode { ; }
+ ;
+
class: classdec '{' classcode '}' {
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
nodes = g_list_append(nodes,class);
}
+ | classdec '{' '}' {
+ ((Class *)class)->nodes = NULL;
+ class_nodes = NULL;
+ nodes = g_list_append(nodes,class);
+ }
;
classdec: CLASS TYPETOKEN FROM TYPETOKEN {
}
;
-classcode: classcode method { ; }
- | classcode variable { ; }
- | classcode argument { ; }
- | method { ; }
+classcode: classcode thing { ; }
+ | thing { ; }
+ ;
+
+thing: method { ; }
| variable { ; }
| argument { ; }
+ | ';' { ; }
;
-variable: PUBLIC type TOKEN ';' {
- push_variable($<id>3,PUBLIC_SCOPE);
+scope: PUBLIC { the_scope = PUBLIC_SCOPE; }
+ | PRIVATE { the_scope = PRIVATE_SCOPE; }
+ | PROTECTED { the_scope = PROTECTED_SCOPE; }
+ ;
+
+destructor: TOKEN TOKEN {
+ if(strcmp($<id>1, "destroywith")==0) {
+ g_free($<id>1);
+ destructor = $<id>2;
+ destructor_line = line_no;
+ destructor_simple = TRUE;
+ } else {
+ g_free($<id>1);
+ g_free($<id>2);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ }
+ | TOKEN '{' CCODE {
+ if(strcmp($<id>1, "destroy")==0) {
+ g_free($<id>1);
+ 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"));
+ YYERROR;
+ }
+ }
+ ;
+
+initializer: '=' numtok {
+ initializer = $<id>2;
+ initializer_line = ccode_line;
+ }
+ | '=' '{' CCODE {
+ initializer = ($<cbuf>3)->str;
+ initializer_line = ccode_line;
+ g_string_free($<cbuf>3, FALSE);
+ }
+ ;
+
+
+varoptions: destructor initializer { ; }
+ | initializer destructor { ; }
+ | initializer { destructor = NULL; }
+ | destructor { initializer = NULL; }
+ | {
+ destructor = NULL;
+ initializer = NULL;
+ }
+ ;
+
+variable: scope type TOKEN varoptions ';' {
+ push_variable($<id>3, the_scope,$<line>1, NULL);
}
- | PRIVATE type TOKEN ';' {
- push_variable($<id>3,PRIVATE_SCOPE);
+ | scope type TOKEN ARRAY_DIM varoptions ';' {
+ push_variable($<id>3, the_scope, $<line>1, $<id>4);
}
;
-argument: ARGUMENT argflags TOKEN TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
+argument: ARGUMENT flags argtype TOKEN TOKEN '{' CCODE TOKEN '{' CCODE ';' {
if(strcmp($<id>5,"get")==0 &&
strcmp($<id>8,"set")==0) {
Node *node;
+ Type *type = pop_type();
g_free($<id>5); g_free($<id>8);
- node = new_argument($<id>3,$<list>2,$<id>4,
- $<cbuf>7,$<cbuf>10);
+ 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);
class_nodes = g_list_append(class_nodes,node);
} else if(strcmp($<id>5,"set")==0 &&
strcmp($<id>8,"get")==0) {
Node *node;
+ Type *type = pop_type();
g_free($<id>5); g_free($<id>8);
- node = new_argument($<id>3,$<list>2,$<id>4,
- $<cbuf>10,$<cbuf>7);
+ 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);
class_nodes = g_list_append(class_nodes,node);
} else {
g_free($<id>3); g_free($<id>4);
YYERROR;
}
}
- | ARGUMENT argflags TOKEN TOKEN TOKEN '{' CCODE ';' {
+ | ARGUMENT flags argtype TOKEN TOKEN '{' CCODE ';' {
if(strcmp($<id>5,"get")==0) {
Node *node;
+ Type *type = pop_type();
g_free($<id>5);
- node = new_argument($<id>3,$<list>2,$<id>4,
- $<cbuf>7,NULL);
+ 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);
class_nodes = g_list_append(class_nodes,node);
} else if(strcmp($<id>5,"set")==0) {
Node *node;
+ Type *type = pop_type();
g_free($<id>5);
- node = new_argument($<id>3,$<list>2,$<id>4,
- NULL,$<cbuf>7);
+ 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);
} else {
g_free($<id>5); g_free($<id>3);
YYERROR;
}
}
+ | ARGUMENT flags argtype TOKEN 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);
+ g_free($<id>4);
+ g_list_foreach($<list>2,(GFunc)g_free,NULL);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+
+ type = pop_type();
+
+ var = find_var_or_die($<id>4, $<line>1);
+ if(var->scope == PRIVATE_SCOPE)
+ root = "self->_priv";
+ else
+ root = "self";
+
+ if(strcmp($<id>5,"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);",
+ root, $<id>4,
+ root, $<id>4);
+ } else if(strcmp($<id>5,"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,
+ root, $<id>4,
+ root, $<id>4,
+ root, $<id>4);
+ } else {
+ g_assert_not_reached();
+ }
+
+ /* get is the same for everything */
+ get = g_strdup_printf("ARG = %s->%s;", root, $<id>4);
+
+ g_free($<id>5);
+
+
+ if(!type)
+ type = copy_type(var->vtype);
+
+ 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);
+ }
+ ;
+
+argtype: TOKEN '(' TOKEN type ')' {
+ if(strcmp($<id>3,"type")!=0) {
+ g_free($<id>1);
+ g_free($<id>3);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ $<id>$ = $<id>1;
+ }
+ | TOKEN {
+ $<id>$ = $<id>1;
+ typestack = g_list_prepend(typestack,NULL);
+ }
;
-argflags: '(' flaglist ')' { $<list>$ = $<list>2; }
+flags: '(' flaglist ')' { $<list>$ = $<list>2; }
| { $<list>$ = NULL; }
;
;
-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 {
| SIGNED CHAR {
$<id>$ = g_strdup("signed char");
}
+ | CHAR {
+ $<id>$ = g_strdup("char");
+ }
| DOUBLE {
$<id>$ = g_strdup("double");
}
stars: '*' stars { stars++; }
| '*' { stars++; }
;
+
+/* this never sets the_scope */
+simplesigtype: 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;
+ }
+ ;
+
+/* this always sets the_scope */
+fullsigtype: scope TOKEN sigtype {
+ 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);
+ }
+ | TOKEN scope 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);
+ }
+ | scope sigtype {
+ $<sigtype>$ = SIGNAL_LAST_METHOD;
+ }
+ | simplesigtype {
+ /* the_scope was default thus public */
+ the_scope = PUBLIC_SCOPE;
+ }
+ ;
sigtype: TOKEN '(' tokenlist ')' {
gtktypes = g_list_prepend(gtktypes,$<id>1);
}
;
+codenocode: '{' CCODE { $<cbuf>$ = $<cbuf>2; }
+ | ';' { $<cbuf>$ = NULL; }
+ ;
+
/*here CCODE will include the ending '}' */
-method: SIGNAL LAST sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE {
- if(!has_this) {
- yyerror(_("signal without 'this' as "
+method: SIGNAL flags fullsigtype type TOKEN '(' funcargs ')' onerror codenocode {
+ if(!has_self) {
+ yyerror(_("signal without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(SIGNAL_LAST_METHOD,NULL,
- $<id>5, $<id>9, $<cbuf>11,$<line>1);
+ push_function(the_scope, $<sigtype>3,NULL,
+ $<id>5, $<id>9, $<cbuf>10,$<line>1,
+ ccode_line, vararg, $<list>2);
}
- | SIGNAL LAST sigtype type TOKEN '(' funcargs ')' onerror ';' {
- if(!has_this) {
- yyerror(_("signal without 'this' as "
+ | scope SIGNAL flags simplesigtype type TOKEN '(' funcargs ')' onerror codenocode {
+ if(!has_self) {
+ yyerror(_("signal without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(SIGNAL_LAST_METHOD, NULL,
- $<id>5, $<id>9, NULL,$<line>1);
+ push_function(the_scope, $<sigtype>4, NULL,
+ $<id>6, $<id>10, $<cbuf>11, $<line>2,
+ ccode_line, vararg, $<list>3);
}
- | SIGNAL FIRST sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE {
- if(!has_this) {
- yyerror(_("signal without 'this' as "
+ | VIRTUAL scope type TOKEN '(' funcargs ')' onerror codenocode {
+ if(!has_self) {
+ yyerror(_("virtual method without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(SIGNAL_FIRST_METHOD, NULL,
- $<id>5, $<id>9, $<cbuf>11,$<line>1);
+ push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4,
+ $<id>8, $<cbuf>9, $<line>1,
+ ccode_line, vararg, NULL);
}
- | SIGNAL FIRST sigtype type TOKEN '(' funcargs ')' onerror ';' {
- if(!has_this) {
- yyerror(_("signal without 'this' as "
+ | scope VIRTUAL type TOKEN '(' funcargs ')' onerror codenocode {
+ if(!has_self) {
+ yyerror(_("virtual method without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(SIGNAL_FIRST_METHOD, NULL, $<id>5,
- $<id>9, NULL,$<line>1);
+ push_function(the_scope, VIRTUAL_METHOD, NULL, $<id>4,
+ $<id>8, $<cbuf>9, $<line>2,
+ ccode_line, vararg, NULL);
}
- | SIGNAL sigtype type TOKEN '(' funcargs ')' onerror '{' CCODE {
- if(!has_this) {
- yyerror(_("signal without 'this' as "
+ | VIRTUAL type TOKEN '(' funcargs ')' onerror codenocode {
+ if(!has_self) {
+ yyerror(_("virtual method without 'self' as "
"first parameter"));
YYERROR;
}
- push_function(SIGNAL_LAST_METHOD, NULL,
- $<id>4, $<id>8, $<cbuf>10,$<line>1);
+ push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL,
+ $<id>3, $<id>7, $<cbuf>8, $<line>1,
+ ccode_line, vararg, NULL);
}
- | SIGNAL sigtype type TOKEN '(' funcargs ')' onerror ';' {
- if(!has_this) {
- yyerror(_("signal without 'this' as "
- "first parameter"));
- YYERROR;
- }
- push_function(SIGNAL_LAST_METHOD, NULL, $<id>4,
- $<id>8, NULL,$<line>1);
- }
- | VIRTUAL type TOKEN '(' funcargs ')' onerror '{' CCODE {
- push_function(VIRTUAL_METHOD, NULL, $<id>3,
- $<id>7, $<cbuf>9,$<line>1);
- }
- | VIRTUAL type TOKEN '(' funcargs ')' onerror ';' {
- push_function(VIRTUAL_METHOD, NULL, $<id>3,
- $<id>7, NULL,$<line>1);
+ | OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' onerror codenocode {
+ push_function(NO_SCOPE, OVERRIDE_METHOD, $<id>3,
+ $<id>6, $<id>10, $<cbuf>11,
+ $<line>1, ccode_line,
+ vararg, NULL);
}
- | OVERRIDE '(' TYPETOKEN ')' type TOKEN '(' funcargs ')' onerror '{' CCODE {
- push_function(OVERRIDE_METHOD, $<id>3,
- $<id>6, $<id>10, $<cbuf>12,$<line>1);
- }
- | PUBLIC type TOKEN '(' funcargs ')' onerror '{' CCODE {
- push_function(PUBLIC_SCOPE, NULL, $<id>3,
- $<id>7, $<cbuf>9,$<line>1);
- }
- | PRIVATE type TOKEN '(' funcargs ')' onerror '{' CCODE {
- push_function(PRIVATE_SCOPE, NULL, $<id>3,
- $<id>7, $<cbuf>9,$<line>1);
+ | scope type TOKEN '(' funcargs ')' onerror codenocode {
+ push_function(the_scope, REGULAR_METHOD, NULL, $<id>3,
+ $<id>7, $<cbuf>8, $<line>1, ccode_line,
+ vararg, NULL);
}
- | TOKEN '(' TOKEN ')' ';' {
+ | TOKEN '(' TOKEN ')' codenocode {
if(strcmp($<id>1,"init")==0) {
push_init_arg($<id>3,FALSE);
- push_function(INIT_METHOD, NULL, $<id>1,
- NULL, NULL,$<line>2);
+ push_function(NO_SCOPE, INIT_METHOD, NULL,
+ $<id>1, NULL, $<cbuf>5, $<line>2,
+ ccode_line, FALSE, NULL);
} 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);
- } else {
- g_free($<id>1);
- g_free($<id>3);
- yyerror(_("parse error"));
- YYERROR;
- }
- }
- | TOKEN '(' TOKEN ')' '{' CCODE {
- if(strcmp($<id>1,"init")==0) {
- push_init_arg($<id>3,FALSE);
- push_function(INIT_METHOD, NULL,
- $<id>1, NULL, $<cbuf>6,$<line>2);
- } 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);
+ push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL,
+ $<id>1, NULL, $<cbuf>5, $<line>2,
+ ccode_line, FALSE, NULL);
} else {
g_free($<id>1);
g_free($<id>3);
}
;
-onerror: ONERROR TOKEN { $<id>$ = $<id>2; }
- | ONERROR number { $<id>$ = $<id>2; }
+onerror: ONERROR numtok { $<id>$ = $<id>2; }
| ONERROR '{' CCODE {
$<id>$ = ($<cbuf>3)->str;
g_string_free($<cbuf>3,FALSE);
}
- | '=' '1' { ; }
| { $<id>$ = NULL; }
;
-
-
-funcargs: VOID { has_this = FALSE; }
+funcargs: VOID { vararg = FALSE; has_self = FALSE; }
| TOKEN {
- has_this = TRUE;
- if(strcmp($<id>1,"this")==0)
- push_this($<id>1);
+ vararg = FALSE;
+ has_self = TRUE;
+ if(strcmp($<id>1,"self")==0)
+ push_self($<id>1);
else {
g_free($<id>1);
yyerror(_("parse error"));
}
}
| TOKEN ',' arglist {
- has_this = TRUE;
- if(strcmp($<id>1,"this")==0)
- push_this($<id>1);
+ has_self = TRUE;
+ if(strcmp($<id>1,"self")==0)
+ push_self($<id>1);
else {
g_free($<id>1);
yyerror(_("parse error"));
YYERROR;
}
}
- | arglist { has_this = FALSE; }
+ | 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 '(' CHECK checklist ')' {
- push_funcarg($<id>2);
+ | type TOKEN ARRAY_DIM {
+ push_funcarg($<id>2,$<id>3);
+ }
+ | type TOKEN '(' TOKEN checklist ')' {
+ if(strcmp($<id>4,"check")!=0) {
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ g_free($<id>4);
+ 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);
}
;
| check { ; }
;
-check: CNULL {
- Node *node = new_check(NULL_CHECK,NULL);
- checks = g_list_append(checks,node);
- }
- | TYPE {
- Node *node = new_check(TYPE_CHECK,NULL);
- checks = g_list_append(checks,node);
+check: TOKEN {
+ if(strcmp($<id>1,"type")==0) {
+ Node *node = new_check(TYPE_CHECK,NULL);
+ checks = g_list_append(checks,node);
+ } else if(strcmp($<id>1,"null")==0) {
+ Node *node = new_check(NULL_CHECK,NULL);
+ checks = g_list_append(checks,node);
+ } else {
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ g_free($<id>1);
}
- | '>' number {
+ | '>' numtok {
Node *node = new_check(GT_CHECK,$<id>2);
checks = g_list_append(checks,node);
}
- | '<' number {
+ | '<' numtok {
Node *node = new_check(LT_CHECK,$<id>2);
checks = g_list_append(checks,node);
}
- | '>' '=' number {
+ | '>' '=' numtok {
Node *node = new_check(GE_CHECK,$<id>3);
checks = g_list_append(checks,node);
}
- | '<' '=' number {
+ | '<' '=' numtok {
Node *node = new_check(LE_CHECK,$<id>3);
checks = g_list_append(checks,node);
}
- | '=' '=' number {
+ | '=' '=' numtok {
Node *node = new_check(EQ_CHECK,$<id>3);
checks = g_list_append(checks,node);
}
- | '!' '=' number {
+ | '!' '=' numtok {
Node *node = new_check(NE_CHECK,$<id>3);
checks = g_list_append(checks,node);
}
;
-number: NUMBER { $<id>$ = $<id>1; }
+numtok: NUMBER { $<id>$ = $<id>1; }
| '-' NUMBER {
$<id>$ = g_strconcat("-",$<id>2,NULL);
g_free($<id>2);
}
+ | TOKEN { $<id>$ = $<id>1; }
;
%%
projects / gob-dx.git / blobdiff