From 69486d5b01b3281ea1c9ca168b2658c1159a82ce Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Fri, 17 Dec 2010 17:05:47 +0100
Subject: Remove dead code (and dialyzer errors) from filename and re

---
 lib/stdlib/src/filename.erl | 14 ++++++--------
 lib/stdlib/src/re.erl       | 42 +++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 31 deletions(-)

(limited to 'lib/stdlib')

diff --git a/lib/stdlib/src/filename.erl b/lib/stdlib/src/filename.erl
index e38b8957f2..24abf1e977 100644
--- a/lib/stdlib/src/filename.erl
+++ b/lib/stdlib/src/filename.erl
@@ -165,8 +165,6 @@ basename1([$/|[]], Tail, DirSep2) ->
     basename1([], Tail, DirSep2);
 basename1([$/|Rest], _Tail, DirSep2) ->
     basename1(Rest, [], DirSep2);
-basename1([[_|_]=List|Rest], Tail, DirSep2) ->
-    basename1(List++Rest, Tail, DirSep2);
 basename1([DirSep2|Rest], Tail, DirSep2) when is_integer(DirSep2) ->
     basename1([$/|Rest], Tail, DirSep2);
 basename1([Char|Rest], Tail, DirSep2) when is_integer(Char) ->
@@ -280,8 +278,6 @@ dirname(Name0) ->
     Name = flatten(Name0),
     dirname(Name, [], [], separators()).
 
-dirname([[_|_]=List|Rest], Dir, File, Seps) ->
-    dirname(List++Rest, Dir, File, Seps);
 dirname([$/|Rest], Dir, File, Seps) ->
     dirname(Rest, File++Dir, [$/], Seps);
 dirname([DirSep|Rest], Dir, File, {DirSep,_}=Seps) when is_integer(DirSep) ->
@@ -346,8 +342,6 @@ extension(Name) when is_binary(Name) ->
 		    []
 	    end,
     case binary:matches(Name,[<<".">>]) of
-	nomatch -> % Bug in binary workaround :(
-	    <<>>;
 	[] ->
 	    <<>>;
 	List ->
@@ -479,6 +473,12 @@ maybe_remove_dirsep(Name, _) ->
 %% by a previous call to join/{1,2}.
 
 -spec append(file:filename(), file:name()) -> file:filename().
+append(Dir, Name) when is_binary(Dir), is_binary(Name) ->
+    <<Dir/binary,$/:8,Name/binary>>;
+append(Dir, Name) when is_binary(Dir) ->
+    append(Dir,filename_string_to_binary(Name));
+append(Dir, Name) when is_binary(Name) ->
+    append(filename_string_to_binary(Dir),Name);
 append(Dir, Name) ->
     Dir ++ [$/|Name].
 
@@ -685,8 +685,6 @@ split([$/|Rest], Comp, Components, OsType) ->
     split(Rest, [], [lists:reverse(Comp)|Components], OsType);
 split([Char|Rest], Comp, Components, OsType) when is_integer(Char) ->
     split(Rest, [Char|Comp], Components, OsType);
-split([List|Rest], Comp, Components, OsType) when is_list(List) ->
-    split(List++Rest, Comp, Components, OsType);
 split([], [], Components, _OsType) ->
     lists:reverse(Components);
 split([], Comp, Components, OsType) ->
diff --git a/lib/stdlib/src/re.erl b/lib/stdlib/src/re.erl
index 296a6b3d23..9642de17b4 100644
--- a/lib/stdlib/src/re.erl
+++ b/lib/stdlib/src/re.erl
@@ -208,29 +208,25 @@ replace(Subject,RE,Replacement,Options) ->
 	process_repl_params(Options,iodata,false),
     FlatSubject = to_binary(Subject, Unicode),
     FlatReplacement = to_binary(Replacement, Unicode),
-    case do_replace(FlatSubject,Subject,RE,FlatReplacement,NewOpt) of
-	{error,_Err} ->
-	    throw(badre);
-	IoList ->
-	    case Convert of
-		iodata ->
-		    IoList;
-		binary ->
-		    case Unicode of
-			false ->
-			    iolist_to_binary(IoList);
-			true ->
-			    unicode:characters_to_binary(IoList,unicode)
-		    end;
-		list ->
-		    case Unicode of
-			false ->
-			    binary_to_list(iolist_to_binary(IoList));
-			true ->
-			    unicode:characters_to_list(IoList,unicode)
-		    end
-	    end
-    end
+    IoList = do_replace(FlatSubject,Subject,RE,FlatReplacement,NewOpt),
+	case Convert of
+	    iodata ->
+		IoList;
+	    binary ->
+		case Unicode of
+		    false ->
+			iolist_to_binary(IoList);
+		    true ->
+			unicode:characters_to_binary(IoList,unicode)
+		end;
+	    list ->
+		case Unicode of
+		    false ->
+			binary_to_list(iolist_to_binary(IoList));
+		    true ->
+			unicode:characters_to_list(IoList,unicode)
+		end
+	end
     catch
 	throw:badopt ->
 	    erlang:error(badarg,[Subject,RE,Replacement,Options]);
-- 
cgit v1.2.3


From 8f15f156e539aaa6d69acc28d527ef6da94d40d3 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Mon, 20 Dec 2010 14:55:23 +0100
Subject: Removed dead code

---
 lib/stdlib/src/epp.erl     | 10 ++--------
 lib/stdlib/src/escript.erl |  4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'lib/stdlib')

diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index e5ccaddbb4..d4844b8c1e 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -427,10 +427,7 @@ scan_toks(From, St) ->
 	    epp_reply(From, {error,E}),
 	    wait_req_scan(St#epp{location=Cl});
 	{eof,Cl} ->
-	    leave_file(From, St#epp{location=Cl});
-	{error,_E} ->
-            epp_reply(From, {error,{St#epp.location,epp,cannot_parse}}),
-	    leave_file(wait_request(St), St)	%This serious, just exit!
+	    leave_file(From, St#epp{location=Cl})
     end.
 
 scan_toks([{'-',_Lh},{atom,_Ld,define}=Define|Toks], From, St) ->
@@ -811,10 +808,7 @@ skip_toks(From, St, [I|Sis]) ->
 	{error,_E,Cl} ->
 	    skip_toks(From, St#epp{location=Cl}, [I|Sis]);
 	{eof,Cl} ->
-	    leave_file(From, St#epp{location=Cl,istk=[I|Sis]});
-	{error,_E} ->
-            epp_reply(From, {error,{St#epp.location,epp,cannot_parse}}),
-	    leave_file(wait_request(St), St)	%This serious, just exit!
+	    leave_file(From, St#epp{location=Cl,istk=[I|Sis]})
     end;
 skip_toks(From, St, []) ->
     scan_toks(From, St).
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index 99e454f593..7cb02afb11 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -570,9 +570,7 @@ parse_beam(S, File, HeaderSz, CheckOnly) ->
 			    forms_or_bin = Bin}
 	    end;
 	{error, beam_lib, Reason} when is_tuple(Reason) ->
-            fatal(element(1, Reason));
-        {error, beam_lib, Reason} ->
-            fatal(Reason)
+            fatal(element(1, Reason))
     end.
 
 parse_source(S, File, Fd, StartLine, HeaderSz, CheckOnly) ->
-- 
cgit v1.2.3