From 8ebf00005f0de6fd8ebb3d6e563eb6cc5224c5bb Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 15 Jun 2018 13:14:53 +0200 Subject: [PATCH] (Dut) Extend vs. Extra --- src/dutch/ExtendDut.gf | 9 ++++++--- src/dutch/ExtraDut.gf | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/dutch/ExtendDut.gf b/src/dutch/ExtendDut.gf index 5c3b86c4e..00d57f33b 100644 --- a/src/dutch/ExtendDut.gf +++ b/src/dutch/ExtendDut.gf @@ -2,7 +2,7 @@ concrete ExtendDut of Extend = CatDut ** ExtendFunctor - - [PastPartAP] + - [PastPartAP,ICompAP,IAdvAdv] with (Grammar = GrammarDut) ** open @@ -12,7 +12,7 @@ concrete ExtendDut of Extend = Prelude, ParadigmsDut in { -lin --# notpresent +lin PastPartAP vp = { --# notpresent s = \\agr,af => let aForm = case vp.isHeavy of { --# notpresent @@ -22,4 +22,7 @@ lin --# notpresent isPre = notB vp.isHeavy ; --# notpresent } ; --# notpresent - } \ No newline at end of file + ICompAP ap = {s = \\agr => "hoe" ++ ap.s ! agr ! APred} ; + + IAdvAdv adv = {s = "hoe" ++ adv.s} ; +} \ No newline at end of file diff --git a/src/dutch/ExtraDut.gf b/src/dutch/ExtraDut.gf index 8758a93db..698e692e4 100644 --- a/src/dutch/ExtraDut.gf +++ b/src/dutch/ExtraDut.gf @@ -1,5 +1,5 @@ concrete ExtraDut of ExtraDutAbs = CatDut ** - open ResDut, Coordination, Prelude, IrregDut, (P = ParadigmsDut), NounDut in + open ResDut, Coordination, Prelude, IrregDut, (P = ParadigmsDut), (E=ExtendDut), NounDut in { flags coding=utf8 ; @@ -19,9 +19,9 @@ concrete ExtraDut of ExtraDutAbs = CatDut ** predVGen v.isAux BeforeObjs v) ; ---- lin - ICompAP ap = {s = \\agr => "hoe" ++ ap.s ! agr ! APred} ; + ICompAP = E.ICompAP ; - IAdvAdv adv = {s = "hoe" ++ adv.s} ; + IAdvAdv = E.IAdvAdv ; lincat VPS = {s : Order => Agr => Str} ;