Changeset 63

Timestamp:

07/13/09 11:17:12 (3 years ago)

Author:

dom

Message:

compiler now recompiles minimally when file changes.

Location:

trunk/src

Files:

• compiler.erl (modified) (2 diffs)
• compiler_test.erl (modified) (3 diffs)
• shells.erl (modified) (1 diff)

trunk/src/compiler.erl

@@ -12 +12 @@
 receive_files (Notify, Watcher, Modules, New) ->
     receive
-        {Watcher, {{file, ".erl"}, File, found}} ->
-            receive_files (Notify, Watcher, Modules, dict: store (File, found, New));
+        {Watcher, {{file, ".erl"}, File, Event}} when Event == found; Event == changed ->
+            receive_files (Notify, Watcher, Modules, dict: store (File, Event, New));
         {Watcher, _} ->
             receive_files (Notify, Watcher, Modules, New)
@@ -30 +30 @@
     loop (Notify, Watcher, Processed).
 
-process (File, found, {Modules, Notify, Binaries}) ->
+process (File, Event, {Modules, Notify, Binaries}) when Event == found;
+                                                        Event == changed ->
     Result = modules: compile (File),
     notify_result (Result, Notify),

trunk/src/compiler_test.erl

@@ -7 +7 @@
 -export ([compiles_and_reports_progress_warnings_and_errors/0]).
 -export ([provides_binaries_when_all_compiled/0]).
+-export ([recompiles_minimally_after_change/0]).
 -include_lib("stdlib/include/ms_transform.hrl").
 
@@ -17 +18 @@
 provides_binaries_when_all_compiled () ->
     F = fun provides_binaries_when_all_compiled/2,
+    ok = fixtures: use_tree (good_erl_tree (), F).
+
+recompiles_minimally_after_change () ->
+    F = fun recompiles_minimally_after_change/2,
     ok = fixtures: use_tree (good_erl_tree (), F).
 
@@ -30 +35 @@
     ok.
 
-%% stops
+recompiles_minimally_after_change (Root, _) ->
+    Compiler = spawn_link (compiler, init, [notify_me (), Root]),
+    receive_all (),
+    File = filename: join (Root, "hello.erl"),
+    Bin = list_to_binary ("-module(hello). -export([run/0]). run()->hello_howdy."),
+    ok = file: write_file (File, Bin),
+    [{2, 1, 1}, {2, 2, 2}, {binaries, [B]}] = receive_all (),
+    Compiler ! stop,
+    {ok, {hello, _}} = beam_lib: chunks (B, [exports]),
+    ok.
 
-%% empty tree
-
+%% More tests:
+%% - stops
+%% - empty tree
+%% - add a file
+%% - remove a file
 
 check ([{Total, 0, 0} | _] = Xs, unknown) ->

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