diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2013-05-30 13:16:35 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2013-05-30 13:16:35 +0000 |
| commit | 51ae8bbce18d4af930f79d22293c9dc7614a9e3d (patch) | |
| tree | ac9bc25ba7fe16554176871b73b1a4c841e6f2a0 /examples/phrasebook | |
| parent | 0893473aaca085d2bfc12cd404940c27c2a0b64e (diff) | |
the Bulgarian phrasebook works again
Diffstat (limited to 'examples/phrasebook')
| -rw-r--r-- | examples/phrasebook/SentencesBul.gf | 10 | ||||
| -rw-r--r-- | examples/phrasebook/WordsBul.gf | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/examples/phrasebook/SentencesBul.gf b/examples/phrasebook/SentencesBul.gf index 4f6d6317f..1b5d453c7 100644 --- a/examples/phrasebook/SentencesBul.gf +++ b/examples/phrasebook/SentencesBul.gf @@ -29,8 +29,14 @@ lin YouFamMale = mkPerson youSg_Pron ; lin ACitizen p cit = let noun : N = case p.name.a.gn of { - R.GSg g => lin N {s = \\nf => cit.s1 ! g ! nf; g = case g of {R.Masc=>R.AMasc R.Human; R.Fem=>R.AFem; R.Neut=>R.ANeut}} ; - R.GPl => lin N {s = \\nf => cit.s1 ! R.Masc ! nf; g = R.AMasc R.Human} + R.GSg g => lin N {s = \\nf => cit.s1 ! g ! nf; + rel = cit.s2.s; + g = case g of {R.Masc=>R.AMasc R.Human; R.Fem=>R.AFem; R.Neut=>R.ANeut} + } ; + R.GPl => lin N {s = \\nf => cit.s1 ! R.Masc ! nf; + rel = cit.s2.s; + g = R.AMasc R.Human + } } ; in mkCl p.name noun ; diff --git a/examples/phrasebook/WordsBul.gf b/examples/phrasebook/WordsBul.gf index c71af5c01..18772fa7d 100644 --- a/examples/phrasebook/WordsBul.gf +++ b/examples/phrasebook/WordsBul.gf @@ -148,7 +148,7 @@ concrete WordsBul of Words = SentencesBul ** })) ; AReady p = mkCl p.name (mkA076 "готов") ; AScared p = mkCl p.name (mkA076 "уплашен") ; - ASpeak p lang = mkCl p.name (dirV2 (stateV (mkV173 "говоря"))) (mkNP (adj2noun lang)) ; + ASpeak p lang = mkCl p.name (dirV2 (stateV (mkV173 "говоря"))) (mkNP (substantiveN lang (R.AMasc R.NonHuman))) ; AThirsty p = mkCl p.name (mkA079 "жаден") ; ATired p = mkCl p.name (mkA076 "уморен") ; AUnderstand p = mkCl p.name (actionV (mkV186 "разбирам") (mkV170 "разбера")) ; @@ -291,10 +291,6 @@ concrete WordsBul of Words = SentencesBul ** xOf : GNumber -> N -> NPPerson -> NPPerson = \n,x,p -> relativePerson n (mkCN x) (\a,b,c -> mkNP (mkNP the_Quant a c) (SyntaxBul.mkAdv (mkPrep "" R.Dat) b)) p ; - adj2noun : A -> N ; - adj2noun a = let g = R.AMasc R.NonHuman - in lin N {s = \\nf => a.s ! R.nform2aform nf g; g = g} ; - mkTransport : N -> {name : CN ; by : Adv} = \n -> { name = mkCN n ; by = SyntaxBul.mkAdv with_Prep (mkNP n) |