From 8f5dddfeb4b818d3616ae9cf75ebe7f34d2acf9e Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Wed, 29 Jun 2005 15:27:56 +0000
Subject: [PATCH] unoptimize for Java ; Finnish

---
 resource/finnish/BasicFin.gf      |  4 ++--
 resource/finnish/MorphoFin.gf     |  2 +-
 resource/finnish/ParadigmsFin.gf  | 18 ++++++++----------
 resource/finnish/SwadeshLexFin.gf |  6 +++---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/resource/finnish/BasicFin.gf b/resource/finnish/BasicFin.gf
index a323c37e6..6a0db6fda 100644
--- a/resource/finnish/BasicFin.gf
+++ b/resource/finnish/BasicFin.gf
@@ -113,7 +113,7 @@ lin
   leather_N = regN "nahka" ; --- nahan
   leave_V2 = dirV2 (regV "jättää") ;
   like_V2 = caseV2 (regV "pitää") elative ;
-  listen_V2 = caseV2 (reg3V "kuunnella" "kuuntelen" "kuuntelin") partitive ;
+  listen_V2 = caseV2 (reg3V "kuunnella" "kuuntelen" "kuunteli") partitive ;
   live_V = regV "elää" ;
   long_ADeg = mkADeg (regN "pitkä") "pitempi" "pisin" ;
   lose_V2 = dirV2 (regV "hävitä") ; --- hukata
@@ -200,7 +200,7 @@ lin
   tree_N = regN "puu" ;
  ---- trousers_N = regN "trousers" ;
   ugly_ADeg = mkADeg (regN "ruma") "rumempi" "rumin" ;
-  understand_V2 = dirV2 (reg3V "ymmärtää" "ymmärrän" "ymmärsin") ;
+  understand_V2 = dirV2 (reg3V "ymmärtää" "ymmärrän" "ymmärsi") ;
   university_N = regN "yliopisto" ;
   village_N = regN "kylä" ;
   wait_V2 = caseV2 (regV "odottaa") partitive ;
diff --git a/resource/finnish/MorphoFin.gf b/resource/finnish/MorphoFin.gf
index 82c330cbc..b786db6cb 100644
--- a/resource/finnish/MorphoFin.gf
+++ b/resource/finnish/MorphoFin.gf
@@ -921,7 +921,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
 
   vOttaa : (_,_ : Str) -> Verb = \ottaa,otan -> 
     let 
-      i = if_then_Str (pbool2bool (Predef.occurs "ou" ottaa)) "i" "oi"
+      i = "i" ; --- wrong rule if_then_Str (pbool2bool (Predef.occurs "ou" ottaa)) "i" "oi"
     in
     vHuoltaa ottaa otan (Predef.tk 2 ottaa + i) (Predef.tk 2 otan + i + "n") ;
 
diff --git a/resource/finnish/ParadigmsFin.gf b/resource/finnish/ParadigmsFin.gf
index 83d8b3f6a..1c8e0be23 100644
--- a/resource/finnish/ParadigmsFin.gf
+++ b/resource/finnish/ParadigmsFin.gf
@@ -402,8 +402,7 @@ regV soutaa =
     u = ifTok Str a "a" "u" "y" ;
     joi = Predef.tk 2 juo + (o + "i")
   in case ta of {
-    "st"        => vJuosta soutaa soudan (juo + "s"+u+"t") (juo + "t"+u) ;
-    "nn" | "rr" | "ll" => vJuosta soutaa soudan (juo +   o+u+"t") (juo + "t"+u) ;
+    "st" | "nn" | "rr" | "ll" => vJuosta soutaa soudan (juo +   o+u+"t") (juo + "t"+u) ;
       _ => case aa of {
     "aa" | "ää" => vOttaa soutaa (souda + "n") ;
     "da" | "dä" => vJuoda soutaa joi ;
@@ -429,7 +428,7 @@ reg2V : (soutaa,souti : Str) -> V = \soutaa,souti ->
     _ => soudat
     } ** {lock_V = <>} ;
 
-reg3V soutaa soudan soudin = 
+reg3V soutaa soudan souti = 
   let
     taa   = Predef.dp 3 soutaa ;
     ta    = init taa ;
@@ -439,15 +438,14 @@ reg3V soutaa soudan soudin =
     o  = last juo ;
     a = last aa ;
     u = ifTok Str a "a" "u" "y" ;
-    joi = init soudin
+    soudin = weakGrade souti + "n" ;
+    soudat = reg2V soutaa souti ;
   in case ta of {
-    "st" => vJuosta soutaa soudan (juo + "s"+u+"t") (juo + "t"+u) ;
-    "nn" | "rr" | "ll" => vJuosta soutaa soudan (juo +   o+u+"t") (juo + "t"+u) ;
+    "ll" => vJuosta soutaa soudan (juo +   o+u+"t") (juo + "t"+u) ;
       _ => case aa of {
-    "aa" | "ää" => vHuoltaa soutaa soudan (init soudin) soudin ;
-    "da" | "dä" => vJuoda soutaa joi ;
-    "ta" | "tä" => vOsata soutaa ;
-    _ => vHukkua soudan souda
+    "aa" | "ää" => vHuoltaa soutaa soudan souti soudin ;
+    "da" | "dä" => vJuoda soutaa souti ;
+    _ => soudat
     }} ** {lock_V = <>} ;
 
   vValua v = vSanoa v ** {lock_V = <>} ;
diff --git a/resource/finnish/SwadeshLexFin.gf b/resource/finnish/SwadeshLexFin.gf
index 4130f5456..1e7250ad4 100644
--- a/resource/finnish/SwadeshLexFin.gf
+++ b/resource/finnish/SwadeshLexFin.gf
@@ -211,7 +211,7 @@ concrete SwadeshLexFin of SwadeshLex = CategoriesFin
     hunt_V = regV "metsästää" ;
     kill_V = regV "tappaa" ;
     know_V =reg2V "tietää" "tiesin" ;
-    laugh_V = reg3V "nauraa" "nauran" "nauroin" ;
+    laugh_V = reg3V "nauraa" "nauran" "nauroi" ;
     lie_V = regV "maata" ;
     live_V = live_V ;
     play_V = UseV2 play_V2 ;
@@ -235,8 +235,8 @@ concrete SwadeshLexFin of SwadeshLex = CategoriesFin
     suck_V = regV "imeä" ;
     swell_V = mkV "turvota" "turpoaa" "turpoan" "turpoavat" "turvotkaa" "turvotaan"
       "turposi" "turposin" "turpoaisi" "turvonnut" "turvottu" "turvotun" ;
-    swim_V = reg3V "uida" "uin" "uin" ;
-    think_V = reg3V "ajatella" "ajattelen" "ajattelin" ;
+    swim_V = reg3V "uida" "uin" "ui" ;
+    think_V = reg3V "ajatella" "ajattelen" "ajatteli" ;
     throw_V = regV "heittää" ;
     tie_V = regV "sitoa" ;
     turn_V = regV "kääntyä" ;