Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion lib/elixir/src/elixir_parser.yrl
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ map_args -> open_curly assoc_update ',' close_curly : build_map_update('$1', '$2
map_args -> open_curly assoc_update ',' map_close : build_map_update('$1', '$2', element(2, '$4'), element(1, '$4')).
map_args -> open_curly assoc_update_kw close_curly : build_map_update('$1', '$2', '$3', []).

map -> map_op map_args : '$2'.
map -> map_op map_args : update_map_meta('$1', '$2').
map -> '%' map_base_expr map_args : {'%', meta_from_token('$1'), ['$2', '$3']}.
map -> '%' map_base_expr eol map_args : {'%', meta_from_token('$1'), ['$2', '$4']}.

Expand All @@ -670,6 +670,13 @@ Erlang code.
-compile({inline, meta_from_token/1, meta_from_location/1, is_eol/1}).
-import(lists, [reverse/1, reverse/2]).

update_map_meta(MapOp, {'%{}', Meta, Args}) ->
MapOpMeta = meta_from_token(MapOp),
FilteredMeta = [M || M <- Meta,
element(1, M) =/= line andalso
element(1, M) =/= column],
{'%{}', FilteredMeta ++ MapOpMeta, Args}.

meta_from_token(Token) ->
meta_from_location(?location(Token)).

Expand Down
2 changes: 1 addition & 1 deletion lib/elixir/src/elixir_tokenizer.erl
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ tokenize([$%, $[ | Rest], Line, Column, Scope, Tokens) ->
error(Reason, Rest, Scope, Tokens);

tokenize([$%, ${ | T], Line, Column, Scope, Tokens) ->
Token = {'{', {Line, Column, nil}},
Token = {'{', {Line, Column + 1, nil}},
handle_terminator(T, Line, Column + 2, Scope, Token, [{'%{}', {Line, Column, nil}} | Tokens]);

tokenize([$% | T], Line, Column, Scope, Tokens) ->
Expand Down
Loading