Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2024-10-27 20:34:16 +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
Show Stats 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();}
}

2
110_gfml/.classpath
View File

@ -9,6 +9,6 @@
<classpathentry kind="src" path="src_600_rdrWtr"/>
<classpathentry kind="src" path="/100_core"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<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>

2
110_gfml/src_100_tkn/gplx/gfml/GfmlLxr_.java
View File

@ -89,7 +89,7 @@ class GfmlLxr_group implements GfmlLxr {
hookLength = trie.LastMatchCount;
}
if (ignoreOutput) return GfmlTkn_.IgnoreOutput;
String raw = sb.XtoStrAndClear();
String raw = sb.Xto_str_and_clear();
return outputTkn.MakeNew(raw, raw);
}
public GfmlLxr SubLxr() {throw Err_sublxr();}

2
110_gfml/src_200_type/gplx/gfml/GfmlFld.java
View File

@ -27,7 +27,7 @@ public class GfmlFld {
rv.defaultTkn = defaultTkn; // FIXME: defaultTkn.clone_()
return rv;
}
public String XtoStr() {String_bldr sb = String_bldr_.new_(); this.XtoStr(sb); return sb.XtoStrAndClear();}
public String XtoStr() {String_bldr sb = String_bldr_.new_(); this.XtoStr(sb); return sb.Xto_str_and_clear();}
public void XtoStr(String_bldr sb) {sb.Add_fmt("name={0} typeKey={1}", name, typeKey);}
public static final GfmlFld Null = new_(false, GfmlItmKeys.NullKey, GfmlType_.AnyKey);

4
110_gfml/src_200_type/gplx/gfml/GfmlTypeMakr.java
View File

@ -38,8 +38,8 @@ class GfmlTypeMakr {
return rv;
}
public void AddSubFld(GfmlFld subFld) {AddSubFld_imp(owner, subFld);}
public GfmlType[] XtoAry() {
GfmlType[] rv = (GfmlType[])list.XtoAry(GfmlType.class);
public GfmlType[] Xto_bry() {
GfmlType[] rv = (GfmlType[])list.Xto_ary(GfmlType.class);
list.Clear();
owner = null;
return rv;

4
110_gfml/src_300_gdoc/gplx/gfml/GfmlDocWtr_.java
View File

@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.gfml; import gplx.*;
public class GfmlDocWtr_ {
public String XtoStrAndClear() {return sb.XtoStrAndClear();}
public String Xto_str_and_clear() {return sb.Xto_str_and_clear();}
public void BuildAttrib(GfmlAtr atr) {Build(atr);}
public void BuildNode(GfmlNde nde) {Build(nde);}
void Build(GfmlItm owner) {
@ -34,6 +34,6 @@ public class GfmlDocWtr_ {
public static String xtoStr_(GfmlNde nde) {
GfmlDocWtr_ wtr = new GfmlDocWtr_();
wtr.BuildNode(nde);
return wtr.XtoStrAndClear();
return wtr.Xto_str_and_clear();
}
}

2
110_gfml/src_400_pragma/gplx/gfml/GfmlPragmaDefault.java
View File

@ -48,7 +48,7 @@ class GfmlPragmaDefault implements GfmlPragma {
makr.MakeSubTypeAsOwner( "_default");
makr.MakeSubTypeAsOwner( "type", "typeKey");
makr.MakeSubTypeAsOwner( "atr", "key", "val");
return makr.XtoAry();
return makr.Xto_bry();
}
public static GfmlPragmaDefault new_() {return new GfmlPragmaDefault();} GfmlPragmaDefault() {}
public static final GfmlTkn Default_none = GfmlTkn_.raw_("DEFAULT NONE");

2
110_gfml/src_400_pragma/gplx/gfml/GfmlPragmaLxrFrm.java
View File

@ -58,7 +58,7 @@ class GfmlPragmaLxrFrm implements GfmlPragma {
}
public GfmlType[] MakePragmaTypes(GfmlTypeMakr makr) {
makr.MakeRootType("_lxr_frame", "_lxr_frame", "key", "type", "bgn", "end");
return makr.XtoAry();
return makr.Xto_bry();
}
public static GfmlPragmaLxrFrm new_() {return new GfmlPragmaLxrFrm();} GfmlPragmaLxrFrm() {}
}

2
110_gfml/src_400_pragma/gplx/gfml/GfmlPragmaLxrSym.java
View File

@ -49,7 +49,7 @@ class GfmlPragmaLxrSym implements GfmlPragma {
makr.MakeRootType("_lxr_sym", "_lxr_sym", "key", "raw");
GfmlFld fld = GfmlFld.new_(true, "cmd", GfmlType_.StringKey).DefaultTkn_(GfmlTkn_.val_("gfml.elm_data"));
makr.AddSubFld(fld);
return makr.XtoAry();
return makr.Xto_bry();
}
public static GfmlPragmaLxrSym new_() {return new GfmlPragmaLxrSym();} GfmlPragmaLxrSym() {}
public static final String CacheLog_key = "log:var";

2
110_gfml/src_400_pragma/gplx/gfml/GfmlPragmaType.java
View File

@ -45,7 +45,7 @@ class GfmlPragmaType implements GfmlPragma {
makr.MakeSubTypeAsOwner( "type", "name", "key");
makr.MakeSubTypeAsOwner( "fld", "name", "default", "type");
makr.AddSubFld(GfmlFld.new_(false, "fld", "_type/type/fld"));
return makr.XtoAry();
return makr.Xto_bry();
}
public static final String CacheLog_key = "log:type";
@gplx.Internal protected static void ExecList(GfmlTypRegy regy, OrderedHash list, ListAdp replaced) {

2
110_gfml/src_400_pragma/gplx/gfml/GfmlPragmaVar.java
View File

@ -41,7 +41,7 @@ class GfmlPragmaVar implements GfmlPragma {
public GfmlType[] MakePragmaTypes(GfmlTypeMakr makr) {
makr.MakeSubTypeAsOwner (pragmaKey);
makr.MakeSubType ( "text", "key", "val", "ctx");
return makr.XtoAry();
return makr.Xto_bry();
}
void ExecList(HashAdp cache, ListAdp list) {
GfmlVarCtx ctx = null;

2
110_gfml/tst/gplx/gfml/yfxts_GfmlParse_fxt.java
View File

@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx.gfml; import gplx.*;
class GfmlParse_fxt {
public GfmlNde_mok nde_() {return GfmlNde_mok.new_();}
public GfmlTkn_mok tkn_grp_ary_(String... ary) {return GfmlTkn_mok.new_().Subs_(GfmlTkn_mok.XtoAry(ary));}
public GfmlTkn_mok tkn_grp_ary_(String... ary) {return GfmlTkn_mok.new_().Subs_(GfmlTkn_mok.Xto_bry(ary));}
public GfmlTkn_mok tkn_grp_(GfmlTkn_mok... ary) {return GfmlTkn_mok.new_().Subs_(ary);}
public GfmlTkn_mok tkn_itm_(String r) {return GfmlTkn_mok.new_().Raw_(r);}
public void ini_RootLxr_Add(GfmlLxr... ary) {rootLxr.SubLxr_Add(ary);}

2
110_gfml/tst/gplx/gfml/ymoks_GfmlTkn_mok.java
View File

@ -55,7 +55,7 @@ class GfmlTkn_mok {
}
}
}
public static GfmlTkn_mok[] XtoAry(String... ary) {
public static GfmlTkn_mok[] Xto_bry(String... ary) {
GfmlTkn_mok[] rv = new GfmlTkn_mok[ary.length];
for (int i = 0; i < rv.length; i++)
rv[i] = GfmlTkn_mok.new_().Raw_(ary[i]);

2
110_gfml/tst/gplx/gfml/z091_GfmlLxr_basic_tst.java
View File

@ -61,7 +61,7 @@ public class z091_GfmlLxr_basic_tst {
if (tkn == GfmlTkn_.EndOfStream) break;
list.Add(tkn.Raw());
}
String[] actl = (String[])list.XtoAry(String.class);
String[] actl = (String[])list.Xto_ary(String.class);
Tfds.Eq_ary(expd, actl);
return tkn;
}

2
110_gfml/tst/gplx/gfml/z400_GfmlTypeMakr_tst.java
View File

@ -56,7 +56,7 @@ public class z400_GfmlTypeMakr_tst {
Tfds.Eq(expdKey, typeMakr.Owner().Key());
}
void tst_XtoAry(GfmlTypeMakr typeMakr, String... expdAry) {
GfmlType[] actlTypeAry = typeMakr.XtoAry();
GfmlType[] actlTypeAry = typeMakr.Xto_bry();
String[] actlAry = new String[actlTypeAry.length];
for (int i = 0; i < actlAry.length; i++) {
actlAry[i] = actlTypeAry[i].Key();

4
110_gfml/tst/gplx/gfml/z424_types_apply_ndes_nest_tst.java
View File

@ -22,7 +22,7 @@ public class z424_types_apply_ndes_nest_tst {
GfmlTypeMakr makr = GfmlTypeMakr.new_();
makr.MakeRootType("gfml.item", "item");
makr.MakeSubType("pos", "x", "y");
fx.Regy().Add_ary(makr.XtoAry());
fx.Regy().Add_ary(makr.Xto_bry());
} GfmlTypeCompiler_fxt fx = GfmlTypeCompiler_fxt.new_();
@Test public void InvokeByHnd() {
fx.tst_Resolve
@ -52,7 +52,7 @@ public class z424_types_apply_ndes_nest_tst {
GfmlTypeMakr makr = GfmlTypeMakr.new_();
makr.MakeRootType("font", "size");
makr.MakeSubType("color", "name");
fx.Regy().Add_ary(makr.XtoAry());
fx.Regy().Add_ary(makr.Xto_bry());
fx.tst_Resolve
( fx.nde_().Hnd_("color").Atru_("blue")
, fx.nde_().Typ_(GfmlType_.AnyKey).Atru_("blue")// confirm that subFlds in other types are not selectable by name; i.e.: must be font/color, not just color

2
140_dbs/.classpath
View File

@ -16,6 +16,6 @@
<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.12-bin.jar"/>
<classpathentry kind="lib" path="lib/postgresql-8.4-701.jdbc4.jar"/>
<classpathentry kind="lib" path="lib/sqlite-jdbc-3.7.15-M1.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>

8
140_dbs/src_110_dbQry/gplx/dbs/Db_stmt_sql.java
View File

@ -65,7 +65,7 @@ class Db_stmt_sql implements Db_stmt {
try {
Bry_bfr bfr = Bry_bfr.new_();
gplx.ios.Io_stream_rdr_.Load_all_to_bfr(bfr, v);
Add(++val_idx, bfr.XtoStrAndClear());
Add(++val_idx, bfr.Xto_str_and_clear());
} catch (Exception e) {throw Err_.err_(e, "failed to add value: type={0} val={1}", "rdr", v);}
return this;
}
@ -99,8 +99,8 @@ class Db_stmt_sql implements Db_stmt {
public void Add(String v) {Add(-1, v);}
public void Add(int idx, String v) {args.Add(v);} ListAdp args = ListAdp_.new_();
public String Xto_sql() {
tmp_fmtr.Bld_bfr_many(tmp_bfr, (Object[])args.XtoAryAndClear(Object.class));
return tmp_bfr.XtoStrAndClear();
tmp_fmtr.Bld_bfr_many(tmp_bfr, (Object[])args.Xto_ary_and_clear(Object.class));
return tmp_bfr.Xto_str_and_clear();
}
String sql_orig;
public Db_stmt Parse(String sql_str) {
@ -119,7 +119,7 @@ class Db_stmt_sql implements Db_stmt {
pos_prv = pos_cur + 1;
}
tmp_bfr.Add_mid(src, pos_prv, src.length);
tmp_fmtr.Fmt_(tmp_bfr.XtoAryAndClear());
tmp_fmtr.Fmt_(tmp_bfr.Xto_bry_and_clear());
return this;
}
}

6
140_dbs/src_120_sql/gplx/dbs/Db_obj_ary_tst.java
View File

@ -33,10 +33,10 @@ class Db_obj_ary_fxt {
public Db_obj_ary_fxt Test_sql(String expd) {
Sql_cmd_wtr_ansi cmd_wtr = (Sql_cmd_wtr_ansi)Sql_cmd_wtr_ansi_.default_();
String_bldr sb = String_bldr_.new_();
crt.Flds_((Db_fld[])flds_list.XtoAryAndClear(Db_fld.class));
crt.Vals_((Object[][])vals_list.XtoAryAndClear(Object[].class));
crt.Flds_((Db_fld[])flds_list.Xto_ary_and_clear(Db_fld.class));
crt.Vals_((Object[][])vals_list.Xto_ary_and_clear(Object[].class));
cmd_wtr.Append_db_obj_ary(sb, crt);
Tfds.Eq(expd, sb.XtoStrAndClear());
Tfds.Eq(expd, sb.Xto_str_and_clear());
return this;
}
}

2
140_dbs/src_400_tdbs/gplx/dbs/TdbSelect.java
View File

@ -28,7 +28,7 @@ class TdbSelectWkr implements Db_qryWkr {
if (cmd.GroupBy() != null)
rv = TdbGroupByWkr.GroupByExec(cmd, rv, tbl);
if (cmd.OrderBy() != null) { // don't use null pattern here; if null ORDER BY, then don't call .Sort on GfoNdeList
ComparerAble comparer = Sql_order_by_sorter.new_((Sql_order_by_itm[])cmd.OrderBy().Flds().XtoAry(Sql_order_by_itm.class));
ComparerAble comparer = Sql_order_by_sorter.new_((Sql_order_by_itm[])cmd.OrderBy().Flds().Xto_ary(Sql_order_by_itm.class));
rv.SortBy(comparer);
}
return GfoNdeRdr_.peers_(rv, false);

2
150_gfui/.classpath
View File

@ -15,10 +15,10 @@
<classpathentry kind="src" path="src_700_env"/>
<classpathentry kind="src" path="tst"/>
<classpathentry kind="src" path="xtn"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="src" path="/100_core"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry combineaccessrules="false" kind="src" path="/110_gfml"/>
<classpathentry kind="lib" path="lib/swt.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
150_gfui/src_200_ipt/gplx/gfui/IptKey_.java
View File

@ -54,7 +54,7 @@ public class IptKey_ {
IptKeyStrMgr._.XtoIptKeyAry(list);
for (IptKey key : del)
list.Del(key);
return (IptKey[])list.XtoAry(IptKey.class);
return (IptKey[])list.Xto_ary(IptKey.class);
}
static IptKey getOrNew_(int val) {
IptKey rv = (IptKey)enmMgr.Get(val);

2
150_gfui/src_210_lyt/gplx/gfui/GftGrid_fx.java
View File

@ -51,7 +51,7 @@ class GftGrid_fx {
public GftGrid_fx ini_Set(int idx, GftBand orig) {return ini_Set(idx, idx, orig);}
public GftGrid_fx ini_Set(int bgn, int end, GftBand orig) {curGrid.Bands_set(bgn, end, orig); return this;}
public GftGrid_fx run() {
GftItem[] ary = (GftItem[])itms.XtoAry(GftItem.class);
GftItem[] ary = (GftItem[])itms.Xto_ary(GftItem.class);
grid.Exec(owner, ary);
return this;
}

2
150_gfui/src_300_gxw/gplx/gfui/GxwTextHtml_lang.java
View File

@ -215,7 +215,7 @@ class GxwTextHtml_editor extends JEditorPane implements GxwTextHtml {
Element elm = Html_sel_elm(); if (elm == null) return KeyVal_.Ary_empty;
ListAdp sel_atrs_list = ListAdp_.new_();
Html_sel_atrs(elm.getAttributes(), sel_atrs_list, null, ".");
return (KeyVal[])sel_atrs_list.XtoAry(KeyVal.class);
return (KeyVal[])sel_atrs_list.Xto_ary(KeyVal.class);
}
@Override public void processKeyEvent(KeyEvent e) {

1
150_gfui/src_300_gxw/gplx/gfui/Gxw_html.java
View File

@ -24,6 +24,7 @@ public interface Gxw_html extends GxwElem {
String Html_doc_selected_get_text_or_href();
String Html_doc_selected_get_href_or_text();
String Html_doc_selected_get_src_or_empty();
String Html_doc_selected_get_active_or_selection(); // gets selected anchor or highlighted text for opening a new page
boolean Html_doc_find(String id, String find, boolean dir_fwd, boolean case_match, boolean wrap_find);
void Html_doc_body_focus();
void Html_doc_selection_focus_toggle();

1
150_gfui/src_420_box_basic/gplx/gfui/Gfui_html.java
View File

@ -26,6 +26,7 @@ public class Gfui_html extends GfuiElemBase {
public String Html_doc_selected_get_text_or_href() {return under.Html_doc_selected_get_text_or_href();}
public String Html_doc_selected_get_href_or_text() {return under.Html_doc_selected_get_href_or_text();}
public String Html_doc_selected_get_src_or_empty() {return under.Html_doc_selected_get_src_or_empty();}
public String Html_doc_selected_get_active_or_selection() {return under.Html_doc_selected_get_active_or_selection();}
public boolean Html_doc_find(String elem_id, String find, boolean dir_fwd, boolean case_match, boolean wrap_find) {return under.Html_doc_find(elem_id, find, dir_fwd, case_match, wrap_find);}
public void Html_doc_body_focus() {under.Html_doc_body_focus();}
public void Html_doc_selection_focus_toggle() {under.Html_doc_selection_focus_toggle();}

52
150_gfui/src_420_box_basic/gplx/gfui/Gfui_html_cfg.java
View File

@ -23,6 +23,7 @@ public class Gfui_html_cfg implements GfoInvkAble {
public String Doc_selected_get_text_or_href() {return Exec_fmt(fmtr_doc_selected_get_text_or_href);} private Bry_fmtr fmtr_doc_selected_get_text_or_href = Bry_fmtr.keys_();
public String Doc_selected_get_href_or_text() {return Exec_fmt(fmtr_doc_selected_get_href_or_text);} private Bry_fmtr fmtr_doc_selected_get_href_or_text = Bry_fmtr.keys_();
public String Doc_selected_get_src_or_empty() {return Exec_fmt(fmtr_doc_selected_get_src_or_empty);} private Bry_fmtr fmtr_doc_selected_get_src_or_empty = Bry_fmtr.keys_();
public String Doc_selected_get_active_or_selection() {return Exec_fmt(fmtr_doc_selected_get_active_or_selection);} private Bry_fmtr fmtr_doc_selected_get_active_or_selection = Bry_fmtr.keys_();
public String Doc_find_html(String find, boolean dir_fwd, boolean case_match, boolean wrap_find, boolean search_text_is_diff, int prv_find_bgn) {
return Exec_fmt(fmtr_doc_find_html, find, Bool_.Xto_str_lower(dir_fwd), Bool_.Xto_str_lower(case_match), Bool_.Xto_str_lower(wrap_find), Bool_.Xto_str_lower(search_text_is_diff), Int_.Xto_str(prv_find_bgn));
} private Bry_fmtr fmtr_doc_find_html = Bry_fmtr.keys_("find_text", "dir_fwd", "case_match", "wrap_find", "find_text_is_diff", "prv_find_bgn");
@ -62,30 +63,31 @@ public class Gfui_html_cfg implements GfoInvkAble {
return rv;
}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Invk_doc_html_)) fmtr_doc_html.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_body_focus_)) fmtr_doc_body_focus.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_selection_focus_toggle_)) fmtr_doc_selection_focus_toggle.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_selected_get_text_or_href_)) fmtr_doc_selected_get_text_or_href.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_selected_get_href_or_text_)) fmtr_doc_selected_get_href_or_text.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_selected_get_src_or_empty_)) fmtr_doc_selected_get_src_or_empty.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_find_html_)) fmtr_doc_find_html.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_find_edit_)) fmtr_doc_find_edit.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_atr_get_)) fmtr_elem_atr_get.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_atr_get_toString_)) fmtr_elem_atr_get_toString.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_atr_set_)) fmtr_elem_atr_set.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_atr_set_append_)) fmtr_elem_atr_set_append.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_delete_)) fmtr_elem_delete.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_replace_html_)) fmtr_elem_replace_html.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_gallery_packed_exec_)) fmtr_gallery_packed_exec.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_focus_)) fmtr_elem_focus.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_scroll_into_view_)) fmtr_elem_scroll_into_view.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_img_update_)) fmtr_elem_img_update.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_path_get_)) fmtr_window_vpos.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_win_print_preview_)) fmtr_window_print_preview.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_path_set_)) fmtr_window_vpos_.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_active_atr_get_)) fmtr_active_atr_get.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_js_scripts_add)) Js_scripts_add(m.ReadStr("name"), m.ReadStr("text"));
else if (ctx.Match(k, Invk_debug_file_)) debug_file = m.ReadIoUrl("v");
if (ctx.Match(k, Invk_doc_html_)) fmtr_doc_html.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_body_focus_)) fmtr_doc_body_focus.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_selection_focus_toggle_)) fmtr_doc_selection_focus_toggle.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_selected_get_text_or_href_)) fmtr_doc_selected_get_text_or_href.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_selected_get_href_or_text_)) fmtr_doc_selected_get_href_or_text.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_selected_get_src_or_empty_)) fmtr_doc_selected_get_src_or_empty.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_selected_get_active_or_selection_)) fmtr_doc_selected_get_active_or_selection.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_find_html_)) fmtr_doc_find_html.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_find_edit_)) fmtr_doc_find_edit.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_atr_get_)) fmtr_elem_atr_get.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_atr_get_toString_)) fmtr_elem_atr_get_toString.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_atr_set_)) fmtr_elem_atr_set.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_atr_set_append_)) fmtr_elem_atr_set_append.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_delete_)) fmtr_elem_delete.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_replace_html_)) fmtr_elem_replace_html.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_gallery_packed_exec_)) fmtr_gallery_packed_exec.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_focus_)) fmtr_elem_focus.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_scroll_into_view_)) fmtr_elem_scroll_into_view.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_img_update_)) fmtr_elem_img_update.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_path_get_)) fmtr_window_vpos.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_win_print_preview_)) fmtr_window_print_preview.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_elem_path_set_)) fmtr_window_vpos_.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_doc_active_atr_get_)) fmtr_active_atr_get.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_js_scripts_add)) Js_scripts_add(m.ReadStr("name"), m.ReadStr("text"));
else if (ctx.Match(k, Invk_debug_file_)) debug_file = m.ReadIoUrl("v");
else return GfoInvkAble_.Rv_unhandled;
return this;
}
@ -99,7 +101,7 @@ public class Gfui_html_cfg implements GfoInvkAble {
public static final String Invk_debug_file_ = "debug_file_"
, Invk_doc_html_ = "doc_html_", Invk_doc_body_focus_ = "doc_body_focus_", Invk_doc_selection_focus_toggle_ = "doc_selection_focus_toggle_"
, Invk_doc_active_atr_get_ = "doc_active_atr_get_", Invk_doc_find_html_ = "doc_find_html_", Invk_doc_find_edit_ = "doc_find_edit_"
, Invk_doc_selected_get_text_or_href_ = "doc_selected_get_text_or_href_", Invk_doc_selected_get_href_or_text_ = "doc_selected_get_href_or_text_", Invk_doc_selected_get_src_or_empty_ = "doc_selected_get_src_or_empty_"
, Invk_doc_selected_get_text_or_href_ = "doc_selected_get_text_or_href_", Invk_doc_selected_get_href_or_text_ = "doc_selected_get_href_or_text_", Invk_doc_selected_get_src_or_empty_ = "doc_selected_get_src_or_empty_", Invk_doc_selected_get_active_or_selection_ = "doc_selected_get_active_or_selection_"
, Invk_win_print_preview_ = "win_print_preview_"
, Invk_elem_atr_get_ = "elem_atr_get_", Invk_elem_atr_get_toString_ = "elem_atr_get_toString_", Invk_elem_atr_set_ = "elem_atr_set_", Invk_elem_atr_set_append_ = "elem_atr_set_append_"
, Invk_elem_path_get_ = "elem_path_get_", Invk_elem_path_set_ = "elem_path_set_"

1
150_gfui/src_700_env/gplx/gfui/Mem_html.java
View File

@ -24,6 +24,7 @@ class Mem_html extends GxwTextMemo_lang implements Gxw_html { public String Htm
public String Html_doc_selected_get_text_or_href() {return "";}
public String Html_doc_selected_get_href_or_text() {return "";}
public String Html_doc_selected_get_src_or_empty() {return "";}
public String Html_doc_selected_get_active_or_selection() {return "";}
public boolean Html_window_print_preview() {return false;}
public void Html_invk_src_(GfoEvObj v) {}
public String Html_elem_atr_get_str(String elem_id, String atr_key) {

1
150_gfui/xtn/gplx/gfui/Swt_html.java
View File

@ -64,6 +64,7 @@ class Swt_html implements Gxw_html, Swt_control, FocusListener {
public String Html_doc_selected_get_text_or_href() {return Eval_script_as_str(kit.Html_cfg().Doc_selected_get_text_or_href());}
public String Html_doc_selected_get_href_or_text() {return Eval_script_as_str(kit.Html_cfg().Doc_selected_get_href_or_text());}
public String Html_doc_selected_get_src_or_empty() {return Eval_script_as_str(kit.Html_cfg().Doc_selected_get_src_or_empty());}
public String Html_doc_selected_get_active_or_selection() {return Eval_script_as_str(kit.Html_cfg().Doc_selected_get_active_or_selection());}
public void Html_doc_body_focus() {Eval_script_as_exec(kit.Html_cfg().Doc_body_focus());}
public void Html_doc_selection_focus_toggle() {Eval_script_as_exec(kit.Html_cfg().Doc_selection_focus_toggle());}
public String Html_elem_atr_get_str(String elem_id, String atr_key) {return Eval_script_as_str(kit.Html_cfg().Elem_atr_get(elem_id, atr_key));}

4
400_xowa/.classpath
View File

@ -19,8 +19,6 @@
<classpathentry kind="src" path="src_405_tkn"/>
<classpathentry kind="src" path="src_409_tkn_misc"/>
<classpathentry kind="src" path="src_440_lnki"/>
<classpathentry kind="src" path="src_460_para"/>
<classpathentry kind="src" path="src_480_tblw"/>
<classpathentry kind="src" path="src_490_xnde"/>
<classpathentry kind="src" path="src_500_tmpl"/>
<classpathentry kind="src" path="xtn"/>
@ -30,6 +28,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/140_dbs"/>
<classpathentry kind="lib" path="lib/luaj_xowa.jar"/>
<classpathentry kind="lib" path="lib/jtidy_xowa.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>

17
400_xowa/src/gplx/core/brys/Bry_comparer.java
View File

@ -22,22 +22,5 @@ public class Bry_comparer implements ComparerAble {
byte[] lhs = (byte[])lhsObj, rhs = (byte[])rhsObj;
return Bry_.Compare(lhs, 0, lhs.length, rhs, 0, rhs.length);
}
// public static int Compare(byte[] lhs, byte[] rhs, int lhs_bgn, int lhs_end, int rhs_bgn, int rhs_end) {
// int lhs_len = lhs_end - lhs_bgn;
// for (int i = 0; i < lhs_len; i++) {
// int lhs_byte = lhs[i + lhs_bgn] & 0xff; // PATCH.JAVA:need to convert to unsigned byte
// int rhs_idx = i + rhs_bgn; if (rhs_idx == rhs_end) return CompareAble_.More;
// int rhs_byte = rhs[rhs_idx] & 0xff; // PATCH.JAVA:need to convert to unsigned byte
// if (lhs_byte == rhs_byte) {
// if (lhs_byte == Byte_ascii.Pipe) return CompareAble_.Same;
// }
// else {
// if (rhs_byte == Byte_ascii.Pipe) return CompareAble_.More;
// else if (lhs_byte == Byte_ascii.Pipe) return CompareAble_.Less;
// else return lhs_byte < rhs_byte ? CompareAble_.Less : CompareAble_.More;
// }
// }
// return Int_.Compare(lhs_len, rhs_end - rhs_bgn);
// }
public static final Bry_comparer _ = new Bry_comparer(); Bry_comparer() {}
}

2
400_xowa/src/gplx/core/btries/Btrie_fast_mgr.java
View File

@ -106,7 +106,7 @@ public class Btrie_fast_mgr {
pos = match_pos;
}
}
return dirty ? tmp_bfr.XtoAryAndClear() : src;
return dirty ? tmp_bfr.Xto_bry_and_clear() : src;
}
public static Btrie_fast_mgr cs_() {return new Btrie_fast_mgr(false);}
public static Btrie_fast_mgr ci_ascii_() {return new Btrie_fast_mgr(true);}

2
400_xowa/src/gplx/core/btries/Btrie_slim_mgr.java
View File

@ -116,7 +116,7 @@ public class Btrie_slim_mgr implements Btrie_mgr {
pos = match_pos;
}
}
return dirty ? tmp_bfr.XtoAryAndClear() : src;
return dirty ? tmp_bfr.Xto_bry_and_clear() : src;
}
public void Clear() {root.Clear(); count = 0;}
public static Btrie_slim_mgr cs_() {return new Btrie_slim_mgr(true);}

4
400_xowa/src/gplx/core/flds/Gfo_fld_rdr.java
View File

@ -80,8 +80,8 @@ public class Gfo_fld_rdr extends Gfo_fld_base {
}
throw Err_.new_("fld_dlm failed").Add("fld_dlm", (char)fld_dlm).Add("bgn", fld_bgn);
}
public String Read_str_escape() {Move_next_escaped(bfr); return String_.new_utf8_(bfr.XtoAryAndClear());}
public byte[] Read_bry_escape() {Move_next_escaped(bfr); return bfr.XtoAryAndClear();}
public String Read_str_escape() {Move_next_escaped(bfr); return String_.new_utf8_(bfr.Xto_bry_and_clear());}
public byte[] Read_bry_escape() {Move_next_escaped(bfr); return bfr.Xto_bry_and_clear();}
public void Move_1() {++pos;}
public void Move_next_escaped() {Move_next_escaped(bfr); bfr.Clear();}
public int Move_next_simple_fld() {

2
400_xowa/src/gplx/core/flds/Gfo_fld_rdr_tst.java
View File

@ -50,7 +50,7 @@ class Gfo_fld_rdr_fxt {
byte[] bry = Bry_.new_utf8_(val);
wtr.Bfr_(bfr);
wtr.Write_bry_escape_fld(bry);
Tfds.Eq(expd, bfr.XtoStr());
Tfds.Eq(expd, bfr.Xto_str());
return this;
} private Bry_bfr bfr = Bry_bfr.new_();
}

2
400_xowa/src/gplx/core/regxs/Gfo_pattern_itm_.java
View File

@ -46,6 +46,6 @@ public class Gfo_pattern_itm_ {
++pos;
if (last) break;
}
return (Gfo_pattern_itm[])rv.XtoAryAndClear(Gfo_pattern_itm.class);
return (Gfo_pattern_itm[])rv.Xto_ary_and_clear(Gfo_pattern_itm.class);
}
}

2
400_xowa/src/gplx/core/regxs/Gfo_pattern_tst.java
View File

@ -78,6 +78,6 @@ class Gfo_pattern_itm_fxt {
Gfo_pattern_itm itm = ary[i];
itm.Xto_str(sb);
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
}

2
400_xowa/src/gplx/fsdb/Fsdb_db_atr_tbl.java
View File

@ -30,7 +30,7 @@ public class Fsdb_db_atr_tbl {
rv.Add(itm);
}
} finally {rdr.Rls();}
return (Fsdb_db_atr_fil[])rv.XtoAry(Fsdb_db_atr_fil.class);
return (Fsdb_db_atr_fil[])rv.Xto_ary(Fsdb_db_atr_fil.class);
}
public static void Commit_all(Db_provider provider, Fsdb_db_atr_fil[] ary) {
stmt_bldr.Init(provider);

2
400_xowa/src/gplx/fsdb/Fsdb_db_bin_tbl.java
View File

@ -50,7 +50,7 @@ public class Fsdb_db_bin_tbl {
rv.Add(itm);
}
} finally {rdr.Rls();}
return (Fsdb_db_bin_fil[])rv.XtoAry(Fsdb_db_bin_fil.class);
return (Fsdb_db_bin_fil[])rv.Xto_ary(Fsdb_db_bin_fil.class);
}
public static final String Tbl_name = "fsdb_db_bin", Fld_uid = "uid", Fld_url = "url", Fld_bin_len = "bin_len", Fld_bin_max = "bin_max";
private static final String Tbl_sql = String_.Concat_lines_nl

2
400_xowa/src/gplx/fsdb/Fsdb_mnt_tbl.java
View File

@ -54,7 +54,7 @@ public class Fsdb_mnt_tbl {
}
}
finally {rdr.Rls();}
return (Fsdb_mnt_itm[])list.XtoAryAndClear(Fsdb_mnt_itm.class);
return (Fsdb_mnt_itm[])list.Xto_ary_and_clear(Fsdb_mnt_itm.class);
}
public static final String Tbl_name = "fsdb_mnt", Fld_mnt_id = "mnt_id", Fld_mnt_name = "mnt_name", Fld_mnt_url = "mnt_url";
private static final String Tbl_sql = String_.Concat_lines_nl

2
400_xowa/src/gplx/gfs/Gfs_lxr.java
View File

@ -167,7 +167,7 @@ class Gfs_lxr_quote implements Gfs_lxr {
break;
}
}
ctx.Make_atr_by_bry(lxr_bgn + bgn_bry_len, end_pos, bfr.XtoAryAndClear());
ctx.Make_atr_by_bry(lxr_bgn + bgn_bry_len, end_pos, bfr.Xto_bry_and_clear());
}
else
ctx.Make_atr(lxr_bgn + bgn_bry_len, end_pos);

2
400_xowa/src/gplx/gfs/Gfs_msg_bldr_tst.java
View File

@ -71,6 +71,6 @@ class Gfs_msg_bldr_fxt {
if (i != 0) sb.Add_char_crlf();
sb.Add(ary[i].XtoStr());
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
}

6
400_xowa/src/gplx/gfs/Gfs_parser_ctx.java
View File

@ -97,7 +97,7 @@ class Gfs_err_mgr {
tmp_fail_bfr.Add_byte(Byte_ascii.Eq).Add_byte(Byte_ascii.Apos);
tmp_fail_bfr.Add_str(kv.Val_to_str_or_empty()).Add_byte(Byte_ascii.Apos);
}
return tmp_fail_bfr.XtoStrAndClear();
return tmp_fail_bfr.Xto_str_and_clear();
}
Bry_bfr tmp_fail_bfr = Bry_bfr.reset_(255);
KeyValList tmp_fail_args = new KeyValList();
@ -105,12 +105,12 @@ class Gfs_err_mgr {
String Fail_excerpt_bgn(byte[] src, int src_len, int pos) {
int bgn = pos - excerpt_len; if (bgn < 0) bgn = 0;
Fail_excerpt_rng(tmp_fail_bfr, src, bgn, pos);
return tmp_fail_bfr.XtoStrAndClear();
return tmp_fail_bfr.Xto_str_and_clear();
}
String Fail_excerpt_end(byte[] src, int src_len, int pos) {
int end = pos + excerpt_len; if (end > src_len) end = src_len;
Fail_excerpt_rng(tmp_fail_bfr, src, pos, end);
return tmp_fail_bfr.XtoStrAndClear();
return tmp_fail_bfr.Xto_str_and_clear();
}
private static void Fail_excerpt_rng(Bry_bfr bfr, byte[] src, int bgn, int end) {
for (int i = bgn; i < end; i++) {

2
400_xowa/src/gplx/gfs/Gfs_parser_tst.java
View File

@ -159,7 +159,7 @@ class Gfs_parser_fxt {
path_bfr.Clear().Add_int_variable(i);
To_str(tmp_bfr, path_bfr, src, expd[i]);
}
return tmp_bfr.XtoStrAndClear();
return tmp_bfr.Xto_str_and_clear();
}
public void To_str(Bry_bfr bfr, Bry_bfr path, byte[] src, Gfs_nde nde) {
To_str_atr(bfr, path, src, Atr_name, nde.Name(), nde.Name_bgn(), nde.Name_end());

2
400_xowa/src/gplx/gfui/Gfui_bnd_parser.java
View File

@ -88,7 +88,7 @@ public class Gfui_bnd_parser {
Gfui_bnd_tkn tkn = (Gfui_bnd_tkn)tkns.FetchAt(i);
tkn.Write(tmp_bfr, !src_is_gfui);
}
return tmp_bfr.XtoStrAndClear();
return tmp_bfr.Xto_str_and_clear();
}
private void Process_sym(boolean src_is_gfui, Gfui_bnd_tkn sym_tkn, int itm_bgn, int itm_end) {
Hash_adp_bry regy = src_is_gfui ? gfui_regy : norm_regy;

2
400_xowa/src/gplx/html/Html_nde.java
View File

@ -77,7 +77,7 @@ public class Html_nde {
break;
}
}
return dirty ? tmp_bfr.XtoAryAndClear() : Bry_.Mid(src, bgn, end);
return dirty ? tmp_bfr.Xto_bry_and_clear() : Bry_.Mid(src, bgn, end);
}
public byte[] Data(byte[] src) {
return Bry_.Mid(src, tag_lhs_end, tag_rhs_bgn);

2
400_xowa/src/gplx/html/Html_parser.java
View File

@ -53,7 +53,7 @@ public class Html_parser {
break;
}
}
return (Html_nde[])rv.XtoAry(Html_nde.class);
return (Html_nde[])rv.Xto_ary(Html_nde.class);
}
int cur_lhs_bgn, cur_lhs_end, cur_name_bgn, cur_name_end, cur_rhs_bgn; boolean xnde_init = true, tag_tid_is_inline = false;
private boolean Parse_xnde_rhs() {

2
400_xowa/src/gplx/html/Html_selecter.java
View File

@ -33,7 +33,7 @@ public class Html_selecter {
}
}
}
Html_nde[] rv = (Html_nde[])list.XtoAry(Html_nde.class);
Html_nde[] rv = (Html_nde[])list.Xto_ary(Html_nde.class);
list.Clear();
return rv;
}

10
400_xowa/src/gplx/html/Html_utl.java
View File

@ -25,7 +25,7 @@ public class Html_utl {
public static byte[] Escape_for_atr_val_as_bry(Bry_bfr tmp_bfr, byte quote_byte, byte[] bry) {
if (bry == null) return null;
boolean dirty = Escape_for_atr_val_as_bry(tmp_bfr, quote_byte, bry, 0, bry.length);
return dirty ? tmp_bfr.XtoAryAndClear() : bry;
return dirty ? tmp_bfr.Xto_bry_and_clear() : bry;
}
public static boolean Escape_for_atr_val_as_bry(Bry_bfr tmp_bfr, byte quote_byte, byte[] src, int bgn, int end) {
boolean dirty = false;
@ -92,7 +92,7 @@ public class Html_utl {
if (write_to_bfr)
return null;
else
return dirty ? bfr.XtoAryAndClear() : bry;
return dirty ? bfr.Xto_bry_and_clear() : bry;
}
private static final Btrie_slim_mgr unescape_trie = Btrie_slim_mgr.ci_ascii_()
@ -106,7 +106,7 @@ public class Html_utl {
Bry_bfr bfr = Bry_bfr.reset_(255);
byte[] bry = Bry_.new_utf8_(src);
Unescape(Bool_.Y, bfr, bry, 0, bry.length, Bool_.Y, Bool_.Y, Bool_.Y, Bool_.Y, Bool_.Y);
return bfr.XtoStrAndClear();
return bfr.Xto_str_and_clear();
}
public static byte[] Unescape(boolean write_to_bfr, Bry_bfr bfr, byte[] bry, int bgn, int end, boolean escape_lt, boolean escape_gt, boolean escape_amp, boolean escape_quote, boolean escape_apos) {
if (bry == null) return null;
@ -148,7 +148,7 @@ public class Html_utl {
if (write_to_bfr)
return null;
else
return dirty ? bfr.XtoAryAndClear() : bry;
return dirty ? bfr.Xto_bry_and_clear() : bry;
}
public static byte[] Del_comments(Bry_bfr bfr, byte[] src) {return Del_comments(bfr, src, 0, src.length);}
public static byte[] Del_comments(Bry_bfr bfr, byte[] src, int pos, int end) {
@ -167,6 +167,6 @@ public class Html_utl {
bfr.Add_mid(src, pos, comm_bgn); // add everything between pos and comm_bgn
pos = comm_end + Html_tag_.Comm_end_len; // reposition pos after comm_end
}
return bfr.XtoAryAndClear();
return bfr.Xto_bry_and_clear();
}
}

6
400_xowa/src/gplx/html/Html_wtr.java
View File

@ -82,9 +82,9 @@ public class Html_wtr {
bfr.Add_byte(Byte_ascii.Gt);
return this;
}
public byte[] Xto_bry_and_clear() {return bfr.XtoAryAndClear();}
public byte[] Xto_bry() {return bfr.XtoAry();}
public String Xto_str() {return bfr.XtoStr();}
public byte[] Xto_bry_and_clear() {return bfr.Xto_bry_and_clear();}
public byte[] Xto_bry() {return bfr.Xto_bry();}
public String Xto_str() {return bfr.Xto_str();}
public static void Write_atr_bry(Bry_bfr bfr, byte[] key, byte[] val) {Write_atr_bry(bfr, Bool_.Y, Byte_ascii.Quote, key, val);}
public static void Write_atr_bry(Bry_bfr bfr, boolean write_space, byte atr_quote, byte[] key, byte[] val) {
if (Bry_.Len_eq_0(val)) return; // don't write empty

4
400_xowa/src/gplx/json/Json_doc_srl.java
View File

@ -20,8 +20,8 @@ public class Json_doc_srl {
private int indent = -1;
private Bry_bfr bfr = Bry_bfr.reset_(255);
public boolean Ws_enabled() {return ws_enabled;} public void Ws_enabled_(boolean v) {ws_enabled = v;} private boolean ws_enabled = false;
public byte[] Bld() {return bfr.XtoAryAndClear();}
public String Bld_as_str() {return bfr.XtoStrAndClear();}
public byte[] Bld() {return bfr.Xto_bry_and_clear();}
public String Bld_as_str() {return bfr.Xto_str_and_clear();}
public Json_doc_srl Write_root(byte[] key, Object val) {
Write_nde_bgn();
Write_obj(false, key, val);

4
400_xowa/src/gplx/json/Json_doc_wtr.java
View File

@ -93,6 +93,6 @@ public class Json_doc_wtr {
bfr.Add_byte(Byte_ascii.Colon);
return this;
}
public byte[] Bld() {return bfr.XtoAryAndClear();}
public String Bld_as_str() {return bfr.XtoStrAndClear();}
public byte[] Bld() {return bfr.Xto_bry_and_clear();}
public String Bld_as_str() {return bfr.Xto_str_and_clear();}
}

2
400_xowa/src/gplx/json/Json_itm.java
View File

@ -111,6 +111,6 @@ class Json_itm_str extends Json_itm_base {
break;
}
}
return bfr.XtoAryAndClear();
return bfr.Xto_bry_and_clear();
}
}

2
400_xowa/src/gplx/json/Json_itm_base.java
View File

@ -23,7 +23,7 @@ public abstract class Json_itm_base implements Json_itm {
public int Src_end() {return src_end;} protected int src_end;
public abstract Object Data();
public abstract byte[] Data_bry();
public String Print_as_json() {Bry_bfr bfr = Bry_bfr.new_(); Print_as_json(bfr, 0); return bfr.XtoStrAndClear();}
public String Print_as_json() {Bry_bfr bfr = Bry_bfr.new_(); Print_as_json(bfr, 0); return bfr.Xto_str_and_clear();}
public abstract void Print_as_json(Bry_bfr bfr, int depth);
@gplx.Virtual public boolean Data_eq(byte[] comp) {return false;}
}

4
400_xowa/src/gplx/json/Json_parser_tst.java
View File

@ -78,7 +78,7 @@ class Json_parser_fxt {
byte[] raw = Json_parser_tst.Replace_apos(Bry_.new_utf8_(raw_str));
Json_doc doc = parser.Parse(raw);
doc.Root().Print_as_json(tmp_bfr, 0);
String actl = tmp_bfr.XtoStrAndClear();
String actl = tmp_bfr.Xto_str_and_clear();
String expd = Xto_str(raw, doc, expd_ary, 0, expd_ary.length);
Tfds.Eq_str_lines(expd, actl, actl);
}
@ -94,6 +94,6 @@ class Json_parser_fxt {
Json_itm itm = ary[i];
itm.Print_as_json(tmp_bfr, 0);
}
return tmp_bfr.XtoStrAndClear();
return tmp_bfr.Xto_str_and_clear();
}
}

2
400_xowa/src/gplx/php/Php_parser.java
View File

@ -49,7 +49,7 @@ public class Php_parser {
Init_lxr(list, new Php_lxr_num());
Init_lxr(list, new Php_lxr_quote(Byte_ascii.Apos));
Init_lxr(list, new Php_lxr_quote(Byte_ascii.Quote));
lxrs = (Php_lxr[])list.XtoAry(Php_lxr.class);
lxrs = (Php_lxr[])list.Xto_ary(Php_lxr.class);
lxrs_len = list.Count();
}
private void Init_lxr(ListAdp list, Php_lxr lxr) {

6
400_xowa/src/gplx/php/Php_parser_tst.java
View File

@ -163,7 +163,7 @@ class Php_parser_fxt {
public void tst_tkns(String raw, Php_tkn_chkr_base... expd) {
byte[] raw_bry = Bry_.new_utf8_(raw);
parser.Parse_tkns(raw_bry, tkn_wkr);
Php_tkn[] actl = (Php_tkn[])tkn_wkr.List().XtoAry(Php_tkn.class);
Php_tkn[] actl = (Php_tkn[])tkn_wkr.List().Xto_ary(Php_tkn.class);
tst_mgr.Vars().Clear().Add("raw_bry", raw_bry);
tst_mgr.Tst_ary("", expd, actl);
log_mgr_chkr.tst(tst_mgr, tkn_wkr.Msg_log());
@ -171,7 +171,7 @@ class Php_parser_fxt {
public void tst_lines(String raw, Php_line_assign_chkr... expd) {
byte[] raw_bry = Bry_.new_utf8_(raw);
parser.Parse_tkns(raw_bry, line_wkr);
Php_line[] actl = (Php_line[])line_wkr.List().XtoAry(Php_line.class);
Php_line[] actl = (Php_line[])line_wkr.List().Xto_ary(Php_line.class);
tst_mgr.Vars().Clear().Add("raw_bry", raw_bry);
tst_mgr.Tst_ary("", expd, actl);
log_mgr_chkr.tst(tst_mgr, line_wkr.Msg_log());
@ -380,7 +380,7 @@ class Gfo_msg_log_chkr implements Tst_chkr {
Gfo_msg_data[] actl_itms = new Gfo_msg_data[actl_itms_len];
for (int i = 0; i < actl_itms_len; i++)
actl_itms[i] = actl.Ary_get(i);
mgr.Tst_ary("itms", (Gfo_msg_data_chkr[])itms.XtoAry(Gfo_msg_data_chkr.class), actl_itms);
mgr.Tst_ary("itms", (Gfo_msg_data_chkr[])itms.Xto_ary(Gfo_msg_data_chkr.class), actl_itms);
}
}
class Gfo_msg_data_chkr implements Tst_chkr {

4
400_xowa/src/gplx/php/Php_srl_parser_tst.java
View File

@ -98,7 +98,7 @@ class Php_srl_parser_fxt {
Php_srl_itm_ary root = parser.Parse(raw);
Php_srl_itm root_sub = root.Subs_get_at(0).Val();
root_sub.Xto_bfr(tmp_bfr, 0);
String actl = tmp_bfr.XtoStrAndClear();
String actl = tmp_bfr.Xto_str_and_clear();
String expd = Xto_str(expd_ary, 0, expd_ary.length);
Tfds.Eq_str_lines(expd, actl, actl);
}
@ -107,6 +107,6 @@ class Php_srl_parser_fxt {
Php_srl_itm itm = ary[i];
itm.Xto_bfr(tmp_bfr, 0);
}
return tmp_bfr.XtoStrAndClear();
return tmp_bfr.Xto_str_and_clear();
}
}

2
400_xowa/src/gplx/php/Php_text_itm_parser.java
View File

@ -32,7 +32,7 @@ public class Php_text_itm_parser {
Php_text_itm itm = (Php_text_itm)tmp_list.FetchAt(i);
itm.Bld(tmp_bfr, raw);
}
rv = tmp_bfr.XtoAryAndClear();
rv = tmp_bfr.Xto_bry_and_clear();
break;
}
return rv;

2
400_xowa/src/gplx/php/Php_text_itm_tst.java
View File

@ -48,6 +48,6 @@ class Php_text_itm_fxt {
Php_text_itm itm = (Php_text_itm)list.FetchAt(i);
itm.Bld(bfr, raw);
}
Tfds.Eq(expd, bfr.XtoStrAndClear());
Tfds.Eq(expd, bfr.Xto_str_and_clear());
}
}

2
400_xowa/src/gplx/srls/dsvs/Dsv_tbl_parser_int_tst.java
View File

@ -38,7 +38,7 @@ class Mok_int_itm implements XtoStrAble {
}
class Mok_int_mgr extends Mok_mgr_base {
public void Clear() {itms.Clear();}
@Override public XtoStrAble[] Itms() {return (XtoStrAble[])itms.XtoAry(XtoStrAble.class);} private ListAdp itms = ListAdp_.new_();
@Override public XtoStrAble[] Itms() {return (XtoStrAble[])itms.Xto_ary(XtoStrAble.class);} private ListAdp itms = ListAdp_.new_();
private String fld_0;
private int fld_1, fld_2;
@Override public Dsv_fld_parser[] Fld_parsers() {

Some files were not shown because too many files have changed in this diff Show More