diff options
| author | aarne <aarne@chalmers.se> | 2011-08-22 14:40:57 +0000 |
|---|---|---|
| committer | aarne <aarne@chalmers.se> | 2011-08-22 14:40:57 +0000 |
| commit | 7b4663067e24da662d3b2b02375d8bb7fb3cbedd (patch) | |
| tree | 157b4e2e3321877ff484795afc25e7c295b93862 /examples/phrasebook/WordsFin.gf | |
| parent | baee60d6cc171cc1b9e6ddd56786bb853909b372 (diff) | |
the from preposition in various Phrasebooks
Diffstat (limited to 'examples/phrasebook/WordsFin.gf')
| -rw-r--r-- | examples/phrasebook/WordsFin.gf | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/examples/phrasebook/WordsFin.gf b/examples/phrasebook/WordsFin.gf index 9f6fe16e3..e8dcfe9be 100644 --- a/examples/phrasebook/WordsFin.gf +++ b/examples/phrasebook/WordsFin.gf @@ -60,7 +60,7 @@ concrete WordsFin of Words = SentencesFin ** School = mkPlace (mkN "koulu") lla ; CitRestaurant cit = { - name = mkCN cit (mkN "ravintola") ; at = casePrep inessive ; to = casePrep illative; isPl = False + name = mkCN cit (mkN "ravintola") ; at = casePrep inessive ; to = casePrep illative; from = casePrep elative ; isPl = False } ; Parking = mkPlace (mkN "pysäköinti" (mkN "alue")) lla ; Supermarket = mkPlace (mkN "supermarket") ssa ; @@ -198,10 +198,10 @@ concrete WordsFin of Words = SentencesFin ** HowFar place = mkQS (mkQCl far_IAdv place.name) ; HowFarFrom x y = - mkQS (mkQCl far_IAdv (mkCl y.name (SyntaxFin.mkAdv from_Prep x.name))) ; + mkQS (mkQCl far_IAdv (mkCl y.name x.from)) ; HowFarFromBy x y t = mkQS (mkQCl far_IAdv (mkCl y.name - (mkVP (mkVP (SyntaxFin.mkAdv from_Prep x.name)) t))) ; + (mkVP (mkVP x.from) t))) ; HowFarBy place t = mkQS (mkQCl far_IAdv (mkCl place.name t)) ; -- mkQS (mkQCl (mkIAdv far_IAdv t) y.name) ; @@ -242,10 +242,11 @@ concrete WordsFin of Words = SentencesFin ** habitual = ParadigmsFin.mkAdv s } ; - mkPlace : N -> Bool -> {name : CN ; at : Prep ; to : Prep; isPl : Bool} = \p,e -> { + mkPlace : N -> Bool -> {name : CN ; at : Prep ; to : Prep; from : Prep ; isPl : Bool} = \p,e -> { name = mkCN p ; at = casePrep (if_then_else Case e adessive inessive) ; -- True: external to = casePrep (if_then_else Case e allative illative) ; + from = casePrep (if_then_else Case e ablative elative) ; isPl = False } ; ssa = False ; |