diff options
author | Lukas Larsson <[email protected]> | 2011-01-25 14:42:03 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2011-01-25 15:44:45 +0100 |
commit | c8ce455e3cd307a564a92161b9e082bcc3672f94 (patch) | |
tree | a04e85717aa147fb2a154f48d66de701c188c55b /lib/stdlib | |
parent | c9aae9e6874950c671c08940d4e72abc616c550e (diff) | |
download | otp-c8ce455e3cd307a564a92161b9e082bcc3672f94.tar.gz otp-c8ce455e3cd307a564a92161b9e082bcc3672f94.tar.bz2 otp-c8ce455e3cd307a564a92161b9e082bcc3672f94.zip |
Update escrips to allow the -n or -compile(native) flag, which compiles the code within the escript with the +native flag. You need an HiPE enabled emulator for this to work.
Diffstat (limited to 'lib/stdlib')
-rw-r--r-- | lib/stdlib/src/escript.erl | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl index 7cb02afb11..0d2d23180a 100644 --- a/lib/stdlib/src/escript.erl +++ b/lib/stdlib/src/escript.erl @@ -31,7 +31,7 @@ %%----------------------------------------------------------------------- --type mode() :: 'compile' | 'debug' | 'interpret' | 'run'. +-type mode() :: 'native' | 'compile' | 'debug' | 'interpret' | 'run'. -type source() :: 'archive' | 'beam' | 'text'. -record(state, {file :: file:filename(), @@ -304,7 +304,11 @@ parse_and_run(File, Args, Options) -> false -> case lists:member("i", Options) of true -> interpret; - false -> Mode + false -> + case lists:member("n", Options) of + true -> native; + false -> Mode + end end end end, @@ -321,6 +325,14 @@ parse_and_run(File, Args, Options) -> _Other -> fatal("There were compilation errors.") end; + native -> + case compile:forms(FormsOrBin, [report,native]) of + {ok, Module, BeamBin} -> + {module, Module} = code:load_binary(Module, File, BeamBin), + run(Module, Args); + _Other -> + fatal("There were compilation errors.") + end; debug -> case compile:forms(FormsOrBin, [report, debug_info]) of {ok,Module,BeamBin} -> @@ -664,7 +676,7 @@ epp_parse_file2(Epp, S, Forms, Parsed) -> {attribute,Ln,mode,NewMode} -> S2 = S#state{mode = NewMode}, if - NewMode =:= compile; NewMode =:= interpret; NewMode =:= debug -> + NewMode =:= compile; NewMode =:= interpret; NewMode =:= debug; NewMode =:= native -> epp_parse_file(Epp, S2, [Form | Forms]); true -> Args = lists:flatten(io_lib:format("illegal mode attribute: ~p", [NewMode])), |