English:
-Finnish +Finnish: +missing many nominal forms of verbs; +the basic lexicon has some erroneous inflectional patterns; +possessive and interrogative suffixes have no proper lexer.
French:
no inverted questions;
diff --git a/lib/resource/finnish/BasicFin.gf b/lib/resource/finnish/BasicFin.gf
index 69f01a0d6..b3bd56db1 100644
--- a/lib/resource/finnish/BasicFin.gf
+++ b/lib/resource/finnish/BasicFin.gf
@@ -10,18 +10,18 @@ flags
lin
airplane_N = regN "lentokone" ;
- answer_V2S = mkV2S (regV "vastata") allative [] [] ;
+ answer_V2S = mkV2S (caseV2 (regV "vastata") allative) ;
apartment_N = regN "asunto" ;
apple_N = regN "omena" ; --- omenia, not omenoita
art_N = regN "taide" ;
- ask_V2Q = mkV2Q (regV "kysyä") ablative [] [] ;
+ ask_V2Q = mkV2Q (caseV2 (regV "kysyä") ablative) ;
baby_N = regN "vauva" ;
bad_ADeg = mkADeg (regN "paha") "pahempi" "pahin" ;
bank_N = regN "pankki" ;
beautiful_ADeg = mkADeg (regN "kaunis") "kauniimpi" "kaunein" ;
become_VA = mkVA (regV "tulla") translative ;
beer_N = regN "olut" ;
- beg_V2V = mkV2V (reg2V "pyytää" "pyysi") partitive inf_illative ;
+ beg_V2V = mkV2V (caseV2 (reg2V "pyytää" "pyysi") partitive) ;
big_ADeg = mkADeg (reg2N "suuri" "suuria") "suurempi" "suurin" ;
bike_N = nLukko "polkupyörä" ; --- for correct vowel harmony
bird_N = regN "lintu" ;
@@ -68,7 +68,7 @@ lin
dog_N = regN "koira" ;
door_N = reg2N "ovi" "ovia" ;
drink_V2 = dirV2 (regV "juoda") ;
- easy_A2V = mkA2V (regN (mkA "helppo")) allative ;
+ easy_A2V = mkA2V (mkA2 (mkA (regN "helppo")) allative) ;
eat_V2 = dirV2 (regV "syödä") ;
empty_ADeg = mkADeg (regN "tyhjä") "tyhjempi" "tyhjin" ;
enemy_N = regN "vihollinen" ;
@@ -93,7 +93,7 @@ lin
harbour_N = reg3N "satama" "sataman" "satamia" ;
hate_V2 = dirV2 (regV "vihata") ;
hat_N = regN "hattu" ;
- have_V2 = dirV2 (regV "omistaa") ; ---- olla
+ have_V2 = dirV2 (caseV adessive vOlla) ;
hear_V2 = dirV2 (regV "kuulla") ;
hill_N = regN "kukkula" ;
hope_VS = mkVS (regV "toivoa") ;
@@ -134,7 +134,7 @@ lin
oil_N = regN "öljy" ;
old_ADeg = mkADeg (regN "vanha") "vanhempi" "vanhin" ;
open_V2 = dirV2 (regV "avata") ;
- paint_V2A = mkV2A (regV "maalata") translative ;
+ paint_V2A = mkV2A (dirV2 (regV "maalata")) translative ;
paper_N = reg2N "paperi" "papereita" ;
peace_N = regN "rauha" ;
pen_N = regN "kynä" ;
@@ -145,14 +145,14 @@ lin
priest_N = regN "pappi" ;
probable_AS = mkAS (mkA (nNainen "todennäköistä")) ; --- for vowel harmony
queen_N = regN "kuningatar" ;
- radio_N = reg3N "radio" "radioita" ;
- rain_V0 = mkV0 (vHuoltaa "sataa" "sadan" "satoi" "sadoin") ;
+ radio_N = reg2N "radio" "radioita" ;
+ rain_V0 = mkV0 (reg2V "sataa" "satoi") ;
read_V2 = dirV2 (regV "lukea") ;
red_ADeg = regADeg "punainen" ;
religion_N = regN "uskonto" ;
restaurant_N = regN "ravintola" ;
river_N = nArpi "joki" ;
- rock_N = regN "kallio" "kallioita" ;
+ rock_N = reg2N "kallio" "kallioita" ;
roof_N = regN "katto" ;
rubber_N = regN "kumi" ;
run_V = reg2V "juosta" "juoksi" ;
@@ -189,7 +189,7 @@ lin
switch8off_V2 = dirV2 (regV "sammuttaa") ; ---
switch8on_V2 = dirV2 (regV "sytyttää") ; ---
table_N = regN "pöytä" ;
- talk_V3 = mkV3 (regV "puhua") allative elative ;
+ talk_V3 = mkV3 (regV "puhua") (caseP allative) (caseP elative) ;
teacher_N = regN "opettaja" ;
teach_V2 = dirV2 (regV "opettaa") ;
television_N = reg2N "televisio" "telievisioita" ;
diff --git a/lib/resource/finnish/CategoriesFin.gf b/lib/resource/finnish/CategoriesFin.gf
index ee6771bc8..6694e6395 100644
--- a/lib/resource/finnish/CategoriesFin.gf
+++ b/lib/resource/finnish/CategoriesFin.gf
@@ -37,27 +37,27 @@ lincat
A = Adjective ;
-- = CommonNoun ;
- A2 = Adjective ** {c : NPForm} ;
+ A2 = Adjective ** {c : ComplCase} ;
ADeg = {s : Degree => AForm => Str} ;
AP = {s : AdjPos => AForm => Str} ;
AS = Adjective ; --- "more difficult for him to come than..."
- A2S = Adjective ** {c : NPForm} ;
+ A2S = Adjective ** {c : ComplCase} ;
AV = Adjective ;
- A2V = Adjective ** {c : NPForm} ;
+ A2V = Adjective ** {c : ComplCase} ;
- V = Verb ;
+ V = Verb1 ;
-- = {s : VForm => Str}
---- VP = {s,s2 : Bool => SForm => Agr => Str ; isAux : Bool} ;
VPI = {s : VIForm => Str} ;
----- VP = Verb ** {s2 : VForm => Str ; c : ComplCase} ;
---- VG = {s,s2 : Bool => VForm => Str ; c : ComplCase} ;
V2 = TransVerb ;
- -- = Verb ** {s3, s4 : Str ; c : ComplCase} ;
- V3 = TransVerb ** {s5, s6 : Str ; c2 : ComplCase} ;
- VS = Verb ;
- VV = Verb ** {c : ComplCase} ;
- VQ = Verb ;
- VA = Verb ** {c : Case} ;
+ -- = Verb ** {s3 : Str ; p : Bool ; c : ComplCase} ;
+ V3 = TransVerb ** {s5 : Str ; p2 : Bool ; c2 : ComplCase} ;
+ VS = Verb1 ;
+ VV = Verb1 ** {i : VIForm} ;
+ VQ = Verb1 ;
+ VA = Verb1 ** {c : Case} ;
V2S = TransVerb ;
V2Q = TransVerb ;
diff --git a/lib/resource/finnish/ClauseFin.gf b/lib/resource/finnish/ClauseFin.gf
index ca156d2c8..a80a8c0b3 100644
--- a/lib/resource/finnish/ClauseFin.gf
+++ b/lib/resource/finnish/ClauseFin.gf
@@ -14,7 +14,7 @@ concrete ClauseFin of Clause = CategoriesFin **
sats2clause (mkSatsObject np v y) ;
SPredV3 subj verb obj1 obj2 =
sats2clause (
- insertObject (mkSatsObject subj verb obj1) verb.c2 verb.s5 verb.s6 obj2) ;
+ insertObject (mkSatsObject subj verb obj1) verb.c2 verb.s5 verb.p obj2) ;
---- SPredReflV2 subj verb =
---- sats2clause (
---- mkSatsObject subj
diff --git a/lib/resource/finnish/ParadigmsFin.gf b/lib/resource/finnish/ParadigmsFin.gf
index d2bc21667..203db7ed2 100644
--- a/lib/resource/finnish/ParadigmsFin.gf
+++ b/lib/resource/finnish/ParadigmsFin.gf
@@ -43,6 +43,7 @@ oper
nominative : Case ;
genitive : Case ;
partitive : Case ;
+ translative : Case ;
inessive : Case ;
elative : Case ;
illative : Case ;
@@ -51,8 +52,10 @@ oper
allative : Case ;
PPosition : Type ;
- PPrep : Case -> Str -> PPosition ;
- PPostp : Case -> Str -> PPosition ;
+ prepP : Case -> Str -> PPosition ;
+ postpP : Case -> Str -> PPosition ;
+ caseP : Case -> PPosition ;
+ accusative : PPosition ;
--2 Nouns
@@ -171,6 +174,8 @@ oper
mkN2 : N -> Case -> N2 ;
genN2 : N -> N2 ;
+ mkN3 : N -> Case -> Case -> N3 ;
+
-- Proper names can be formed by using declensions for nouns.
-- The plural forms are filtered away by the compiler.
@@ -185,7 +190,7 @@ oper
-- Two-place adjectives need a case for the second argument.
- mkA2 : N -> Case -> A2 ;
+ mkA2 : A -> Case -> A2 ;
-- Comparison adjectives have three forms. The comparative and the superlative
-- are always inflected in the same way, so the nominative of them is actually
@@ -232,6 +237,11 @@ oper
vTuoda : (tuoda : Str) -> V ;
+-- All the patterns above have $nominative$ as subject case.
+-- If another case is wanted, use the following.
+
+ caseV : Case -> V -> V ;
+
-- The verbs "be" and the negative auxiliary are special.
vOlla : V ;
@@ -240,7 +250,7 @@ oper
-- Two-place verbs need a case, and can have a pre- or postposition.
-- At least one of the latter is empty, $[]$.
- mkV2 : V -> PPostp -> V2 ;
+ mkV2 : V -> PPosition -> V2 ;
-- If both are empty, the following special function can be used.
@@ -257,7 +267,7 @@ oper
-- the first one or both can be absent.
mkV3 : V -> PPosition -> PPosition -> V3 ; -- speak, with, about
- dirV3 : V -> PPosition -> V3 ; -- give,_,to
+ dirV3 : V -> Case -> V3 ; -- give,_,to
dirdirV3 : V -> V3 ; -- acc, allat
--3 Other complement patterns
@@ -275,10 +285,10 @@ oper
mkVQ : V -> VQ ;
mkV2Q : V2 -> V2Q ;
- mkAS : A -> AS ;
- mkA2S : A -> Str -> A2S ;
- mkAV : A -> AV ;
- mkA2V : A -> Str -> A2V ;
+ mkAS : A -> AS ;
+ mkA2S : A2 -> A2S ;
+ mkAV : A -> AV ;
+ mkA2V : A2 -> A2V ;
-- The definitions should not bother the user of the API. So they are
@@ -297,6 +307,7 @@ oper
nominative = Nom ;
genitive = Gen ;
partitive = Part ;
+ translative = Transl ;
inessive = Iness ;
elative = Elat ;
illative = Illat ;
@@ -304,11 +315,14 @@ oper
ablative = Ablat ;
allative = Allat ;
- PPosition : Type = {c : Case ; s1,s2 : Str} ;
- PPrep : Case -> Str -> PPosition =
- \c,p -> {c = c ; s1 = p ; s2 = []} ;
- PPostp : Case -> Str -> PPosition =
- \c,p -> {c = c ; s1 = [] ; s2 = p} ;
+ PPosition : Type = {c : ComplCase ; s3 : Str ; p : Bool} ;
+ prepP : Case -> Str -> PPosition =
+ \c,p -> {c = CCase c ; s3 = p ; p = True} ;
+ postpP : Case -> Str -> PPosition =
+ \c,p -> {c = CCase c ; s3 = p ; p = False} ;
+ caseP : Case -> PPosition =
+ \c -> {c = CCase c ; s3 = [] ; p = True} ;
+ accusative = {c = CAcc ; s3 = [] ; p = True} ;
mkN = \a,b,c,d,e,f,g,h,i,j,k ->
mkNoun a b c d e f g h i j ** {g = k ; lock_N = <>} ;
@@ -414,11 +428,12 @@ reg3N = \vesi,veden,vesi
nComp = \s,n -> {s = \\c => s ++ n.s ! c ; g = n.g ; lock_N = <>} ;
mkN2 = \n,c -> n2n n ** {c = NPCase c ; lock_N2 = <>} ;
+ mkN3 = \n,c,e -> n2n n ** {c = NPCase c ; c2 = NPCase e ; lock_N3 = <>} ;
genN2 = \n -> mkN2 n genitive ;
mkPN n = mkProperName n ** {lock_PN = <>} ;
mkA = \x -> noun2adj x ** {lock_A = <>} ;
- mkA2 = \x,c -> mkA x ** {c = NPCase c ; lock_A2 = <>} ;
+ mkA2 = \x,c -> x ** {c = CCase c ; lock_A2 = <>} ;
mkADeg x kivempi kivin =
let
a = last (x.s ! ((NCase Sg Part))) ; ---- gives "kivinta"
@@ -434,7 +449,8 @@ reg3N = \vesi,veden,vesi
(init (suur.s ! NCase Sg Gen) + "mpi")
(init (suur.s ! NCase Pl Ess)) ;
- mkV a b c d e f g h i j k l = mkVerb a b c d e f g h i j k l ** {lock_V = <>} ;
+ mkV a b c d e f g h i j k l = mkVerb a b c d e f g h i j k l **
+ {sc = Nom ; lock_V = <>} ;
regV soutaa =
let
@@ -455,7 +471,7 @@ regV soutaa =
"da" | "dä" => vJuoda soutaa joi ;
"ta" | "tä" => vOsata soutaa ;
_ => vHukkua soutaa souda
- }} ** {lock_V = <>} ;
+ }} ** {sc = Nom ; lock_V = <>} ;
reg2V : (soutaa,souti : Str) -> V = \soutaa,souti ->
let
@@ -476,7 +492,7 @@ reg2V : (soutaa,souti : Str) -> V = \soutaa,souti ->
"at" | "ät" => vPalkata soutaa souti ;
"st" => vJuosta soutaa souden (juo + o+u+"t") (juo + "t"+u) ;
_ => soudat
- }} ** {lock_V = <>} ;
+ }} ** {sc = Nom ; lock_V = <>} ;
reg3V soutaa soudan souti =
let
@@ -496,43 +512,48 @@ reg3V soutaa soudan souti =
"aa" | "ää" => vHuoltaa soutaa soudan souti soudin ;
"da" | "dä" => vJuoda soutaa souti ;
_ => soudat
- }} ** {lock_V = <>} ;
+ }} ** {sc = Nom ; lock_V = <>} ;
+
+ vValua v = vSanoa v ** {sc = Nom ; lock_V = <>} ;
+ vKattaa v u = vOttaa v u ** {sc = Nom ; lock_V = <>} ;
+ vOstaa v = vPoistaa v ** {sc = Nom ; lock_V = <>} ;
+ vNousta v u = vJuosta v u [] [] ** {sc = Nom ; lock_V = <>} ; -----
+ vTuoda v = vJuoda v [] ** {sc = Nom ; lock_V = <>} ; -----
+ caseV c v = {s = v.s ; sc = c ; lock_V = <>} ;
+
+ vOlla = verbOlla ** {sc = Nom ; lock_V = <>} ;
+ vEi = verbEi ** {sc = Nom ; lock_V = <>} ;
- vValua v = vSanoa v ** {lock_V = <>} ;
- vKattaa v u = vOttaa v u ** {lock_V = <>} ;
- vOstaa v = vPoistaa v ** {lock_V = <>} ;
- vNousta v u = vJuosta v u [] [] ** {lock_V = <>} ; -----
- vTuoda v = vJuoda v [] ** {lock_V = <>} ; -----
- vOlla = verbOlla ** {lock_V = <>} ;
- vEi = verbEi ** {lock_V = <>} ;
vHuoltaa : (_,_,_,_ : Str) -> Verb = \ottaa,otan,otti,otin ->
- SyntaxFin.vHuoltaa ottaa otan otti otin ** {lock_V = <>} ;
--- mkV2 = \v,c,p,o -> v ** {s3 = p ; s4 = o ; c = CCase c ; lock_V2 = <>} ;
--- caseV2 = \v,c -> mkV2 v c [] [] ;
+ SyntaxFin.vHuoltaa ottaa otan otti otin ** {sc = Nom ; lock_V = <>} ;
+ mkV2 = \v,c -> v ** {s3 = c.s3 ; p = c.p ; c = c.c ; lock_V2 = <>} ;
+ caseV2 = \v,c -> mkV2 v (caseP c) ;
dirV2 v = mkTransVerbDir v ** {lock_V2 = <>} ;
mkAdv : Str -> Adv = \s -> {s = s ; lock_Adv = <>} ;
--- mkV3 : V -> PPosition -> PPosition -> V3 ; -- speak, with, about
--- dirV3 : V -> PPosition -> V3 ; -- give,_,to
--- dirdirV3 : V -> -> V3 ; -- acc, allat
+ mkV3 v p q = v **
+ {s3 = p.s3 ; p = p.p ; c = p.c ; s5 = q.s3 ; p2 = q.p ; c2 = q.c ;
+ lock_V3 = <>} ;
+ dirV3 v p = mkV3 v accusative (caseP p) ;
+ dirdirV3 v = dirV3 v allative ;
mkV0 v = v ** {lock_V0 = <>} ;
mkVS v = v ** {lock_VS = <>} ;
mkV2S v = v ** {lock_V2S = <>} ;
-- mkVV v = v ** {lock_VV = <>} ;
mkV2V v = v ** {lock_V2V = <>} ;
--- mkVA v c = v ** {c = c ; lock_V0 = <>} ;
--- mkV2A v c = v ** {c2 = c ; lock_V0 = <>} ;
+ mkVA v c = v ** {c = c ; lock_VA = <>} ;
+ mkV2A v c = v ** {c2 = c ; lock_V2A = <>} ;
mkVQ v = v ** {lock_VQ = <>} ;
mkV2Q v = v ** {lock_V2Q = <>} ;
mkAS v = v ** {lock_AS = <>} ;
--- mkA2S v c = v ** {c = c ; lock_AS = <>} ;
+ mkA2S v = v ** {lock_A2S = <>} ;
mkAV v = v ** {lock_AV = <>} ;
--- mkA2V v c = v ** {c = c ; lock_AS = <>} ;
+ mkA2V v = v ** {lock_A2V = <>} ;
-- inf_illative
-- infinitive
diff --git a/lib/resource/finnish/RulesFin.gf b/lib/resource/finnish/RulesFin.gf
index 4051aa972..b742da31f 100644
--- a/lib/resource/finnish/RulesFin.gf
+++ b/lib/resource/finnish/RulesFin.gf
@@ -63,7 +63,8 @@ lin
ComplA2 = complAdj ;
ComplAV av vpi = {s = \\_,a => av.s ! a ++ vpi.s ! VIInfinit} ;
- ComplObjA2V av obj vpi = {s = \\_,a => av.s ! a ++ obj.s ! av.c ++ vpi.s ! VIInfinit} ;
+ ComplObjA2V av obj vpi = {s = \\_,a => av.s ! a ++ obj.s ! complCase
+ True av.c VImperat ++ vpi.s ! VIInfinit} ;
PositADeg = positAdjPhrase ;
ComparADeg = comparAdjPhrase ;
@@ -73,10 +74,10 @@ lin
PredAS adj sent = sats2clause (
insertComplement
- (mkSats impersNounPhrase verbOlla)
+ (mkSats impersNounPhrase (vNom verbOlla))
(complAdjPhrase Sg (adj2adjPhrase adj) ++ sent.s)
) ;
- PredV0 rain = sats2clause (mkSats impersNounPhrase rain) ;
+ PredV0 rain = sats2clause (mkSats impersNounPhrase (vNom rain)) ;
-- Partial saturation.
diff --git a/lib/resource/finnish/StructuralFin.gf b/lib/resource/finnish/StructuralFin.gf
index 6fbabdfbd..ced177ceb 100644
--- a/lib/resource/finnish/StructuralFin.gf
+++ b/lib/resource/finnish/StructuralFin.gf
@@ -27,8 +27,8 @@ concrete StructuralFin of Structural =
both_AndConjD = sd2 "sekä" "että" ** {n = Pl} ;
by8agent_Prep = prepPostpGen "toimesta" ;
by8means_Prep = prepPostpGen "avulla" ;
- can8know_VV = nomVerbVerb (vOsata "osata") ;
- can_VV = nomVerbVerb (vJuoda "voida" "voi") ;
+---- can8know_VV = nomVerbVerb (vOsata "osata") ;
+---- can_VV = nomVerbVerb (vJuoda "voida" "voi") ;
during_Prep = prepPostpGen "aikana" ;
either8or_ConjD = sd2 "joko" "tai" ** {n = Sg} ;
everybody_NP = {
@@ -55,7 +55,7 @@ concrete StructuralFin of Structural =
most8many_Det = useimmatDet ;
most_Det = mkDeterminer singular (caseTable singular (sSuurin "enintä")) ;
much_Det = mkDeterminer singular (caseTable singular (sNauris "runsasta")) ;
- must_VV = vHukkua "täytyä" "täydy" ** {c = CCase Gen} ;
+---- must_VV = vHukkua "täytyä" "täydy" ** {c = CCase Gen} ;
no_Phr = ss ("Ei" ++ stopPunct) ;
on_Prep = prepCase Adess ;
or_Conj = ss "tai" ** {n = Sg} ;
@@ -92,7 +92,7 @@ concrete StructuralFin of Structural =
to_Prep = prepCase Illat ; --- allat
under_Prep = prepPostpGen "alla" ;
very_Adv = ss "hyvin" ;
- want_VV = nomVerbVerb (vOsata "haluta") ;
+---- want_VV = nomVerbVerb (vOsata "haluta") ;
we_NP = pronNounPhrase pronMe ;
what8many_IP = intPronWhat Pl ;
what8one_IP = intPronWhat Sg ;
diff --git a/lib/resource/finnish/SyntaxFin.gf b/lib/resource/finnish/SyntaxFin.gf
index 9a2138051..9685b7a70 100644
--- a/lib/resource/finnish/SyntaxFin.gf
+++ b/lib/resource/finnish/SyntaxFin.gf
@@ -367,23 +367,22 @@ oper
-- "tyytyväinen vaalitulokseen", "jaollinen kolmella"), which is not a possible
-- order for the accusative case.
- AdjCompl = Adjective ** {c : NPForm} ;
+ AdjCompl = Adjective ** {c : ComplCase} ;
+
+--- Only the middle argument of $complCase$ matters, since
+--- no accusatives come into question.
complAdj : AdjCompl -> NounPhrase -> AdjPhrase = \hyva,paini ->
- let {
+ let
hyvat : AForm => Str = \\a => hyva.s ! a ;
- painissa : Str = paini.s ! hyva.c
- }
+ c : NPForm = complCase True hyva.c VImperat ;
+ painissa : Str = paini.s ! c
in
{s = table {
AAttr => \\a => painissa ++ hyvat ! a ;
APred => \\a => if_then_else Str
- (isLocalNPForm hyva.c)
- (variants {
- hyvat ! a ++ painissa ;
- painissa ++ hyvat ! a
- }
- )
+ (isLocalNPForm c)
+ (hyvat ! a ++ painissa)
(painissa ++ hyvat ! a)
}
} ;
@@ -479,6 +478,14 @@ oper
--
--3 Verb phrases
--
+-- In Finnish, verbs can have nominative subjects, but there are
+-- also verbs with a special subject case ("täytyy").
+
+ Verb1 : Type = Verb ** {sc : Case} ;
+
+ vCase : Verb -> Case -> Verb1 = \v,c -> v ** {sc = c} ;
+ vNom : Verb -> Verb1 = \v -> vCase v Nom ;
+
-- These are parameters for clauses and sentences.
param
@@ -528,27 +535,33 @@ oper
questPart : Str -> Str = \s -> glueParticle s "ko" ; --- "kö"
- mkSats : NounPhrase -> Verb -> Sats = \subj,verb ->
- {subj = subj.s ! NPCase Nom ; --- "minusta tulee poliisi"
+ mkSats : NounPhrase -> Verb1 -> Sats = \subj,verb ->
+ let
+ np = case verb.sc of {
+ Nom =>