GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 03:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chenpeng's fixes in NumeralChi

Browse Source
This commit is contained in:
aarne
2012-11-16 13:15:03 +00:00
parent ba57ad3367
commit ba1ad29b57
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/src/Make.hs
View File

@@ -241,6 +241,7 @@ unlexer abstr ls =
run_gfc :: [String] -> IO () run_gfc :: [String] -> IO ()
run_gfc args = run_gfc args =
do let args' = ["-batch"] ++ filter (not . null) args ++ ["+RTS"] ++ rts_flags ++ ["-RTS"] do let args' = ["-batch"] ++ filter (not . null) args ++ ["+RTS"] ++ rts_flags ++ ["-RTS"]
----do let args' = ["-batch","-new-comp"] ++ filter (not . null) args ++ ["+RTS"] ++ rts_flags ++ ["-RTS"]
--- do let args' = ["-batch","-gf-lib-path=."] ++ filter (not . null) args ++ ["+RTS"] ++ rts_flags ++ ["-RTS"] --- why path? AR --- do let args' = ["-batch","-gf-lib-path=."] ++ filter (not . null) args ++ ["+RTS"] ++ rts_flags ++ ["-RTS"] --- why path? AR
putStrLn $ "Running: " ++ default_gf ++ " " ++ unwords (map showArg args') putStrLn $ "Running: " ++ default_gf ++ " " ++ unwords (map showArg args')
e <- rawSystem default_gf args' e <- rawSystem default_gf args'

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

@@ -58,8 +58,8 @@ lin pot111 =
s,p = table { s,p = table {
shi => mkD "十一" "拾壹" ; shi => mkD "十一" "拾壹" ;
shi0 => mkD "一十一" "壹拾壹" ; shi0 => mkD "一十一" "壹拾壹" ;
wan => mkD "十一万" "拾壹万" ; wan => mkD "一万一千" "壹万壹千" ; -- 11.16 by chenpeng wan => mkD "十一万" "拾壹万" ;
wan0 => mkD "十一万" "拾壹万"}} ; wan0 => mkD "一万一千" "壹万壹千"}} ; -- 11.16 by chenpeng wan0 => mkD "十一万" "拾壹万"}} ;
lin pot1to19 d = lin pot1to19 d =
{inh = nozero ; {inh = nozero ;
s,p = table { s,p = table {
@@ -116,10 +116,10 @@ lin pot2 d =
lin pot2plus d e = lin pot2plus d e =
{inh = nozero ; {inh = nozero ;
s,p = table { s,p = table {
bai => d.s ++ mkD "" "佰" ++ (ling ! <e.inh,e.inh>) ++ e.s ! shi0 ; bai => d.s ++ mkD "百" "佰" ++ (ling ! <e.inh,e.inh>) ++ e.s ! shi0 ; --why omit "百"? i add it /chenpeng
bai0 => d.s ++ mkD "" "佰" ++ (ling ! <e.inh,e.inh>) ++ e.s ! shi0 ; bai0 => d.s ++ mkD "百" "佰" ++ (ling ! <e.inh,e.inh>) ++ e.s ! shi0 ; --why omit "百"? i add it /chenpeng
shiwan => d.s ++ mkD "" "拾" ++ (Wan ! (e.inh)) ++ e.s ! wan ; shiwan => d.s ++ mkD "十" "拾" ++ (Wan ! (e.inh)) ++ e.s ! wan ; --why omit "十"? i add it /chenpeng
shiwan0 => d.s ++ mkD "" "拾" ++ (Wan ! (e.inh)) ++ e.s ! wan0}} ; shiwan0 => d.s ++ mkD "十" "拾" ++ (Wan ! (e.inh)) ++ e.s ! wan0}} ;--why omit "十"? i add it /chenpeng
lin pot2as3 n = lin pot2as3 n =
{s = n.s ! bai ; p = n.p ! bai} ; {s = n.s ! bai ; p = n.p ! bai} ;
lin pot3 n = lin pot3 n =