From ec1605fb2483febda540b2a20d1cf4877b072fda Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Sun, 26 Feb 2006 11:16:53 +0000
Subject: [PATCH] bug fixed (?) in compilation

---
 resource-1.0/scandinavian/NounScand.gf | 2 +-
 resource-1.0/spanish/NumeralSpa.gf     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/resource-1.0/scandinavian/NounScand.gf b/resource-1.0/scandinavian/NounScand.gf
index 40a951d0a..c229c9004 100644
--- a/resource-1.0/scandinavian/NounScand.gf
+++ b/resource-1.0/scandinavian/NounScand.gf
@@ -1,7 +1,7 @@
 incomplete concrete NounScand of Noun =
    CatScand ** open CommonScand, ResScand, Prelude in {
 
-  flags optimize=none_subs ; ---- all_subs
+  flags optimize=all_subs ;
 
 -- The rule defines $Det Quant Num Ord CN$ where $Det$ is empty if
 -- it is the definite article ($DefSg$ or $DefPl$) and both $Num$ and
diff --git a/resource-1.0/spanish/NumeralSpa.gf b/resource-1.0/spanish/NumeralSpa.gf
index 88fce62f0..e15b35fe0 100644
--- a/resource-1.0/spanish/NumeralSpa.gf
+++ b/resource-1.0/spanish/NumeralSpa.gf
@@ -36,6 +36,10 @@ lin n8  =
 lin n9  =
   {inh = conj ; s = table {{p1 = unit ; p2 = mod} => "nueve" ; {p1 = unit ; p2 = unmod} => "nueve" ; {p1 = unit ; p2 = conj} => "y" ++ "nueve" ; {p1 = teen ; p2 = mod} => "diecinueve" ; {p1 = teen ; p2 = unmod} => "diecinueve" ; {p1 = teen ; p2 = conj} => "diecinueve" ; {p1 = ten ; p2 = mod} => "noventa" ; {p1 = ten ; p2 = unmod} => "noventa" ; {p1 = ten ; p2 = conj} => "noventa" ; {p1 = hundred ; p2 = mod} => "novecientos" ; {p1 = hundred ; p2 = unmod} => "novecientos" ; {p1 = hundred ; p2 = conj} => "novecientos"}} ;
 lin pot01  =
+  let
+    uno  : Gender => Str = table {Masc => "uno" ; Fem => "una"} ;
+    yuno : Gender => Str = \\g => "y" ++ uno ! g ;
+  in
   {s = table {{p1 = unit ; p2 = mod} => uno ; {p1 = unit ; p2 = unmod}
   => uno ; {p1 = unit ; p2 = conj} => yuno ; {p1 = teen ; p2 = mod} =>
   uno ; {p1 = teen ; p2 = unmod} => uno ; {p1 = teen ; p2 = conj} =>
@@ -74,7 +78,5 @@ param Modif = mod  | unmod  | conj  ;
 oper spl : Str -> {s : Gender => Str ; n : Number} = \s -> {s = \\_ =>
   s ; n = Pl} ;
 
-  uno  : Gender => Str = table {Masc => "uno" ; Fem => "una"} ;
-  yuno : Gender => Str = \\g => "y" ++ uno ! g ;
 
 }