From 220e7eed638623cc5ddba59291339f88ae82bbe6 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Sun, 8 Jun 2008 19:27:20 +0000
Subject: [PATCH] sorting command list in Commands

---
 resource-1.4/english/VerbEng.gf         |  2 +-
 resource-1.4/scandinavian/ExtraScand.gf |  2 +-
 resource-1.4/spanish/DiffSpa.gf         | 16 ++++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/resource-1.4/english/VerbEng.gf b/resource-1.4/english/VerbEng.gf
index 706a29246..b78f6e258 100644
--- a/resource-1.4/english/VerbEng.gf
+++ b/resource-1.4/english/VerbEng.gf
@@ -27,7 +27,7 @@ concrete VerbEng of Verb = CatEng ** open ResEng in {
       insertObj (\\a => infVP vv.isAux vp a) (predVV vv) **
         {c2 = vp.c2} ;
     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)) **
           {c2 = vp.c2} ;
 
diff --git a/resource-1.4/scandinavian/ExtraScand.gf b/resource-1.4/scandinavian/ExtraScand.gf
index e60cc0105..15bd59c56 100644
--- a/resource-1.4/scandinavian/ExtraScand.gf
+++ b/resource-1.4/scandinavian/ExtraScand.gf
@@ -41,7 +41,7 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand **
     MkVPI vp = {
       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) ;
 
 } 
diff --git a/resource-1.4/spanish/DiffSpa.gf b/resource-1.4/spanish/DiffSpa.gf
index e6c8d97f7..82803c995 100644
--- a/resource-1.4/spanish/DiffSpa.gf
+++ b/resource-1.4/spanish/DiffSpa.gf
@@ -59,7 +59,7 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
     vpAgrClit : Agr -> VPAgr = \a ->
       vpAgrNone ;
 
-    pronArg = \n,p,acc,dat ->
+    pronArg = \n,p,acc,dat -> 
       let 
         paccp = case acc of {
           CRefl   => <reflPron n p Acc, p,True> ;
@@ -69,11 +69,15 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
         pdatp = case dat of {
           CPron ag an ap => <argPron ag an ap dative, ap,True> ;
           _ => <[],P2,False>
-          }
-       in case <<paccp.p2, pdatp.p2> : Person * Person> of {
-          <P3,P3> => <"se" ++ paccp.p1, [],True> ;
-         _       => <pdatp.p1 ++ paccp.p1, [],orB paccp.p3 pdatp.p3>
-         } ;
+          } ;
+        defaultPronArg = <pdatp.p1 ++ paccp.p1, [], orB paccp.p3 pdatp.p3>
+      in 
+        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 = {
       s = \\pol,aag =>