generalize DAP

This commit is contained in:
Krasimir Angelov
2018-06-26 18:09:11 +02:00
parent a730a3194b
commit 0df8c34e1d
14 changed files with 123 additions and 64 deletions

View File

@@ -75,13 +75,12 @@ incomplete concrete CatScand of Cat =
CN = {s : Number => DetSpecies => Case => Str ; g : NGender ; isMod : Bool} ;
NP = {s : NPForm => Str ; a : Agr ; isPron : Bool} ;
Pron = {s : NPForm => Str ; a : Agr} ;
Det = {s,sp : Bool => NGender => Str ; n : Number ; det : DetSpecies} ;
Det,DAP = {s,sp : Bool => NGender => Str ; n : Number ; det : DetSpecies} ;
Quant = {s,sp : Number => Bool => Bool => NGender => Str ; det : DetSpecies} ;
Predet = {s : Gender => Number => Str ; p : Str ; a : PredetAgr} ;
Num = {s : NGender => Str ; isDet : Bool ; n : Number} ;
Card = {s : NGender => Str ; n : Number} ;
Ord = {s : Str} ;
DAP = {s : Bool => NGender => Str ; n : Number ; det : DetSpecies} ;
-- Numeral

View File

@@ -254,11 +254,11 @@ incomplete concrete NounScand of Noun =
} ;
AdjDAP det ap = {
s = \\b,g => det.s ! b ! g ++ ap.s ! agrAdj (gennum (ngen2gen g) det.n) det.det ;
n = det.n ;
det = det.det ;
s,sp = \\b,g => det.s ! b ! g ++ ap.s ! agrAdj (gennum (ngen2gen g) det.n) det.det ;
n = det.n ;
det= det.det ;
} ;
DetDAP d = d ; -- forgetting sp
DetDAP d = d ;
}