finishing TestGerman

This commit is contained in:
aarne
2006-01-13 22:33:15 +00:00
parent f3f346d6d9
commit 1a262ce1f8
10 changed files with 133 additions and 43 deletions

View File

@@ -1,4 +1,4 @@
concrete VerbGer of Verb = CatGer ** open ResGer in {
concrete VerbGer of Verb = CatGer ** open Prelude, ResGer in {
flags optimize=all_subs ;
@@ -10,16 +10,23 @@ concrete VerbGer of Verb = CatGer ** open ResGer in {
insertObj (\\_ => appPrep v.c2 np.s ++ appPrep v.c3 np2.s) (predV v) ;
ComplVV v vp =
insertObj (\\a => v.part ++ (vp.s ! a ! VPInfinit Simul).inf) (predV v) ;
let
compl : Agr => Str = \\a =>
let
vpi = vp.s ! a ! VPInfinit Simul
in
vp.n2 ! a ++ vp.a2 ++ vpi.fin ++ infPart v.isAux ++ vpi.inf
in
insertObj compl (predVGen v.isAux v) ;
ComplVS v s =
insertExtrapos (conjThat ++ s.s ! Sub) (predV v) ;
ComplVQ v q =
insertExtrapos (q.s ! QIndir) (predV v) ;
-- ComplVA v ap = insertObj (ap.s) (predV v) ;
-- ComplV2A v np ap =
-- insertObj (\\_ => v.c2 ++ np.s ! Acc ++ ap.s ! np.a) (predV v) ;
--
ComplVA v ap = insertObj (\\ _ => ap.s ! APred) (predV v) ;
ComplV2A v np ap =
insertObj (\\_ => appPrep v.c2 np.s ++ ap.s ! APred) (predV v) ;
UseComp comp = insertObj comp.s (predV sein_V) ;
@@ -28,11 +35,11 @@ concrete VerbGer of Verb = CatGer ** open ResGer in {
CompAdv a = {s = \\_ => a.s} ;
AdvVP vp adv = insertAdv adv.s vp ;
-- AdVVP adv vp = insertAdV adv.s vp ;
--
-- ReflV2 v = insertObj (\\a => v.c2 ++ reflPron ! a) (predV v) ;
--
-- PassV2 v = {s = \\_ => v.s ! VPPart} ;
AdVVP adv vp = insertAdV adv.s vp ;
ReflV2 v = insertObj (\\a => appPrep v.c2 (reflPron ! a)) (predV v) ;
PassV2 v = insertObj (\\_ => v.s ! VPastPart APred) (predV werdenPass) ;
UseVS, UseVQ = \v -> v ** {c2 = noPreposition Acc} ;