Merge pull request #922 from bellthoven/fix_function_calls

Allow 'foo . (42)' calls

Author: José Valim

lib/elixir/src/elixir_tokenizer.erl

@@ -211,6 +211,14 @@ tokenize("..." ++ Rest, Line, Scope, Tokens) ->
   tokenize(Rest, Line, Scope, [Token|Tokens]);
 
 % ## Containers
+
+tokenize([$.,T|Tail], Line, Scope, Tokens) when ?is_space(T) ->
+  case [T|Tail] of
+    [$\r,$\n|Rest] -> tokenize([$.|Rest], Line + 1, Scope, Tokens);
+    [$\n|Rest]     -> tokenize([$.|Rest], Line + 1, Scope, Tokens);
+    [_|Rest]       -> tokenize([$.|Rest], Line, Scope, Tokens)
+  end;
+
 tokenize(".<<>>" ++ Rest, Line, Scope, Tokens) ->
   handle_call_identifier(Rest, Line, '<<>>', Scope, Tokens);
 

lib/elixir/test/erlang/function_test.erl

@@ -88,6 +88,28 @@ function_calls_with_multiple_args_with_line_breaks_test() ->
 function_calls_with_parenthesis_test() ->
   {3, [{a,_},{b,1}]} = eval("a = (fn x -> x + 2 end).(b = 1)").
 
+function_call_with_a_single_space_test() ->
+  {3, _} = eval("a = fn a, b -> a + b end; a. (1,2)"),
+  {3, _} = eval("a = fn a, b -> a + b end; a .(1,2)").
+
+function_call_with_spaces_test() ->
+  {3, _} = eval("a = fn a, b -> a + b end; a . (1,2)").
+
+function_call_without_assigning_with_spaces_test() ->
+  {3, _} = eval("(fn a, b -> a + b end) . (1,2)").
+
+function_call_with_assignment_and_spaces_test() ->
+  {3, [{a,_},{c,3}]} = eval("a = fn x -> x + 2 end; c = a . (1)").
+
+function_call_with_multiple_spaces_test() ->
+  {3, _} = eval("a = fn a, b -> a + b end; a .         (1,2)").
+
+function_call_with_multiline_test() ->
+  {3, _} = eval("a = fn a, b -> a + b end; a .   \n      (1,2)").
+
+function_call_with_tabs_test() ->
+  {3, _} = eval("a = fn a, b -> a + b end; a .\n\t(1,2)").
+
 %% Partial application
 
 require_partial_application_test() ->
@@ -96,4 +118,4 @@ require_partial_application_test() ->
 
 import_partial_application_test() ->
   { Fun, _ } = eval("is_atom(&1)"),
-  Fun = fun erlang:is_atom/1.
+  Fun = fun erlang:is_atom/1.