Merge remote-tracking branch 'upstream/master' into por

This commit is contained in:
odanoburu
2018-03-29 11:49:19 -03:00
2 changed files with 42 additions and 31 deletions

View File

@@ -75,6 +75,7 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol]
sp : Number => Gender => Case => Str ; sp : Number => Gender => Case => Str ;
isNeg : Bool -- negative element, e.g. aucun isNeg : Bool -- negative element, e.g. aucun
} ; } ;
DAP = {s : Gender => Str ; n : Number} ;
Predet = { Predet = {
s : AAgr => Case => Str ; s : AAgr => Case => Str ;
c : Case ; -- c : la plupart de c : Case ; -- c : la plupart de

View File

@@ -179,4 +179,14 @@ incomplete concrete NounRomance of Noun =
s = \\n => cn.s ! n ++ appCompl {s = [] ; c = genitive ; isDir = False} np ; s = \\n => cn.s ! n ++ appCompl {s = [] ; c = genitive ; isDir = False} np ;
g = cn.g ; g = cn.g ;
} ; } ;
-- PartNP and CounNP missing: how to define 'of' in the functor?
AdjDAP det ap = {
s = \\g => det.s ! g ++ ap.s ! AF g det.n ;
n = det.n ;
} ;
DetDAP det = {s = \\g => det.s ! g ! Nom ; n = det.n } ;
} }