Changeset 93 for trunk/src/compiler.erl

Timestamp:

01/29/10 07:56:02 (2 years ago)

Author:

dom

Message:

Include directories can be given to compiler

File:

• trunk/src/compiler.erl (modified) (5 diffs)

trunk/src/compiler.erl

@@ -5 +5 @@
 -module (compiler).
 -export ([init/2]).
+-export ([init/3]).
 
 init (Notify, Dir) ->
+    init (Notify, Dir, []).
+
+init (Notify, Dir, Options) ->
     Args = [Dir, notify_me ()],
     Watcher = spawn_link (directory_watcher, init_recursive, Args),
-    State = {dict: new (), [], []},
+    State = {dict: new (), [], [], Options},
     loop (Notify, Watcher, State).
 
@@ -16 +20 @@
         check ->
             Watcher ! check,
-            {Modules, Binaries, Removed} = State,
+            {Modules, Binaries, Removed, Options} = State,
             case receive_files (Watcher, Modules) of
                 Modules ->
                     loop (Notify, Watcher, State);
                 Changed ->
-                    New_state = {Changed, Binaries, Removed},
+                    New_state = {Changed, Binaries, Removed, Options},
                     compile (Notify, Watcher, New_state)
             end;
@@ -39 +43 @@
 
 compile (Notify, Watcher, State) ->
-    {Modules, _, _} = State,
+    {Modules, _, _, _} = State,
     Notify (totals (Modules)),
     Process = process_fun (Notify),
@@ -48 +52 @@
 process_fun (Notify) ->
     fun (File, Event, Acc) when Event == found; Event == changed ->
-            {Modules, Binaries, Removed} = Acc,
-            Result = modules: compile (File),
+            {Modules, Binaries, Removed, Options} = Acc,
+            Result = modules: compile (File, Options),
             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};
+            {New_modules, New_binaries, Removed, Options};
         (File, Event, Acc) when Event == lost ->
-            {Modules, Binaries, Removed} = Acc,
+            {Modules, Binaries, Removed, Options} = Acc,
             New_modules = dict: erase (File, Modules),
             New_removed = [modules: module_name (File) | Removed],
-            {New_modules, Binaries, New_removed};
+            {New_modules, Binaries, New_removed, Options};
         (_, _, Acc) ->
             Acc
@@ -93 +97 @@
 
 notify_end (Notify, State) ->
-    {Modules, _, _} = State,
+    {Modules, _, _, _} = State,
     notify_end (Notify, totals (Modules), State).
 
-notify_end (Notify, {N, N, N}, {Modules, Binaries, Removed}) ->
+notify_end (Notify, {N, N, N}, {Modules, Binaries, Removed, Options}) ->
     Notify ({{binaries, Binaries}, {removed, Removed}}),
-    {Modules, [], []};
+    {Modules, [], [], Options};
 notify_end (_, _, State) ->
     State.