From 1ad71e10b10ca006259d5b47e81453e6f1cdb23e Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Fri, 24 Feb 2023 12:46:59 +0800
Subject: [PATCH] (May) make linrefs into opers in ResMay

---
 src/malay/CatMay.gf | 8 ++++----
 src/malay/ResMay.gf | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/malay/CatMay.gf b/src/malay/CatMay.gf
index 61ca8867..74b5192c 100644
--- a/src/malay/CatMay.gf
+++ b/src/malay/CatMay.gf
@@ -122,10 +122,10 @@ concrete CatMay of Cat = CommonX - [IAdv] ** open ResMay, Prelude in {
     PN = ResMay.PNoun ;
 
     linref
-        CN = \cn -> cn.s ! NF Sg Bare ++ cn.heavyMod;
-        ClSlash = \cl -> cl.subj ++ cl.pred ! Root ! Pos ++ cl.c2.s;
-        RCl = \cl -> cl.subj ++ cl.pred ! P1 ! Pos;
-        Cl = \cl -> cl.subj ++ cl.pred ! Active ! Pos;
+        CN = linCN ;
+        ClSlash = linClSlash ;
+        RCl = linRCl ;
+        Cl = linCl ;
         Det = linDet ;
 }
 
diff --git a/src/malay/ResMay.gf b/src/malay/ResMay.gf
index 09448cb9..2645b437 100644
--- a/src/malay/ResMay.gf
+++ b/src/malay/ResMay.gf
@@ -13,6 +13,7 @@ oper
   CNoun : Type = Noun ** {
     heavyMod : Str ; -- heavy stuff like relative clauses after determiner
     } ;
+  linCN : CNoun -> Str = \cn -> cn.s ! NF Sg Bare ++ cn.heavyMod ;
 
   PNoun : Type = Noun ;
 
@@ -320,14 +321,19 @@ oper
     pred : VForm => Polarity => Str -- Cl may become relative clause, need to keep open VForm
     } ;
 
+  linCl : Clause -> Str = \cl -> cl.subj ++ cl.pred ! Active ! Pos ;
+
   RClause : Type = {
     subj : Str ;
     pred : Person => Polarity => Str
     } ;
 
+  linRCl : RClause -> Str = \cl -> cl.subj ++ cl.pred ! P1 ! Pos ;
+
   RS : Type = {s : Person => Str} ;
 
   ClSlash : Type = Clause ** {c2 : Preposition} ;
+  linClSlash : ClSlash -> Str = \cl -> cl.subj ++ cl.pred ! Root ! Pos ++ cl.c2.s ;
 
   Sentence : Type = {s : Str} ;