From 3104497559a93a4e3edad3e569e1069f3a541df9 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Mon, 12 Nov 2007 12:36:40 +0000
Subject: [PATCH] fixed bug with prawitz transform of course-of-values tables
 in Compute

---
 resource-1.0/Makefile           | 4 +++-
 resource-1.0/spanish/DiffSpa.gf | 6 +++---
 resource-1.0/spanish/ResSpa.gf  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/resource-1.0/Makefile b/resource-1.0/Makefile
index f49fe61c..b482fb4d 100644
--- a/resource-1.0/Makefile
+++ b/resource-1.0/Makefile
@@ -156,7 +156,9 @@ gfdoc:
 	cp */Irreg???.gf doc/gfdoc
 	mv ../prelude/*.html doc/gfdoc
 
-gf3:
+gf3: gf3present gf3alltenses
+
+gf3alltenses:
 #	$(GFNew) arabic/GrammarAra.gf
 #	$(GFNew) catalan/Catalan.gf
 	$(GFNew) danish/Danish.gf
diff --git a/resource-1.0/spanish/DiffSpa.gf b/resource-1.0/spanish/DiffSpa.gf
index 603bb064..e6c8d97f 100644
--- a/resource-1.0/spanish/DiffSpa.gf
+++ b/resource-1.0/spanish/DiffSpa.gf
@@ -70,8 +70,8 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
           CPron ag an ap => <argPron ag an ap dative, ap,True> ;
           _ => <[],P2,False>
           }
-       in case <paccp.p2, pdatp.p2> of {
-         <P3,P3> => <"se" ++ paccp.p1, [],True> ;
+       in case <<paccp.p2, pdatp.p2> : Person * Person> of {
+          <P3,P3> => <"se" ++ paccp.p1, [],True> ;
          _       => <pdatp.p1 ++ paccp.p1, [],orB paccp.p3 pdatp.p3>
          } ;
 
@@ -139,7 +139,7 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
           _ => eux
           } ;
       in 
-      \g,n,p -> case <g,n,p> of { 
+      \g,n,p -> case <<g,n,p> : Gender * Number * Person> of { 
         <_,Sg,P1> => cases "me" "mí" ;
         <_,Sg,P2> => cases "te" "tí" ;
         <_,Pl,P1> => cases "nos" "nosotras" ; --- nosotros
diff --git a/resource-1.0/spanish/ResSpa.gf b/resource-1.0/spanish/ResSpa.gf
index 0479b8eb..c5576ce0 100644
--- a/resource-1.0/spanish/ResSpa.gf
+++ b/resource-1.0/spanish/ResSpa.gf
@@ -8,6 +8,6 @@
 
 instance ResSpa of ResRomance = DiffSpa ** open CommonRomance, Prelude in {
 
-  flags optimize=noexpand ;
+---  flags optimize=noexpand ;
 
 } ;