(May) Cleanup in quant+det types

This commit is contained in:
Inari Listenmaa
2020-09-01 16:13:39 +02:00
parent d1322ea14d
commit d3dd3d668c

View File

@@ -1,4 +1,4 @@
resource ResMay = ParamMay ** open Prelude, Predef, ParamMay in {
resource ResMay = ParamMay ** open Prelude, Predef in {
--------------------------------------------------------------------------------
-- Nouns
@@ -59,21 +59,17 @@ oper
--------------------------------------------------------------------------------
-- Det, Quant, Card, Ord
BaseQuant : Type = {
Quant : Type = {
s : Str ;
sp : NForm => Str ;
poss : Possession ;
} ;
Determiner : Type = BaseQuant ** {
sp : NForm => Str ;
Determiner : Type = Quant ** {
n : Number ;
-- numtype : NumType ; -- number as in "5" or "Sg/Pl", often makes a difference in lots of things
} ;
Quant : Type = BaseQuant ** {
sp : NForm => Str ;
} ;
Num : Type = {
s : DForm => Str ; -- independent or attribute
n : Number
@@ -89,8 +85,9 @@ oper
ord : Str
} ;
baseQuant : BaseQuant = {
baseQuant : Quant = {
s = [] ;
sp = \\_ => [] ;
poss = Bare ;
} ;