mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-23 09:52:55 -06:00
now in the parsing grammar ComplVV gets as additional arguments the polarity and the anteriority
This commit is contained in:
@@ -7,7 +7,7 @@ concrete ParseEngBul of ParseEngAbs =
|
|||||||
NumeralBul,
|
NumeralBul,
|
||||||
SymbolBul [PN, Symb, MkSymb, SymbPN],
|
SymbolBul [PN, Symb, MkSymb, SymbPN],
|
||||||
ConjunctionBul,
|
ConjunctionBul,
|
||||||
VerbBul - [SlashV2V, PassV2, UseCopula],
|
VerbBul - [SlashV2V, PassV2, UseCopula, ComplVV],
|
||||||
AdverbBul,
|
AdverbBul,
|
||||||
PhraseBul,
|
PhraseBul,
|
||||||
SentenceBul,
|
SentenceBul,
|
||||||
@@ -75,6 +75,14 @@ lin
|
|||||||
daComplex ant.a p.p vp ! Perf ! agr)
|
daComplex ant.a p.p vp ! Perf ! agr)
|
||||||
(slashV vv vv.c2) ;
|
(slashV vv vv.c2) ;
|
||||||
|
|
||||||
|
ComplVV vv ant p vp =
|
||||||
|
insertObj (\\agr => ant.s ++ p.s ++
|
||||||
|
case vv.typ of {
|
||||||
|
VVInf => daComplex ant.a p.p vp ! Perf ! agr;
|
||||||
|
VVGerund => gerund vp ! Imperf ! agr
|
||||||
|
})
|
||||||
|
(predV vv) ;
|
||||||
|
|
||||||
PredVPosv np vp = {
|
PredVPosv np vp = {
|
||||||
s = \\t,a,p,o =>
|
s = \\t,a,p,o =>
|
||||||
let
|
let
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ concrete ParseEng of ParseEngAbs =
|
|||||||
NumeralEng,
|
NumeralEng,
|
||||||
SymbolEng [PN, Symb, MkSymb, SymbPN],
|
SymbolEng [PN, Symb, MkSymb, SymbPN],
|
||||||
ConjunctionEng,
|
ConjunctionEng,
|
||||||
VerbEng - [SlashV2V, PassV2, UseCopula],
|
VerbEng - [SlashV2V, PassV2, UseCopula, ComplVV],
|
||||||
AdverbEng,
|
AdverbEng,
|
||||||
PhraseEng,
|
PhraseEng,
|
||||||
SentenceEng,
|
SentenceEng,
|
||||||
@@ -74,6 +74,9 @@ lin
|
|||||||
v.c3 ++
|
v.c3 ++
|
||||||
vpi.s ! VVAux ! a)
|
vpi.s ! VVAux ! a)
|
||||||
(predVc v) ;
|
(predVc v) ;
|
||||||
|
ComplVV v a p vp = insertObj (\\agr => a.s ++ p.s ++
|
||||||
|
infVP v.typ vp a.a p.p agr)
|
||||||
|
(predVV v) ;
|
||||||
|
|
||||||
PredVPosv np vp = {
|
PredVPosv np vp = {
|
||||||
s = \\t,a,b,o =>
|
s = \\t,a,b,o =>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ abstract ParseEngAbs =
|
|||||||
Numeral,
|
Numeral,
|
||||||
Symbol [PN, Symb, String, MkSymb, SymbPN],
|
Symbol [PN, Symb, String, MkSymb, SymbPN],
|
||||||
Conjunction,
|
Conjunction,
|
||||||
Verb - [SlashV2V, PassV2, UseCopula],
|
Verb - [SlashV2V, PassV2, UseCopula, ComplVV],
|
||||||
Adverb,
|
Adverb,
|
||||||
Phrase,
|
Phrase,
|
||||||
Sentence,
|
Sentence,
|
||||||
@@ -46,6 +46,8 @@ fun CompoundCN : Num -> N -> CN -> CN ;
|
|||||||
|
|
||||||
SlashSlashV2V : V2V -> Ant -> Pol -> VPSlash -> VPSlash ;
|
SlashSlashV2V : V2V -> Ant -> Pol -> VPSlash -> VPSlash ;
|
||||||
|
|
||||||
|
ComplVV : VV -> Ant -> Pol -> VP -> VP ;
|
||||||
|
|
||||||
PredVPosv,PredVPovs : NP -> VP -> Cl ;
|
PredVPosv,PredVPovs : NP -> VP -> Cl ;
|
||||||
|
|
||||||
that_RP, no_RP : RP ;
|
that_RP, no_RP : RP ;
|
||||||
|
|||||||
Reference in New Issue
Block a user