From 53eb8ab9df593e8bcede1b89a92f21c2a5660027 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Tue, 18 Aug 2020 21:34:04 +0200
Subject: [PATCH] (May) Add some determiners + fix word order in DetCN

---
 src/malay/NounMay.gf       | 6 +++++-
 src/malay/ResMay.gf        | 9 +++++++--
 src/malay/StructuralMay.gf | 8 ++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/malay/NounMay.gf b/src/malay/NounMay.gf
index 4746c5e3..f8337991 100644
--- a/src/malay/NounMay.gf
+++ b/src/malay/NounMay.gf
@@ -8,7 +8,11 @@ concrete NounMay of Noun = CatMay ** open ResMay, Prelude in {
 
 -- : Det -> CN -> NP
     DetCN det cn = {
-      s = det.s ++ cn.s ! NF det.n Bare ; -- TODO add possessive determiners
+      s =
+        case det.isPoss of {
+          True => cn.s ! NF det.n (Poss P3) ; -- TODO add possessive determiners
+          False => cn.s ! NF det.n Bare }
+        ++ det.s ;
       p = P3
       } ;
 
diff --git a/src/malay/ResMay.gf b/src/malay/ResMay.gf
index 067ffa12..610981b5 100644
--- a/src/malay/ResMay.gf
+++ b/src/malay/ResMay.gf
@@ -78,9 +78,14 @@ oper
   baseQuant : BaseQuant = {
     s = [] ;
     isPoss = False ;
-  } ;
+    } ;
 
---------------------------------------------------------------------------------
+  mkQuant : Str -> Quant = \str -> baseQuant ** {
+    s = str ;
+    sp = \\_ => str
+    } ;
+
+  --------------------------------------------------------------------------------
 -- Prepositions
 
   Preposition : Type = {
diff --git a/src/malay/StructuralMay.gf b/src/malay/StructuralMay.gf
index ad37a6de..9aa9243c 100644
--- a/src/malay/StructuralMay.gf
+++ b/src/malay/StructuralMay.gf
@@ -68,10 +68,10 @@ lin much_Det = R.indefDet "" sg ;
 lin somePl_Det =
 lin someSg_Det =
 
-lin no_Quant =
-lin that_Quant =
-lin this_Quant =
-lin which_IQuant =
+lin no_Quant = -}
+lin that_Quant = mkQuant "itu" ;
+lin this_Quant = mkQuant "ini" ;
+{-lin which_IQuant =
 
 
 -----