File 1216-Refactor-get_name-1.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1216-Refactor-get_name-1.patch of Package erlang (Revision 1f1d20761f6491e00983c98926c55485)

Currently displaying revision 1f1d20761f6491e00983c98926c55485 , Show latest

From 61f421e356bd3eb659d7ba811905b2d3e1348348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 29 Apr 2016 10:25:39 +0200
Subject: [PATCH 6/9] Refactor get_name/1

Refactor get_name/1 to facilitate an optimization in the next commit.
---
 lib/kernel/src/code_server.erl | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index 2184a51..7fefb40 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -615,18 +615,23 @@ exclude(Dir,Path) ->
 %%
 %%
 get_name(Dir) ->
-    get_name2(get_name1(Dir), []).
-
-get_name1(Dir) ->
-    case lists:reverse(filename:split(Dir)) of
-	["ebin",DirName|_] -> DirName;
-	[DirName|_]        -> DirName;
-	_                  -> ""        % No name !
-    end.
-
-get_name2([$-|_],Acc) -> lists:reverse(Acc);
-get_name2([H|T],Acc)  -> get_name2(T,[H|Acc]);
-get_name2(_,Acc)      -> lists:reverse(Acc).
+    get_name_from_splitted(filename:split(Dir)).
+
+get_name_from_splitted([DirName,"ebin"]) ->
+    discard_after_hyphen(DirName);
+get_name_from_splitted([DirName]) ->
+    discard_after_hyphen(DirName);
+get_name_from_splitted([_|T]) ->
+    get_name_from_splitted(T);
+get_name_from_splitted([]) ->
+    "".						%No name.
+
+discard_after_hyphen("-"++_) ->
+    [];
+discard_after_hyphen([H|T]) ->
+    [H|discard_after_hyphen(T)];
+discard_after_hyphen([]) ->
+    [].
 
 check_path(Path) ->
     PathChoice = init:code_path_choice(),
-- 
2.1.4

Places

File 1216-Refactor-get_name-1.patch of Package erlang (Revision 1f1d20761f6491e00983c98926c55485)

Places