diff options
| -rw-r--r-- | src/lacweb.grm | 18 | ||||
| -rw-r--r-- | tests/cargs.lac | 7 |
2 files changed, 23 insertions, 2 deletions
diff --git a/src/lacweb.grm b/src/lacweb.grm index 822cba8c..ca4ef55b 100644 --- a/src/lacweb.grm +++ b/src/lacweb.grm @@ -193,6 +193,7 @@ fun sql_relop (oper, sqlexp1, sqlexp2, loc) = | kind of kind | ktuple of kind list | kcolon of explicitness + | kopt of kind option | path of string list * string | cpath of string list * string @@ -211,6 +212,7 @@ fun sql_relop (oper, sqlexp1, sqlexp2, loc) = | rcone of (con * con) list | cargs of con * kind -> con * kind | cargl of con * kind -> con * kind + | cargl2 of con * kind -> con * kind | carg of con * kind -> con * kind | cargp of con * kind -> con * kind @@ -295,8 +297,14 @@ file : decls (decls) decls : ([]) | decl decls (decl :: decls) -decl : CON SYMBOL EQ cexp (DCon (SYMBOL, NONE, cexp), s (CONleft, cexpright)) - | CON SYMBOL DCOLON kind EQ cexp (DCon (SYMBOL, SOME kind, cexp), s (CONleft, cexpright)) +decl : CON SYMBOL cargl2 kopt EQ cexp (let + val loc = s (CONleft, cexpright) + + val k = Option.getOpt (kopt, (KWild, loc)) + val (c, k) = cargl2 (cexp, k) + in + (DCon (SYMBOL, SOME k, c), loc) + end) | LTYPE SYMBOL EQ cexp (DCon (SYMBOL, SOME (KType, s (LTYPEleft, cexpright)), cexp), s (LTYPEleft, cexpright)) | DATATYPE SYMBOL dargs EQ barOpt dcons(DDatatype (SYMBOL, dargs, dcons), s (DATATYPEleft, dconsright)) @@ -337,6 +345,9 @@ decl : CON SYMBOL EQ cexp (DCon (SYMBOL, NONE, cexp), s (CONleft, (DClass (SYMBOL1, c), s (CLASSleft, cexpright)) end) +kopt : (NONE) + | DCOLON kind (SOME kind) + dargs : ([]) | SYMBOL dargs (SYMBOL :: dargs) @@ -464,6 +475,9 @@ cargs : carg (carg) cargl : cargp cargp (cargp1 o cargp2) | cargp cargl (cargp o cargl) +cargl2 : (fn x => x) + | cargp cargl2 (cargp o cargl2) + carg : SYMBOL (fn (c, k) => let val loc = s (SYMBOLleft, SYMBOLright) diff --git a/tests/cargs.lac b/tests/cargs.lac index 4aba9860..7aa10d1b 100644 --- a/tests/cargs.lac +++ b/tests/cargs.lac @@ -5,3 +5,10 @@ con id3 = fn t => id2 t con pair = fn (t :: Type) (u :: Type) => (t, u) con pair2 = fn t u => pair t u con pair3 = fn t (u :: Type) => pair2 t u + +con id4 (t :: Type) = t +con id5 (t :: Type) :: Type = id4 t +con id6 t :: Type = id5 t + +con pair4 t (u :: Type) = pair3 t u +con pair5 t (u :: Type) :: (Type * Type) = pair4 t u |