eliminated dependency of PhrasebookChi from DictionaryChi ; added 'make forApp' to compile what is needed for Phrasebook in App

examples/phrasebook/GreetingsChi.gf

@@ -1,20 +1,20 @@
 concrete GreetingsChi of Greetings =
 SentencesChi [Greeting,mkGreeting] **
-  open (D = DictionaryChi), ParadigmsChi, ResChi, Prelude in {
+open ParadigmsChi, ResChi, Prelude in {
 
 flags coding = utf8 ;
 
 lin
-  GBye = D.bye_Interj ;
+GBye = (mkInterj "再见" ) ;
-  GCheers = D.cheers_Interj ;
+GCheers = (mkInterj "干杯" ) ;
-  GDamn = D.damn_Interj ;
+GDamn = (mkInterj "该死的" ) ;
-  GExcuse, GExcusePol = D.excuse_me_Interj ;
+GExcuse, GExcusePol = (mkInterj "原谅我" ) ;
-  GGoodDay = D.hi_Interj ;
+GGoodDay = (mkInterj "你好" ) ;
-  GGoodEvening = D.good_evening_Interj ;
+GGoodEvening = (mkInterj "下午好" ) ;
-  GGoodMorning = D.good_morning_Interj ;
+GGoodMorning = (mkInterj "早上好" ) ;
-  GGoodNight = D.good_night_Interj ;
+GGoodNight = (mkInterj "晚安" ) ;
-  GGoodbye = D.goodbye_Interj ;
+GGoodbye = (mkInterj "再见" ) ;
-  GHello = D.hi_Interj ;
+GHello = (mkInterj "你好" ) ;
 GHelp = mkInterj "帮助" ;
 GHowAreYou = mkInterj "你好" ;
 GLookOut = mkInterj "留意" ;
@@ -22,11 +22,11 @@ lin
 GPleaseGive, GPleaseGivePol = mkInterj "请" ;
 GSeeYouSoon = mkInterj "很快再见" ;
 GSorry, GSorryPol = mkInterj "对不起" ;
-  GThanks = D.thanks_Interj ;
+GThanks = (mkInterj "谢谢" ) ;
 GTheCheck = mkInterj "检查" ;
 GCongratulations = mkInterj "祝贺您" ;
 GHappyBirthday = mkInterj "祝你生日快乐" ;
-  GGoodLuck = D.good_luck_Interj ;
+GGoodLuck = (mkInterj "祝你好运" ) ;
 GWhatTime = mkInterj "现在是什么时候" ;
 
 }

examples/phrasebook/Makefile

@@ -1,5 +1,9 @@
 compile = runghc Compile 
 
+forApp: compdemo fin Chi gfos
+
+.PHONY: gfos
+
 Chi:
 	$(compile) Chi
 

examples/phrasebook/PhrasebookChi.gf

@@ -1,4 +1,4 @@
---# -path=.:alltenses:../../lib/src/chinese:../../lib/src/translator
+--# -path=.:alltenses
 
 concrete PhrasebookChi of Phrasebook = 
   GreetingsChi,

examples/phrasebook/WordsChi.gf

@@ -4,7 +4,6 @@ concrete WordsChi of Words = SentencesChi **
 ParadigmsChi,
 (P = ParadigmsChi),
 (R = ResChi),
-      (D = DictionaryChi),
 (L = LexiconChi),
 Prelude in {
 
@@ -18,14 +17,14 @@ concrete WordsChi of Words = SentencesChi **
 Beer = mkCN L.beer_N ;
 Bread = mkCN L.bread_N ;
 Cheese = mkCN L.cheese_N ;
-    Chicken = mkCN D.chicken_N ;
+Chicken = mkCN (mkN "鸡" "只" ) ;
-    Coffee = mkCN D.coffee_N ;
+Coffee = mkCN (mkN "咖啡" ) ;
 Fish = mkCN L.fish_N ;
 Meat = mkCN L.meat_N ;
 Milk = mkCN L.milk_N ;
 Pizza = mkCN (mkN "比萨饼") ;
 Salt = mkCN L.salt_N ;
-    Tea = mkCN D.tea_N ;
+Tea = mkCN (mkN "茶" ) ;
 Water = mkCN L.water_N ;
 Wine = mkCN L.wine_N ;
 
@@ -33,12 +32,12 @@ concrete WordsChi of Words = SentencesChi **
 
 Bad = L.bad_A ;
 Boring = mkA "难吃" ;
-    Cheap = D.cheap_A ;
+Cheap = (mkA "廉价" ) ;
 Cold = L.cold_A ;
 Delicious = mkA "美味" ;
-    Expensive = D.expensive_A ;
+Expensive = (mkA "昂贵" ) ;
-    Fresh = D.fresh_A ;
+Fresh = (mkA "新鲜" ) ;
-    Good = D.good_A ;
+Good = (mkA "好" ) ;
 Suspect = mkA "可疑" ;
 Warm = L.warm_A ;
 
@@ -46,19 +45,19 @@ concrete WordsChi of Words = SentencesChi **
 -- also the directional preposition varies, but in English we use $to$, as
 -- defined by $mkPlace$.
 
-    Airport = mkPlace ((D.airport_N)) ;
+Airport = mkPlace (( (mkN "机场" ) )) ;
 AmusementPark = mkPlace (mkN "游乐园") ;
-    Bank = mkPlace ((D.bank_N)) ;
+Bank = mkPlace (( (L.bank_N ) )) ;
-    Bar = mkPlace ((D.bar_N)) ;
+Bar = mkPlace (( (mkN "酒吧" ) )) ;
-    Cafeteria = mkPlace ((D.bank_N)) ;
+Cafeteria = mkPlace (( (L.bank_N ) )) ;
 Center = mkPlace (mkN "中心") ;
 Cinema = mkPlace (mkN "电影院") ;
-    Church = mkPlace D.church_N ;
+Church = mkPlace (L.church_N ) ;
 Disco = mkPlace (mkN "迪斯科") ;
-    Hospital = mkPlace D.hospital_N ;
+Hospital = mkPlace (mkN "医院" ) ;
-    Hotel = mkPlace D.hotel_N ;
+Hotel = mkPlace (mkN "旅馆" ) ;
-    Museum = mkPlace D.museum_N ;
+Museum = mkPlace (mkN "博物馆" ) ;
-    Park = mkPlace D.park_N ;
+Park = mkPlace (mkN "公园" ) ;
 Parking = mkPlace (mkN "地方停车") ;
 Pharmacy = mkPlace (mkN "药店") ;
 PostOffice = mkPlace (mkN "邮局") ;
@@ -66,10 +65,10 @@ concrete WordsChi of Words = SentencesChi **
 Restaurant = mkPlace L.restaurant_N ;
 School = mkPlace L.school_N ;
 Shop = mkPlace L.shop_N ;
-    Station = mkPlace D.station_N ;
+Station = mkPlace (mkN "车站" ) ;
-    Supermarket = mkPlace D.supermarket_N ;
+Supermarket = mkPlace (mkN "超级市场" "家" ) ;
 Theatre = mkPlace (mkN "剧院") ;
-    Toilet = mkPlace D.toilet_N ;
+Toilet = mkPlace (mkN "厕所" ) ;
 University = mkPlace L.university_N ;
 Zoo = mkPlace (mkN "动物园") ;
 
@@ -113,7 +112,7 @@ concrete WordsChi of Words = SentencesChi **
 -- Means of transportation
 
 Bike = mkTransport L.bike_N ;
-   Bus = mkTransport D.bus_N ;
+Bus = mkTransport (mkN "公共汽车" ) ;
 Car = mkTransport L.car_N ;
 Ferry = mkTransport (mkN "渡船") ;
 Plane = mkTransport L.airplane_N ;
@@ -129,14 +128,14 @@ concrete WordsChi of Words = SentencesChi **
 AHasAge p nu = mkCl (lin NP {s = p.name.s ++ nu.s}) (mkV "岁") ; ----
 AHasChildren p num = mkCl p.name have_V2 (mkNP num L.child_N) ;
 AHasRoom p num = mkCl p.name have_V2
-      (mkNP (mkNP a_Det D.room_1_N) (SyntaxChi.mkAdv for_Prep (mkNP num D.person_N))) ;
+(mkNP (mkNP a_Det (mkN "房间" ) ) (SyntaxChi.mkAdv for_Prep (mkNP num (L.person_N ) ))) ;
 AHasTable p num = mkCl p.name have_V2
-      (mkNP (mkNP a_Det D.table_N) (SyntaxChi.mkAdv for_Prep (mkNP num D.person_N))) ;
+(mkNP (mkNP a_Det L.table_N ) (SyntaxChi.mkAdv for_Prep (mkNP num (L.person_N ) ))) ;
 AHasName p name = mkCl p.name (mkV2 "叫") name ;
 AHungry p = mkCl p.name (mkA "饿") ;
-    AIll p = mkCl p.name D.ill_A ;
+AIll p = mkCl p.name (mkA "生病" ) ;
 AKnow p = mkCl p.name <lin V L.know_V2 : V> ;
-    ALike p item = mkCl p.name D.like_V2 item ;
+ALike p item = mkCl p.name (L.like_V2 ) item ;
 ALive p co = mkCl p.name (mkV2 (mkV "住")) co ;
 ALove p q = mkCl p.name L.love_V2 q.name ;
 AMarried p = mkCl p.name (mkAP L.married_A2) ;
@@ -145,7 +144,7 @@ concrete WordsChi of Words = SentencesChi **
 ASpeak p lang = mkCl p.name L.speak_V2 lang ;
 AThirsty p = mkCl p.name (mkA "渴") ;
 ATired p = mkCl p.name (mkA "累") ;
-    AUnderstand p = mkCl p.name (lin V D.understand_V) ;
+AUnderstand p = mkCl p.name (lin V (mkV "理解" ) ) ;
 AWant p obj = mkCl p.name (mkV2 "要") obj ;
 AWantGo p place = mkCl p.name want_VV (mkVP (mkVP L.go_V) place.to) ;
 
@@ -156,11 +155,11 @@ concrete WordsChi of Words = SentencesChi **
 HowMuchCost item = lin QS {s = item.s ++ R.word "是多少呢"} ;
 ItCost item price = mkCl item (mkV2 "成本") price ;
 
-    PropOpen p = mkCl p.name D.open_A ;
+PropOpen p = mkCl p.name (mkA "开放" ) ;
 PropClosed p = mkCl p.name closed_A ;
-    PropOpenDate p d = mkCl p.name (mkVP (mkVP D.open_A) d) ; 
+PropOpenDate p d = mkCl p.name (mkVP (mkVP (mkA "开放" ) ) d) ;
 PropClosedDate p d = mkCl p.name (mkVP (mkVP closed_A) d) ;
-    PropOpenDay p d = mkCl p.name (mkVP (mkVP D.open_A) d.habitual) ; 
+PropOpenDay p d = mkCl p.name (mkVP (mkVP (mkA "开放" ) ) d.habitual) ;
 PropClosedDay p d = mkCl p.name (mkVP (mkVP closed_A) d.habitual) ;
 
 -- Building phrases from strings is complicated: the solution is to use
@@ -174,11 +173,11 @@ concrete WordsChi of Words = SentencesChi **
 -- below. Languages without productive genitives must use an equivalent of
 -- "ตหเ วิฝเ oฝ มย สoน" for non-pronouns.
 
-    Wife = xOf D.wife_N ;
+Wife = xOf (L.wife_N ) ;
-    Husband = xOf D.husband_N ;
+Husband = xOf (L.husband_N ) ;
-    Wife = xOf D.wife_N ;
+Wife = xOf (L.wife_N ) ;
-    Son = xOf D.son_N ;
+Son = xOf (mkN "儿子" ) ;
-    Daughter = xOf  D.daughter_N ;
+Daughter = xOf (mkN "女儿" ) ;
 Children = xOf L.child_N ; ----
 
 -- week days
@@ -197,9 +196,9 @@ concrete WordsChi of Words = SentencesChi **
 
 TheBest = mkSuperl L.good_A ;
 TheClosest = mkSuperl L.near_A ;
-   TheCheapest = mkSuperl D.cheap_A ;
+TheCheapest = mkSuperl (mkA "廉价" ) ;
-   TheMostExpensive = mkSuperl D.expensive_A ;
+TheMostExpensive = mkSuperl (mkA "昂贵" ) ;
-   TheMostPopular = mkSuperl D.popular_A ;
+TheMostPopular = mkSuperl (mkA "流行" ) ;
 TheWorst = mkSuperl L.bad_A ;
 
 SuperlPlace sup p = placeNP sup p ;
@@ -264,7 +263,7 @@ concrete WordsChi of Words = SentencesChi **
 -- howfar = lin IComp (ss ("ไกล" + "เท่า" + "ไร")) ; far = lin Adv (ss ("ไกล" + "เท่า" + "ไร")) ; how = lin IAdv (ss [])
 -- } ;
 
-    at_Prep = D.at_Prep ;
+at_Prep = (mkPrep "在" ) ;
 noPrep = mkPrep [] ;
 
 --------------------------------------------------