From c4a8c71e07af7f976c9f22e80abb663754d5defe Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Tue, 28 Jun 2005 11:54:34 +0000
Subject: [PATCH] closer to complete BasicFin

---
 lib/resource/finnish/BasicFin.gf     | 18 +++++++++---------
 lib/resource/finnish/ParadigmsFin.gf |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/resource/finnish/BasicFin.gf b/lib/resource/finnish/BasicFin.gf
index 7946b9068..2aa1bebe3 100644
--- a/lib/resource/finnish/BasicFin.gf
+++ b/lib/resource/finnish/BasicFin.gf
@@ -65,7 +65,7 @@ lin
   dirty_ADeg = mkADeg (regN "likainen") "likaisempi" "likaisin" ;
 ----  distance_N3 = mkN3 (regN "distance") "from" "to" ;
 --3  doctor_N = reg3N "tohtori" "tohtorin" "tohtoreita" ;
-  dog_N = reg3N "koira" ;
+  dog_N = regN "koira" ;
   door_N = reg2N "ovi" "ovia" ;
   drink_V2 = dirV2 (regV "juoda") ;
 ----  easy_A2V = mkA2V (regA "easy") "for" ;
@@ -104,7 +104,7 @@ lin
   industry_N = regN "teollisuus" ;
   iron_N = regN "rauta" ;
   king_N = regN "kuningas" ;
-  know_V2 = dirV2 (reg3V "tietää" "tiesi") ; --- tuntea; gives tietänyt
+  know_V2 = dirV2 (reg2V "tietää" "tiesi") ; --- tuntea; gives tietänyt
   lake_N = reg2N "järvi" "järviä" ;
   lamp_N = regN "lamppu" ;
   learn_V2 = 
@@ -176,7 +176,7 @@ lin
 ----  small_ADeg = regADeg "small" ;
   snake_N = regN "käärme" ;
   sock_N = regN "sukka" ;
-  speak_V2 = dirV2 (irregV "puhua") ;
+  speak_V2 = dirV2 (regV "puhua") ;
   star_N = reg2N "tähti" "tähtiä" ;
 ----  steel_N = regN "teräs" ;
   stone_N = reg2N "kivi" "kiviä" ;
@@ -189,7 +189,7 @@ lin
   table_N = regN "pöytä" ;
 ----  talk_V3 = mkV3 (regV "puhua") allative elative ;
   teacher_N = regN "opettaja" ;
-  teach_V2 = dirV2 (irregV "opettaa") ;
+  teach_V2 = dirV2 (regV "opettaa") ;
 --3  television_N = reg2N "televisio" "telievisioita" ;
   thick_ADeg = regADeg "paksu" ;
   thin_ADeg = regADeg "ohut" ;
@@ -201,7 +201,7 @@ lin
   understand_V2 = dirV2 (reg3V "ymmärtää" "ymmärrän" "ymmärsin") ;
   university_N = regN "yliopisto" ;
   village_N = regN "kylä" ;
-  wait_V2 = mkV2 (regV "odottaa") partitive ;
+  wait_V2 = caseV2 (regV "odottaa") partitive ;
   walk_V = (regV "kävellä") ;
 ----  warm_ADeg = regADeg "warm" ;
   war_N = regN "sota" ;
@@ -210,11 +210,11 @@ lin
   white_ADeg = regADeg "valkoinen" ;
   window_N = reg2N "ikkuna" "ikkunoita" ;
   wine_N = regN "viini" ;
-  win_V2 = dirV2 (irregV "voittaa") ;
+  win_V2 = dirV2 (regV "voittaa") ;
   woman_N = regN "nainen" ;
 --3  wonder_VQ = mkVQ (regV "ihmetellä") ;
   wood_N = regN "puu" ;
-  write_V2 = dirV2 (irregV "kirjoittaa") ;
+  write_V2 = dirV2 (regV "kirjoittaa") ;
   yellow_ADeg = regADeg "keltainen" ;
   young_ADeg = mkADeg (reg2N "nuori" "nuoria") "nuorempi" "nuorin" ;
 
@@ -223,9 +223,9 @@ lin
   already_Adv = mkAdv "jo" ;
   song_N = regN "laulu" ;
 ----  add_V3 = dirV3 (regV "lisätä") illative ;
-----  number_N = regN "numero" ; ---
+  number_N = reg2N "numero" "numeroita" ;
   put_V2 = dirV2 (regV "panna") ;
-  stop_V = regDuplV "pysähtyä" ;
+  stop_V = regV "pysähtyä" ;
   jump_V = regV "hypätä" ;
   here_Adv = mkAdv "täällä" ;
   here7to_Adv = mkAdv "tänne" ;
diff --git a/lib/resource/finnish/ParadigmsFin.gf b/lib/resource/finnish/ParadigmsFin.gf
index c099f474b..490a9fe50 100644
--- a/lib/resource/finnish/ParadigmsFin.gf
+++ b/lib/resource/finnish/ParadigmsFin.gf
@@ -462,5 +462,7 @@ reg3V soutaa soudan soudin =
   mkV2 = \v,c,p,o -> v ** {s3 = p ; s4 = o ; c = CCase c ; lock_V2 = <>} ;
   caseV2 = \v,c -> mkV2 v c [] [] ; 
   dirV2 v = mkTransVerbDir v ** {lock_V2 = <>} ;
+
+  mkAdv : Str -> Adv = \s -> {s = s ; lock_Adv = <>} ;
 } ;