From 780148b429246580d8a1be140486bee71aa09408 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Fri, 9 Nov 2007 14:02:11 +0000
Subject: [PATCH] debugging gfcc bug; resulted in some type annotations to work
 around problems

---
 resource-1.0/Makefile                    |  3 ++-
 resource-1.0/danish/DiffDan.gf           |  2 +-
 resource-1.0/norwegian/DiffNor.gf        |  2 +-
 resource-1.0/scandinavian/CommonScand.gf | 10 ++++++----
 resource-1.0/swedish/DiffSwe.gf          | 13 ++++++++++++-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/resource-1.0/Makefile b/resource-1.0/Makefile
index ca22600ad..180e1bb34 100644
--- a/resource-1.0/Makefile
+++ b/resource-1.0/Makefile
@@ -29,7 +29,8 @@ GFCCP=$(GFCC) -preproc=./mkPresent
 new:
 	export GF='../../bin/gf -s' ; make -e all
 
-all: chmod show-path prelude present alltenses mathematical api langs compiled
+all: langs compiled
+#all: chmod show-path prelude present alltenses mathematical api langs compiled
 
 chmod:
 	chmod a+x mkPresent
diff --git a/resource-1.0/danish/DiffDan.gf b/resource-1.0/danish/DiffDan.gf
index d79726432..cd7185def 100644
--- a/resource-1.0/danish/DiffDan.gf
+++ b/resource-1.0/danish/DiffDan.gf
@@ -10,7 +10,7 @@ instance DiffDan of DiffScand = open CommonScand, Prelude in {
     neutrum = Neutr ;
 
     gennum : Gender -> Number -> GenNum = \g,n ->
-      case <g,n> of {
+      case <<g,n> : Gender * Number> of {
         <Utr,  Sg> => SgUtr ;
         <Neutr,Sg> => SgNeutr ;
         _  => Plg
diff --git a/resource-1.0/norwegian/DiffNor.gf b/resource-1.0/norwegian/DiffNor.gf
index f69b25fba..d485f9e7e 100644
--- a/resource-1.0/norwegian/DiffNor.gf
+++ b/resource-1.0/norwegian/DiffNor.gf
@@ -11,7 +11,7 @@ instance DiffNor of DiffScand = open CommonScand, Prelude in {
     neutrum = Neutr ;
 
     gennum : Gender -> Number -> GenNum = \g,n ->
-      case <g,n> of {
+      case <<g,n> : Gender * Number> of {
         <Utr _,Sg> => SgUtr ;
         <Neutr,Sg> => SgNeutr ;
         _  => Plg
diff --git a/resource-1.0/scandinavian/CommonScand.gf b/resource-1.0/scandinavian/CommonScand.gf
index 7b4c32dce..39954df83 100644
--- a/resource-1.0/scandinavian/CommonScand.gf
+++ b/resource-1.0/scandinavian/CommonScand.gf
@@ -81,10 +81,12 @@ oper
 
 -- Used in $Noun.AdjCN$.
 
-  agrAdj : GenNum -> DetSpecies -> AFormPos = \gn,d -> case <gn,d> of {
-    <_,  DIndef> => Strong gn ;
-    <Plg,DDef _> => Weak Pl ;
-    _            => Weak Sg
+-----  agrAdj : GenNum -> DetSpecies -> AFormPos = \gn,d -> Strong gn ; --- debug
+  agrAdj : GenNum -> DetSpecies -> AFormPos = \gn,d -> 
+    case <<gn,d> : GenNum * DetSpecies> of {
+      <_,  DIndef> => Strong gn ;
+      <Plg,DDef _> => Weak Pl ;
+      _            => Weak Sg
     } ;
 
 -- Used in $DiffScand.predV$.
diff --git a/resource-1.0/swedish/DiffSwe.gf b/resource-1.0/swedish/DiffSwe.gf
index 434518a67..78a88dcb2 100644
--- a/resource-1.0/swedish/DiffSwe.gf
+++ b/resource-1.0/swedish/DiffSwe.gf
@@ -9,8 +9,19 @@ instance DiffSwe of DiffScand = open CommonScand, Prelude in {
     utrum = Utr ; 
     neutrum = Neutr ;
 
+    gennumN : Gender -> Number -> GenNum = \g,n -> Plg ; -----
     gennum : Gender -> Number -> GenNum = \g,n ->
-      case <g,n> of {
+{-
+--- debugging Compute 9/11/2007
+      case n of {
+        Sg => case g of {
+          Utr => SgUtr ;
+          Neutr => SgNeutr
+          } ;
+        _  => Plg
+        } ;
+-}
+      case <<g,n> : Gender * Number> of {
         <Utr,Sg> => SgUtr ;
         <Neutr,Sg> => SgNeutr ;
         _  => Plg