forked from GitHub/gf-core
updates in Phrasebook and resources
This commit is contained in:
@@ -145,5 +145,11 @@ abstract Sentences = Numeral ** {
|
|||||||
|
|
||||||
ByTransp : Transport -> ByTransport ; -- by bus
|
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
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,8 @@ concrete SentencesBul of Sentences =
|
|||||||
NumeralBul ** SentencesI - [IMale, IFemale, YouFamMale, YouFamFemale, YouPolMale,
|
NumeralBul ** SentencesI - [IMale, IFemale, YouFamMale, YouFamFemale, YouPolMale,
|
||||||
YouPolFemale, ACitizen, Citizenship, PCitizenship,
|
YouPolFemale, ACitizen, Citizenship, PCitizenship,
|
||||||
LangNat, CitiNat, CountryNat, PropCit,
|
LangNat, CitiNat, CountryNat, PropCit,
|
||||||
Nationality, Country, Language, PLanguage, PCountry] with
|
Nationality, Country, Language, PLanguage, PCountry
|
||||||
|
] with
|
||||||
(Syntax = SyntaxBul),
|
(Syntax = SyntaxBul),
|
||||||
(Symbolic = SymbolicBul),
|
(Symbolic = SymbolicBul),
|
||||||
(Lexicon = LexiconBul) ** open ExtraBul, (R = ResBul) in {
|
(Lexicon = LexiconBul) ** open ExtraBul, (R = ResBul) in {
|
||||||
|
|||||||
@@ -133,6 +133,9 @@ incomplete concrete SentencesI of Sentences = Numeral **
|
|||||||
ABePlace p place = mkCl p.name place.at ;
|
ABePlace p place = mkCl p.name place.at ;
|
||||||
ByTransp t = t.by ;
|
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
|
oper
|
||||||
|
|
||||||
-- These operations are used internally in Sentences.
|
-- These operations are used internally in Sentences.
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ concrete WordsGer of Words = SentencesGer **
|
|||||||
Fresh = mkA "frisch" ;
|
Fresh = mkA "frisch" ;
|
||||||
Good = L.good_A ;
|
Good = L.good_A ;
|
||||||
Warm = L.warm_A ;
|
Warm = L.warm_A ;
|
||||||
Suspect = mkA "vermut" ;
|
Suspect = mkA "verdächtig" ;
|
||||||
|
|
||||||
-- places
|
-- places
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ Test:
|
|||||||
-- which can be provided by 'runghc Make present lang api langs=Eng' in lib/src/
|
-- which can be provided by 'runghc Make present lang api langs=Eng' in lib/src/
|
||||||
% gf QueryEng.gf
|
% gf QueryEng.gf
|
||||||
-- parse a sentence and see all variants
|
-- 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:
|
Regression test:
|
||||||
|
|
||||||
|
|||||||
@@ -103,7 +103,8 @@ lin
|
|||||||
iron_N = mk2N "jern" "jernet" ;
|
iron_N = mk2N "jern" "jernet" ;
|
||||||
john_PN = mkPN "John" utrum ;
|
john_PN = mkPN "John" utrum ;
|
||||||
king_N = mk2N "konge" "kongen" ;
|
king_N = mk2N "konge" "kongen" ;
|
||||||
know_V2 = dirV2 vide_V ;
|
know_V2 = dirV2 (mkV "kende" "kendte") ;
|
||||||
|
know_VS = mkVS vide_V ;
|
||||||
lake_N = mk2N "sø" "søen" ;
|
lake_N = mk2N "sø" "søen" ;
|
||||||
lamp_N = mk2N "lampe" "lampen" ;
|
lamp_N = mk2N "lampe" "lampen" ;
|
||||||
learn_V2 = dirV2 (mk2V "lære" "lærte") ;
|
learn_V2 = dirV2 (mk2V "lære" "lærte") ;
|
||||||
|
|||||||
@@ -16,9 +16,10 @@ concrete NounGer of Noun = CatGer ** open ResGer, Prelude in {
|
|||||||
isPron = False
|
isPron = False
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
UsePN pn = heavyNP {
|
UsePN pn = {
|
||||||
s = \\c => usePrepC c (\k -> pn.s ! k) ;
|
s = \\c => usePrepC c (\k -> pn.s ! k) ;
|
||||||
a = agrP3 Sg
|
a = agrP3 Sg ;
|
||||||
|
isPron = True --- means: this is not a heavy NP, but comes before negation
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
UsePron pron = {
|
UsePron pron = {
|
||||||
|
|||||||
@@ -101,7 +101,8 @@ lin
|
|||||||
iron_N = regGenN "jern" neutrum ;
|
iron_N = regGenN "jern" neutrum ;
|
||||||
john_PN = mkPN "John" masculine ;
|
john_PN = mkPN "John" masculine ;
|
||||||
king_N = regGenN "konge" masculine ;
|
king_N = regGenN "konge" masculine ;
|
||||||
know_V2 = dirV2 IrregNor.vite_V ;
|
know_V2 = dirV2 (mkV "kjenne" "kjente") ;
|
||||||
|
know_VS = mkVS IrregNor.vite_V ;
|
||||||
lake_N = regGenN "vann" neutrum ;
|
lake_N = regGenN "vann" neutrum ;
|
||||||
lamp_N = regGenN "lampe" feminine ;
|
lamp_N = regGenN "lampe" feminine ;
|
||||||
learn_V2 = dirV2 (mk2V "lære" "lærte") ;
|
learn_V2 = dirV2 (mk2V "lære" "lærte") ;
|
||||||
|
|||||||
@@ -100,7 +100,8 @@ lin
|
|||||||
industry_N = regN "industria" ;
|
industry_N = regN "industria" ;
|
||||||
iron_N = regN "fierro" ;
|
iron_N = regN "fierro" ;
|
||||||
king_N = regN "rey" ;
|
king_N = regN "rey" ;
|
||||||
know_V2 = dirV2 (verboV (saber_71 "saber")) ; -- conocer
|
know_V2 = mkV2 (verboV (conocer_25 "conocer")) ;
|
||||||
|
know_VS = mkVS (verboV (saber_71 "saber")) ;
|
||||||
lake_N = regN "lago" ;
|
lake_N = regN "lago" ;
|
||||||
lamp_N = regN "lámpara" ;
|
lamp_N = regN "lámpara" ;
|
||||||
learn_V2 = dirV2 (regV "aprender") ;
|
learn_V2 = dirV2 (regV "aprender") ;
|
||||||
|
|||||||
Reference in New Issue
Block a user