msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

fix some warnings in the compilation of Turkish

Browse Source
This commit is contained in:
Krasimir Angelov
2017-08-19 23:34:59 +02:00
parent 128cae61d5
commit d0c7531dfa
5 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/turkish/CatTur.gf
View File

@@ -16,7 +16,7 @@ concrete CatTur of Cat = CommonX ** open ResTur, Prelude in {
Card = {s : Number => Case => Str} ; Card = {s : Number => Case => Str} ;
Ord = {s : Number => Case => Str} ; Ord = {s : Number => Case => Str} ;
Quant = {s : Str} ; Quant = {s : Str} ;
Prep = Compl ; Prep = {s : Str; c : Case} ;
Numeral = {s : CardOrd => Number => Case => Str ; n : Number} ; Numeral = {s : CardOrd => Number => Case => Str ; n : Number} ;
Digits = {s : CardOrd => Number => Case => Str ; n : Number; tail : DTail} ; Digits = {s : CardOrd => Number => Case => Str ; n : Number; tail : DTail} ;
@@ -27,14 +27,14 @@ concrete CatTur of Cat = CommonX ** open ResTur, Prelude in {
-- Open lexical classes, e.g. Lexicon -- Open lexical classes, e.g. Lexicon
V, VS, VQ, VA = Verb ; V, VS, VQ, VA = Verb ;
V2, V2Q, V2V, V2A, V2S = Verb ** {c : Compl} ; V2, V2Q, V2V, V2A, V2S = Verb ** {c : Prep} ;
V3 = Verb ** {c1,c2 : Compl} ; V3 = Verb ** {c1,c2 : Prep} ;
A = Adjective ; A = Adjective ;
A2 = Adjective ** {c : Compl} ; A2 = Adjective ** {c : Prep} ;
N = Noun ; N = Noun ;
N2 = Noun ** {c : Compl} ; N2 = Noun ** {c : Prep} ;
N3 = Noun ** {c1,c2 : Compl} ; N3 = Noun ** {c1,c2 : Prep} ;
PN = Noun ; PN = Noun ;
} }

12
src/turkish/IrregTur.gf
View File

@@ -21,11 +21,11 @@ concrete IrregTur of IrregTurAbs = CatTur ** open ParadigmsTur, ResTur in {
see_V = mkV "görmek" SgSylConIrreg ; see_V = mkV "görmek" SgSylConIrreg ;
oper oper
et_Aux : Verb = mkV "etmek" "edmek" ; et_Aux : V = mkV "etmek" "edmek" ;
et_Hard_Aux : Verb = mkV "etmek" ; et_Hard_Aux : V = mkV "etmek" ;
soyle_Aux : Verb = mkV "söylemek" ; soyle_Aux : V = mkV "söylemek" ;
ol_Aux : Verb = mkV "olmak" SgSylConIrreg ; ol_Aux : V = mkV "olmak" SgSylConIrreg ;
koy_Aux : Verb = mkV "koymak" ; koy_Aux : V = mkV "koymak" ;
gec_Aux : Verb = mkV "geçmek" ; gec_Aux : V = mkV "geçmek" ;
against_Prep : Prep = mkPrep "karşı" Dat; against_Prep : Prep = mkPrep "karşı" Dat;
} }

2
src/turkish/LexiconTur.gf
View File

@@ -248,7 +248,7 @@ concrete LexiconTur of Lexicon = CatTur **
married_A2 = mkA2 (mkA "evli") with_Prep ; married_A2 = mkA2 (mkA "evli") with_Prep ;
--Verbs --Verbs
add_V3 = mkV3 (mkV "eklemek") ; add_V3 = mkV3 (mkV "eklemek") ;
answer_V2S = mkV2 (mkV "yanıtlamak") ; answer_V2S = mkV2S (mkV "yanıtlamak") ;
ask_V2Q = mkV2 (mkV "sormak") ; ask_V2Q = mkV2 (mkV "sormak") ;
become_VA = mkV "olmak" SgSylConIrreg ; become_VA = mkV "olmak" SgSylConIrreg ;
beg_V2V = mkV2 (mkV "dilemek") ; beg_V2V = mkV2 (mkV "dilemek") ;

119
src/turkish/ParadigmsTur.gf
View File

@@ -17,69 +17,70 @@ oper
mkV : overload { mkV : overload {
--make regular verbs, one form is enough --make regular verbs, one form is enough
mkV : (esmek : Str) -> Verb ; mkV : (esmek : Str) -> V ;
-- make verbs of which aorist form is irregular -- make verbs of which aorist form is irregular
mkV : (gelmek : Str) -> AoristType -> Verb ; mkV : (gelmek : Str) -> AoristType -> V ;
-- make verbs which do not obey softnening rule -- make verbs which do not obey softnening rule
mkV : (gitmek, gidmek : Str) -> Verb ; mkV : (gitmek, gidmek : Str) -> V ;
-- make verbs which progressive and future forms has "e" to "i" conversion like "yemek" -> "yiyorum" and "demek" -> "diyorum" -- make verbs which progressive and future forms has "e" to "i" conversion like "yemek" -> "yiyorum" and "demek" -> "diyorum"
-- two forms are enough but third form is needed to differentiate from the other overloads -- two forms are enough but third form is needed to differentiate from the other overloads
mkV : (yemek, yemek, yimek : Str) -> Verb ; mkV : (yemek, yemek, yimek : Str) -> V ;
-- make verbs that is usually formed by a noun and a auxiallary verb -- make verbs that is usually formed by a noun and a auxiallary verb
-- contiguity indicates whether they are written concatenated or separated -- contiguity indicates whether they are written concatenated or separated
mkV : (seyr : Str) -> (etmek : Verb) -> (con : Contiguity) -> Verb ; mkV : (seyr : Str) -> (etmek : V) -> (con : Contiguity) -> V ;
-- same as above, defined to make separated form default -- same as above, defined to make separated form default
mkV : (nefret : Str) -> (etmek : Verb) -> Verb ; mkV : (nefret : Str) -> (etmek : V) -> V ;
} ; } ;
mkV2 : overload { mkV2 : overload {
-- make V2, use default case and preposition which are accusative case and no preposition -- make V2, use default case and preposition which are accusative case and no preposition
mkV2 : (sormak : Verb) -> Verb ** {c : Compl} ; mkV2 : (sormak : V) -> V2 ;
-- make V2, set case explicitly -- make V2, set case explicitly
mkV2 : (korkmak : Verb) -> Compl -> Verb ** {c : Compl} ; mkV2 : (korkmak : V) -> Prep -> V2 ;
} ; } ;
mkV3 : overload { mkV3 : overload {
-- make V3, use default cases and prepositions which are accusative and dative cases and no preposition. -- make V3, use default cases and prepositions which are accusative and dative cases and no preposition.
mkV3 : (satmak : Verb) -> Verb ** {c1,c2 : Compl} ; mkV3 : (satmak : V) -> V2 ;
-- make V3, set cases and prepositions explicitly. -- make V3, set cases and prepositions explicitly.
mkV3 : (konusmak : Verb) -> Compl -> Compl -> Verb ** {c1,c2 : Compl} ; mkV3 : (konusmak : V) -> Prep -> Prep -> V3 ;
} ; } ;
mkV2S : V -> V2S = \verb -> lin V2S (verb ** {c = no_Prep}) ;
-- worst-case function -- worst-case function
-- bases of all forms are required. -- bases of all forms are required.
makeVerb : (inf,base,presBase,pastBase,aoristBase : Str) -> ( futureBase : Softness => Str ) -> Harmony -> Verb ; makeVerb : (inf,base,presBase,pastBase,aoristBase : Str) -> ( futureBase : Softness => Str ) -> Harmony -> V ;
-- make a regular verb -- make a regular verb
-- supply infinitive, softened infinitive, future infinitive forms and aorist type -- supply infinitive, softened infinitive, future infinitive forms and aorist type
regVerb : (inf, softInf, futInf : Str) -> AoristType -> Verb ; regVerb : (inf, softInf, futInf : Str) -> AoristType -> V ;
-- make a regular verb, only infinitive form is needed -- make a regular verb, only infinitive form is needed
regV : (inf : Str) -> Verb ; regV : (inf : Str) -> V ;
-- make a verb, aorist type must be specified -- make a verb, aorist type must be specified
-- see AoristType for list of verbs that has irregular aorist suffix -- see AoristType for list of verbs that has irregular aorist suffix
irregV_aor : (inf : Str) -> AoristType -> Verb ; irregV_aor : (inf : Str) -> AoristType -> V ;
-- make a verb from a str (usually a noun) and a auxiallary verb, also specify contiguity (i.e whether they will be concatenated or separated) -- make a verb from a str (usually a noun) and a auxiallary verb, also specify contiguity (i.e whether they will be concatenated or separated)
auxillaryVerb : Str -> Verb -> Contiguity -> Verb ; auxillaryVerb : Str -> Verb -> Contiguity -> V ;
mkV2 = overload { mkV2 = overload {
-- sormak -- sormak
mkV2 : Verb -> Verb ** {c : Compl} = \verb -> verb ** {c = no_Prep} ; mkV2 : V -> V2 = \verb -> verb ** {c = no_Prep} ;
-- (bir şeyden) korkmak -- (bir şeyden) korkmak
mkV2 : Verb -> Compl -> Verb ** {c : Compl} = \verb,c -> verb ** {c = c} ; mkV2 : V -> Prep -> V2 = \verb,c -> verb ** {c = c} ;
} ; } ;
mkV3 = overload { mkV3 = overload {
-- (birine bir şeyi) satmak -- (birine bir şeyi) satmak
mkV3 : Verb -> Verb ** {c1,c2 : Compl} = \verb -> verb ** {c1 = no_Prep; c2 = no_Prep} ; mkV3 : V -> V3 = \verb -> verb ** {c1 = no_Prep; c2 = no_Prep} ;
-- (biri ile bir şeyi) konuşmak -- (biri ile bir şeyi) konuşmak
mkV3 : Verb -> Compl -> Compl -> Verb ** {c1 : Compl; c2 : Compl} = mkV3 : V -> Prep -> Prep -> V3 =
\verb,c1,c2 -> verb ** {c1 = c1; c2 = c2} ; \verb,c1,c2 -> verb ** {c1 = c1; c2 = c2} ;
} ; } ;
@@ -88,33 +89,33 @@ oper
-- overload all noun paradigms to mkN -- overload all noun paradigms to mkN
mkN : overload { mkN : overload {
-- regular noun, only nominative case is needed -- regular noun, only nominative case is needed
mkN : (araba : Str) -> Noun ; mkN : (araba : Str) -> N ;
-- handles three type of irregularities which never overlap -- handles three type of irregularities which never overlap
-- 1.Doubling consonant hak -> hakka -- 1.Doubling consonant hak -> hakka
-- 2.Dropping vowel burun -> burnu -- 2.Dropping vowel burun -> burnu
-- 3.Improper softening bisiklet -> bisikleti -- 3.Improper softening bisiklet -> bisikleti
mkN : (burun, burn : Str) -> Noun ; mkN : (burun, burn : Str) -> N ;
-- in addition to irregularities above, handles vowel harmony irregularities -- in addition to irregularities above, handles vowel harmony irregularities
mkN : (divaniharp, divaniharb : Str) -> (ih_har : HarVowP) -> Noun ; mkN : (divaniharp, divaniharb : Str) -> (ih_har : HarVowP) -> N ;
-- links two noun to form a compound noun -- links two noun to form a compound noun
mkN : (fotograf, makine : Noun) -> Contiguity -> Noun ; mkN : (fotograf, makine : N) -> Contiguity -> N ;
-- same as above, make concatenated form default -- same as above, make concatenated form default
mkN : (zeytin, yag : Noun) -> Noun ; mkN : (zeytin, yag : N) -> N ;
} ; } ;
mkN2 : Str -> Noun ** {c : Compl} ; mkN2 : Str -> N2 ;
mkN3 : Str -> Noun ** {c1,c2 : Compl} ; mkN3 : Str -> N3 ;
-- worst case function -- worst case function
-- parameters: all singular cases of base, base of genitive table, plural form of base and harmony of base -- parameters: all singular cases of base, base of genitive table, plural form of base and harmony of base
mkNoun : (nom,acc,dat,gen,loc,abl,abessPos,abessNeg,gens,plural : Str) -> Harmony -> Noun ; mkNoun : (nom,acc,dat,gen,loc,abl,abessPos,abessNeg,gens,plural : Str) -> Harmony -> N ;
--this function is for nouns that has different harmony than their vowels imply --this function is for nouns that has different harmony than their vowels imply
irregN_h : (burun, burn : Str) -> HarVowP -> Noun ; irregN_h : (burun, burn : Str) -> HarVowP -> N ;
-- this function handles all irregularities in nouns, because all irregularities require two forms of noun -- this function handles all irregularities in nouns, because all irregularities require two forms of noun
irregN : HarVowP -> (burun, burn : Str) -> Noun; irregN : HarVowP -> (burun, burn : Str) -> N ;
-- paradigm for regular noun -- paradigm for regular noun
regN : Str -> Noun ; regN : Str -> N ;
-- paradigm for proper noun -- paradigm for proper noun
regPN : Str -> Noun ; regPN : Str -> Noun ;
-- worst case function for proper nouns -- worst case function for proper nouns
@@ -122,7 +123,7 @@ oper
-- digits can be seen as proper noun, but we need an additional harmony argument since harmony information can not be extracted from digit string. -- digits can be seen as proper noun, but we need an additional harmony argument since harmony information can not be extracted from digit string.
makeHarPN : Str -> Str -> Harmony -> Noun ; makeHarPN : Str -> Str -> Harmony -> Noun ;
-- Link two nouns, e.g. zeytin (olive) + yağ (oil) -> zeytinyağı (olive oil) -- Link two nouns, e.g. zeytin (olive) + yağ (oil) -> zeytinyağı (olive oil)
linkNoun : (tere,yag : Noun) -> Species -> Contiguity -> Noun ; linkNoun : (tere,yag : N) -> Species -> Contiguity -> N ;
-- Paradigms for adjactives -- Paradigms for adjactives
mkA : overload { mkA : overload {
@@ -138,10 +139,10 @@ oper
mkA2 : overload { mkA2 : overload {
-- (biri) ile evli -- (biri) ile evli
mkA2 : Adjective -> Compl -> Adjective ** {c : Compl}; mkA2 : A -> Prep -> A2 ;
} ; } ;
mkAdj2 : Adjective -> Compl -> Adjective ** {c : Compl} ; mkAdj2 : A -> Prep -> A2 ;
-- Paradigms for numerals -- Paradigms for numerals
mkNum : overload { mkNum : overload {
@@ -167,22 +168,22 @@ oper
mkV = overload { mkV = overload {
--esmek --esmek
mkV : Str -> Verb = regV ; mkV : Str -> V = regV ;
--gelmek --gelmek
mkV : Str -> AoristType -> Verb = irregV_aor ; mkV : Str -> AoristType -> V = irregV_aor ;
--gitmek --gitmek
mkV : Str -> Str -> Verb = \inf,softInf -> regVerb inf softInf softInf (getAoristType (tk 3 inf)) ; mkV : Str -> Str -> V = \inf,softInf -> regVerb inf softInf softInf (getAoristType (tk 3 inf)) ;
--yemek --yemek
mkV : Str -> Str -> Str -> Verb = \inf,softInf,futInf -> regVerb inf softInf futInf (getAoristType (tk 3 inf)) ; mkV : Str -> Str -> Str -> V = \inf,softInf,futInf -> regVerb inf softInf futInf (getAoristType (tk 3 inf)) ;
--seyretmek --seyretmek
mkV : Str -> Verb -> Contiguity -> Verb = auxillaryVerb ; mkV : Str -> V -> Contiguity -> V = auxillaryVerb ;
--nefret etmek --nefret etmek
mkV : Str -> Verb -> Verb = \base,v -> auxillaryVerb base v Sep ; mkV : Str -> V -> V = \base,v -> auxillaryVerb base v Sep ;
} ; } ;
auxillaryVerb prefix verb con = case con of { auxillaryVerb prefix verb con = case con of {
Sep => {s = \\t => prefix ++ verb.s ! t} ; Sep => lin V {s = \\t => prefix ++ verb.s ! t} ;
Con => {s = \\t => prefix + verb.s ! t} Con => lin V {s = \\t => prefix + verb.s ! t}
} ; } ;
regV inf = regVerb inf inf inf (getAoristType (tk 3 inf)) ; regV inf = regVerb inf inf inf (getAoristType (tk 3 inf)) ;
@@ -221,7 +222,7 @@ oper
pastHar = {vow = har.vow ; con = SVow} ; pastHar = {vow = har.vow ; con = SVow} ;
futHar = {vow = futht ; con = (SCon Soft)} ; futHar = {vow = futht ; con = (SCon Soft)} ;
aorHar = {vow = getHarVowP aoristBase ; con = (SCon Soft)} ; aorHar = {vow = getHarVowP aoristBase ; con = (SCon Soft)} ;
in { in lin V {
s = table { s = table {
VProg agr => addSuffix progBase progHar (verbSuffixes ! agr) ; VProg agr => addSuffix progBase progHar (verbSuffixes ! agr) ;
VPast agr => addSuffix pastBase pastHar (verbSuffixes ! agr) ; VPast agr => addSuffix pastBase pastHar (verbSuffixes ! agr) ;
@@ -237,7 +238,7 @@ oper
mkNoun sn sa sd sg sl sabl sgabPos sgabNeg sgs pln har = mkNoun sn sa sd sg sl sabl sgabPos sgabNeg sgs pln har =
let plHar = getHarmony pln ; let plHar = getHarmony pln ;
in in
{ lin N {
s = table { s = table {
Sg => table { Sg => table {
Nom => sn ; Nom => sn ;
@@ -349,7 +350,7 @@ oper
sgAbessNeg = con.p6 ; sgAbessNeg = con.p6 ;
sgHar = getHarmony sn ; sgHar = getHarmony sn ;
plHar = getHarmony pn plHar = getHarmony pn
in { in lin N {
s = table { s = table {
Sg => table { Sg => table {
Nom => sn ; --tereyağı Nom => sn ; --tereyağı
@@ -380,32 +381,32 @@ oper
} ; } ;
mkN = overload { mkN = overload {
mkN : (araba : Str) -> Noun = regN ; mkN : (araba : Str) -> N = regN ;
mkN : (burun, burn : Str) -> Noun = \sn,sg -> irregN (getComplexHarmony sn sg) sn sg ; mkN : (burun, burn : Str) -> N = \sn,sg -> irregN (getComplexHarmony sn sg) sn sg ;
mkN : (divaniharp, divaniharb : Str) -> (ih_har : HarVowP) -> Noun = irregN_h ; mkN : (divaniharp, divaniharb : Str) -> (ih_har : HarVowP) -> N = irregN_h ;
mkN : (fotograf, makine : Noun) -> Contiguity -> Noun = \n1,n2,c -> linkNoun n1 n2 Indef c ; mkN : (fotograf, makine : N) -> Contiguity -> Noun = \n1,n2,c -> linkNoun n1 n2 Indef c ;
mkN : (zeytin, yag : Noun) -> Noun = \n1,n2 -> linkNoun n1 n2 Indef Con ; mkN : (zeytin, yag : N) -> N = \n1,n2 -> linkNoun n1 n2 Indef Con ;
} ; } ;
mkN2 base = mkN base ** {c = {s=[]; c=Gen}} ; mkN2 base = (mkN base) ** lin N2 {c = lin Prep {s=[]; c=Gen}} ;
mkN3 base = mkN base ** {c1,c2 = {s=[]; c=Gen}} ; mkN3 base = (mkN base) ** lin N3 {c1,c2 = lin Prep {s=[]; c=Gen}} ;
-- Implementation of adjactive paradigms -- Implementation of adjactive paradigms
mkA = overload { mkA = overload {
-- güzel -- güzel
mkA : Str -> Adjective = \base -> (mkN base) ** { adv = addSuffix base (getHarmony base) adjAdvSuffix } ; mkA : Str -> A = \base -> (mkN base) ** { adv = addSuffix base (getHarmony base) adjAdvSuffix; lock_A=<> } ;
-- ak -- ak
mkA : Str -> Str -> Adjective = \base,soft -> (irregN (getComplexHarmony base soft) base soft ) ** { adv = addSuffix base (getHarmony base) adjAdvSuffix } ; mkA : Str -> Str -> A = \base,soft -> (irregN (getComplexHarmony base soft) base soft ) ** { adv = addSuffix base (getHarmony base) adjAdvSuffix } ;
-- kahve rengi -- kahve rengi
mkA : (zeytin, yag : Noun) -> Adjective = \n1,n2 -> let n = linkNoun n1 n2 Indef Con in n ** {adv = addSuffix (n.s ! Sg ! Nom) (getHarmony (n.s ! Sg ! Nom)) adjAdvSuffix } ; mkA : (zeytin, yag : N) -> A = \n1,n2 -> let n = linkNoun n1 n2 Indef Con in n ** {adv = addSuffix (n.s ! Sg ! Nom) (getHarmony (n.s ! Sg ! Nom)) adjAdvSuffix } ;
-- pürdikkat -- pürdikkat
mkA : (base, base1 : Str) -> (ih_har : HarVowP) -> Adjective = \base,base1,ih_har -> (irregN_h base base ih_har) ** { adv = addSuffix base (mkHar ih_har (getHarConP base)) adjAdvSuffix }; mkA : (base, base1 : Str) -> (ih_har : HarVowP) -> A = \base,base1,ih_har -> (irregN_h base base ih_har) ** { adv = addSuffix base (mkHar ih_har (getHarConP base)) adjAdvSuffix };
} ; } ;
mkA2 = overload { mkA2 = overload {
mkA2 : Adjective -> Compl -> Adjective ** {c : Compl} = mkAdj2 ; mkA2 : A -> Prep -> A2 = mkAdj2 ;
} ; } ;
mkAdj2 base c = base ** {c = c} ; mkAdj2 base c = base ** {c = c} ;
@@ -506,9 +507,9 @@ oper
Pl => addSuffix base (mkHar harVow SVow) plSuffix Pl => addSuffix base (mkHar harVow SVow) plSuffix
} ; } ;
ablat_Case = mkPrep [] Ablat; ablat_Case : Prep = mkPrep [] Ablat;
dat_Case = mkPrep [] Dat; dat_Case : Prep = mkPrep [] Dat;
acc_Case = mkPrep [] Dat; acc_Case : Prep = mkPrep [] Dat;
mkQuant : Str -> Quant = \s -> lin Quant {s=s} ; mkQuant : Str -> Quant = \s -> lin Quant {s=s} ;

1
src/turkish/ResTur.gf
View File

@@ -14,7 +14,6 @@ resource ResTur = ParamX ** open Prelude, Predef, HarmonyTur in {
oper oper
Agr = {n : Number ; p : Person} ; Agr = {n : Number ; p : Person} ;
Compl = {s : Str; c : Case} ;
Noun = {s : Number => Case => Str; gen : Number => Agr => Str; harmony : Harmony} ; Noun = {s : Number => Case => Str; gen : Number => Agr => Str; harmony : Harmony} ;
Pron = {s : Case => Str; a : Agr} ; Pron = {s : Case => Str; a : Agr} ;