Remove ?break handling duplication

Author: josevalim

lib/elixir/src/elixir_interpolation.erl

@@ -80,17 +80,8 @@ extract([$\\ | Rest], Buffer, Output, Line, Column, Scope, Interpol, Last) ->
 
 %% Catch all clause
 
-extract([Char | _Rest], _Buffer, _Output, Line, Column, _Scope, _Interpol, _Last)
-    when ?break(Char) ->
-  Token = io_lib:format("\\u~4.16.0B", [Char]),
-  Pos = io_lib:format(". If you want to use such character, use it in its escaped ~ts form instead", [Token]),
-  {error, {?LOC(Line, Column),
-    {"invalid line break character in string: ",
-     Pos},
-    Token}};
-
 extract([Char1, Char2 | Rest], Buffer, Output, Line, Column, Scope, Interpol, Last)
-    when Char1 =< 255, Char2 =< 255 ->
+    when Char1 =< 255, Char2 =< 255, not (?break(Char1)) ->
   extract([Char2 | Rest], [Char1 | Buffer], Output, Line, Column + 1, Scope, Interpol, Last);
 
 extract(Rest, Buffer, Output, Line, Column, Scope, Interpol, Last) ->

lib/elixir/src/elixir_tokenizer.hrl

@@ -24,20 +24,20 @@
 
 %% Bidirectional control
 %% Retrieved from https://trojansource.codes/trojan-source.pdf
--define(bidi(C), C =:= 16#202A;
-                 C =:= 16#202B;
-                 C =:= 16#202D;
-                 C =:= 16#202E;
-                 C =:= 16#2066;
-                 C =:= 16#2067;
-                 C =:= 16#2068;
-                 C =:= 16#202C;
+-define(bidi(C), C =:= 16#202A orelse
+                 C =:= 16#202B orelse
+                 C =:= 16#202D orelse
+                 C =:= 16#202E orelse
+                 C =:= 16#2066 orelse
+                 C =:= 16#2067 orelse
+                 C =:= 16#2068 orelse
+                 C =:= 16#202C orelse
                  C =:= 16#2069).
 
 %% Unsupported newlines
 %% https://www.unicode.org/reports/tr55/
--define(break(C), C =:= 16#000B;
-                  C =:= 16#000C;
-                  C =:= 16#0085;
-                  C =:= 16#2028;
+-define(break(C), C =:= 16#000B orelse
+                  C =:= 16#000C orelse
+                  C =:= 16#0085 orelse
+                  C =:= 16#2028 orelse
                   C =:= 16#2029).

lib/elixir/test/elixir/kernel/parser_test.exs

@@ -1137,23 +1137,15 @@ defmodule Kernel.ParserTest do
           "nofile:1:12:",
           "invalid line break character in string: \\u000B. If you want to use such character, use it in its escaped \\u000B form instead"
         ],
-        :erlang.list_to_binary([34] ++ ~c"this is a " ++ [11, 34])
+        [34] ++ ~c"this is a " ++ [11, 34]
       )
 
       assert_syntax_error(
         [
           "nofile:1:12:",
           "invalid line break character in string: \\u000C. If you want to use such character, use it in its escaped \\u000C form instead"
         ],
-        :erlang.list_to_binary([34] ++ ~c"this is a " ++ [12, 34])
-      )
-
-      assert_syntax_error(
-        [
-          "nofile:1:12:",
-          "invalid line break character in string: \\u0085. If you want to use such character, use it in its escaped \\u0085 form instead"
-        ],
-        <<34, "this is a ", 194, 133, 34>>
+        [34] ++ ~c"this is a " ++ [12, 34]
       )
     end