X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.y;h=c64fb41d6757a50367855a9ac4bf38b4d28a8949;hb=309cfb29215471ef323da96e21d1e2c7c0508be0;hp=353f12e1cb72fdf80b3def4f782d65f36c500691;hpb=0dcc87936907b5f1a80e74f9483e43f763e0cdc2;p=swftools.git diff --git a/lib/as3/parser.y b/lib/as3/parser.y index 353f12e..c64fb41 100644 --- a/lib/as3/parser.y +++ b/lib/as3/parser.y @@ -31,6 +31,7 @@ #include "registry.h" #include "code.h" #include "opcodes.h" + %} //%glr-parser @@ -39,14 +40,17 @@ %union tokenunion { tokenptr_t token; - multiname_t*multiname; - multiname_list_t*multiname_list; + + class_signature_t*class_signature; + class_signature_list_t*class_signature_list; + int number_int; unsigned int number_uint; double number_float; - struct _code*code; - struct _code_list*code_list; - struct _writeable writeable; + code_t*code; + typedcode_t value; + typedcode_list_t*value_list; + writeable_t writeable; char*string; } @@ -62,7 +66,7 @@ %token T_FLOAT %token KW_IMPLEMENTS -%token KW_NAMESPACE +%token KW_NAMESPACE "namespace" %token KW_PACKAGE "package" %token KW_PROTECTED %token KW_PUBLIC @@ -91,14 +95,17 @@ %token KW_BOOLEAN "Boolean" %token KW_UINT "uint" %token KW_INT "int" +%token KW_WHILE "while" %token KW_NUMBER "Number" %token KW_STRING "String" %token KW_IF "if" %token KW_ELSE "else" +%token KW_BREAK "break" %token KW_IS "is" %token KW_AS "as" %token T_EQEQ "==" +%token T_EQEQEQ "===" %token T_NE "!=" %token T_LE "<=" %token T_GE ">=" @@ -123,7 +130,7 @@ %token T_DOT '.' %type CODE -%type CODEPIECE CODEPIECE2 +%type CODEPIECE %type CODEBLOCK MAYBECODE %type PACKAGE_DECLARATION %type FUNCTION_DECLARATION @@ -131,16 +138,17 @@ %type CLASS_DECLARATION %type NAMESPACE_DECLARATION %type INTERFACE_DECLARATION -%type EXPRESSION -%type MAYBEEXPRESSION -%type E +%type VOIDEXPRESSION +%type EXPRESSION +%type MAYBEEXPRESSION +%type E %type LH -%type CONSTANT -%type FOR IF MAYBEELSE -%type USE -%type ASSIGNMENT NEW_ASSIGNMENT SOME_ASSIGNMENT +%type CONSTANT +%type FOR IF WHILE MAYBEELSE BREAK +%type USE_NAMESPACE +%type ASSIGNMENT FOR_INIT %type IMPORT -%type MAYBETYPE +%type MAYBETYPE %type PACKAGESPEC %type GETSET %type PARAM @@ -148,22 +156,22 @@ %type PARAM_LIST %type MODIFIERS %type MODIFIER_LIST -%type IMPLEMENTS_LIST -%type EXTENDS -%type EXTENDS_LIST -%type PACKAGEANDCLASS -%type PACKAGEANDCLASS_LIST +%type IMPLEMENTS_LIST +%type EXTENDS +%type EXTENDS_LIST +%type PACKAGEANDCLASS +%type PACKAGEANDCLASS_LIST %type MULTILEVELIDENTIFIER -%type TYPE +%type TYPE %type VAR //%type VARIABLE -%type VAR_READ -%type NEW +%type VAR_READ +%type NEW %type X_IDENTIFIER %type MODIFIER %type PACKAGE -%type FUNCTIONCALL -%type MAYBE_EXPRESSION_LIST EXPRESSION_LIST +%type FUNCTIONCALL +%type MAYBE_EXPRESSION_LIST EXPRESSION_LIST // precendence: from low to high // http://livedocs.adobe.com/flash/9.0/main/wwhelp/wwhimpl/common/html/wwhelp.htm?context=LiveDocs_Parts&file=00000012.html @@ -181,7 +189,7 @@ %nonassoc '|' %nonassoc '^' %nonassoc '&' -%nonassoc "!=" "==" "<=" '<' ">=" '>' // TODO: support "a < b < c" syntax? +%nonassoc "!=" "==" "===" "<=" '<' ">=" '>' // TODO: support "a < b < c" syntax? %nonassoc "is" %left '-' %left '+' @@ -198,6 +206,7 @@ %nonassoc "as" %left '.' ".." "::" %nonassoc T_IDENTIFIER +%left below_semicolon %left ';' %nonassoc "else" %left '(' @@ -261,6 +270,10 @@ typedef struct _state { char*package; char*function; + /* code that needs to be executed at the start of + a method (like initializing local registers) */ + code_t*initcode; + abc_method_body_t*m; import_list_t*imports; @@ -269,25 +282,56 @@ typedef struct _state { abc_class_t*cls; array_t*vars; - + int local_var_base; } state_t; 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); + static state_list_t*state_stack=0; -void initialize_state() +static void new_state() { NEW(state_t, s); NEW(state_list_t, sl); + + state_t*oldstate = state; + if(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; state_stack = sl; - state = sl->state = s; + state = s; + state->level++; + state->vars = array_new(); + state->initcode = 0; +} +static void old_state() +{ + if(!state_stack || !state_stack->next) + syntaxerror("invalid nesting"); + state_t*oldstate = state; + state_list_t*old = state_stack; + state_stack = state_stack->next; + free(old); + state = state_stack->state; + /*if(state->initcode) { + printf("residual initcode\n"); + code_dump(state->initcode, 0, 0, "", stdout); + }*/ + state->initcode = code_append(state->initcode, oldstate->initcode); +} +void initialize_state() +{ + new_state(); state->file = abc_file_new(); state->file->flags &= ~ABCFILE_LAZY; - state->level = 0; state->init = abc_initscript(state->file, 0, 0); abc_method_body_t*m = state->init->method->body; @@ -299,7 +343,7 @@ void initialize_state() } void* finalize_state() { - if(state->level) { + if(state->level!=1) { syntaxerror("unexpected end of file"); } abc_method_body_t*m = state->init->method->body; @@ -312,32 +356,6 @@ void* finalize_state() return state->file; } -static void new_state() -{ - NEW(state_t, s); - NEW(state_list_t, sl); - - if(state->m) { - syntaxerror("not able to start another method scope"); - } - - memcpy(s, state, sizeof(state_t)); //shallow copy - sl->next = state_stack; - sl->state = s; - state_stack = sl; - state = s; - state->level++; -} -static void old_state() -{ - if(!state_stack || !state_stack->next) - syntaxerror("invalid nesting"); - state_t*oldstate = state; - state_list_t*old = state_stack; - state_stack = state_stack->next; - free(old); - state = state_stack->state; -} static void startpackage(token_t*t) { @@ -346,34 +364,36 @@ static void startpackage(token_t*t) } new_state(); char*name = t?t->text:""; - printf("entering package \"%s\"\n", name); + /*printf("entering package \"%s\"\n", name);*/ state->package = name; } static void endpackage() { - printf("leaving package \"%s\"\n", state->package); + /*printf("leaving package \"%s\"\n", state->package);*/ old_state(); } char*globalclass=0; -static void startclass(token_t*modifiers, token_t*name, multiname_t*extends, multiname_list_t*implements) +static void startclass(token_t*modifiers, token_t*name, class_signature_t*extends, class_signature_list_t*implements) { if(state->cls) { syntaxerror("inner classes now allowed"); } new_state(); state->classname = name->text; - printf("entering class %s\n", name->text); + token_list_t*t=0; + class_signature_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"); - printf(" extends: %s\n", multiname_tostring(extends)); + if(extends) + printf(" extends: %s.%s\n", extends->package, extends->name); - multiname_list_t*mlist=0; printf(" implements (%d): ", list_length(implements)); for(mlist=implements;mlist;mlist=mlist->next) { - printf("%s ", multiname_tostring(mlist->multiname)); + printf("%s ", mlist->class_signature->name); } - printf("\n"); + printf("\n");*/ char public=0,internal=0,final=0,sealed=1; for(t=modifiers->tokens;t;t=t->next) { @@ -393,40 +413,57 @@ static void startclass(token_t*modifiers, token_t*name, multiname_t*extends, mul syntaxerror("public and internal not supported at the same time."); /* create the class name, together with the proper attributes */ - multiname_t* classname = 0; - if(!public && !state->package) - classname = multiname_new(namespace_new_private(current_filename), state->classname); - else if(!public && state->package) - classname = multiname_new(namespace_new_packageinternal(state->package), state->classname); - else if(state->package) - classname = multiname_new(namespace_new_package(state->package), state->classname); - else + int access=0; + char*package=0; + + if(!public && !state->package) { + access = ACCESS_PRIVATE; package = current_filename; + } else if(!public && state->package) { + access = ACCESS_PACKAGEINTERNAL; package = state->package; + } else if(state->package) { + access = ACCESS_PACKAGE; package = state->package; + } else { 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); + } + + class_signature_t* classname = class_signature_register(access, package, state->classname); + + multiname_t*extends2 = sig2mname(extends); + multiname_t*classname2 = sig2mname(classname); - state->cls = abc_class_new(state->file, classname, extends); + state->cls = abc_class_new(state->file, classname2, extends2); if(final) abc_class_final(state->cls); if(sealed) abc_class_sealed(state->cls); for(mlist=implements;mlist;mlist=mlist->next) { - abc_class_add_interface(state->cls, mlist->multiname); + MULTINAME(m, mlist->class_signature); + abc_class_add_interface(state->cls, &m); } /* now write the construction code for this class */ - int slotindex = abc_initscript_addClassTrait(state->init, classname, state->cls); + int slotindex = abc_initscript_addClassTrait(state->init, classname2, state->cls); abc_method_body_t*m = state->init->method->body; __ getglobalscope(m); - multiname_t*s = extends; + class_signature_t*s = extends; int count=0; while(s) { //TODO: take a look at the current scope stack, maybe // we can re-use something - s = registry_getsuperclass(s); + s = s->superclass; if(!s) break; - __ getlex2(m, s); + + multiname_t*s2 = sig2mname(s); + __ getlex2(m, s2); + multiname_destroy(s2); + __ pushscope(m); m->code = m->code->prev->prev; // invert count++; @@ -437,7 +474,7 @@ static void startclass(token_t*modifiers, token_t*name, multiname_t*extends, mul /* TODO: if this is one of *our* classes, we can also do a getglobalscope/getslot (which references the init function's slots) */ - __ getlex2(m, extends); + __ getlex2(m, extends2); __ dup(m); __ pushscope(m); // we get a Verify Error #1107 if this is not the top scope __ newclass(m,state->cls); @@ -446,7 +483,8 @@ static void startclass(token_t*modifiers, token_t*name, multiname_t*extends, mul } __ setslot(m, slotindex); - if(!globalclass && public && multiname_equals(registry_getMovieClip(),extends)) { + /* flash.display.MovieClip handling */ + if(!globalclass && public && class_signature_equals(registry_getMovieClip(),extends)) { if(state->package && state->package[0]) { globalclass = concat3str(state->package, ".", state->classname); } else { @@ -457,7 +495,7 @@ static void startclass(token_t*modifiers, token_t*name, multiname_t*extends, mul static void endclass() { - printf("leaving class %s\n", state->classname); + /*printf("leaving class %s\n", state->classname);*/ old_state(); } static void addimport(token_t*t) @@ -475,61 +513,50 @@ static void print_imports() } } static void startfunction(token_t*ns, token_t*mod, token_t*getset, token_t*name, - token_t*params, multiname_t*type) + token_t*params, class_signature_t*type) { token_list_t*t; new_state(); state->function = name->text; - printf("entering function %s\n", 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"); - printf(" type: %s\n", multiname_tostring(type)); - print_imports(); + 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(!strcmp(state->classname,name->text)) { - state->m = abc_class_constructor(state->cls, type, 0); + state->m = abc_class_constructor(state->cls, type2, 0); } else { - state->m = abc_class_method(state->cls, type, name->text, 0); + state->m = abc_class_method(state->cls, type2, name->text, 0); } - state->vars = array_new(); + /* state->vars is initialized by state_new */ array_append(state->vars, "this", 0); __ getlocal_0(state->m); __ pushscope(state->m); + + multiname_destroy(type2); } static void endfunction() { - printf("leaving function %s\n", state->function); + /*printf("leaving function %s\n", state->function);*/ __ returnvoid(state->m); old_state(); } -static int newvariable(token_t*mod, token_t*varconst, token_t*name, multiname_t*type) -{ - token_list_t*t; - printf("defining new variable %s\n", name->text); - if(mod) { - printf(" mod: ");for(t=mod->tokens;t;t=t->next) printf("%s ", t->token->text);printf("\n"); - } - if(varconst) { - printf(" access: ");printf("%s\n", varconst->text); - } - printf(" type: ");printf("%s\n", multiname_tostring(type)); - if(!state->vars) - syntaxerror("not allowed to defined variables outside a method"); - int index = array_find(state->vars, name->text); - if(index>=0) { - syntaxerror("Variable %s already defined", name->text); - } else { - index = array_append(state->vars, name->text, 0); - } - return index; -} static token_t* empty_token() { NEW(token_t,t); @@ -558,40 +585,272 @@ 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) +{ + state_list_t* s = state_stack; + while(s) { + int i = array_find(s->state->vars, name); + if(i>=0) { + if(m) { + *m = array_getvalue(s->state->vars, i); + } + return i + s->state->local_var_base; + } + s = s->next; + } + syntaxerror("undefined variable: %s", name); +} +static char variable_exists(char*name) +{ + return array_contains(state->vars, name); +} +static int new_variable(char*name, class_signature_t*type) +{ + return array_append(state->vars, name, type) + state->local_var_base; +} +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); + //} + } + 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) +{ + return 1; // FIXME +} + +void breakjumpsto(code_t*c, code_t*jump) +{ + while(c->prev) + c=c->prev; + while(c) { + if(c->opcode == OPCODE___BREAK__) { + c->opcode = OPCODE_JUMP; + c->branch = jump; + } + c = c->next; + } +} +code_t*converttype(code_t*c, class_signature_t*from, class_signature_t*to) +{ + if(!to) { + /*TODO: can omit this if from is zero? */ + return abc_coerce_a(c); + } + if(TYPE_IS_NUMBER(from) && TYPE_IS_UINT(to)) { + MULTINAME(m, TYPE_UINT); + return abc_coerce2(c, &m); + } + if(TYPE_IS_NUMBER(from) && TYPE_IS_INT(to)) { + MULTINAME(m, TYPE_INT); + return abc_coerce2(c, &m); + } + return c; +} + +code_t*defaultvalue(code_t*c, class_signature_t*type) +{ + if(TYPE_IS_INT(type) || TYPE_IS_UINT(type) || TYPE_IS_FLOAT(type)) { + c = abc_pushbyte(c, 0); + } else if(TYPE_IS_BOOLEAN(type)) { + c = abc_pushfalse(c); + } else { + c = abc_pushnull(c); + } + return c; +} + %} + %% +/* ------------ code blocks / statements ---------------- */ + PROGRAM: MAYBECODE MAYBECODE: CODE {$$=$1;} MAYBECODE: {$$=code_new();} -CODE: CODE CODEPIECE2 {$$=$1;} -CODE: CODEPIECE2 {$$=code_new();} - -CODEPIECE2: CODEPIECE { - if(state->m) { - state->m->code = code_append(state->m->code, $1); - } -} +CODE: CODE CODEPIECE {$$=code_append($1,$2);} +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: IMPORT {$$=code_new();/*adds imports to current scope*/} CODEPIECE: ';' {$$=code_new();} CODEPIECE: VARIABLE_DECLARATION {$$=$1} -CODEPIECE: PACKAGE_DECLARATION {/*TODO*/$$=code_new();} -CODEPIECE: IMPORT {/*TODO*/$$=code_new();} -CODEPIECE: NAMESPACE_DECLARATION {/*TODO*/$$=code_new();} -CODEPIECE: CLASS_DECLARATION {/*TODO*/$$=code_new();} -CODEPIECE: INTERFACE_DECLARATION {/*TODO*/$$=code_new();} -CODEPIECE: FUNCTION_DECLARATION {/*TODO*/$$=code_new();} -CODEPIECE: EXPRESSION {/*calculate and discard*/$$=$1;$$=abc_pop($$);} +CODEPIECE: VOIDEXPRESSION {$$=$1} CODEPIECE: FOR {$$=$1} +CODEPIECE: WHILE {$$=$1} +CODEPIECE: BREAK {$$=$1} CODEPIECE: IF {$$=$1} -CODEPIECE: USE {/*TODO*/$$=code_new();} -CODEPIECE: ASSIGNMENT {/*TODO*/$$=code_new();} +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 ';' {$$=$1;} +CODEBLOCK : CODEPIECE %prec below_semicolon {$$=$1;} + +/* ------------ functions --------------------------- */ + +FUNCTION_DECLARATION: MODIFIERS "function" GETSET T_IDENTIFIER '(' PARAMS ')' + 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;} + | {$$.c=abc_pushundefined(0); + $$.t=TYPE_ANY; + } + +VAR : "const" | "var" +VARIABLE_DECLARATION : VAR T_IDENTIFIER MAYBETYPE MAYBEEXPRESSION { + if(variable_exists($2->text)) + syntaxerror("Variable %s already defined", $2->text); + + if(!is_subtype_of($4.t, $3)) { + syntaxerror("Can't convert %s to %s", $4.t->name, + $3->name); + } + + int index = new_variable($2->text, $3); + + if($3) { + if($4.c->prev || $4.c->opcode != OPCODE_PUSHUNDEFINED) { + $$ = $4.c; + $$ = converttype($$, $4.t, $3); + $$ = abc_setlocal($$, index); + } else { + $$ = defaultvalue(0, $3); + $$ = abc_setlocal($$, index); + } + + /* push default value for type on stack */ + 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($$); + $$ = abc_setlocal($$, index); + } else { + $$ = code_new(); + } + } + + /* that's the default for a local register, anyway + else { + state->initcode = abc_pushundefined(state->initcode); + state->initcode = abc_setlocal(state->initcode, index); + }*/ + 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 ------------------------- */ + +MAYBEELSE: %prec prec_none {$$ = code_new();} +MAYBEELSE: "else" CODEBLOCK {$$=$2;} +//MAYBEELSE: ';' "else" CODEBLOCK {$$=$3;} + +IF : "if" '(' {new_state();} EXPRESSION ')' CODEBLOCK MAYBEELSE { + $$ = state->initcode;state->initcode=0; + + $$ = code_append($$, $4.c); + code_t*myjmp,*myif = $$ = abc_iffalse($$, 0); + + $$ = code_append($$, $6); + if($7) { + myjmp = $$ = abc_jump($$, 0); + } + myif->branch = $$ = abc_label($$); + if($7) { + $$ = code_append($$, $7); + myjmp->branch = $$ = abc_label($$); + } + + $$ = killvars($$);old_state(); +} + +FOR_INIT : {$$=code_new();} +FOR_INIT : ASSIGNMENT | VARIABLE_DECLARATION | VOIDEXPRESSION + +FOR : "for" '(' {new_state();} FOR_INIT ';' EXPRESSION ';' VOIDEXPRESSION ')' CODEBLOCK { + $$ = state->initcode;state->initcode=0; + + $$ = code_append($$, $4); + code_t*loopstart = $$ = abc_label($$); + $$ = code_append($$, $6.c); + code_t*myif = $$ = abc_iffalse($$, 0); + $$ = code_append($$, $10); + $$ = code_append($$, $8); + $$ = abc_jump($$, loopstart); + code_t*out = $$ = abc_label($$); + breakjumpsto($$, out); + myif->branch = out; + + $$ = killvars($$);old_state(); +} + +WHILE : "while" '(' {new_state();} EXPRESSION ')' CODEBLOCK { + $$ = state->initcode;state->initcode=0; + + code_t*myjmp = $$ = abc_jump($$, 0); + code_t*loopstart = $$ = abc_label($$); + $$ = code_append($$, $6); + myjmp->branch = $$ = abc_label($$); + $$ = code_append($$, $4.c); + $$ = abc_iftrue($$, loopstart); + code_t*out = $$ = abc_label($$); + breakjumpsto($$, out); + + $$ = killvars($$);old_state(); +} + +BREAK : "break" { + $$ = abc___break__(0); +} + +/* ------------ packages and imports ---------------- */ PACKAGE_DECLARATION : "package" MULTILEVELIDENTIFIER '{' {startpackage($2)} MAYBECODE '}' {endpackage()} PACKAGE_DECLARATION : "package" '{' {startpackage(0)} MAYBECODE '}' {endpackage()} @@ -612,8 +871,6 @@ MAYBETYPE: {$$=0;} //FUNCTION_HEADER: NAMESPACE MODIFIERS T_FUNCTION GETSET T_IDENTIFIER '(' PARAMS ')' FUNCTION_HEADER: MODIFIERS "function" GETSET T_IDENTIFIER '(' PARAMS ')' MAYBETYPE -FUNCTION_DECLARATION: MODIFIERS "function" GETSET T_IDENTIFIER '(' PARAMS ')' - MAYBETYPE '{' {startfunction(0,$1,$3,$4,$6,$8)} MAYBECODE '}' {endfunction()} NAMESPACE_DECLARATION : MODIFIERS KW_NAMESPACE T_IDENTIFIER NAMESPACE_DECLARATION : MODIFIERS KW_NAMESPACE T_IDENTIFIER '=' T_IDENTIFIER @@ -622,139 +879,158 @@ NAMESPACE_DECLARATION : MODIFIERS KW_NAMESPACE T_IDENTIFIER '=' T_STRING //NAMESPACE : {$$=empty_token();} //NAMESPACE : T_IDENTIFIER {$$=$1}; -CONSTANT : T_BYTE {$$ = abc_pushbyte(0, $1);$$=abc_coerce2($$,registry_getnumberclass());} -CONSTANT : T_SHORT {$$ = abc_pushshort(0, $1);} -CONSTANT : T_INT {$$ = abc_pushint(0, $1);} -CONSTANT : T_UINT {$$ = abc_pushuint(0, $1);} -CONSTANT : T_FLOAT {$$ = abc_pushdouble(0, $1);} -CONSTANT : T_STRING {$$ = abc_pushstring(0, $1);} -CONSTANT : KW_TRUE {$$ = abc_pushtrue(0);} -CONSTANT : KW_FALSE {$$ = abc_pushfalse(0);} -CONSTANT : KW_NULL {$$ = abc_pushnull(0);} +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 : "const" | "var" - -// type annotation -// TODO: NAMESPACE - -VARIABLE_DECLARATION : MODIFIERS VAR T_IDENTIFIER MAYBETYPE MAYBEEXPRESSION { - int i = newvariable($1,$2,$3,$4); - $$ = $5; - $$ = abc_setlocal($$, i); -} - -NEW_ASSIGNMENT : "var" T_IDENTIFIER MAYBETYPE '=' EXPRESSION { - int i = newvariable(0,0,$2,$3); - $$ = $5; - $$ = abc_setlocal($$, i); -} -ASSIGNMENT : T_IDENTIFIER '=' EXPRESSION { - int i = array_find(state->vars, $1->text); - if(i<0) { - syntaxerror("Unknown variable '%s'", $1->text); - } - $$ = $3; - $$ = abc_setlocal($$, i); -} -SOME_ASSIGNMENT : ASSIGNMENT | NEW_ASSIGNMENT - -FOR : "for" '(' SOME_ASSIGNMENT ';' EXPRESSION ';' EXPRESSION ')' '{' MAYBECODE '}' { - $$ = $3; - code_t*loopstart = $$ = abc_label($$); - $$ = code_append($$, $5); - code_t*myif = $$ = abc_iffalse($$, 0); - $$ = code_append($$, $10); - $$ = code_append($$, $7);$$=abc_pop($$); - $$ = abc_jump($$, loopstart); - $$ = abc_label($$); - myif->branch = $$; -} -MAYBEELSE: %prec prec_none {$$ = code_new();} -MAYBEELSE: "else" CODEBLOCK {$$=$2;} -MAYBEELSE: ';' "else" CODEBLOCK {$$=$3;} - -IF : "if" '(' EXPRESSION ')' CODEBLOCK MAYBEELSE { - $$=$3; - code_t*myjmp,*myif = $$ = abc_iffalse($$, 0); - $$ = code_append($$, $5); - if($6) { - myjmp = $$ = abc_jump($$, 0); - } - myif->branch = $$ = abc_label($$); - if($6) { - $$ = code_append($$, $6); - myjmp->branch = $$ = abc_label($$); - } -} - -USE : "use" KW_NAMESPACE T_IDENTIFIER - - -MAYBEEXPRESSION : '=' EXPRESSION {$$=$2;} - | {$$=code_new();} EXPRESSION : E %prec prec_none /*precendence below '-x'*/ {$$ = $1;} +VOIDEXPRESSION : E %prec prec_none {$$=$1.c;/*calculate and discard*/$$=abc_pop($$);} E : CONSTANT E : VAR_READ %prec T_IDENTIFIER {$$ = $1;} -E : NEW {$$ = abc_pushundefined(0); /* FIXME */} -E : T_REGEXP {$$ = abc_pushundefined(0); /* FIXME */} +E : NEW {$$.c = abc_pushundefined(0); /* FIXME */ + $$.t = TYPE_ANY; + } +E : T_REGEXP {$$.c = abc_pushundefined(0); /* FIXME */ + $$.t = TYPE_ANY; + } E : FUNCTIONCALL -E : E '<' E {$$ = code_append($1,$3);$$ = abc_greaterequals($$);$$=abc_not($$);} -E : E '>' E {$$ = code_append($1,$3);$$ = abc_greaterthan($$);} -E : E "<=" E {$$ = code_append($1,$3);$$ = abc_greaterthan($$);$$=abc_not($$);} -E : E ">=" E {$$ = code_append($1,$3);$$ = abc_greaterequals($$);} -E : E "==" E {$$ = code_append($1,$3);$$ = abc_equals($$);} -E : E "!=" E {$$ = code_append($1,$3);$$ = abc_equals($$);$$ = abc_not($$);} -E : E '+' E {$$ = code_append($1,$3);$$ = abc_add($$);} +E : E '<' E {$$.c = code_append($1.c,$3.c);$$.c = abc_greaterequals($$.c);$$.c=abc_not($$.c); + $$.t = TYPE_BOOLEAN; + } +E : E '>' E {$$.c = code_append($1.c,$3.c);$$.c = abc_greaterthan($$.c); + $$.t = TYPE_BOOLEAN; + } +E : E "<=" E {$$.c = code_append($1.c,$3.c);$$.c = abc_greaterthan($$.c);$$.c=abc_not($$.c); + $$.t = TYPE_BOOLEAN; + } +E : E ">=" E {$$.c = code_append($1.c,$3.c);$$.c = abc_greaterequals($$.c); + $$.t = TYPE_BOOLEAN; + } +E : E "==" E {$$.c = code_append($1.c,$3.c);$$.c = abc_equals($$.c); + $$.t = TYPE_BOOLEAN; + } +E : E "===" E {$$.c = code_append($1.c,$3.c);$$.c = abc_strictequals($$.c); + $$.t = TYPE_BOOLEAN; + } +E : E "!=" E {$$.c = code_append($1.c,$3.c);$$.c = abc_equals($$.c);$$.c = abc_not($$.c); + $$.t = TYPE_BOOLEAN; + } + E : E '-' E E : E '/' E -E : E '%' E -E : E '*' E +E : E '+' E {$$.c = code_append($1.c,$3.c);$$.c = abc_add($$.c);$$.c=abc_coerce_a($$.c); + $$.t = join_types($1.t, $3.t, '+'); + } +E : E '%' E {$$.c = code_append($1.c,$3.c);$$.c = abc_modulo($$.c);$$.c=abc_coerce_a($$.c); + $$.t = join_types($1.t, $3.t, '%'); + } +E : E '*' E {$$.c = code_append($1.c,$3.c);$$.c = abc_multiply($$.c);$$.c=abc_coerce_a($$.c); + $$.t = join_types($1.t, $3.t, '*'); + } + E : E "as" TYPE E : E "is" TYPE 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; + } + // TODO: use inclocal where appropriate -E : LH "++" {$$ = $1.read;$$=abc_increment($$);$$=abc_dup($$);$$=code_append($$,$1.write);} -E : LH "--" {$$ = $1.read;$$=abc_decrement($$);$$=abc_dup($$);$$=code_append($$,$1.write);} +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 : 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; + } LH: T_IDENTIFIER { - int i = array_find(state->vars, $1->text); - if(i<0) syntaxerror("unknown variable '%s'", $1->text); + int i = find_variable($1->text, &$$.type); $$.read = abc_getlocal(0, i); $$.write = abc_setlocal(0, i); } -NEW : "new" T_IDENTIFIER - | "new" T_IDENTIFIER '(' ')' - | "new" T_IDENTIFIER '(' EXPRESSION_LIST ')' +NEW : "new" T_IDENTIFIER {$$.c=0;$$.t=0;/*FIXME*/} + | "new" T_IDENTIFIER '(' ')' {$$.c=0;$$.t=0;/*FIXME*/} + | "new" T_IDENTIFIER '(' EXPRESSION_LIST ')' {$$.c=0;$$.t=0;/*FIXME*/} FUNCTIONCALL : T_IDENTIFIER '(' MAYBE_EXPRESSION_LIST ')' { /* TODO: use abc_call (for calling local variables), abc_callstatic (for calling own methods) */ - $$ = code_new(); - $$ = abc_findproperty($$, $1->text); - code_list_t*l = $3; + $$.c = code_new(); + $$.c = abc_findpropstrict($$.c, $1->text); + typedcode_list_t*l = $3; // push parameters on stack + int len = 0; while(l) { - $$ = code_append($$, l->code); - l = l->next; + $$.c = code_append($$.c, l->typedcode.c); + l = l->nxt; + len ++; } - $$ = abc_callproperty($$, $1->text, list_length($3)); + $$.c = abc_callproperty($$.c, $1->text, len); } -MAYBE_EXPRESSION_LIST : {} +MAYBE_EXPRESSION_LIST : {$$=0;} MAYBE_EXPRESSION_LIST : EXPRESSION_LIST -EXPRESSION_LIST : EXPRESSION {$$=list_new();list_append($$,$1);} -EXPRESSION_LIST : EXPRESSION_LIST ',' EXPRESSION {list_append($$,$3);} +EXPRESSION_LIST : EXPRESSION {$$=malloc(sizeof(typedcode_list_t)); + $$->nxt = 0; + $$->typedcode = $1;} +EXPRESSION_LIST : EXPRESSION_LIST ',' EXPRESSION {$$=malloc(sizeof(typedcode_list_t)); + $$->nxt = $1; + $$->typedcode = $3; + } VAR_READ : T_IDENTIFIER { - int i = array_find(state->vars, $1->text); - if(i<0) - syntaxerror("unknown variable '%s'", $1->text); - $$ = abc_getlocal(0, i); + int i = find_variable($1->text, &$$.t); + $$.c = abc_getlocal(0, i); } //VARIABLE : T_IDENTIFIER