From 07caa0b53902e84852dcb8860f2fbb6655793b44 Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 30 Jan 2017 13:46:02 +0000 Subject: [PATCH] some renamings of internal types in Icelandic to avoid clashes --- lib/src/icelandic/CatIce.gf | 22 +++++++++++----------- lib/src/icelandic/MorphoIce.gf | 12 ++++++------ lib/src/icelandic/ResIce.gf | 22 +++++++++++----------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/src/icelandic/CatIce.gf b/lib/src/icelandic/CatIce.gf index a34852dcb..986911b64 100644 --- a/lib/src/icelandic/CatIce.gf +++ b/lib/src/icelandic/CatIce.gf @@ -18,7 +18,7 @@ concrete CatIce of Cat = CommonX ** open ResIce, Prelude in { Cl = ResIce.Cl ; ClSlash = { - s : Tense => Anteriority => Polarity => Order => Str ; + s : ResIce.Tense => Anteriority => Polarity => Order => Str ; c2 : Preposition } ; @@ -32,7 +32,7 @@ concrete CatIce of Cat = CommonX ** open ResIce, Prelude in { --2 Questions and interrogatives - QCl = {s : Tense => Anteriority => Polarity => QForm => Str} ; + QCl = {s : ResIce.Tense => Anteriority => Polarity => QForm => Str} ; IP = { s : Gender => Case => Str ; @@ -48,7 +48,7 @@ concrete CatIce of Cat = CommonX ** open ResIce, Prelude in { --2 Relative clauses and pronouns - RCl = {s : Tense => Anteriority => Polarity => Agr => Str} ; + RCl = {s : ResIce.Tense => Anteriority => Polarity => Agr => Str} ; RP = {s : Str} ; @@ -136,15 +136,15 @@ concrete CatIce of Cat = CommonX ** open ResIce, Prelude in { --2 Words of open classes - V, VS, VQ, VA = ResIce.V; - VV, V2, V2A, V2S, V2Q = ResIce.V ** {c2 : Preposition} ; - V3, V2V = ResIce.V ** {c2,c3 : Preposition} ; + V, VS, VQ, VA = ResIce.Verb; + VV, V2, V2A, V2S, V2Q = ResIce.Verb ** {c2 : Preposition} ; + V3, V2V = ResIce.Verb ** {c2,c3 : Preposition} ; - A = ResIce.A ; - A2 = ResIce.A ** {c2 : Preposition} ; + A = ResIce.Adj ; + A2 = ResIce.Adj ** {c2 : Preposition} ; - N = ResIce.N ; - N2 = ResIce.N ** {c2 : Preposition} ; - N3 = ResIce.N ** {c2,c3 : Preposition} ; + N = ResIce.Noun ; + N2 = ResIce.Noun ** {c2 : Preposition} ; + N3 = ResIce.Noun ** {c2,c3 : Preposition} ; PN = {s : Case => Str ; g : Gender} ; } diff --git a/lib/src/icelandic/MorphoIce.gf b/lib/src/icelandic/MorphoIce.gf index e8104bdc2..8480b0335 100644 --- a/lib/src/icelandic/MorphoIce.gf +++ b/lib/src/icelandic/MorphoIce.gf @@ -306,13 +306,13 @@ resource MorphoIce = ResIce ** open Prelude, (Predef=Predef), ResIce in { -- Noun Construction -- ----------------------- - nForms2NeutrNoun : NForms -> N = \nfs -> nForms2Noun nfs (nForms2Suffix nfs Neutr) Neutr ; + nForms2NeutrNoun : NForms -> Noun = \nfs -> nForms2Noun nfs (nForms2Suffix nfs Neutr) Neutr ; - nForms2MascNoun : NForms -> N = \nfs -> nForms2Noun nfs (nForms2Suffix nfs Masc) Masc ; + nForms2MascNoun : NForms -> Noun = \nfs -> nForms2Noun nfs (nForms2Suffix nfs Masc) Masc ; - nForms2FemNoun : NForms -> N = \nfs -> nForms2Noun nfs (nForms2Suffix nfs Fem) Fem ; + nForms2FemNoun : NForms -> Noun = \nfs -> nForms2Noun nfs (nForms2Suffix nfs Fem) Fem ; - nForms2Noun : NForms -> NForms -> Gender -> N = \free,suffix,g -> { + nForms2Noun : NForms -> NForms -> Gender -> Noun = \free,suffix,g -> { s = table { Sg => table { Suffix => caseList (suffix ! 0) (suffix ! 1) (suffix ! 2) (suffix ! 3) ; @@ -693,7 +693,7 @@ resource MorphoIce = ResIce ** open Prelude, (Predef=Predef), ResIce in { -- Adjective Construction -- ---------------------------- - aForms2Adjective : (x1,_,_,_,x5 : AForms) -> Str -> A = \positw,posits,compar,superlw,superls,aadv -> { + aForms2Adjective : (x1,_,_,_,x5 : AForms) -> Str -> Adj = \positw,posits,compar,superlw,superls,aadv -> { s = table { APosit Weak Sg Masc c => caseList (positw ! Masc ! 0) (positw ! Masc ! 1) (positw ! Masc ! 2) (positw ! Masc ! 3) ! c ; APosit Weak Sg Fem c => caseList (positw ! Fem ! 0) (positw ! Fem ! 1) (positw ! Fem ! 2) (positw ! Fem ! 3) ! c ; @@ -896,7 +896,7 @@ resource MorphoIce = ResIce ** open Prelude, (Predef=Predef), ResIce in { -- Verb Construction -- ----------------------- - vForms2Verb : Str -> MForms -> (x5,x6,x7,x8 : Str) -> (x9,x10 : AForms) -> V = + vForms2Verb : Str -> MForms -> (x5,x6,x7,x8 : Str) -> (x9,x10 : AForms) -> Verb = \inf,mforms,impSg,impPl,presPart,sup,pastPartW,pastPartS -> let presInd = mforms ! Indicative ! DPres ; diff --git a/lib/src/icelandic/ResIce.gf b/lib/src/icelandic/ResIce.gf index 9502e9b79..407e9feea 100644 --- a/lib/src/icelandic/ResIce.gf +++ b/lib/src/icelandic/ResIce.gf @@ -104,7 +104,7 @@ resource ResIce = ParamX ** open Prelude in { -- For $Nouns$ - N : Type = { + Noun : Type = { s : Number => Species => Case => Str ; g : Gender } ; @@ -117,14 +117,14 @@ resource ResIce = ParamX ** open Prelude in { -- For $Adjectives$ - A : Type = { + Adj : Type = { s : AForm => Str ; adv : Str } ; -- For $Verb$. - V : Type = { + Verb : Type = { s : VForm => Str ; p : PForm => Str ; sup : Voice => Str @@ -143,7 +143,7 @@ resource ResIce = ParamX ** open Prelude in { } ; -- is this needed for anything else but the auxiliary verbs below? - mkVerb : (x1,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,x59 : Str) -> V = + mkVerb : (x1,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,x59 : Str) -> Verb = \fljúga1,flýg,flýgur2,flýgur3,fljúgum,fljúgið,fljúga2,flaug1,flaugst,flaug2,flugum,fluguð,flugu, fljúgi1,fljúgir,fljúgi3,fljúgumS,fljúgiðS,fljúgi,flygi1,flygir,flygi2,flygjum,flygjuð,flygju, fljúgðu,fljúgið,fljúgandi,floginn,sgMascAcc,sgMascDat,sgMascGen,sgFemNom,sgFemAcc,sgFemDat,sgFemGen, @@ -225,7 +225,7 @@ resource ResIce = ParamX ** open Prelude in { <_,True> => s.fin ++ s.a1.p1 ++ s.inf ++ ind ++ dir ++ s.a1.p2 ++ vp.a2 } ; - predV : V -> VP = \v -> { + predV : Verb -> VP = \v -> { s = \\vpform,pol,agr => case vpform of { VPInf => vf (v.s ! VInf) [] (negation pol) False ; VPImp => vf (v.s ! VImp Active agr.n) [] (negation pol) False ; @@ -257,7 +257,7 @@ resource ResIce = ParamX ** open Prelude in { } ; } ; - vff : V -> Tense -> Anteriority -> Polarity -> Agr -> {fin,inf : Str ; a1 : Str * Str} + vff : Verb -> Tense -> Anteriority -> Polarity -> Agr -> {fin,inf : Str ; a1 : Str * Str} =\v,ten,ant,pol,agr -> case of { -- hann sefur []/ekki - he []/doesn't sleep => vf (v.s ! VPres Active Indicative agr.n agr.p) [] (negation pol) False; @@ -286,26 +286,26 @@ resource ResIce = ParamX ** open Prelude in { -- participle nor does it exist in the middle voice or passive voice. Therefore, I will (for the time being) -- fill in the remaining with the infinitive "vera". This goes also for the rest of the auxileries. - verbBe : V = mkVerb "vera" "er" "ert" "er" "erum" "eruð" "eru" "var" "varst" "var" "vorum" "voruð" "voru" + verbBe : Verb = mkVerb "vera" "er" "ert" "er" "erum" "eruð" "eru" "var" "varst" "var" "vorum" "voruð" "voru" "sé" "sért" "sé" "séum" "séuð" "séu" "væri" "værir" "væri" "værum" "voruð" "væru" "vertu" "verið" "verandi" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "vera" "verið" ; - verbBecome : V = mkVerb "verða" "verð" "verður" "verður" "verðum" "verðið" "verða" "varð" "varðst" "varð" "urðum" "urðuð" "urðu" + verbBecome : Verb = mkVerb "verða" "verð" "verður" "verður" "verðum" "verðið" "verða" "varð" "varðst" "varð" "urðum" "urðuð" "urðu" "verði" "verðir" "verði" "verðum" "verðið" "verði" "yrði" "yrðir" "yrði" "yrðum" "yrðuð" "yrðu" "verðið" "verðið" "verðandi" "orðinn" "orðinn" "orðnum" "orðsins" "orðin" "orðna" "orðinni" "orðinnar" "orðið" "orðið" "orðnu" "orðins" "orðnir" "orðna" "orðnum" "orðinna" "orðnar" "orðnar" "orðnum" "orðinna" "orðin" "orðin" "orðnum" "orðinna" "orðni" "orðna" "orðna" "orðnu" "orðna" "orðnu" "orðið" ; - verbHave : V = mkVerb "hafa" "hef" "hefur" "hefur" "höfum" "hafið" "hafa" "hafði" "hafðir" "hafði" "höfðum" "höfðuð" "höfðu" + verbHave : Verb = mkVerb "hafa" "hef" "hefur" "hefur" "höfum" "hafið" "hafa" "hafði" "hafðir" "hafði" "höfðum" "höfðuð" "höfðu" "hafi" "hafir" "hafi" "höfðum" "hafið" "hafi" "hefði" "hefðir" "hefði" "hefðum" "hefðuð" "hefðu" "hafðu" "hafið" "hafandi" "hafður" "hafðan" "höfðum" "hafðs" "höfð" "hafða" "hafðri" "hafðrar" "haft" "haft" "höfðu" "hafðs" "hafðir" "hafða" "höfðum" "hafðra" "hafðar" "hafðar" "höfðum" "hafðra" "höfð" "höfð" "höfðum" "hafðra" "hafa" "hafa" "hafa" "hafa" "hafa" "hafa" "haft" ; - verbWill : V = mkVerb "munu" "mun" "munt" "mun" "munum" "munuð" "munu" "munu" "munu" "munu" "munu" "munu" "munu" + verbWill : Verb = mkVerb "munu" "mun" "munt" "mun" "munum" "munuð" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "muni" "munir" "muni" "munum" "munið" "muni" "myndi" "myndir" "myndi" "myndum" "mynduð" "myndu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" "munu" @@ -313,7 +313,7 @@ resource ResIce = ParamX ** open Prelude in { -- Not really an axuilary verb but then again there is no exclusive club of axuilary verbs in Icelandic (or so have I been told). -- verbLet is nevertheless needed in Idiom. - or is it? - verbLet : V = mkVerb "láta" "læt" "lætur" "lætur" "látum" "látið" "láta" "lét" "lést" "lét" "létum" "létuð" "létu" + verbLet : Verb = mkVerb "láta" "læt" "lætur" "lætur" "látum" "látið" "láta" "lét" "lést" "lét" "létum" "létuð" "létu" "láti" "látir" "láti" "látum" "látið" "láti" "léti" "létir" "léti" "létum" "létuð" "létu" "láttu" "látið" "látandi" "látinn" "látinn" "látnum" "látins" "látin" "látna" "látinni" "látinnar" "látið" "látið" "látnu" "látins" "látnir" "látna" "látnum" "látinna" "látnar" "látnar" "látnum" "látinnar" "látin"