Changeset 96

Timestamp:

08/19/10 09:26:03 (18 months ago)

Author:

dom

Message:

Continue work on include files

Location:

trunk/src

Files:

• compiler_test.erl (modified) (3 diffs)
• modules.erl (modified) (2 diffs)
• modules_test.erl (modified) (2 diffs)
• text_printer_test.erl (modified) (1 diff)

trunk/src/compiler_test.erl

@@ -15 +15 @@
 -export ([can_be_given_include_directories/0]).
 -export ([discovers_hrl_files_and_includes_their_path/0]).
+%% -export ([recompiles_includers/0]).
 -export ([adds_root_to_include_path/0]).
 -export ([reset_includes_none/0]).
@@ -114 +115 @@
 
 discovers_hrl_files_and_includes_their_path () ->
-    Tree =
-        [{directory, "include",
-          [{file, "eg_include.hrl", "-define(eg_macro,ok)."}]},
-         {directory, "src",
-          [{file, "eg_code_with_include.erl",
-            ["-module (eg_code_with_include).",
-             "-test (ok).",
-             "-export ([ok/0]).",
-             "-include (\"eg_include.hrl\").",
-             "ok () ->",
-             "    ok = ?eg_macro."]}]}],
+    Tree = [{directory, "include",
+             [{file, "eg_include.hrl", "-define(eg_macro,ok)."}]},
+            {directory, "src",
+             [{file, "eg_code_with_include.erl",
+               ["-module (eg_code_with_include).",
+                "-test (ok).",
+                "-export ([ok/0]).",
+                "-include (\"eg_include.hrl\").",
+                "ok () ->",
+                "    ok = ?eg_macro."]}]}],
     ok = fixtures: use_tree (Tree, fun discovers_hrl/2).    
 
@@ -278 +278 @@
     Expected = [debug, bla, {i, "/dir/subdir"}, {i, "/dir"}],
     Expected = compiler: reset_includes (New, Options).
+
+%% recompiles_includers () ->
+%%     Tree = modules_test: includes_tree (),
+%%     ok = fixtures: use_tree (Tree, fun recompiles_includers/2).
+
+%% recompiles_includers (Root, _) ->
+%%     Compiler = spawn_link (compiler, init, [notify_me (), [Root]]),
+%%     Compiler ! check,
+%%     [{3, 0, 0}, _, _, {3, 3, 3}, _] = receive_all (),
+%%     Include = filename: join (Root, "eg_include.hrl"),
+%%     Define = "-define(eg_macro, ko)",
+%%     ok = file: write_file (Include, Define),
+%%     Compiler ! check,
+%%     [{3, 2, 2}, {3, 3, 3}, {{binaries, _}, _}] = receive_all (),
+%%     ok.

trunk/src/modules.erl

@@ -10 +10 @@
 -export ([module_name/1]).
 -export ([locate/2]).
+-export ([includes/1]).
 
 to_binary (File_name) ->
@@ -52 +53 @@
 locate_line (_, _, []) ->
     unknown.
+
+includes (File) ->
+    includes_from_forms (epp_dodger: parse_file (File)).
+
+includes_from_forms ({error, _}=E) ->
+    E;
+includes_from_forms ({ok, Forms}) ->
+    Attributes = [A || {tree, attribute, _, A} <- Forms],
+    Includes = [I || {attribute, {atom, _, include}, [I]} <- Attributes],
+    [F || {string, _, F} <- Includes].

trunk/src/modules_test.erl

@@ -4 +4 @@
 
 -module (modules_test).
--test (exports).
+-test (module_name).
+-test (locate).
+-test (includes).
 -export ([module_name/0]).
 -export ([locate/0]).
+-export ([includes_tree/0]).
+-export ([includes/0]).
 
 module_name () ->
@@ -29 +33 @@
     {File, 3} = modules: locate ({eg_code, ok, 0}, Binary),
     ok.
+
+includes_tree () ->
+    [{file, "eg_include.hrl", "-define(eg_macro,ok)."},
+     {file, "eg_code_with_include.erl",
+      ["-module (eg_code_with_include).",
+       "-export ([ok/0]).",
+       "-include (\"eg_include.hrl\").",
+       "ok () -> ?eg_macro."]},
+     {file, "eg_code_no_include.erl",
+      ["-module (eg_code_no_include).",
+       "-export ([ok/0]).",
+       "ok () -> ok."]},
+     {directory, "dir",
+      [{file, "eg_include_in_dir.hrl", "-define(eg_macro2,nok)."}]},
+     {file, "eg_code_include_with_path.erl",
+      ["-module (eg_code_include_with_path).",
+       "-include (\"dir/eg_include_in_dir.hrl\").",
+       "-export ([ok/0]).",
+       "ok () -> ok."]}].
+
+includes () ->
+    ok = fixtures: use_tree (includes_tree (), fun includes/2).
+
+includes (Root, _) ->
+    Without = filename: join (Root, "eg_code_no_include.erl"),
+    [] = modules: includes (Without),
+    With = filename: join (Root, "eg_code_with_include.erl"),
+    ["eg_include.hrl"] = modules: includes (With),
+    With_path = filename: join (Root, "eg_code_include_with_path.erl"),
+    ["dir/eg_include_in_dir.hrl"] = modules: includes (With_path),
+    ok.

trunk/src/text_printer_test.erl

@@ -75 +75 @@
             P ! {io_reply, Self, ok},
             Binary;
+        {io_request, P, Self, {put_chars, Binary}} ->
+            P ! {io_reply, Self, ok},
+            Binary;
         M -> M
     after 1000 -> timeout