GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-09 04:59:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

added auxV2V (parallel to auxVV)

Browse Source
This commit is contained in:
andrea.christina.unger
2015-05-27 14:47:35 +00:00
parent a1c5cfb55f
commit b2cef847b2
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/src/german/CatGer.gf
View File

@@ -108,8 +108,8 @@ concrete CatGer of Cat =
V, VS, VQ, VA = \v -> useInfVP False (predV v) ;
V2, V2A, V2Q, V2S = \v -> useInfVP False (predV v) ++ v.c2.s ;
V3 = \v -> useInfVP False (predV v) ++ v.c2.s ++ v.c3.s ;
VV = \v -> useInfVP False (predV v) ;
V2V = \v -> useInfVP False (predV v) ++ v.c2.s ;
VV = \v -> useInfVP v.isAux (predVGen v.isAux v) ;
V2V = \v -> useInfVP v.isAux (predVGen v.isAux v) ++ v.c2.s ;
Conj = \c -> c.s1 ++ c.s2 ;
}

12
lib/src/german/ParadigmsGer.gf
View File

@@ -300,10 +300,14 @@ mkV2 : overload {
mkV0 : V -> V0 ; --%
mkVS : V -> VS ;
mkV2V : overload {
mkV2V : overload { -- with zu
mkV2V : V -> V2V ;
mkV2V : V -> Prep -> V2V ;
} ;
auxV2V : overload { -- without zu
auxV2V : V -> V2V ;
auxV2V : V -> Prep -> V2V ;
} ;
mkV2A : overload {
mkV2A : V -> V2A ;
mkV2A : V -> Prep -> V2A ;
@@ -602,6 +606,12 @@ mkV2 : overload {
mkV2V : V -> Prep -> V2V
= \v,p -> prepV2 v p ** {isAux = False ; lock_V2V = <>} ;
} ;
auxV2V = overload {
auxV2V : V -> V2V
= \v -> dirV2 v ** {isAux = True ; lock_V2V = <>} ;
auxV2V : V -> Prep -> V2V
= \v,p -> prepV2 v p ** {isAux = True ; lock_V2V = <>} ;
} ;
mkV2A = overload {
mkV2A : V -> V2A
= \v -> dirV2 v ** {isAux = False ; lock_V2A = <>} ;

8
lib/src/german/VerbGer.gf
View File

@@ -34,11 +34,11 @@ concrete VerbGer of Verb = CatGer ** open Prelude, ResGer, Coordination in {
insertExtrapos (q.s ! QIndir) (predV v) ** {c2 = v.c2} ;
SlashV2V v vp =
let
vpi = infVP False vp
vpi = infVP v.isAux vp
in
insertExtrapos vpi.p3 (
insertInf vpi.p2 (
insertObj vpi.p1 ((predV v)))) ** {c2 = v.c2} ;
insertObj vpi.p1 ((predVGen v.isAux v)))) ** {c2 = v.c2} ;
SlashV2A v ap =
insertObj (\\_ => ap.s ! APred) (predV v) ** {c2 = v.c2} ;
@@ -56,13 +56,13 @@ concrete VerbGer of Verb = CatGer ** open Prelude, ResGer, Coordination in {
SlashV2VNP v np vp =
let
vpi = infVP False vp
vpi = infVP v.isAux vp
in
insertExtrapos vpi.p3 (
insertInf vpi.p2 (
insertObj vpi.p1 (
insertObj (\\_ => appPrep v.c2 np.s) (
predV v)))) ** {c2 = v.c2} ;
predVGen v.isAux v)))) ** {c2 = v.c2} ;
UseComp comp = insertObj comp.s (predV sein_V) ; -- agr not used
-- we want to say "ich liebe sie nicht" but not "ich bin alt nicht"