better / more tests

reasonml · Oct 11, 2018 · 9d25a58 · 9d25a58
1 parent 1d5e115
commit 9d25a58
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/formatTest/unit_tests/expected_output/infix.re b/formatTest/unit_tests/expected_output/infix.re
@@ -1202,7 +1202,6 @@ let (=-) = (a, b) => a + b;
 
 let foo = (a, b) => a =- b;
 
-<<<<<<< HEAD
 let (=><) = (a, b) => a + b;
 let x = a =>< b;
 
@@ -1317,3 +1316,5 @@ let derefInsideArray = [|a^|];
 let (=\>) = (a, b) => a + b;
 
 let x = a =\> b;
+
+let (=>>) = (a, b) => a + b;
diff --git a/formatTest/unit_tests/input/infix.re b/formatTest/unit_tests/input/infix.re
@@ -919,7 +919,6 @@ let (=-) = (a, b) => a + b;
 
 let foo = (a, b) => a =- b;
 
-<<<<<<< HEAD
 let (=><) = (a, b) => a + b;
 let x = a =>< b;
 
@@ -1011,3 +1010,4 @@ let (=\>) = (a, b) => a + b;
 
 let x = a =\> b;
 
+let (=>>) = (a, b) => a + b;
diff --git a/src/reason-parser/reason_lexer.mll b/src/reason-parser/reason_lexer.mll
@@ -615,7 +615,7 @@ rule token = parse
             { INFIXOP0(lexeme_operator lexbuf) }
   (* `=\>` is treated especially due to conflicts with the function declaration
      syntax *)
-  | '\\'? '=' '\\'? '>' operator_chars*
+  | '\\'? "=\\>"
             { INFIXOP0(lexeme_operator lexbuf) }
   | '\\'? '@' operator_chars*
             { INFIXOP1(lexeme_operator lexbuf) }