From 10ac938d123c72755a7f75d76c693d0f0d96ced3 Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Wed, 20 Feb 2008 16:38:54 +0000
Subject: [PATCH] rename empty field to nonEmpty and fix the countabled

---
 lib/resource/bulgarian/CatBul.gf  |  4 ++--
 lib/resource/bulgarian/NounBul.gf | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/resource/bulgarian/CatBul.gf b/lib/resource/bulgarian/CatBul.gf
index 3bdd0a28e..966cd69ca 100644
--- a/lib/resource/bulgarian/CatBul.gf
+++ b/lib/resource/bulgarian/CatBul.gf
@@ -36,8 +36,8 @@ concrete CatBul of Cat = CommonX ** open ResBul, Prelude in {
     CN = {s : NForm => Str; g : DGender} ;
     NP, Pron = {s : Case => Str ; a : Agr} ;
     Det = {s : DGender => Case => Str ; n : Number; countable : Bool; spec : Species} ;
-    Predet, Ord = {s : AForm => Str; empty : Bool} ;
-    Num = {s : DGenderSpecies => Str; n : Number; empty : Bool} ;
+    Predet, Ord = {s : AForm => Str; nonEmpty : Bool} ;
+    Num = {s : DGenderSpecies => Str; n : Number; nonEmpty : Bool} ;
     Quant = {s : GenNum => Str; spec : Species} ;
 
 -- Numeral
diff --git a/lib/resource/bulgarian/NounBul.gf b/lib/resource/bulgarian/NounBul.gf
index 692b89c4f..2f31bfa03 100644
--- a/lib/resource/bulgarian/NounBul.gf
+++ b/lib/resource/bulgarian/NounBul.gf
@@ -25,16 +25,16 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
                    ord.s   ! aform (gennum g Sg) quant.spec c ;
       n = Sg ;
       countable = False ;
-      spec=case ord.empty of {True => quant.spec; _ => Indef}
+      spec=case ord.nonEmpty of {False => quant.spec; _ => Indef}
       } ;
 
     DetPl quant num ord = {
       s = \\g,c => quant.s ! gennum g num.n ++
                    num.s ! dgenderSpecies g quant.spec c ++
-                   ord.s ! aform (gennum g num.n) (case num.empty of {True => quant.spec; _ => Indef}) c ; 
+                   ord.s ! aform (gennum g num.n) (case num.nonEmpty of {False => quant.spec; _ => Indef}) c ; 
       n = num.n ;
-      countable = True ;
-      spec=case <num.empty,ord.empty> of {<True,True> => quant.spec; _ => Indef}
+      countable = num.nonEmpty ;
+      spec=case <num.nonEmpty,ord.nonEmpty> of {<False,False> => quant.spec; _ => Indef}
       } ;
 
     PossPron p = {
@@ -42,11 +42,11 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
       spec = Indef
       } ;
 
-    NoNum = {s = \\_ => []; n = Pl; empty = True} ;
-    NoOrd = {s = \\_ => []; empty = True} ;
+    NoNum = {s = \\_ => []; n = Pl; nonEmpty = False} ;
+    NoOrd = {s = \\_ => []; nonEmpty = False} ;
 
-    NumNumeral numeral = {s = \\gspec => numeral.s ! NCard gspec; n = numeral.n; empty = False} ;
-    OrdNumeral numeral = {s = \\aform => numeral.s ! NOrd aform; empty = False} ;
+    NumNumeral numeral = {s = \\gspec => numeral.s ! NCard gspec; n = numeral.n; nonEmpty = False} ;
+    OrdNumeral numeral = {s = \\aform => numeral.s ! NOrd aform; nonEmpty = False} ;
 
     DefArt = {
       s = \\_ => [] ;