Skip to content

Commit ec94c93

Browse files
author
José Valim
committed
Remove ** from operators list for now
1 parent 96ed1ff commit ec94c93

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

lib/elixir/lib/macro.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ defmodule Macro do
1313

1414
@binary_ops [:===, :!==,
1515
:==, :!=, :<=, :>=,
16-
:&&, :||, :<>, :++, :--, :**, ://, :::, :<-, :.., :|>, :=~,
16+
:&&, :||, :<>, :++, :--, ://, :::, :<-, :.., :|>, :=~,
1717
:<, :>, :->,
1818
:+, :-, :*, :/, :=, :|, :.,
1919
:and, :or, :xor, :when, :in, :inlist, :inbits,
@@ -39,7 +39,7 @@ defmodule Macro do
3939
o when o in [:==, :!=, :<, :<=, :>=, :>, :=~, :===, :!==] -> {:left, 150}
4040
o when o in [:|>, :<<<, :>>>] -> {:right, 160}
4141
:in -> {:left, 170}
42-
o when o in [:++, :--, :**, :.., :<>] -> {:right, 200}
42+
o when o in [:++, :--, :.., :<>] -> {:right, 200}
4343
o when o in [:+, :-] -> {:left, 210}
4444
o when o in [:*, :/] -> {:left, 220}
4545
:^^^ -> {:left, 250}

lib/elixir/src/elixir_parser.yrl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Left 140 and_op_eol. %% &&, &&&, and
5353
Left 150 comp_op_eol. %% <, >, <=, >=, ==, !=, =~, ===, !==
5454
Right 160 arrow_op_eol. %% < (op), (op) > (e.g |>, <<<, >>>)
5555
Left 170 in_op_eol. %% in
56-
Right 200 two_op_eol. %% ++, --, **, .., <>
56+
Right 200 two_op_eol. %% ++, --, .., <>
5757
Left 210 add_op_eol. %% + (op), - (op)
5858
Left 220 mult_op_eol. %% * (op), / (op)
5959
Left 250 exp_op_eol. %% ^ (op) (e.g ^^^)

lib/elixir/src/elixir_tokenizer.erl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
-define(two_op(T1, T2),
2525
T1 == $+, T2 == $+;
2626
T1 == $-, T2 == $-;
27-
T1 == $*, T2 == $*;
2827
T1 == $<, T2 == $>;
2928
T1 == $., T2 == $.).
3029

0 commit comments

Comments
 (0)