diff options
| author | odanoburu <bcclaro@gmail.com> | 2018-06-20 12:33:05 -0300 |
|---|---|---|
| committer | odanoburu <bcclaro@gmail.com> | 2018-06-20 12:33:05 -0300 |
| commit | f0672679535e59c53ed68729bbb5a201ce507b02 (patch) | |
| tree | 839216d85c207fc4d8fc0565466899ff4a41d5b1 /examples/phrasebook | |
| parent | 8b05ed9469a970590e1b11cc4e83320d8b94e846 (diff) | |
| parent | 427f8d84788fc3757fb4dacda931c878bf253fa1 (diff) | |
Merge remote-tracking branch 'upstream/master' into por
Diffstat (limited to 'examples/phrasebook')
| -rw-r--r-- | examples/phrasebook/SentencesBul.gf | 4 | ||||
| -rw-r--r-- | examples/phrasebook/WordsDut.gf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/phrasebook/SentencesBul.gf b/examples/phrasebook/SentencesBul.gf index cf886f27d..12638fba5 100644 --- a/examples/phrasebook/SentencesBul.gf +++ b/examples/phrasebook/SentencesBul.gf @@ -30,11 +30,11 @@ lin ACitizen p cit = let noun : N = case p.name.a.gn of { R.GSg g => lin N {s = \\nf => cit.s1 ! g ! nf; - rel = cit.s2.s; + rel = cit.s2.s; relPost = False; 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; + rel = cit.s2.s; relPost = False; g = R.AMasc R.Human } } ; diff --git a/examples/phrasebook/WordsDut.gf b/examples/phrasebook/WordsDut.gf index 2ba3f3d78..12cab7861 100644 --- a/examples/phrasebook/WordsDut.gf +++ b/examples/phrasebook/WordsDut.gf @@ -3,7 +3,7 @@ concrete WordsDut of Words = SentencesDut ** - open SyntaxDut, (P = ParadigmsDut), (I = IrregDut), (L = LexiconDut), (R=ResDut), ExtraDut, Prelude in { + open SyntaxDut, (P = ParadigmsDut), (I = IrregDut), (L = LexiconDut), (R=ResDut), (E=ExtendDut), Prelude in { lin @@ -173,7 +173,7 @@ ik ga te voet/ ik ga lopend -- miscellaneous QWhatName p = mkQS (mkQCl how_IAdv (mkCl p.name I.heten_V)) ; --hoe heet je - QWhatAge p = mkQS (mkQCl (ICompAP (mkAP L.old_A)) p.name) ; + QWhatAge p = mkQS (mkQCl (E.ICompAP (mkAP L.old_A)) p.name) ; HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item (P.mkV "kosten"))) ; --hoeveel kost... ItCost item price = prop (mkCl item (P.mkV2 (P.mkV "kosten")) price) ; --..item.. kost ..price.. |