From 0f2cc754909acd78ca8ae796398d450627d73d1e Mon Sep 17 00:00:00 2001 From: aarne Date: Sat, 7 Dec 2013 08:01:28 +0000 Subject: [PATCH] make ParseFin compile with Construction --- lib/src/finnish/stemmed/ParseFin.gf | 6 +- src/ui/android/res/xml/inflection_fi.xml | 279 ----------------------- 2 files changed, 3 insertions(+), 282 deletions(-) delete mode 100644 src/ui/android/res/xml/inflection_fi.xml diff --git a/lib/src/finnish/stemmed/ParseFin.gf b/lib/src/finnish/stemmed/ParseFin.gf index 029a23cef..a4ce9f2ce 100644 --- a/lib/src/finnish/stemmed/ParseFin.gf +++ b/lib/src/finnish/stemmed/ParseFin.gf @@ -1,4 +1,4 @@ ---# -path=.:..:../../abstract:../../common:../../english:../kotus +--# -path=.:..:../../abstract:../../common:../../api:../../english:../kotus concrete ParseFin of ParseEngAbs = TenseX, ---- - [Pol, PNeg, PPos], @@ -21,7 +21,7 @@ concrete ParseFin of ParseEngAbs = VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV] , DictEngFin ** -open MorphoFin, ResFin, ParadigmsFin, SyntaxFin, StemFin, Prelude in { +open MorphoFin, ResFin, ParadigmsFin, SyntaxFin, StemFin, (E = ExtraFin), Prelude in { flags literal=Symb ; coding = utf8 ; @@ -68,7 +68,7 @@ lin PredVPosv np vp = mkCl np vp ; ---- -- Ant -> Pol -> VPSlash -> RS ; --- here replaced by a relative clause - PastPartRS ant pol vps = mkRS ant pol (mkRCl which_RP (passVPSlash (lin VPSlash vps))) ; + PastPartRS ant pol vps = mkRS ant pol (mkRCl which_RP (E.PassVPSlash (lin VPSlash vps))) ; ApposNP np1 np2 = { s = \\c => np1.s ! c ++ "," ++ np2.s ! c ; diff --git a/src/ui/android/res/xml/inflection_fi.xml b/src/ui/android/res/xml/inflection_fi.xml deleted file mode 100644 index a454b8c39..000000000 --- a/src/ui/android/res/xml/inflection_fi.xml +++ /dev/null @@ -1,279 +0,0 @@ - - - - - - -

- - -

Substantiivi

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
yksikkömonikko
nominatiivi
s NCase Sg Nom
s NCase Pl Nom
genetiivi
s NCase Sg Gen
s NCase Pl Gen
partitiivi
s NCase Sg Part
s NCase Pl Part
translatiivi
s NCase Sg Transl
s NCase Pl Transl
essiivi
s NCase Sg Ess
s NCase Pl Ess
inessiivi
s NCase Sg Iness
s NCase Pl Iness
elatiivi
s NCase Sg Elat
s NCase Pl Elat
illatiivi
s NCase Sg Illat
s NCase Pl Illat
adessiivi
s NCase Sg Adess
s NCase Pl Adess
ablatiivi
s NCase Sg Ablat
s NCase Pl Ablat
allatiivi
s NCase Sg Allat
s NCase Pl Allat
abessiivi
s NCase Sg Abess
s NCase Pl Abess
komitatiivi
s NComit
instruktiivi
s NInstruct
- - - -

Verbi

-

Finiittimuodot

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
aktiivipreesensimperfektikonditionaalipotentiaaliimperatiivi
yksikkö1. persoona
s Presn Sg P1
s Impf Sg P1
s Condit Sg P1
s Potent Sg P1
-
2. persoona
s Presn Sg P2
s Impf Sg P2
s Condit Sg P2
s Potent Sg P2
s Imper Sg
3. persoona
s Presn Sg P3
s Impf Sg P3
s Condit Sg P3
s Potent Sg P3
s ImperP3 Sg
monikko1. persoona
s Presn Pl P1
s Impf Pl P1
s Condit Pl P1
s Potent Pl P1
s ImperP1Pl
2. persoona
s Presn Pl P2
s Impf Pl P2
s Condit Pl P2
s Potent Pl P2
s Imper Pl
3. persoona
s Presn Pl P3
s Impf Pl P3
s Condit Pl P3
s Potent Pl P3
s ImperP3 Pl
kielteinen
s Imper Sg
s PastPartAct (AN (NCase Pl Nom))
s Condit Sg P3
s PotentNeg
s ImperNegPl
passiivimyönteinen
s PassPresn True
s PassImpf True
s PassCondit True
s PassPotent True
s PassImper True
kielteinen
s PassPresn False
s PassImpf False
s PassCondit False
s PassPotent False
s PassImper False
- -

Nominaalimuodot

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
infinitiivi1.lyhyt
s Inf Inf1
pitkä
s Inf Inf1Long
ni
2. aktiiviinessiivi
s Inf Inf2Iness
instruktiivi
s Inf Inf2Instr
2. passiiviinessiivi
s Inf Inf2InessPass
3. aktiiviinessiivi
s Inf Inf3Iness
elatiivi
s Inf Inf3Elat
illatiivi
s Inf Inf3Illat
adessiivi
s Inf Inf3Adess
abessiivi
s Inf Inf3Abess
instruktiivi
s Inf Inf3Instr
3. passiiviinstruktiivi
s Inf Inf3InstrPass
4.nominatiivi
s Inf Inf4Nom
partitiivi
s Inf Inf4Part
5.
s Inf Inf5
ni
partisiippipreesensaktiivi
s PastPartAct (AN (NCase Sg Nom))
passiivi
s PastPartPass (AN (NCase Sg Nom))
perfektiaktiivi
s PastPartAct (AN (NCase Sg Nom))
passiivi
s PastPartPass (AN (NCase Sg Nom))
agentti
s AgentPart (AN (NCase Sg Nom))
- -
-
-Last modified: Fri Nov 29 09:19:29 CET 2013 -