Single pass

Author: jonatanklosko

lib/elixir/src/elixir_parser.yrl

@@ -672,15 +672,15 @@ meta_from_location({Line, Column, _}) ->
 do_end_meta(Do, End) ->
   case ?token_metadata() of
     true ->
-      [{do, meta_from_location(?location(Do))}, {'end', meta_from_location(?location(End))}];
+      [{do, meta_from_token(Do)}, {'end', meta_from_token(End)}];
     false ->
       []
   end.
 
 meta_from_token_with_closing(Begin, End) ->
   case ?token_metadata() of
     true ->
-      [{closing, meta_from_location(?location(End))} | meta_from_token(Begin)];
+      [{closing, meta_from_token(End)} | meta_from_token(Begin)];
     false ->
       meta_from_token(Begin)
   end.
@@ -778,46 +778,33 @@ build_map_update(Left, {Pipe, Struct, Map}, Right, Extra) ->
 
 %% Blocks
 
-build_block(Exprs) -> build_block(Exprs, []).
+build_block(Exprs) -> build_block(Exprs, {}).
 
-build_block([{unquote_splicing, _, [_]}]=Exprs, Meta) ->
-  {'__block__', Meta, Exprs};
-build_block([{Op, ExprMeta, Args}], Meta) ->
+build_block([{unquote_splicing, _, [_]}]=Exprs, BeforeAfter) ->
+  {'__block__', block_meta(BeforeAfter), Exprs};
+build_block([{Op, ExprMeta, Args}], {Before, After}) ->
   ExprMetaWithExtra =
     case ?token_metadata() of
-      true -> ExprMeta ++ block_meta(Meta);
-      false -> ExprMeta
+      true ->
+        ExprMeta ++ [{parens_opening, meta_from_token(Before)}, {parens_closing, meta_from_token(After)}];
+      false ->
+        ExprMeta
     end,
   {Op, ExprMetaWithExtra, Args};
-build_block([Expr], _Meta) ->
+build_block([Expr], _BeforeAfter) ->
   Expr;
-build_block(Exprs, Meta) ->
-  {'__block__', Meta, Exprs}.
-
-block_meta(Meta) ->
-  block_meta(Meta, [], []).
-
-block_meta([], [], []) ->
-  [];
-block_meta([], [], Closing) ->
-  [{parens_closing, Closing}];
-block_meta([], Opening, Closing) ->
-  [{parens_opening, lists:reverse(Opening)} | block_meta([], [], Closing)];
-block_meta([{line, Line} | Meta], Opening, Closing) ->
-  block_meta(Meta, [{line, Line} | Opening], Closing);
-block_meta([{column, Column} | Meta], Opening, Closing) ->
-  block_meta(Meta, [{column, Column} | Opening], Closing);
-block_meta([{closing, Closing} | Meta], Opening, _Closing) ->
-  block_meta(Meta, Opening, Closing);
-block_meta([_ | Meta], Opening, Closing) ->
-  block_meta(Meta, Opening, Closing).
+build_block(Exprs, BeforeAfter) ->
+  {'__block__', block_meta(BeforeAfter), Exprs}.
+
+block_meta({}) -> [];
+block_meta({Before, After}) -> meta_from_token_with_closing(Before, After).
 
 %% Newlines
 
 newlines_pair(Left, Right) ->
   case ?token_metadata() of
     true ->
-      newlines(?location(Left), [{closing, meta_from_location(?location(Right))}]);
+      newlines(?location(Left), [{closing, meta_from_token(Right)}]);
     false ->
       []
   end.
@@ -1089,7 +1076,7 @@ build_paren_stab(_Before, [{Op, _, [_]}]=Exprs, _After) when ?rearrange_uop(Op)
   {'__block__', [], Exprs};
 build_paren_stab(Before, Stab, After) ->
   case check_stab(Stab, none) of
-    block -> build_block(reverse(Stab), meta_from_token_with_closing(Before, After));
+    block -> build_block(reverse(Stab), {Before, After});
     stab -> handle_literal(collect_stab(Stab, [], []), Before, newlines_pair(Before, After))
   end.