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

fixes to Det and ComplSlash in Chi

Browse Source
This commit is contained in:
aarne
2012-10-15 20:03:13 +00:00
parent d21c9913cf
commit fefb95ecc7
8 changed files with 100 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
lib/src/chinese/NumeralChi.gf
View File

@@ -16,55 +16,53 @@ oper Wan : Zero => Str =
oper mkD : Str -> Str -> Str = \x,_ -> word x ; -- hiding the "formal" version
--lincat Numeral = {s : Str} ;
lincat Digit = {s : Str} ;
lincat Sub10 = {s : Str} ;
lincat Sub100 = {inh : Zero ; s : Bform => Str} ;
lincat Sub1000 = {inh : Zero ; s : Qform => Str} ;
lincat Sub1000000 = {s : Str} ;
lin num x0 =
{s = x0.s} ;
lincat Digit = {s,p : Str} ;
lincat Sub10 = {s,p : Str} ;
lincat Sub100 = {inh : Zero ; s,p : Bform => Str} ;
lincat Sub1000 = {inh : Zero ; s,p : Qform => Str} ;
lincat Sub1000000 = {s,p : Str} ;
lin num x0 = x0 ;
-- 一二三四五六七八九十一百千
--
lin n2 =
{s = mkD "二" "贰"} ;
{s = mkD "二" "贰" ; p = "两"} ;
lin n3 =
{s = mkD "三" "叁"} ;
{s,p = mkD "三" "叁"} ;
lin n4 =
{s = mkD "四" "肆"} ;
{s,p = mkD "四" "肆"} ;
lin n5 =
{s = mkD "五" "伍"} ;
{s,p = mkD "五" "伍"} ;
lin n6 =
{s = mkD "六" "陆"} ;
{s,p = mkD "六" "陆"} ;
lin n7 =
{s = mkD "七" "柒"} ;
{s,p = mkD "七" "柒"} ;
lin n8 =
{s = mkD "八" "捌"} ;
{s,p = mkD "八" "捌"} ;
lin n9 =
{s = mkD "九" "玖"} ;
{s,p = mkD "九" "玖"} ;
lin pot01 =
{s = mkD "一" "壹"} ;
{s,p = mkD "一" "壹"} ;
lin pot0 d =
{s = d.s} ;
{s = d.s ; p = d.p} ;
lin pot110 =
{inh = nozero ;
s = table {
s,p = table {
shi => mkD "一十" "壹拾" ;
shi0 => mkD "一十" "壹拾" ;
wan => mkD "一万" "壹万" ;
wan0 => mkD "一万" "壹万"}} ;
lin pot111 =
{inh = nozero ;
s = table {
s,p = table {
shi => mkD "十一" "拾壹" ;
shi0 => mkD "一十一" "壹拾壹" ;
wan => mkD "十一万" "拾壹万" ;
wan0 => mkD "十一万" "拾壹万"}} ;
lin pot1to19 d =
{inh = nozero ;
s = table {
s,p = table {
shi => mkD "一十" "壹拾" ++ d.s ;
shi0 => mkD "一十" "壹拾" ;
wan => mkD "一万" "壹万" ++ d.s ++ mkD "千" "仟" ;
@@ -75,17 +73,23 @@ lin pot0as1 n =
shi => n.s ;
shi0 => n.s ;
wan => n.s ++ mkD "千" "仟" ;
wan0 => n.s ++ mkD "千" "仟"}} ;
wan0 => n.s ++ mkD "千" "仟"} ;
p = table {
shi => n.p ;
shi0 => n.s ;
wan => n.s ++ mkD "千" "仟" ;
wan0 => n.s ++ mkD "千" "仟"}
} ;
lin pot1 d =
{inh = zero ;
s = table {
s,p = table {
shi => d.s ++ mkD "十" "拾" ;
shi0 => d.s ++ mkD "十" "拾" ;
wan0 => d.s ++ "万" ;
wan => d.s ++ "万"}} ;
lin pot1plus d e =
{inh = nozero ;
s = table {
s,p = table {
shi => d.s ++ mkD "十" "拾" ++ e.s ;
shi0 => d.s ++ mkD "十" "拾" ++ e.s ;
wan => d.s ++ "万" ++ e.s ++ mkD "千" "仟" ;
@@ -96,27 +100,32 @@ lin pot1as2 n =
bai => n.s ! shi ;
bai0 => n.s ! shi ;
shiwan => n.s ! wan ;
shiwan0 => n.s ! wan0} ;
p = table {
bai => n.p ! shi ;
bai0 => n.s ! shi ;
shiwan => n.s ! wan ;
shiwan0 => n.s ! wan0}} ;
lin pot2 d =
{inh = zero ;
s = table {
s,p = table {
bai => d.s ++ mkD "百" "佰" ;
bai0 => d.s ++ mkD "百" "佰" ;
shiwan0 => d.s ++ mkD "十万" "拾万" ;
shiwan => d.s ++ mkD "十万" "拾万"}} ;
lin pot2plus d e =
{inh = nozero ;
s = table {
s,p = table {
bai => d.s ++ mkD "" "佰" ++ (ling ! <e.inh,e.inh>) ++ e.s ! shi0 ;
bai0 => d.s ++ mkD "" "佰" ++ (ling ! <e.inh,e.inh>) ++ e.s ! shi0 ;
shiwan => d.s ++ mkD "" "拾" ++ (Wan ! (e.inh)) ++ e.s ! wan ;
shiwan0 => d.s ++ mkD "" "拾" ++ (Wan ! (e.inh)) ++ e.s ! wan0}} ;
lin pot2as3 n =
{s = n.s ! bai} ;
{s = n.s ! bai ; p = n.p ! bai} ;
lin pot3 n =
{s = n.s ! shiwan} ;
{s,p = n.s ! shiwan} ;
lin pot3plus n m =
{s = (n.s ! shiwan0) ++ (ling ! <n.inh,m.inh>) ++ m.s ! bai0} ;
{s,p = (n.s ! shiwan0) ++ (ling ! <n.inh,m.inh>) ++ m.s ! bai0} ;
-- numerals as sequences of digits