Remove *_table terminolgy in favor of setup/cleanup

Author: José Valim

lib/elixir/src/elixir_def.erl

@@ -2,8 +2,8 @@
 -module(elixir_def).
 -export([table/1,
   clauses_table/1,
-  build_table/1,
-  delete_table/1,
+  setup/1,
+  cleanup/1,
   reset_last/1,
   lookup_definition/2,
   delete_definition/2,
@@ -21,15 +21,15 @@
 table(Module) -> ?atom_concat([f, Module]).
 clauses_table(Module) -> ?atom_concat([c, Module]).
 
-build_table(Module) ->
+setup(Module) ->
   FunctionsTable = table(Module),
   ClausesTable = clauses_table(Module),
   ets:new(FunctionsTable, [set, named_table, public]),
   ets:new(ClausesTable, [bag, named_table, public]),
   reset_last(Module),
   { FunctionsTable, ClausesTable }.
 
-delete_table(Module) ->
+cleanup(Module) ->
   ets:delete(table(Module)),
   ets:delete(clauses_table(Module)).
 

lib/elixir/src/elixir_import.erl

@@ -5,7 +5,7 @@
 -export([import/5, format_error/1,
   ensure_no_import_conflict/4, ensure_no_local_conflict/4,
   ensure_all_imports_used/3,
-  build_table/1, delete_table/1, record/3]).
+  setup/1, cleanup/1, record/3]).
 -include("elixir.hrl").
 
 %% This table keeps:
@@ -18,10 +18,10 @@
 %%
 table(Module) -> ?atom_concat([i, Module]).
 
-build_table(Module) ->
+setup(Module) ->
   ets:new(table(Module), [bag, named_table, public]).
 
-delete_table(Module) ->
+cleanup(Module) ->
   ets:delete(table(Module)).
 
 record(_Tuple, _Receiver, nil) -> false;

lib/elixir/src/elixir_module.erl

@@ -91,10 +91,10 @@ compile(Line, Module, Block, Vars, #elixir_scope{context_modules=FileModules} =
     { module, Module, Binary, Result }
   after
     elixir_def_local:cleanup(Module),
+    elixir_def:cleanup(Module),
+    elixir_import:cleanup(Module),
     ets:delete(data_table(Module)),
-    ets:delete(docs_table(Module)),
-    elixir_def:delete_table(Module),
-    elixir_import:delete_table(Module)
+    ets:delete(docs_table(Module))
   end;
 
 compile(Line, Other, _Block, _Vars, #elixir_scope{file=File}) ->
@@ -137,13 +137,8 @@ build(Line, File, Module) ->
 
   %% Setup other modules
   elixir_def_local:setup(Module),
-
-  %% We keep a separated table for function definitions
-  %% and another one for imports. We keep them in different
-  %% tables for organization and speed purpose (since the
-  %% imports table is frequently written to).
-  elixir_def:build_table(Module),
-  elixir_import:build_table(Module).
+  elixir_def:setup(Module),
+  elixir_import:setup(Module).
 
 %% Receives the module representation and evaluates it.