From d3dd3d668c359b749cab71e7066730fb4438dcf1 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Tue, 1 Sep 2020 16:13:39 +0200
Subject: [PATCH] (May) Cleanup in quant+det types

---
 src/malay/ResMay.gf | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/malay/ResMay.gf b/src/malay/ResMay.gf
index 0ee2a6e0..4b73b3c6 100644
--- a/src/malay/ResMay.gf
+++ b/src/malay/ResMay.gf
@@ -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 ;
     } ;