From 469718230a9f2d1ba4f231500a76164141c90381 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Tue, 30 Jul 2019 16:38:57 +0200
Subject: [PATCH] (Som) WIP: add FocusObj

---
 src/somali/ExtendSom.gf   |  8 +++++++-
 src/somali/ResSom.gf      | 26 ++++++++++++++------------
 src/somali/SentenceSom.gf |  5 ++++-
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/somali/ExtendSom.gf b/src/somali/ExtendSom.gf
index e696a76d..e1bc6816 100644
--- a/src/somali/ExtendSom.gf
+++ b/src/somali/ExtendSom.gf
@@ -7,7 +7,13 @@ concrete ExtendSom of Extend = CatSom
 
 lin
    -- : NP  -> SSlash  -> Utt ;   -- her I love -- Sayeed p. 189-
-  FocusObj np sslash =
+  FocusObj np sslash = -- FIXME: preposition disappears in negative sentences
+    let ss = sslash.s ! False ;
+        ssSub  = sslash.s ! True ; -- the negative particle is the same as subordinate, but verb forms come from main clause
+        obj = case np.isPron of {
+                True => np.empty ++ (pronTable ! np.a).sp ;
+                False => np.s ! Abs }
+     in {s = ssSub.beforeSTM ++ "waxa" ++ ssSub.stm ++ ss.afterSTM ++ obj} ;
 
   -- FocusAdv : Adv -> S       -> Utt ;   -- today I will sleep
   -- FocusAdV : AdV -> S       -> Utt ;   -- never will I sleep
diff --git a/src/somali/ResSom.gf b/src/somali/ResSom.gf
index 799bfba9..bc7c1bff 100644
--- a/src/somali/ResSom.gf
+++ b/src/somali/ResSom.gf
@@ -798,13 +798,14 @@ oper
                     _ => o
                      -- object pronoun, prepositions and negation all contract
                   } ;
-           stm : Str = case cltyp of {
-                Subord  => if_then_Pol p [] "aan" ++ subjpron ; -- if we form a ClSlash, no sentence type marker; negation with aan (Sayeed p. 210)
-                Question  => "ma" ; -- TODO find out how negative questions work
+           stm : {p1,p2 : Str} = case cltyp of {
+                Subord  => {p1 = if_then_Pol p [] "aan" ; -- if we form a ClSlash, no sentence type marker; negation with aan (Sayeed p. 210)
+                            p2 = if_then_Pol p subjpron []} ;
+                Question  => {p1 = "ma" ; p2 = []} ; -- TODO find out how negative questions work
                 Statement => case <p,vp.pred,subj.a> of {
-                               <Pos,Copula|NoCopula,Sg3 _|Impers> => "waa" ;
+                               <Pos,Copula|NoCopula,Sg3 _|Impers> => {p1 = "waa" ; p2 = []} ;
                                _ => stmarkerNoContr ! subj.a ! p }} ;
-      in wordOrder subjnoun subjpron stm obj pred vp ;
+      in (wordOrder subjnoun subjpron stm obj pred vp) ;
     } where {
         vp = case isPassive vps of {
                True => complSlash (insertComp vps np) ;
@@ -812,13 +813,14 @@ oper
         subj = case isPassive vps of {True => impersNP ; _ => np}
       } ;
 
-  wordOrder : (sn,sp,stm : Str) -> {p1,p2 : Str} -> {fin,inf : Str} -> VerbPhrase -> BaseCl =
+  wordOrder : (sn,sp : Str) -> (stm,obj : {p1,p2 : Str}) -> {fin,inf : Str} -> VerbPhrase -> BaseCl =
     \subjnoun,subjpron,stm,obj,pred,vp -> {
         beforeSTM = vp.berri -- AdV
                   ++ subjnoun -- subject if it's a noun
                   ++ obj.p1 ; -- object if it's a noun
-              stm = stm ;       -- sentence type marker + possible subj. pronoun
-         afterSTM = obj.p2   -- object if it's a pronoun
+              stm = stm.p1 ;  -- sentence type marker
+         afterSTM = stm.p2    -- possible subj. pronoun
+                  ++ obj.p2   -- object if it's a pronoun
                   ++ vp.sii   -- restricted set of particles
                   ++ vp.dhex  -- restricted set of nouns/adverbials
                   ++ vp.secObj   -- "second object"
@@ -866,10 +868,10 @@ oper
     let stm = if_then_Pol b "w" "m"
      in stm + subjpron ! a ;
 
-  stmarkerNoContr : Agreement => Polarity => Str = \\a,p =>
+  stmarkerNoContr : Agreement => Polarity => {p1,p2 : Str} = \\a,p =>
     case p of {
-      Pos => "waa" ++ subjpron ! a ;
-      Neg => "ma" } ;
+      Pos => {p1 = "waa" ; p2 = subjpron ! a} ;
+      Neg => {p1 = "ma" ; p2 = []} } ;
 
   subjpron : Agreement => Str = table {
     Sg1|Pl1 Excl => "aan" ;
@@ -885,7 +887,7 @@ oper
 oper
   linVP : VForm -> VerbPhrase -> Str = \vf,vp ->
     let inf = {inf = vp.s ! vf ; fin=[]} ;
-        wo = wordOrder [] [] [] (vp.comp ! Pl3) inf vp ;
+        wo = wordOrder [] [] {p1,p2=[]} (vp.comp ! Pl3) inf vp ;
      in wo.beforeSTM ++ wo.afterSTM ;
 
   linCN : CNoun -> Str = \cn -> cn.s ! NomSg ++ cn.mod ! Sg ! Abs ;
diff --git a/src/somali/SentenceSom.gf b/src/somali/SentenceSom.gf
index e0ef4c1e..0c926b57 100644
--- a/src/somali/SentenceSom.gf
+++ b/src/somali/SentenceSom.gf
@@ -27,7 +27,10 @@ lin
 
 -}
   --  : Temp -> Pol -> ClSlash -> SSlash ; -- (that) she had not seen
-  --UseSlash t p cls = {s = \\b => t.s ++ p.s ++ cls.s ! b ! t.t ! t.a ! p.p} ;
+  UseSlash t p cls = {s = \\b =>
+    let sent = cls.s ! b ! t.t ! t.a ! p.p in
+    sent ** {beforeSTM = t.s ++ p.s ++ sent.beforeSTM}
+    } ;
 
 --2 Imperatives
   -- : VP -> Imp ;