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

A tested version of Numerals

Browse Source 
A bug is known in NP case agreement. The fix does not belong to this part of the resource grammar.
This commit is contained in:
Nick Frolov
2011-12-14 16:22:43 +00:00
parent 20b4ff07e3
commit 342ba2e070
7 changed files with 186 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/src/russian/NounRus.gf
View File

@@ -82,7 +82,7 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
} ;
DetQuantOrd quant num ord = {
s = \\af => quant.s !af ++ num.s! (caseAF af) ! (genAF af) ++ ord.s!af ;
s = \\af => quant.s !af ++ num.s ! (genAF af) ! (animAF af) ! (caseAF af) ++ ord.s!af ;
n = num.n ;
g = quant.g;
c = quant.c;
@@ -91,7 +91,7 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
} ;
DetQuant quant num = {
s = \\af => quant.s !af ++ num.s! (caseAF af) ! (genAF af) ;
s = \\af => quant.s !af ++ num.s ! (genAF af) ! (animAF af) ! (caseAF af);
n = num.n ;
g = quant.g;
c = quant.c;
@@ -149,8 +149,8 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
PossPron p = {s = \\af => p.s ! mkPronForm (caseAF af) No (Poss (gennum (genAF af) (numAF af) )); c=Nom; g = PNoGen; q = False} ;
NumCard c = c ;
NumSg = {s = \\_,_ => [] ; n = Sg} ;
NumPl = {s = \\_,_ => [] ; n = Pl} ;
NumSg = {s = \\_,_,_ => [] ; n = Sg} ;
NumPl = {s = \\_,_,_ => [] ; n = Pl} ;
OrdNumeral numeral = variants {} ; ---- TODO; needed to compile Constructors
OrdDigits numeral = variants {} ; ---- TODO; needed to compile Constructors
@@ -158,9 +158,9 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
-- {s = \\ af => (uy_j_EndDecl (numeral.s ! caseAF af ! genAF af)).s!af} ;
NumNumeral n = n ;
NumDigits n = {s = \\_,_ => n.s ; n = n.n} ;
NumDigits n = {s = \\_,_,_ => n.s ; n = n.n} ;
AdNum adn num = {s = \\c,n => adn.s ++ num.s!c!n ; n = num.n} ;
AdNum adn num = {s = \\c,a,n => adn.s ++ num.s!c!a!n ; n = num.n} ;
OrdSuperl a = {s = a.s!Posit};