changes to file and filelib2

Changes:
  * strip out most types and specs;
  * replace the use of error with erlang:error in one place;
  * file2 starts up serialiser on-demand and uses it for subsequenct calls.

The R13 modules used here require slightly fewer changes than the R14 ones.

1 files changed, 4 insertions, 23 deletions

diff --git a/src/filelib2.erl b/src/filelib2.erl
index c9d1ad0414..9172b0e4f3 100644
--- a/src/filelib2.erl
+++ b/src/filelib2.erl
@@ -40,66 +40,51 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec wildcard(name()) -> [file:filename()].
 wildcard(Pattern) when is_list(Pattern) ->
     ?HANDLE_ERROR(do_wildcard(Pattern, file)).
 
--spec wildcard(name(), name() | atom()) -> [file:filename()].
 wildcard(Pattern, Cwd) when is_list(Pattern), is_list(Cwd) ->
     ?HANDLE_ERROR(do_wildcard(Pattern, Cwd, file));
 wildcard(Pattern, Mod) when is_list(Pattern), is_atom(Mod) ->
     ?HANDLE_ERROR(do_wildcard(Pattern, Mod)).
 
--spec wildcard(name(), name(), atom()) -> [file:filename()].
 wildcard(Pattern, Cwd, Mod)
   when is_list(Pattern), is_list(Cwd), is_atom(Mod) ->
     ?HANDLE_ERROR(do_wildcard(Pattern, Cwd, Mod)).
 
--spec is_dir(name()) -> boolean().
 is_dir(Dir) ->
     do_is_dir(Dir, file).
 
--spec is_dir(name(), atom()) -> boolean().
 is_dir(Dir, Mod) when is_atom(Mod) ->
     do_is_dir(Dir, Mod).
 
--spec is_file(name()) -> boolean().
 is_file(File) ->
     do_is_file(File, file).
 
--spec is_file(name(), atom()) -> boolean().
 is_file(File, Mod) when is_atom(Mod) ->
     do_is_file(File, Mod).
 
--spec is_regular(name()) -> boolean().
 is_regular(File) ->
     do_is_regular(File, file).
     
--spec is_regular(name(), atom()) -> boolean().
 is_regular(File, Mod) when is_atom(Mod) ->
     do_is_regular(File, Mod).
     
--spec fold_files(name(), string(), boolean(), fun((_,_) -> _), _) -> _.
 fold_files(Dir, RegExp, Recursive, Fun, Acc) ->
     do_fold_files(Dir, RegExp, Recursive, Fun, Acc, file).
 
--spec fold_files(name(), string(), boolean(), fun((_,_) -> _), _, atom()) -> _.
 fold_files(Dir, RegExp, Recursive, Fun, Acc, Mod) when is_atom(Mod) ->
     do_fold_files(Dir, RegExp, Recursive, Fun, Acc, Mod).
 
--spec last_modified(name()) -> date_time() | 0.
 last_modified(File) ->
     do_last_modified(File, file).
 
--spec last_modified(name(), atom()) -> date_time() | 0.
 last_modified(File, Mod) when is_atom(Mod) ->
     do_last_modified(File, Mod).
 
--spec file_size(name()) -> non_neg_integer().
 file_size(File) ->
     do_file_size(File, file).
 
--spec file_size(name(), atom()) -> non_neg_integer().
 file_size(File, Mod) when is_atom(Mod) ->
     do_file_size(File, Mod).
 
@@ -218,7 +203,6 @@ do_file_size(File, Mod) ->
 %% +type X = filename() | dirname()
 %% ensures that the directory name required to create D exists
 
--spec ensure_dir(name()) -> 'ok' | {'error', posix()}.
 ensure_dir("/") ->
     ok;
 ensure_dir(F) ->
@@ -228,7 +212,7 @@ ensure_dir(F) ->
 	    ok;
 	false ->
 	    ensure_dir(Dir),
-	    file:make_dir(Dir)
+	    file2:make_dir(Dir)
     end.
 
 
@@ -351,7 +335,7 @@ compile_part_to_sep(Part) ->
     compile_part(Part, true, []).
 
 compile_part([], true, _) ->
-    error(missing_delimiter);
+    erlang:error({badpattern, missing_delimiter});
 compile_part([$,|Rest], true, Result) ->
     {ok, $,, lists:reverse(Result), Rest};
 compile_part([$}|Rest], true, Result) ->
@@ -419,11 +403,8 @@ compile_alt(Pattern, Result) ->
 	    error
     end.
 
-error(Reason) ->
-    erlang:error({badpattern,Reason}).
-
 eval_read_file_info(File, file) ->
-    file:read_file_info(File);
+    file2:read_file_info(File);
 eval_read_file_info(File, erl_prim_loader) ->
     case erl_prim_loader:read_file_info(File) of
 	error -> {error, erl_prim_loader};
@@ -433,7 +414,7 @@ eval_read_file_info(File, Mod) ->
     Mod:read_file_info(File).
 
 eval_list_dir(Dir, file) ->
-    file:list_dir(Dir);
+    file2:list_dir(Dir);
 eval_list_dir(Dir, erl_prim_loader) ->
     case erl_prim_loader:list_dir(Dir) of
 	error -> {error, erl_prim_loader};