File 1124-epp-Eliminate-the-Type-argument-from-expan... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1124-epp-Eliminate-the-Type-argument-from-expand_macros-5.patch of Package erlang (Revision c976f7f310a3eae4238634ae9f19bcb1)

Currently displaying revision c976f7f310a3eae4238634ae9f19bcb1 , Show latest

From b6bbd00d6cdcc8418ee2385d719b0f12b7586198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 17 Nov 2015 09:47:20 +0100
Subject: [PATCH 4/6] epp: Eliminate the Type argument from expand_macros/5

The Type argument is always 'atom', so there is no need for the
argument.
---
 lib/stdlib/src/epp.erl | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index 87cffc9..1d9762c 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -1160,25 +1160,24 @@ macro_expansion([], Anno0) -> throw({error,loc(Anno0),premature_end}).
 %%  Expand the macros in a list of tokens, making sure that an expansion
 %%  gets the same location as the macro call.
 
-expand_macros(Type, MacT, M, Toks, Ms0) ->
-    %% (Type will always be 'atom')
+expand_macros(MacT, M, Toks, Ms0) ->
     {Ms, U} = Ms0,
     Lm = loc(MacT),
     Tinfo = element(2, MacT),
-    case expand_macro1(Type, Lm, M, Toks, Ms) of
+    case expand_macro1(Lm, M, Toks, Ms) of
 	{ok,{none,Exp}} ->
-	    check_uses([{{Type,M}, none}], [], U, Lm),
+	    check_uses([{{atom,M}, none}], [], U, Lm),
 	    Toks1 = expand_macros(expand_macro(Exp, Tinfo, [], dict:new()), Ms0),
 	    expand_macros(Toks1++Toks, Ms0);
 	{ok,{As,Exp}} ->
-	    check_uses([{{Type,M}, length(As)}], [], U, Lm),
+	    check_uses([{{atom,M}, length(As)}], [], U, Lm),
 	    {Bs,Toks1} = bind_args(Toks, Lm, M, As, dict:new()),
 	    expand_macros(expand_macro(Exp, Tinfo, Toks1, Bs), Ms0)
     end.
 
-expand_macro1(Type, Lm, M, Toks, Ms) ->
+expand_macro1(Lm, M, Toks, Ms) ->
     Arity = count_args(Toks, Lm, M),
-    case dict:find({Type,M}, Ms) of
+    case dict:find({atom,M}, Ms) of
         error -> %% macro not found
             throw({error,Lm,{undefined,M,Arity}});
         {ok, undefined} -> %% Predefined macro without definition
@@ -1220,13 +1219,13 @@ get_macro_uses({M,Arity}, U) ->
 %% Macro expansion
 %% Note: io:scan_erl_form() does not return comments or white spaces.
 expand_macros([{'?',_Lq},{atom,_Lm,M}=MacT|Toks], Ms) ->
-    expand_macros(atom, MacT, M, Toks, Ms);
+    expand_macros(MacT, M, Toks, Ms);
 %% Special macros
 expand_macros([{'?',_Lq},{var,Lm,'LINE'}=Tok|Toks], Ms) ->
     Line = erl_scan:line(Tok),
     [{integer,Lm,Line}|expand_macros(Toks, Ms)];
 expand_macros([{'?',_Lq},{var,_Lm,M}=MacT|Toks], Ms) ->
-    expand_macros(atom, MacT, M, Toks, Ms);
+    expand_macros(MacT, M, Toks, Ms);
 %% Illegal macros
 expand_macros([{'?',_Lq},Token|_Toks], _Ms) ->
     T = case erl_scan:text(Token) of
-- 
2.1.4

Places

File 1124-epp-Eliminate-the-Type-argument-from-expand_macros-5.patch of Package erlang (Revision c976f7f310a3eae4238634ae9f19bcb1)

Places