summaryrefslogtreecommitdiff
path: root/source/Meaning.hs
diff options
context:
space:
mode:
Diffstat (limited to 'source/Meaning.hs')
-rw-r--r--source/Meaning.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/Meaning.hs b/source/Meaning.hs
index d32e8ac..834d8a6 100644
--- a/source/Meaning.hs
+++ b/source/Meaning.hs
@@ -389,13 +389,14 @@ glossStmt = \case
vp' <- glossVP vp
let phi = Sem.makeConjunction (vp' <$> toList ts')
pure (compose quantifies phi)
- Raw.StmtNoun t np -> do
- (t', quantify) <- glossTerm t
+ Raw.StmtNoun ts np -> do
+ (ts', quantifies) <- NonEmpty.unzip <$> glossTerm `each` ts
(np', maySuchThat) <- glossNPMaybe np
let andSuchThat phi = case maySuchThat of
Just suchThat -> phi `Sem.And` suchThat
Nothing -> phi
- pure (quantify (andSuchThat (np' t')))
+ psi = Sem.makeConjunction (andSuchThat . np' <$> toList ts')
+ pure (compose quantifies psi)
Raw.StmtStruct t sp -> do
(t', quantify) <- glossTerm t
pure (quantify (Sem.TermSymbol (Sem.SymbolPredicate (Sem.PredicateNounStruct sp)) [t']))