From 28e50b0f5f6c2c39ec1545786b1234616fe95e2c Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 18 Jun 2014 15:38:11 +0000 Subject: [PATCH] quick hack: changed cat name Language to LAnguage in Phrasebook to avoid clash with Construction.Language in App --- examples/phrasebook/Sentences.gf | 6 +++--- examples/phrasebook/SentencesBul.gf | 4 ++-- examples/phrasebook/SentencesGer.gf | 4 ++-- examples/phrasebook/SentencesI.gf | 2 +- examples/phrasebook/SentencesPol.gf | 2 +- examples/phrasebook/Words.gf | 10 ++++++++-- examples/phrasebook/WordsEng.gf | 6 ++++++ examples/phrasebook/WordsSwe.gf | 8 +++++++- 8 files changed, 30 insertions(+), 12 deletions(-) diff --git a/examples/phrasebook/Sentences.gf b/examples/phrasebook/Sentences.gf index da15031db..6798c2127 100644 --- a/examples/phrasebook/Sentences.gf +++ b/examples/phrasebook/Sentences.gf @@ -36,7 +36,7 @@ abstract Sentences = Numeral ** { Person ; -- agent wanting or doing something e.g. "you" Action ; -- proposition about a Person e.g. "you are here" Nationality ; -- complex of language, property, country e.g. "Swedish, Sweden" - Language ; -- language (can be without nationality) e.g. "Flemish" + LAnguage ; -- language (can be without nationality) e.g. "Flemish" Citizenship ; -- property (can be without language) e.g. "Belgian" Country ; -- country (can be without language) e.g. "Belgium" Day ; -- weekday type e.g. "Friday" @@ -75,7 +75,7 @@ abstract Sentences = Numeral ** { PPlace : Place -> Word ; PPlaceKind : PlaceKind -> Word ; PCurrency : Currency -> Word ; - PLanguage : Language -> Word ; + PLanguage : LAnguage -> Word ; PCitizenship : Citizenship -> Word ; PCountry : Country -> Word ; PDay : Day -> Word ; @@ -142,7 +142,7 @@ abstract Sentences = Numeral ** { YouFamMale, YouFamFemale, -- familiar you, said to man/woman (affects agreement) YouPolMale, YouPolFemale : Person ; -- polite you, said to man/woman (affects agreement) - LangNat : Nationality -> Language ; -- Swedish + LangNat : Nationality -> LAnguage ; -- Swedish CitiNat : Nationality -> Citizenship ; -- Swedish CountryNat : Nationality -> Country ; -- Sweden PropCit : Citizenship -> Property ; -- Swedish diff --git a/examples/phrasebook/SentencesBul.gf b/examples/phrasebook/SentencesBul.gf index 1b5d453c7..cf886f27d 100644 --- a/examples/phrasebook/SentencesBul.gf +++ b/examples/phrasebook/SentencesBul.gf @@ -2,7 +2,7 @@ concrete SentencesBul of Sentences = NumeralBul ** SentencesI - [IMale, IFemale, YouFamMale, YouFamFemale, YouPolMale, YouPolFemale, ACitizen, Citizenship, PCitizenship, LangNat, CitiNat, CountryNat, PropCit, - Nationality, Country, Language, PLanguage, PCountry + Nationality, Country, LAnguage, PLanguage, PCountry ] with (Syntax = SyntaxBul), (Symbolic = SymbolicBul), @@ -16,7 +16,7 @@ lincat s2 : A; -- furthermore, adjective for Property s3 : PN -- country name } ; - Language = A ; + LAnguage = A ; Country = PN ; lin IMale = mkPerson i_Pron ; diff --git a/examples/phrasebook/SentencesGer.gf b/examples/phrasebook/SentencesGer.gf index 71f674d29..cc0922d5f 100644 --- a/examples/phrasebook/SentencesGer.gf +++ b/examples/phrasebook/SentencesGer.gf @@ -2,7 +2,7 @@ concrete SentencesGer of Sentences = NumeralGer ** SentencesI - [PYesToNo,SHaveNo,SHaveNoMass, Proposition, Action, Is, IsMass, SProp, SPropNot, QProp, AHaveCurr, ACitizen, ABePlace, AKnowSentence, AKnowPerson, AKnowQuestion, - Nationality, Language, + Nationality, LAnguage, ADoVerbPhrase, AModVerbPhrase, ADoVerbPhrasePlace, AModVerbPhrasePlace, YouPlurPolMale, YouPlurPolFemale ] with @@ -38,7 +38,7 @@ concrete SentencesGer of Sentences = NumeralGer ** SentencesI - lincat Nationality = {lang : CN ; country : NP ; prop : A} ; - Language = CN ; -- kein Deutsch + LAnguage = CN ; -- kein Deutsch -- the new things lin diff --git a/examples/phrasebook/SentencesI.gf b/examples/phrasebook/SentencesI.gf index ae4b281bb..528ea8584 100644 --- a/examples/phrasebook/SentencesI.gf +++ b/examples/phrasebook/SentencesI.gf @@ -34,7 +34,7 @@ incomplete concrete SentencesI of Sentences = Numeral ** Action = Cl ; Person = NPPerson ; -- {name : NP ; isPron : Bool ; poss : Quant} ; Nationality = NPNationality ; -- {lang : NP ; country : NP ; prop : A} ; - Language = NP ; + LAnguage = NP ; Citizenship = A ; Country = NP ; Day = NPDay ; -- {name : NP ; point : Syntax.Adv ; habitual : Syntax.Adv} ; diff --git a/examples/phrasebook/SentencesPol.gf b/examples/phrasebook/SentencesPol.gf index eebb820e2..66a6c473e 100644 --- a/examples/phrasebook/SentencesPol.gf +++ b/examples/phrasebook/SentencesPol.gf @@ -1,6 +1,6 @@ concrete SentencesPol of Sentences = NumeralPol ** SentencesI - [ - Day,PDay,OnDay,Language,PLanguage,Citizenship, + Day,PDay,OnDay,LAnguage,PLanguage,Citizenship, PCitizenship,CitiNat,PropCit,ACitizen, Nationality,Transport,PTransport,ByTransp, IFemale,YouFamFemale, YouPolFemale,YouPolMale, diff --git a/examples/phrasebook/Words.gf b/examples/phrasebook/Words.gf index 278bd3954..08704990a 100644 --- a/examples/phrasebook/Words.gf +++ b/examples/phrasebook/Words.gf @@ -78,8 +78,10 @@ abstract Words = Sentences ** { NorwegianCrown : Currency ; Pound : Currency ; -- UK Rouble : Currency ; -- Russia + Rupee : Currency ; -- India SwedishCrown : Currency ; Zloty : Currency ; -- Poland + Yuan : Currency ; -- China -- nationalities, countries, languages, citizenships @@ -88,13 +90,17 @@ abstract Words = Sentences ** { Belgium : Country ; Bulgarian : Nationality ; Catalan : Nationality ; + Chinese : Nationality ; Danish : Nationality ; Dutch : Nationality ; English : Nationality ; Finnish : Nationality ; - Flemish : Language ; + Flemish : LAnguage ; French : Nationality ; German : Nationality ; + Hindi : LAnguage ; + India : Country ; + Indian : Citizenship ; Italian : Nationality ; Norwegian : Nationality ; Polish : Nationality ; @@ -135,7 +141,7 @@ abstract Words = Sentences ** { AMarried : Person -> Action ; -- I am married AReady : Person -> Action ; -- I am ready AScared : Person -> Action ; -- I am scared - ASpeak : Person -> Language -> Action ; -- I speak Finnish + ASpeak : Person -> LAnguage -> Action ; -- I speak Finnish AThirsty : Person -> Action ; -- I am thirsty ATired : Person -> Action ; -- I am tired AUnderstand : Person -> Action ; -- I (don't) understand diff --git a/examples/phrasebook/WordsEng.gf b/examples/phrasebook/WordsEng.gf index cd6a23b1d..ca8a55172 100644 --- a/examples/phrasebook/WordsEng.gf +++ b/examples/phrasebook/WordsEng.gf @@ -85,8 +85,10 @@ concrete WordsEng of Words = SentencesEng ** NorwegianCrown = mkCN (mkA "Norwegian") (mkN "crown") | mkCN (mkN "crown") ; Pound = mkCN (mkN "pound") ; Rouble = mkCN (mkN "rouble") ; + Rupee = mkCN (mkN "rupee") ; SwedishCrown = mkCN (mkA "Swedish") (mkN "crown") | mkCN (mkN "crown") ; Zloty = mkCN (mkN "zloty" "zloty") ; + Yuan = mkCN (mkN "yuan" "yuan") ; -- Nationalities @@ -94,6 +96,7 @@ concrete WordsEng of Words = SentencesEng ** Belgium = mkNP (mkPN "Belgium") ; Bulgarian = mkNat "Bulgarian" "Bulgaria" ; Catalan = mkNPNationality (mkNP (mkPN "Catalan")) (mkNP (mkPN "Catalonia")) (mkA "Catalonian") ; + Chinese = mkNat "Chinese" "China" ; Danish = mkNat "Danish" "Denmark" ; Dutch = mkNPNationality (mkNP (mkPN "Dutch")) (mkNP the_Quant (mkN "Netherlands")) (mkA "Dutch") ; English = mkNat "English" "England" ; @@ -101,6 +104,9 @@ concrete WordsEng of Words = SentencesEng ** Flemish = mkNP (mkPN "Flemish") ; French = mkNat "French" "France" ; German = mkNat "German" "Germany" ; + Hindi = mkNP (mkPN "Hindi") ; + India = mkNP (mkPN "India") ; + Indian = mkA "Indian" ; Italian = mkNat "Italian" "Italy" ; Norwegian = mkNat "Norwegian" "Norway" ; Polish = mkNat "Polish" "Poland" ; diff --git a/examples/phrasebook/WordsSwe.gf b/examples/phrasebook/WordsSwe.gf index 5c4eca32c..ce22964c7 100644 --- a/examples/phrasebook/WordsSwe.gf +++ b/examples/phrasebook/WordsSwe.gf @@ -78,8 +78,10 @@ concrete WordsSwe of Words = SentencesSwe ** NorwegianCrown = mkCN (mkA "norsk") (mkN "krona") | mkCN (mkN "krona") ; Pound = mkCN (mkN "pund" "pund") ; ---- ett pund ? Rouble = mkCN (mkN "rubel" "rubeln" "rubel" "rubeln") ; ---- ? + Rupee = mkCN (mkN "rupee" "rupee") ; ---- SwedishCrown = mkCN (mkA "svensk") (mkN "krona") | mkCN (mkN "krona") ; Zloty = mkCN (mkN "zloty" "zloty") ; + Yuan = mkCN (mkN "yuan" "yuan") ; -- nationalities @@ -87,13 +89,17 @@ concrete WordsSwe of Words = SentencesSwe ** Belgium = mkNP (mkPN "Belgien") ; Bulgarian = mkNat "bulgarisk" "Bulgarien" ; Catalan = mkNat "katalansk" "Katalonien" ; + China = mkNat "kinesisk" "Kina" ; Danish = mkNat "dansk" "Danmark" ; Dutch = mkNat "nederländsk" "Nederländerna" ; English = mkNat "engelsk" "England" ; Finnish = mkNat "finsk" "Finland" ; Flemish = mkNP (mkPN "flamländska") ; French = mkNat "fransk" "Frankrike" ; - German = mkNat "tysk" "Tyskland" ; + German = mkNat "tysk" "Tyskland" ; + Hindi = mkNP (mkPN "hindi") ; + Indian = mkA "indisk" ; + India = mkNP (mkPN "Indien") ; Italian = mkNat "italiensk" "Italien" ; Norwegian = mkNat "norsk" "Norge" ; Polish = mkNat "polsk" "Polen" ;