forked from GitHub/gf-core
updated clefts in Idiom (now all except Russian)
This commit is contained in:
@@ -9,7 +9,7 @@ incomplete concrete CatRomance of Cat =
|
||||
|
||||
S = {s : Mood => Str} ;
|
||||
QS = {s : QForm => Str} ;
|
||||
RS = {s : Mood => Agr => Str} ;
|
||||
RS = {s : Mood => Agr => Str ; c : Case} ;
|
||||
|
||||
-- Sentence
|
||||
|
||||
@@ -26,7 +26,10 @@ incomplete concrete CatRomance of Cat =
|
||||
|
||||
-- Relative
|
||||
|
||||
RCl = {s : Agr => Tense => Anteriority => Polarity => Mood => Str} ;
|
||||
RCl = {
|
||||
s : Agr => Tense => Anteriority => Polarity => Mood => Str ;
|
||||
c : Case
|
||||
} ;
|
||||
RP = {s : Bool => AAgr => Case => Str ; a : AAgr ; hasAgr : Bool} ;
|
||||
|
||||
-- Verb
|
||||
|
||||
@@ -6,7 +6,8 @@ incomplete concrete RelativeRomance of Relative =
|
||||
lin
|
||||
|
||||
RelCl cl = {
|
||||
s = \\ag,t,a,p,m => pronSuch ! ag ++ conjThat ++ cl.s ! t ! a ! p ! m
|
||||
s = \\ag,t,a,p,m => pronSuch ! ag ++ conjThat ++ cl.s ! t ! a ! p ! m ;
|
||||
c = Nom
|
||||
} ;
|
||||
|
||||
--- more efficient to compile than case inside mkClause; see log.txt
|
||||
@@ -15,18 +16,20 @@ incomplete concrete RelativeRomance of Relative =
|
||||
(mkClause
|
||||
(rp.s ! False ! {g = ag.g ; n = ag.n} ! Nom)
|
||||
{g = rp.a.g ; n = rp.a.n ; p = P3}
|
||||
vp).s} ;
|
||||
vp).s ; c = Nom} ;
|
||||
False => {s = \\ag =>
|
||||
(mkClause
|
||||
(rp.s ! False ! {g = ag.g ; n = ag.n} ! Nom)
|
||||
ag
|
||||
vp).s
|
||||
vp).s ; c = Nom
|
||||
}
|
||||
} ;
|
||||
|
||||
RelSlash rp slash = {
|
||||
s = \\ag,t,a,p,m =>
|
||||
slash.c2.s ++ rp.s ! False ! {g = ag.g ; n = ag.n} ! slash.c2.c ++ slash.s ! t ! a ! p ! m
|
||||
slash.c2.s ++ rp.s ! False ! {g = ag.g ; n = ag.n} ! slash.c2.c ++
|
||||
slash.s ! t ! a ! p ! m ;
|
||||
c = Acc
|
||||
} ;
|
||||
|
||||
FunRP p np rp = {
|
||||
|
||||
@@ -35,7 +35,9 @@ incomplete concrete SentenceRomance of Sentence =
|
||||
|
||||
UseCl t a p cl = {s = \\o => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! o} ;
|
||||
UseQCl t a p cl = {s = \\q => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! q} ;
|
||||
UseRCl t a p cl =
|
||||
{s = \\r,ag => t.s ++ a.s ++ p.s ++ cl.s ! ag ! t.t ! a.a ! p.p ! r} ;
|
||||
UseRCl t a p cl = {
|
||||
s = \\r,ag => t.s ++ a.s ++ p.s ++ cl.s ! ag ! t.t ! a.a ! p.p ! r ;
|
||||
c = cl.c
|
||||
} ;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user