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/Words.gf | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'examples/phrasebook/Words.gf') 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 -- cgit v1.2.3