diff --git a/lib/src/bulgarian/ParseEngBul.gf b/lib/src/bulgarian/ParseEngBul.gf index c9ef515ea..afb56164a 100644 --- a/lib/src/bulgarian/ParseEngBul.gf +++ b/lib/src/bulgarian/ParseEngBul.gf @@ -16,7 +16,8 @@ concrete ParseEngBul of ParseEngAbs = IdiomBul [NP, VP, Tense, Cl, ProgrVP, ExistNP], ExtraBul [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash, Temp, Pol, Conj, VPS, ListVPS, S, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, - VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV], + VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV, + ClSlash, RCl, EmptyRelSlash], DictEngBul ** open ResBul, Prelude in { @@ -52,9 +53,6 @@ lin that_RP = { s = whichRP } ; - no_RP = { - s = whichRP - } ; UseQuantPN q pn = { s = table { RObj Dat => "на" ++ pn.s; diff --git a/lib/src/english/ParseEng.gf b/lib/src/english/ParseEng.gf index 2f0cac16a..8f44d3bce 100644 --- a/lib/src/english/ParseEng.gf +++ b/lib/src/english/ParseEng.gf @@ -16,7 +16,8 @@ concrete ParseEng of ParseEngAbs = IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP], ExtraEng [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash, Temp, Pol, Conj, VPS, ListVPS, S, Num, CN, RP, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, GenRP, - VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV], + VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV, + ClSlash, RCl, EmptyRelSlash], DictEng ** open MorphoEng, ResEng, ParadigmsEng, Prelude in { @@ -106,10 +107,6 @@ lin s = \\_ => "that" ; a = RNoAg } ; - no_RP = { - s = \\_ => "" ; - a = RNoAg - } ; CompS s = {s = \\_ => "that" ++ s.s} ; CompVP ant p vp = {s = \\a => ant.s ++ p.s ++ diff --git a/lib/src/english/ParseEngAbs.gf b/lib/src/english/ParseEngAbs.gf index ef3a29644..9c663c5a0 100644 --- a/lib/src/english/ParseEngAbs.gf +++ b/lib/src/english/ParseEngAbs.gf @@ -15,7 +15,8 @@ abstract ParseEngAbs = Idiom [NP, VP, Cl, Tense, ProgrVP, ExistNP], Extra [NP, Quant, VPSlash, VP, GenNP, PassVPSlash, Temp, Tense, Pol, Conj, VPS, ListVPS, S, Num, CN, RP, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, GenRP, - VPI, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV], + VPI, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV, + ClSlash, RCl, EmptyRelSlash], DictEngAbs ** { flags @@ -50,8 +51,8 @@ fun CompoundCN : Num -> N -> CN -> CN ; PredVPosv,PredVPovs : NP -> VP -> Cl ; - that_RP, no_RP : RP ; - + that_RP : RP ; + CompS : S -> Comp ; CompVP : Ant -> Pol -> VP -> Comp ;