From 28e50b0f5f6c2c39ec1545786b1234616fe95e2c Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 18 Jun 2014 15:38:11 +0000 Subject: quick hack: changed cat name Language to LAnguage in Phrasebook to avoid clash with Construction.Language in App --- examples/phrasebook/Sentences.gf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/phrasebook/Sentences.gf') 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 -- cgit v1.2.3