File tree Expand file tree Collapse file tree 3 files changed +15
-19
lines changed Expand file tree Collapse file tree 3 files changed +15
-19
lines changed Original file line number Diff line number Diff line change @@ -179,13 +179,7 @@ let entries =
179
179
name = " %lsr" ;
180
180
form = Binary ;
181
181
specialization =
182
- {
183
- int = Plsrint ;
184
- bool = None ;
185
- float = None ;
186
- bigint = None ;
187
- string = None ;
188
- };
182
+ {int = Plsrint ; bool = None ; float = None ; bigint = None ; string = None };
189
183
};
190
184
{
191
185
path = builtin " mod" ;
Original file line number Diff line number Diff line change @@ -887,16 +887,14 @@ let rec scan scanner =
887
887
next scanner;
888
888
Token. Plus )
889
889
| '>' -> (
890
- match peek scanner with
891
- | '>' -> (
892
- match peek2 scanner with
893
- | '>' ->
894
- next3 scanner;
895
- Token. GreaterThanGreaterThanGreaterThan
896
- | _ ->
897
- next2 scanner;
898
- Token. GreaterThanGreaterThan )
899
- | '=' when not (in_diamond_mode scanner) ->
890
+ match (peek scanner, peek2 scanner) with
891
+ | '>' , '>' when not (in_diamond_mode scanner) ->
892
+ next3 scanner;
893
+ Token. GreaterThanGreaterThanGreaterThan
894
+ | '>' , _ when not (in_diamond_mode scanner) ->
895
+ next2 scanner;
896
+ Token. GreaterThanGreaterThan
897
+ | '=' , _ when not (in_diamond_mode scanner) ->
900
898
next2 scanner;
901
899
Token. GreaterEqual
902
900
| _ ->
@@ -1039,6 +1037,9 @@ let reconsider_less_than scanner =
1039
1037
if scanner.ch == '/' then
1040
1038
let () = next scanner in
1041
1039
Token. LessThanSlash
1040
+ else if scanner.ch == '<' then (
1041
+ next scanner;
1042
+ Token. LessThanLessThan )
1042
1043
else Token. LessThan
1043
1044
1044
1045
(* If an operator has whitespace around both sides, it's a binary operator *)
Original file line number Diff line number Diff line change @@ -110,8 +110,9 @@ let precedence = function
110
110
| Equal | EqualEqual | EqualEqualEqual | LessThan | GreaterThan | BangEqual
111
111
| BangEqualEqual | LessEqual | GreaterEqual | BarGreater ->
112
112
5
113
- | Plus | PlusDot | Minus | MinusDot | PlusPlus | LessThanLessThan | GreaterThanGreaterThan
114
- | GreaterThanGreaterThanGreaterThan -> 6
113
+ | Plus | PlusDot | Minus | MinusDot | PlusPlus | LessThanLessThan
114
+ | GreaterThanGreaterThan ->
115
+ 6
115
116
| Asterisk | AsteriskDot | Forwardslash | ForwardslashDot | Percent -> 7
116
117
| Exponentiation -> 8
117
118
| MinusGreater -> 9
You can’t perform that action at this time.
0 commit comments