Changeset 68

Timestamp:

07/14/09 09:37:03 (3 years ago)

Author:

dom

Message:

compiler now notifies of removed files (but still imperfect...)

Location:

trunk/src

Files:

• compiler.erl (modified) (5 diffs)
• compiler_test.erl (modified) (7 diffs)
• modules.erl (modified) (2 diffs)
• modules_test.erl (added)
• shells.erl (modified) (1 diff)
• shells_tests.erl (modified) (1 diff)

trunk/src/compiler.erl

@@ -17 +17 @@
 receive_files (Notify, Watcher, Modules, New) ->
     receive
-        {Watcher, {{file, ".erl"}, File, Event}} when Event == found; Event == changed ->
+        {Watcher, {{file, ".erl"}, File, Event}} ->
             receive_files (Notify, Watcher, Modules, dict: store (File, Event, New));
         {Watcher, _} ->
@@ -29 +29 @@
 compile (Notify, Watcher, _, Modules) ->
     notify_totals (Modules, Notify),
-    Init = {Modules, Notify, []},
-    {Processed, _, Binaries} = dict: fold (fun process/3, Init, Modules),
-    notify_binaries (Binaries, Notify),
+    Init = {Modules, Notify, [], []},
+    {Processed, _, Binaries, Removed} = dict: fold (fun process/3, Init, Modules),
+    notify_end (Binaries, Removed, Notify),
     loop (Notify, Watcher, Processed).
 
-process (File, Event, {Modules, Notify, Binaries}) when Event == found;
-                                                        Event == changed ->
+process (File, Event, Acc) when Event == found; Event == changed ->
+    {Modules, Notify, Binaries, Removed} = Acc,
     Result = modules: compile (File),
     notify_result (Result, Notify),
@@ -41 +41 @@
     notify_totals (New_modules, Notify),
     New_binaries = binaries (Result, Binaries),
-    {New_modules, Notify, New_binaries};
+    {New_modules, Notify, New_binaries, Removed};
+process (File, Event, Acc) when Event == lost ->
+    {Modules, Notify, Binaries, Removed} = Acc,
+    New_modules = dict: erase (File, Modules),
+    New_removed = [modules: module_name (File) | Removed],
+    {New_modules, Notify, Binaries, New_removed};
 process (_, _, Acc) ->
     Acc.
@@ -52 +57 @@
     Notify (dict: fold (fun count/3, {0, 0, 0}, Modules)).
 
+count (_, lost, Acc) ->
+    Acc;
 count (_, {ok, _, _, _}, {Total, Compiled, Successful}) ->
     {Total + 1, Compiled + 1, Successful + 1};
@@ -73 +80 @@
     errors.
 
-notify_binaries (errors, _) ->
+notify_end (errors, _, _) ->
     pass;
-notify_binaries (Bs, Notify) when is_list (Bs) ->
-    Notify ({binaries, Bs}).
+notify_end (Binaries, Removed, Notify) ->
+    Notify ({{binaries, Binaries}, {removed, Removed}}).

trunk/src/compiler_test.erl

@@ -10 +10 @@
 -export ([stops/0]).
 -export ([can_start_empty_and_add_files/0]).
+-export ([notifies_removed_files/0]).
+-export ([notifies_removed_files_even_if_never_compiled/0]).
 -include_lib("stdlib/include/ms_transform.hrl").
 
@@ -40 +42 @@
     ok = fixtures: use_tree ([], F).
 
+notifies_removed_files () ->
+    F = fun notifies_removed_files/2,
+    ok = fixtures: use_tree (good_erl_tree (), F).
+
+notifies_removed_files_even_if_never_compiled () ->
+    F = fun notifies_removed_files_even_if_never_compiled/2,
+    Tree = [{file, "hello.erl", "rubbish"}],
+    ok = fixtures: use_tree (Tree, F).
+
 provides_binaries_when_all_compiled (Root, _) ->
     Compiler = spawn_link (compiler, init, [notify_me (), Root]),
@@ -46 +57 @@
     Compiler ! stop,
     ok = check (Ms, unknown),
-    {binaries, Bs} = lists: last (Ms),
+    {{binaries, Bs}, _} = lists: last (Ms),
     Chunks = [ beam_lib: chunks (B, [exports]) || B <- Bs],
     Modules = [M || {ok, {M, [{exports, [_, _, {run, 0}]}]}} <- Chunks],
@@ -60 +71 @@
     ok = file: write_file (File, Bin),
     Compiler ! check,
-    [{2, 1, 1}, {2, 2, 2}, {binaries, [B]}] = receive_all (),
+    [{2, 1, 1}, {2, 2, 2}, {{binaries, [B]}, _}] = receive_all (),
     Compiler ! stop,
     {ok, {hello, _}} = beam_lib: chunks (B, [exports]),
@@ -73 +84 @@
     ok = file: write_file (File, Bin),
     Compiler ! check,
-    [{1, 0, 0}, {1, 1, 1}, {binaries, [_]}] = receive_all (),
+    [{1, 0, 0}, {1, 1, 1}, {{binaries, [_]}, _}] = receive_all (),
     Compiler ! stop,
     ok.
 
-%% More tests:
-%% - remove a file
+notifies_removed_files (Root, [F, _]) ->
+    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler ! check,
+    receive_all (),
+    {file, File, _} = F,
+    ok = file: delete (filename: join (Root, File)),
+    Compiler ! check,
+    [{1, 1, 1}, {{binaries, []}, {removed, [hello]}}] = receive_all (),
+    Compiler ! {self (), stop},
+    ok.
+
+notifies_removed_files_even_if_never_compiled (Root, [F]) ->
+    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    Compiler ! check,
+    [{1, 0, 0}, {_, _}, {1, 1, 0}] = receive_all (),
+    {file, File, _} = F,
+    Filename = filename: join (Root, File),
+    Module = modules: module_name (Filename),
+    ok = file: delete (Filename),
+    Compiler ! check,
+    [{0, 0, 0}, {{binaries, []}, {removed, [Module]}}] = receive_all (),
+    Compiler ! {self (), stop},
+    ok.
 
 check ([{Total, 0, 0} | _] = Xs, unknown) ->
@@ -93 +125 @@
 check ([{Total, Total, N}], Total) when N < Total ->
     ok;
-check ([{Total, Total, Total}, {binaries, _}], Total) ->
+check ([{Total, Total, Total}, {{binaries, _}, {removed, _}}], Total) ->
     ok.
 
@@ -110 +142 @@
     receive
         {Total, Total, Total} = Ts ->
-            receive {binaries, _} = Bs ->
+            receive {{binaries, _}, {removed, _}} = Bs ->
                     lists: reverse ([Bs, Ts | Ms])
             end;

trunk/src/modules.erl

@@ -8 +8 @@
 -export ([forms_to_binary/1]).
 -export ([compile/1]).
+-export ([module_name/1]).
 
 to_binary (File_name) ->
@@ -27 +28 @@
 compile (File) ->
     compile (fun compile: file/2, File).
+
+module_name (Filename) ->
+    {extension, ".erl"} = {extension, filename: extension (Filename)},
+    String = filename: rootname (filename: basename (Filename)),
+    list_to_atom (String).

trunk/src/shells.erl

@@ -11 +11 @@
         receive {Self, done} -> ok;
                 M -> io:fwrite ("tests_crash: ~p~n", [M])
-        after 20000 -> throw ("tests timed out~n")
+        after 30000 -> throw ("tests timed out~n")
         end
 

trunk/src/shells_tests.erl

@@ -13 +13 @@
     Modules = [fixtures_test, fixtures,
                directory_watcher_test, directory_watcher,
-               compiler_test, compiler, modules],
+               compiler_test, compiler,
+               modules_test, modules],
     ok = hand_send_to_tester (Modules, Test_node),
     Caller ! {Caller, done}.