mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-07-02 12:08:34 -06:00
Worked on DetQuant in Noun and Digits in Numeral
This commit is contained in:
+34
-30
@@ -1,7 +1,7 @@
|
||||
--# -path=.:../prelude:../abstract:../common
|
||||
|
||||
concrete NumeralCgg of Numeral = CatCgg [Numeral,Digits] **
|
||||
open ResCgg in {
|
||||
open ResCgg, Prelude in {
|
||||
|
||||
lincat
|
||||
Digit = { s : Str; unit : { s:Str ; g : Gender; stem : Str}; ten : { s:Str ; g : Gender} };
|
||||
@@ -10,19 +10,25 @@ lincat
|
||||
Sub1000 = {s : Str ; g:Gender; n : Number} ;
|
||||
Sub1000000 = {s : Str ; g:Gender; n : Number} ;
|
||||
|
||||
lin num x = x ;
|
||||
lin n2 = mkNum "biri" "ibiri" ZERO_ZERO "abiri" I_MA;
|
||||
|
||||
lin n3 = mkNum "shatu" "ishatu" I_ZERO "ashatu" I_MA;
|
||||
lin n4 = mkNum "na" "ina" I_ZERO "ana" I_MA ;
|
||||
lin n5 = mkNum "taano" "itaano" I_ZERO "ataano" I_MA ;
|
||||
lin n6 = mkNum "kaaga" "mukaaga" MU_MI "nkaaga" N_ZERO;
|
||||
lin n7 = mkNum "shanju" "mushanju" MU_MI "nshanju" N_ZERO;
|
||||
lin n8 = mkNum "naana" "munaana" MU_MI "kinaana" KI_ZERO ;
|
||||
lin n9 = mkNum "enda" "mwenda" MU_MI "kyenda" KI_ZERO ;
|
||||
lin num x = x ; --Numeral = {s : Res.CardOrd => Res.Agreement => Str ; n : Res.Number} ;
|
||||
lin n2 = mkNum "biri" "ibiri" ZERO_ZERO "abiri" I_MA True;
|
||||
lin n3 = mkNum "shatu" "ishatu" I_ZERO "ashatu" I_MA True;
|
||||
lin n4 = mkNum "na" "ina" I_ZERO "ana" I_MA True;
|
||||
lin n5 = mkNum "taano" "itaano" I_ZERO "ataano" I_MA True;
|
||||
lin n6 = mkNum "kaaga" "mukaaga" MU_MI "nkaaga" N_ZERO False;
|
||||
lin n7 = mkNum "shanju" "mushanju" MU_MI "nshanju" N_ZERO False;
|
||||
lin n8 = mkNum "naana" "munaana" MU_MI "kinaana" KI_ZERO False;
|
||||
lin n9 = mkNum "enda" "mwenda" MU_MI "kyenda" KI_ZERO False;
|
||||
|
||||
|
||||
lin pot01 = mkNum "mwe" "emwe" ZERO_ZERO "ikumi" I_MA ** {n = Sg} ; -- 1
|
||||
lin pot01 = {s = [];
|
||||
unit ={s = "emwe"; g = ZERO_ZERO; stem ="mwe"};
|
||||
ten = {s = "ikumi" ; g = I_MA};
|
||||
ordinal = "kabanza";
|
||||
isOrdDifferent = True;
|
||||
n = Sg
|
||||
}; -- 1
|
||||
lin pot0 d = d ** {n = Pl} ; -- Sub10 d * 1
|
||||
lin pot110 = {s = "ikumi" ; g= I_MA; n = Pl}; --10 -Sub100
|
||||
lin pot111 = {s = "ikumi na emwe" ; g = ZERO_ZERO; n = Pl}; --11
|
||||
@@ -40,19 +46,19 @@ lin pot2 d = let
|
||||
_ => d.ten.s
|
||||
};
|
||||
in {s = "magana" ++ numStr; g = ZERO_ZERO} ** {n = Pl} ;
|
||||
{-
|
||||
|
||||
lin pot2plus d e = let
|
||||
unitFigure = case <d.n> of{
|
||||
unitFigure = case d.n of{
|
||||
Sg => "igana";
|
||||
_ => "magana"
|
||||
};
|
||||
|
||||
numStr = case <d.unit.g> of{
|
||||
numStr = case d.unit.g of{
|
||||
MU_MI => d.unit.s;
|
||||
_ => d.ten.s
|
||||
};
|
||||
in {s = unitFigure ++ numStr ++ "na" ++ e.unit.s; g = ZERO_ZERO} ** {n = Pl} ; -- Sub10 -> Sub100 -> Sub1000 ; * 100 + n
|
||||
-}
|
||||
in {s = unitFigure ++ numStr ++ "na" ++ e.s; g = ZERO_ZERO} ** {n = Pl} ; -- Sub10 -> Sub100 -> Sub1000 ; * 100 + n
|
||||
|
||||
|
||||
lin pot2as3 n = n ;
|
||||
lin pot3 n = let
|
||||
@@ -69,8 +75,8 @@ lin pot3plus n m = let
|
||||
};
|
||||
in { s = thousand ++ m.s; g = ZERO_ZERO; n = n.n} ;
|
||||
|
||||
-- numerals as sequences of digits
|
||||
{-
|
||||
|
||||
|
||||
lincat
|
||||
Dig = TDigit ;
|
||||
|
||||
@@ -78,15 +84,15 @@ lin pot3plus n m = let
|
||||
IDig d = d ** {tail = T1} ;
|
||||
|
||||
IIDig d i = {
|
||||
s = \\o,c => d.s ! NCard ! Nom ++ commaIf i.tail ++ i.s ! o ! c ;
|
||||
s = \\o,agr => d.s ! NCard ! agr ++ commaIf i.tail ++ i.s ! o ! agr ;
|
||||
n = Pl ;
|
||||
tail = inc i.tail
|
||||
} ;
|
||||
|
||||
D_0 = mkDig "0" ;
|
||||
D_1 = mk3Dig "1" "1st" Sg ;
|
||||
D_2 = mk2Dig "2" "2nd" ;
|
||||
D_3 = mk2Dig "3" "3rd" ;
|
||||
D_1 = mk3Dig "1" "1" Sg ;
|
||||
D_2 = mkDig "2" ;
|
||||
D_3 = mkDig "3" ;
|
||||
D_4 = mkDig "4" ;
|
||||
D_5 = mkDig "5" ;
|
||||
D_6 = mkDig "6" ;
|
||||
@@ -104,24 +110,22 @@ lin pot3plus n m = let
|
||||
T1 => T2 ;
|
||||
T2 => T3 ;
|
||||
T3 => T1
|
||||
} ;
|
||||
};
|
||||
|
||||
mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
|
||||
mkDig : Str -> TDigit = \c -> mk2Dig c (c + "th") ;
|
||||
mkDig : Str -> TDigit = \c -> mk2Dig c c;
|
||||
|
||||
mk3Dig : Str -> Str -> Number -> TDigit = \c,o,n -> {
|
||||
s = table {NCard => regGenitiveS c ; NOrd => regGenitiveS o} ;
|
||||
s = table {NCard =>\\_=> c ; NOrd => mkOrdinal c } ;
|
||||
n = n
|
||||
} ;
|
||||
|
||||
TDigit = {
|
||||
n : Number ;
|
||||
s : CardOrd => Case => Str
|
||||
s : CardOrd =>Agreement => Str;
|
||||
n : Number
|
||||
} ;
|
||||
|
||||
-}
|
||||
|
||||
|
||||
mkOrdinal : Str -> Agreement => Str =\c -> \\agr => mkGenPrepWithIVClitic ! agr ++ c;
|
||||
{-
|
||||
--1 Numerals
|
||||
|
||||
|
||||
Reference in New Issue
Block a user