Add fixity declarations

Author: polytypic

lexer.mll

@@ -270,6 +270,7 @@ rule token = parse
   | "fun" { FUN }
   | "if" { IF }
   | "in" { IN }
+  | "fixity" { FIXITY }
   | "..." { ELLIPSIS }
   | "let" { LET }
   | "||" { LOGICAL_OR }

parser.mly

@@ -39,6 +39,7 @@ let parse_error s = raise (Source.Error (Source.nowhere_region, s))
 %token IMPORT
 %token WRAP_OP UNWRAP_OP
 %token ROLL_OP UNROLL_OP
+%token FIXITY
 
 %token EOF
 
@@ -109,13 +110,27 @@ head :
     { $1 }
 ;
 
-names :
+syms :
+  | sym
+    { [$1] }
+  | syms sym
+    { $2::$1 }
+;
+
+plainnames :
   | name
     { [$1] }
-  | name names
+  | name plainnames
     { $1::$2 }
 ;
 
+names :
+  | FIXITY syms
+    { List.map (fun n -> ("fixity." ^ n.it) @@ n.at) $2 }
+  | plainnames
+    { $1 }
+;
+
 label :
   | name
     { $1 }

prelude/index.1ml

@@ -1,5 +1,9 @@
 import "./primitives"
 
+Succ = {
+  type t _ = {}
+}
+
 Bool = {
   ...Bool
   not b = if b then false else true

prelude/index.1mls

@@ -1,5 +1,37 @@
 local import "./primitives"
 
+Succ: {
+  type t _
+}
+
+Prec: {
+  type _0 n =            n
+  type _1 n = Succ.t (_0 n)
+  type _2 n = Succ.t (_1 n)
+  type _3 n = Succ.t (_2 n)
+  type _4 n = Succ.t (_3 n)
+  type _5 n = Succ.t (_4 n)
+  type _6 n = Succ.t (_5 n)
+  type _7 n = Succ.t (_6 n)
+  type _8 n = Succ.t (_7 n)
+}
+
+Assoc: {
+  type L n = (Succ.t n,        n)
+  type N n = (       n,        n)
+  type R n = (       n, Succ.t n)
+}
+
+type Fixity (type prec _) (type assoc _) = {prec, assoc}
+
+fixity * / %           = Fixity Prec.8 Assoc.L
+fixity + -             = Fixity Prec.7 Assoc.L
+fixity :: ++           = Fixity Prec.6 Assoc.R
+fixity < <= <> == > >= = Fixity Prec.5 Assoc.N
+fixity << >>           = Fixity Prec.4 Assoc.L
+fixity |>              = Fixity Prec.3 Assoc.L
+fixity <|              = Fixity Prec.3 Assoc.R
+
 Alt: {
   type t _ _
   inl 'a 'b: a -> t a b
@@ -93,6 +125,7 @@ type char = Char.t
 type int = Int.t
 type list a = List.t a
 type opt a = Opt.t a
+type succ = Succ.t
 type text = Text.t
 type zero = Zero.t