- add missing linearizations for DetDAP and AdjDAP

- indentation
This commit is contained in:
odanoburu
2018-03-28 15:56:57 -03:00
parent 23f27a9dab
commit ccefcc7f16
2 changed files with 42 additions and 31 deletions
+14 -13
View File
@@ -16,7 +16,7 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol]
QS = {s : QForm => Str} ;
RS = {s : Mood => Agr => Str ; c : Case} ;
SSlash = {
s : AAgr => Mood => Str ;
s : AAgr => Mood => Str ;
c2 : Compl
} ;
@@ -26,7 +26,7 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol]
Cl = {s : Direct => RTense => Anteriority => RPolarity => Mood => Str} ;
ClSlash = {
s : AAgr => Direct => RTense => Anteriority => RPolarity => Mood => Str ;
s : AAgr => Direct => RTense => Anteriority => RPolarity => Mood => Str ;
c2 : Compl
} ;
Imp = {s : RPolarity => ImpForm => Gender => Str} ;
@@ -35,14 +35,14 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol]
QCl = {s : RTense => Anteriority => RPolarity => QForm => Str} ;
IP = {s : Case => Str ; a : AAgr} ;
IComp = {s : AAgr => Str ; cop : CopulaType} ;
IComp = {s : AAgr => Str ; cop : CopulaType} ;
IDet = {s : Gender => Case => Str ; n : Number} ;
IQuant = {s : Number => Gender => Case => Str} ;
-- Relative
RCl = {
s : Agr => RTense => Anteriority => RPolarity => Mood => Str ;
s : Agr => RTense => Anteriority => RPolarity => Mood => Str ;
c : Case
} ;
RP = {s : Bool => AAgr => Case => Str ; a : AAgr ; hasAgr : Bool} ;
@@ -51,11 +51,11 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol]
VP = ResRomance.VP ;
VPSlash = ResRomance.VP ** {c2 : Compl} ;
Comp = {s : Agr => Str ; cop : CopulaType} ;
Comp = {s : Agr => Str ; cop : CopulaType} ;
-- Adjective
AP = {s : AForm => Str ; isPre : Bool} ;
AP = {s : AForm => Str ; isPre : Bool} ;
-- Noun
@@ -63,20 +63,21 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol]
Pron = Pronoun ;
NP = NounPhrase ;
Det = {
s : Gender => Case => Str ;
n : Number ;
s2 : Str ; -- -ci
s : Gender => Case => Str ;
n : Number ;
s2 : Str ; -- -ci
sp : Gender => Case => Str ; -- substantival: mien, mienne
isNeg : Bool -- negative element, e.g. aucun
} ;
Quant = {
s : Bool => Number => Gender => Case => Str ;
s2 : Str ;
s : Bool => Number => Gender => Case => Str ;
s2 : Str ;
sp : Number => Gender => Case => Str ;
isNeg : Bool -- negative element, e.g. aucun
} ;
DAP = {s : Gender => Str ; n : Number} ;
Predet = {
s : AAgr => Case => Str ;
s : AAgr => Case => Str ;
c : Case ; -- c : la plupart de
a : PAgr -- if an agr is forced, e.g. chacun de nous
} ;
@@ -107,7 +108,7 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol]
A = {s : Degree => AForm => Str ; isPre : Bool} ;
A2 = {s : Degree => AForm => Str ; c2 : Compl} ;
N = Noun ;
N = Noun ;
N2 = Noun ** {c2 : Compl} ;
N3 = Noun ** {c2,c3 : Compl} ;
PN = {s : Str ; g : Gender} ;