From db1ecda1f6cfe6ef875a066f83df1a7aadc21d60 Mon Sep 17 00:00:00 2001 From: Aarne Ranta Date: Wed, 25 Apr 2018 10:46:40 +0200 Subject: [PATCH] made AllDut import ExtendDut --- src/dutch/AllDut.gf | 4 ++-- src/dutch/AllDutAbs.gf | 2 +- src/dutch/CatDut.gf | 2 +- src/dutch/ExtendDut.gf | 17 +++++++++-------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/dutch/AllDut.gf b/src/dutch/AllDut.gf index 55360f72c..ff7160ac9 100644 --- a/src/dutch/AllDut.gf +++ b/src/dutch/AllDut.gf @@ -2,8 +2,8 @@ concrete AllDut of AllDutAbs = LangDut, - IrregDut, - ExtraDut + IrregDut + , ExtendDut ** { --{} ; diff --git a/src/dutch/AllDutAbs.gf b/src/dutch/AllDutAbs.gf index 4ddd642c7..ec224b0d7 100644 --- a/src/dutch/AllDutAbs.gf +++ b/src/dutch/AllDutAbs.gf @@ -3,7 +3,7 @@ abstract AllDutAbs = Lang, IrregDutAbs, - ExtraDutAbs + Extend -- ExtraDutAbs ** { --{} ; diff --git a/src/dutch/CatDut.gf b/src/dutch/CatDut.gf index 9f070439c..02345e64d 100644 --- a/src/dutch/CatDut.gf +++ b/src/dutch/CatDut.gf @@ -34,7 +34,7 @@ concrete CatDut of Cat = -- Verb VP = ResDut.VP ; - VPSlash = ResDut.VP ** {c2 : Preposition * Bool} ; + VPSlash = ResDut.VP ** {c2 : Preposition * Bool} ; -- False = empty prep Comp = {s : Agr => Str} ; -- Adjective diff --git a/src/dutch/ExtendDut.gf b/src/dutch/ExtendDut.gf index 994a368c9..5c3b86c4e 100644 --- a/src/dutch/ExtendDut.gf +++ b/src/dutch/ExtendDut.gf @@ -11,14 +11,15 @@ concrete ExtendDut of Extend = Coordination, Prelude, ParadigmsDut in { - lin - PastPartAP vp = { - s = \\agr,af => let aForm = case vp.isHeavy of { - True => APred ; - False => af } ; - in (infClause [] agr vp aForm).s ! Past ! Anter ! Pos ! Sub ; - isPre = notB vp.isHeavy ; - } ; +lin --# notpresent + + PastPartAP vp = { --# notpresent + s = \\agr,af => let aForm = case vp.isHeavy of { --# notpresent + True => APred ; --# notpresent + False => af } ; --# notpresent + in (infClause [] agr vp aForm).s ! Past ! Anter ! Pos ! Sub ; --# notpresent + isPre = notB vp.isHeavy ; --# notpresent + } ; --# notpresent } \ No newline at end of file