mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-06-06 21:56:31 -06:00
generalize DAP
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user