rename the s2 field in VP and VPSlash to compl

lib/resource-1.4/bulgarian/CatBul.gf

@@ -55,7 +55,7 @@ concrete CatBul of Cat = open ResBul, Prelude, (R = ParamX) in {
       s : ResBul.Tense => Anteriority => Polarity => Agr => Bool => Aspect => Str ;
       imp : Polarity => Number => Aspect => Str ;
       ad : Bool => Str ;
-      s2 : Agr => Str ;
+      compl : Agr => Str ;
       subjRole : Role
     } ;
 

lib/resource-1.4/bulgarian/IdiomBul.gf

@@ -58,13 +58,13 @@ concrete IdiomBul of Idiom = CatBul ** open Prelude, ParadigmsBul, ResBul in {
       s   = \\t,a,p,agr,q,asp => vp.s ! t ! a ! p ! agr ! q ! Imperf ;
       imp = \\p,n,_ => vp.imp ! p ! n ! Imperf ;
       ad = vp.ad ;
-      s2 = vp.s2 ;
+      compl = vp.compl ;
       subjRole = vp.subjRole
       } ;
 
     ImpPl1 vp = {s = "íåêà" ++
                      vp.s ! Pres ! Simul ! Pos ! {gn = GPl ; p = P1} ! False ! Imperf ++
-                     vp.s2 ! {gn = GPl ; p = P1}
+                     vp.compl ! {gn = GPl ; p = P1}
                 } ;
 }
 

lib/resource-1.4/bulgarian/PhraseBul.gf

@@ -15,7 +15,7 @@ concrete PhraseBul of Phrase = CatBul ** open Prelude, ResBul in {
     UttVP vp = {s = vp.ad ! False ++
                     "äà" ++ 
                     vp.s ! Pres ! Simul ! Pos ! agrP3 (GSg Neut) ! False ! Perf ++ 
-                    vp.s2 ! agrP3 (GSg Neut)} ;
+                    vp.compl ! agrP3 (GSg Neut)} ;
     UttAdv adv = adv ;
 
     NoPConj = {s = []} ;

lib/resource-1.4/bulgarian/ResBul.gf

@@ -199,7 +199,7 @@ resource ResBul = ParamX ** open Prelude in {
       s     : Tense => Anteriority => Polarity => Agr => Bool => Aspect => Str ;
       imp   : Polarity => Number => Aspect => Str ;
       ad    : Bool => Str ;          -- sentential adverb
-      s2  : Agr => Str ;
+      compl : Agr => Str ;
       subjRole : Role
     } ;
 
@@ -275,7 +275,7 @@ resource ResBul = ParamX ** open Prelude in {
                               Neg => "íå" ++ verb.s ! Imperf ! VImperative n
                             } ;
              ad = \\_ => [] ;
-             s2 = \\_ => [] ;
+             compl = \\_ => [] ;
              subjRole = case verb.vtype of {
                           VNormal    => RSubj ;
                           VMedial  _ => RSubj ;
@@ -287,7 +287,7 @@ resource ResBul = ParamX ** open Prelude in {
       s     = vp.s ;
       imp   = vp.imp ;
       ad    = vp.ad ;
-      s2 = \\a => vp.s2 ! a ++ obj ! a ;
+      compl = \\a => vp.compl ! a ++ obj ! a ;
       subjRole = vp.subjRole
       } ;
 
@@ -418,7 +418,7 @@ resource ResBul = ParamX ** open Prelude in {
         let 
           verb  : Bool => Str
                 = \\q => vp.ad ! q ++ vp.s ! t ! a ! p ! agr_vp ! q ! Perf ;
-          compl = vp.s2 ! agr_compl
+          compl = vp.compl ! agr_compl
         in case o of {
              Main  => subj ++ verb ! False ++ compl ;
              Inv   => verb ! False ++ compl ++ subj ;

lib/resource-1.4/bulgarian/SentenceBul.gf

@@ -11,7 +11,7 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
       s = \\p,gn => 
         let agr = {gn = gn ; p = P2} ;
             verb = vp.imp ! p ! numGenNum gn ! Perf ;
-            compl = vp.s2 ! agr
+            compl = vp.compl ! agr
         in
         verb ++ compl
     } ;

lib/resource-1.4/bulgarian/VerbBul.gf

@@ -21,7 +21,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
         in vv_verb ++ vp.ad ! False ++ "äà" ++ vp_verb ;
       imp = vp.imp ;
       ad = \\_ => [] ;
-      s2 = vp.s2 ;
+      compl = vp.compl ;
       subjRole = vp.subjRole
       } ;
 
@@ -61,7 +61,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
           slash_verb = slash.s ! Pres ! Simul ! Pos ! {gn = gennum DMasc n; p = P2} ! False ! Perf ;
         in vv_verb ++ slash.ad ! False ++ "äà" ++ slash_verb ;
       ad = \\_ => [] ;
-      s2 = slash.s2 ;
+      compl = slash.compl ;
       subjRole = (predV vv).subjRole
       } ** {c2 = slash.c2} ;
 
@@ -78,7 +78,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
           slash_verb = slash.s ! Pres ! Simul ! Pos ! np.a ! False ! Perf ;
         in vv_verb ++ vv.c2.s ++ np.s ! RObj vv.c2.c ++ slash.ad ! False ++ "äà" ++ slash_verb ;
       ad = \\_ => [] ;
-      s2 = slash.s2 ;
+      compl = slash.compl ;
       subjRole = (predV vv).subjRole
       } ** {c2 = slash.c2} ;
 
@@ -86,7 +86,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
       s   = slash.s ;
       imp = slash.imp ;
       ad  = slash.ad ;
-      s2 = \\_ => slash.c2.s ++ np.s ! RObj slash.c2.c ++ slash.s2 ! np.a ;
+      compl = \\_ => slash.c2.s ++ np.s ! RObj slash.c2.c ++ slash.compl ! np.a ;
       subjRole = slash.subjRole
       } ;
 
@@ -98,7 +98,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
       s   = \\t,a,p,agr,q,asp => vp.s ! t ! a ! p ! agr ! False ! asp ;
       imp = vp.imp ;
       ad  = \\q => vp.ad ! q ++ adv.s ++ case q of {True => "ëè"; False => []} ;
-      s2 = vp.s2 ;
+      compl = vp.compl ;
       subjRole = vp.subjRole
       } ;