cale/toy-datalog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a bug in projectTuple where it wasn't ensuring that variables that appeared multiple times were bound to the same thing in the resulting set of tuples.

Browse Source
This commit is contained in:
Cale Gibbard 2026-01-26 12:18:29 -05:00
parent c09e07042b
commit a775f753e0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Datalog/Eval.hs
View File

@ -145,10 +145,16 @@ evalConjunction db atoms = do
return (foldr (><) (Set.singleton Map.empty) rs) return (foldr (><) (Set.singleton Map.empty) rs)
projectTuple :: Set ConId -> Map VarId ConId -> [Term] -> Set [ConId] projectTuple :: Set ConId -> Map VarId ConId -> [Term] -> Set [ConId]
projectTuple univ m = Set.fromList . mapM proj projectTuple univ m0 ts0 = Set.fromList $ proj m0 ts0
where where
proj (Con c) = [c] proj _ [] = [[]]
proj (Var v) = Map.findWithDefault (Set.toList univ) v (fmap (:[]) m) proj m (Con c : ts) = map (c:) (proj m ts)
proj m (Var v : ts) = case Map.lookup v m of
Just c -> map (c:) (proj m ts)
Nothing -> do
c <- Set.toList univ
s <- proj (Map.insert v c m) ts
return (c : s)
immediateConsequences :: Database -> Rule -> Either EvalError (Set [ConId]) immediateConsequences :: Database -> Rule -> Either EvalError (Set [ConId])
immediateConsequences db (Atom _ ts :- bodyAtoms) = do immediateConsequences db (Atom _ ts :- bodyAtoms) = do