Move all unary operators to new schema

Author: José Valim

lib/elixir/src/elixir_parser.yrl

@@ -29,13 +29,13 @@ Terminals
   number signed_number atom bin_string list_string sigil
   dot_call_op op_identifier
   comp_op at_op unary_op dual_op
-  'not' 'and' 'or' 'xor' 'when' 'in' 'inlist' 'inbits' 'do'
+  'and' 'or' 'xor' 'when' 'in' 'inlist' 'inbits' 'do'
   'true' 'false' 'nil'
   '=' '*' '/' '++' '--' '**' '//'
   '(' ')' '[' ']' '{' '}' '<<' '>>' '::'
   eol ','  '&' '|'  '.' '<-' '<>' '->' '|>' '=~'
   '&&' '||' '...' '..'
-  '<<<' '>>>' '&&&' '|||' '^^^' '~~~'
+  '<<<' '>>>' '&&&' '|||' '^^^'
   .
 
 Rootsymbol grammar.
@@ -64,7 +64,7 @@ Left     220 dual_op_eol. %% +, -
 Left     230 mult_op.
 Right    240 bin_concat_op.
 Right    250 two_op.
-Nonassoc 300 unary_op_eol. %% +, -, !, ^
+Nonassoc 300 unary_op_eol. %% +, -, !, ^, not, ~~~
 Left     310 dot_call_op.
 Left     310 dot_op.
 Nonassoc 320 at_op_eol. %% @<op>
@@ -309,10 +309,6 @@ unary_op_eol -> unary_op : '$1'.
 unary_op_eol -> unary_op eol : '$1'.
 unary_op_eol -> dual_op : '$1'.
 unary_op_eol -> dual_op eol : '$1'.
-unary_op_eol -> 'not' : '$1'.
-unary_op_eol -> 'not' eol : '$1'.
-unary_op_eol -> '~~~' : '$1'.
-unary_op_eol -> '~~~' eol : '$1'.
 
 match_op -> '=' : '$1'.
 match_op -> '=' eol : '$1'.

lib/elixir/src/elixir_tokenizer.erl

@@ -70,15 +70,18 @@
 -define(at_op(T),
   T == $@).
 
--define(dual_op(T),
-  T == $+ orelse T == $-).
-
 -define(unary_op(T),
   % T == $&;
   T == $!;
   T == $^
 ).
 
+-define(unary_op3(T1, T2, T3),
+  T1 == $~, T2 == $~, T3 == $~).
+
+-define(dual_op(T),
+  T == $+ orelse T == $-).
+
 tokenize(String, Line, Opts) ->
   File = case lists:keyfind(file, 1, Opts) of
     { file, V1 } -> V1;
@@ -227,6 +230,9 @@ tokenize([$.,T1,T2|Rest], Line, Scope, Tokens) when ?container2(T1, T2) ->
   handle_call_identifier(Rest, Line, list_to_atom([T1, T2]), Scope, Tokens);
 
 % ## Three Token Operators
+tokenize([$.,T1,T2,T3|Rest], Line, Scope, Tokens) when ?unary_op3(T1, T2, T3) ->
+  handle_call_identifier(Rest, Line, list_to_atom([T1, T2, T3]), Scope, Tokens);
+
 tokenize([$.,T1,T2,T3|Rest], Line, Scope, Tokens) when ?comp3(T1, T2, T3); ?op3(T1, T2, T3) ->
   handle_call_identifier(Rest, Line, list_to_atom([T1, T2, T3]), Scope, Tokens);
 
@@ -303,6 +309,9 @@ tokenize([$:,T1,T2|Rest], Line, Scope, Tokens) when ?container2(T1, T2) ->
   tokenize(Rest, Line, Scope, [{ atom, Line, list_to_atom([T1,T2]) }|Tokens]);
 
 % ## Three Token Operators
+tokenize([$:,T1,T2,T3|Rest], Line, Scope, Tokens) when ?unary_op3(T1, T2, T3) ->
+  tokenize(Rest, Line, Scope, [{ atom, Line, list_to_atom([T1,T2,T3]) }|Tokens]);
+
 tokenize([$:,T1,T2,T3|Rest], Line, Scope, Tokens) when ?comp3(T1, T2, T3); ?op3(T1, T2, T3)  ->
   tokenize(Rest, Line, Scope, [{ atom, Line, list_to_atom([T1,T2,T3]) }|Tokens]);
 
@@ -349,6 +358,9 @@ tokenize([T1,T2,T3|Rest], Line, Scope, Tokens) when ?comp3(T1, T2, T3) ->
   handle_comp_op(Rest, Line, list_to_atom([T1,T2,T3]), Scope, Tokens);
 
 % ## Three token operators
+tokenize([T1,T2,T3|Rest], Line, Scope, Tokens) when ?unary_op3(T1, T2, T3) ->
+  handle_unary_op(Rest, Line, unary_op, list_to_atom([T1,T2,T3]), Scope, Tokens);
+
 tokenize([T1,T2,T3|Rest], Line, Scope, Tokens) when ?op3(T1, T2, T3) ->
   handle_op(Rest, Line, list_to_atom([T1,T2,T3]), Scope, Tokens);
 
@@ -847,7 +859,8 @@ check_keyword(Line, Identifier, Atom, Tokens) when
         true  -> { ok, [{ Atom, Line }|Tokens] };
         false -> { error, "do" }
       end;
-    false -> nomatch
+    false -> nomatch;
+    unary_op -> { ok, [{ unary_op, Line, Atom }|Tokens] }
   end;
 
 check_keyword(_, _, _, _) -> nomatch.
@@ -862,12 +875,12 @@ keyword('end')   -> true;
 keyword('true')  -> true;
 keyword('false') -> true;
 keyword('nil')   -> true;
-keyword('not')   -> true;
 
 % Special handling for do
 keyword('do')    -> do;
 
-% Bin operator keywords
+% Operators keywords
+keyword('not')    -> unary_op;
 keyword('and')    -> op;
 keyword('or')     -> op;
 keyword('xor')    -> op;