1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

v2.10.3.1

This commit is contained in:
gnosygnu
2015-10-18 22:17:57 -04:00
parent 8e18af05b6
commit 4f43f51b18
1935 changed files with 12500 additions and 12889 deletions

View File

@@ -52,9 +52,9 @@ public class Xol_num_fmtr_base implements GfoInvkAble {
i = dlm_match_pos - 1; // NOTE: handle multi-byte delims
}
}
return tmp.Xto_bry_and_clear();
return tmp.To_bry_and_clear();
}
public byte[] Fmt(int val) {return Fmt(Bry_.new_a7(Int_.Xto_str(val)));}
public byte[] Fmt(int val) {return Fmt(Bry_.new_a7(Int_.To_str(val)));}
public byte[] Fmt(byte[] src) { // SEE: DOC_1:Fmt
int src_len = src.length;
int num_bgn = -1, dec_pos = -1;
@@ -95,7 +95,7 @@ public class Xol_num_fmtr_base implements GfoInvkAble {
Gfo_num_fmt_wkr wkr = Get_or_new(src_len - num_bgn);
wkr.Fmt(src, num_bgn, src_len, tmp);
}
return tmp.Xto_bry_and_clear();
return tmp.To_bry_and_clear();
}
private Gfo_num_fmt_wkr Get_or_new(int src_len) {
Gfo_num_fmt_wkr rv = null;

View File

@@ -62,7 +62,7 @@ public class Xol_num_grp_fmtr {
break;
}
}
return dirty ? bfr.Xto_bry_and_clear() : src;
return dirty ? bfr.To_bry_and_clear() : src;
}
private void Fmt_grp(Bry_bfr bfr, byte[] src, int bgn, int end, int len, int grp_len) {
int seg_0 = bgn + (len % grp_len); // 5 digit number will have seg_0 of 2; 12345 -> 12,345

View File

@@ -31,8 +31,8 @@ public class Xol_num_mgr implements GfoInvkAble {
return num;
}
public byte[] Format_num_no_separators(byte[] num) {return Format_num(num, true);}
public byte[] Format_num_by_long(long val) {return Format_num(Bry_.new_a7(Long_.Xto_str(val)));}
public byte[] Format_num(int val) {return Format_num(Bry_.new_a7(Int_.Xto_str(val)));}
public byte[] Format_num_by_long(long val) {return Format_num(Bry_.new_a7(Long_.To_str(val)));}
public byte[] Format_num(int val) {return Format_num(Bry_.new_a7(Int_.To_str(val)));}
public byte[] Format_num(byte[] num) {return Format_num(num, false);}
public byte[] Format_num(byte[] num, boolean skip_commafy) {
if (!skip_commafy) {

View File

@@ -19,21 +19,21 @@ package gplx.xowa.langs.numbers; import gplx.*; import gplx.xowa.*; import gplx.
public class Xol_num_mgr_ {
public static Xol_num_mgr new_by_lang_id(int lang_id) {
switch (lang_id) {
case Xol_lang_itm_.Id_be_tarask:
case Xol_lang_itm_.Id_bg:
case Xol_lang_itm_.Id_ru:
case Xol_lang_itm_.Id_pl:
case Xol_lang_itm_.Id_uk:
case Xol_lang_itm_.Id_es:
case Xol_lang_itm_.Id_et:
case Xol_lang_itm_.Id_hy:
case Xol_lang_itm_.Id_kaa:
case Xol_lang_itm_.Id_kk_cyrl:
case Xol_lang_itm_.Id_ksh:
// case Xol_lang_itm_.Id_ku_ku:
case Xol_lang_stub_.Id_be_tarask:
case Xol_lang_stub_.Id_bg:
case Xol_lang_stub_.Id_ru:
case Xol_lang_stub_.Id_pl:
case Xol_lang_stub_.Id_uk:
case Xol_lang_stub_.Id_es:
case Xol_lang_stub_.Id_et:
case Xol_lang_stub_.Id_hy:
case Xol_lang_stub_.Id_kaa:
case Xol_lang_stub_.Id_kk_cyrl:
case Xol_lang_stub_.Id_ksh:
// case Xol_lang_stub_.Id_ku_ku:
return new Xol_num_mgr__commafy_5();
case Xol_lang_itm_.Id_km:
case Xol_lang_itm_.Id_my: return new Xol_num_mgr__noop();
case Xol_lang_stub_.Id_km:
case Xol_lang_stub_.Id_my: return new Xol_num_mgr__noop();
default: return new Xol_num_mgr();
}
}

View File

@@ -20,7 +20,7 @@ import gplx.core.btries.*;
public class Xol_transform_mgr implements GfoInvkAble {
private Btrie_fast_mgr trie_k_to_v = Btrie_fast_mgr.cs();
private Btrie_fast_mgr trie_v_to_k = Btrie_fast_mgr.cs();
private Ordered_hash hash = Ordered_hash_.new_bry_();
private Ordered_hash hash = Ordered_hash_.New_bry();
private boolean empty = true;
public void Clear() {hash.Clear(); trie_k_to_v.Clear(); trie_v_to_k.Clear(); empty = true;}
public int Len() {return hash.Count();}