mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-22 17:42:51 -06:00
remove no_RP from the parsing grammars and use EmptyRelSlash instead
This commit is contained in:
@@ -16,7 +16,8 @@ concrete ParseEngBul of ParseEngAbs =
|
|||||||
IdiomBul [NP, VP, Tense, Cl, ProgrVP, ExistNP],
|
IdiomBul [NP, VP, Tense, Cl, ProgrVP, ExistNP],
|
||||||
ExtraBul [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash,
|
ExtraBul [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash,
|
||||||
Temp, Pol, Conj, VPS, ListVPS, S, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS,
|
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 **
|
DictEngBul **
|
||||||
open ResBul, Prelude in {
|
open ResBul, Prelude in {
|
||||||
@@ -52,9 +53,6 @@ lin
|
|||||||
that_RP = {
|
that_RP = {
|
||||||
s = whichRP
|
s = whichRP
|
||||||
} ;
|
} ;
|
||||||
no_RP = {
|
|
||||||
s = whichRP
|
|
||||||
} ;
|
|
||||||
|
|
||||||
UseQuantPN q pn = { s = table {
|
UseQuantPN q pn = { s = table {
|
||||||
RObj Dat => "на" ++ pn.s;
|
RObj Dat => "на" ++ pn.s;
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ concrete ParseEng of ParseEngAbs =
|
|||||||
IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP],
|
IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP],
|
||||||
ExtraEng [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash,
|
ExtraEng [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash,
|
||||||
Temp, Pol, Conj, VPS, ListVPS, S, Num, CN, RP, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, GenRP,
|
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 **
|
DictEng **
|
||||||
open MorphoEng, ResEng, ParadigmsEng, Prelude in {
|
open MorphoEng, ResEng, ParadigmsEng, Prelude in {
|
||||||
@@ -106,10 +107,6 @@ lin
|
|||||||
s = \\_ => "that" ;
|
s = \\_ => "that" ;
|
||||||
a = RNoAg
|
a = RNoAg
|
||||||
} ;
|
} ;
|
||||||
no_RP = {
|
|
||||||
s = \\_ => "" ;
|
|
||||||
a = RNoAg
|
|
||||||
} ;
|
|
||||||
|
|
||||||
CompS s = {s = \\_ => "that" ++ s.s} ;
|
CompS s = {s = \\_ => "that" ++ s.s} ;
|
||||||
CompVP ant p vp = {s = \\a => ant.s ++ p.s ++
|
CompVP ant p vp = {s = \\a => ant.s ++ p.s ++
|
||||||
|
|||||||
@@ -15,7 +15,8 @@ abstract ParseEngAbs =
|
|||||||
Idiom [NP, VP, Cl, Tense, ProgrVP, ExistNP],
|
Idiom [NP, VP, Cl, Tense, ProgrVP, ExistNP],
|
||||||
Extra [NP, Quant, VPSlash, VP, GenNP, PassVPSlash,
|
Extra [NP, Quant, VPSlash, VP, GenNP, PassVPSlash,
|
||||||
Temp, Tense, Pol, Conj, VPS, ListVPS, S, Num, CN, RP, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, GenRP,
|
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 ** {
|
DictEngAbs ** {
|
||||||
|
|
||||||
flags
|
flags
|
||||||
@@ -50,7 +51,7 @@ fun CompoundCN : Num -> N -> CN -> CN ;
|
|||||||
|
|
||||||
PredVPosv,PredVPovs : NP -> VP -> Cl ;
|
PredVPosv,PredVPovs : NP -> VP -> Cl ;
|
||||||
|
|
||||||
that_RP, no_RP : RP ;
|
that_RP : RP ;
|
||||||
|
|
||||||
CompS : S -> Comp ;
|
CompS : S -> Comp ;
|
||||||
CompVP : Ant -> Pol -> VP -> Comp ;
|
CompVP : Ant -> Pol -> VP -> Comp ;
|
||||||
|
|||||||
Reference in New Issue
Block a user