Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

v1.10.2.1

Browse Source
This commit is contained in:
gnosygnu
2014-10-13 00:13:41 -04:00
parent cd5a440404
commit d6561b3c1f
514 changed files with 1899 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
100_core/.classpath
View File

@@ -26,6 +26,6 @@
<classpathentry kind="src" path="xtn"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/commons-compress-1.5.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>

4
100_core/src/gplx/String_bldr.java
View File

@@ -30,7 +30,7 @@ public interface String_bldr {
String_bldr Add_str_w_crlf(String v);
String_bldr Add_spr_unless_first(String s, String spr, int i);
String_bldr Clear();
String XtoStrAndClear();
String Xto_str_and_clear();
String XtoStr();
int Count();
String_bldr Add(byte[] v);
@@ -70,7 +70,7 @@ abstract class String_bldr_base implements String_bldr {
return this;
}
public String_bldr Clear() {Del(0, Count()); return this;}
public String XtoStrAndClear() {
public String Xto_str_and_clear() {
String rv = XtoStr();
Clear();
return rv;

2
100_core/src_000_err/gplx/ErrMsgWtr.java
View File

@@ -105,7 +105,7 @@ public class ErrMsgWtr {
errAry.Add(cur);
cur = cur.Inner();
}
return (Err[])errAry.XtoAry(Err.class);
return (Err[])errAry.Xto_ary(Err.class);
}
public static final ErrMsgWtr _ = new ErrMsgWtr(); ErrMsgWtr() {}
}

2
100_core/src_000_err/gplx/ErrProcData.java
View File

@@ -45,7 +45,7 @@ class ErrProcData {
if (String_.HasAtBgn(md.signatureRaw, "gplx.Err_") || String_.HasAtBgn(md.signatureRaw, "gplx.Err.")) continue; // java includes entire stackTrace from point of creation; only care about point of throw
list.Add(md);
}
return (ErrProcData[])list.XtoAry(ErrProcData.class);
return (ErrProcData[])list.Xto_ary(ErrProcData.class);
}
public static ErrProcData parse_(String raw) {
ErrProcData rv = new ErrProcData().Raw_(raw);

2
100_core/src_000_err/gplx/Gfo_msg_grp_.java
View File

@@ -24,7 +24,7 @@ public class Gfo_msg_grp_ {
public static int Uid_next() {return uid_next++;} static int uid_next = 0;
public static byte[] Path(byte[] owner_path, byte[] key) {
if (owner_path != Bry_.Empty) tmp_bfr.Add(owner_path).Add_byte(Byte_ascii.Dot); // only add "." if owner_path is available; prevents creating ".gplx"
return tmp_bfr.Add(key).XtoAryAndClear();
return tmp_bfr.Add(key).Xto_bry_and_clear();
}
static Bry_bfr tmp_bfr = Bry_bfr.reset_(256);
}

4
100_core/src_000_err/gplx/Gfo_msg_itm.java
View File

@@ -38,7 +38,7 @@ public class Gfo_msg_itm implements Gfo_msg_obj {
if (fmtr == null) fmtr = Bry_fmtr.new_bry_(fmt).Compile();
if (fmtr.Fmt_args_exist()) {
fmtr.Bld_bfr_many(tmp_bfr, vals);
return tmp_bfr.XtoStrAndClear();
return tmp_bfr.Xto_str_and_clear();
}
else
return String_.new_utf8_(fmt);
@@ -47,7 +47,7 @@ public class Gfo_msg_itm implements Gfo_msg_obj {
if (fmtr == null) fmtr = Bry_fmtr.new_bry_(fmt).Compile();
if (fmtr.Fmt_args_exist()) {
fmtr.Bld_bfr_one(tmp_bfr, val);
return tmp_bfr.XtoStrAndClear();
return tmp_bfr.Xto_str_and_clear();
}
else
return String_.new_utf8_(fmt);

17
100_core/src_110_primitive/gplx/Bry_.java
View File

@@ -747,7 +747,7 @@ public class Bry_ {
}
else if (next == lkp) {
posRef.Val_(pos + 2); // 1=endQuote;1=lkp;
return make ? bb.XtoAry() : Bry_.Empty;
return make ? bb.Xto_bry() : Bry_.Empty;
}
else throw Err_.new_("quote found, but not doubled").Add("txt", String_.new_utf8_len_safe_(ary, bgn, pos + 1));
}
@@ -840,7 +840,12 @@ public class Bry_ {
if (last) break;
++src_pos;
}
return (byte[][])rv.XtoAry(byte[].class);
return (byte[][])rv.Xto_ary(byte[].class);
}
public static byte[] Replace_create(byte[] src, byte find, byte replace) {
byte[] rv = Bry_.Copy(src);
Replace_reuse(rv, find, replace);
return rv;
}
public static void Replace_reuse(byte[] src, byte find, byte replace) {
int src_len = src.length;
@@ -878,7 +883,7 @@ public class Bry_ {
}
if (dirty)
bfr.Add_mid(src, bfr_bgn, src_end);
return dirty ? bfr.XtoAryAndClear() : src;
return dirty ? bfr.Xto_bry_and_clear() : src;
}
public static byte[] Replace(byte[] src, byte[] find, byte[] replace) {return Replace_between(src, find, null, replace);}
public static byte[] Replace_between(byte[] src, byte[] bgn, byte[] end, byte[] replace) {
@@ -907,7 +912,7 @@ public class Bry_ {
}
}
}
return bfr.XtoAryAndClear();
return bfr.Xto_bry_and_clear();
}
public static int Trim_end_pos(byte[] src, int end) {
for (int i = end - 1; i > -1; i--) {
@@ -934,7 +939,7 @@ public class Bry_ {
if (find_pos == src_len) break;
cur_pos = find_pos + dlm_len;
}
return (byte[][])rv.XtoAry(byte[].class);
return (byte[][])rv.Xto_ary(byte[].class);
}
public static byte[][] Split_lines(byte[] src) {
if (Bry_.Len_eq_0(src)) return Bry_.Ary_empty;
@@ -960,7 +965,7 @@ public class Bry_ {
if (last) break;
src_pos = nxt_bgn;
}
return (byte[][])rv.XtoAry(byte[].class);
return (byte[][])rv.Xto_ary(byte[].class);
}
public static byte[] Increment_last(byte[] ary) {return Increment_last(ary, ary.length - 1);}
public static byte[] Increment_last(byte[] ary, int end_idx) {

23
100_core/src_110_primitive/gplx/Bry_bfr.java
View File

@@ -417,29 +417,28 @@ public class Bry_bfr {
return this;
}
public boolean Eq(byte b) {return bfr_len == 1 && bfr[0] == b;}
public byte[] XtoAry() {return bfr_len == 0 ? Bry_.Empty : Bry_.Mid(bfr, 0, bfr_len);}
public byte[] XtoAryAndReset(int v) {
byte[] rv = XtoAry();
public byte[] Xto_bry() {return bfr_len == 0 ? Bry_.Empty : Bry_.Mid(bfr, 0, bfr_len);}
public byte[] Xto_bry_and_reset(int v) {
byte[] rv = Xto_bry();
this.Clear().Reset_if_gt(v);
return rv;
}
public byte[] XtoAryAndClearAndTrim() {return XtoAryAndClearAndTrim(true, true, Bry_.Trim_ary_ws);}
public byte[] XtoAryAndClearAndTrim(boolean trim_bgn, boolean trim_end, byte[] trim_bry) {
public byte[] Xto_bry_and_clear_and_trim() {return Xto_bry_and_clear_and_trim(true, true, Bry_.Trim_ary_ws);}
public byte[] Xto_bry_and_clear_and_trim(boolean trim_bgn, boolean trim_end, byte[] trim_bry) {
byte[] rv = Bry_.Trim(bfr, 0, bfr_len, trim_bgn, trim_end, trim_bry);
this.Clear();
return rv;
}
public byte[] XtoAryAndClear() {
byte[] rv = XtoAry();
public byte[] Xto_bry_and_clear() {
byte[] rv = Xto_bry();
this.Clear();
if (reset > 0) Reset_if_gt(reset);
return rv;
}
public String XtoStr() {return String_.new_utf8_(XtoAry());}
public String XtoStrByPos(int bgn, int end) {return String_.new_utf8_(XtoAry(), bgn, end);}
public String XtoStrAndClear() {return String_.new_utf8_(XtoAryAndClear());}
public String XtoStrAndClearAndTrim() {return String_.new_utf8_(XtoAryAndClearAndTrim());}
public String XtoStrAndReset(int v) {return String_.new_utf8_(XtoAryAndReset(v));}
public String Xto_str() {return String_.new_utf8_(Xto_bry());}
public String Xto_str_by_pos(int bgn, int end) {return String_.new_utf8_(Xto_bry(), bgn, end);}
public String Xto_str_and_clear() {return String_.new_utf8_(Xto_bry_and_clear());}
public String Xto_str_and_clear_and_trim() {return String_.new_utf8_(Xto_bry_and_clear_and_trim());}
public int XtoIntAndClear(int or) {int rv = XtoInt(or); this.Clear(); return rv;}
public int XtoInt(int or) {
switch (bfr_len) {

38
100_core/src_110_primitive/gplx/Bry_bfr_tst.java
View File

@@ -33,13 +33,13 @@ public class Bry_bfr_tst {
@Test public void Add_byte_repeat() { // NOTE: make sure auto-expands
bb = Bry_bfr.new_(2);
tst_Add_byte_repeat(Byte_ascii.Space, 12, String_.Repeat(" ", 12));
} void tst_Add_byte_repeat(byte b, int len, String expd) {Tfds.Eq(expd, bb.Add_byte_repeat(b, len).XtoStrAndClear());}
} void tst_Add_byte_repeat(byte b, int len, String expd) {Tfds.Eq(expd, bb.Add_byte_repeat(b, len).Xto_str_and_clear());}
void tst_AddByte(String s, String expdStr, int expdLen) {
if (String_.Len(s) == 1)
bb.Add_byte((byte)String_.CharAt(s, 0));
else
bb.Add(Bry_.new_utf8_(s));
Tfds.Eq(expdStr, String_.new_utf8_(bb.XtoAry()));
Tfds.Eq(expdStr, String_.new_utf8_(bb.Xto_bry()));
Tfds.Eq(expdLen, bb.Bfr_max());
}
@Test public void Add_dte() {
@@ -47,7 +47,7 @@ public class Bry_bfr_tst {
}
void tst_AddDte(String raw) {
bb.Add_dte(DateAdp_.parse_fmt(raw, Bry_.Fmt_csvDte));
Tfds.Eq(raw, String_.new_utf8_(bb.XtoAry()));
Tfds.Eq(raw, String_.new_utf8_(bb.Xto_bry()));
}
@Test public void Add_int_variable() {
Add_int_variable(-1);
@@ -64,12 +64,12 @@ public class Bry_bfr_tst {
}
void tst_Add_float(float v) {
bb.Add_float(v);
Tfds.Eq(v, Float_.parse_(String_.new_utf8_(bb.XtoAry())));
Tfds.Eq(v, Float_.parse_(String_.new_utf8_(bb.Xto_bry())));
}
void Add_int_variable(int val) {
bb.Clear();
bb.Add_int_variable(val);
Tfds.Eq(val, Int_.parse_(String_.new_utf8_(bb.XtoAry())));
Tfds.Eq(val, Int_.parse_(String_.new_utf8_(bb.Xto_bry())));
}
@Test public void Add_int_fixed_len3() {tst_Add_int_fixed(123, 3, "123");}
@Test public void Add_int_fixed_pad_1() {tst_Add_int_fixed(2, 1, "2");}
@@ -79,7 +79,7 @@ public class Bry_bfr_tst {
@Test public void Add_int_fixed_neg_pad1() {tst_Add_int_fixed(-2, 1, "-");}
@Test public void Add_int_fixed_chop_1() {tst_Add_int_fixed(123, 1, "3");}
@Test public void Add_int_fixed_chop_neg() {tst_Add_int_fixed(-21, 2, "-1");}
void tst_Add_int_fixed(int val, int digits, String expd) {Tfds.Eq(expd, String_.new_utf8_(bb.Add_int_fixed(val, digits).XtoAry()));}
void tst_Add_int_fixed(int val, int digits, String expd) {Tfds.Eq(expd, String_.new_utf8_(bb.Add_int_fixed(val, digits).Xto_bry()));}
@Test public void Add_long_fixed_len3() {tst_Add_long_fixed(123, 3, "123");}
@Test public void Add_long_fixed_pad_1() {tst_Add_long_fixed(2, 1, "2");}
@Test public void Add_long_fixed_pad_2() {tst_Add_long_fixed(2, 2, "02");}
@@ -89,7 +89,7 @@ public class Bry_bfr_tst {
@Test public void Add_long_fixed_chop_1() {tst_Add_long_fixed(123, 1, "3");}
@Test public void Add_long_fixed_chop_neg() {tst_Add_long_fixed(-21, 2, "-1");}
@Test public void Add_long_fixed_large() {tst_Add_long_fixed(123456789012345L, 15, "123456789012345");}
void tst_Add_long_fixed(long val, int digits, String expd) {Tfds.Eq(expd, String_.new_utf8_(bb.Add_long_fixed(val, digits).XtoAry()));}
void tst_Add_long_fixed(long val, int digits, String expd) {Tfds.Eq(expd, String_.new_utf8_(bb.Add_long_fixed(val, digits).Xto_bry()));}
@Test public void AddDte_short() {
tst_AddDte_short("2010-08-26T22:38:36Z");
}
@@ -122,10 +122,10 @@ public class Bry_bfr_tst {
// bb = Bry_bfr.new_(16);
// bb.Add_str(orig);
// bb.InsertAt_str(insertAt, insertStr);
// String actl = bb.XtoStrAndClear();
// String actl = bb.Xto_str_and_clear();
// Tfds.Eq(expd, actl);
// }
@Test public void XtoAryAndClearAndTrim() {
@Test public void Xto_bry_and_clear_and_trim() {
tst_XtoAryAndClearAndTrim("a" , "a");
tst_XtoAryAndClearAndTrim(" a " , "a");
tst_XtoAryAndClearAndTrim(" a b " , "a b");
@@ -133,7 +133,7 @@ public class Bry_bfr_tst {
}
void tst_XtoAryAndClearAndTrim(String raw, String expd) {
bb.Add_str(raw);
Tfds.Eq(expd, String_.new_utf8_(bb.XtoAryAndClearAndTrim()));
Tfds.Eq(expd, String_.new_utf8_(bb.Xto_bry_and_clear_and_trim()));
}
@Test public void XtoInt() {
tst_XtoInt("123", 123);
@@ -167,7 +167,7 @@ public class Bry_bfr_tst {
}
void tst_Add_bfr_trimEnd_and_clear(String raw, String expd) {
Bry_bfr tmp = Bry_bfr.new_().Add_str(raw);
Tfds.Eq(expd, bb.Add_bfr_trim_and_clear(tmp, false, true).XtoStrAndClear());
Tfds.Eq(expd, bb.Add_bfr_trim_and_clear(tmp, false, true).Xto_str_and_clear());
}
@Test public void Add_bfr_trimAll_and_clear() {
tst_Add_bfr_trimAll_and_clear(" a ", "a");
@@ -177,7 +177,7 @@ public class Bry_bfr_tst {
}
void tst_Add_bfr_trimAll_and_clear(String raw, String expd) {
Bry_bfr tmp = Bry_bfr.new_().Add_str(raw);
Tfds.Eq(expd, bb.Add_bfr_trim_and_clear(tmp, true, true).XtoStrAndClear());
Tfds.Eq(expd, bb.Add_bfr_trim_and_clear(tmp, true, true).Xto_str_and_clear());
}
@Test public void Add_int_pad_bgn() {
fxt.Test_Add_int_pad_bgn(Byte_ascii.Num_0, 3, 0, "000");
@@ -214,14 +214,14 @@ class ByteAryBfr_fxt {
public void Clear() {
bfr.ClearAndReset();
}
public void Test_Add_int_pad_bgn(byte pad_byte, int str_len, int val, String expd) {Tfds.Eq(expd, bfr.Add_int_pad_bgn(pad_byte, str_len, val).XtoStrAndClear());}
public void Test_Add_int_pad_bgn(byte pad_byte, int str_len, int val, String expd) {Tfds.Eq(expd, bfr.Add_int_pad_bgn(pad_byte, str_len, val).Xto_str_and_clear());}
public void Test_Add_bry_escape(String val, String expd) {
byte[] val_bry = Bry_.new_utf8_(val);
Tfds.Eq(expd, bfr.Add_bry_escape(Byte_ascii.Apos, Byte_ascii.Apos, val_bry, 0, val_bry.length).XtoStrAndClear());
Tfds.Eq(expd, bfr.Add_bry_escape(Byte_ascii.Apos, Byte_ascii.Apos, val_bry, 0, val_bry.length).Xto_str_and_clear());
}
public void Test_Insert_at(String init, int pos, String val, String expd) {Tfds.Eq(expd, bfr.Add_str(init).Insert_at(pos, Bry_.new_utf8_(val)).XtoStrAndClear());}
public void Test_Insert_at(String init, int pos, String val, int val_bgn, int val_end, String expd) {Tfds.Eq(expd, bfr.Add_str(init).Insert_at(pos, Bry_.new_utf8_(val), val_bgn, val_end).XtoStrAndClear());}
public void Test_Delete_rng(String init, int bgn, int end, String expd) {Tfds.Eq(expd, bfr.Add_str(init).Delete_rng(bgn, end).XtoStrAndClear());}
public void Test_Delete_rng_to_bgn(String init, int pos, String expd) {Tfds.Eq(expd, bfr.Add_str(init).Delete_rng_to_bgn(pos).XtoStrAndClear());}
public void Test_Delete_rng_to_end(String init, int pos, String expd) {Tfds.Eq(expd, bfr.Add_str(init).Delete_rng_to_end(pos).XtoStrAndClear());}
public void Test_Insert_at(String init, int pos, String val, String expd) {Tfds.Eq(expd, bfr.Add_str(init).Insert_at(pos, Bry_.new_utf8_(val)).Xto_str_and_clear());}
public void Test_Insert_at(String init, int pos, String val, int val_bgn, int val_end, String expd) {Tfds.Eq(expd, bfr.Add_str(init).Insert_at(pos, Bry_.new_utf8_(val), val_bgn, val_end).Xto_str_and_clear());}
public void Test_Delete_rng(String init, int bgn, int end, String expd) {Tfds.Eq(expd, bfr.Add_str(init).Delete_rng(bgn, end).Xto_str_and_clear());}
public void Test_Delete_rng_to_bgn(String init, int pos, String expd) {Tfds.Eq(expd, bfr.Add_str(init).Delete_rng_to_bgn(pos).Xto_str_and_clear());}
public void Test_Delete_rng_to_end(String init, int pos, String expd) {Tfds.Eq(expd, bfr.Add_str(init).Delete_rng_to_end(pos).Xto_str_and_clear());}
}

14
100_core/src_110_primitive/gplx/Bry_fmtr.java
View File

@@ -87,14 +87,14 @@ public class Bry_fmtr {
bfr.Add(itm.Dat);
}
}
public byte[] Bld_bry_none(Bry_bfr bfr) {Bld_bfr_ary(bfr, Object_.Ary_empty); return bfr.XtoAryAndClear();}
public byte[] Bld_bry_none(Bry_bfr bfr) {Bld_bfr_ary(bfr, Object_.Ary_empty); return bfr.Xto_bry_and_clear();}
public byte[] Bld_bry_many(Bry_bfr bfr, Object... args) {
Bld_bfr_ary(bfr, args);
return bfr.XtoAryAndClear();
return bfr.Xto_bry_and_clear();
}
public String Bld_str_many(Bry_bfr bfr, String fmt, Object... args) {
this.Fmt_(fmt).Bld_bfr_many(bfr, args);
return bfr.XtoStrAndClear();
return bfr.Xto_str_and_clear();
}
public String Bld_str_many(String... args) {
@@ -135,7 +135,7 @@ public class Bry_fmtr {
if (lkp_is_numeric)
list.Add(Bry_fmtr_itm.arg_(lkp_bfr.XtoInt(0) - baseInt));
else {
byte[] key_fmt = lkp_bfr.XtoAry();
byte[] key_fmt = lkp_bfr.Xto_bry();
Object idx_ref = keys.Fetch(Bry_obj_ref.new_(key_fmt));
if (idx_ref == null) {
int lkp_bfr_len = lkp_bfr.Len();
@@ -209,7 +209,7 @@ public class Bry_fmtr {
}
if (lkp_is_active) throw Err_.new_("idx mode not closed");
if (trg_pos > 0) {list.Add(Bry_fmtr_itm.dat_(trg_bry, trg_pos)); trg_pos = 0;}
itms = (Bry_fmtr_itm[])list.XtoAry(Bry_fmtr_itm.class);
itms = (Bry_fmtr_itm[])list.Xto_ary(Bry_fmtr_itm.class);
itms_len = itms.length;
return this;
}
@@ -252,12 +252,12 @@ public class Bry_fmtr {
tmp_bfr.Add_byte(Byte_ascii.Curly_end);
tmp_bfr.Add_byte(Byte_ascii.Apos);
}
return tmp_bfr.XtoStrAndClear();
return tmp_bfr.Xto_str_and_clear();
} static Bry_bfr tmp_bfr = Bry_bfr.reset_(255);
public void Bld_bfr_many_and_set_fmt(Object... args) {
Bry_bfr bfr = Bry_bfr.new_();
this.Bld_bfr_many(bfr, args);
byte[] bry = bfr.XtoAryAndClear();
byte[] bry = bfr.Xto_bry_and_clear();
this.Fmt_(bry).Compile();
}
public static String Escape_tilde(String v) {return String_.Replace(v, "~", "~~");}

2
100_core/src_110_primitive/gplx/Bry_fmtr_eval_mgr_.java
View File

@@ -22,6 +22,6 @@ public class Bry_fmtr_eval_mgr_ {
Bry_bfr bfr = Bry_bfr.reset_(255);
Bry_fmtr fmtr = Bry_fmtr.tmp_();
fmtr.Eval_mgr_(eval_mgr).Fmt_(fmt).Bld_bfr_none(bfr);
return Io_url_.new_any_(bfr.XtoStrAndClear());
return Io_url_.new_any_(bfr.Xto_str_and_clear());
}
}

19
100_core/src_110_primitive/gplx/Byte_ascii.java
View File

@@ -42,7 +42,23 @@ public class Byte_ascii {
, Curly_end = 125, Tilde = 126
;
public static final byte Max_7_bit = (byte)127, Ascii_min = 0, Ascii_max = 127;
public static final byte[] Space_len2 = new byte[] {Space, Space}, Space_len4 = new byte[] {Space, Space, Space, Space};
public static boolean Is_sym(byte b) {
switch (b) {
case Byte_ascii.Bang: case Byte_ascii.Quote:
case Byte_ascii.Hash: case Byte_ascii.Dollar: case Byte_ascii.Percent: case Byte_ascii.Amp: case Byte_ascii.Apos:
case Byte_ascii.Paren_bgn: case Byte_ascii.Paren_end: case Byte_ascii.Asterisk: case Byte_ascii.Plus: case Byte_ascii.Comma:
case Byte_ascii.Dash: case Byte_ascii.Dot: case Byte_ascii.Slash:
case Byte_ascii.Colon: case Byte_ascii.Semic:
case Byte_ascii.Lt: case Byte_ascii.Eq: case Byte_ascii.Gt: case Byte_ascii.Question: case Byte_ascii.At:
case Byte_ascii.Brack_bgn: case Byte_ascii.Backslash: case Byte_ascii.Brack_end: case Byte_ascii.Pow:
case Byte_ascii.Underline: case Byte_ascii.Tick:
case Byte_ascii.Curly_bgn: case Byte_ascii.Pipe:
case Byte_ascii.Curly_end: case Byte_ascii.Tilde:
return true;
default:
return false;
}
}
public static boolean Is_ltr(byte b) {
return ( b >= Byte_ascii.Ltr_a && b <= Byte_ascii.Ltr_z
|| b >= Byte_ascii.Ltr_A && b <= Byte_ascii.Ltr_Z);
@@ -69,6 +85,7 @@ public class Byte_ascii {
: b
;
}
public static final byte[] Space_len2 = new byte[] {Space, Space}, Space_len4 = new byte[] {Space, Space, Space, Space};
public static final byte[]
Tab_bry = new byte[] {Byte_ascii.Tab}
, NewLine_bry = new byte[] {Byte_ascii.NewLine}

2
100_core/src_110_primitive/gplx/Int_.java
View File

@@ -151,7 +151,7 @@ public class Int_ implements GfoInvkAble {
bfr.Add_int_fixed(val, len);
bfr.Add_byte_repeat(pad_chr, pad_len);
if (bgn) bfr.Add_int_fixed(val, len); // NOTE: neg handled above
return bfr.XtoStr();
return bfr.Xto_str();
}
public static int read_(Object o) {String s = String_.as_(o); return s != null ? Int_.parse_(s) : Int_.cast_(o);}
public static int parse_(String raw) {try {return Integer.parseInt(raw);} catch(Exception e) {throw Err_.parse_type_exc_(e, int.class, raw);}}

8
100_core/src_110_primitive/gplx/String_.java
View File

@@ -343,13 +343,13 @@ public class String_ implements GfoInvkAble {
c = String_.CharAt(raw, i);
if (c == dlm) {
if (!addEmptyIfDlmIsLast && sb.Count() == 0 && i == rawLen - 1) {}
else list.Add(sb.XtoStrAndClear());
else list.Add(sb.Xto_str_and_clear());
}
else
sb.Add(c);
}
if (sb.Count() > 0)
list.Add(sb.XtoStrAndClear());
list.Add(sb.Xto_str_and_clear());
return list.XtoStrAry();
}
public static String[] Split(String s, String separator) {return Split_do(s, separator, false);}
@@ -418,7 +418,7 @@ public class String_ implements GfoInvkAble {
while (true) {
if (sprMatched
|| i == textLength) { // last pass; add whatever's in sb to list
list.Add(sb.XtoStrAndClear());
list.Add(sb.Xto_str_and_clear());
if (sprMatched && i == textLength) list.Add(""); // if s ends with spr and last pass, add emptyString as last
sprMatched = false;
}
@@ -445,7 +445,7 @@ public class String_ implements GfoInvkAble {
i++;
}
}
return (String[])list.XtoAry(String.class);
return (String[])list.Xto_ary(String.class);
}
static String Mid_lang(String s, int bgn, int len) {return s.substring(bgn, bgn + len);}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {

2
100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_time_tst.java
View File

@@ -37,6 +37,6 @@ class Time_fmtr_arg_fxt {
Bry_bfr bfr = Bry_bfr.reset_(255);
arg.Seconds_(seconds);
arg.XferAry(bfr, 0);
Tfds.Eq(expd, bfr.XtoStr());
Tfds.Eq(expd, bfr.Xto_str());
}
}

2
100_core/src_120_basicDataType/gplx/KeyValHash.java
View File

@@ -29,7 +29,7 @@ public class KeyValHash {
public KeyValHash Add(String key, Object val) {hash.Add(key, KeyVal_.new_(key, val)); return this;}
public KeyValHash AddReplace(String key, Object val) {hash.AddReplace(key, KeyVal_.new_(key, val)); return this;}
public void Del(String key) {hash.Del(key);}
public KeyVal[] XtoAry() {
public KeyVal[] Xto_bry() {
KeyVal[] rv = new KeyVal[this.Count()];
for (int i = 0; i < rv.length; i++)
rv[i] = this.FetchAt(i);

2
100_core/src_120_basicDataType/gplx/KeyValHash_tst.java
View File

@@ -30,7 +30,7 @@ public class KeyValHash_tst {
}
catch (Exception e) {Err_.Noop(e);}
}
void tst_AryVals(String[] ary, KeyVal... expd) {Tfds.Eq_ary_str(expd, KeyValHash.strAry_(ary).XtoAry());}
void tst_AryVals(String[] ary, KeyVal... expd) {Tfds.Eq_ary_str(expd, KeyValHash.strAry_(ary).Xto_bry());}
KeyVal kv_(String key, Object val) {return KeyVal_.new_(key, val);}
String[] ary_(String... ary) {return ary;}
}

2
100_core/src_120_basicDataType/gplx/KeyValList.java
View File

@@ -21,7 +21,7 @@ public class KeyValList {//20101217
public void Clear() {list.Clear();}
public KeyVal GetAt(int i) {return (KeyVal)list.FetchAt(i);}
public KeyValList Add(String key, Object val) {list.Add(KeyVal_.new_(key, val)); return this;}
public KeyVal[] XtoAry() {return (KeyVal[])list.XtoAry(KeyVal.class);}
public KeyVal[] Xto_bry() {return (KeyVal[])list.Xto_ary(KeyVal.class);}
public String XtoStr() {
String_bldr sb = String_bldr_.new_();
for (int i = 0; i < list.Count(); i++) {

2
100_core/src_120_basicDataType/gplx/KeyVal_.java
View File

@@ -65,7 +65,7 @@ public class KeyVal_ {
public static String Ary_xto_str_nested(KeyVal... ary) {
Bry_bfr bfr = Bry_bfr.new_();
Ary_xto_str_nested(bfr, 0, ary);
return bfr.XtoStrAndClear();
return bfr.Xto_str_and_clear();
}
private static void Ary_xto_str_nested(Bry_bfr bfr, int indent, KeyVal[] ary) {
int len = ary.length;

2
100_core/src_120_basicDataType/gplx/TimeSpanAdp_.java
View File

@@ -94,7 +94,7 @@ public class TimeSpanAdp_ {
sb.Add("0");
sb.Add(Int_.Xto_str(val));
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
boolean fmt_fracs = !String_.Eq(fmt, TimeSpanAdp_.Fmt_NoFractionals);
boolean fmt_padZeros = String_.Eq(fmt, TimeSpanAdp_.Fmt_PadZeros);

4
100_core/src_140_list/gplx/ListAdp.java
View File

@@ -40,8 +40,8 @@ public interface ListAdp extends EnumerAble {
void SetAt(int i, Object o);
String XtoStr();
String[] XtoStrAry();
Object XtoAry(Class<?> memberType);
Object XtoAryAndClear(Class<?> memberType);
Object Xto_ary(Class<?> memberType);
Object Xto_ary_and_clear(Class<?> memberType);
void Reverse();
void Sort();

4
100_core/src_140_list/gplx/ListAdp_.java
View File

@@ -73,8 +73,8 @@ class ListAdp_null implements ListAdp {
public void MoveTo(int elemPos, int newPos) {}
public boolean RangeCheck(int v) {return false;}
public void ResizeBounds(int i) {}
public Object XtoAry(Class<?> memberType) {return Object_.Ary_empty;}
public Object XtoAryAndClear(Class<?> memberType) {return Object_.Ary_empty;}
public Object Xto_ary(Class<?> memberType) {return Object_.Ary_empty;}
public Object Xto_ary_and_clear(Class<?> memberType) {return Object_.Ary_empty;}
public String XtoStr() {return "< NULL LIST >";}
public String[] XtoStrAry() {return new String[0];}
public java.util.Iterator iterator() {return Iterator_null._;}

6
100_core/src_140_list/gplx/ListAdp_base.java
View File

@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx;
import gplx.lists.*;
public abstract class ListAdp_base implements ListAdp, GfoInvkAble {
public Object XtoAryAndClear(Class<?> memberType) {Object rv = XtoAry(memberType); this.Clear(); return rv;}
public Object XtoAry(Class<?> memberType) {
public Object Xto_ary_and_clear(Class<?> memberType) {Object rv = Xto_ary(memberType); this.Clear(); return rv;}
public Object Xto_ary(Class<?> memberType) {
Object rv = Array_.Create(memberType, count);
for (int i = 0; i < count; i++)
Array_.Set(rv, i, list[i]);
@@ -144,7 +144,7 @@ public abstract class ListAdp_base implements ListAdp, GfoInvkAble {
list[i-1] = tmp;
}
}
public String[] XtoStrAry() {return (String[])XtoAry(String.class);}
public String[] XtoStrAry() {return (String[])Xto_ary(String.class);}
public Object FetchAt(int i) {return FetchAt_base(i);}
public Object FetchAtLast() {if (count == 0) throw Err_.invalid_op_("cannot call FetchAtLast on empty list"); return FetchAt_base(count - 1);}
public Object FetchAtOr(int i, Object or) {return (i >= count) ? or : FetchAt(i);}

8
100_core/src_140_list/gplx/ListAdp_tst.java
View File

@@ -150,14 +150,14 @@ public class ListAdp_tst {
tst_Enumerator("0", "1", "2");
}
@Test public void Sort_empty() {list.Sort();}
@Test public void XtoAry() {
@Test public void Xto_bry() {
list_AddMany("0", "1");
String[] ary = (String[])list.XtoAry(String.class);
String[] ary = (String[])list.Xto_ary(String.class);
Tfds.Eq_nullNot(ary);
Tfds.Eq(2, Array_.Len(ary));
}
@Test public void XtoAry_empty() {
String[] ary = (String[])list.XtoAry(String.class);
String[] ary = (String[])list.Xto_ary(String.class);
Tfds.Eq_nullNot(ary);
Tfds.Eq(0, Array_.Len(ary));
}
@@ -214,7 +214,7 @@ public class ListAdp_tst {
}
ListAdp_tst run_MoveTo(int elemPos, int newPos) {list.MoveTo(elemPos, newPos); return this;}
ListAdp_tst tst_Order(String... expd) {
String[] actl = (String[])list.XtoAry(String.class);
String[] actl = (String[])list.Xto_ary(String.class);
Tfds.Eq_ary(expd, actl);
return this;
}

2
100_core/src_140_list/gplx/OrderedHash.java
View File

@@ -25,7 +25,7 @@ public interface OrderedHash extends HashAdp {
void Sort();
void SortBy(ComparerAble comparer);
void ResizeBounds(int i);
Object XtoAry(Class<?> t);
Object Xto_ary(Class<?> t);
String XtoStr_ui();
void MoveTo(int src, int trg);
void Lock();

2
100_core/src_140_list/gplx/OrderedHash_base.java
View File

@@ -37,7 +37,7 @@ public class OrderedHash_base extends HashAdp_base implements OrderedHash, GfoIn
super.Clear();
ordered.Clear();
}
public Object XtoAry(Class<?> type) {return ordered.XtoAry(type);}
public Object Xto_ary(Class<?> type) {return ordered.Xto_ary(type);}
@gplx.Virtual public void Sort() {if (locked) Lock_fail(); ordered.Sort();} // NOTE: uses item's .compareTo
public void SortBy(ComparerAble comparer) {if (locked) Lock_fail(); ordered.SortBy(comparer);}
@Override public java.util.Iterator iterator() {return ordered.iterator();}

2
100_core/src_140_list/gplx/lists/StackAdp_tst.java
View File

@@ -26,7 +26,7 @@ public class StackAdp_tst {
for (int i : ary)
stack.Push(i);
ListAdp list = stack.XtoList();
int[] actl = (int[])list.XtoAry(int.class);
int[] actl = (int[])list.Xto_ary(int.class);
for (int i = 0; i < ary.length; i++)
Tfds.Eq(ary[i], actl[i]);
}

2
100_core/src_150_text/gplx/intl/Utf8__tst.java
View File

@@ -54,7 +54,7 @@ public class Utf8__tst {
// bgn = end;
// bgn_bry = end_by_codepoint_next;
// }
// Tfds.WriteText(bfr.XtoStrAndClear());
// Tfds.WriteText(bfr.Xto_str_and_clear());
// }
}
class Utf8__fxt {

2
100_core/src_150_text/gplx/texts/CharStream.java
View File

@@ -53,7 +53,7 @@ public class CharStream {
length = (pos + length > len) ? len - pos : length;
return Char_.XtoStr(ary, pos, length);
}
public String XtoStrByPos(int bgn, int end) {
public String Xto_str_by_pos(int bgn, int end) {
if (bgn < 0) bgn = 0; if (end > len - 1) end = len - 1;
return Char_.XtoStr(ary, bgn, end - bgn + 1);
}

2
100_core/src_150_text/gplx/texts/RegxAdp.java
View File

@@ -58,7 +58,7 @@ public class RegxAdp {
: find_bgn + find_len // otherwise search after find_end
;
}
return (RegxMatch[])rv.XtoAry(RegxMatch.class);
return (RegxMatch[])rv.Xto_ary(RegxMatch.class);
}
@gplx.Internal protected RegxAdp(String regx) {Pattern_(regx);}
}

2
100_core/src_150_text/gplx/texts/StringTableBldr.java
View File

@@ -46,7 +46,7 @@ public class StringTableBldr {
}
sb.Add(String_.CrLf);
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
public static StringTableBldr new_() {return new StringTableBldr();} StringTableBldr() {}

2
100_core/src_200_io/gplx/ios/Io_download_fmt.java
View File

@@ -77,7 +77,7 @@ public class Io_download_fmt {
, rate_fmtr_arg.Val_(prog_rate)
, prog_left_fmtr_arg.Seconds_(prog_left / 1000)
);
prog_msg = prog_bfr.XtoStrAndClear();
prog_msg = prog_bfr.Xto_str_and_clear();
if (usr_dlg != null)
usr_dlg.Prog_none(GRP_KEY, "prog", prog_msg);
} private Bry_bfr prog_bfr = Bry_bfr.new_(); Bry_fmtr prog_fmtr = Bry_fmtr.new_().Fail_when_invalid_escapes_(false); // NOTE: prog_fmtr can be passed file_names with ~ which are not easy to escape; DATE:2013-02-19

2
100_core/src_200_io/gplx/ios/Io_stream_rdr_.java
View File

@@ -51,7 +51,7 @@ public class Io_stream_rdr_ {
public static byte[] Load_all_as_bry(Io_stream_rdr rdr) {return Load_all_as_bry(Bry_bfr.new_(), rdr);}
public static byte[] Load_all_as_bry(Bry_bfr rv, Io_stream_rdr rdr) {
Load_all_to_bfr(rv, rdr);
return rv.XtoAryAndClear();
return rv.Xto_bry_and_clear();
}
public static void Load_all_to_bfr(Bry_bfr rv, Io_stream_rdr rdr) {
try {

6
100_core/src_200_io/gplx/ios/Io_stream_wtr_.java
View File

@@ -70,7 +70,7 @@ abstract class Io_stream_wtr_base implements Io_stream_wtr {
java.io.OutputStream zip_stream;
public Io_url Url() {return url;} public Io_stream_wtr Url_(Io_url v) {url = v; trg_bfr = null; return this;} Io_url url;
public void Trg_bfr_(Bry_bfr v) {trg_bfr = v;} Bry_bfr trg_bfr; java.io.ByteArrayOutputStream mem_stream;
public byte[] Xto_ary_and_clear() {return trg_bfr.XtoAryAndClear();}
public byte[] Xto_ary_and_clear() {return trg_bfr.Xto_bry_and_clear();}
@SuppressWarnings("resource") // rely on OutputStream to close bry_stream
public Io_stream_wtr Open() {
java.io.OutputStream bry_stream = null;
@@ -165,7 +165,7 @@ class Io_stream_wtr_zip implements Io_stream_wtr {
catch (Exception e) {throw Err_.new_fmt_("close failed: url={0}", url.Raw());}
}
public byte[] Xto_ary_and_clear() {
byte[] rv = trg_bfr.XtoAryAndClear();
byte[] rv = trg_bfr.Xto_bry_and_clear();
this.Rls();
return rv;
}
@@ -192,7 +192,7 @@ class Io_stream_wtr_file implements Io_stream_wtr {
trg_bfr.Add_mid(bry, bgn, bgn + len);
}
public byte[] Xto_ary_and_clear() {
return trg_bfr == null ? Io_mgr._.LoadFilBry(url) : trg_bfr.XtoAryAndClear();
return trg_bfr == null ? Io_mgr._.LoadFilBry(url) : trg_bfr.Xto_bry_and_clear();
}
public void Flush() {
if (trg_bfr == null)

10
100_core/src_210_env/gplx/ProcessAdp.java
View File

@@ -60,7 +60,7 @@ public class ProcessAdp implements GfoInvkAble, RlsAble {
if (!args_fmtr.Fmt_null()) {
Bry_bfr tmp_bfr = Bry_bfr.new_();
args_fmtr.Bld_bfr_many(tmp_bfr, args);
args_str = tmp_bfr.XtoStrAndClear();
args_str = tmp_bfr.Xto_str_and_clear();
}
prog_dlg.Log_many(GRP_KEY, "run", "running process: ~{0} ~{1}", exe_url.Raw(), args_str);
exit_code = Exit_init;
@@ -157,7 +157,7 @@ public class ProcessAdp implements GfoInvkAble, RlsAble {
elapsed = notify_checkpoint;
notify_checkpoint += notify_interval;
notify_fmtr.Bld_bfr_many(notify_bfr, exe_url.NameAndExt(), args_str, elapsed / 1000);
prog_dlg.Prog_none(GRP_KEY, "notify.prog", notify_bfr.XtoStrAndClear());
prog_dlg.Prog_none(GRP_KEY, "notify.prog", notify_bfr.Xto_str_and_clear());
}
}
if (thread_timeout == 0) break;
@@ -178,7 +178,7 @@ public class ProcessAdp implements GfoInvkAble, RlsAble {
}
if (elapsed != notify_checkpoint) {
notify_fmtr.Bld_bfr_many(notify_bfr, exe_url.NameAndExt(), args_str, elapsed / 1000);
if (prog_dlg != null) prog_dlg.Prog_none(GRP_KEY, "notify.prog", notify_bfr.XtoStrAndClear());
if (prog_dlg != null) prog_dlg.Prog_none(GRP_KEY, "notify.prog", notify_bfr.Xto_str_and_clear());
}
return this;
}
@@ -235,7 +235,7 @@ public class ProcessAdp implements GfoInvkAble, RlsAble {
exit_code = process.exitValue();
WhenEnd_run();
process.destroy();
rslt_out = sb.XtoStrAndClear();
rslt_out = sb.Xto_str_and_clear();
}
public void Process_term() {
try {
@@ -337,7 +337,7 @@ class StreamGobbler extends Thread {
sb.Add(s);
}
stream.close();
rslt = sb.XtoStrAndClear();
rslt = sb.Xto_str_and_clear();
}
catch (Exception ex) {throw Err_.new_fmt_("failed reading stream; name={0} ex={1}", name, Err_.Message_lang(ex));}
}

2
100_core/src_310_gfoNde/gplx/GfoNde_.java
View File

@@ -38,7 +38,7 @@ public class GfoNde_ {
valAry[i] = rdr.ReadAt(i);
rows.Add(GfoNde_.vals_(flds, valAry));
}
return GfoNde_.tbl_("", flds, (GfoNde[])rows.XtoAry(GfoNde.class));
return GfoNde_.tbl_("", flds, (GfoNde[])rows.Xto_ary(GfoNde.class));
}
finally {rdr.Rls();}
}

2
100_core/src_311_gfoObj/gplx/GfoMsg_.java
View File

@@ -222,7 +222,7 @@ class GfoMsg_base implements GfoMsg {
public String XtoStr() {
String_bldr sb = String_bldr_.new_();
XtoStr(sb, new XtoStrWkr_gplx(), this);
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
void XtoStr(String_bldr sb, XtoStrWkr wkr, GfoMsg m) {
sb.Add(m.Key());

4
100_core/src_340_dsv/gplx/stores/dsvs/DsvDataRdr_.java
View File

@@ -71,7 +71,7 @@ class DsvParser {
qteOn = false;
}
else
throw Err_.new_("invalid quote in quoted field; quote must be followed by quote, fieldSpr, or recordSpr").Add("sym", strm.Cur()).Add("text", strm.XtoStrByPos(strm.Pos() - 10, strm.Pos() + 10));
throw Err_.new_("invalid quote in quoted field; quote must be followed by quote, fieldSpr, or recordSpr").Add("sym", strm.Cur()).Add("text", strm.Xto_str_by_pos(strm.Pos() - 10, strm.Pos() + 10));
}
else { // regular char; append and continue
sb.Add(strm.Cur());
@@ -79,7 +79,7 @@ class DsvParser {
}
}
void ProcessFld(CharStream strm) {
String val = sb.XtoStrAndClear();
String val = sb.Xto_str_and_clear();
if (cmdSeqOn) {
cmdSeqOn = false;
if (String_.Eq(val, sym.CmdDlm()) && qteOn) { // 2 cmdDlms in a row; cmdSeq encountered; next fld must be cmdName

6
100_core/src_340_dsv/gplx/stores/dsvs/DsvDataRdr_csv_dat_tst.java
View File

@@ -161,7 +161,7 @@ class DsvDataRdr_fxt {
for (int i = 0; i < flds.Count(); i++) {
GfoFld fld = flds.FetchAt(i);
sb.Add(fld.Key()).Add(",").Add(fld.Type().Key());
list.Add(sb.XtoStrAndClear());
list.Add(sb.Xto_str_and_clear());
}
}
public DsvDataRdr_fxt tst_Tbls(String... expdNames) {
@@ -192,7 +192,7 @@ class DsvDataRdr_fxt {
if (j != 0) sb.Add("~");
sb.Add_obj(Object_.Xto_str_strict_or_null_mark(row.ReadAt(j)));
}
expdList.Add(sb.XtoStrAndClear());
expdList.Add(sb.Xto_str_and_clear());
}
for (Object[] expdRow : expdRows) {
if (expdRow == null) {
@@ -203,7 +203,7 @@ class DsvDataRdr_fxt {
if (j != 0) sb.Add("~");
sb.Add_obj(Object_.Xto_str_strict_or_null_mark(expdRow[j]));
}
actlList.Add(sb.XtoStrAndClear());
actlList.Add(sb.Xto_str_and_clear());
}
Tfds.Eq_list(expdList, actlList);
return this;

2
100_core/src_420_usrMsg/gplx/Gfo_log_bfr.java
View File

@@ -25,5 +25,5 @@ public class Gfo_log_bfr {
bfr.Add_byte_nl();
return this;
}
public String Xto_str() {return bfr.XtoStrAndClear();}
public String Xto_str() {return bfr.Xto_str_and_clear();}
}