Add beam dump

elmer-compiler · Oct 17, 2016 · 8e5f7b3 · 8e5f7b3
1 parent 91636e1
commit 8e5f7b3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/src/elmer_compiler.erl b/src/elmer_compiler.erl
@@ -52,20 +52,28 @@ compile_elmo_file(ElmoFile, Output) ->
     Erl = elmer_to_erl:from_file(ElmoFile),
     dump(Output, ElmoFile, Erl).
 
-dump(absform, Filename, Erl) ->
-    {Filename, Erl};
+dump(absform, ElmoFile, Erl) ->
+    {ElmoFile, Erl};
 
-dump(erlsrc, Filename, Erl) ->
+dump(erlsrc, ElmoFile, Erl) ->
     Src = lists:map(fun erl_pp:form/1, Erl),
     Bin = erlang:iolist_to_binary(Src),
-    {Filename, Bin};
-
-dump(binary, Filename, Erl) ->
-    Bin = compile:forms(Erl, [report_errors, report_warnings]),
-    {Filename, Bin};
-
-dump(stdout, Filename, Erl) ->
+    {ElmoFile, Bin};
+
+dump({beam, OutputDir}, ElmoFile, Erl) ->
+    io:format("~s~n", [ElmoFile]),
+    %% io:format("~p~n", [Erl]),
+    {ok, Module, Bin} = compile:forms(Erl, [report_errors, report_warnings]),
+    %% OutputFilename = filename:basename(ElmoFile, ".elmo") ++ ".beam",
+    OutputFilename = filename:basename(ElmoFile, ".elmo") ++ ".beam",
+    OutputFilepath = filename:join(filename:absname(OutputDir), OutputFilename),
+    io:format("~s~n", [OutputFilepath]),
+    io:format("~s~n", [Module]),
+    ok = file:write_file(OutputFilepath, io_lib:fwrite("~p.\n", [Bin])),
+    {ElmoFile, Bin};
+
+dump(stdout, ElmoFile, Erl) ->
     io:format("-----~n|~s~n-----~n~s~n", [
-                                          Filename,
+                                          ElmoFile,
                                           lists:concat(lists:map(fun erl_pp:form/1, Erl))]).
 
diff --git a/src/elmer_to_erl.erl b/src/elmer_to_erl.erl
@@ -86,7 +86,7 @@ compile(?JSON_DEF(Name, Value), Elmo = #elmo{ defs = Defs }) ->
     Def = to_erl({def, Name, to_erl(Value)}),
     Elmo#elmo{ defs = [Def | Defs]};
 
-compile(?JSON_TAILDEF(Name, Args, Content), Elmo = #elmo{ defs = Defs })->
+compile(?JSON_TAILDEF(Name, Args, Content), Elmo = #elmo{ defs = Defs }) ->
     VArgs = [{var, ?ELINE, elmer_util:var(A)} || A <- Args],
     Fun = {'fun', ?ELINE, {clauses, [{clause, ?ELINE, VArgs, [], exps(to_erl(Content))}]}},
     Def = to_erl({def, Name, ?ELMER_PARTIAL(Fun, length(Args))}),

diff --git a/test/elmer_to_erl_test.erl b/test/elmer_to_erl_test.erl
@@ -155,10 +155,5 @@ compiles_ImportExposing_testPending() ->
 compiles_TailDef_test() ->
     assert_elm_compiles_to_erl("TailDef").
 
-runs_RunExample_test() ->
-    elm_load_module("RunExample"),
-    Result = 'Elm.RunExample':greet(),
-    ?assertEqual(<<"Howdy">>, Result).
-
 -endif. %%  TEST
 
diff --git a/test/native_elmer_test.erl b/test/native_elmer_test.erl
@@ -28,7 +28,7 @@ core_build_filepath(ElmModuleName) ->
     ?CORE_BUILD_DIR ++ "/" ++ ElmModuleName ++ ".elmo".
 
 elm_load_module(ElmModuleName, CoreModuleName) ->
-    Compiled = elm_compile(ElmModuleName, binary),
+    Compiled = elm_compile(ElmModuleName, {beam, "build"}),
     UserElmoFileName = user_build_filepath(ElmModuleName),
     {ok, Module, CompiledBinary} = proplists:get_value(UserElmoFileName, Compiled, elm_not_compiled),
     {module, Module} = code:load_binary(Module, ElmModuleName, CompiledBinary),
@@ -41,7 +41,6 @@ elm_load_module(ElmModuleName, CoreModuleName) ->
 runs_RunExample_test() ->
     elm_load_module("RunExample", "Basics"),
     %% TODO Figure out where to put Native modules
-    %% TODO Namespace loaded modules to 'Elm.ModuleName'
     Result = ('Elm.RunExample':greet())([<<"doodie">>]),
     ?assertEqual(<<"Howdy, doodie">>, Result),
     Result2 = ('Elm.Native.Utils':append())([[1,2],[3,4]]),