From a32f9664f6a2da857655cad1e0cdcbf26fbbea9f Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 1 Dec 2011 21:58:42 +0000 Subject: [PATCH] Nui's grammar error reports implemented in PhrasebookTha --- examples/phrasebook/Makefile | 10 +++---- examples/phrasebook/WordsEng.gf | 12 +++++++++ examples/phrasebook/WordsFin.gf | 11 ++++++++ examples/phrasebook/WordsTha.gf | 29 +++++++++++++++----- examples/phrasebook/missing.txt | 48 +++++++-------------------------- 5 files changed, 61 insertions(+), 49 deletions(-) diff --git a/examples/phrasebook/Makefile b/examples/phrasebook/Makefile index 7c9b871d9..e1a71c044 100644 --- a/examples/phrasebook/Makefile +++ b/examples/phrasebook/Makefile @@ -5,13 +5,13 @@ all: demo missing demo: compdemo fin linkdemo compdemo: - $(compile) Bul Dan Dut Nor Pol Spa - $(compile) -opt Cat Eng Fre Ger Rus Swe Tha Urd DisambPhrasebookEng -# $(compile) -opt Bul Cat Dan Dut Eng Fre Ger Ita Nor Pol Ron Rus Spa Swe Tha Urd DisambPhrasebookEng +# $(compile) Bul Dan Dut Nor Pol Spa +# $(compile) -opt Cat Eng Fre Ger Rus Swe Tha Urd DisambPhrasebookEng + $(compile) -opt Bul Cat Dan Dut Eng Fre Ger Ita Nor Pol Ron Rus Spa Swe Tha Urd DisambPhrasebookEng linkdemo: - $(compile) -link Eng Bul Cat Dan Dut Fin Fre Ger Ita Nor Pol Rus Spa Swe Tha Urd DisambPhrasebookEng -# $(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 Ita Nor Pol Rus Spa Swe Tha Urd DisambPhrasebookEng + $(compile) -link Eng Bul Cat Dan Dut Fin Fre Ger Ita Nor Pol Ron Rus Spa Swe Tha Urd DisambPhrasebookEng #separate, because slow... fin: diff --git a/examples/phrasebook/WordsEng.gf b/examples/phrasebook/WordsEng.gf index 91a6bb871..387ff1863 100644 --- a/examples/phrasebook/WordsEng.gf +++ b/examples/phrasebook/WordsEng.gf @@ -279,6 +279,18 @@ concrete WordsEng of Words = SentencesEng ** Pineapple = mkCN (mkN "pineapple") ; Coke = mkCN (mkN "coke") ; IceCream = mkCN (mkN "ice cream") ; + Salad = mkCN (mkN "salad") ; + OrangeJuice = mkCN (mkN "orange juice") ; + Lemonade = mkCN (mkN "lemonade") ; + Beach = mkPlace "beach" "on" ; + ItsRaining = mkCl (progressiveVP (mkVP L.rain_V0)) ; + ItsCold = mkCl (mkVP L.cold_A) ; + ItsWarm = mkCl (mkVP L.warm_A) ; + ItsWindy = mkCl (mkVP (P.mkA "windy")) ; + SunShine = mkCl (mkNP the_Det L.sun_N) (progressiveVP (mkVP shine_V)) ; + + Smoke = mkVP (P.mkV "smoke") ; + } diff --git a/examples/phrasebook/WordsFin.gf b/examples/phrasebook/WordsFin.gf index 97e11f827..98a2e334d 100644 --- a/examples/phrasebook/WordsFin.gf +++ b/examples/phrasebook/WordsFin.gf @@ -289,6 +289,7 @@ concrete WordsFin of Words = SentencesFin ** Rice = mkCN (mkN "riisi") ; Pork = mkCN (mkN "sika") ; Beef = mkCN (mkN "nauta") ; + Egg = mkCN L.egg_N ; Noodles = mkCN (mkN "nuudeli" "nuudeleita") ; Shrimps = mkCN (mkN "katka" (mkN "rapu")) ; Chili = mkCN (mkN "chili") ; @@ -298,7 +299,17 @@ concrete WordsFin of Words = SentencesFin ** Pineapple = mkCN (mkN "ananas" "ananaksia") ; Coke = mkCN (mkN "coca-cola") ; IceCream = mkCN (mkN "jäätelö" "jäätelöitä") ; + Salad = mkCN (mkN "salaatti") ; + OrangeJuice = mkCN (mkN "appelsiini" (mkN "mehu")) ; + Lemonade = mkCN (mkN "limsa") ; + Beach = mkPlace (mkN "uima" (mkN "ranta")) lla ; + ItsRaining = mkCl (mkVP L.rain_V0) ; + ItsCold = mkCl (mkVP L.cold_A) ; + ItsWarm = mkCl (mkVP L.warm_A) ; + ItsWindy = mkCl (mkVP (mkV "tuulla")) ; + SunShine = mkCl (mkNP the_Det L.sun_N) (mkVP (mkV "paistaa")) ; + Smoke = mkVP (mkV "tupakoida") ; } diff --git a/examples/phrasebook/WordsTha.gf b/examples/phrasebook/WordsTha.gf index 726f12a98..0762706b3 100644 --- a/examples/phrasebook/WordsTha.gf +++ b/examples/phrasebook/WordsTha.gf @@ -209,18 +209,22 @@ concrete WordsTha of Words = SentencesTha ** -- transports - HowFar place = mkQS (mkQCl far_IAdv place.name) ; + HowFar place = mkQS (mkQCl howFar.how (mkNP place.name howFar.far)) ; + HowFarFrom x y = - mkQS (mkQCl far_IAdv (mkCl y.name (SyntaxTha.mkAdv from_Prep x.name))) ; + mkQS (mkQCl howFar.how (mkCl (mkNP y.name howFar.far) (SyntaxTha.mkAdv from_Prep x.name))) ; + HowFarFromBy x y t = - mkQS (mkQCl far_IAdv (mkCl y.name (SyntaxTha.mkAdv from_Prep (mkNP x.name t)))) ; - HowFarBy y t = mkQS (mkQCl far_IAdv (mkCl y.name t)) ; + mkQS (mkQCl howFar.how (mkCl (mkNP y.name howFar.far) + (SyntaxTha.mkAdv from_Prep (mkNP x.name t)))) ; + + HowFarBy y t = mkQS (mkQCl howFar.how (mkCl (mkNP y.name howFar.far) t)) ; WhichTranspPlace trans place = mkQS (mkQCl (mkIP which_IDet trans.name) (mkVP (mkVP L.go_V) place.to)) ; IsTranspPlace trans place = - mkQS (mkQCl (mkCl (mkCN trans.name place.to))) ; + mkQS (mkQCl (mkCl (mkCN (mkCN trans.name (mkSC (mkVP L.go_V))) place.to))) ; @@ -258,7 +262,9 @@ concrete WordsTha of Words = SentencesTha ** mkCurrency : Str -> CN = \s -> mkCN (mkN [] s) ; ---- just a classifier - far_IAdv = lin IAdv (ss (R.thword "āđ„āļāļĨ" "āđ€āļ—āđˆāļē" "āđ„āļĢ")) ; + howFar : {far : Adv ; how : IAdv} = { + far = lin Adv (ss "āđ„āļāļĨ") ; how = lin IAdv (ss ("āđ€āļ—āļē" + "āđ„āļĢ")) + } ; at_Prep = mkPrep "āļ—āļĩāđˆ" ; noPrep = mkPrep [] ; @@ -284,7 +290,18 @@ concrete WordsTha of Words = SentencesTha ** Pineapple = mkCN (mkN (R.thword "āļŠāļąāļš" "āļ›āļ°" "āļĢāļ”")) ; Coke = mkCN (mkN ("āđ‚āļ„āđ‰āļ")) ; IceCream = mkCN (mkN (R.thword "āđ„āļ­" "āļĻ" "āļāļĢāļĩāļĄ")) ; + Salad = mkCN (mkN "āļŠāļĨāļąāļ”") ; + OrangeJuice = mkCN (mkN (R.thword "āļ™āđ‰āļģ" "āļŠāđ‰āļĄ" "āļ„āļąāđ‰āļ™")) ; + Lemonade = mkCN (mkN (R.thword "āļ™āđ‰āļģ" "āļĄāļ°" "āļ™āļēāļ§")) ; Beach = mkPlace (placeN (R.thword "āļŦāļēāļ”")) ; + ItsRaining = mkCl (mkVP L.rain_V0) ; + ItsCold = mkCl (mkVP L.cold_A) ; + ItsWarm = mkCl (mkVP L.warm_A) ; + ItsWindy = mkCl (mkVP (P.mkA (R.thword "āļĨāļĄ" "āļˆāļąāļ”"))) ; + SunShine = mkCl (mkNP the_Det L.sun_N) (mkVP (R.regV "āļ‰āļēāļĒ")) ; + + Smoke = mkVP (P.mkV (R.thword "āļŠāļđāļš" "āļšāļļ" "āļĢāļĩ")) ; + } diff --git a/examples/phrasebook/missing.txt b/examples/phrasebook/missing.txt index 83026b33f..93df097d8 100644 --- a/examples/phrasebook/missing.txt +++ b/examples/phrasebook/missing.txt @@ -1,41 +1,13 @@ -v v v v v v v DisambPhrasebookEng : -PhrasebookBul : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -PhrasebookCat : Baht Beach Beef Chili Coke Durian Garlic IceCream MMust Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -PhrasebookDan : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -PhrasebookDut : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -************* -DisambPhrasebookEng : -PhrasebookBul : Baht Beef Durian Mango Pineapple Pork Rice Thai -PhrasebookCat : Baht Beef Durian MMust Mango Pineapple Pork Rice Thai -PhrasebookDan : Baht Beef Durian Mango Pineapple Pork Rice Thai -PhrasebookDut : Baht Beef Durian Mango Pineapple Pork Rice Thai -^ ^ ^ ^ ^ ^ ^ PhrasebookEng : -v v v v v v v -PhrasebookFin : -PhrasebookFre : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -PhrasebookGer : AModVerbPhrase AModVerbPhrasePlace Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -PhrasebookIta : Baht Beach Beef Chili Coke Durian Garlic IceCream MCan MMust Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -PhrasebookNor : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -PhrasebookPol : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -PhrasebookRon : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -PhrasebookRus : Baht Beach Beef Belgian Belgium Chili Coke Durian Flemish Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -PhrasebookSpa : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -PhrasebookSwe : +PhrasebookFre : 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 : AModVerbPhrase AModVerbPhrasePlace 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 +PhrasebookIta : 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 : 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 +PhrasebookPol : 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 : 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 : 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 +PhrasebookSpa : 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 +PhrasebookSwe : Egg ItsCold ItsRaining ItsWarm ItsWindy Lemonade OrangeJuice Salad Smoke SunShine PhrasebookTha : -PhrasebookUrd : Baht Beach Beef Chili Coke Durian Garlic IceCream MMust Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur -************* -PhrasebookFin : Baht Beef Durian Mango Pineapple Pork Rice Thai -PhrasebookFre : Baht Beef Durian Mango Pineapple Pork Rice Thai -PhrasebookGer : AModVerbPhrase AModVerbPhrasePlace Baht Beef Durian Mango Pineapple Pork Rice Thai -PhrasebookIta : Baht Beef Durian MCan MMust Mango Pineapple Pork Rice Thai -PhrasebookNor : Baht Beef Durian Mango Pineapple Pork Rice Thai -PhrasebookPol : Baht Beef Durian Mango Pineapple Pork Rice Thai -PhrasebookRon : Baht Beef Durian Mango Pineapple Pork Rice Thai -PhrasebookRus : Baht Beef Belgian Belgium Durian Flemish Mango Pineapple Pork Rice Thai -PhrasebookSpa : Baht Beef Durian Mango Pineapple Pork Rice Thai -PhrasebookSwe : Baht Beef Durian Mango Pineapple Pork Rice Thai -PhrasebookTha : -PhrasebookUrd : Baht Beef Durian MMust Mango Pineapple Pork Rice Thai -^ ^ ^ ^ ^ ^ ^ +PhrasebookUrd : 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