Skip to content

Commit 9d25a58

Browse files
committed
better / more tests
1 parent 1d5e115 commit 9d25a58

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

formatTest/unit_tests/expected_output/infix.re

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,6 @@ let (=-) = (a, b) => a + b;
12021202

12031203
let foo = (a, b) => a =- b;
12041204

1205-
<<<<<<< HEAD
12061205
let (=><) = (a, b) => a + b;
12071206
let x = a =>< b;
12081207

@@ -1317,3 +1316,5 @@ let derefInsideArray = [|a^|];
13171316
let (=\>) = (a, b) => a + b;
13181317

13191318
let x = a =\> b;
1319+
1320+
let (=>>) = (a, b) => a + b;

formatTest/unit_tests/input/infix.re

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,6 @@ let (=-) = (a, b) => a + b;
919919

920920
let foo = (a, b) => a =- b;
921921

922-
<<<<<<< HEAD
923922
let (=><) = (a, b) => a + b;
924923
let x = a =>< b;
925924

@@ -1011,3 +1010,4 @@ let (=\>) = (a, b) => a + b;
10111010

10121011
let x = a =\> b;
10131012

1013+
let (=>>) = (a, b) => a + b;

src/reason-parser/reason_lexer.mll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ rule token = parse
615615
{ INFIXOP0(lexeme_operator lexbuf) }
616616
(* `=\>` is treated especially due to conflicts with the function declaration
617617
syntax *)
618-
| '\\'? '=' '\\'? '>' operator_chars*
618+
| '\\'? "=\\>"
619619
{ INFIXOP0(lexeme_operator lexbuf) }
620620
| '\\'? '@' operator_chars*
621621
{ INFIXOP1(lexeme_operator lexbuf) }

0 commit comments

Comments
 (0)