diff options
| author | aarne <aarne@chalmers.se> | 2012-08-28 11:29:54 +0000 |
|---|---|---|
| committer | aarne <aarne@chalmers.se> | 2012-08-28 11:29:54 +0000 |
| commit | 27196778ace6de265407947a21a5b0eb3fd0caf8 (patch) | |
| tree | 54610ef927680dd443edc2b5c34d24a4a09a3293 /examples | |
| parent | 7862bfb15b06447ae177d2a2fe468ea014e7e67a (diff) | |
added Lav in compilation; commented out extensions of Words that are only available for a fraction of languages; fixed a couple of type errors in WordsLav, to be checked
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/phrasebook/Makefile | 4 | ||||
| -rw-r--r-- | examples/phrasebook/Words.gf | 2 | ||||
| -rw-r--r-- | examples/phrasebook/WordsLav.gf | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/examples/phrasebook/Makefile b/examples/phrasebook/Makefile index 3f99019a6..5fdddaabc 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 Hin Ita Nor Pes Pol Ron Rus Spa Swe Tha Urd DisambPhrasebookEng + $(compile) -opt Bul Cat Dan Dut Eng Fre Ger Hin Ita Lav Nor Pes Pol Ron Rus Spa Swe Tha Urd DisambPhrasebookEng linkdemo: - $(compile) -link Eng Bul Cat Dan Dut Fin Fre Ger Hin Ita Nor Pes Pol Ron Rus Spa Swe Tha Urd DisambPhrasebookEng + $(compile) -link Eng Bul Cat Dan Dut Fin Fre Ger Hin Ita Lav 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/Words.gf b/examples/phrasebook/Words.gf index 7dccbc7c1..278bd3954 100644 --- a/examples/phrasebook/Words.gf +++ b/examples/phrasebook/Words.gf @@ -199,6 +199,7 @@ abstract Words = Sentences ** { -------------------------------------------------- -- New 30/11/2011 AR -------------------------------------------------- +{- 28/8/2012 still only available in Bul Eng Fin Swe Tha fun Thai : Nationality ; @@ -242,5 +243,6 @@ abstract Words = Sentences ** { ACook : Person -> Action ; AStudent : Person -> Action ; ABusinessman : Person -> Action ; +-} } diff --git a/examples/phrasebook/WordsLav.gf b/examples/phrasebook/WordsLav.gf index 66eb134ad..a78d97abb 100644 --- a/examples/phrasebook/WordsLav.gf +++ b/examples/phrasebook/WordsLav.gf @@ -157,8 +157,9 @@ in { ATired p = mkCl p.name (mkA (mkV "nogurt" "nogurstu" "noguru")) ; AUnderstand p = mkCl p.name (mkV "saprast" "saprotu" "sapratu") ; AWant p obj = mkCl p.name (mkV2 (mkV "vēlēties" third_conjugation) acc_Prep) obj ; - AWantGo p place = mkCl p.name (mkV "vēlēties" third_conjugation) (mkVP (mkVP (mkV "doties" "dodos" "devos")) place.to) ; - + AWantGo p place = mkCl p.name (mkVV (mkV "vēlēties" third_conjugation)) (mkVP (mkVP (mkV "doties" "dodos" "devos")) place.to) ; + ---- mkVV by AR 28/8/2012 + -- Miscellaneous QWhatName p = mkQS (mkQCl whatSg_IP (mkVP (nameOf p))) ; @@ -236,8 +237,8 @@ in { -- isPl : Bool --} = \comp,p,i -> mkCNPlace (mkCN (P.mkN comp (mkN p))) i to_Prep ; - mkPlace : Str -> Prep -> {name : CN ; at : Prep ; to : Prep ; isPl : Bool} = \p,i -> - mkCNPlace (mkCN (mkN p)) i to8uz_Prep ; + mkPlace : Str -> Prep -> {name : CN ; at : SyntaxLav.Prep ; to : SyntaxLav.Prep ; isPl : Bool} = \p,i -> + mkCNPlace (mkCN (mkN p)) i to8uz_Prep ; ---- SyntaxLav.Prep by AR 28/8/2012 open_A = P.mkA "atvērts" ; |