add support for multiple extend expressions in tutd

relates to #270
agentm · Nov 7, 2020 · a45300a · a45300a
1 parent f7fc888
commit a45300a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/bin/TutorialD/Interpreter/RelationalExpr.hs b/src/bin/TutorialD/Interpreter/RelationalExpr.hs
@@ -102,7 +102,11 @@ ungroupP = do
 extendP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a)
 extendP = do
   reservedOp ":"
-  Extend <$> braces extendTupleExpressionP
+  extends <- braces (sepBy extendTupleExpressionP comma)
+  case extends of
+    [] -> pure (Restrict TruePredicate)
+    extends' ->
+      pure $ \expr -> foldl (\acc ext -> Extend ext acc) expr extends'
 
 semijoinP :: RelationalMarkerExpr a => Parser (RelationalExprBase a -> RelationalExprBase a -> RelationalExprBase a)
 semijoinP = do

diff --git a/test/TutorialD/Interpreter.hs b/test/TutorialD/Interpreter.hs
@@ -121,7 +121,8 @@ simpleRelTests = TestCase $ do
                       ("x:=relation{tuple{a 5}} : {b:=6}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 6])]),
                       ("x:=relation{tuple{a 5}} : {b:=add(@a,5)}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 10])]),
                       ("x:=relation{tuple{a 5}} : {b:=add(@a,\"spam\")}", Left (AtomFunctionTypeError "add" 2 IntegerAtomType TextAtomType)),
-                      ("x:=relation{tuple{a 5}} : {b:=add(add(@a,2),5)}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 12])])
+                      ("x:=relation{tuple{a 5}} : {b:=add(add(@a,2),5)}", mkRelationFromTuples simpleDAttributes [RelationTuple simpleDAttributes (V.fromList [IntegerAtom 5, IntegerAtom 12])]),
+                      ("x:=false:{a:=1,b:=2}", mkRelationFromTuples simpleDAttributes [])
                      ]
     simpleAAttributes = A.attributesFromList [Attribute "a" IntegerAtomType]
     simpleBAttributes = A.attributesFromList [Attribute "d" IntegerAtomType]