diff options
author | Richard Carlsson <[email protected]> | 2018-04-17 15:03:49 +0200 |
---|---|---|
committer | Richard Carlsson <[email protected]> | 2018-05-04 10:22:36 +0200 |
commit | 5684a2c7715c4cf0524a2be91ddeaf47281634bb (patch) | |
tree | c098cd86fc6f69d0df39e3f75fa77a5e52ad489a /lib/dialyzer/test/r9c_SUITE_data/src/inets | |
parent | 831259a3dfe8e4def7257df148516ed9f14f8cf8 (diff) | |
download | otp-5684a2c7715c4cf0524a2be91ddeaf47281634bb.tar.gz otp-5684a2c7715c4cf0524a2be91ddeaf47281634bb.tar.bz2 otp-5684a2c7715c4cf0524a2be91ddeaf47281634bb.zip |
Move lib:eval_str/1 into mod_esi.erl
Diffstat (limited to 'lib/dialyzer/test/r9c_SUITE_data/src/inets')
-rw-r--r-- | lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl index a48f73274b..d9d27bf8d3 100644 --- a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl +++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl @@ -285,7 +285,7 @@ eval(Info,"GET",CGIBody,Modules) -> "~n Modules: ~p",[Modules]), case auth(CGIBody,Modules) of true -> - case lib:eval_str(string:concat(CGIBody,". ")) of + case eval_str(string:concat(CGIBody,". ")) of {error,Reason} -> ?vlog("eval -> error:" "~n Reason: ~p",[Reason]), @@ -318,6 +318,50 @@ auth(CGIBody,Modules) -> false end. +%% eval_str(InStr) -> {ok, OutStr} | {error, ErrStr'} +%% InStr must represent a body +%% Note: If InStr is a binary it has to be a Latin-1 string. +%% If you have a UTF-8 encoded binary you have to call +%% unicode:characters_to_list/1 before the call to eval_str(). + +-define(result(F,D), lists:flatten(io_lib:format(F, D))). + +-spec eval_str(string() | unicode:latin1_binary()) -> + {'ok', string()} | {'error', string()}. + +eval_str(Str) when is_list(Str) -> + case erl_scan:tokens([], Str, 0) of + {more, _} -> + {error, "Incomplete form (missing .<cr>)??"}; + {done, {ok, Toks, _}, Rest} -> + case all_white(Rest) of + true -> + case erl_parse:parse_exprs(Toks) of + {ok, Exprs} -> + case catch erl_eval:exprs(Exprs, erl_eval:new_bindings()) of + {value, Val, _} -> + {ok, Val}; + Other -> + {error, ?result("*** eval: ~p", [Other])} + end; + {error, {_Line, Mod, Args}} -> + Msg = ?result("*** ~ts",[Mod:format_error(Args)]), + {error, Msg} + end; + false -> + {error, ?result("Non-white space found after " + "end-of-form :~ts", [Rest])} + end + end; +eval_str(Bin) when is_binary(Bin) -> + eval_str(binary_to_list(Bin)). + +all_white([$\s|T]) -> all_white(T); +all_white([$\n|T]) -> all_white(T); +all_white([$\t|T]) -> all_white(T); +all_white([]) -> true; +all_white(_) -> false. + %%---------------------------------------------------------------------- %%Creates the environment list that will be the first arg to the %%Functions that is called through the ErlScript Schema |