Allow tensor and cartesian products to take in terms

Author: InnovativeInventor

README.md

@@ -25,4 +25,9 @@ Type check a benchmark in the examples directory with the following command.
 dune exec -- nfuzz examples/BENCHMARK.fz
 ```
 
-
+Changelog
+=====
+1. Allow resources to go unused (so functions can be dead, etc.).
+2. Add support for `sub : num x num -> num`. Intended to used with a paired NumFuzz semantics.
+3. Allow cartesian and tensor products to take in expressions (rather than values).
+4. Add a `factor : (M[q] 𝜎) x (M[q]𝜏) --o M[q] (𝜎 x 𝜏)` primitive for a tighter sensitivity and roundoff error analysis.

src/lexer.mll

@@ -60,6 +60,7 @@ let reservedWords = [
   ("num", fun i -> Parser.NUM i);
   ("bool", fun i -> Parser.BOOL i);
   ("string", fun i -> Parser.STRING i);
+  ("factor", fun i -> Parser.FACTOR i);
   (* ("sens", fun i -> Parser.SENS i); *)
 ]
 

src/parser.mly

@@ -67,6 +67,7 @@ let from_args_to_type arg_list oty = match oty with
 %token <Support.FileInfo.info> EQUAL
 %token <Support.FileInfo.info> EQOP
 %token <Support.FileInfo.info> EOF
+%token <Support.FileInfo.info> FACTOR
 (* %token <Support.FileInfo.info> FALSE *)
 %token <Support.FileInfo.info> FUNCTION
 %token <Support.FileInfo.info> FUN
@@ -217,6 +218,18 @@ Term :
   (* extra *)
   | LPAREN Term RPAREN
     { $2 }
+  (* tuples can take in arbitrary terms *)
+  | LPAREN PairSeq RPAREN
+      { fun ctx -> $2 ctx }
+  | LPAREN PIPE Term COMMA Term PIPE RPAREN
+      { fun ctx -> TmAmpersand($1, $3 ctx, $5 ctx) }
+
+(* Sugar for n-ary tuples *)
+PairSeq:
+    Term COMMA Term
+      { fun ctx -> TmTens($2, $1 ctx, $3 ctx)  }
+  | Term COMMA PairSeq
+      { fun ctx -> TmTens($2, $1 ctx, $3 ctx)  }
 
 Argument :
     LPAREN ID COLON Type RPAREN
@@ -233,13 +246,6 @@ Arguments :
           (l @ l2, ctx'')
       }
 
-(* Sugar for n-ary tuples *)
-PairSeq:
-    Val COMMA Val
-      { fun ctx -> TmTens($2, $1 ctx, $3 ctx)  }
-  | Val COMMA PairSeq
-      { fun ctx -> TmTens($2, $1 ctx, $3 ctx)  }
-
 Val:
     LPAREN RPAREN
       { fun _cx -> TmPrim ($1, PrimTUnit) }