From c7862899f23d464a5e35a9fdcfcbe0ec7692de69 Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Wed, 20 Feb 2008 10:58:40 +0000
Subject: [PATCH] Use GenNum in the Imp lincat instead of the old ImpF

---
 lib/resource/bulgarian/CatBul.gf      |  2 +-
 lib/resource/bulgarian/PhraseBul.gf   |  7 ++++---
 lib/resource/bulgarian/SentenceBul.gf | 12 +++---------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/resource/bulgarian/CatBul.gf b/lib/resource/bulgarian/CatBul.gf
index dcba8411e..5e5322cd9 100644
--- a/lib/resource/bulgarian/CatBul.gf
+++ b/lib/resource/bulgarian/CatBul.gf
@@ -12,7 +12,7 @@ concrete CatBul of Cat = CommonX ** open ResBul, Prelude in {
 -- Sentence
 
     Cl = {s : ResBul.Tense => Anteriority => Polarity => Order => Str} ;
-    Imp = {s : Polarity => ImpForm => Str} ;
+    Imp = {s : Polarity => GenNum => Str} ;
 
 -- Question
 
diff --git a/lib/resource/bulgarian/PhraseBul.gf b/lib/resource/bulgarian/PhraseBul.gf
index 994a607ac..96beab498 100644
--- a/lib/resource/bulgarian/PhraseBul.gf
+++ b/lib/resource/bulgarian/PhraseBul.gf
@@ -3,7 +3,8 @@ concrete PhraseBul of Phrase = CatBul ** open Prelude, ResBul in {
   lin
     UttS s = s ;
     UttQS qs = {s = qs.s ! QDir} ;
-    UttImpSg  pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Sg False} ;
-    UttImpPl  pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Pl False} ;
-    UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Sg True } ;
+    UttImpSg  pol imp = {s = pol.s ++ imp.s ! pol.p ! GSg Masc} ;
+    UttImpPl  pol imp = {s = pol.s ++ imp.s ! pol.p ! GPl} ;
+    UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! GPl} ;
+
 }
diff --git a/lib/resource/bulgarian/SentenceBul.gf b/lib/resource/bulgarian/SentenceBul.gf
index d50de8b49..636b0eae6 100644
--- a/lib/resource/bulgarian/SentenceBul.gf
+++ b/lib/resource/bulgarian/SentenceBul.gf
@@ -6,15 +6,9 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
     PredVP np vp = mkClause (np.s ! Nom) np.a vp ;
 
     ImpVP vp = {
-      s = \\p,i => 
-        let gn : GenNum =
-              case i of {
-                ImpF _  True => GPl ;
-                ImpF Sg _    => GSg (variants {Masc; Fem; Neut}) ;
-	        ImpF Pl _    => GPl
-	      } ;
-            agr = {gn = gn ; p = P2} ;
-            verb = vp.imp ! p ! numImp i ;
+      s = \\p,gn => 
+        let agr = {gn = gn ; p = P2} ;
+            verb = vp.imp ! p ! numGenNum gn ;
             compl = vp.s2 ! agr
         in
         verb ++ compl