add optional parameters/arguments for math commands

Sapphire-Lilith · Sep 8, 2018 · e02bb58 · e02bb58
1 parent cd57b5f
commit e02bb58
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/src/frontend/lexer.mll b/src/frontend/lexer.mll
@@ -444,6 +444,9 @@ and mathexpr stack = parse
       comment lexbuf;
       mathexpr stack lexbuf
     }
+  | "?:" {
+      OPTIONAL(get_pos lexbuf)
+    }
   | "!{" {
       Stack.push HorizontalState stack;
       skip_spaces lexbuf;

diff --git a/src/frontend/parser.mly b/src/frontend/parser.mly
@@ -623,10 +623,10 @@ nxvertdec:
       }
 ;
 nxmathdec:
-  | mcmdtok=HORZCMD; argpatlst=argpats; DEFEQ; utast=nxlet {
+  | mcmdtok=HORZCMD; cmdarglst=list(arg); DEFEQ; utast=nxlet {
       let (rngcs, _) = mcmdtok in
       let rng = make_range (Tok rngcs) (Ranged utast) in
-      let curried = curry_lambda_abstract_pattern rngcs argpatlst utast in
+      let curried = curry_lambda_abstract Alist.empty rngcs cmdarglst utast in
         (None, mcmdtok, (rng, UTLambdaMath(curried)))
       }
 ;
@@ -1130,10 +1130,31 @@ mathbot:
   | tok=VARINMATH { let (rng, mdlnmlst, varnm) = tok in (rng, UTMEmbed((rng, UTContentOf(mdlnmlst, varnm)))) }
 ;
 matharg:
-  | opn=BMATHGRP; utast=mathblock; cls=EMATHGRP { let (_, utastmain) = utast in UTMandatoryArgument(make_standard (Tok opn) (Tok cls) utastmain) }
-  | opn=BHORZGRP; utast=sxsep; cls=EHORZGRP     { let (_, utastmain) = utast in UTMandatoryArgument(make_standard (Tok opn) (Tok cls) utastmain) }
-  | opn=BVERTGRP; utast=vxblock; cls=EVERTGRP   { let (_, utastmain) = utast in UTMandatoryArgument(make_standard (Tok opn) (Tok cls) utastmain) }
-  | utcmdarg=narg                               { utcmdarg }
+  | opn=BMATHGRP; utast=mathblock; cls=EMATHGRP {
+        let (_, utastmain) = utast in
+          UTMandatoryArgument(make_standard (Tok opn) (Tok cls) utastmain)
+      }
+  | opn=BHORZGRP; utast=sxsep; cls=EHORZGRP {
+        let (_, utastmain) = utast in
+          UTMandatoryArgument(make_standard (Tok opn) (Tok cls) utastmain)
+      }
+  | opn=BVERTGRP; utast=vxblock; cls=EVERTGRP {
+        let (_, utastmain) = utast in
+          UTMandatoryArgument(make_standard (Tok opn) (Tok cls) utastmain)
+      }
+  | opt=OPTIONAL; BMATHGRP; utast=mathblock; cls=EMATHGRP {
+        let (_, utastmain) = utast in
+          UTOptionalArgument(make_standard (Tok opt) (Tok cls) utastmain)
+      }
+  | opt=OPTIONAL; BHORZGRP; utast=sxsep; cls=EHORZGRP {
+        let (_, utastmain) = utast in
+          UTOptionalArgument(make_standard (Tok opt) (Tok cls) utastmain)
+      }
+  | opt=OPTIONAL; BVERTGRP; utast=vxblock; cls=EVERTGRP {
+        let (_, utastmain) = utast in
+          UTOptionalArgument(make_standard (Tok opt) (Tok cls) utastmain)
+      }
+  | utcmdarg=narg { utcmdarg }
 ;
 sxblock:
   | ih=ih { let rng = make_range_from_list ih in (rng, UTInputHorz(ih)) }