Changeset 69 for trunk

Timestamp:

07/15/09 04:39:24 (3 years ago)

Author:

dom

Message:

Fixed defect in compiler that not all binaries were notified after compile errors got fixed.

Location:

trunk/src

Files:

• compiler.erl (modified) (3 diffs)
• compiler_test.erl (modified) (4 diffs)

trunk/src/compiler.erl

@@ -4 +4 @@
 init (Notify, Dir) ->
     Watcher = spawn_link (directory_watcher, init_recursive, [Dir, notify_me ()]),
-    loop (Notify, Watcher, dict: new ()).
+    loop (Notify, Watcher, dict: new (), [], []).
 
-loop (Notify, Watcher, Modules) ->
+loop (Notify, Watcher, Modules, Binaries, Removed) ->
     receive
         check ->
             Watcher ! check,
-            receive_files (Notify, Watcher, Modules, Modules);
+            receive_files (Notify, Watcher, Modules, Modules, Binaries, Removed);
         {Pid, stop} ->
             Pid ! {self (), bye}
     end.
 
-receive_files (Notify, Watcher, Modules, New) ->
+receive_files (Notify, Watcher, Modules, New, Binaries, Removed) ->
     receive
         {Watcher, {{file, ".erl"}, File, Event}} ->
-            receive_files (Notify, Watcher, Modules, dict: store (File, Event, New));
+            receive_files (Notify, Watcher, Modules, dict: store (File, Event, New), Binaries, Removed);
         {Watcher, _} ->
-            receive_files (Notify, Watcher, Modules, New)
+            receive_files (Notify, Watcher, Modules, New, Binaries, Removed)
     after 500 ->
-            compile (Notify, Watcher, Modules, New)
+            compile (Notify, Watcher, Modules, New, Binaries, Removed)
     end.
 
-compile (Notify, Watcher, Modules, Modules) ->
-    loop (Notify, Watcher, Modules);
-compile (Notify, Watcher, _, Modules) ->
+compile (Notify, Watcher, Modules, Modules, Binaries, Removed) ->
+    loop (Notify, Watcher, Modules, Binaries, Removed);
+compile (Notify, Watcher, _, Modules, Binaries, Removed) ->
     notify_totals (Modules, Notify),
-    Init = {Modules, Notify, [], []},
-    {Processed, _, Binaries, Removed} = dict: fold (fun process/3, Init, Modules),
-    notify_end (Binaries, Removed, Notify),
-    loop (Notify, Watcher, Processed).
+    Init = {Modules, Notify, Binaries, Removed},
+    {Processed, _, New_binaries, New_removed} = dict: fold (fun process/3, Init, Modules),
+    {Final_binaries, Final_removed} = notify_end (totals (Processed), New_binaries, New_removed, Notify),
+    loop (Notify, Watcher, Processed, Final_binaries, Final_removed).
 
 process (File, Event, Acc) when Event == found; Event == changed ->
@@ -55 +55 @@
             
 notify_totals (Modules, Notify) ->
-    Notify (dict: fold (fun count/3, {0, 0, 0}, Modules)).
+    Notify (totals (Modules)).
+
+totals (Modules) ->
+    dict: fold (fun count/3, {0, 0, 0}, Modules).
 
 count (_, lost, Acc) ->
@@ -73 +76 @@
     Notify ({Errors, Warnings}).
 
-binaries (_, errors) ->
-    errors;
 binaries ({ok, _, B, _}, Bs) ->
     [B | Bs];
-binaries ({error, _, _}, _) ->
-    errors.
+binaries ({error, _, _}, Bs) ->
+    Bs.
 
-notify_end (errors, _, _) ->
-    pass;
-notify_end (Binaries, Removed, Notify) ->
-    Notify ({{binaries, Binaries}, {removed, Removed}}).
+notify_end ({N, N, N}, Binaries, Removed, Notify) ->
+    Notify ({{binaries, Binaries}, {removed, Removed}}),
+    {[], []};
+notify_end (_, Binaries, Removed, _) ->
+    {Binaries, Removed}.

trunk/src/compiler_test.erl

@@ -12 +12 @@
 -export ([notifies_removed_files/0]).
 -export ([notifies_removed_files_even_if_never_compiled/0]).
+-export ([provides_all_binaries_not_just_latest_when_all_compiled/0]).
 -include_lib("stdlib/include/ms_transform.hrl").
 
@@ -38 +39 @@
     ok = fixtures: use_tree (good_erl_tree (), F).
 
+provides_all_binaries_not_just_latest_when_all_compiled () ->
+    F = fun provides_all_binaries_not_just_latest_when_all_compiled/2,
+    ok = fixtures: use_tree (bad_erl_tree (), F).
+
 can_start_empty_and_add_files () ->
     F = fun can_start_empty_and_add_files/2,
@@ -61 +66 @@
     Modules = [M || {ok, {M, [{exports, [_, _, {run, 0}]}]}} <- Chunks],
     [gdbye, hello] = lists: sort (Modules),
+    ok.
+
+provides_all_binaries_not_just_latest_when_all_compiled (Root, [_, File]) ->
+    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler ! check,
+    [{2, 0, 0}, {_, _}, {2, 1, 0}, {2, 2, 1}] = receive_all (),
+    {file, Filename, _} = File,
+    Code = "-module(gdbye). -export([run/0]). run()->gdbye.",
+    file: write_file (filename: join (Root, Filename), Code),
+    Compiler ! check,
+    [{2, 1, 1}, {2, 2, 2}, {{binaries, [_, _]}, _}] = receive_all (),
     ok.
 
@@ -132 +148 @@
      {file, "gdbye.erl", "-module(gdbye). -export([run/0]). run()->gdbye."}].
 
+bad_erl_tree () ->
+    [{file, "hello.erl", "-module(hello). -export([run/0]). run()->hello."},
+     {file, "gdbye.erl", "-module(gdbye) -export([run/0]) run()->gdbye"}].
+
 notify_me () ->
     Self = self (),