From 2240335832b6dd2af2b85ddefe645f9c70b2d171 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Wed, 14 Aug 2019 13:52:45 +0200
Subject: [PATCH] (Som) Minor cleanup/typofix

---
 src/somali/ConjunctionSom.gf | 7 ++++---
 src/somali/ParamSom.gf       | 2 +-
 src/somali/PhraseSom.gf      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/somali/ConjunctionSom.gf b/src/somali/ConjunctionSom.gf
index c5d6e93cd..2a6c2015c 100644
--- a/src/somali/ConjunctionSom.gf
+++ b/src/somali/ConjunctionSom.gf
@@ -116,9 +116,10 @@ oper
 
  -- Like conjunctTable from prelude/Coordination.gf,
  -- but forces the first argument into absolutive.
-  conjunctNPTable : ConjDistr -> ({s1,s2 : Case => Str} ** BaseNP) -> {s : Case => Str ; st : State} = \co,xs -> xs **
-   {s = -- TODO if xs is a pronoun, make them use (pronTable ! xs.a).sp
-      table { cas => co.s1 ++ xs.s1 ! Abs ++ co.s2 ! xs.st ++ xs.s2 ! cas}} ;
+  conjunctNPTable : ConjDistr -> ({s1,s2 : Case => Str} ** BaseNP) -> NP = \co,xs -> lin NP (xs' ** {
+    s = \\c => co.s1 ++ xs.s1 ! Abs ++ co.s2 ! xs.st ++ xs.s2 ! c
+    }) ;
+
   conjunctRSTable : ConjDistr -> {s1,s2 : State => Gender => Case => Str} -> RS = \co,xs -> lin RS (xs ** {
     s = \\st,g,c => co.s1
                 ++ xs.s1 ! st ! g ! c
diff --git a/src/somali/ParamSom.gf b/src/somali/ParamSom.gf
index a09fbd03d..ab99bcdce 100644
--- a/src/somali/ParamSom.gf
+++ b/src/somali/ParamSom.gf
@@ -52,7 +52,7 @@ oper
     } where {
         allomF : Str -> DefTA = \wiilka ->
           case wiilka of {
-                _ + "ta" => DA ; _ + "sha" => SHA ;
+                _ + "ta" => TA ; _ + "sha" => SHA ;
                 _ + "da" => DA ; _ + "dha" => DHA } ;
         allomM : Str -> DefKA = \wiilka ->
           case wiilka of {
diff --git a/src/somali/PhraseSom.gf b/src/somali/PhraseSom.gf
index f3740b04b..846d7123a 100644
--- a/src/somali/PhraseSom.gf
+++ b/src/somali/PhraseSom.gf
@@ -17,7 +17,7 @@ concrete PhraseSom of Phrase = CatSom ** open Prelude, ResSom in {
     UttNP np = { s = np.s ! Abs} ;
     UttVP vp = { s = infVP vp } ;
     UttAdv adv = {s = linAdv adv} ;
-    UttCN n = {s = linCN n } ;
+    UttCN n = {s = linCN n} ;
     UttCard n = {s = n.s ! Mid} ;
     UttAP ap = { s = ap.s ! AF Sg Abs } ;
     UttInterj i = i ;