1
0
forked from GitHub/gf-rgl

sorting command list in Commands

This commit is contained in:
aarne
2008-06-08 19:27:20 +00:00
parent f1b939f7d1
commit 220e7eed63
3 changed files with 12 additions and 8 deletions

View File

@@ -27,7 +27,7 @@ concrete VerbEng of Verb = CatEng ** open ResEng in {
insertObj (\\a => infVP vv.isAux vp a) (predVV vv) ** insertObj (\\a => infVP vv.isAux vp a) (predVV vv) **
{c2 = vp.c2} ; {c2 = vp.c2} ;
SlashV2VNP vv np vp = SlashV2VNP vv np vp =
insertObjPre (\\_ => v.c2 ++ np.s ! Acc) insertObjPre (\\_ => vv.c2 ++ np.s ! Acc)
(insertObjc (\\a => infVP vv.isAux vp a) (predVc vv)) ** (insertObjc (\\a => infVP vv.isAux vp a) (predVc vv)) **
{c2 = vp.c2} ; {c2 = vp.c2} ;

View File

@@ -41,7 +41,7 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand **
MkVPI vp = { MkVPI vp = {
s = \\v,a => infVP vp a ---- no sup s = \\v,a => infVP vp a ---- no sup
} ; } ;
ConjVPI = conjunctTable2 VPIForm Agr ; ConjVPI = conjunctDistrTable2 VPIForm Agr ;
ComplVPIVV vv vpi = insertObj (\\a => vv.c2 ++ vpi.s ! VPIInf ! a) (predV vv) ; ComplVPIVV vv vpi = insertObj (\\a => vv.c2 ++ vpi.s ! VPIInf ! a) (predV vv) ;
} }

View File

@@ -59,7 +59,7 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
vpAgrClit : Agr -> VPAgr = \a -> vpAgrClit : Agr -> VPAgr = \a ->
vpAgrNone ; vpAgrNone ;
pronArg = \n,p,acc,dat -> pronArg = \n,p,acc,dat ->
let let
paccp = case acc of { paccp = case acc of {
CRefl => <reflPron n p Acc, p,True> ; CRefl => <reflPron n p Acc, p,True> ;
@@ -69,11 +69,15 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
pdatp = case dat of { pdatp = case dat of {
CPron ag an ap => <argPron ag an ap dative, ap,True> ; CPron ag an ap => <argPron ag an ap dative, ap,True> ;
_ => <[],P2,False> _ => <[],P2,False>
} } ;
in case <<paccp.p2, pdatp.p2> : Person * Person> of { defaultPronArg = <pdatp.p1 ++ paccp.p1, [], orB paccp.p3 pdatp.p3>
<P3,P3> => <"se" ++ paccp.p1, [],True> ; in
_ => <pdatp.p1 ++ paccp.p1, [],orB paccp.p3 pdatp.p3> case <<paccp.p2, pdatp.p2> : Person * Person> of {
} ; <P3,P3> => <"se" ++ paccp.p1, [], True> ;
_ => defaultPronArg
} ;
---- 8/6/2008 efficiency problem in pgf generation: replace the case expr with
---- defaultPronArg ;
mkImperative b p vp = { mkImperative b p vp = {
s = \\pol,aag => s = \\pol,aag =>