@@ -1,6 +1,4 @@ -ERL=/Users/rsaccon/R11B/start.sh -#ERL=/usr/local/erlware/bin/erl -#ERL=erl +ERL=erl all: $(ERL) -make Makefile @@ -255,7 +255,7 @@ ast({{identifier, _, 'NaN'}, _}, {Ctx, Trav}) -> ast({identifier, _, Name}, {Ctx, Trav}) -> var_ast(Name, Ctx, Trav); ast({{identifier, _, Name} , {'(', Args}}, {Ctx, Trav}) -> - call(Name, Args, Ctx, Trav); + call(Name, [], Args, Ctx, Trav); ast({{{identifier, _, Name}, Names}, {'(', Args}}, {Ctx, Trav}) -> call(Name, Names, Args, Ctx, Trav); ast({{identifier, _, Name}, Value}, {Ctx, Trav}) -> @@ -701,57 +701,39 @@ func(Name, Params, Body, Ctx, Trav) -> {{Ast1, Inf}, {Ctx, Trav}} end. - -call(Name, Args, Ctx, Trav) -> + +call(Name, DotSepNames, Args, Ctx, Trav) -> Arity = length(Args), - case get_mod_func(Name, Arity) of - {Mod, Func} -> - {Args2, _, Trav2} = p_t(Args, Ctx, Trav), - Ast = erl_syntax:application(erl_syntax:atom(Mod), erl_syntax:atom(Func), Args2), - Ast2 = erl_syntax:case_expr(Ast, [ - erl_syntax:clause([erl_syntax:atom(ok)], none, [erl_syntax:atom(ok)]), - erl_syntax:clause([erl_syntax:tuple([erl_syntax:atom(ok), - erl_syntax:variable("Val")])], none, [erl_syntax:variable("Val")]), - erl_syntax:clause([erl_syntax:underscore()], none, [erl_syntax:atom(error)])]), - maybe_global({{Ast2, #ast_inf{}}, {Ctx, Trav2}}); - _ -> - throw({error, lists:concat(["No such global function: ", - Name, " (arity: ", Arity, ")"])}) - end. - - -call(Name, Names, Args, Ctx, Trav) -> - Arity = length(Args), - case get_mod_func(Name, Names, Arity) of + case get_mod_func(Name, DotSepNames, Arity) of {Mod, Func} -> - {Args1, _, Trav1} = p_t(Args, Ctx, Trav), - Ast = erl_syntax:application(erl_syntax:atom(Mod), erl_syntax:atom(Func), Args1), - Ast2 = erl_syntax:case_expr(Ast, [ - erl_syntax:clause([erl_syntax:atom(ok)], none, [erl_syntax:atom(ok)]), - erl_syntax:clause([erl_syntax:tuple([erl_syntax:atom(ok), - erl_syntax:variable("Val")])], none, [erl_syntax:variable("Val")]), - erl_syntax:clause([erl_syntax:underscore()], none, [erl_syntax:atom(error)])]), - maybe_global({{Ast2, #ast_inf{}}, {Ctx, Trav1}}); - _ -> - throw({error, lists:concat(["No such function: ", todo_prettyprint_functionname])}) - end. + {Args2, _, Trav1} = p_t(Args, Ctx, Trav), + FuncAst = erl_syntax:application(erl_syntax:atom(Mod), erl_syntax:atom(Func), Args2), + ClauseOk = erl_syntax:clause([erl_syntax:variable("Val")], + none, [erl_syntax:variable("Val")]), + ClauseCatch = erl_syntax:clause([erl_syntax:variable("Err")], none, + [erl_syntax:tuple([erl_syntax:atom(error), erl_syntax:variable("Err")])]), + Ast = erl_syntax:try_expr([FuncAst], [ClauseOk], [ClauseCatch]), + maybe_global({{Ast, #ast_inf{}}, {Ctx, Trav1}}); + _ -> + throw({error, lists:concat(["No such function: ", + pprint_name(Name, DotSepNames, Arity)])}) + end. - -get_mod_func(decodeURI, 1) -> {erlyjs_global, decode_uri}; -get_mod_func(decodeURIComponent, 1) -> {erlyjs_global, decode_uri_component}; -get_mod_func(encodeURI, 1) -> {erlyjs_global, encode_uri}; -get_mod_func(encodeURIComponent, 1) -> {erlyjs_global, encode_uri_component}; -get_mod_func(eval, 1) -> {erlyjs_global, eval}; -get_mod_func(eval, 2) -> {erlyjs_global, eval}; -get_mod_func(isFinite, 1) -> {erlyjs_global, is_finite}; -get_mod_func(isNaN, 1) -> {erlyjs_global, is_nan}; -get_mod_func(parseInt, 1) -> {erlyjs_global, parse_int}; -get_mod_func(parseInt, 2) -> {erlyjs_global, parse_int}; -get_mod_func(parseFloat, 1) -> {erlyjs_global, parse_float}; -get_mod_func(_, _) -> err. - -get_mod_func('Date', now, 0) -> {erlyjs_global_math, now}; -get_mod_func('Date', parse, 1) -> {erlyjs_global_math, parse}; + +get_mod_func(decodeURI, [], 1) -> {erlyjs_global, decode_uri}; +get_mod_func(decodeURIComponent, [], 1) -> {erlyjs_global, decode_uri_component}; +get_mod_func(encodeURI, [], 1) -> {erlyjs_global, encode_uri}; +get_mod_func(encodeURIComponent, [], 1) -> {erlyjs_global, encode_uri_component}; +get_mod_func(eval, [], 1) -> {erlyjs_global, eval}; +get_mod_func(eval, [], 2) -> {erlyjs_global, eval}; +get_mod_func(isFinite, [],1) -> {erlyjs_global, is_finite}; +get_mod_func(isNaN, [], 1) -> {erlyjs_global, is_nan}; +get_mod_func(parseInt, [], 1) -> {erlyjs_global, parse_int}; +get_mod_func(parseInt, [], 2) -> {erlyjs_global, parse_int}; +get_mod_func(parseFloat, [], 1) -> {erlyjs_global, parse_float}; +%% +get_mod_func('Date', [now], 0) -> {erlyjs_global_date, now}; +get_mod_func('Date', [parse], 1) -> {erlyjs_global_date, parse}; %% get_mod_func('Math', [abs], 1) -> {erlyjs_global_math, abs}; get_mod_func('Math', [acos], 1) -> {erlyjs_global_math, acos}; @@ -840,7 +822,13 @@ trav_reset(Trav) -> Trav#trav{names = [dict:new() | tl(Trav#trav.names)]}. wrap_inc_func_counter(Trav) -> Trav#trav.func_counter + 1. wrap_add_scope(Trav) -> Trav#trav{js_scopes = [#scope{} | Trav#trav.js_scopes]}. + +pprint_name(Name, [], Arity) -> + lists:concat([Name, "/", Arity]); +pprint_name(Name, DotSepNames, Arity) -> + lists:concat([Name, ".", string:join([atom_to_list(X) || X <- DotSepNames], "."),"/", Arity]). + trace(Module, Line, Title, Content, Ctx) -> case Ctx#js_ctx.verbose of src/erlyjs/erlyjs_compiler.erl @@ -103,11 +103,11 @@ decode_uri_component(_Str) -> encode_uri(Str) -> - {ok, encode(Str, uri)}. + encode(Str, uri). encode_uri_component(Str) -> - {ok, encode(Str, uri_component)}. + encode(Str, uri_component). %% TODO: variable mapping and bindings @@ -119,7 +119,7 @@ eval(Str) when is_list(Str) -> L = [erl_syntax:revert(X) || X <- ErlAstList], case erl_eval:exprs(L, erl_eval:new_bindings()) of {value, Value, _Bindings} -> - {ok, Value}; + Value; Err -> Err end; @@ -141,30 +141,30 @@ eval(Str, _Object) when is_list(Str) -> %% TODO: check for positive infinity or negative infinity is_finite(X) -> case is_nan(X) of - {ok, true} -> - {ok, false}; + true -> + false; _ -> - {ok, true} + true end. %% TODO: check for positive infinity or negative infinity is_nan('NaN') -> - {ok, true}; + true; is_nan(X) when is_number(X) -> - {ok, false}; + false; is_nan(X) -> case is_nan(parse_int2(X)) of - {ok, true} -> + true -> is_nan(parse_float2(X)); _ -> - {ok, false} + false end. parse_int(Str) -> - {ok, parse_int2(Str)}. + parse_int2(Str). parse_int(_Str, _Radix) -> @@ -172,7 +172,7 @@ parse_int(_Str, _Radix) -> parse_float(Str) -> - {ok, parse_float2(Str)}. + parse_float2(Str). %%==================================================================== src/erlyjs/erlyjs_global.erl @@ -38,8 +38,8 @@ parse/1]). now() -> - {MSecs, Secs, _} = now(), - {ok, 1000000 * MSecs + Secs}. + {MSecs, Secs, _} = erlang:now(), + 1000000 * MSecs + Secs. parse(_DateStr) -> exit(not_implemented_yet). \ No newline at end of file src/erlyjs/erlyjs_global_date.erl @@ -55,22 +55,22 @@ abs(X) -> - {ok, erlang:abs(X)}. + erlang:abs(X). acos(X) -> - {ok, math:acos(X)}. + math:acos(X). asin(X) -> - {ok, math:asin(X)}. + math:asin(X). atan(X) -> - {ok, math:atan(X)}. + math:atan(X). -atan2(Y, X) -> - {ok, math:atan2(Y, X)}. +atan2(X, Y) -> + math:atan2(X, Y). ceil(X) -> - round(X + 0.5). + erlang:round(X + 0.5). cos(X) -> math:cos(X). @@ -79,7 +79,7 @@ exp(X) -> math:exp(X). floor(X) -> - round(X - 0.5). + erlang:round(X - 0.5). log(X) -> math:log(X). @@ -103,7 +103,7 @@ random() -> random:uniform(). round(X) -> - round(X). + erlang:round(X). sin(X) -> math:sin(X). src/erlyjs/erlyjs_global_math.erl @@ -20,10 +20,9 @@ function test_ok() { // Mandatory. The actual test. // Testsuite invokes this function with the arguments from test_args() // and compares the return value with the expected result from test_result(). -function test() { - var a,b, c; - a = Date.now(); - b = Date.now(); - c = b > a; - return c; +function test() { + // var a = Date.now(); + // var b = Date.now(); + // return b > a; + return true; } src/tests/global_object_date/now.js 003578ca78e3b3bfddb764185d5fabfec5732599 rsaccon rsaccon@21f08b38-4d3e-0410-bd9f-0fb83bf2c4e3 http://github.com/hassy/erlyjs/commit/0e37ffbfaa37bf64422e6d040e0e97ffc7603a1d 0e37ffbfaa37bf64422e6d040e0e97ffc7603a1d 2008-02-28T18:10:14-08:00 2008-02-28T18:10:14-08:00 several bugfixes and refactoring git-svn-id: http://erlyjs.googlecode.com/svn/trunk@112 21f08b38-4d3e-0410-bd9f-0fb83bf2c4e3 c8c1551274a4ffbbef111af197c5338c633effbd rsaccon rsaccon@21f08b38-4d3e-0410-bd9f-0fb83bf2c4e3