diff options
| author | aarne <aarne@chalmers.se> | 2014-06-18 15:38:11 +0000 |
|---|---|---|
| committer | aarne <aarne@chalmers.se> | 2014-06-18 15:38:11 +0000 |
| commit | 28e50b0f5f6c2c39ec1545786b1234616fe95e2c (patch) | |
| tree | a845d4c97e06c605a2174ddf077df05252988bc9 /examples/phrasebook/Sentences.gf | |
| parent | fa33096e6d6832e45d73d3afc7b124a95e9d8244 (diff) | |
quick hack: changed cat name Language to LAnguage in Phrasebook to avoid clash with Construction.Language in App
Diffstat (limited to 'examples/phrasebook/Sentences.gf')
| -rw-r--r-- | examples/phrasebook/Sentences.gf | 6 |
1 files changed, 3 insertions, 3 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 |