diff --git a/examples/phrasebook/Sentences.gf b/examples/phrasebook/Sentences.gf index 45b82f030..031253b9e 100644 --- a/examples/phrasebook/Sentences.gf +++ b/examples/phrasebook/Sentences.gf @@ -145,5 +145,11 @@ abstract Sentences = Numeral ** { ByTransp : Transport -> ByTransport ; -- by bus + AKnowSentence : Person -> Sentence -> Action ; -- you know that I am in the bar + AKnowPerson : Person -> Person -> Action ; -- you know me + +-- in Words, as long as Lexicon doesn't have it +-- AKnowQuestion : Person -> Question -> Action ; -- you know how far the bar is + } diff --git a/examples/phrasebook/SentencesBul.gf b/examples/phrasebook/SentencesBul.gf index d2f3eb17a..4f6d6317f 100644 --- a/examples/phrasebook/SentencesBul.gf +++ b/examples/phrasebook/SentencesBul.gf @@ -2,7 +2,8 @@ concrete SentencesBul of Sentences = NumeralBul ** SentencesI - [IMale, IFemale, YouFamMale, YouFamFemale, YouPolMale, YouPolFemale, ACitizen, Citizenship, PCitizenship, LangNat, CitiNat, CountryNat, PropCit, - Nationality, Country, Language, PLanguage, PCountry] with + Nationality, Country, Language, PLanguage, PCountry + ] with (Syntax = SyntaxBul), (Symbolic = SymbolicBul), (Lexicon = LexiconBul) ** open ExtraBul, (R = ResBul) in { diff --git a/examples/phrasebook/SentencesI.gf b/examples/phrasebook/SentencesI.gf index f871c7d06..334b7e92a 100644 --- a/examples/phrasebook/SentencesI.gf +++ b/examples/phrasebook/SentencesI.gf @@ -133,6 +133,9 @@ incomplete concrete SentencesI of Sentences = Numeral ** ABePlace p place = mkCl p.name place.at ; ByTransp t = t.by ; + AKnowSentence p s = mkCl p.name Lexicon.know_VS s ; + AKnowPerson p q = mkCl p.name Lexicon.know_V2 q.name ; + oper -- These operations are used internally in Sentences. diff --git a/examples/phrasebook/WordsGer.gf b/examples/phrasebook/WordsGer.gf index ad132e4f7..35fb3db1a 100644 --- a/examples/phrasebook/WordsGer.gf +++ b/examples/phrasebook/WordsGer.gf @@ -33,7 +33,7 @@ concrete WordsGer of Words = SentencesGer ** Fresh = mkA "frisch" ; Good = L.good_A ; Warm = L.warm_A ; - Suspect = mkA "vermut" ; + Suspect = mkA "verdächtig" ; -- places diff --git a/examples/query/README b/examples/query/README index 81442cd01..94ead32e7 100644 --- a/examples/query/README +++ b/examples/query/README @@ -19,7 +19,7 @@ Test: -- which can be provided by 'runghc Make present lang api langs=Eng' in lib/src/ % gf QueryEng.gf -- parse a sentence and see all variants - > "p "Bulgarian people working at Google" | l -all + > p "Bulgarian people working at Google" | l -all Regression test: