romancs imp PlP1 forms ; Spanish ordinals over 1000

This commit is contained in:
aarne
2006-06-21 09:05:49 +00:00
parent c8f319d247
commit 8fa2d3a19c
7 changed files with 22 additions and 27 deletions

View File

@@ -78,9 +78,8 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
s = \\pol,aag =>
let
agr = aag ** {p = p} ;
verb = case <aag.n, pol,p> of {
<_,_, P1> => (vp.s ! VPFinite (VPres Conjunct) Simul).fin ! agr ;
<Sg,Neg,P2> => (vp.s ! VPFinite (VPres Conjunct) Simul).fin ! agr ;
verb = case <aag.n, pol> of {
<Sg,Neg> => (vp.s ! VPFinite (VPres Conjunct) Simul).fin ! agr ;
_ => (vp.s ! VPImperat).fin ! agr
} ;
neg = vp.neg ! pol ;

View File

@@ -60,8 +60,8 @@ lin pot2 d = spl (d.s ! hundra) ;
lin pot2plus d e =
{s = \\g => d.s ! hundra ! g ++ e.s ! g ; n = Pl} ;
lin pot2as3 n = n ;
lin pot3 n = spl (\\g => n.s ! g ++ mil g) ;
lin pot3plus n m = {s = \\g => n.s ! g ++ mil g ++ m.s ! g ; n = Pl} ;
lin pot3 n = spl (\\g => n.s ! NCard Masc ++ mil g) ;
lin pot3plus n m = {s = \\g => n.s ! NCard Masc ++ mil g ++ m.s ! g ; n = Pl} ;
oper
mkTal : (x1,_,_,_,_,_,_,x8 : Str) -> {s : DForm => CardOrd => Str} =