X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.y;h=516f5d30701108f673917b3968a9da1b0f65351e;hb=2a819eb7bb914f004ba919f621c4e82fcb2bffed;hp=152a0012fce2ad99d8bb175bbb0c5fb546dc9df6;hpb=264d24eab52421606f62c73b4a7e9bdd543b9165;p=swftools.git diff --git a/lib/as3/parser.y b/lib/as3/parser.y index 152a001..516f5d3 100644 --- a/lib/as3/parser.y +++ b/lib/as3/parser.y @@ -41,8 +41,8 @@ %union tokenunion { tokenptr_t token; - class_signature_t*class_signature; - class_signature_list_t*class_signature_list; + classinfo_t*classinfo; + classinfo_list_t*classinfo_list; int number_int; unsigned int number_uint; @@ -84,8 +84,9 @@ %token KW_SET "set" %token KW_STATIC %token KW_IMPORT "import" +%token KW_RETURN "return" %token KW_INTERFACE "interface" -%token KW_NULL +%token KW_NULL "null" %token KW_VAR "var" %token KW_DYNAMIC %token KW_OVERRIDE @@ -131,6 +132,7 @@ %token T_STAR '*' %token T_DOT '.' +%type X_IDENTIFIER %type CODE %type CODEPIECE %type CODEBLOCK MAYBECODE @@ -146,35 +148,34 @@ %type E %type LH %type CONSTANT -%type FOR IF WHILE MAYBEELSE BREAK +%type FOR IF WHILE MAYBEELSE BREAK RETURN %type USE_NAMESPACE %type ASSIGNMENT FOR_INIT %type IMPORT -%type MAYBETYPE +%type MAYBETYPE %type GETSET %type PARAM %type PARAM_LIST %type MAYBE_PARAM_LIST %type MODIFIERS %type MODIFIER_LIST -%type IMPLEMENTS_LIST -%type EXTENDS -%type EXTENDS_LIST -%type PACKAGEANDCLASS -%type PACKAGEANDCLASS_LIST -%type MULTILEVELIDENTIFIER -%type TYPE +%type IMPLEMENTS_LIST +%type EXTENDS +%type EXTENDS_LIST +%type CLASS PACKAGEANDCLASS QNAME +%type QNAME_LIST +%type TYPE %type VAR //%type VARIABLE %type VAR_READ %type NEW -%type X_IDENTIFIER +//%type T_IDENTIFIER %type MODIFIER %type PACKAGE %type FUNCTIONCALL %type MAYBE_EXPRESSION_LIST EXPRESSION_LIST MAYBE_PARAM_VALUES -// precendence: from low to high +// precedence: from low to high // http://livedocs.adobe.com/flash/9.0/main/wwhelp/wwhimpl/common/html/wwhelp.htm?context=LiveDocs_Parts&file=00000012.html %left prec_none @@ -212,6 +213,13 @@ %nonassoc "else" %left '(' +// needed for "return" precedence: +%nonassoc T_STRING T_REGEXP +%nonassoc T_INT T_UINT T_BYTE T_SHORT T_FLOAT +%nonassoc "new" "false" "true" "null" + +%left prec_highest + %{ @@ -393,7 +401,7 @@ static void endpackage() } char*globalclass=0; -static void startclass(token_t*modifiers, token_t*name, class_signature_t*extends, class_signature_list_t*implements, char interface) +static void startclass(token_t*modifiers, token_t*name, classinfo_t*extends, classinfo_list_t*implements, char interface) { if(state->cls) { syntaxerror("inner classes now allowed"); @@ -402,14 +410,14 @@ static void startclass(token_t*modifiers, token_t*name, class_signature_t*extend state->classname = name->text; token_list_t*t=0; - class_signature_list_t*mlist=0; + classinfo_list_t*mlist=0; /*printf("entering class %s\n", name->text); printf(" modifiers: ");for(t=modifiers->tokens;t;t=t->next) printf("%s ", t->token->text);printf("\n"); if(extends) printf(" extends: %s.%s\n", extends->package, extends->name); printf(" implements (%d): ", list_length(implements)); for(mlist=implements;mlist;mlist=mlist->next) { - printf("%s ", mlist->class_signature?mlist->class_signature->name:0); + printf("%s ", mlist->classinfo?mlist->classinfo->name:0); } printf("\n"); */ @@ -449,7 +457,7 @@ static void startclass(token_t*modifiers, token_t*name, class_signature_t*extend syntaxerror("Package \"%s\" already contains a class called \"%s\"", package, state->classname); } - class_signature_t* classname = class_signature_register(access, package, state->classname); + classinfo_t* classname = classinfo_register(access, package, state->classname); MULTINAME(classname2,classname); @@ -461,7 +469,7 @@ static void startclass(token_t*modifiers, token_t*name, class_signature_t*extend if(interface) abc_class_interface(state->cls); for(mlist=implements;mlist;mlist=mlist->next) { - MULTINAME(m, mlist->class_signature); + MULTINAME(m, mlist->classinfo); abc_class_add_interface(state->cls, &m); } @@ -470,7 +478,7 @@ static void startclass(token_t*modifiers, token_t*name, class_signature_t*extend abc_method_body_t*m = state->init->method->body; __ getglobalscope(m); - class_signature_t*s = extends; + classinfo_t*s = extends; int count=0; @@ -485,9 +493,8 @@ static void startclass(token_t*modifiers, token_t*name, class_signature_t*extend __ getlex2(m, s2); multiname_destroy(s2); - __ pushscope(m); + __ pushscope(m); count++; m->code = m->code->prev->prev; // invert - count++; } /* continue appending after last op end */ while(m->code && m->code->next) m->code = m->code->next; @@ -498,9 +505,15 @@ static void startclass(token_t*modifiers, token_t*name, class_signature_t*extend if(extends2) { __ getlex2(m, extends2); __ dup(m); - __ pushscope(m); // we get a Verify Error #1107 if this is not the top scope + /* notice: we get a Verify Error #1107 if the top elemnt on the scope + stack is not the superclass */ + __ pushscope(m);count++; } else { __ pushnull(m); + /* notice: we get a verify error #1107 if the top element on the scope + stack is not the global object */ + __ getlocal_0(m); + __ pushscope(m);count++; } __ newclass(m,state->cls); while(count--) { @@ -509,7 +522,7 @@ static void startclass(token_t*modifiers, token_t*name, class_signature_t*extend __ setslot(m, slotindex); /* flash.display.MovieClip handling */ - if(!globalclass && public && class_signature_equals(registry_getMovieClip(),extends)) { + if(!globalclass && public && classinfo_equals(registry_getMovieClip(),extends)) { if(state->package && state->package[0]) { globalclass = concat3str(state->package, ".", state->classname); } else { @@ -525,7 +538,7 @@ static void endclass() old_state(); } static void startfunction(token_t*ns, token_t*mod, token_t*getset, token_t*name, - param_list_t*params, class_signature_t*type) + param_list_t*params, classinfo_t*type) { token_list_t*t; new_state(); @@ -546,7 +559,6 @@ static void startfunction(token_t*ns, token_t*mod, token_t*getset, token_t*name, } multiname_t*type2 = sig2mname(type); - if(!strcmp(state->classname,name->text)) { state->m = abc_class_constructor(state->cls, type2, 0); } else { @@ -566,8 +578,6 @@ static void startfunction(token_t*ns, token_t*mod, token_t*getset, token_t*name, __ getlocal_0(state->m); __ pushscope(state->m); - - multiname_destroy(type2); } static void endfunction() { @@ -606,7 +616,7 @@ void extend_s(token_t*list, char*seperator, token_t*add) { list->text[l1+l2+l3]=0; } -static int find_variable(char*name, class_signature_t**m) +static int find_variable(char*name, classinfo_t**m) { state_list_t* s = state_stack; while(s) { @@ -619,13 +629,20 @@ static int find_variable(char*name, class_signature_t**m) } s = s->next; } - syntaxerror("undefined variable: %s", name); + return -1; } +static int find_variable_safe(char*name, classinfo_t**m) +{ + int i = find_variable(name, m); + if(i<0) + syntaxerror("undefined variable: %s", name); + return i; +} static char variable_exists(char*name) { return array_contains(state->vars, name); } -static int new_variable(char*name, class_signature_t*type) +static int new_variable(char*name, classinfo_t*type) { return array_append(state->vars, name, type) + state->local_var_base; } @@ -633,7 +650,7 @@ code_t* killvars(code_t*c) { int t; for(t=0;tvars->num;t++) { - class_signature_t*type = array_getvalue(state->vars, t); + classinfo_t*type = array_getvalue(state->vars, t); //do this always, otherwise register types don't match //in the verifier when doing nested loops //if(!TYPE_IS_BUILTIN_SIMPLE(type)) { @@ -643,11 +660,7 @@ code_t* killvars(code_t*c) return c; } -class_signature_t*join_types(class_signature_t*type1, class_signature_t*type2, char op) -{ - return registry_getanytype(); // FIXME -} -char is_subtype_of(class_signature_t*type, class_signature_t*supertype) +char is_subtype_of(classinfo_t*type, classinfo_t*supertype) { return 1; // FIXME } @@ -664,8 +677,15 @@ void breakjumpsto(code_t*c, code_t*jump) c = c->next; } } -code_t*converttype(code_t*c, class_signature_t*from, class_signature_t*to) + +classinfo_t*join_types(classinfo_t*type1, classinfo_t*type2, char op) +{ + return registry_getanytype(); // FIXME +} +code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) { + if(from==to) + return c; if(!to) { /*TODO: can omit this if from is zero? */ return abc_coerce_a(c); @@ -681,7 +701,7 @@ code_t*converttype(code_t*c, class_signature_t*from, class_signature_t*to) return c; } -code_t*defaultvalue(code_t*c, class_signature_t*type) +code_t*defaultvalue(code_t*c, classinfo_t*type) { if(TYPE_IS_INT(type) || TYPE_IS_UINT(type) || TYPE_IS_FLOAT(type)) { c = abc_pushbyte(c, 0); @@ -718,6 +738,7 @@ CODEPIECE: VOIDEXPRESSION {$$=$1} CODEPIECE: FOR {$$=$1} CODEPIECE: WHILE {$$=$1} CODEPIECE: BREAK {$$=$1} +CODEPIECE: RETURN {$$=$1} CODEPIECE: IF {$$=$1} CODEPIECE: ASSIGNMENT {$$=$1} CODEPIECE: NAMESPACE_DECLARATION {/*TODO*/$$=code_new();} @@ -795,8 +816,8 @@ VARIABLE_DECLARATION : VAR T_IDENTIFIER MAYBETYPE MAYBEEXPRESSION { printf("variable %s -> %d (%s)\n", $2->text, index, $4.t?$4.t->name:""); } ASSIGNMENT : T_IDENTIFIER '=' EXPRESSION { - class_signature_t*type=0; - int i = find_variable($1->text, &type); + classinfo_t*type=0; + int i = find_variable_safe($1->text, &type); $$ = $3.c; if(!type && $3.t) { // convert to "any" type, the register is untyped @@ -873,18 +894,21 @@ BREAK : "break" { /* ------------ packages and imports ---------------- */ -PACKAGE_DECLARATION : "package" MULTILEVELIDENTIFIER '{' {startpackage($2)} MAYBECODE '}' {endpackage()} -PACKAGE_DECLARATION : "package" '{' {startpackage(0)} MAYBECODE '}' {endpackage()} +X_IDENTIFIER: T_IDENTIFIER + | "package" PACKAGE: PACKAGE '.' X_IDENTIFIER {$$ = concat3($1,$2,$3);} PACKAGE: X_IDENTIFIER {$$=$1;} -IMPORT : "import" PACKAGE '.' X_IDENTIFIER { - class_signature_t*c = registry_findclass($2->text, $4->text); +PACKAGE_DECLARATION : "package" PACKAGE '{' {startpackage($2)} MAYBECODE '}' {endpackage()} +PACKAGE_DECLARATION : "package" '{' {startpackage(0)} MAYBECODE '}' {endpackage()} + +IMPORT : "import" QNAME { + classinfo_t*c = $2; if(!c) - syntaxerror("Couldn't import %s.%s\n", $2->text, $4->text); + syntaxerror("Couldn't import class\n"); state_has_imports(); - dict_put(state->imports, $4->text, c); + dict_put(state->imports, c->name, c); $$=0; } IMPORT : "import" PACKAGE '.' '*' { @@ -904,13 +928,13 @@ MODIFIER_LIST : MODIFIER {$$=empty_token();extend($$,$1);} MODIFIER : KW_PUBLIC | KW_PRIVATE | KW_PROTECTED | KW_STATIC | KW_DYNAMIC | KW_FINAL | KW_OVERRIDE | KW_NATIVE | KW_INTERNAL EXTENDS : {$$=registry_getobjectclass();} -EXTENDS : KW_EXTENDS PACKAGEANDCLASS {$$=$2;} +EXTENDS : KW_EXTENDS QNAME {$$=$2;} EXTENDS_LIST : {$$=list_new();} -EXTENDS_LIST : KW_EXTENDS PACKAGEANDCLASS_LIST {$$=$2;} +EXTENDS_LIST : KW_EXTENDS QNAME_LIST {$$=$2;} IMPLEMENTS_LIST : {$$=list_new();} -IMPLEMENTS_LIST : KW_IMPLEMENTS PACKAGEANDCLASS_LIST {$$=$2;} +IMPLEMENTS_LIST : KW_IMPLEMENTS QNAME_LIST {$$=$2;} CLASS_DECLARATION : MODIFIERS "class" T_IDENTIFIER EXTENDS IMPLEMENTS_LIST @@ -923,7 +947,121 @@ INTERFACE_DECLARATION : MODIFIERS "interface" T_IDENTIFIER MAYBE_IDECLARATION_LIST '}' {endclass();} -TYPE : PACKAGEANDCLASS {$$=$1;} +/* ------------- package + class ids --------------- */ + +CLASS: T_IDENTIFIER { + + /* try current package */ + $$ = registry_findclass(state->package, $1->text); + + /* try explicit imports */ + dictentry_t* e = dict_get_slot(state->imports, $1->text); + while(e) { + if($$) + break; + if(!strcmp(e->key, $1->text)) { + $$ = (classinfo_t*)e->data; + } + e = e->next; + } + + /* try package.* imports */ + import_list_t*l = state->wildcard_imports; + while(l) { + if($$) + break; + //printf("does package %s contain a class %s?\n", l->import->package, $1->text); + $$ = registry_findclass(l->import->package, $1->text); + l = l->next; + } + + /* try global package */ + if(!$$) { + $$ = registry_findclass("", $1->text); + } + + if(!$$) syntaxerror("Could not find class %s\n", $1->text); +} + +PACKAGEANDCLASS : PACKAGE '.' T_IDENTIFIER { + $$ = registry_findclass($1->text, $3->text); + if(!$$) syntaxerror("Couldn't find class %s.%s\n", $1->text, $3->text); +} + +QNAME: PACKAGEANDCLASS + | CLASS + + +/* ----------function calls, constructor calls ------ */ + +MAYBE_PARAM_VALUES : %prec prec_none {$$=0;} +MAYBE_PARAM_VALUES : '(' MAYBE_EXPRESSION_LIST ')' {$$=$2} + +MAYBE_EXPRESSION_LIST : {$$=0;} +MAYBE_EXPRESSION_LIST : EXPRESSION_LIST +EXPRESSION_LIST : EXPRESSION {$$=list_new(); + typedcode_t*t = malloc(sizeof(typedcode_t)); + *t = $1; + list_append($$, t);} +EXPRESSION_LIST : EXPRESSION_LIST ',' EXPRESSION {$$=$1; + typedcode_t*t = malloc(sizeof(typedcode_t)); + *t = $3; + list_append($$, t);} + +NEW : "new" CLASS MAYBE_PARAM_VALUES { + MULTINAME(m, $2); + $$.c = code_new(); + $$.c = abc_findpropstrict2($$.c, &m); + typedcode_list_t*l = $3; + int len = 0; + while(l) { + $$.c = code_append($$.c, l->typedcode->c); // push parameters on stack + l = l->next; + len ++; + } + $$.c = abc_constructprop2($$.c, &m, len); + $$.t = $2; +} + +/* TODO: use abc_call (for calling local variables), + abc_callstatic (for calling own methods) + call (for closures) +*/ +FUNCTIONCALL : E '(' MAYBE_EXPRESSION_LIST ')' { + typedcode_list_t*l = $3; + int len = 0; + code_t*paramcode = 0; + while(l) { + paramcode = code_append(paramcode, l->typedcode->c); // push parameters on stack + l = l->next; + len ++; + } + + $$.c = $1.c; + if($$.c->opcode == OPCODE_GETPROPERTY) { + multiname_t*name = multiname_clone($$.c->data[0]); + $$.c = code_cutlast($$.c); + $$.c = code_append($$.c, paramcode); + $$.c = abc_callproperty2($$.c, name, len); + } else { + int i = find_variable_safe("this", 0); + $$.c = abc_getlocal($$.c, i); + $$.c = code_append($$.c, paramcode); + $$.c = abc_call($$.c, len); + } + /* TODO: look up the functions's return value */ + $$.t = TYPE_ANY; +} + +RETURN: "return" %prec prec_none { + $$ = abc_returnvoid(0); +} +RETURN: "return" EXPRESSION { + $$ = $2.c; + $$ = abc_returnvalue($$); +} + +TYPE : QNAME {$$=$1;} | '*' {$$=registry_getanytype();} | "String" {$$=registry_getstringclass();} | "int" {$$=registry_getintclass();} @@ -978,7 +1116,7 @@ CONSTANT : KW_NULL {$$.c = abc_pushnull(0); USE_NAMESPACE : "use" "namespace" T_IDENTIFIER -EXPRESSION : E %prec prec_none /*precendence below '-x'*/ {$$ = $1;} +EXPRESSION : E %prec prec_none /*precedence below '-x'*/ {$$ = $1;} VOIDEXPRESSION : E %prec prec_none {$$=$1.c;/*calculate and discard*/$$=abc_pop($$);} E : CONSTANT @@ -1010,25 +1148,50 @@ E : E "!=" E {$$.c = code_append($1.c,$3.c);$$.c = abc_equals($$.c);$$.c = abc_n $$.t = TYPE_BOOLEAN; } -E : E "||" E {$$.c = $1.c; - $$.c=abc_dup($$.c); +E : E "||" E {$$.t = join_types($1.t, $3.t, 'O'); + $$.c = $1.c; + $$.c = converttype($$.c, $1.t, $$.t); + $$.c = abc_dup($$.c); code_t*jmp = $$.c = abc_iftrue($$.c, 0); - $$.c=abc_pop($$.c); + $$.c = abc_pop($$.c); $$.c = code_append($$.c,$3.c); + $$.c = converttype($$.c, $1.t, $$.t); code_t*label = $$.c = abc_label($$.c); jmp->branch = label; - $$.t = join_types($1.t, $3.t, 'O'); } -E : E "&&" E {$$.c = $1.c; - $$.c=abc_dup($$.c); +E : E "&&" E {$$.t = join_types($1.t, $3.t, 'A'); + $$.c = $1.c; + $$.c = converttype($$.c, $1.t, $$.t); + $$.c = abc_dup($$.c); code_t*jmp = $$.c = abc_iffalse($$.c, 0); - $$.c=abc_pop($$.c); + $$.c = abc_pop($$.c); $$.c = code_append($$.c,$3.c); + $$.c = converttype($$.c, $1.t, $$.t); code_t*label = $$.c = abc_label($$.c); - jmp->branch = label; - $$.t = join_types($1.t, $3.t, 'A'); + jmp->branch = label; } +//E : E '.' T_IDENTIFIER '(' ')' +// {$$.c = 0; // FIXME +// $$.t = 0; +// } + +E : E '.' T_IDENTIFIER + {$$.c = $1.c; + if($$.t) { + namespace_t ns = {$$.t->access, (char*)$$.t->package}; + multiname_t m = {QNAME, &ns, 0, $3->text}; + $$.c = abc_getproperty2($$.c, &m); + /* FIXME: get type of ($1.t).$3 */ + $$.t = registry_getanytype(); + } else { + namespace_t ns = {ACCESS_PACKAGE, ""}; + multiname_t m = {QNAME, &ns, 0, $3->text}; + $$.c = abc_getproperty2($$.c, &m); + $$.t = registry_getanytype(); + } + } + E : '!' E {$$.c=$2.c; $$.c = abc_not($$.c); $$.t = TYPE_BOOLEAN; @@ -1046,95 +1209,68 @@ E : E '*' E {$$.c = code_append($1.c,$3.c);$$.c = abc_multiply($$.c);$$.c=abc_co $$.t = join_types($1.t, $3.t, '*'); } -E : E "as" TYPE -E : E "is" TYPE +E : E "as" E +E : E "is" E E : '(' E ')' {$$=$2;} E : '-' E {$$=$2;} E : LH "+=" E {$$.c = $1.read;$$.c=code_append($$.c,$3.c);$$.c=abc_add($$.c); - class_signature_t*type = join_types($1.type, $3.t, '+'); + classinfo_t*type = join_types($1.type, $3.t, '+'); $$.c=converttype($$.c, type, $1.type); $$.c=abc_dup($$.c);$$.c=code_append($$.c,$1.write); $$.t = $1.type; } E : LH "-=" E {$$.c = $1.read;$$.c=code_append($$.c,$3.c);$$.c=abc_add($$.c); - class_signature_t*type = join_types($1.type, $3.t, '-'); + classinfo_t*type = join_types($1.type, $3.t, '-'); $$.c=converttype($$.c, type, $1.type); $$.c=abc_dup($$.c);$$.c=code_append($$.c,$1.write); $$.t = $1.type; } // TODO: use inclocal where appropriate -E : LH "++" {$$.c = $1.read;$$.c=abc_increment($$.c); - class_signature_t*type = $1.type; - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) type = TYPE_NUMBER; +E : LH "++" {$$.c = $1.read; + classinfo_t*type = $1.type; + if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { + $$.c=abc_increment_i($$.c); + } else { + $$.c=abc_increment($$.c); + type = TYPE_NUMBER; + } $$.c=converttype($$.c, type, $1.type); $$.c=abc_dup($$.c);$$.c=code_append($$.c,$1.write); $$.t = $1.type; } -E : LH "--" {$$.c = $1.read;$$.c=abc_decrement($$.c); - class_signature_t*type = $1.type; - if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) type = TYPE_NUMBER; - $$.c=converttype($$.c, 0, $1.type); +E : LH "--" {$$.c = $1.read; + classinfo_t*type = $1.type; + if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) { + $$.c=abc_decrement_i($$.c); + } else { + $$.c=abc_decrement($$.c); + type = TYPE_NUMBER; + } + $$.c=converttype($$.c, type, $1.type); $$.c=abc_dup($$.c);$$.c=code_append($$.c,$1.write); $$.t = $1.type; } LH: T_IDENTIFIER { - int i = find_variable($1->text, &$$.type); + int i = find_variable_safe($1->text, &$$.type); $$.read = abc_getlocal(0, i); $$.write = abc_setlocal(0, i); } -MAYBE_PARAM_VALUES : %prec prec_none {$$=0;} -MAYBE_PARAM_VALUES : '(' MAYBE_EXPRESSION_LIST ')' {$$=$2} - -NEW : "new" PACKAGEANDCLASS MAYBE_PARAM_VALUES { - MULTINAME(m, $2); - $$.c = code_new(); - $$.c = abc_findpropstrict2($$.c, &m); - typedcode_list_t*l = $3; - int len = 0; - while(l) { - $$.c = code_append($$.c, l->typedcode->c); // push parameters on stack - l = l->next; - len ++; - } - $$.c = abc_constructprop2($$.c, &m, len); - $$.t = $2; -} - -FUNCTIONCALL : T_IDENTIFIER '(' MAYBE_EXPRESSION_LIST ')' { - /* TODO: use abc_call (for calling local variables), - abc_callstatic (for calling own methods) */ - $$.c = code_new(); - $$.c = abc_findpropstrict($$.c, $1->text); - typedcode_list_t*l = $3; - int len = 0; - while(l) { - $$.c = code_append($$.c, l->typedcode->c); // push parameters on stack - l = l->next; - len ++; - } - $$.c = abc_callproperty($$.c, $1->text, len); - /* TODO: look up the functions's return value */ - $$.t = TYPE_ANY; -} - -MAYBE_EXPRESSION_LIST : {$$=0;} -MAYBE_EXPRESSION_LIST : EXPRESSION_LIST -EXPRESSION_LIST : EXPRESSION {$$=list_new(); - typedcode_t*t = malloc(sizeof(typedcode_t)); - *t = $1; - list_append($$, t);} -EXPRESSION_LIST : EXPRESSION_LIST ',' EXPRESSION {$$=$1; - typedcode_t*t = malloc(sizeof(typedcode_t)); - *t = $3; - list_append($$, t);} VAR_READ : T_IDENTIFIER { + $$.t = 0; + $$.c = 0; int i = find_variable($1->text, &$$.t); - $$.c = abc_getlocal(0, i); + if(i>=0) { + $$.c = abc_getlocal($$.c, i); + } else { + $$.t = 0; + $$.c = abc_findpropstrict($$.c, $1->text); + $$.c = abc_getproperty($$.c, $1->text); + } } //VARIABLE : T_IDENTIFIER @@ -1144,9 +1280,6 @@ VAR_READ : T_IDENTIFIER { //VARIABLE : VARIABLE "::" '[' EXPRESSION ']' // qualified expression //VARIABLE : VARIABLE '[' EXPRESSION ']' // unqualified expression -// keywords which also may be identifiers -X_IDENTIFIER : T_IDENTIFIER | KW_PACKAGE - GETSET : "get" {$$=$1;} | "set" {$$=$1;} | {$$=empty_token();} @@ -1169,50 +1302,8 @@ IDECLARATION : FUNCTION_DECLARATION //IDENTIFIER_LIST : T_IDENTIFIER ',' IDENTIFIER_LIST {extend($3,$1);$$=$3;} //IDENTIFIER_LIST : T_IDENTIFIER {$$=empty_token();extend($$,$1);} -PACKAGEANDCLASS : T_IDENTIFIER { - - /* try current package */ - $$ = registry_findclass(state->package, $1->text); - - /* try explicit imports */ - dictentry_t* e = dict_get_slot(state->imports, $1->text); - while(e) { - if($$) - break; - if(!strcmp(e->key, $1->text)) { - $$ = (class_signature_t*)e->data; - } - e = e->next; - } - - /* try package.* imports */ - import_list_t*l = state->wildcard_imports; - while(l) { - if($$) - break; - //printf("does package %s contain a class %s?\n", l->import->package, $1->text); - $$ = registry_findclass(l->import->package, $1->text); - l = l->next; - } - - /* try global package */ - if(!$$) { - $$ = registry_findclass("", $1->text); - } - - if(!$$) syntaxerror("Could not find class %s\n", $1->text); -} -PACKAGEANDCLASS : PACKAGE '.' T_IDENTIFIER { - $$ = registry_findclass($1->text, $3->text); - if(!$$) syntaxerror("Couldn't find class %s.%s\n", $1->text, $3->text); -} - - -MULTILEVELIDENTIFIER : MULTILEVELIDENTIFIER '.' X_IDENTIFIER {$$=$1;extend_s($$, ".", $3)} -MULTILEVELIDENTIFIER : T_IDENTIFIER {$$=$1;extend($$,$1)}; - -PACKAGEANDCLASS_LIST : PACKAGEANDCLASS {$$=list_new();list_append($$, $1);} -PACKAGEANDCLASS_LIST : PACKAGEANDCLASS_LIST ',' PACKAGEANDCLASS {$$=$1;list_append($$,$3);} +QNAME_LIST : QNAME {$$=list_new();list_append($$, $1);} +QNAME_LIST : QNAME_LIST ',' QNAME {$$=$1;list_append($$,$3);} MAYBE_DECLARATION_LIST : MAYBE_DECLARATION_LIST : DECLARATION_LIST