use BIND in IIDig for all languages in the library

This commit is contained in:
krasimir
2015-06-11 12:00:57 +00:00
parent 0804f386ff
commit 3c2740c079
24 changed files with 39 additions and 39 deletions

View File

@@ -58,7 +58,7 @@ lin
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! invNum ++ i.s ! o ; s = \\o => d.s ! invNum ++ BIND ++ i.s ! o ;
n = Pl n = Pl
} ; } ;

View File

@@ -1,5 +1,5 @@
concrete NumeralAmh of Numeral = CatAmh ** open ResAmh,ParamX in { concrete NumeralAmh of Numeral = CatAmh ** open ResAmh,ParamX,Prelude in {
flags coding = utf8; flags coding = utf8;
lincat lincat
@@ -93,8 +93,8 @@ lin pot3plus n m = {
oper oper
commaIf : DTail -> Str = \t -> case t of { commaIf : DTail -> Str = \t -> case t of {
T3 => "," ; T3 => BIND++","++BIND ;
_ => [] _ => BIND
} ; } ;
inc : DTail -> DTail = \t -> case t of { inc : DTail -> DTail = \t -> case t of {

View File

@@ -121,7 +121,7 @@ lincat
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = d.s ++ i.s; s = d.s ++ BIND ++ i.s;
n = ThreeTen ; n = ThreeTen ;
} ; } ;

View File

@@ -139,7 +139,7 @@ param
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! NCard Masc ++ i.s ! o ; s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
n = Pl n = Pl
} ; } ;

View File

@@ -1,4 +1,4 @@
concrete NumeralDan of Numeral = CatDan ** open MorphoDan in { concrete NumeralDan of Numeral = CatDan ** open MorphoDan,Prelude in {
flags coding=utf8 ; flags coding=utf8 ;
@@ -52,7 +52,7 @@ lin n9 = mkTal "ni" "nitten" "halvfems" "niende" "halvfemsindstyvende" ;
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! NCard neutrum ++ i.s ! o ; s = \\o => d.s ! NCard neutrum ++ BIND ++ i.s ! o ;
n = Pl n = Pl
} ; } ;

View File

@@ -57,7 +57,7 @@ lin
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! invNum ++ i.s ! o ; s = \\o => d.s ! invNum ++ BIND ++ i.s ! o ;
n = Pl n = Pl
} ; } ;

View File

@@ -128,7 +128,7 @@ oper
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! NCard (NCase Sg Nom) ++ i.s ! o ; s = \\o => d.s ! NCard (NCase Sg Nom) ++ BIND ++ i.s ! o ;
n = Pl n = Pl
} ; } ;

View File

@@ -157,7 +157,7 @@ oper
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! NCard (NCase Sg Nom) ++ i.s ! o ; s = \\o => d.s ! NCard (NCase Sg Nom) ++ BIND ++ i.s ! o ;
n = Pl n = Pl
} ; } ;

View File

@@ -151,7 +151,7 @@ oper hyphen = BIND ++ "-" ++ BIND ;
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! NCard Masc ++ i.s ! o ; s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
n = Pl n = Pl
} ; } ;

View File

@@ -71,8 +71,8 @@ concrete NumeralHun of Numeral = CatHun [Numeral,Digits] ** open ResHun in
-- --
-- oper -- oper
-- commaIf : DTail -> Str = \t -> case t of { -- commaIf : DTail -> Str = \t -> case t of {
-- T3 => "," ; -- T3 => BIND++","++BIND ;
-- _ => [] -- _ => BIND
-- } ; -- } ;
-- --
-- inc : DTail -> DTail = \t -> case t of { -- inc : DTail -> DTail = \t -> case t of {

View File

@@ -1,4 +1,4 @@
concrete NumeralIna of Numeral = CatIna ** open ResIna in { concrete NumeralIna of Numeral = CatIna ** open ResIna,Prelude in {
lincat lincat
Digit = {s : DForm => CardOrd => Str} ; Digit = {s : DForm => CardOrd => Str} ;
@@ -68,8 +68,8 @@ concrete NumeralIna of Numeral = CatIna ** open ResIna in {
oper oper
commaIf : DTail -> Str = \t -> case t of { commaIf : DTail -> Str = \t -> case t of {
T3 => "," ; T3 => BIND++","++BIND ;
_ => [] _ => BIND
} ; } ;
inc : DTail -> DTail = \t -> case t of { inc : DTail -> DTail = \t -> case t of {

View File

@@ -118,7 +118,7 @@ param Pred = pred | indip ;
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! NCard Masc ++ i.s ! o ; s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
n = Pl n = Pl
} ; } ;

View File

@@ -1,4 +1,4 @@
concrete NumeralLat of Numeral = CatLat ** open ResLat in { concrete NumeralLat of Numeral = CatLat ** open ResLat,Prelude in {
-- --
--lincat --lincat
-- Digit = {s : DForm => CardOrd => Str} ; -- Digit = {s : DForm => CardOrd => Str} ;
@@ -51,7 +51,7 @@ concrete NumeralLat of Numeral = CatLat ** open ResLat in {
IDig d = {s = d.s ! one; unit = ten} ; IDig d = {s = d.s ! one; unit = ten} ;
IIDig d i = { IIDig d i = {
s = d.s ! i.unit ++ i.s ; s = d.s ! i.unit ++ BIND ++ i.s ;
unit = inc i.unit unit = inc i.unit
} ; } ;

View File

@@ -1,6 +1,6 @@
--# -path=.:abstract:common:prelude --# -path=.:abstract:common:prelude
concrete NumeralLav of Numeral = CatLav [Numeral,Digits] ** open ResLav, ParadigmsLav in { concrete NumeralLav of Numeral = CatLav [Numeral,Digits] ** open ResLav, ParadigmsLav, Prelude in {
flags coding = utf8 ; flags coding = utf8 ;
@@ -89,7 +89,7 @@ lin
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! NCard ++ i.s ! o ; s = \\o => d.s ! NCard ++ BIND ++ i.s ! o ;
num = Pl ; -- FIXME: 1 cilvēks, 11 cilvēki, 21 cilvēks, ... num = Pl ; -- FIXME: 1 cilvēks, 11 cilvēki, 21 cilvēks, ...
} ; } ;

View File

@@ -380,8 +380,8 @@ concrete NumeralMlt of Numeral = CatMlt [Numeral,Digits] ** open Prelude,ResMlt
-- For correct comma placement in Digits -- For correct comma placement in Digits
commaIf : DTail -> Str = \t -> case t of { commaIf : DTail -> Str = \t -> case t of {
T3 => "," ; T3 => BIND++","++BIND ;
_ => [] _ => BIND
} ; } ;
inc : DTail -> DTail = \t -> case t of { inc : DTail -> DTail = \t -> case t of {
T1 => T2 ; T1 => T2 ;

View File

@@ -1,6 +1,6 @@
--# -path=.:../abstract:../common:../prelude --# -path=.:../abstract:../common:../prelude
concrete NumeralMon of Numeral = CatMon ** open ResMon, MorphoMon in { concrete NumeralMon of Numeral = CatMon ** open ResMon, MorphoMon, Prelude in {
flags coding=utf8 ; flags coding=utf8 ;
@@ -143,7 +143,7 @@ lin
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\co => d.s ! NCard ++ i.s ! co ; s = \\co => d.s ! NCard ++ BIND ++ i.s ! co ;
n = Pl n = Pl
} ; } ;

View File

@@ -1,4 +1,4 @@
concrete NumeralNor of Numeral = CatNor ** open MorphoNor in { concrete NumeralNor of Numeral = CatNor ** open MorphoNor, Prelude in {
flags coding=utf8 ; flags coding=utf8 ;
lincat lincat
@@ -53,7 +53,7 @@ lin
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! NCard neutrum ++ i.s ! o ; s = \\o => d.s ! NCard neutrum ++ BIND ++ i.s ! o ;
n = Pl n = Pl
} ; } ;

View File

@@ -87,8 +87,8 @@ lin pot3plus n m = {
oper oper
commaIf : DTail -> Str = \t -> case t of { commaIf : DTail -> Str = \t -> case t of {
T3 => "," ; T3 => BIND++","++BIND ;
_ => [] _ => BIND
} ; } ;
inc : DTail -> DTail = \t -> case t of { inc : DTail -> DTail = \t -> case t of {

View File

@@ -537,7 +537,7 @@ oper tysiac = table {
IDig d = d; IDig d = d;
-- IIDig : Dig -> Digits -> Digits ; -- 876 -- IIDig : Dig -> Digits -> Digits ; -- 876
IIDig d dd = { s = d.s ++ dd.s; o = d.s ++ dd.o; n=Pl; a=dd.a }; IIDig d dd = { s = d.s ++ BIND ++ dd.s; o = d.s ++ BIND ++ dd.o; n=Pl; a=dd.a };
D_0 = { s = "0"; o="0."; n=Pl; a=TysiacA }; D_0 = { s = "0"; o="0."; n=Pl; a=TysiacA };
D_1 = { s = "1"; o="1."; n=Sg; a=NoA }; D_1 = { s = "1"; o="1."; n=Sg; a=NoA };

View File

@@ -223,7 +223,7 @@ lin
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! NCard Masc ++ i.s ! o ; s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
n = case d.n of n = case d.n of
{ sg => if_then_else Size (i.isDig) less20 pl ; { sg => if_then_else Size (i.isDig) less20 pl ;
_ => pl _ => pl

View File

@@ -1,6 +1,6 @@
--# -path=.:../abstract:../common:../../prelude --# -path=.:../abstract:../common:../../prelude
concrete NumeralRus of Numeral = CatRus ** open ResRus in { concrete NumeralRus of Numeral = CatRus ** open ResRus, Prelude in {
flags coding=utf8 ; flags coding=utf8 ;
@@ -234,7 +234,7 @@ lin pot3plus n m =
IDig d = {s = d.s ; n = d.n ; size = d.size} ; IDig d = {s = d.s ; n = d.n ; size = d.size} ;
IIDig d i = { IIDig d i = {
s = d.s ++ i.s ; s = d.s ++ BIND ++ i.s ;
n = Pl ; n = Pl ;
size = i.size size = i.size
} ; } ;

View File

@@ -111,7 +111,7 @@ param
IDig d = d ; IDig d = d ;
IIDig d i = { IIDig d i = {
s = \\o => d.s ! NCard Masc ++ i.s ! o ; s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
n = Pl n = Pl
} ; } ;

View File

@@ -69,8 +69,8 @@
---- ----
---- oper ---- oper
---- commaIf : DTail -> Str = \t -> case t of { ---- commaIf : DTail -> Str = \t -> case t of {
---- T3 => "," ; ---- T3 => BIND++","++BIND ;
---- _ => [] ---- _ => BIND
---- } ; ---- } ;
---- ----
---- inc : DTail -> DTail = \t -> case t of { ---- inc : DTail -> DTail = \t -> case t of {

View File

@@ -67,8 +67,8 @@ lin
D_9 = mkDig "9" ; D_9 = mkDig "9" ;
oper oper
commaIf : DTail -> Str = \t -> case t of { commaIf : DTail -> Str = \t -> case t of {
T3 => "," ; T3 => BIND++","++BIND ;
_ => [] _ => BIND
} ; } ;
inc : DTail -> DTail = \t -> case t of { inc : DTail -> DTail = \t -> case t of {