mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-09 04:59:31 -06:00
using le for AAnter in Chi; adjustments of CompAP rules in Chi
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
concrete CatChi of Cat = CommonX - [Tense, Temp, Adv] ** open ResChi, Prelude in {
|
||||
concrete CatChi of Cat = CommonX - [Tense, Temp, Ant, Adv] ** open ResChi, Prelude in {
|
||||
|
||||
lincat
|
||||
|
||||
@@ -81,6 +81,6 @@ concrete CatChi of Cat = CommonX - [Tense, Temp, Adv] ** open ResChi, Prelude in
|
||||
|
||||
Temp = {s : Str ; t : Aspect} ;
|
||||
Tense = {s : Str ; t : Aspect} ;
|
||||
|
||||
Ant = {s : Str ; t : Aspect} ;
|
||||
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ concrete ParseChi of ParseEngAbs =
|
||||
QuestionChi,
|
||||
RelativeChi,
|
||||
IdiomChi [NP, VP, Tense, Cl, ProgrVP, ExistNP],
|
||||
ExtraChi [NP, Quant, VPSlash, VP, Tense, Aspect, GenNP, PassVPSlash,
|
||||
ExtraChi [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,
|
||||
ClSlash, RCl, EmptyRelSlash, ListCN, ConjCN, BaseCN, ConsCN],
|
||||
|
||||
@@ -118,7 +118,10 @@ oper
|
||||
copula : Verb = mkVerb "是" [] [] [] [] "不" ;
|
||||
hen_copula : Verb =
|
||||
{s = hen_s ; sn = [] ; pp = [] ; ds = [] ; dp = [] ; ep = [] ; neg = "不"} ; ---
|
||||
nocopula : Verb = mkVerb [] [] [] [] [] "不" ;
|
||||
nocopula : Verb =
|
||||
{s = [] ; sn = "是" ; pp = [] ; ds = [] ; dp = [] ; ep = [] ; neg = "不"} ; ---
|
||||
adjcopula : Verb =
|
||||
{s = "是" ; sn = [] ; pp = [] ; ds = [] ; dp = [] ; ep = [] ; neg = "不"} ; ---
|
||||
|
||||
regVerb : (walk : Str) -> Verb = \v ->
|
||||
mkVerb v "了" "着" "在" "过" "没" ;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
concrete TenseChi of Tense =
|
||||
CatChi [Tense,Temp], TenseX [Ant,Pol,AAnter,ASimul,PNeg,PPos] ** open ResChi in {
|
||||
CatChi [Tense,Temp,Ant], TenseX [Pol,PNeg,PPos] ** open ResChi in {
|
||||
|
||||
lin
|
||||
TTAnt t a = {s = t.s ++ a.s ; t = t.t} ;
|
||||
TTAnt t a = {s = t.s ++ a.s ; t = case a.t of {APerf => APerf ; _ => t.t}} ;
|
||||
|
||||
---- ??
|
||||
TPres = {s = [] ; t = APlain} ;
|
||||
@@ -10,4 +10,7 @@ concrete TenseChi of Tense =
|
||||
TFut = {s = [] ; t = ADurProg} ;
|
||||
TCond = {s = [] ; t = ADurStat} ;
|
||||
|
||||
ASimul = {s = [] ; t = APlain} ;
|
||||
AAnter = {s = [] ; t = APerf} ;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
concrete TextChi of Text = CommonX - [Temp,Tense,Adv] ** open ResChi in {
|
||||
concrete TextChi of Text = CommonX - [Temp,Tense,Ant,Adv] ** open ResChi in {
|
||||
|
||||
-- No punctuation - but make sure to leave spaces between sentences!
|
||||
|
||||
|
||||
@@ -54,11 +54,10 @@ concrete VerbChi of Verb = CatChi ** open ResChi, Prelude in {
|
||||
|
||||
PassV2 v = insertAdv (mkNP passive_s) (predV v v.part) ; ----
|
||||
|
||||
CompAP ap = insertObj (mkNP ap.s) (
|
||||
case ap.hasAdA of {
|
||||
True => predV nocopula [] ;
|
||||
False => predV hen_copula []}
|
||||
) ;
|
||||
CompAP ap = case ap.hasAdA of {
|
||||
True => insertObj (mkNP ap.s) (predV nocopula []) ;
|
||||
False => insertObj (mkNP (ap.s ++ de_s)) (predV copula [])
|
||||
} ;
|
||||
|
||||
CompNP np = insertObj np (predV copula []) ; ----
|
||||
|
||||
|
||||
Reference in New Issue
Block a user