Changeset 62

Timestamp:

07/13/09 05:34:59 (3 years ago)

Author:

dom

Message:

compiler now provides binaries when all ok.

Location:

trunk/src

Files:

• compiler.erl (modified) (2 diffs)
• compiler_test.erl (modified) (2 diffs)

trunk/src/compiler.erl

@@ -25 +25 @@
 compile (Notify, Watcher, _, Modules) ->
     notify_totals (Modules, Notify),
-    {Processed, _} = dict: fold (fun process/3, {Modules, Notify}, Modules),
+    Init = {Modules, Notify, []},
+    {Processed, _, Binaries} = dict: fold (fun process/3, Init, Modules),
+    notify_binaries (Binaries, Notify),
     loop (Notify, Watcher, Processed).
 
-process (File, found, {Modules, Notify}) ->
+process (File, found, {Modules, Notify, Binaries}) ->
     Result = modules: compile (File),
     notify_result (Result, Notify),
     New_modules = dict: store (File, Result, Modules),
     notify_totals (New_modules, Notify),
-    {New_modules, Notify};
+    New_binaries = binaries (Result, Binaries),
+    {New_modules, Notify, New_binaries};
 process (_, _, Acc) ->
     Acc.
@@ -57 +60 @@
 notify_result ({error, Errors, Warnings},Notify) ->
     Notify ({Errors, Warnings}).
+
+binaries (_, errors) ->
+    errors;
+binaries ({ok, _, B, _}, Bs) ->
+    [B | Bs];
+binaries ({error, _, _}, _) ->
+    errors.
+
+notify_binaries (errors, _) ->
+    pass;
+notify_binaries (Bs, Notify) when is_list (Bs) ->
+    Notify ({binaries, Bs}).

trunk/src/compiler_test.erl

@@ -5 +5 @@
 -module (compiler_test).
 -test (exports).
--export ([compiles_and_reports_progress/0]).
+-export ([compiles_and_reports_progress_warnings_and_errors/0]).
+-export ([provides_binaries_when_all_compiled/0]).
 -include_lib("stdlib/include/ms_transform.hrl").
 
-compiles_and_reports_progress () ->
-%%     dbg:tracer(),
-%%     dbg:p(new,c),
-%%     dbg:tpl(compiler, dbg:fun2ms(fun(_)->return_trace() end)),
-%%     dbg:tpl(modules, dbg:fun2ms(fun(_)->return_trace() end)),
+compiles_and_reports_progress_warnings_and_errors () ->
     Compiler = spawn_link (compiler, init, [notify_me (), "fix"]),
     Ms = receive_all (),
     Compiler ! stop,
     ok = check (Ms, unknown).
+
+provides_binaries_when_all_compiled () ->
+    F = fun provides_binaries_when_all_compiled/2,
+    ok = fixtures: use_tree (good_erl_tree (), F).
+
+provides_binaries_when_all_compiled (Root, _) ->
+    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Ms = receive_all (),
+    Compiler ! stop,
+    ok = check (Ms, unknown),
+    {binaries, Bs} = lists: last (Ms),
+    Chunks = [ beam_lib: chunks (B, [exports]) || B <- Bs],
+    Modules = [M || {ok, {M, [{exports, [_, _, {run, 0}]}]}} <- Chunks],
+    [gdbye, hello] = lists: sort (Modules),
+    ok.
+
+%% stops
+
+%% empty tree
+
 
 check ([{Total, 0, 0} | _] = Xs, unknown) ->
@@ -29 +46 @@
   when M2 == M1+1, N2 == N1 ->
     check ([X | Xs], Total);
-check ([{Total, Total, N}], Total) when N =< Total ->
+check ([{Total, Total, N}], Total) when N < Total ->
+    ok;
+check ([{Total, Total, Total}, {binaries, _}], Total) ->
     ok.
+
+good_erl_tree () ->
+    [{file, "hello.erl", "-module(hello). -export([run/0]). run()->hello."},
+     {file, "gdbye.erl", "-module(gdbye). -export([run/0]). run()->gdbye."}].
 
 notify_me () ->