From 21028dbe949626eb577762add47d4cb43dcfb77f Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Tue, 7 Oct 2008 18:17:32 +0000
Subject: [PATCH] the parameter for RS and RCl should be Agr and not GenNum
 (bulgarian)

---
 lib/resource/bulgarian/CatBul.gf      | 4 ++--
 lib/resource/bulgarian/IdiomBul.gf    | 2 +-
 lib/resource/bulgarian/NounBul.gf     | 5 ++---
 lib/resource/bulgarian/RelativeBul.gf | 8 ++++----
 lib/resource/bulgarian/SentenceBul.gf | 8 ++------
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/lib/resource/bulgarian/CatBul.gf b/lib/resource/bulgarian/CatBul.gf
index 257c4c0f2..e9202f095 100644
--- a/lib/resource/bulgarian/CatBul.gf
+++ b/lib/resource/bulgarian/CatBul.gf
@@ -25,7 +25,7 @@ concrete CatBul of Cat = open ResBul, Prelude, (R = ParamX) in {
 
     S  = {s : Str} ;
     QS = {s : QForm => Str} ;
-    RS = {s : GenNum => Str} ;
+    RS = {s : Agr => Str} ;
     SC  = {s : Str} ;
     SSlash = {s : Agr => Str ; c2 : Preposition} ;
 
@@ -48,7 +48,7 @@ concrete CatBul of Cat = open ResBul, Prelude, (R = ParamX) in {
 
 -- Relative
 
-    RCl = {s : ResBul.Tense => Anteriority => Polarity => GenNum => Str} ;
+    RCl = {s : ResBul.Tense => Anteriority => Polarity => Agr => Str} ;
     RP = {s : GenNum => Str} ;
 
 -- Verb
diff --git a/lib/resource/bulgarian/IdiomBul.gf b/lib/resource/bulgarian/IdiomBul.gf
index 40536ad2e..cd22f7908 100644
--- a/lib/resource/bulgarian/IdiomBul.gf
+++ b/lib/resource/bulgarian/IdiomBul.gf
@@ -10,7 +10,7 @@ concrete IdiomBul of Idiom = CatBul ** open Prelude, ParadigmsBul, ResBul in {
     CleftNP np rs = 
       mkClause (np.s ! RSubj)
                {gn=GSg Neut; p=np.a.p}
-               (insertObj (\\_ => thisRP ! np.a.gn ++ rs.s ! np.a.gn) (predV verbBe)) ;        
+               (insertObj (\\_ => thisRP ! np.a.gn ++ rs.s ! np.a) (predV verbBe)) ;        
         
     CleftAdv ad s = {s = \\t,a,p,o => case p of {Pos=>[]; Neg=>"νε"} ++ ad.s ++ s.s } ;
 
diff --git a/lib/resource/bulgarian/NounBul.gf b/lib/resource/bulgarian/NounBul.gf
index 8c939c31d..80aa20e22 100644
--- a/lib/resource/bulgarian/NounBul.gf
+++ b/lib/resource/bulgarian/NounBul.gf
@@ -168,7 +168,7 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
       g = cn.g
       } ;
     RelCN cn rs = {
-      s = \\nf => cn.s ! nf ++ rs.s ! gennum cn.g (numNForm nf) ;
+      s = \\nf => cn.s ! nf ++ rs.s ! {gn=gennum cn.g (numNForm nf); p=P3} ;
       g = cn.g
       } ;
     AdvCN cn ad = {
@@ -180,9 +180,8 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
 
     ApposCN cn np = {s = \\nf => cn.s ! nf ++ np.s ! RSubj; g=cn.g} ;
 
----- FIXME AR
     RelNP np rs = {
-      s = \\r => np.s ! r ++ rs.s ! np.a.gn ; ---- gennum cn.g (numNForm nf) ;
+      s = \\r => np.s ! r ++ rs.s ! np.a ;
       a = np.a
       } ;
 }
diff --git a/lib/resource/bulgarian/RelativeBul.gf b/lib/resource/bulgarian/RelativeBul.gf
index fefd03032..19e4f4af3 100644
--- a/lib/resource/bulgarian/RelativeBul.gf
+++ b/lib/resource/bulgarian/RelativeBul.gf
@@ -6,21 +6,21 @@ concrete RelativeBul of Relative = CatBul ** open ResBul in {
 
   lin
     RelCl cl = {
-      s = \\t,a,p,gn => suchRP ! gn ++ "χε" ++ cl.s ! t ! a ! p ! Main ; 
+      s = \\t,a,p,agr => suchRP ! agr.gn ++ "χε" ++ cl.s ! t ! a ! p ! Main ; 
       role = RSubj
       } ;
 
     RelVP rp vp = {
-      s = \\t,a,p,gn => 
+      s = \\t,a,p,agr => 
         let 
-          cl = mkClause (rp.s ! gn) {gn=gn; p=P3} vp
+          cl = mkClause (rp.s ! agr.gn) agr vp
         in
         cl.s ! t ! a ! p ! Main ;
       role = RSubj
       } ;
 
     RelSlash rp slash = {
-      s = \\t,a,p,gn => slash.c2.s ++ rp.s ! gn ++ slash.s ! (agrP3 gn) ! t ! a ! p ! Main ;
+      s = \\t,a,p,agr => slash.c2.s ++ rp.s ! agr.gn ++ slash.s ! agr ! t ! a ! p ! Main ;
       role = RObj Acc
       } ;
 
diff --git a/lib/resource/bulgarian/SentenceBul.gf b/lib/resource/bulgarian/SentenceBul.gf
index 36bbb7cf5..ff2bc0fd8 100644
--- a/lib/resource/bulgarian/SentenceBul.gf
+++ b/lib/resource/bulgarian/SentenceBul.gf
@@ -58,7 +58,7 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
       s = \\q => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! q
     } ;
     UseRCl t a p cl = {
-      s    = \\r => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! r ;
+      s    = \\agr => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! agr ;
       role = cl.role
     } ;
     UseSlash t a p cl = {
@@ -68,9 +68,5 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
 
     AdvS a s = {s = a.s ++ "," ++ s.s} ;
 
----- FIXME: guessed by AR
--- test: she walks , which is good
-
-    RelS s r = {s = s.s ++ "," ++ r.s ! gennum DNeut Sg} ;
-
+    RelS s r = {s = s.s ++ "," ++ r.s ! {gn=gennum DNeut Sg; p=P3}} ;
 }