summaryrefslogtreecommitdiff
path: root/src/lexer.mll
diff options
context:
space:
mode:
authorAlasdair Armstrong2018-02-05 23:00:58 +0000
committerAlasdair Armstrong2018-02-05 23:00:58 +0000
commitfc5ad2e3930b06a8bd382639361b31bd7407f395 (patch)
tree9c4b5064cde7fa7fa0027c090e6b654549fbdb63 /src/lexer.mll
parent17265a95407c62e78bb850c0e6ffb0876c85c5cb (diff)
parentbdfcb327ccf23982ae74549fc56ec3451c493ed5 (diff)
Merge changes to type_check.ml
Diffstat (limited to 'src/lexer.mll')
-rw-r--r--src/lexer.mll9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lexer.mll b/src/lexer.mll
index 77fba70b..3538d5cb 100644
--- a/src/lexer.mll
+++ b/src/lexer.mll
@@ -93,7 +93,14 @@ let mk_operator prec n op =
| InfixR, 9 -> Op9r op
| _, _ -> assert false
-let operators = ref M.empty
+let operators = ref
+ (List.fold_left
+ (fun r (x, y) -> M.add x y r)
+ M.empty
+ [ ("==", mk_operator Infix 4 "==");
+ ("/", mk_operator InfixL 7 "/");
+ ("%", mk_operator InfixL 7 "%");
+ ])
let kw_table =
List.fold_left