From c3ef27293aa3b20a479390407088bf214b675cd0 Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 5 Mar 2012 15:13:28 +0000 Subject: [PATCH] Phrasebook now compiles for Hin and Pes --- examples/phrasebook/Makefile | 4 ++-- examples/phrasebook/missing.txt | 2 ++ lib/src/api/SymbolicPes.gf | 2 +- lib/src/hindi/ExtraHinAbs.gf | 8 +++++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/examples/phrasebook/Makefile b/examples/phrasebook/Makefile index 365ad7a0d..3f99019a6 100644 --- a/examples/phrasebook/Makefile +++ b/examples/phrasebook/Makefile @@ -15,10 +15,10 @@ thaiscript: demo: compdemo fin linkdemo compdemo: - $(compile) -opt Bul Cat Dan Dut Eng Fre Ger Ita Nor Pol Ron Rus Spa Swe Tha Urd DisambPhrasebookEng + $(compile) -opt Bul Cat Dan Dut Eng Fre Ger Hin Ita Nor Pes Pol Ron Rus Spa Swe Tha Urd DisambPhrasebookEng linkdemo: - $(compile) -link Eng Bul Cat Dan Dut Fin Fre Ger Ita Nor Pol Ron Rus Spa Swe Tha Urd DisambPhrasebookEng + $(compile) -link Eng Bul Cat Dan Dut Fin Fre Ger Hin Ita Nor Pes Pol Ron Rus Spa Swe Tha Urd DisambPhrasebookEng linkdemothb: $(compile) -link Eng Bul Cat Dan Dut Fin Fre Ger Ita Nor Pol Ron Rus Spa Swe Tha Thb Urd DisambPhrasebookEng diff --git a/examples/phrasebook/missing.txt b/examples/phrasebook/missing.txt index 93d0b9d03..a90b4e95f 100644 --- a/examples/phrasebook/missing.txt +++ b/examples/phrasebook/missing.txt @@ -7,8 +7,10 @@ PhrasebookEng : PhrasebookFin : PhrasebookFre : ABusinessman ACook ADoctor AEngineer ALawyer AProfessor AStudent ATeacher Baht Beach Beef Chili Coke Durian Egg Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur PhrasebookGer : ABusinessman ACook ADoctor AEngineer ALawyer AModVerbPhrase AModVerbPhrasePlace AProfessor AStudent ATeacher Baht Beach Beef Chili Coke Durian Egg Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur +PhrasebookHin : ABusinessman ACook ADoctor AEngineer ALawyer AProfessor AScared AStudent ATeacher ATired Baht Beach Beef Chili Coke Durian Egg Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade MMust Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur PhrasebookIta : ABusinessman ACook ADoctor AEngineer ALawyer AProfessor AStudent ATeacher Baht Beach Beef Chili Coke Durian Egg Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade MCan MMust Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur PhrasebookNor : ABusinessman ACook ADoctor AEngineer ALawyer AProfessor AStudent ATeacher Baht Beach Beef Chili Coke Durian Egg Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur +PhrasebookPes : ABusinessman ACook ADoctor AEngineer AHasAge AHasChildren AHasRoom AHasTable ALawyer AProfessor AStudent ATeacher AmountCurrency Baht Beach Beef Belgian Chili Coke DrinkNumber Durian Egg Garlic IceCream ItCost ItsCold ItsRaining ItsWarm ItsWindy Lemonade MCan MKnow MMust Mango NNumeral Noodles ObjNumber ObjPlur OrangeJuice PNumber PPrice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur V2Wait VWait PhrasebookPol : ABusinessman ACook ADoctor AEngineer ALawyer AProfessor AStudent ATeacher Baht Beach Beef Chili Coke Durian Egg Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur PhrasebookRon : ABusinessman ACook ADoctor AEngineer ALawyer AProfessor AStudent ATeacher Baht Beach Beef Chili Coke Durian Egg Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur PhrasebookRus : ABusinessman ACook ADoctor AEngineer ALawyer AProfessor AStudent ATeacher Baht Beach Beef Belgian Belgium Chili Coke Durian Egg Flemish Garlic IceCream ItsCold ItsRaining ItsWarm ItsWindy Lemonade Mango Noodles ObjPlur OrangeJuice Pineapple Pork Rice Salad Shrimps Smoke SunShine Thai ThesPlur ThesePlur ThosePlur diff --git a/lib/src/api/SymbolicPes.gf b/lib/src/api/SymbolicPes.gf index 6a007eadf..5225856cc 100644 --- a/lib/src/api/SymbolicPes.gf +++ b/lib/src/api/SymbolicPes.gf @@ -1,4 +1,4 @@ ---# -path=.:present:mathematical:prelude +--# -path=.:alltenses:mathematical:prelude resource SymbolicPes = Symbolic with (Symbol = SymbolPes), diff --git a/lib/src/hindi/ExtraHinAbs.gf b/lib/src/hindi/ExtraHinAbs.gf index eb5662dea..0dcac547a 100644 --- a/lib/src/hindi/ExtraHinAbs.gf +++ b/lib/src/hindi/ExtraHinAbs.gf @@ -1,2 +1,8 @@ -abstract ExtraHinAbs = { +abstract ExtraHinAbs = Extra ** { + + fun + + each_Det : Det ; + have_V : V; + cost_V : V; }