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

@@ -117,10 +117,7 @@ instance DiffFre of DiffRomance = open CommonRomance, PhonoFre, Prelude in {
s = \\pol,aag =>
let
agr = aag ** {p = p} ;
verb = case p of {
P1 => (vp.s ! VPFinite (VPres Indic) Simul).fin ! agr ;
_ => (vp.s ! VPImperat).fin ! agr --- P2 only
} ;
verb = (vp.s ! VPImperat).fin ! agr ;
neg = vp.neg ! pol ;
clpr = pronArgGen pol agr.n agr.p vp.clAcc vp.clDat ;
compl = neg.p2 ++ clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol

View File

@@ -131,7 +131,7 @@ lin
old_A =
prefA (compADeg (mkA "vieux" "vieille" "vieux" "vieillement")) ; ---- vieil
open_V2 = ouvrir_V2 ;
paint_V2A = mkV2A (v2V peindre_V2) accusative (mkPreposition "en") ;
paint_V2A = mkV2A (v2V peindre_V2) accusative (mkPrep "en") ;
paper_N = regGenN "papier" masculine ;
paris_PN = mkPN "Paris" masculine ;
peace_N = regGenN "paix" feminine ;
@@ -323,7 +323,7 @@ lin
hunt_V2 = dirV2 (regV "chasser") ;
kill_V2 = dirV2 (regV "tuer") ;
laugh_V = rire_V2 ;
lie_V = reflV étendre_V2 ;
lie_V = reflV (v2V étendre_V2) ;
play_V = regV "jouer" ;
pull_V2 = dirV2 (regV "tirer") ;
push_V2 = dirV2 (regV "pousser") ;
@@ -331,7 +331,7 @@ lin
scratch_V2 = dirV2 (regV "gratter") ;
sew_V = coudre_V2 ;
sing_V = regV "chanter" ;
sit_V = reflV asseoir_V2 ;
sit_V = reflV (v2V asseoir_V2) ;
smell_V = v2V ( sentir_V2) ;
spit_V = regV "cracher" ;
squeeze_V2 = dirV2 (regV "serrer") ;
@@ -348,9 +348,8 @@ lin
wash_V2 = dirV2 (regV "laver") ;
wipe_V2 = dirV2 (regV "essuyer") ;
hold_V2 = dirV2 tenir_V2 ;
split_V2 = dirV2 fendre_V2 ;
lie_V = reflV étendre_V2 ;
sit_V = reflV asseoir_V2 ;
hold_V2 = tenir_V2 ;
split_V2 = fendre_V2 ;
sit_V = reflV (v2V asseoir_V2) ;
} ;

View File

@@ -290,9 +290,9 @@ oper
plural = Pl ;
Preposition = Compl ;
accusative = complAcc ;
genitive = complGen ;
dative = complDat ;
accusative = complAcc ** {lock_Prep = <>} ;
genitive = complGen ** {lock_Prep = <>} ;
dative = complDat ** {lock_Prep = <>} ;
mkPrep p = {s = p ; c = Acc ; isDir = False ; lock_Prep = <>} ;
--- obsolete
@@ -348,8 +348,8 @@ oper
v2V v = v ** {lock_V = <>} ;
mkV3 v p q = v ** {c2 = p ; c3 = q ; lock_V3 = <>} ;
dirV3 v p = mkV3 v complAcc p ;
dirdirV3 v = dirV3 v complDat ;
dirV3 v p = mkV3 v accusative p ;
dirdirV3 v = dirV3 v dative ;
V0 : Type = V ;
V2S, V2V, V2Q : Type = V2 ;