forked from GitHub/gf-rgl
fix the lexical aspect for negative imperatives. also temporary remove the comma from EmbedS
This commit is contained in:
@@ -16,15 +16,16 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
|
|||||||
ImpVP vp = {
|
ImpVP vp = {
|
||||||
s = \\p,gn =>
|
s = \\p,gn =>
|
||||||
let agr = {gn = gn ; p = P2} ;
|
let agr = {gn = gn ; p = P2} ;
|
||||||
verb = vp.s ! Perf ! VImperative (numGenNum gn) ;
|
verb : Aspect -> Str
|
||||||
|
= \asp -> vp.s ! asp ! VImperative (numGenNum gn) ;
|
||||||
compl = vp.compl ! agr ;
|
compl = vp.compl ! agr ;
|
||||||
clitic = case vp.vtype of {
|
clitic = case vp.vtype of {
|
||||||
VNormal => [] ;
|
VNormal => [] ;
|
||||||
VMedial c => reflClitics ! c ;
|
VMedial c => reflClitics ! c ;
|
||||||
VPhrasal c => personalClitics ! c ! agr.gn ! agr.p
|
VPhrasal c => personalClitics ! c ! agr.gn ! agr.p
|
||||||
} ;
|
} ;
|
||||||
in case p of {Pos => vp.ad.s ++ verb ++ clitic ;
|
in case p of {Pos => vp.ad.s ++ verb Perf ++ clitic ;
|
||||||
Neg => "íå" ++ vp.ad.s ++ clitic ++ verb} ++ compl ;
|
Neg => "íå" ++ vp.ad.s ++ clitic ++ verb Imperf} ++ compl ;
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
SlashVP np slash = {
|
SlashVP np slash = {
|
||||||
@@ -50,7 +51,7 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
|
|||||||
c2 = slash.c2
|
c2 = slash.c2
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
EmbedS s = {s = \\_ => comma ++ "֌" ++ s.s} ;
|
EmbedS s = {s = \\_ => "֌" ++ s.s} ;
|
||||||
EmbedQS qs = {s = \\_ => qs.s ! QIndir} ;
|
EmbedQS qs = {s = \\_ => qs.s ! QIndir} ;
|
||||||
EmbedVP vp = {s = \\agr => daComplex Simul Pos vp ! Perf ! agr} ;
|
EmbedVP vp = {s = \\agr => daComplex Simul Pos vp ! Perf ! agr} ;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user