mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-03 00:02:50 -06:00
Convert many RGL modules from Latin-1 to UTF-8 to speed up compilation
Also add flags coding=utf8 to silence warnings.
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
--# -path=.:../common:prelude
|
||||
--# -coding=latin1
|
||||
|
||||
--1 A Simple Finnish Resource Morphology
|
||||
--
|
||||
@@ -12,6 +11,7 @@
|
||||
resource MorphoFin = ResFin ** open Prelude in {
|
||||
|
||||
flags optimize=noexpand ;
|
||||
coding=utf8 ;
|
||||
|
||||
oper
|
||||
|
||||
@@ -109,7 +109,7 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
(onnettom + "in" + a) (onnettom + "iss" + a)
|
||||
(onnettom + "iin") ;
|
||||
|
||||
-- 2-syllable a/ä, o/ö, u/y
|
||||
-- 2-syllable a/ä, o/ö, u/y
|
||||
dUkko : (_,_ : Str) -> NForms = \ukko,ukon ->
|
||||
let
|
||||
o = last ukko ;
|
||||
@@ -118,8 +118,8 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
uko = init ukon ;
|
||||
uk = init uko ;
|
||||
ukkoja = case <ukko : Str> of {
|
||||
_ + "ä" => -- kylä,kyliä,kylien,kylissä,kyliin
|
||||
<ukk + "iä", ukk + "ien", ukk, uk, ukk + "iin"> ;
|
||||
_ + "ä" => -- kylä,kyliä,kylien,kylissä,kyliin
|
||||
<ukk + "iä", ukk + "ien", ukk, uk, ukk + "iin"> ;
|
||||
_ + ("au" | "eu") + _ + "a" => -- kauhojen,seurojen
|
||||
<ukk + "oja",ukk + "ojen",ukk + "o", uk + "o", ukk + "oihin"> ;
|
||||
_ + ("o" | "u") + _ + "a" => -- pula,pulia,pulien,pulissa,puliin
|
||||
@@ -136,7 +136,7 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
ukkoja.p2 ukkoja.p1
|
||||
ukkoina ukoissa ukkoja.p5 ;
|
||||
|
||||
-- 3-syllable a/ä/o/ö
|
||||
-- 3-syllable a/ä/o/ö
|
||||
dSilakka : (_,_,_ : Str) -> NForms = \silakka,silakan,silakoita ->
|
||||
let
|
||||
o = last silakka ;
|
||||
@@ -145,15 +145,15 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
silaka = init silakan ;
|
||||
silak = init silaka ;
|
||||
silakkaa = silakka + case o of {
|
||||
"o" | "ö" => "t" + a ; -- radiota
|
||||
"o" | "ö" => "t" + a ; -- radiota
|
||||
_ => a -- sammakkoa
|
||||
} ;
|
||||
silakoiden = case <silakoita : Str> of {
|
||||
_ + "i" + ("a" | "ä") => -- asemia
|
||||
_ + "i" + ("a" | "ä") => -- asemia
|
||||
<silakka+a, silakk + "ien", silakk, silak, silakk + "iin"> ;
|
||||
_ + O@("o" | "ö" | "u" | "y" | "e") + ("ja" | "jä") => -- pasuunoja
|
||||
_ + O@("o" | "ö" | "u" | "y" | "e") + ("ja" | "jä") => -- pasuunoja
|
||||
<silakka+a,silakk+O+"jen",silakk+O, silak+O, silakk +O+ "ihin"> ;
|
||||
_ + O@("o" | "ö" | "u" | "y" | "e") + ("ita" | "itä") => -- silakoita
|
||||
_ + O@("o" | "ö" | "u" | "y" | "e") + ("ita" | "itä") => -- silakoita
|
||||
<silakkaa, silak+O+"iden",silakk+O, silak+O, silakk +O+ "ihin"> ;
|
||||
_ => Predef.error silakoita
|
||||
} ;
|
||||
@@ -172,7 +172,7 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
ar = init arp ;
|
||||
arpe = case last arp of {
|
||||
"s" => case last arv of {
|
||||
"d" | "l" | "n" | "r" => -- suden,sutta ; jälsi ; kansi ; hirsi
|
||||
"d" | "l" | "n" | "r" => -- suden,sutta ; jälsi ; kansi ; hirsi
|
||||
<ar + "tt" + a, arpi + "en",arpi,ar + "t"> ;
|
||||
_ => -- kuusta,kuusien
|
||||
<arp + "t" + a,arp + "ien",arpi, arp>
|
||||
@@ -183,7 +183,7 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
<arp + "t" + a,arp + "ien",arpi, arp>;
|
||||
_ => -- arpea,arpien,arvissa
|
||||
<arp + "e" + a,arp + "ien",arv+"i",arp>
|
||||
} ; ---- pieni,pientä; uni,unta
|
||||
} ; ---- pieni,pientä; uni,unta
|
||||
in nForms10
|
||||
arpi arven arpe.p1 (arpe.p4 + "en" + a) (arpe.p4 + "een")
|
||||
arpe.p2 (arpi + a)
|
||||
@@ -282,23 +282,23 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
"A" =>
|
||||
<"n","ta","na","han","iden","ita","ina","issa","ihin"> ;
|
||||
"B" | "C" | "D" | "E" | "G" | "P" | "T" | "V" | "W" =>
|
||||
<"n","tä","nä","hen","iden","itä","inä","issä","ihin"> ;
|
||||
<"n","tä","nä","hen","iden","itä","inä","issä","ihin"> ;
|
||||
"F" | "L" | "M" | "N" | "R" | "S" | "X" =>
|
||||
<"n","ää","nä","ään","ien","iä","inä","issä","iin"> ;
|
||||
"H" | "K" | "O" | "Å" =>
|
||||
<"n","ää","nä","ään","ien","iä","inä","issä","iin"> ;
|
||||
"H" | "K" | "O" | "Å" =>
|
||||
<"n","ta","na","hon","iden","ita","ina","issa","ihin"> ;
|
||||
"I" | "J" =>
|
||||
<"n","tä","nä","hin","iden","itä","inä","issä","ihin"> ;
|
||||
<"n","tä","nä","hin","iden","itä","inä","issä","ihin"> ;
|
||||
"Q" | "U" =>
|
||||
<"n","ta","na","hun","iden","ita","ina","issa","ihin"> ;
|
||||
"Z" =>
|
||||
<"n","aa","na","aan","ojen","oja","oina","oissa","oihin"> ;
|
||||
"Ä" =>
|
||||
<"n","tä","nä","hän","iden","itä","inä","issä","ihin"> ;
|
||||
"Ö" =>
|
||||
<"n","tä","nä","hön","iden","itä","inä","issä","ihin"> ;
|
||||
"Ä" =>
|
||||
<"n","tä","nä","hän","iden","itä","inä","issä","ihin"> ;
|
||||
"Ö" =>
|
||||
<"n","tä","nä","hön","iden","itä","inä","issä","ihin"> ;
|
||||
"Y" =>
|
||||
<"n","tä","nä","hyn","iden","itä","inä","issä","ihin"> ;
|
||||
<"n","tä","nä","hyn","iden","itä","inä","issä","ihin"> ;
|
||||
_ => Predef.error (["illegal abbreviation"] ++ SDP)
|
||||
} ;
|
||||
in nForms10
|
||||
@@ -609,7 +609,7 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
pudot = init pudota ;
|
||||
pudo = init pudot ;
|
||||
ai = case last pudo of {
|
||||
"a" | "ä" => <[], "i"> ;
|
||||
"a" | "ä" => <[], "i"> ;
|
||||
_ => <a, a + "i">
|
||||
} ;
|
||||
puto = Predef.tk 2 putosi ;
|
||||
@@ -735,7 +735,7 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
tule_ = init tulen ;
|
||||
tuli_ = init tulin ;
|
||||
a = last tulkaa ;
|
||||
tulko = Predef.tk 2 tulkaa + (ifTok Str a "a" "o" "ö") ;
|
||||
tulko = Predef.tk 2 tulkaa + (ifTok Str a "a" "o" "ö") ;
|
||||
o = last tulko ;
|
||||
tulkoo = tulko + o ;
|
||||
tullee = Predef.tk 2 tullut + "ee" ;
|
||||
@@ -853,13 +853,13 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
"rk" + ("i" | "e") => ku + "rj" + o ;
|
||||
"lk" + _ => ku + "l" + o ;
|
||||
"rk" + _ => ku + "r" + o ;
|
||||
("hk" | "tk") + _ => kukko ; -- *tahko-tahon, *pitkä-pitkän
|
||||
("hk" | "tk") + _ => kukko ; -- *tahko-tahon, *pitkä-pitkän
|
||||
("f"|"s") + ("k" | "p" | "t") + _ => kukko ; -- *lasku-lasvun, *raspi-rasvin, *lastu-lasdun, *afta-aftan
|
||||
("k"|"p") + "t" + _ => kukko ; -- *projekti-projekdin
|
||||
x + "ku" => ku + x + "vu" ;
|
||||
x + "k" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + o ;
|
||||
x + "p" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + "v" + o ;
|
||||
x + "t" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + "d" + o ;
|
||||
x + "k" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + o ;
|
||||
x + "p" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + "v" + o ;
|
||||
x + "t" + ("a" | "e" | "i" | "o" | "u" | "y" | "ä" | "ö") => ku + x + "d" + o ;
|
||||
_ => kukko
|
||||
} ;
|
||||
|
||||
@@ -878,13 +878,13 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
"ll" + a => "lt" + a ;
|
||||
h@("h" | "l") + "je" + e => h + "ke" ; -- pohje/lahje impossible
|
||||
("tk" | "hk" | "sk" | "sp" | "st") + _ => nke ; -- viuhke,kuiske
|
||||
a + k@("k"|"p"|"t") + e@("e"|"a"|"ä"|"u"|"y"|"i"|"o"|"ö") => a + k + k + e ;
|
||||
a + "d" + e@("e"|"a"|"ä"|"u"|"i"|"o"|"ö") => a + "t" + e ;
|
||||
s + a@("a" | "ä") + "e" => s + a + "ke" ; -- säe, tae
|
||||
a + k@("k"|"p"|"t") + e@("e"|"a"|"ä"|"u"|"y"|"i"|"o"|"ö") => a + k + k + e ;
|
||||
a + "d" + e@("e"|"a"|"ä"|"u"|"i"|"o"|"ö") => a + "t" + e ;
|
||||
s + a@("a" | "ä") + "e" => s + a + "ke" ; -- säe, tae
|
||||
s + "ui" => s + "uki" ; -- ruis
|
||||
s + "aa" => s + "aka" ; -- taata
|
||||
s + "i" + a@("a" | "e" | "i") => s + "ik" + a ; -- liata, siitä, pietä
|
||||
a + "v" + e@("e"|"a"|"ä"|"u"|"i") => a + "p" + e ; -- taive/toive imposs
|
||||
s + "i" + a@("a" | "e" | "i") => s + "ik" + a ; -- liata, siitä, pietä
|
||||
a + "v" + e@("e"|"a"|"ä"|"u"|"i") => a + "p" + e ; -- taive/toive imposs
|
||||
ase => ase
|
||||
} ;
|
||||
|
||||
@@ -895,12 +895,12 @@ resource MorphoFin = ResFin ** open Prelude in {
|
||||
|
||||
vowHarmony : Str -> Str = \s -> case s of {
|
||||
_ + ("a" | "o" | "u" | "A" | "O" | "U") + _ => "a" ;
|
||||
_ => "ä"
|
||||
_ => "ä"
|
||||
} ;
|
||||
|
||||
getHarmony : Str -> Str = \u -> case u of {
|
||||
"a"|"o"|"u" => "a" ;
|
||||
_ => "ä"
|
||||
_ => "ä"
|
||||
} ;
|
||||
|
||||
-----------------------
|
||||
@@ -914,7 +914,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
|
||||
|
||||
mkDetPol : Bool -> Number -> CommonNoun -> {
|
||||
s1,sp : Case => Str ; -- minun kolme
|
||||
s2 : Harmony => Str ; -- -ni ; nsa/nsä
|
||||
s2 : Harmony => Str ; -- -ni ; nsa/nsä
|
||||
n : Number ; -- Pl (agreement feature for verb)
|
||||
isNum : Bool ; -- True (a numeral is present)
|
||||
isPoss : Bool ; -- True (a possessive suffix is present)
|
||||
@@ -930,7 +930,7 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
|
||||
} ;
|
||||
|
||||
-- Here we define personal and relative pronouns.
|
||||
-- Personal pronouns have possessive suffix (hänen talonsa) but "se" doesn't (sen talo)
|
||||
-- Personal pronouns have possessive suffix (hänen talonsa) but "se" doesn't (sen talo)
|
||||
|
||||
mkPronoun : (_,_,_,_,_ : Str) -> Number -> Person ->
|
||||
{s : NPForm => Str ; a : Agr ; hasPoss : Bool ; poss : Str} = mkPronounGen True ;
|
||||
@@ -999,16 +999,16 @@ oper
|
||||
s = table {
|
||||
Nom => "se" ;
|
||||
Gen => "sen" ;
|
||||
Part => "sitä" ;
|
||||
Part => "sitä" ;
|
||||
Transl => "siksi" ;
|
||||
Ess => "sinä" ;
|
||||
Iness => "siinä" ;
|
||||
Elat => "siitä" ;
|
||||
Ess => "sinä" ;
|
||||
Iness => "siinä" ;
|
||||
Elat => "siitä" ;
|
||||
Illat => "siihen" ;
|
||||
Adess => "sillä" ;
|
||||
Ablat => "siltä" ;
|
||||
Adess => "sillä" ;
|
||||
Ablat => "siltä" ;
|
||||
Allat => "sille" ;
|
||||
Abess => "sittä"
|
||||
Abess => "sittä"
|
||||
} ;
|
||||
} ;
|
||||
|
||||
@@ -1016,16 +1016,16 @@ oper
|
||||
s = table {
|
||||
Nom => "ne" ;
|
||||
Gen => "niiden" ;
|
||||
Part => "niitä" ;
|
||||
Part => "niitä" ;
|
||||
Transl => "niiksi" ;
|
||||
Ess => "niinä" ;
|
||||
Iness => "niissä" ;
|
||||
Elat => "niitä" ;
|
||||
Ess => "niinä" ;
|
||||
Iness => "niissä" ;
|
||||
Elat => "niitä" ;
|
||||
Illat => "niihin" ;
|
||||
Adess => "niillä" ;
|
||||
Ablat => "niiltä" ;
|
||||
Adess => "niillä" ;
|
||||
Ablat => "niiltä" ;
|
||||
Allat => "niille" ;
|
||||
Abess => "niittä"
|
||||
Abess => "niittä"
|
||||
} ;
|
||||
} ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user