GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-10 11:42:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Latvian: code refactoring (an intermediate step) and few bugfixes

Browse Source
This commit is contained in:
normundsg
2013-05-10 12:03:42 +00:00
parent 65d29d6ecb
commit aa80b55f2a
24 changed files with 862 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lib/src/latvian/NumeralLav.gf
View File

@@ -1,22 +1,20 @@
--# -path=.:../abstract:../common:../prelude
--# -path=.:abstract:common:prelude
concrete NumeralLav of Numeral = CatLav ** open
ResLav,
ParadigmsLav
in {
concrete NumeralLav of Numeral = CatLav ** open ResLav, ParadigmsLav in {
flags
coding = utf8 ;
flags coding = utf8 ;
lincat
-- TODO: formas, kas pieprasa ģenitīvu - tūkstotis grāmatu, trīs simti meiteņu
Digit = { s : DForm => CardOrd => Gender => Case => Str } ;
Sub10 = { s : CardOrd => Gender => Case => Str ; n : Number } ;
Sub100 = { s : CardOrd => Gender => Case => Str ; n : Number } ;
Sub1000 = { s : CardOrd => Gender => Case => Str ; n : Number } ;
Sub1000000 = { s : CardOrd => Gender => Case => Str ; n : Number } ;
Sub10 = { s : CardOrd => Gender => Case => Str ; num : Number } ;
Sub100 = { s : CardOrd => Gender => Case => Str ; num : Number } ;
Sub1000 = { s : CardOrd => Gender => Case => Str ; num : Number } ;
Sub1000000 = { s : CardOrd => Gender => Case => Str ; num : Number } ;
lin
num x = x ;
n2 = mkNumReg "divi" "otrais" Pl ;
@@ -44,55 +42,55 @@ lin
n8 = mkNumReg "astoņi" "astotais" Pl ;
n9 = mkNumReg "deviņi" "devītais" Pl ;
pot01 = { s = viens.s ! DUnit } ** { n = Sg } ;
pot0 d = { s = d.s ! DUnit } ** { n = Pl } ;
pot110 = { s = viens.s ! DTen } ** { n = Pl } ;
pot111 = { s = viens.s ! DTeen } ** { n = Pl } ;
pot1to19 d = { s = d.s ! DTeen } ** { n = Pl } ;
pot0as1 n = { s = n.s ; n = n.n } ;
pot1 d = { s = d.s ! DTen } ** { n = Pl } ;
pot01 = { s = viens.s ! DUnit } ** { num = Sg } ;
pot0 d = { s = d.s ! DUnit } ** { num = Pl } ;
pot110 = { s = viens.s ! DTen } ** { num = Pl } ;
pot111 = { s = viens.s ! DTeen } ** { num = Pl } ;
pot1to19 d = { s = d.s ! DTeen } ** { num = Pl } ;
pot0as1 n = { s = n.s ; num = n.num } ;
pot1 d = { s = d.s ! DTen } ** { num = Pl } ;
pot1plus d e = {
s = \\o,g,c => d.s ! DTen ! NCard ! Masc ! Nom ++ e.s ! o ! g ! c ;
n = e.n
num = e.num
} ;
pot1as2 n = n ;
-- FIXME: nav īsti labi, kārtas skaitlim ir jābūt 'trīssimtais' utml
pot2 d = {
s = \\o,g,c => d.s ! NCard ! Masc ! Nom ++ simts ! o ! g ! d.n ! c ;
n = Pl
s = \\o,g,c => d.s ! NCard ! Masc ! Nom ++ simts ! o ! g ! d.num ! c ;
num = Pl
} ;
pot2plus d e = {
s = \\o,g,c => d.s ! NCard ! Masc ! Nom ++ simts ! NCard ! Masc ! d.n ! Nom ++ e.s ! o ! g ! c ;
n = e.n
s = \\o,g,c => d.s ! NCard ! Masc ! Nom ++ simts ! NCard ! Masc ! d.num ! Nom ++ e.s ! o ! g ! c ;
num = e.num
} ;
pot2as3 n = n ;
pot3 d = {
s = \\o,g,c => d.s ! NCard ! Masc ! Nom ++ tuukstotis ! o ! g ! d.n ! c ;
n = Pl
s = \\o,g,c => d.s ! NCard ! Masc ! Nom ++ tuukstotis ! o ! g ! d.num ! c ;
num = Pl
} ;
pot3plus d e = {
s = \\o,g,c => d.s ! NCard ! Masc ! Nom ++ tuukstotis ! NCard ! Masc ! d.n ! Nom ++ e.s ! o ! g ! c ;
n = e.n
s = \\o,g,c => d.s ! NCard ! Masc ! Nom ++ tuukstotis ! NCard ! Masc ! d.num ! Nom ++ e.s ! o ! g ! c ;
num = e.num
} ;
-- Numerals as sequences of digits:
lincat
Dig = { n : Number ; s : CardOrd => Str } ;
Dig = { num : Number ; s : CardOrd => Str } ;
lin
IDig d = d ;
IIDig d i = {
s = \\o => d.s ! NCard ++ i.s ! o ;
n = Pl ; -- FIXME: 1 cilvēks, 11 cilvēki, 21 cilvēks, ...
num = Pl ; -- FIXME: 1 cilvēks, 11 cilvēki, 21 cilvēks, ...
} ;
D_0 = mkDig "0" ;
@@ -111,7 +109,7 @@ oper
mk2Dig : Str -> Number -> Dig = \c,n -> lin Dig {
s = table { NCard => c ; NOrd => c + "." } ;
n = n
num = n
} ;
}