Changeset 71

Timestamp:

07/15/09 06:21:16 (3 years ago)

Author:

dom

Message:

Refactoring.

Location:

trunk/src

Files:

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

trunk/src/compiler.erl

@@ -3 +3 @@
 
 init (Notify, Dir) ->
-    Watcher = spawn_link (directory_watcher, init_recursive, [Dir, notify_me ()]),
-    loop (Notify, Watcher, dict: new (), [], []).
+    Args = [Dir, notify_me ()],
+    Watcher = spawn_link (directory_watcher, init_recursive, Args),
+    State = {dict: new (), [], []},
+    loop (Notify, Watcher, State).
 
-loop (Notify, Watcher, Modules, Binaries, Removed) ->
+loop (Notify, Watcher, State) ->
     receive
         check ->
             Watcher ! check,
-            New_modules = receive_files (Watcher, Modules),
-            compile (Notify, Watcher, Modules, New_modules, Binaries, Removed);
+            {Modules, Binaries, Removed} = State,
+            case receive_files (Watcher, Modules) of
+                Modules ->
+                    loop (Notify, Watcher, State);
+                Changed ->
+                    New_state = {Changed, Binaries, Removed},
+                    compile (Notify, Watcher, New_state)
+            end;
         {Pid, stop} ->
             Pid ! {self (), bye}
@@ -26 +34 @@
     end.
 
-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, 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).
+compile (Notify, Watcher, State) ->
+    {Modules, _, _} = State,
+    Notify (totals (Modules)),
+    Process = process_fun (Notify),
+    Processed = dict: fold (Process, State, Modules),
+    Notified = notify_end (Notify, Processed),
+    loop (Notify, Watcher, Notified).
 
-process (File, Event, Acc) when Event == found; Event == changed ->
-    {Modules, Notify, Binaries, Removed} = Acc,
-    Result = modules: compile (File),
-    notify_result (Result, Notify),
-    New_modules = dict: store (File, Result, Modules),
-    notify_totals (New_modules, Notify),
-    New_binaries = binaries (Result, 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.
+process_fun (Notify) ->
+    fun (File, Event, Acc) when Event == found; Event == changed ->
+            {Modules, Binaries, Removed} = Acc,
+            Result = modules: compile (File),
+            notify_result (Result, Notify),
+            New_modules = dict: store (File, Result, Modules),
+            Notify (totals (New_modules)),
+            New_binaries = binaries (Result, Binaries),
+            {New_modules, New_binaries, Removed};
+        (File, Event, Acc) when Event == lost ->
+            {Modules, Binaries, Removed} = Acc,
+            New_modules = dict: erase (File, Modules),
+            New_removed = [modules: module_name (File) | Removed],
+            {New_modules, Binaries, New_removed};
+        (_, _, Acc) ->
+            Acc
+    end.
 
 notify_me () ->
@@ -55 +64 @@
     fun (E) -> Self ! {self (), E} end.
             
-notify_totals (Modules, Notify) ->
-    Notify (totals (Modules)).
-
 totals (Modules) ->
     dict: fold (fun count/3, {0, 0, 0}, Modules).
@@ -82 +88 @@
     Bs.
 
-notify_end ({N, N, N}, Binaries, Removed, Notify) ->
+notify_end (Notify, State) ->
+    {Modules, _, _} = State,
+    notify_end (Notify, totals (Modules), State).
+
+notify_end (Notify, {N, N, N}, {Modules, Binaries, Removed}) ->
     Notify ({{binaries, Binaries}, {removed, Removed}}),
-    {[], []};
-notify_end (_, Binaries, Removed, _) ->
-    {Binaries, Removed}.
+    {Modules, [], []};
+notify_end (_, _, State) ->
+    State.

trunk/src/compiler_test.erl

@@ -71 +71 @@
     Compiler = spawn_link (compiler, init, [notify_me (), Root]),
     Compiler ! check,
-    [{2, 0, 0}, {_, _}, {2, 1, 0}, {2, 2, 1}] = receive_all (),
+    [{2, 0, 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),
+    Bin = list_to_binary ("-module(gdbye). -export([run/0]). run()->gdbye."),
+    ok = file: write_file (filename: join (Root, Filename), Bin),
     Compiler ! check,
     [{2, 1, 1}, {2, 2, 2}, {{binaries, [_, _]}, _}] = receive_all (),
@@ -84 +84 @@
     receive_all (),
     File = filename: join (Root, "hello.erl"),
-    Bin = list_to_binary ("-module(hello). -export([run/0]). run()->hello_howdy."),
+    Code = "-module(hello). -export([run/0]). run()->hello_howdy.",
+    Bin = list_to_binary (Code),
     ok = file: write_file (File, Bin),
     Compiler ! check,