1
0
forked from GitHub/gf-core

Major refactoring -> lexical aspect; word order in VP

This commit is contained in:
krasimir
2008-04-05 17:18:47 +00:00
parent da5200f02a
commit 2498fe7ee8
12 changed files with 362 additions and 319 deletions

View File

@@ -10,7 +10,7 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
ImpVP vp = {
s = \\p,gn =>
let agr = {gn = gn ; p = P2} ;
verb = vp.imp ! p ! numGenNum gn ;
verb = vp.imp ! p ! numGenNum gn ! Perf ;
compl = vp.s2 ! agr
in
verb ++ compl
@@ -22,10 +22,10 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
SlashVVV2 np vv v2 =
mkClause (np.s ! RSubj) np.a
(let vp = predV vv
in { s = \\t,a,p,agr,q => vp.s ! t ! a ! p ! agr ! q ++ "äà" ++ v2.s ! (VPres (numGenNum agr.gn) agr.p) ;
in { s = \\t,a,p,agr,q,asp => vp.s ! t ! a ! p ! agr ! q ! asp ++ "äà" ++ v2.s ! Perf ! (VPres (numGenNum agr.gn) agr.p) ;
imp = vp.imp ;
ad = vp.ad ;
s2 = vp.s2 ;
ad = vp.ad ;
s2 = vp.s2 ;
subjRole = vp.subjRole
}) **
{c2 = v2.c2} ;
@@ -44,7 +44,7 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
EmbedS s = {s = "," ++ "֌" ++ s.s} ;
EmbedQS qs = {s = qs.s ! QIndir} ;
EmbedVP vp = {s = vp.ad ! False ++ "äà" ++ vp.s ! Pres ! Simul ! Pos ! {gn=GSg Masc; p=P1} ! False} ;
EmbedVP vp = {s = vp.ad ! False ++ "äà" ++ vp.s ! Pres ! Simul ! Pos ! {gn=GSg Masc; p=P1} ! False ! Perf} ;
UseCl t a p cl = {
s = t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! Main