From c6f6a749b542c67c9ef7203372746d83e5b65600 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Wed, 8 Feb 2023 11:32:47 +0800 Subject: [PATCH 1/2] (Eng) uncontracted form for standalone VPS --- src/english/ExtendEng.gf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/english/ExtendEng.gf b/src/english/ExtendEng.gf index a9cdb3fb..6ca47c7d 100644 --- a/src/english/ExtendEng.gf +++ b/src/english/ExtendEng.gf @@ -191,7 +191,7 @@ concrete ExtendEng of Extend = inf = verb.adv ++ vp.ad ! a ++ verb.fin ++ verb.inf ++ vp.p ++ compl} ; } ; - linVPS : Agr -> {s : Order => Agr => {fin,inf : Str}} -> Str = \agr,vps -> let vpss = vps.s ! ODir True ! agr in vpss.fin ++ vpss.inf ; + linVPS : Agr -> {s : Order => Agr => {fin,inf : Str}} -> Str = \agr,vps -> let vpss = vps.s ! ODir False ! agr in vpss.fin ++ vpss.inf ; mkVPI : VP -> VPI = \vp -> lin VPI { s = table { From 65e5b78edd0af0379521d3943848e74d8033c48b Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Wed, 8 Feb 2023 11:36:48 +0800 Subject: [PATCH 2/2] (Eng) don't drop VP's ext field when making VPI --- src/english/ExtendEng.gf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/english/ExtendEng.gf b/src/english/ExtendEng.gf index 6ca47c7d..f086716d 100644 --- a/src/english/ExtendEng.gf +++ b/src/english/ExtendEng.gf @@ -195,9 +195,9 @@ concrete ExtendEng of Extend = mkVPI : VP -> VPI = \vp -> lin VPI { s = table { - VVAux => \\a => vp.ad ! a ++ vp.inf ++ vp.p ++ vp.s2 ! a ; - VVInf => \\a => "to" ++ vp.ad ! a ++ vp.inf ++ vp.p ++ vp.s2 ! a ; - VVPresPart => \\a => vp.ad ! a ++ vp.prp ++ vp.p ++ vp.s2 ! a + VVAux => \\a => vp.ad ! a ++ vp.inf ++ vp.p ++ vp.s2 ! a ++ vp.ext ; + VVInf => \\a => "to" ++ vp.ad ! a ++ vp.inf ++ vp.p ++ vp.s2 ! a ++ vp.ext ; + VVPresPart => \\a => vp.ad ! a ++ vp.prp ++ vp.p ++ vp.s2 ! a ++ vp.ext } } ;