X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.y;h=67c6cba8299ae792a3fe63699fa9dc4f4a457c07;hb=ff2096e7e8b2e52dd7fbb10d1f98a15582cfdb53;hp=000680cea65e69fb93ad00433f2fcacf944d1ab9;hpb=e93f2e3f38277d48fc4204ab6c7bdb9386ec4c6b;p=swftools.git diff --git a/lib/as3/parser.y b/lib/as3/parser.y index 000680c..67c6cba 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; @@ -51,9 +51,9 @@ typedcode_t value; typedcode_list_t*value_list; param_t* param; - param_list_t* param_list; - writeable_t writeable; + params_t params; char*string; + constant_t*constant; } @@ -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 @@ -124,6 +125,7 @@ %token T_MINUSMINUS "--" %token T_PLUSPLUS "++" %token T_DOTDOT ".." +%token T_DOTDOTDOT "..." %token T_SHL "<<" %token T_USHR ">>>" %token T_SHR ">>" @@ -131,50 +133,50 @@ %token T_STAR '*' %token T_DOT '.' +%type X_IDENTIFIER VARCONST %type CODE %type CODEPIECE %type CODEBLOCK MAYBECODE %type PACKAGE_DECLARATION %type FUNCTION_DECLARATION -%type VARIABLE_DECLARATION +%type VARIABLE_DECLARATION ONE_VARIABLE VARIABLE_LIST %type CLASS_DECLARATION %type NAMESPACE_DECLARATION %type INTERFACE_DECLARATION %type VOIDEXPRESSION -%type EXPRESSION +%type EXPRESSION NONCOMMAEXPRESSION %type MAYBEEXPRESSION %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 FOR_INIT %type IMPORT -%type MAYBETYPE +%type MAYBETYPE %type GETSET %type PARAM -%type PARAM_LIST -%type MAYBE_PARAM_LIST +%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 STATICCONSTANT MAYBESTATICCONSTANT +%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 @@ -185,13 +187,14 @@ %nonassoc ">>=" %nonassoc "<<=" %nonassoc ">>>=" -%nonassoc "||" -%nonassoc "&&" +%left "||" +%left "&&" %nonassoc '|' %nonassoc '^' %nonassoc '&' %nonassoc "!=" "==" "===" "<=" '<' ">=" '>' // TODO: support "a < b < c" syntax? %nonassoc "is" +%left prec_belowminus %left '-' %left '+' %left "<<" @@ -212,6 +215,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 + %{ @@ -274,27 +284,51 @@ typedef struct _state { a method (like initializing local registers) */ code_t*initcode; - abc_method_body_t*m; - import_list_t*wildcard_imports; dict_t*imports; char has_own_imports; /* class data */ - char*classname; + classinfo_t*clsinfo; abc_class_t*cls; + code_t*cls_init; + code_t*cls_static_init; + + /* method data */ + memberinfo_t*minfo; + abc_method_body_t*m; - array_t*vars; - int local_var_base; + dict_t*vars; + char late_binding; } state_t; +typedef struct _global { + int variable_count; +} global_t; + +static global_t*global = 0; static state_t* state = 0; DECLARE_LIST(state); #define MULTINAME(m,x) multiname_t m;namespace_t m##_ns;registry_fill_multiname(&m, &m##_ns, x); +/* warning: list length of namespace set is undefined */ +#define MULTINAME_LATE(m, access, package) \ + namespace_t m##_ns = {access, package}; \ + namespace_set_t m##_nsset; \ + namespace_list_t m##_l;m##_l.next = 0; \ + m##_nsset.namespaces = &m##_l; \ + m##_nsset = m##_nsset; \ + m##_l.namespace = &m##_ns; \ + multiname_t m = {MULTINAMEL, 0, &m##_nsset, 0}; + static state_list_t*state_stack=0; + +static void init_globals() +{ + global = rfx_calloc(sizeof(global_t)); +} static void new_state() { @@ -306,16 +340,13 @@ static void new_state() memcpy(s, state, sizeof(state_t)); //shallow copy sl->next = state_stack; sl->state = s; - if(oldstate) { - s->local_var_base = array_length(oldstate->vars) + oldstate->local_var_base; - } if(!s->imports) { s->imports = dict_new(); } state_stack = sl; state = s; state->level++; - state->vars = array_new(); + state->vars = dict_new(); state->initcode = 0; state->has_own_imports = 0; } @@ -347,18 +378,49 @@ static void old_state() } void initialize_state() { + init_globals(); new_state(); state->file = abc_file_new(); state->file->flags &= ~ABCFILE_LAZY; state->init = abc_initscript(state->file, 0, 0); - abc_method_body_t*m = state->init->method->body; - __ getlocal_0(m); - __ pushscope(m); - __ findpropstrict(m, "[package]::trace"); - __ pushstring(m, "[entering global init function]"); - __ callpropvoid(m, "[package]::trace", 1); + code_t*c = state->init->method->body->code; + + c = abc_getlocal_0(c); + c = abc_pushscope(c); + + /* findpropstrict doesn't just return a scope object- it + also makes it "active" somehow. Push local_0 on the + scope stack and read it back with findpropstrict, it'll + contain properties like "trace". Trying to find the same + property on a "vanilla" local_0 yields only a "undefined" */ + //c = abc_findpropstrict(c, "[package]::trace"); + + /*c = abc_getlocal_0(c); + c = abc_findpropstrict(c, "[package]::trace"); + c = abc_coerce_a(c); + c = abc_setlocal_1(c); + + c = abc_pushbyte(c, 0); + c = abc_setlocal_2(c); + + code_t*xx = c = abc_label(c); + c = abc_findpropstrict(c, "[package]::trace"); + c = abc_pushstring(c, "prop:"); + c = abc_hasnext2(c, 1, 2); + c = abc_dup(c); + c = abc_setlocal_3(c); + c = abc_callpropvoid(c, "[package]::trace", 2); + c = abc_getlocal_3(c); + c = abc_kill(c, 3); + c = abc_iftrue(c,xx);*/ + + c = abc_findpropstrict(c, "[package]::trace"); + c = abc_pushstring(c, "[entering global init function]"); + c = abc_callpropvoid(c, "[package]::trace", 1); + + state->init->method->body->code = c; } void* finalize_state() { @@ -393,23 +455,23 @@ 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"); } new_state(); - state->classname = name->text; + char*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"); */ @@ -445,23 +507,28 @@ static void startclass(token_t*modifiers, token_t*name, class_signature_t*extend syntaxerror("public classes only allowed inside a package"); } - if(registry_findclass(package, state->classname)) { - syntaxerror("Package \"%s\" already contains a class called \"%s\"", package, state->classname); + if(registry_findclass(package, classname)) { + syntaxerror("Package \"%s\" already contains a class called \"%s\"", package, classname); } - class_signature_t* classname = class_signature_register(access, package, state->classname); + state->clsinfo = classinfo_register(access, package, classname); - MULTINAME(classname2,classname); + MULTINAME(classname2,state->clsinfo); multiname_t*extends2 = sig2mname(extends); + /*if(extends) { + state->cls_init = abc_getlocal_0(state->cls_init); + state->cls_init = abc_constructsuper(state->cls_init, 0); + }*/ + state->cls = abc_class_new(state->file, &classname2, extends2); if(final) abc_class_final(state->cls); if(sealed) abc_class_sealed(state->cls); 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 +537,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 +552,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 +564,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,11 +581,11 @@ 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); + globalclass = concat3str(state->package, ".", classname); } else { - globalclass = strdup(state->classname); + globalclass = strdup(classname); } } multiname_destroy(extends2); @@ -521,63 +593,31 @@ static void startclass(token_t*modifiers, token_t*name, class_signature_t*extend static void endclass() { - /*printf("leaving class %s\n", state->classname);*/ - 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) -{ - token_list_t*t; - new_state(); - state->function = name->text; - - /*printf("entering function %s\n", name->text); - if(ns) - printf(" namespace: %s\n", ns->text); - printf(" getset: %s\n", getset->text); - printf(" params: ");for(t=params->tokens;t;t=t->next) printf("%s ", t->token->text);printf("\n"); - printf(" mod: ");for(t=mod->tokens;t;t=t->next) printf("%s ", t->token->text);printf("\n"); - if(type) - printf(" type: %s.%s\n", type->package, type->name); - print_imports();*/ - - if(state->m) { - syntaxerror("not able to start another method scope"); - } - - multiname_t*type2 = sig2mname(type); + if(state->cls_init) { + if(!state->cls->constructor) { + abc_method_body_t*m = abc_class_constructor(state->cls, 0, 0); + m->code = code_append(m->code, state->cls_init); + m->code = abc_returnvoid(m->code); + } else { + code_t*c = state->cls->constructor->body->code; + c = code_append(state->cls_init, c); + state->cls->constructor->body->code = c; - if(!strcmp(state->classname,name->text)) { - state->m = abc_class_constructor(state->cls, type2, 0); - } else { - state->m = abc_class_method(state->cls, type2, name->text, 0); - } - param_list_t*p; - for(p=params;p;p=p->next) { - multiname_t*m = sig2mname(p->param->type); - list_append(state->m->method->parameters, m); + } } - - /* state->vars is initialized by state_new */ - array_append(state->vars, "this", 0); - for(p=params;p;p=p->next) { - array_append(state->vars, p->param->name, 0); + if(state->cls_static_init) { + if(!state->cls->static_constructor) { + abc_method_body_t*m = abc_class_staticconstructor(state->cls, 0, 0); + m->code = state->cls_static_init; + } else { + state->cls->static_constructor->body->code = + code_append(state->cls_static_init, state->cls->static_constructor->body->code); + } } - __ getlocal_0(state->m); - __ pushscope(state->m); - - multiname_destroy(type2); -} -static void endfunction() -{ - /*printf("leaving function %s\n", state->function);*/ - __ returnvoid(state->m); - old_state(); } - static token_t* empty_token() { NEW(token_t,t); @@ -606,48 +646,171 @@ 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) +typedef struct _variable { + int index; + classinfo_t*type; +} variable_t; + +static int find_variable(char*name, classinfo_t**m) { state_list_t* s = state_stack; while(s) { - int i = array_find(s->state->vars, name); - if(i>=0) { + variable_t*v = dict_lookup(s->state->vars, name); + if(v) { if(m) { - *m = array_getvalue(s->state->vars, i); + *m = v->type; } - return i + s->state->local_var_base; + return v->index; } 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); + return dict_lookup(state->vars, name)!=0; } -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; + NEW(variable_t, v); + v->index = global->variable_count; + v->type = type; + dict_put(state->vars, name, v); + return global->variable_count++; +} +#define TEMPVARNAME "__as3_temp__" +static int gettempvar() +{ + int i = find_variable(TEMPVARNAME, 0); + if(i<0) { + return new_variable(TEMPVARNAME, 0); + } else { + return i; + } } + code_t* killvars(code_t*c) { int t; - for(t=0;tvars->num;t++) { - class_signature_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)) { - c = abc_kill(c, t+state->local_var_base); - //} + for(t=0;tvars->hashsize;t++) { + dictentry_t*e =state->vars->slots[t]; + while(e) { + variable_t*v = (variable_t*)e->data; + //do this always, otherwise register types don't match + //in the verifier when doing nested loops + //if(!TYPE_IS_BUILTIN_SIMPLE(type)) { + c = abc_kill(c, v->index); + e = e->next; + } } return c; } -class_signature_t*join_types(class_signature_t*type1, class_signature_t*type2, char op) + +static void check_constant_against_type(classinfo_t*t, constant_t*c) { - return registry_getanytype(); // FIXME +#define xassert(b) if(!(b)) syntaxerror("Invalid default value %s for type '%s'", constant_tostring(c), t->name) + if(TYPE_IS_NUMBER(t)) { + xassert(c->type == CONSTANT_FLOAT + || c->type == CONSTANT_INT + || c->type == CONSTANT_UINT); + } else if(TYPE_IS_UINT(t)) { + xassert(c->type == CONSTANT_UINT || + (c->type == CONSTANT_INT && c->i>0)); + } else if(TYPE_IS_INT(t)) { + xassert(c->type == CONSTANT_INT); + } else if(TYPE_IS_BOOLEAN(t)) { + xassert(c->type == CONSTANT_TRUE + || c->type == CONSTANT_FALSE); + } } -char is_subtype_of(class_signature_t*type, class_signature_t*supertype) + +static void startfunction(token_t*ns, token_t*mod, token_t*getset, token_t*name, + params_t*params, classinfo_t*type) +{ + token_list_t*t; + new_state(); + global->variable_count = 0; + state->function = name->text; + + if(state->m) { + syntaxerror("not able to start another method scope"); + } + + multiname_t*type2 = sig2mname(type); + if(!strcmp(state->clsinfo->name,name->text)) { + state->m = abc_class_constructor(state->cls, type2, 0); + } else { + state->minfo = memberinfo_register(state->clsinfo, name->text, MEMBER_METHOD); + state->minfo->return_type = type; + state->m = abc_class_method(state->cls, type2, name->text, 0); + // getslot on a member slot only returns "undefined", so no need + // to actually store these + //state->minfo->slot = state->m->method->trait->slot_id; + } + if(getset->type == KW_GET) { + state->m->method->trait->kind = TRAIT_GETTER; + } + if(getset->type == KW_SET) { + state->m->method->trait->kind = TRAIT_SETTER; + } + if(params->varargs) { + state->m->method->flags |= METHOD_NEED_REST; + } + + char opt=0; + param_list_t*p=0; + for(p=params->list;p;p=p->next) { + if(params->varargs && !p->next) { + break; //varargs: omit last parameter in function signature + } + multiname_t*m = sig2mname(p->param->type); + list_append(state->m->method->parameters, m); + if(p->param->value) { + check_constant_against_type(p->param->type, p->param->value); + opt=1;list_append(state->m->method->optional_parameters, p->param->value); + } else if(opt) { + syntaxerror("non-optional parameter not allowed after optional parameters"); + } + } + + /* state->vars is initialized by state_new */ + if(new_variable("this", state->clsinfo)!=0) syntaxerror("Internal error"); + + for(p=params->list;p;p=p->next) { + new_variable(p->param->name, p->param->type); + } +} +static void endfunction(code_t*body) +{ + code_t*c = 0; + if(state->late_binding) { + c = abc_getlocal_0(c); + c = abc_pushscope(c); + } + c = code_append(c, state->initcode); + c = code_append(c, body); + + /* append return if necessary */ + if(!c || c->opcode != OPCODE_RETURNVOID && + c->opcode != OPCODE_RETURNVALUE) + c = abc_returnvoid(c); + + if(state->m->code) syntaxerror("internal error"); + state->m->code = c; + old_state(); +} + + + +char is_subtype_of(classinfo_t*type, classinfo_t*supertype) { return 1; // FIXME } @@ -664,7 +827,18 @@ 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) +{ + if(!type1 || !type2) + return registry_getanytype(); + if(TYPE_IS_ANY(type1) || TYPE_IS_ANY(type2)) + return registry_getanytype(); + if(type1 == type2) + return type1; + return registry_getanytype(); +} +code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to) { if(from==to) return c; @@ -683,7 +857,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); @@ -695,6 +869,124 @@ code_t*defaultvalue(code_t*c, class_signature_t*type) return c; } +char is_pushundefined(code_t*c) +{ + return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED); +} + +void parserassert(int b) +{ + if(!b) syntaxerror("internal error: assertion failed"); +} + +static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign) +{ + /* converts this: + + [prefix code] [read instruction] + + to this: + + [prefix code] ([dup]) [read instruction] [middlepart] [setvar] [write instruction] [getvar] + */ + + if(in && in->opcode == OPCODE_COERCE_A) { + in = code_cutlast(in); + } + if(in->next) + syntaxerror("internal error"); + + /* chop off read instruction */ + code_t*prefix = in; + code_t*r = in; + if(r->prev) { + prefix = r->prev;r->prev = 0; + prefix->next=0; + } else { + prefix = 0; + } + + /* generate the write instruction, and maybe append a dup to the prefix code */ + code_t* write = abc_nop(0); + if(r->opcode == OPCODE_GETPROPERTY) { + write->opcode = OPCODE_SETPROPERTY; + multiname_t*m = (multiname_t*)r->data[0]; + write->data[0] = multiname_clone(m); + if(m->type != QNAME) + syntaxerror("illegal lvalue: can't assign a value to this expression (not a qname)"); + if(!justassign) { + prefix = abc_dup(prefix); // we need the object, too + } + } else if(r->opcode == OPCODE_GETSLOT) { + write->opcode = OPCODE_SETSLOT; + write->data[0] = r->data[0]; + if(!justassign) { + prefix = abc_dup(prefix); // we need the object, too + } + } else if(r->opcode == OPCODE_GETLOCAL) { + write->opcode = OPCODE_SETLOCAL; + write->data[0] = r->data[0]; + } else if(r->opcode == OPCODE_GETLOCAL_0) { + write->opcode = OPCODE_SETLOCAL_0; + } else if(r->opcode == OPCODE_GETLOCAL_1) { + write->opcode = OPCODE_SETLOCAL_1; + } else if(r->opcode == OPCODE_GETLOCAL_2) { + write->opcode = OPCODE_SETLOCAL_2; + } else if(r->opcode == OPCODE_GETLOCAL_3) { + write->opcode = OPCODE_SETLOCAL_3; + } else { + code_dump(r, 0, 0, "", stdout); + syntaxerror("illegal lvalue: can't assign a value to this expression"); + } + code_t* c = 0; + + int temp = -1; + if(!justassign) { +#if 1 + /* with getproperty/getslot, we have to be extra careful not + to execute the read code twice, as it might have side-effects + (e.g. if the property is in fact a setter/getter combination) + + So read the value, modify it, and write it again, + using prefix only once and making sure (by using a temporary + register) that the return value is what we just wrote */ + temp = gettempvar(); + c = code_append(c, prefix); + c = code_append(c, r); + c = code_append(c, middlepart); + c = abc_dup(c); + c = abc_setlocal(c, temp); + c = code_append(c, write); + c = abc_getlocal(c, temp); + c = abc_kill(c, temp); +#else + /* if we're allowed to execute the read code twice *and* + the middlepart doesn't modify the code, things are easier. + */ + code_t* r2 = code_dup(r); + //c = code_append(c, prefix); + parserassert(!prefix); + c = code_append(c, r); + c = code_append(c, middlepart); + c = code_append(c, write); + c = code_append(c, r2); +#endif + } else { + /* even smaller version: overwrite the value without reading + it out first */ + if(prefix) { + c = code_append(c, prefix); + c = abc_dup(c); + } + c = code_append(c, middlepart); + c = code_append(c, write); + c = code_append(c, r); + } + + return c; +} + + %} @@ -712,7 +1004,8 @@ CODE: CODEPIECE {$$=$1;} CODEPIECE: PACKAGE_DECLARATION {$$=code_new();/*enters a scope*/} CODEPIECE: CLASS_DECLARATION {$$=code_new();/*enters a scope*/} -CODEPIECE: INTERFACE_DECLARATION {/*TODO*/$$=code_new();} +CODEPIECE: FUNCTION_DECLARATION {$$=code_new();/*enters a scope*/} +CODEPIECE: INTERFACE_DECLARATION {$$=code_new();} CODEPIECE: IMPORT {$$=code_new();/*adds imports to current scope*/} CODEPIECE: ';' {$$=code_new();} CODEPIECE: VARIABLE_DECLARATION {$$=$1} @@ -720,37 +1013,30 @@ 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();} -CODEPIECE: FUNCTION_DECLARATION {/*TODO*/$$=code_new();} CODEPIECE: USE_NAMESPACE {/*TODO*/$$=code_new();} CODEBLOCK : '{' MAYBECODE '}' {$$=$2;} CODEBLOCK : CODEPIECE ';' {$$=$1;} CODEBLOCK : CODEPIECE %prec below_semicolon {$$=$1;} -/* ------------ functions --------------------------- */ - -FUNCTION_DECLARATION: MODIFIERS "function" GETSET T_IDENTIFIER '(' MAYBE_PARAM_LIST ')' - MAYBETYPE '{' {startfunction(0,$1,$3,$4,$6,$8)} MAYBECODE '}' { - if(!state->m) syntaxerror("internal error: undefined function"); - state->initcode = abc_nop(state->initcode); - state->initcode = abc_nop(state->initcode); - state->initcode = abc_nop(state->initcode); - state->m->code = code_append(state->initcode, $11);state->initcode=0; - endfunction() -} - /* ------------ variables --------------------------- */ -MAYBEEXPRESSION : '=' EXPRESSION {$$=$2;} +MAYBEEXPRESSION : '=' NONCOMMAEXPRESSION {$$=$2;} | {$$.c=abc_pushundefined(0); $$.t=TYPE_ANY; } VAR : "const" | "var" -VARIABLE_DECLARATION : VAR T_IDENTIFIER MAYBETYPE MAYBEEXPRESSION { +VARIABLE_DECLARATION : VAR VARIABLE_LIST {$$=$2;} + +VARIABLE_LIST: ONE_VARIABLE {$$ = $1;} +VARIABLE_LIST: VARIABLE_LIST ',' ONE_VARIABLE {$$ = code_append($1, $3);} + +ONE_VARIABLE: {} T_IDENTIFIER MAYBETYPE MAYBEEXPRESSION +{ if(variable_exists($2->text)) syntaxerror("Variable %s already defined", $2->text); @@ -771,15 +1057,13 @@ VARIABLE_DECLARATION : VAR T_IDENTIFIER MAYBETYPE MAYBEEXPRESSION { $$ = abc_setlocal($$, index); } - /* push default value for type on stack */ - state->initcode = defaultvalue(state->initcode, $3); - state->initcode = abc_setlocal(state->initcode, index); + /* if this is a typed variable: + push default value for type on stack */ + if($3) { + state->initcode = defaultvalue(state->initcode, $3); + state->initcode = abc_setlocal(state->initcode, index); + } } else { - /* only bother to actually set this variable if its syntax is either - var x:type; - or - var x=expr; - */ if($4.c->prev || $4.c->opcode != OPCODE_PUSHUNDEFINED) { $$ = $4.c; $$ = abc_coerce_a($$); @@ -796,18 +1080,6 @@ 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); - $$ = $3.c; - if(!type && $3.t) { - // convert to "any" type, the register is untyped - $$ = abc_coerce_a($$); - } else { - // TODO: convert ints to strings etc. - } - $$ = abc_setlocal($$, i); -} /* ------------ control flow ------------------------- */ @@ -835,7 +1107,8 @@ IF : "if" '(' {new_state();} EXPRESSION ')' CODEBLOCK MAYBEELSE { } FOR_INIT : {$$=code_new();} -FOR_INIT : ASSIGNMENT | VARIABLE_DECLARATION | VOIDEXPRESSION +FOR_INIT : VARIABLE_DECLARATION +FOR_INIT : VOIDEXPRESSION FOR : "for" '(' {new_state();} FOR_INIT ';' EXPRESSION ';' VOIDEXPRESSION ')' CODEBLOCK { $$ = state->initcode;state->initcode=0; @@ -875,18 +1148,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 '.' '*' { @@ -897,7 +1173,7 @@ IMPORT : "import" PACKAGE '.' '*' { $$=0; } -/* ------------ classes and interfaces -------------- */ +/* ------------ classes and interfaces (header) -------------- */ MODIFIERS : {$$=empty_token();} MODIFIERS : MODIFIER_LIST {$$=$1} @@ -906,82 +1182,284 @@ 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 '{' {startclass($1,$3,$4,$5, 0);} MAYBE_DECLARATION_LIST '}' {endclass();} + INTERFACE_DECLARATION : MODIFIERS "interface" T_IDENTIFIER EXTENDS_LIST '{' {startclass($1,$3,0,$4,1);} MAYBE_IDECLARATION_LIST '}' {endclass();} -TYPE : PACKAGEANDCLASS {$$=$1;} - | '*' {$$=registry_getanytype();} - | "String" {$$=registry_getstringclass();} - | "int" {$$=registry_getintclass();} - | "uint" {$$=registry_getuintclass();} - | "Boolean" {$$=registry_getbooleanclass();} - | "Number" {$$=registry_getnumberclass();} +/* ------------ classes and interfaces (body) -------------- */ -MAYBETYPE: ':' TYPE {$$=$2;} -MAYBETYPE: {$$=0;} +MAYBE_DECLARATION_LIST : +MAYBE_DECLARATION_LIST : DECLARATION_LIST +DECLARATION_LIST : DECLARATION +DECLARATION_LIST : DECLARATION_LIST DECLARATION +DECLARATION : ';' +DECLARATION : SLOT_DECLARATION +DECLARATION : FUNCTION_DECLARATION -//FUNCTION_HEADER: NAMESPACE MODIFIERS T_FUNCTION GETSET T_IDENTIFIER '(' PARAMS ')' -FUNCTION_HEADER: MODIFIERS "function" GETSET T_IDENTIFIER '(' MAYBE_PARAM_LIST ')' - MAYBETYPE +/* ------------ classes and interfaces (body, slots ) ------- */ -NAMESPACE_DECLARATION : MODIFIERS KW_NAMESPACE T_IDENTIFIER -NAMESPACE_DECLARATION : MODIFIERS KW_NAMESPACE T_IDENTIFIER '=' T_IDENTIFIER -NAMESPACE_DECLARATION : MODIFIERS KW_NAMESPACE T_IDENTIFIER '=' T_STRING +VARCONST: "var" | "const" +SLOT_DECLARATION: MODIFIERS VARCONST T_IDENTIFIER MAYBETYPE MAYBEEXPRESSION { -//NAMESPACE : {$$=empty_token();} -//NAMESPACE : T_IDENTIFIER {$$=$1}; + memberinfo_t* info = memberinfo_register(state->clsinfo, $3->text, MEMBER_SLOT); + info->type = $4; -CONSTANT : T_BYTE {$$.c = abc_pushbyte(0, $1); - //MULTINAME(m, registry_getintclass()); - //$$.c = abc_coerce2($$.c, &m); // FIXME - $$.t = TYPE_INT; - } -CONSTANT : T_SHORT {$$.c = abc_pushshort(0, $1); - $$.t = TYPE_INT; - } -CONSTANT : T_INT {$$.c = abc_pushint(0, $1); - $$.t = TYPE_INT; - } -CONSTANT : T_UINT {$$.c = abc_pushuint(0, $1); - $$.t = TYPE_UINT; - } -CONSTANT : T_FLOAT {$$.c = abc_pushdouble(0, $1); - $$.t = TYPE_FLOAT; - } -CONSTANT : T_STRING {$$.c = abc_pushstring(0, $1); - $$.t = TYPE_STRING; - } -CONSTANT : KW_TRUE {$$.c = abc_pushtrue(0); - $$.t = TYPE_BOOLEAN; - } -CONSTANT : KW_FALSE {$$.c = abc_pushfalse(0); - $$.t = TYPE_BOOLEAN; - } -CONSTANT : KW_NULL {$$.c = abc_pushnull(0); - $$.t = TYPE_NULL; - } + trait_t*t=0; + if($4) { + MULTINAME(m, $4); + t=abc_class_slot(state->cls, $3->text, &m); + } else { + t=abc_class_slot(state->cls, $3->text, 0); + } + if($2->type==KW_CONST) { + t->kind= TRAIT_CONST; + } + info->slot = t->slot_id; + if($5.c && !is_pushundefined($5.c)) { + code_t*c = 0; + c = abc_getlocal_0(c); + c = code_append(c, $5.c); + c = converttype(c, $5.t, $4); + c = abc_setslot(c, t->slot_id); + //c = abc_setproperty(c, $3->text); + state->cls_init = code_append(state->cls_init, c); + } +} -USE_NAMESPACE : "use" "namespace" T_IDENTIFIER +/* ------------ constants -------------------------------------- */ + +MAYBESTATICCONSTANT: {$$=0;} +MAYBESTATICCONSTANT: '=' STATICCONSTANT {$$=$2;} + +STATICCONSTANT : T_BYTE {$$ = constant_new_int($1);} +STATICCONSTANT : T_INT {$$ = constant_new_int($1);} +STATICCONSTANT : T_UINT {$$ = constant_new_uint($1);} +STATICCONSTANT : T_FLOAT {$$ = constant_new_float($1);} +STATICCONSTANT : T_STRING {$$ = constant_new_string($1);} +//STATICCONSTANT : T_NAMESPACE {$$ = constant_new_namespace($1);} +STATICCONSTANT : KW_TRUE {$$ = constant_new_true($1);} +STATICCONSTANT : KW_FALSE {$$ = constant_new_false($1);} +STATICCONSTANT : KW_NULL {$$ = constant_new_null($1);} + +/* ------------ classes and interfaces (body, functions) ------- */ + +// non-vararg version +MAYBE_PARAM_LIST: { + memset(&$$,0,sizeof($$)); +} +MAYBE_PARAM_LIST: PARAM_LIST { + $$=$1; +} + +// vararg version +MAYBE_PARAM_LIST: "..." PARAM { + memset(&$$,0,sizeof($$)); + $$.varargs=1; + list_append($$.list, $2); +} +MAYBE_PARAM_LIST: PARAM_LIST ',' "..." PARAM { + $$ =$1; + $$.varargs=1; + list_append($$.list, $4); +} + +// non empty +PARAM_LIST: PARAM_LIST ',' PARAM { + $$ = $1; + list_append($$.list, $3); +} +PARAM_LIST: PARAM { + memset(&$$,0,sizeof($$)); + list_append($$.list, $1); +} +PARAM: T_IDENTIFIER ':' TYPE MAYBESTATICCONSTANT { + $$ = malloc(sizeof(param_t)); + $$->name=$1->text; + $$->type = $3; + $$->value = $4; +} +PARAM: T_IDENTIFIER MAYBESTATICCONSTANT { + $$ = malloc(sizeof(param_t)); + $$->name=$1->text;$$->type = TYPE_ANY; +} + +FUNCTION_DECLARATION: MODIFIERS "function" GETSET T_IDENTIFIER '(' MAYBE_PARAM_LIST ')' + MAYBETYPE '{' {startfunction(0,$1,$3,$4,&$6,$8)} MAYBECODE '}' +{ + if(!state->m) syntaxerror("internal error: undefined function"); + endfunction($11); +} + +/* ------------- 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 : NONCOMMAEXPRESSION {$$=list_new(); + typedcode_t*t = malloc(sizeof(typedcode_t)); + *t = $1; + list_append($$, t);} +EXPRESSION_LIST : EXPRESSION_LIST ',' NONCOMMAEXPRESSION {$$=$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(); + + /* TODO: why do we have to *find* our own classes? */ + $$.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_COERCE_A) { + $$.c = code_cutlast($$.c); + } + + $$.t = TYPE_ANY; + multiname_t*name = 0; + if($$.c->opcode == OPCODE_GETPROPERTY) { + name = multiname_clone($$.c->data[0]); + $$.c = code_cutlast($$.c); + $$.c = code_append($$.c, paramcode); + $$.c = abc_callproperty2($$.c, name, len); + } else if($$.c->opcode == OPCODE_GETSLOT) { + int slot = (int)(ptroff_t)$$.c->data[0]; + trait_t*t = abc_class_find_slotid(state->cls,slot);//FIXME + if(t->kind!=TRAIT_METHOD) { + //flash allows to assign closures to members. + //syntaxerror("not a function"); + } + name = t->name; + $$.c = code_cutlast($$.c); + $$.c = code_append($$.c, paramcode); + //$$.c = abc_callmethod($$.c, t->method, len); //#1051 illegal early access binding + $$.c = abc_callproperty2($$.c, name, len); + } else { + $$.c = abc_getlocal_0($$.c); + $$.c = code_append($$.c, paramcode); + $$.c = abc_call($$.c, len); + } + + memberinfo_t*f = 0; + + if(TYPE_IS_FUNCTION($1.t) && + (f = registry_findmember($1.t, "call"))) { + $$.t = f->return_type; + } else { + $$.c = abc_coerce_a($$.c); + $$.t = TYPE_ANY; + } +} +RETURN: "return" %prec prec_none { + $$ = abc_returnvoid(0); +} +RETURN: "return" EXPRESSION { + $$ = $2.c; + $$ = abc_returnvalue($$); +} +// ----------------------- expression types ------------------------------------- + +NONCOMMAEXPRESSION : E %prec prec_belowminus {$$=$1;} +EXPRESSION : E %prec prec_belowminus {$$ = $1;} +EXPRESSION : EXPRESSION ',' E %prec prec_belowminus { + $$.c = $1.c; + $$.c = cut_last_push($$.c); + $$.c = code_append($$.c,$3.c); + $$.t = $3.t; +} +VOIDEXPRESSION : EXPRESSION %prec prec_belowminus {$$=cut_last_push($1.c);} -EXPRESSION : E %prec prec_none /*precendence below '-x'*/ {$$ = $1;} -VOIDEXPRESSION : E %prec prec_none {$$=$1.c;/*calculate and discard*/$$=abc_pop($$);} +// ----------------------- expression evaluation ------------------------------------- E : CONSTANT E : VAR_READ %prec T_IDENTIFIER {$$ = $1;} @@ -1017,20 +1495,26 @@ E : E "||" E {$$.t = join_types($1.t, $3.t, 'O'); $$.c = converttype($$.c, $1.t, $$.t); $$.c = abc_dup($$.c); code_t*jmp = $$.c = abc_iftrue($$.c, 0); - $$.c = abc_pop($$.c); + $$.c = cut_last_push($$.c); $$.c = code_append($$.c,$3.c); - $$.c = converttype($$.c, $1.t, $$.t); + $$.c = converttype($$.c, $3.t, $$.t); code_t*label = $$.c = abc_label($$.c); jmp->branch = label; } -E : E "&&" E {$$.t = join_types($1.t, $3.t, 'A'); +E : E "&&" E { + $$.t = join_types($1.t, $3.t, 'A'); + /*printf("%08x:\n",$1.t); + code_dump($1.c, 0, 0, "", stdout); + printf("%08x:\n",$3.t); + code_dump($3.c, 0, 0, "", stdout); + printf("joining %08x and %08x to %08x\n", $1.t, $3.t, $$.t);*/ $$.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 = cut_last_push($$.c); $$.c = code_append($$.c,$3.c); - $$.c = converttype($$.c, $1.t, $$.t); + $$.c = converttype($$.c, $3.t, $$.t); code_t*label = $$.c = abc_label($$.c); jmp->branch = label; } @@ -1052,96 +1536,214 @@ 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, '+'); - $$.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, '-'); - $$.c=converttype($$.c, type, $1.type); - $$.c=abc_dup($$.c);$$.c=code_append($$.c,$1.write); - $$.t = $1.type; +E : E '[' E ']' { + $$.c = $1.c; + $$.c = code_append($$.c, $3.c); + + MULTINAME_LATE(m, $1.t?$1.t->access:ACCESS_PACKAGE, ""); + $$.c = abc_getproperty2($$.c, &m); +} + +E : E "+=" E { + code_t*c = $3.c; + if(TYPE_IS_INT($3.t) || TYPE_IS_UINT($3.t)) { + c=abc_add_i(c); + } else { + c=abc_add(c); + } + c=converttype(c, join_types($1.t, $3.t, '+'), $1.t); + + $$.c = toreadwrite($1.c, c, 0); + $$.t = $1.t; } +E : E "-=" E { code_t*c = $3.c; + if(TYPE_IS_INT($3.t) || TYPE_IS_UINT($3.t)) { + c=abc_subtract_i(c); + } else { + c=abc_subtract(c); + } + c=converttype(c, join_types($1.t, $3.t, '-'), $1.t); + + $$.c = toreadwrite($1.c, c, 0); + $$.t = $1.t; + } +E : E '=' E { code_t*c = 0; + c = code_append(c, $3.c); + c = converttype(c, $3.t, $1.t); + $$.c = toreadwrite($1.c, c, 1); + $$.t = $1.t; + } // 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; - $$.c=converttype($$.c, type, $1.type); - $$.c=abc_dup($$.c);$$.c=code_append($$.c,$1.write); - $$.t = $1.type; +E : E "++" { code_t*c = 0; + classinfo_t*type = $1.t; + 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.t); + $$.c = toreadwrite($1.c, c, 0); + $$.t = $1.t; + } +E : E "--" { code_t*c = 0; + classinfo_t*type = $1.t; + 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.t); + $$.c = toreadwrite($1.c, c, 0); + $$.t = $1.t; } -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); - $$.c=abc_dup($$.c);$$.c=code_append($$.c,$1.write); - $$.t = $1.type; + +E : "++" E { code_t*c = 0; + classinfo_t*type = $2.t; + 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, $2.t); + $$.c = toreadwrite($2.c, c, 0); + $$.t = $2.t; + } + +E : E '.' T_IDENTIFIER + {$$.c = $1.c; + if($$.t) { + memberinfo_t*f = registry_findmember($$.t, $3->text); + + if(f && f->slot) { + $$.c = abc_getslot($$.c, f->slot); + } else { + namespace_t ns = {$$.t->access, ""}; // needs to be "", not $$.t->package + multiname_t m = {QNAME, &ns, 0, $3->text}; + $$.c = abc_getproperty2($$.c, &m); + } + /* determine type */ + if(f) { + if(f->kind == MEMBER_METHOD) { + $$.t = TYPE_FUNCTION(f); + } else { + $$.t = f->type; + } + } else { + $$.c = abc_coerce_a($$.c); + $$.t = registry_getanytype(); + } + } else { + namespace_t ns = {ACCESS_PACKAGE, ""}; + multiname_t m = {QNAME, &ns, 0, $3->text}; + $$.c = abc_getproperty2($$.c, &m); + $$.c = abc_coerce_a($$.c); + $$.t = registry_getanytype(); + } } -LH: T_IDENTIFIER { - int i = find_variable($1->text, &$$.type); - $$.read = abc_getlocal(0, i); - $$.write = abc_setlocal(0, i); +VAR_READ : T_IDENTIFIER { + $$.t = 0; + $$.c = 0; + int i; + memberinfo_t*f = 0; + if((i = find_variable($1->text, &$$.t)) >= 0) { + // $1 is a local variable + $$.c = abc_getlocal($$.c, i); + } else if((f = registry_findmember(state->clsinfo, $1->text))) { + // $1 is a function in this class + if(f->kind == MEMBER_METHOD) { + $$.t = TYPE_FUNCTION(f); + } else { + $$.t = f->type; + } + if(f->slot>0) { + $$.c = abc_getlocal_0($$.c); + $$.c = abc_getslot($$.c, f->slot); + } else { + namespace_t ns = {state->clsinfo->access, ""}; + multiname_t m = {QNAME, &ns, 0, $1->text}; + $$.c = abc_getlocal_0($$.c); + $$.c = abc_getproperty2($$.c, &m); + } + } else { + // let the avm2 resolve $1 + if(strcmp($1->text,"trace")) + warning("Couldn't resolve %s, doing late binding", $1->text); + state->late_binding = 1; + + $$.t = 0; + $$.c = abc_findpropstrict($$.c, $1->text); + $$.c = abc_getproperty($$.c, $1->text); + } } -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);} +TYPE : QNAME {$$=$1;} + | '*' {$$=registry_getanytype();} + | "String" {$$=registry_getstringclass();} + | "int" {$$=registry_getintclass();} + | "uint" {$$=registry_getuintclass();} + | "Boolean" {$$=registry_getbooleanclass();} + | "Number" {$$=registry_getnumberclass();} + +MAYBETYPE: ':' TYPE {$$=$2;} +MAYBETYPE: {$$=0;} + +//FUNCTION_HEADER: NAMESPACE MODIFIERS T_FUNCTION GETSET T_IDENTIFIER '(' PARAMS ')' +FUNCTION_HEADER: MODIFIERS "function" GETSET T_IDENTIFIER '(' MAYBE_PARAM_LIST ')' + MAYBETYPE + +NAMESPACE_DECLARATION : MODIFIERS KW_NAMESPACE T_IDENTIFIER +NAMESPACE_DECLARATION : MODIFIERS KW_NAMESPACE T_IDENTIFIER '=' T_IDENTIFIER +NAMESPACE_DECLARATION : MODIFIERS KW_NAMESPACE T_IDENTIFIER '=' T_STRING + +//NAMESPACE : {$$=empty_token();} +//NAMESPACE : T_IDENTIFIER {$$=$1}; + +CONSTANT : T_BYTE {$$.c = abc_pushbyte(0, $1); + //MULTINAME(m, registry_getintclass()); + //$$.c = abc_coerce2($$.c, &m); // FIXME + $$.t = TYPE_INT; + } +CONSTANT : T_SHORT {$$.c = abc_pushshort(0, $1); + $$.t = TYPE_INT; + } +CONSTANT : T_INT {$$.c = abc_pushint(0, $1); + $$.t = TYPE_INT; + } +CONSTANT : T_UINT {$$.c = abc_pushuint(0, $1); + $$.t = TYPE_UINT; + } +CONSTANT : T_FLOAT {$$.c = abc_pushdouble(0, $1); + $$.t = TYPE_FLOAT; + } +CONSTANT : T_STRING {$$.c = abc_pushstring(0, $1); + $$.t = TYPE_STRING; + } +CONSTANT : KW_TRUE {$$.c = abc_pushtrue(0); + $$.t = TYPE_BOOLEAN; + } +CONSTANT : KW_FALSE {$$.c = abc_pushfalse(0); + $$.t = TYPE_BOOLEAN; + } +CONSTANT : KW_NULL {$$.c = abc_pushnull(0); + $$.t = TYPE_NULL; + } + +USE_NAMESPACE : "use" "namespace" T_IDENTIFIER -VAR_READ : T_IDENTIFIER { - int i = find_variable($1->text, &$$.t); - $$.c = abc_getlocal(0, i); -} //VARIABLE : T_IDENTIFIER //VARIABLE : VARIABLE '.' T_IDENTIFIER @@ -1150,80 +1752,19 @@ 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();} -MAYBE_PARAM_LIST: {$$=list_new();} -MAYBE_PARAM_LIST: PARAM_LIST {$$=$1;} -PARAM_LIST: PARAM_LIST ',' PARAM {$$ =$1; list_append($$, $3);} -PARAM_LIST: PARAM {$$ = list_new();list_append($$, $1);} -PARAM: T_IDENTIFIER ':' TYPE {$$ = malloc(sizeof(param_t)); - $$->name=$1->text;$$->type = $3;} -PARAM: T_IDENTIFIER {$$ = malloc(sizeof(param_t)); - $$->name=$1->text;$$->type = TYPE_ANY;} - -DECLARATION : VARIABLE_DECLARATION -DECLARATION : FUNCTION_DECLARATION - IDECLARATION : VARIABLE_DECLARATION 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; - } +QNAME_LIST : QNAME {$$=list_new();list_append($$, $1);} +QNAME_LIST : QNAME_LIST ',' QNAME {$$=$1;list_append($$,$3);} - /* 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);} - -MAYBE_DECLARATION_LIST : -MAYBE_DECLARATION_LIST : DECLARATION_LIST -DECLARATION_LIST : DECLARATION -DECLARATION_LIST : DECLARATION_LIST DECLARATION MAYBE_IDECLARATION_LIST : MAYBE_IDECLARATION_LIST : IDECLARATION_LIST