From ccfa60cbba26dd2fdaafea0616628506d1de7339 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Thu, 29 Nov 2018 15:52:17 +0100 Subject: [PATCH] (Ara) Fixes in noun attributes --- src/arabic/NounAra.gf | 2 +- src/arabic/ParadigmsAra.gf | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/arabic/NounAra.gf b/src/arabic/NounAra.gf index c1d99ad51..27edb0d4f 100644 --- a/src/arabic/NounAra.gf +++ b/src/arabic/NounAra.gf @@ -195,7 +195,7 @@ lin -- : CN -> NP -> CN ; -- house of Paris, house of mine PossNP cn np = cn ** { s = \\n,_d,c => cn.s ! n ! Const ! c ; - s2 = \\n,_d,c => cn.s2 ! n ! Const ! Gen ; -- unsure about this /IL + s2 = \\n,_d,c => cn.s2 ! n ! Const ! Gen ; np = \\c => cn.np ! c ++ np.s ! Gen }; diff --git a/src/arabic/ParadigmsAra.gf b/src/arabic/ParadigmsAra.gf index 6859260c2..f13c1664d 100644 --- a/src/arabic/ParadigmsAra.gf +++ b/src/arabic/ParadigmsAra.gf @@ -362,10 +362,9 @@ resource ParadigmsAra = open attrN : Number -> N -> N -> N = \num,n1,n2 -> n1 ** { s = \\n,_,c => n1.s ! n ! Const ! c ; - s2 = \\n,s,c => let c' = case c of {Dat => Gen; _ => c} in -- the Dat with liPrep hack only applies to the first word - n1.s2 ! num ! s ! c' -- attribute doesn't change - ++ n2.s ! num ! s ! c' - ++ n2.s2 ! num ! s ! c'} ; + s2 = \\n,s,_ => n1.s2 ! num ! s ! Gen -- attribute doesn't change + ++ n2.s ! num ! s ! Gen + ++ n2.s2 ! num ! s ! Gen} ; dualN : N -> N = \n -> n ** {isDual=True} ;