mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-25 02:38:55 -06:00
tense update for lib/resource/english
This commit is contained in:
@@ -52,7 +52,7 @@ lin
|
||||
UseInt i = {s = table {Nom => i.s ; Gen => i.s ++ "'s"}} ; ---
|
||||
NoNum = noNum ;
|
||||
|
||||
SymbPN i = {s = table {Nom => i.s ; Gen => i.s ++ "'s"}} ; ---
|
||||
SymbPN i = {s = table {Nom => i.s ; Gen => i.s ++ "'s"} ; g = Neutr} ; ---
|
||||
SymbCN cn s =
|
||||
{s = \\n,c => cn.s ! n ! c ++ s.s ;
|
||||
g = cn.g} ;
|
||||
@@ -71,25 +71,25 @@ lin
|
||||
PredVA = complAdjVerb ;
|
||||
PredVV2 = transVerbVerb ;
|
||||
|
||||
UseV2V x = x ;
|
||||
UseV2V x = x ** {isAux = False} ;
|
||||
UseV2S x = x ;
|
||||
UseV2Q x = x ;
|
||||
UseA2S x = x ;
|
||||
UseA2V x = x ;
|
||||
|
||||
UseCl tp cl = {s = tp.s ++ cl.s ! tp.b ! t2cl tp.t tp.a} ;
|
||||
UseCl tp cl = {s = tp.s ++ cl.s ! tp.b ! VFinite tp.t tp.a} ;
|
||||
|
||||
PosVP tp = predVerbGroup True tp.a ;
|
||||
NegVP tp = predVerbGroup False tp.a ;
|
||||
|
||||
ProgVP = progressiveVerbPhrase ;
|
||||
ProgVG = progressiveVerbPhrase ;
|
||||
|
||||
PosTP t a = {s = t.s ++ a.s ; b = True ; t = t.t ; a = a.a} ;
|
||||
NegTP t a = {s = t.s ++ a.s ; b = False ; t = t.t ; a = a.a} ;
|
||||
TPresent = {s = [] ; t = ClPresent} ;
|
||||
TPast = {s = [] ; t = ClPast} ;
|
||||
TFuture = {s = [] ; t = ClFuture} ;
|
||||
TConditional = {s = [] ; t = ClConditional} ;
|
||||
TPresent = {s = [] ; t = Present} ;
|
||||
TPast = {s = [] ; t = Past} ;
|
||||
TFuture = {s = [] ; t = Future} ;
|
||||
TConditional = {s = [] ; t = Conditional} ;
|
||||
ASimul = {s = [] ; a = Simul} ;
|
||||
AAnter = {s = [] ; a = Anter} ;
|
||||
|
||||
@@ -108,7 +108,7 @@ lin
|
||||
PredVV = complVerbVerb ;
|
||||
PredVQ = complQuestVerb ;
|
||||
VTrans = transAsVerb ;
|
||||
PredV0 rain = predVerbGroupClause pronIt (predVerb rain) ;
|
||||
PredV0 rain = predVerbGroupClause (pronNounPhrase pronIt) (predVerb rain) ;
|
||||
|
||||
PredAS = predAdjSent ;
|
||||
PredA2S = predAdjSent2 ;
|
||||
@@ -124,15 +124,16 @@ lin
|
||||
AdvAP = advAdjPhrase ;
|
||||
|
||||
SlashV2 = slashTransVerbCl ;
|
||||
OneVP = predVerbGroupClause (nameNounPhrase (nameReg "one")) ;
|
||||
OneVP = predVerbGroupClause (nameNounPhrase (nameReg "one" human)) ;
|
||||
---- ThereNP = thereIs ;
|
||||
|
||||
ExistCN A = predVerbGroupClause
|
||||
(nameNounPhrase (nameReg "there"))
|
||||
(nameNounPhrase (nameReg "there" Neutr))
|
||||
(complTransVerb (mkTransVerbDir verbBe)
|
||||
(indefNounPhrase singular A)) ;
|
||||
ExistNumCN nu A =
|
||||
predVerbGroupClause
|
||||
(nameNounPhrasePl (nameReg "there"))
|
||||
(nameNounPhrasePl (nameReg "there" Neutr))
|
||||
(complTransVerb (mkTransVerbDir verbBe)
|
||||
(indefNounPhraseNum plural nu A)) ;
|
||||
|
||||
@@ -143,10 +144,7 @@ lin
|
||||
ModRS = modRelClause ;
|
||||
RelCl = relSuch ;
|
||||
|
||||
UseRCl tp cl =
|
||||
{s = \\g,n =>
|
||||
tp.s ++ cl.s ! tp.b ! (cl2s (t2cl tp.t tp.a) n P3).form ! g ! n} ;
|
||||
--- P3 ==> p
|
||||
UseRCl tp cl = {s = \\a => tp.s ++ cl.s ! tp.b ! VFinite tp.t tp.a ! a} ;
|
||||
|
||||
WhoOne = intPronWho singular ;
|
||||
WhoMany = intPronWho plural ;
|
||||
@@ -161,19 +159,18 @@ lin
|
||||
IntSlash = intSlash ;
|
||||
QuestAdv = questAdverbial ;
|
||||
|
||||
UseQCl tp cl = {s = \\q => tp.s ++ cl.s ! tp.b ! t2cl tp.t tp.a ! q} ;
|
||||
UseQCl tp cl = {s = \\q => tp.s ++ cl.s ! tp.b ! VFinite tp.t tp.a ! q} ;
|
||||
|
||||
ExistQCl A = questVerbPhrase
|
||||
(nameNounPhrase (nameReg "there"))
|
||||
(nameNounPhrase (nameReg "there" Neutr))
|
||||
(complTransVerb (mkTransVerbDir verbBe)
|
||||
(indefNounPhrase singular A)) ;
|
||||
ExistNumQCl nu A =
|
||||
questVerbPhrase
|
||||
(nameNounPhrasePl (nameReg "there"))
|
||||
(nameNounPhrasePl (nameReg "there" Neutr))
|
||||
(complTransVerb (mkTransVerbDir verbBe)
|
||||
(indefNounPhraseNum plural nu A)) ;
|
||||
|
||||
|
||||
PosImperVP = imperVerbPhrase True ;
|
||||
NegImperVP = imperVerbPhrase False ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user