v2.9.3.1

400_xowa/src/gplx/core/brys/Bit_.java

@@ -30,6 +30,7 @@ public class Bit_ {
 		rv[i] = bits[i] ? Byte_ascii.Num_1 : Byte_ascii.Num_0;
     		return String_.new_a7(rv);
 	}
+	public static int Get_flag(int i) {return Base2_ary[i];}
 	public static int[] Bld_pow_ary(int... seg_ary) {
 		int seg_ary_len = seg_ary.length;
 		int pow = 0;

400_xowa/src/gplx/core/btries/Btrie_u8_mgr_tst.java

@@ -45,9 +45,9 @@ public class Btrie_u8_mgr_tst {
 	}
 	@Test  public void Uft8_asymmetric() {
 		fxt.Init_add(Bry_.new_u8("İ")	, "1");
-		fxt.Test_match("İ"	, "1");				// exact=y; İ = Bry_.ints_(196,176)
-		fxt.Test_match("i"	, "1");				// lower=y; i = Bry_.ints_(105)
-		fxt.Test_match("I"	, null);			// upper=n; I = Bry_.ints_( 73); see Btrie_u8_itm and rv.asymmetric_bry
+		fxt.Test_match("İ"	, "1");				// exact=y; İ = Bry_.new_ints(196,176)
+		fxt.Test_match("i"	, "1");				// lower=y; i = Bry_.new_ints(105)
+		fxt.Test_match("I"	, null);			// upper=n; I = Bry_.new_ints( 73); see Btrie_u8_itm and rv.asymmetric_bry
 
 		fxt.Clear();
 		fxt.Init_add(Bry_.new_u8("i")	, "1");

400_xowa/src/gplx/core/caches/GfoCacheMgr_tst.java

@@ -0,0 +1,66 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.caches; import gplx.*; import gplx.core.*;
+import org.junit.*;
+public class GfoCacheMgr_tst {
+	@Before public void init() {fxt = new GfoCacheMgr_fxt();} GfoCacheMgr_fxt fxt;
+	@Test  public void teardown() {Env_.TickCount_Test = -1;}
+	@Test  public void Basic() {fxt.run_Add("a").Expd_curSize_(1).Expd_itms_("a").tst();}
+//		@Test  public void Reduce() {fxt.run_Add("a", "b", "c", "d", "e").Expd_curSize_(3).Expd_itms_("c", "d", "e").tst();}
+//		@Test  public void Access() {fxt.run_Add("a", "b", "c", "d").run_Get("b", "a").run_Add("e").Expd_curSize_(3).Expd_itms_("b", "a", "e").tst();}
+//		@Test  public void Sizes() {fxt.run_Add("abc", "d", "e").Expd_curSize_(2).Expd_itms_("d", "e").tst();}
+}
+class GfoCacheMgr_fxt {
+	Gfo_cache_mgr mgr = new Gfo_cache_mgr().Max_size_(4).Reduce_by_(2);
+	public GfoCacheMgr_fxt() {
+		Env_.TickCount_Test = 1;
+	}
+	public GfoCacheMgr_fxt run_Add(String... ary) {
+		for (int i = 0; i < ary.length; i++) {
+			String s = ary[i];
+			mgr.Add(Bry_.new_u8(s), new GfoCacheItm_mock(s), String_.Len(s));
+			Env_.TickCount_Test++;
+		}
+		return this;
+	}
+	public GfoCacheMgr_fxt run_Get(String... ary) {
+		for (int i = 0; i < ary.length; i++) {
+			String s = ary[i];
+			mgr.Get_by_key(Bry_.new_u8(s));
+			Env_.TickCount_Test++;
+		}
+		return this;
+	}
+	public GfoCacheMgr_fxt Expd_curSize_(int v) {expd_curSize = v; return this;} private int expd_curSize = -1;
+	public GfoCacheMgr_fxt Expd_itms_(String... v) {expd_itms = v; return this;} private String[] expd_itms;
+	public GfoCacheMgr_fxt tst() {
+		if (expd_curSize != -1) Tfds.Eq(expd_curSize, mgr.Cur_size(), "curSize");
+		if (expd_itms != null) {
+			String[] actl = new String[mgr.Count()];
+			for (int i = 0; i < actl.length; i++)
+				actl[i] = ((GfoCacheItm_mock)mgr.Get_at(i)).S();
+			Tfds.Eq_ary_str(expd_itms, actl, "itms");
+		}
+		return this;
+	}
+}
+class GfoCacheItm_mock implements RlsAble {
+	public void Rls() {}
+	public String S() {return s;} private String s;
+	public GfoCacheItm_mock(String s) {this.s = s;}
+}

400_xowa/src/gplx/core/caches/Gfo_cache_mgr.java

@@ -0,0 +1,123 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.caches; import gplx.*; import gplx.core.*;
+import gplx.core.consoles.*;
+public class Gfo_cache_mgr {
+	private Ordered_hash hash = Ordered_hash_.new_bry_();
+	private Ordered_hash recent = Ordered_hash_.new_bry_();
+	public int Max_size() {return max_size;} public Gfo_cache_mgr Max_size_(int v) {max_size = v; return this;} private int max_size;
+	public int Reduce_by() {return reduce_by;} public Gfo_cache_mgr Reduce_by_(int v) {reduce_by = v; return this;} private int reduce_by;
+	public int Cur_size() {return cur_size;} private int cur_size;
+	public int Count() {return hash.Count();}
+	public void Clear() {hash.Clear(); recent.Clear(); cur_size = 0;}
+	@gplx.Internal protected Object Get_at(int i) {
+		Gfo_cache_data rv = (Gfo_cache_data)hash.Get_at(i);
+		return rv.Val();
+	}
+	public Object Get_by_key(byte[] key) {
+		Object o = hash.Get_by(key); if (o == null) return null;
+		Gfo_cache_data rv = (Gfo_cache_data)o;
+		rv.Timestamp_update();
+		Object recent_itm = recent.Get_by(key);
+		if (recent_itm == null) recent.Add(key, rv);
+		return rv.Val();
+	}
+	public void Del(byte[] key) {
+		Object o = hash.Get_by(key); if (o == null) return;
+		Gfo_cache_data itm = (Gfo_cache_data)o;
+		cur_size -= itm.Size();
+		hash.Del(itm.Key());
+		itm.Rls();
+	}
+	public void Add_replace(byte[] key, RlsAble val, int size) {
+//			Del(key);
+//			Add(key, val, size);
+		Object o = hash.Get_by(key);
+		if (o == null)
+			Add(key, val, size);
+		else {
+			Gfo_cache_data itm = (Gfo_cache_data)o;
+			cur_size -= itm.Size();
+			cur_size += size;
+			itm.Replace(val, size);
+		}
+	}
+	public void Add(byte[] key, RlsAble val, int size) {
+//			if (cur_size + size > 600000000) ReduceCache();
+		cur_size += size;
+//			++cur_size;
+		Gfo_cache_data itm = new Gfo_cache_data(key, val, size);
+		hash.Add(key, itm);
+	}
+	public void Reduce_recent() {
+//			Console_adp__sys.I.WriteLine("reducing");
+		int len = recent.Count();
+		for (int i = 0; i < len; i++) {
+			Gfo_cache_data itm = (Gfo_cache_data)recent.Get_at(i);
+			itm.Rls();	// releases root
+		}
+		recent.Clear();
+	}
+	public void Reduce_cache() {
+		Console_adp__sys.I.Write_str_w_nl("compacting:");			
+//			hash.Sort();
+//			int len = hash.Count();
+//			List_adp deleted = List_adp_.new_();
+//			int deleted_size = 0, deleted_count = 0;
+//			for (int i = 0; i < len; i++) {
+//				Gfo_cache_data itm = (Gfo_cache_data)hash.Get_at(i);
+//				int new_deleted_size = deleted_size + 1;//itm.Size();
+//				if (new_deleted_size > 4000 && deleted_count > 0) break;
+//				deleted.Add(itm);
+//				deleted_count++;
+//				deleted_size = new_deleted_size;
+//			}
+//			len = deleted.Count();
+//			for (int i = 0; i < len; i++) {
+//				Gfo_cache_data itm = (Gfo_cache_data)deleted.Get_at(i);
+//				cur_size --;
+//				hash.Del(bry_ref.Val_(itm.Key()));
+//				itm.Rls();
+//			}
+//			deleted.Clear();
+
+		int len = hash.Count();
+		for (int i = 0; i < len; i++) {
+			Gfo_cache_data itm = (Gfo_cache_data)hash.Get_at(i);
+//				hash.Del(bry_ref.Val_(itm.Key()));
+			itm.Rls();
+		}
+	}
+}
+class Gfo_cache_data implements gplx.CompareAble, RlsAble {
+	public Gfo_cache_data(byte[] key, RlsAble val, int size) {this.key = key; this.val = val; this.size = size; this.timestamp = Env_.TickCount();}
+	public byte[] Key() {return key;} private byte[] key;
+	public RlsAble Val() {return val;} private RlsAble val;
+	public int Size() {return size;} private int size;
+	public void Replace(RlsAble val, int size) {this.val = val; this.size = size;}
+	public long Timestamp() {return timestamp;} public void Timestamp_update() {timestamp = Env_.TickCount();} private long timestamp;
+	public int compareTo(Object obj) {
+		Gfo_cache_data comp = (Gfo_cache_data)obj;
+		return Long_.Compare(timestamp, comp.timestamp);
+	}
+	public void Rls() {
+		val.Rls();
+//			val = null;
+//			key = null;
+	}
+}

400_xowa/src/gplx/core/caches/Gfo_cache_mgr_base.java

@@ -0,0 +1,48 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.caches; import gplx.*; import gplx.core.*;
+public class Gfo_cache_mgr_base {
+	private Ordered_hash hash = Ordered_hash_.new_bry_();
+	public int Compress_max() {return compress_max;} public void Compress_max_(int v) {compress_max = v;} private int compress_max = 16;
+	public int Compress_to() {return compress_to;} public void Compress_to_(int v) {compress_to = v;} private int compress_to = 8;
+	protected Object Base_get_or_null(byte[] key) {
+		Object rv_obj = hash.Get_by(key);
+		return rv_obj == null ? null : ((Gfo_cache_itm)rv_obj).Val();
+	}
+	protected void Base_add(byte[] key, Object val) {
+		if (hash.Count() >= compress_max) Compress(); 
+		Gfo_cache_itm itm = new Gfo_cache_itm(key, val); 
+		hash.Add(key, itm);
+	}
+	protected void Base_del(byte[] key) {
+		hash.Del(key);
+	}
+	public void Compress() {
+		hash.Sort_by(Gfo_cache_itm_comparer.Touched_asc);
+		int del_len = hash.Count() - compress_to;
+		List_adp del_list = List_adp_.new_();
+		for (int i = 0; i < del_len; i++) {
+			Gfo_cache_itm itm = (Gfo_cache_itm)hash.Get_at(i);
+			del_list.Add(itm);
+		}
+		for (int i = 0; i < del_len; i++) {
+			Gfo_cache_itm itm = (Gfo_cache_itm)del_list.Get_at(i);
+			hash.Del(itm.Key());
+		}
+	}
+}

400_xowa/src/gplx/core/caches/Gfo_cache_mgr_bry.java

@@ -0,0 +1,53 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.caches; import gplx.*; import gplx.core.*;
+import gplx.core.primitives.*;
+public class Gfo_cache_mgr_bry extends Gfo_cache_mgr_base {
+	public Object Get_or_null(byte[] key) {return Base_get_or_null(key);}
+	public void Add(byte[] key, Object val) {Base_add(key, val);}
+	public void Del(byte[] key) {Base_del(key);}
+}
+class Gfo_cache_itm {
+	public Gfo_cache_itm(Object key, Object val) {this.key = key; this.val = val; this.Touched_update();}
+	public Object Key() {return key;} private Object key;
+	public Object Val() {return val;} private Object val;
+	public long Touched() {return touched;} private long touched;
+	public Gfo_cache_itm Touched_update() {touched = Env_.TickCount(); return this;}
+}
+class Gfo_cache_itm_comparer implements gplx.lists.ComparerAble {
+	public int compare(Object lhsObj, Object rhsObj) {
+		Gfo_cache_itm lhs = (Gfo_cache_itm)lhsObj;
+		Gfo_cache_itm rhs = (Gfo_cache_itm)rhsObj;
+		return Long_.Compare(lhs.Touched(), rhs.Touched());
+	}
+	public static final Gfo_cache_itm_comparer Touched_asc = new Gfo_cache_itm_comparer(); 
+}
+class Io_url_exists_mgr {
+	private gplx.core.caches.Gfo_cache_mgr_bry cache_mgr = new gplx.core.caches.Gfo_cache_mgr_bry();
+	public Io_url_exists_mgr() {
+		cache_mgr.Compress_max_(Int_.Max_value);
+	}
+	public boolean Has(Io_url url) {
+		byte[] url_key = url.RawBry();
+		Object rv_obj = cache_mgr.Get_or_null(url_key);
+		if (rv_obj != null) return ((Bool_obj_ref)rv_obj).Val(); // cached val exists; use it
+		boolean exists = Io_mgr.I.ExistsFil(url);
+		cache_mgr.Add(url_key, Bool_obj_ref.new_(exists));
+		return exists;
+	}
+}

400_xowa/src/gplx/core/consoles/App_cmd_arg.java

@@ -0,0 +1,113 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.consoles; import gplx.*; import gplx.core.*;
+public class App_cmd_arg {
+	App_cmd_arg(byte tid, byte val_tid, String key, boolean reqd) {this.tid = tid; this.val_tid = val_tid; this.key = key; this.reqd = reqd;}
+	public byte Tid() {return tid;} private byte tid;
+	public byte Val_tid() {return val_tid;} public App_cmd_arg Val_tid_(byte v) {val_tid = v; return this;} private byte val_tid;
+	public String Val_tid_str() {
+		switch (val_tid) {
+			case Val_tid_string:		return "string";
+			case Val_tid_yn:			return "yes_no";
+			case Val_tid_url:			return "path";
+			default:					return "unknown";
+		}
+	}
+	public String Key() {return key;} private String key;
+	public boolean Reqd() {return reqd;} private boolean reqd;
+	public String Reqd_str() {return reqd ? "required" : "optional";}
+	public boolean Dirty() {return dirty;} public App_cmd_arg Dirty_(boolean v) {this.dirty = v; return this;} private boolean dirty;
+	public String Note() {return note;} public App_cmd_arg Note_(String v) {note = v; return this;} private String note;
+	public String Example() {return example;}
+	public App_cmd_arg Example_(String v) {example = v; return this;} private String example;
+	public App_cmd_arg Example_url_(String v) {
+		Example_(v);
+		val_tid = Val_tid_url;
+		return this;
+	}
+	public App_cmd_arg Example_list_str_(String v) {
+		example = String_.Concat_with_obj(" ", v);
+		val_tid = Val_tid_list_string;
+		return this;
+	}
+	public Object Val() {return val;} public App_cmd_arg Val_(Object v) {this.val = v; return this;} Object val;
+	public Object Dflt() {return dflt;} public App_cmd_arg Dflt_(Object v) {dflt = v; return this;} Object dflt;
+	public boolean Val_as_bool() {return Bool_.cast(val);}
+	public String Val_as_str_or(String or) {return val == null ? or : (String)val;}
+	public String Val_as_str() {return (String)val;}
+	public int Val_as_int_or(int or) {return val == null ? or : Int_.parse_or((String)val, or);}
+	public Io_url Val_as_url_rel_dir_or(Io_url owner_dir, Io_url or) {return Val_as_url_rel_url_or(owner_dir, or, true);}
+	public Io_url Val_as_url_rel_fil_or(Io_url owner_dir, Io_url or) {return Val_as_url_rel_url_or(owner_dir, or, false);}
+	public Io_url Val_as_url_rel_url_or(Io_url owner_dir, Io_url or, boolean dir) {return Val_as_url_rel_url_or(Val_as_str(), owner_dir, or, dir);}
+	public boolean Parse(App_cmd_mgr mgr, String[] s_ary) {
+		dirty = true;			
+		String s = s_ary.length == 0 ? "" : s_ary[0];
+		switch (val_tid) {
+			case Val_tid_string:
+				val = s;
+				break;
+			case Val_tid_url:	// NOTE: do not parse urls as it can either be absolute (C:\dir\fil.txt) or relative (fil.txt). relative cannot be parsed without knowing owner dir
+				val = s;
+				break;
+			case Val_tid_yn:
+				int v_int = Yn.parse_as_int(s);
+				if (v_int == Bool_.__int) {return mgr.Errs_add(Err_parse_yn, "value must be either y or n: ~{0}", s);}
+				val = v_int == Bool_.Y_int;
+				break;
+		}
+		return true;
+	}	public static final String Err_parse_yn = "parse_yn";
+	public App_cmd_arg Clone() {
+		App_cmd_arg rv = new App_cmd_arg(tid, val_tid, key, reqd);
+		rv.val = val;
+		rv.dflt = dflt;
+		rv.note = note;
+		rv.example = example;
+		return rv;
+	}
+	public static App_cmd_arg req_(String key) {return new App_cmd_arg(Tid_general, Val_tid_string, key, true);}
+	public static App_cmd_arg opt_(String key) {return new App_cmd_arg(Tid_general, Val_tid_string, key, false);}
+	public static App_cmd_arg new_(String key, boolean reqd) {return new App_cmd_arg(Tid_general, Val_tid_string, key, reqd);}
+	public static App_cmd_arg sys_help_() {return sys_help_("help");}
+	public static App_cmd_arg sys_help_(String key) {return new App_cmd_arg(Tid_help, Val_tid_string, key, false);}
+	public static App_cmd_arg sys_header_(String key) {return new App_cmd_arg(Tid_header, Val_tid_yn, key, false);}
+	public static App_cmd_arg sys_args_(String key) {return new App_cmd_arg(Tid_args, Val_tid_yn, key, false);}
+	public static final byte Tid_general = 0, Tid_help = 1, Tid_header = 2, Tid_args = 3;
+	public static final byte Val_tid_string = 0, Val_tid_yn = 1, Val_tid_url = 2, Val_tid_list_string = 3;
+
+	public static Io_url Val_as_url_rel_url_or(String val_str, Io_url owner_dir, Io_url or, boolean dir) {
+		if (val_str == null) return or;
+		byte val_has_dir = Op_sys.Tid_nil;	// if val_str is dir, use it literally (only checking for closing dir_spr); if it's just a name, assume a simple relative path
+		if		(String_.Has(val_str, Op_sys.Lnx.Fsys_dir_spr_str()))
+			val_has_dir = Op_sys.Tid_lnx;
+		else if (String_.Has(val_str, Op_sys.Wnt.Fsys_dir_spr_str()))
+			val_has_dir = Op_sys.Tid_wnt;
+		if (val_has_dir != Op_sys.Tid_nil) {
+			if (dir) {	// NOTE: need to do extra logic to guarantee trailing "/"; JAVA:7 apparently strips "/dir/" to "/dir" when passed in as argument; DATE:2013-03-20
+				String val_dir_spr = val_has_dir == Op_sys.Tid_lnx ? Op_sys.Lnx.Fsys_dir_spr_str() : Op_sys.Wnt.Fsys_dir_spr_str();
+				if (!String_.Has_at_end(val_str, val_dir_spr))
+					val_str += val_dir_spr;
+				return Io_url_.new_dir_(val_str);
+			}
+			else
+				return Io_url_.new_fil_(val_str); 
+		}
+		else
+			return dir ? owner_dir.GenSubDir(val_str) : owner_dir.GenSubFil(val_str); 
+	}
+}

400_xowa/src/gplx/core/consoles/App_cmd_mgr.java

@@ -0,0 +1,162 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.consoles; import gplx.*; import gplx.core.*;
+import gplx.core.strings.*;
+public class App_cmd_mgr {
+	private Ordered_hash expd_args = Ordered_hash_.new_(), actl_args = Ordered_hash_.new_(); 
+	private List_adp tmp_vals = List_adp_.new_(); private String[] orig_ary;
+	public App_cmd_mgr Msg_root_(Gfo_msg_root v) {msg_root = v; return this;} private Gfo_msg_root msg_root = Gfo_msg_root._;
+	public String Arg_prefix() {return arg_prefix;} public App_cmd_mgr Arg_prefix_(String v) {arg_prefix = v; prefix_len = String_.Len(v); return this;} private String arg_prefix = "--"; int prefix_len = 2;
+	public void Clear() {expd_args.Clear(); actl_args.Clear(); errs.Clear(); key_help = key_header = null;}
+	public int Actl_len() {return actl_args.Count();}
+	public App_cmd_arg[] Actl_ary() {return (App_cmd_arg[])actl_args.To_ary(App_cmd_arg.class);}
+	public App_cmd_mgr Expd_add_many(App_cmd_arg... ary) {for (App_cmd_arg o : ary) Expd_add(o); return this;}
+	public App_cmd_mgr Expd_add(App_cmd_arg prm) {
+		expd_args.Add(prm.Key(), prm);
+		switch (prm.Tid()) {
+			case App_cmd_arg.Tid_help: 		key_help = prm.Key(); break;
+			case App_cmd_arg.Tid_header: 	key_header = prm.Key(); break;
+			case App_cmd_arg.Tid_args: 		key_args = prm.Key(); break;
+		}
+		return this;
+	}	String key_help, key_header, key_args;
+	public boolean Args_process(String[] ary) {Args_parse(ary); return errs.Count() == 0;}
+	private void Args_parse(String[] ary) {
+		this.orig_ary = ary;
+		App_cmd_arg arg = null;			
+		int ary_len = ary.length;
+		actl_args = Expd_copy();
+		errs.Clear(); tmp_vals.Clear();
+		for (int i = 0; i < ary_len; i++) {
+			String itm = ary[i];
+			if (String_.Has_at_bgn(itm, arg_prefix)) {	// key
+				if (arg != null) {
+					String[] tmp_ary = tmp_vals.To_str_ary();
+					if (!arg.Parse(this, tmp_ary)) {continue;}
+					tmp_vals.Clear();
+				}
+				String key = String_.Mid(itm, prefix_len);
+				Object o = actl_args.Get_by(key);			
+				if (o == null) {Errs_add(Err_argument_is_unknown, "unknown argument: '~{0}'", key); continue;} 
+				arg = (App_cmd_arg)o;
+				if (arg.Dirty()) {Errs_add(Err_argument_is_duplicate, "duplicate argument: '~{0}'", key); continue;}
+				arg.Dirty_(true);
+			}
+			else {
+				if (arg == null) {Errs_add(Err_argument_is_invalid_key, "argument key must be prefixed with '~{0}'; EX: '~{0}~{1}'", arg_prefix, itm); continue;}	// should only happen if 1st itm is not "--%"
+//					if (arg.Val() != null) return Errs_add("argument_is_already_valued", "argument can only take one value: '{0}'", itm);
+				tmp_vals.Add(itm);
+			}
+		}
+		if (arg != null) {
+			String[] tmp_ary = tmp_vals.To_str_ary();
+			arg.Parse(this, tmp_ary);
+			tmp_vals.Clear();
+		}
+		int len = actl_args.Count();
+		for (int i = 0; i < len; i++) {
+			arg = (App_cmd_arg)actl_args.Get_at(i);
+			if (arg.Reqd() && !arg.Dirty()) {Errs_add(Err_argument_is_required, "argument is required: '~{0}'", arg.Key()); continue;}
+			if (!arg.Dirty() && arg.Dflt() != null) arg.Val_(arg.Dflt());
+		}
+	}	public static final String Err_argument_is_duplicate = "argument_is_duplicate", Err_argument_is_required = "argument_is_required", Err_argument_is_unknown = "argument_is_unknown", Err_argument_is_invalid_key = "argument_is_invalid_key";
+	public String Fmt_hdr() {return fmt_hdr;} public App_cmd_mgr Fmt_hdr_(String v) {fmt_hdr = v; return this;} private String fmt_hdr = "";
+	public App_cmd_arg Args_get(String key) {return (App_cmd_arg)actl_args.Get_by(key);}
+	public boolean Args_has_help() {
+		App_cmd_arg arg = (App_cmd_arg)actl_args.Get_by(key_help);
+		return arg != null && arg.Dirty();
+	}
+	public App_cmd_mgr Print_header(Gfo_usr_dlg usr_dlg) {
+		App_cmd_arg arg_hdr = (App_cmd_arg)actl_args.Get_by(key_header);
+		if (arg_hdr == null) return this;				// no key_header specified; assume header shouldn't be printed
+		if (!arg_hdr.Val_as_bool()) return this;		// key_header specified as false; return;
+		usr_dlg.Note_gui_none(GRP_KEY, "print.header", fmt_hdr);
+		return this;
+	}
+	public void Print_args(Gfo_usr_dlg usr_dlg) {
+		sb.Add_char_crlf();
+		sb.Add_str_w_crlf("arguments:");
+		int len = orig_ary.length;
+		if (len == 0) {
+			sb.Add_fmt_line("  **** NONE ****");
+			sb.Add_fmt_line("  use --help to show help");
+		}
+		else {
+			for (int i = 0; i < len; i++)
+				sb.Add_fmt_line("  [{0}] = '{1}'", i, orig_ary[i]);			
+		}
+		usr_dlg.Note_none(GRP_KEY, "print.args", sb.Xto_str_and_clear());
+	}	String_bldr sb = String_bldr_.new_();
+	public void Print_fail(Gfo_usr_dlg usr_dlg) {
+		sb.Add("** error: ").Add_char_crlf();
+		int len = errs.Count();
+		for (int i = 0; i < len; i++) {
+			Gfo_msg_data data = (Gfo_msg_data)errs.Get_at(i);
+			sb.Add_fmt_line("  " + data.Gen_str_ary());
+		}
+		sb.Add_char_crlf();
+		sb.Add_str_w_crlf(String_.Repeat("-", 80));
+		usr_dlg.Note_none(GRP_KEY, "print.fail", sb.Xto_str_and_clear());
+	}
+	public void Print_help(Gfo_usr_dlg usr_dlg, String app_name) {
+		sb.Add_str_w_crlf("example:");
+		sb.Add_fmt("  java -jar {0}.jar", app_name);
+		int key_max = 0, tid_max = 0;
+		int len = expd_args.Count();
+		for (int i = 0; i < len; i++) {
+			App_cmd_arg arg = (App_cmd_arg)expd_args.Get_at(i);
+			if (arg.Tid() != App_cmd_arg.Tid_general) continue; // skip header, help
+			sb.Add(" ").Add(arg_prefix).Add(arg.Key()).Add(" ").Add(arg.Example());
+			int key_len = String_.Len(arg.Key()); if (key_len > key_max) key_max = key_len;
+			int tid_len = String_.Len(String_.Format("[{0}:{1}]", arg.Reqd_str(), arg.Val_tid_str())); if (tid_len > tid_max) tid_max = tid_len;
+		}	sb.Add_char_crlf();
+		sb.Add_char_crlf();
+		sb.Add_str_w_crlf("detail:");
+		for (int i = 0; i < len; i++) {
+			App_cmd_arg arg = (App_cmd_arg)expd_args.Get_at(i);
+//				if (arg.Tid() != App_cmd_arg.Tid_general) continue; // skip header, help
+			sb.Add("  ").Add(arg_prefix).Add(String_.PadEnd(arg.Key(), key_max + 1, " ")).Add(String_.PadEnd(String_.Format("[{0}:{1}]", arg.Reqd_str(), arg.Val_tid_str()), tid_max, " "));
+			if (arg.Dflt() != null)
+				sb.Add_fmt(" default={0}", arg.Dflt());
+			sb.Add_char_crlf();
+			if (arg.Note() != null)
+				sb.Add("    ").Add(arg.Note()).Add_char_crlf();
+//				for (int j = 0; j < arg.Itms().Count(); j++) {
+//					App_arg_info expdInf = (App_arg_info)arg.Itms().Get_at(j);
+//					sb.Add("    ").Add(String_.PadEnd(expdInf.Key(), key_max + 1, " ")).Add_str_w_crlf(expdInf.Descrip());
+//				}
+		}
+		usr_dlg.Note_gui_none(GRP_KEY, "print.info", sb.Xto_str_and_clear());
+	}
+	private Ordered_hash Expd_copy() {
+		Ordered_hash rv = Ordered_hash_.new_();
+		int expd_len = expd_args.Count();
+		for (int i = 0 ; i < expd_len; i++) {
+			App_cmd_arg arg = (App_cmd_arg)expd_args.Get_at(i);
+			rv.Add(arg.Key(), arg.Clone());
+		}
+		return rv;
+	}		
+	public boolean Errs_add(String key, String fmt, Object... vals) {
+		errs.Add(msg_root.Data_new_many(Gfo_msg_itm_.Cmd_warn, GRP_KEY, key, fmt, vals));
+		return false;
+	}
+	public int			Errs_len()		{return errs.Count();} private List_adp errs = List_adp_.new_();
+	public Gfo_msg_data Errs_get(int i) {return (Gfo_msg_data)errs.Get_at(i);}
+	private static final String GRP_KEY = "gplx.app.app_cmd_mgr";
+}

400_xowa/src/gplx/core/consoles/App_cmd_mgr_tst.java

@@ -0,0 +1,142 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.consoles; import gplx.*; import gplx.core.*;
+import org.junit.*; import gplx.core.tests.*;
+public class App_cmd_mgr_tst {
+	App_cmd_mgr_fxt fxt = new App_cmd_mgr_fxt();
+	@Before public void init() {fxt.Clear();}
+	@Test  public void Basic() {
+		fxt	.Expd_(fxt.arg_("a"), fxt.arg_("b"))
+			.Args_process("--a", "0", "--b", "1")
+			.Tst_errs_none()
+			.Tst_actl(fxt.chkr_("a", "0"), fxt.chkr_("b", "1"));
+		;
+	}
+	@Test  public void Dflt() {
+		fxt	.Expd_(fxt.arg_("a").Val_tid_(App_cmd_arg.Val_tid_yn).Dflt_(true));
+		fxt .Args_process("--a", "n").Tst_actl(fxt.chkr_("a", false));	// if val, use it
+		fxt .Args_process().Tst_actl(fxt.chkr_("a", true));				// if no val, use default
+	}
+	@Test  public void Header_y() {
+		fxt.Expd_(App_cmd_arg.sys_header_("print_license")).Args_process("--print_license", "y");
+		fxt.Mgr().Fmt_hdr_("test_hdr").Print_header(fxt.Usr_dlg());
+		fxt.tst_write("test_hdr");
+		fxt.Clear();
+	}
+	@Test  public void Header_n() {
+		fxt.Expd_(App_cmd_arg.sys_header_("print_license")).Args_process("--print_license", "n");
+		fxt.Mgr().Fmt_hdr_("test_hdr").Print_header(fxt.Usr_dlg());
+		fxt.tst_write();
+	}
+//		@Test  public void Help_y() {
+//			fxt.Expd_(App_cmd_arg.sys_header_("help")).Args_process("--help");
+////			fxt.Mgr().Fmt_help_grp("bgn ~{args} end").Fmt_help_itm_("~{0} ~{1}").Print_header(fxt.Status_mgr());
+////			fxt.Tst_write("test_hdr");
+//			fxt.Clear();
+//		}
+	@Test  public void Err_parse_yn() {
+		fxt	.Expd_(fxt.arg_("a").Val_tid_(App_cmd_arg.Val_tid_yn))
+			.Args_process("--a", "x")
+			.Tst_errs(App_cmd_arg.Err_parse_yn);
+		;
+	}
+	@Test  public void Err_reqd() {
+		fxt	.Expd_(fxt.arg_("a", true), fxt.arg_("b", false))
+			.Args_process("--b", "1")
+			.Tst_errs(App_cmd_mgr.Err_argument_is_required);
+		;
+	}
+	@Test  public void Err_dupe() {
+		fxt	.Expd_(fxt.arg_("a"))
+			.Args_process("--a", "0", "--a", "0")
+			.Tst_errs(App_cmd_mgr.Err_argument_is_duplicate);
+		;
+	}
+	@Test  public void Err_unknown() {
+		fxt	.Expd_(fxt.arg_("a"))
+			.Args_process("--b")
+			.Tst_errs(App_cmd_mgr.Err_argument_is_unknown);
+		;
+	}
+	@Test  public void Err_key_invalid() {
+		fxt	.Expd_(fxt.arg_("a"))
+			.Args_process("a")
+			.Tst_errs(App_cmd_mgr.Err_argument_is_invalid_key);
+		;
+	}
+	@Test  public void Val_as_url_rel_dir_or() {	// PURPOSE: "/xowa" -> "/xowa/"
+		String root_dir = Op_sys.Cur().Tid_is_wnt() ? "C:\\" : "/", dir_spr = Op_sys.Cur().Fsys_dir_spr_str();
+		Tst_val_as_url_rel_dir_or(root_dir, dir_spr, root_dir + "sub"			, root_dir + "sub" + dir_spr);						// /sub   -> /sub/
+		Tst_val_as_url_rel_dir_or(root_dir, dir_spr, root_dir + "sub" + dir_spr	, root_dir + "sub" + dir_spr);						// /sub/  -> /sub/
+		Tst_val_as_url_rel_dir_or(root_dir, dir_spr, "sub"						, root_dir + "dir" + dir_spr + "sub" + dir_spr);	// sub    -> /dir/sub/
+	}
+	private void Tst_val_as_url_rel_dir_or(String root_dir, String dir_spr, String val, String expd) {
+		Io_url actl = fxt.arg_("key").Val_(val).Val_as_url_rel_dir_or(Io_url_.new_dir_(root_dir).GenSubDir("dir"), null);
+		Tfds.Eq(expd, actl.Raw());
+	}
+}
+class App_cmd_mgr_fxt {
+	public Gfo_usr_dlg Usr_dlg() {return usr_dlg;} Gfo_usr_dlg usr_dlg;
+	public App_cmd_mgr Mgr() {return mgr;} App_cmd_mgr mgr = new App_cmd_mgr(); Tst_mgr tst_mgr = new Tst_mgr();
+	public App_cmd_mgr_fxt Clear() {
+		if (usr_dlg == null) {
+			usr_dlg = Gfo_usr_dlg_.Test();
+		}
+		mgr.Clear();
+		usr_dlg.Gui_wkr().Clear();
+		return this;
+	}
+	public App_cmd_arg arg_(String key) {return arg_(key, false);}
+	public App_cmd_arg arg_(String key, boolean reqd) {return App_cmd_arg.new_(key, reqd);}
+	public App_cmd_arg_chkr chkr_(String key, Object val) {return new App_cmd_arg_chkr(key, val);}
+	public App_cmd_mgr_fxt Expd_(App_cmd_arg... v) {mgr.Expd_add_many(v); return this;}
+	public App_cmd_mgr_fxt Args_process(String... v) {mgr.Args_process(v); return this;}
+	public App_cmd_mgr_fxt Tst_actl_len(int v) {Tfds.Eq(v, mgr.Actl_len()); return this;}
+	public App_cmd_mgr_fxt Tst_actl(App_cmd_arg_chkr... expd) {
+		App_cmd_arg[] actl = mgr.Actl_ary();
+		tst_mgr.Tst_ary("", expd, actl);
+		return this;
+	}
+	public App_cmd_mgr_fxt Tst_errs_none() {return Tst_errs(String_.Ary_empty);}
+	public App_cmd_mgr_fxt Tst_errs(String... expd) {
+		int len = mgr.Errs_len();
+		String[] actl = new String[len];
+		for (int i = 0; i < len; i++) {
+			Gfo_msg_data data = mgr.Errs_get(i);
+			actl[i] = data.Item().Key_str();
+		}
+		Tfds.Eq_ary_str(expd, actl);
+		return this;
+	}
+	public App_cmd_mgr_fxt tst_write(String... expd) {
+		String[] actl = ((Gfo_usr_dlg__gui_test)usr_dlg.Gui_wkr()).Xto_str_ary();
+		Tfds.Eq_ary_str(expd, actl);
+		return this;
+	}
+}
+class App_cmd_arg_chkr implements Tst_chkr {
+	public App_cmd_arg_chkr(String key, Object val) {this.key = key; this.val = val;} private String key; Object val;
+	public Class<?> TypeOf() {return App_cmd_arg.class;}
+	public int Chk(Tst_mgr mgr, String path, Object actl_obj) {
+		App_cmd_arg actl = (App_cmd_arg)actl_obj;
+		int err = 0;
+		err += mgr.Tst_val(false, path, "key", key, actl.Key());
+		err += mgr.Tst_val(false, path, "val", val, actl.Val());
+		return err;
+	}
+}

400_xowa/src/gplx/core/flds/Gfo_fld_rdr.java

@@ -54,7 +54,7 @@ public class Gfo_fld_rdr extends Gfo_fld_base {
 		f += (data[fld_bgn + 16] - Byte_ascii.Num_0) *  100;
 		f += (data[fld_bgn + 17] - Byte_ascii.Num_0) *   10;
 		f += (data[fld_bgn + 18] - Byte_ascii.Num_0);
-		if (data[fld_bgn + 19] != fld_dlm) throw Err_.new_wo_type("csv date is invalid", "txt", String_.new_u8_by_len(data, fld_bgn, 20));
+		if (data[fld_bgn + 19] != fld_dlm) throw Err_.new_wo_type("csv date is invalid", "txt", String_.new_u8__by_len(data, fld_bgn, 20));
 		fld_end = pos + 20;
 		pos = fld_end + 1; ++fld_idx;
 		return DateAdp_.new_(y, M, d, H, m, s, f);

400_xowa/src/gplx/core/html/parsers/Gfo_html_parser.java

@@ -1,69 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.html.parsers; import gplx.*; import gplx.core.*; import gplx.core.html.*;
-import gplx.core.btries.*; import gplx.core.primitives.*;
-import gplx.xowa.*;
-import gplx.xowa.parsers.xndes.*;
-class Gfo_html_parser {
-	private final Gfo_msg_log msg_log = Gfo_msg_log.Test();
-	private final Xop_xatr_parser xatr_parser = new Xop_xatr_parser();
-	public void Parse(Gfo_html_wkr handler, byte[] src, int bgn, int end) {
-//			int src_len = src.length;
-//			int prv_pos = 0; 
-//			int css_find_bgn_len = Css_find_bgn.length;
-//			byte[] protocol_prefix_bry = Bry_.new_u8(protocol_prefix);
-//			while (true) {
-//				int url_bgn = Bry_finder.Find_fwd(src, Css_find_bgn, prv_pos);	 				if (url_bgn == Bry_.NotFound) break;	// nothing left; stop
-//				url_bgn += css_find_bgn_len;
-//				int url_end = Bry_finder.Find_fwd(src, Byte_ascii.Quote, url_bgn, src_len); 	if (url_end == Bry_.NotFound) {usr_dlg.Warn_many("", "main_page.css_parse", "could not find css; pos='~{0}' text='~{1}'", url_bgn, String_.new_u8_by_len(src, url_bgn, url_bgn + 32)); break;}
-//				byte[] css_url_bry = Bry_.Mid(src, url_bgn, url_end);
-//				css_url_bry = Bry_.Replace(css_url_bry, Css_amp_find, Css_amp_repl);		// &amp; -> &
-//				css_url_bry = url_encoder.Decode(css_url_bry);								// %2C ->		%7C -> |
-//				css_url_bry = Bry_.Add(protocol_prefix_bry, css_url_bry);
-//				rv.Add(String_.new_u8(css_url_bry));
-//				prv_pos = url_end;
-//			}
-//			return rv.XtoStrAry();
-		int src_len = src.length; int pos = 0;
-		while (pos < src_len) {
-			byte b = src[pos];
-			switch (b) {
-				case Byte_ascii.Angle_bgn:
-					pos = Parse_node(handler, src, end, pos, pos + 1);
-					break;
-				default:
-					++pos;
-					break;
-			}
-		}
-	}
-	private int Parse_node(Gfo_html_wkr handler, byte[] src, int end, int tkn_bgn, int tkn_end) {
-		int name_bgn = tkn_end;
-		int name_end = Bry_finder.Find_fwd_until_ws(src, name_bgn, end);
-		if (name_end == Bry_finder.Not_found) return end;	// EOS; EX: "<abcEOS"
-		if (name_bgn == name_end) return tkn_end;			// ws; EX: "< "
-		Object o = handler.Get_or_null(src, name_bgn, name_end);
-		if (o == null) return name_end;						// unknown name: EX: "<unknown >"
-		int node_end = Bry_finder.Find_fwd(src, Byte_ascii.Angle_end, name_end, end);
-		if (node_end == Bry_finder.Not_found) return end;	// EOS; EX: "<name lots_of_text_but_no_gt EOS"
-		Xop_xatr_itm[] xatr_ary = xatr_parser.Parse(msg_log, src, name_end, node_end);
-		Gfo_html_tkn tkn = (Gfo_html_tkn)o;
-		tkn.Process(src, Xop_xatr_hash.new_ary(src, xatr_ary));
-		return node_end;
-	}
-}

400_xowa/src/gplx/core/intls/Gfo_app.java

@@ -15,8 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.html.parsers; import gplx.*; import gplx.core.*; import gplx.core.html.*;
-interface Gfo_html_wkr {
-	Gfo_html_tkn Get_or_null(byte[] src, int bgn, int end);
-	void Process(Gfo_html_node node);
+package gplx.core.intls; import gplx.*; import gplx.core.*;
+public class Gfo_app {
+	public Gfo_i18n_mgr I18n_mgr() {return i18n_mgr;} private Gfo_i18n_mgr i18n_mgr = new Gfo_i18n_mgr();
 }

400_xowa/src/gplx/core/intls/Gfo_i18n_itm.java

@@ -0,0 +1,42 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.intls; import gplx.*; import gplx.core.*;
+class Gfo_i18n_itm {
+	public Gfo_i18n_itm(int src, byte[] key, byte[] val, boolean val_fmt_exists, Gfo_i18n_val_cmd val_cmd) {
+		this.src = src; this.key = key; this.val = val; this.val_fmt_exists = val_fmt_exists; this.val_cmd = val_cmd;
+	}
+	public int Src() {return src;} private final int src;
+	public byte[] Key() {return key;} private final byte[] key;
+	public byte[] Val() {return val;} private final byte[] val;
+	public boolean Val_fmt_exists() {return val_fmt_exists;} private final boolean val_fmt_exists;
+	public Gfo_i18n_val_cmd Val_cmd() {return val_cmd;} private final Gfo_i18n_val_cmd val_cmd;
+	public byte[] Bld_none() {
+		return val_cmd == null ? val : val_cmd.Process(src, key, val);
+	}
+	public byte[] Bld_many(Object... args) {
+		byte[] rv = null;
+		synchronized (tmp_fmtr) {
+			tmp_fmtr.Fmt_(val);
+			tmp_fmtr.Bld_bfr_many(tmp_bfr, args);
+			rv = tmp_bfr.Xto_bry_and_clear();
+		}
+		return val_cmd == null ? rv : val_cmd.Process(src, key, rv);
+	}
+	private static final Bry_fmtr tmp_fmtr = Bry_fmtr.new_();
+	private static final Bry_bfr tmp_bfr = Bry_bfr.reset_(255);
+}

400_xowa/src/gplx/core/intls/Gfo_i18n_mgr.java

@@ -0,0 +1,41 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.intls; import gplx.*; import gplx.core.*;
+public class Gfo_i18n_mgr {
+	public String Dflt() {return dflt;} private String dflt = "en";
+	public Gfo_i18n_mgr Add_txt_dflt(String key, String val) {return this;}
+	public Gfo_i18n_mgr Add_txt_one(String key, String lng, String val) {return this;}
+	public Gfo_i18n_mgr Add_txt_many(String key, String... ary) {return this;}
+}
+class Gfo_i18n_lng {
+	private Hash_adp_bry hash = Hash_adp_bry.cs();
+	public Gfo_i18n_lng(String lng) {this.lng = lng;}
+	public String Lng() {return lng;} private final String lng;
+	public void Add(int src, byte[] key, byte[] val, boolean val_fmt_exists, Gfo_i18n_val_cmd val_cmd) {
+		Gfo_i18n_itm itm = new Gfo_i18n_itm(src, key, val, val_fmt_exists, val_cmd);
+		hash.Add_bry_obj(key, itm);
+	}
+	public byte[] Bld_to_bry_none(byte[] key) {
+		Gfo_i18n_itm itm = (Gfo_i18n_itm)hash.Get_by_bry(key);
+		return itm.Bld_none();
+	}
+	public byte[] Bld_to_bry_many(byte[] key, Object... args) {
+		Gfo_i18n_itm itm = (Gfo_i18n_itm)hash.Get_by_bry(key);
+		return itm.Bld_many(args);
+	}
+}

400_xowa/src/gplx/core/intls/Gfo_i18n_val_cmd.java

@@ -15,10 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.html.parsers; import gplx.*; import gplx.core.*; import gplx.core.html.*;
-class Gfo_html_node {
-	public Gfo_html_node(byte[] src, int bgn, int end) {this.src = src; this.bgn = bgn; this.end = end;}
-	public byte[] Src() {return src;} private final byte[] src;
-	public int Bgn() {return bgn;} private final int bgn;
-	public int End() {return end;} private final int end;
+package gplx.core.intls; import gplx.*; import gplx.core.*;
+interface Gfo_i18n_val_cmd {
+	byte[] Process(int src, byte[] key, byte[] val);
 }

400_xowa/src/gplx/core/intls/String_surrogate_utl.java

@@ -0,0 +1,36 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.intls; import gplx.*; import gplx.core.*;
+public class String_surrogate_utl {
+	public int Byte_pos() {return byte_pos;} int byte_pos;
+	public int Count_surrogates__char_idx(byte[] src, int src_len, int byte_bgn, int char_idx)				{return Count_surrogates(src, src_len, byte_bgn, Bool_.Y, char_idx);}	
+	public int Count_surrogates__codepoint_idx1(byte[] src, int src_len, int byte_bgn, int codepoint_idx)	{return Count_surrogates(src, src_len, byte_bgn, Bool_.N, codepoint_idx);}	
+	private int Count_surrogates(byte[] src, int src_len, int byte_bgn, boolean stop_idx_is_char, int stop_idx) {
+		int char_count = 0, codepoint_count = 0;
+		byte_pos = byte_bgn;
+		while (true) {
+			if (	stop_idx == (stop_idx_is_char ? char_count : codepoint_count)		// requested # of chars found
+				||	byte_pos >= src_len													// eos reached; DATE:2014-09-02
+				) return codepoint_count - char_count;
+			int char_len_in_bytes = gplx.core.intls.Utf8_.Len_of_char_by_1st_byte(src[byte_pos]);
+			++char_count;												// char_count always incremented by 1
+			codepoint_count += (char_len_in_bytes == 4) ? 2 : 1;		// codepoint_count incremented by 2 if surrogate pair; else 1
+			byte_pos += char_len_in_bytes;
+		} 
+	}	
+}

400_xowa/src/gplx/core/intls/String_surrogate_utl_tst.java

@@ -0,0 +1,57 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.intls; import gplx.*; import gplx.core.*;
+import org.junit.*;
+public class String_surrogate_utl_tst {
+	@Before public void init() {fxt.Clear();} private String_surrogate_utl_fxt fxt = new String_surrogate_utl_fxt();
+	@Test   public void Char_idx() {
+		String test_str = "aé𡼾bî𡼾";
+		fxt.Test_count_surrogates__char_idx			(test_str,  0, 1, 0,  1);		// a
+		fxt.Test_count_surrogates__char_idx			(test_str,  0, 2, 0,  3);		// aé
+		fxt.Test_count_surrogates__char_idx			(test_str,  0, 3, 1,  7);		// aé𡼾
+		fxt.Test_count_surrogates__char_idx			(test_str,  7, 1, 0,  8);		// b
+		fxt.Test_count_surrogates__char_idx			(test_str,  7, 2, 0, 10);		// bî
+		fxt.Test_count_surrogates__char_idx			(test_str,  7, 3, 1, 14);		// bî𡼾
+		fxt.Test_count_surrogates__char_idx			(test_str,  0, 6, 2, 14);		// aé𡼾bî𡼾
+		fxt.Test_count_surrogates__char_idx			(test_str, 14, 7, 0, 14);		// PURPOSE: test out of bounds; DATE:2014-09-02
+	}
+	@Test   public void Codepoint_idx() {
+		String test_str = "aé𡼾bî𡼾";
+		fxt.Test_count_surrogates__codepoint_idx	(test_str,  0, 1, 0,  1);		// a
+		fxt.Test_count_surrogates__codepoint_idx	(test_str,  0, 2, 0,  3);		// aé
+		fxt.Test_count_surrogates__codepoint_idx	(test_str,  0, 4, 1,  7);		// aé𡼾
+		fxt.Test_count_surrogates__codepoint_idx	(test_str,  7, 1, 0,  8);		// b
+		fxt.Test_count_surrogates__codepoint_idx	(test_str,  7, 2, 0, 10);		// bî
+		fxt.Test_count_surrogates__codepoint_idx	(test_str,  7, 4, 1, 14);		// bî𡼾
+		fxt.Test_count_surrogates__codepoint_idx	(test_str,  0, 8, 2, 14);		// aé𡼾bî𡼾
+	}
+}
+class String_surrogate_utl_fxt {
+	private String_surrogate_utl codepoint_utl = new String_surrogate_utl();
+	public void Clear() {}
+	public void Test_count_surrogates__char_idx(String src_str, int bgn_byte, int char_idx, int expd_count, int expd_pos) {
+		byte[] src_bry = Bry_.new_u8(src_str); int src_len = src_bry.length;
+		Tfds.Eq(expd_count	, codepoint_utl.Count_surrogates__char_idx(src_bry, src_len, bgn_byte, char_idx));
+		Tfds.Eq(expd_pos	, codepoint_utl.Byte_pos());
+	}
+	public void Test_count_surrogates__codepoint_idx(String src_str, int bgn_byte, int char_idx, int expd_count, int expd_pos) {
+		byte[] src_bry = Bry_.new_u8(src_str); int src_len = src_bry.length;
+		Tfds.Eq(expd_count	, codepoint_utl.Count_surrogates__codepoint_idx1(src_bry, src_len, bgn_byte, char_idx), "count");
+		Tfds.Eq(expd_pos	, codepoint_utl.Byte_pos(), "pos");
+	}
+}

400_xowa/src/gplx/core/json/Json_ary.java

@@ -1,79 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_ary extends Json_itm_base implements Json_grp {
-	public Json_ary(int src_bgn, int src_end) {this.Ctor(src_bgn, src_end);}
-	@Override public byte Tid() {return Json_itm_.Tid__ary;}
-	public void Src_end_(int v) {this.src_end = v;}
-	@Override public Object Data() {return null;}
-	@Override public byte[] Data_bry() {return null;}
-	public int Len() {return subs_len;} private int subs_len = 0, subs_max = 0;
-	public Json_nde Get_at_as_nde(int i) {
-		Json_itm rv = subs[i]; if (rv.Tid() != Json_itm_.Tid__nde) throw Err_.new_("json", "itm is not nde", "type", rv.Tid(), "i", i);
-		return (Json_nde)rv;
-	}
-	public Json_itm Get_at(int i) {return subs[i];}
-	public Json_ary Add_many(Json_itm... ary) {
-		int len = ary.length;
-		for (int i = 0; i < len; i++)
-			Add(ary[i]);
-		return this;
-	}
-	public void Add(Json_itm itm) {
-		int new_len = subs_len + 1;
-		if (new_len > subs_max) {	// ary too small >>> expand
-			subs_max = new_len * 2;
-			Json_itm[] new_subs = new Json_itm[subs_max];
-			Array_.Copy_to(subs, 0, new_subs, 0, subs_len);
-			subs = new_subs;
-		}
-		subs[subs_len] = itm;
-		subs_len = new_len;
-	}
-	@Override public void Print_as_json(Bry_bfr bfr, int depth) {
-		if (subs_len == 0) {	// empty grp; print on one line (rather than printing across 3)
-			bfr.Add_byte(Byte_ascii.Brack_bgn).Add_byte(Byte_ascii.Brack_end);
-			return;
-		}
-		bfr.Add_byte_nl();
-		Json_grp_.Print_indent(bfr, depth);
-		bfr.Add_byte(Byte_ascii.Brack_bgn).Add_byte(Byte_ascii.Space);
-		for (int i = 0; i < subs_len; i++) {
-			if (i != 0) {
-				Json_grp_.Print_nl(bfr); Json_grp_.Print_indent(bfr, depth);
-				bfr.Add_byte(Byte_ascii.Comma).Add_byte(Byte_ascii.Space);
-			}
-			subs[i].Print_as_json(bfr, depth + 1);
-		}
-		Json_grp_.Print_nl(bfr); Json_grp_.Print_indent(bfr, depth);
-		bfr.Add_byte(Byte_ascii.Brack_end).Add_byte_nl();
-	}
-	public byte[][] Xto_bry_ary() {
-		if (subs_len == 0) return Bry_.Ary_empty;
-		byte[][] rv = new byte[subs_len][];
-		for (int i = 0; i < subs_len; ++i)
-			rv[i] = subs[i].Data_bry();
-		return rv;
-	}
-	private Json_itm[] subs = Json_itm_.Ary_empty;
-	public static Json_ary cast_or_null(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid__ary ? null : (Json_ary)v;}
-	public static Json_ary cast(Json_itm v) {
-		if (v == null || v.Tid() != Json_itm_.Tid__ary) throw Err_.new_("json", "itm is not array");
-		return (Json_ary)v;
-	}
-}

400_xowa/src/gplx/core/json/Json_doc.java

@@ -1,73 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_doc {
-	private final byte[][] tmp_qry_bry = new byte[1][];
-	public void Ctor(byte[] src, Json_grp new_root) {
-		this.src = src;
-		this.root_grp = new_root;
-		switch (root_grp.Tid()) {
-			case Json_itm_.Tid__nde:	this.root_ary = null; this.root_nde = (Json_nde)root_grp; break;
-			case Json_itm_.Tid__ary:	this.root_nde = null; this.root_ary = (Json_ary)root_grp; break;
-			default:					throw Err_.new_unhandled(root_grp.Tid());
-		}
-	}
-	public byte[] Src() {return src;} private byte[] src;
-	public Json_grp Root_grp() {return root_grp;} private Json_grp root_grp;
-	public Json_nde Root_nde() {return root_nde;} private Json_nde root_nde;
-	public Json_ary Root_ary() {return root_ary;} private Json_ary root_ary;
-	public Bry_bfr Bfr() {return bfr;} private final Bry_bfr bfr = Bry_bfr.new_();
-	public Number_parser Utl_num_parser() {return utl_num_parser;} private final Number_parser utl_num_parser = new Number_parser();
-	public byte[] Tmp_u8_bry() {return tmp_u8_bry;} private final byte[] tmp_u8_bry = new byte[6];	// tmp bry[] for decoding sequences like \u0008
-	public byte[] Get_val_as_bry_or(byte[]   qry_bry, byte[] or) {tmp_qry_bry[0] = qry_bry; return Get_val_as_bry_or(tmp_qry_bry, or);}
-	public byte[] Get_val_as_bry_or(byte[][] qry_bry, byte[] or) {
-		Json_itm nde = Find_nde(root_nde, qry_bry, qry_bry.length - 1, 0);
-		return nde == null || nde.Tid() != Json_itm_.Tid__str ? or : nde.Data_bry();
-	}
-	public String Get_val_as_str_or(byte[]   qry_bry, String or) {tmp_qry_bry[0] = qry_bry; return Get_val_as_str_or(tmp_qry_bry, or);}
-	public String Get_val_as_str_or(byte[][] qry_bry, String or) {
-		Json_itm nde = Find_nde(root_nde, qry_bry, qry_bry.length - 1, 0);
-		return nde == null || nde.Tid() != Json_itm_.Tid__str ? or : (String)nde.Data();
-	}
-	public Json_grp Get_grp(byte[] qry_bry) {
-		tmp_qry_bry[0] = qry_bry;
-		Json_itm rv = Find_nde(root_nde, tmp_qry_bry, 0, 0); if (rv == null) return null;
-		return (Json_grp)rv;
-	}
-	public Json_grp Get_grp(byte[][] qry_bry) {
-		Json_itm rv = Find_nde(root_nde, qry_bry, qry_bry.length - 1, 0); if (rv == null) return null;
-		return (Json_grp)rv;
-	}
-	public Json_itm Find_nde(byte[] key) {
-		tmp_qry_bry[0] = key;
-		return Find_nde(root_nde, tmp_qry_bry, 0, 0);
-	}
-	private Json_itm Find_nde(Json_nde owner, byte[][] paths, int paths_last, int paths_idx) {
-		byte[] path = paths[paths_idx];
-		int subs_len = owner.Len();
-		for (int i = 0; i < subs_len; i++) {
-			Json_kv itm = Json_kv.cast(owner.Get_at(i)); if (itm == null) continue;	// ignore simple props, arrays, ndes
-			if (!itm.Key_eq(path)) continue;
-			if (paths_idx == paths_last) return itm.Val();
-			Json_nde sub_nde = Json_nde.cast(itm.Val()); if (sub_nde == null) return null;	// match, but has not a nde; exit
-			return Find_nde(sub_nde, paths, paths_last, paths_idx + 1);
-		}
-		return null;
-	}
-	public static String Make_str_by_apos(String... ary) {return String_.Replace(String_.Concat_lines_nl_skip_last(ary), "'", "\"");}
-}

400_xowa/src/gplx/core/json/Json_doc_bldr.java

@@ -1,42 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_doc_bldr {
-	public Json_nde Nde(Json_doc jdoc) {return factory.Nde(jdoc, -1);}
-	public Json_nde Nde(Json_doc jdoc, Json_grp owner) {
-		Json_nde rv = factory.Nde(jdoc, -1);
-		owner.Add(rv);
-		return rv;
-	}
-	public Json_itm Str(byte[] v) {return Str(String_.new_u8(v));}
-	public Json_itm Str(String v) {return Json_itm_tmp.new_str_(v);}
-	public Json_itm Int(int v) {return Json_itm_tmp.new_int_(v);}
-	public Json_kv Kv_int(Json_grp owner, String key, int val)		{Json_kv rv = factory.Kv(Json_itm_tmp.new_str_(key), Json_itm_tmp.new_int_(val)); owner.Add(rv); return rv;}
-	public Json_kv Kv_str(Json_grp owner, String key, String val)	{Json_kv rv = factory.Kv(Json_itm_tmp.new_str_(key), Json_itm_tmp.new_str_(val)); owner.Add(rv); return rv;}
-	public Json_ary Kv_ary(Json_grp owner, String key, Json_itm... subs) {
-		Json_itm key_itm = Json_itm_tmp.new_str_(key);
-		Json_ary val_ary = factory.Ary(-1, -1);			
-		Json_kv kv = factory.Kv(key_itm, val_ary);
-		owner.Add(kv);
-		int len = subs.length;
-		for (int i = 0; i < len; i++)
-			val_ary.Add(subs[i]);
-		return val_ary;
-	}
-	Json_doc doc = new Json_doc(); Json_factory factory = new Json_factory();
-}

400_xowa/src/gplx/core/json/Json_doc_srl.java

@@ -1,89 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-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.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);
-		Write_nde_end();
-		return this;
-	}
-	public void Write_obj(boolean comma, byte[] key, Object val) {
-		Class<?> t = Type_adp_.ClassOf_obj(val);
-		if	(Type_adp_.Is_array(t))
-			Write_kv_ary(comma, key, (Object[])val);
-		else
-			Write_kv_str(comma, key, Object_.Xto_str_strict_or_empty(val));
-	}
-	private void Write_kv_ary(boolean comma, byte[] key, Object[] val) {
-		Write_key(comma, key); Write_new_line();	// '"key":\n'
-		Write_ary_bgn();							// '[\n'
-		Indent_add();								// -->
-		int len = val.length;
-		for (int i = 0; i < len; i++) {
-			Write_itm_hdr(i != 0);					// ', '
-			Write_str(Bry_.new_u8(Object_.Xto_str_strict_or_null(val[i])));
-			Write_new_line();
-		}
-		Indent_del();
-		Write_ary_end();
-	}
-	private void Write_kv_str(boolean comma, byte[] key, String val) {
-		Write_key(comma, key);							// "key":
-		Write_str(Bry_.new_u8(val));					// "val"
-		Write_new_line();								// \n
-	}
-	private void Write_key(boolean comma, byte[] key) {	// "key":
-		Write_indent();
-		Write_str(key);
-		bfr.Add_byte(Byte_ascii.Colon);
-	}
-	private void Write_indent() {if (ws_enabled && indent > 0) bfr.Add_byte_repeat(Byte_ascii.Space, indent);}
-	private void Write_str(byte[] v) {
-		if (v == null)
-			bfr.Add(Object_.Bry__null);
-		else
-			bfr.Add_byte(Byte_ascii.Quote).Add(v).Add_byte(Byte_ascii.Quote);
-	}
-	private void Write_comma(boolean comma) {
-		if (comma)
-			bfr.Add_byte(Byte_ascii.Comma);
-		else {
-			if (ws_enabled) 
-				bfr.Add_byte(Byte_ascii.Space);
-		}
-		if (ws_enabled)
-			bfr.Add_byte(Byte_ascii.Space);
-	}
-	private void Write_ary_bgn() {Indent_add();	Write_indent(); bfr.Add_byte(Byte_ascii.Brack_bgn); Write_new_line();}
-	private void Write_ary_end() {				Write_indent(); bfr.Add_byte(Byte_ascii.Brack_end); Write_new_line();	Indent_del();}
-	private void Write_nde_bgn() {Indent_add();	Write_indent(); bfr.Add_byte(Byte_ascii.Curly_bgn); Write_new_line();}
-	private void Write_nde_end() {				Write_indent(); bfr.Add_byte(Byte_ascii.Curly_end); Write_new_line();	Indent_del();}
-	private void Write_itm_hdr(boolean comma) {
-		Write_indent();
-		Write_comma(comma);
-	}
-	private void Indent_add() {indent += 2;}
-	private void Indent_del() {indent -= 2;}
-	private void Write_new_line() {if (ws_enabled) bfr.Add_byte_nl();}
-}

400_xowa/src/gplx/core/json/Json_doc_tst.java

@@ -1,46 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-import org.junit.*;
-public class Json_doc_tst {
-	private final Json_qry_mgr_fxt fxt = new Json_qry_mgr_fxt();
-	@Test  public void Select() {
-		Json_doc doc = fxt.Make_json
-		(	"{'0':"
-		,	"  {'0_0':"
-		,	"    {'0_0_0':'000'"
-		,	"    },"
-		,	"   '0_1':"
-		,	"    {'0_1_0':'010'"
-		,	"    }"
-		,	"  }"
-		,	"}"
-		);
-		fxt.Test_get_val_as_str(doc, "0/0_0/0_0_0", "000");
-		fxt.Test_get_val_as_str(doc, "0/0_1/0_1_0", "010");
-		fxt.Test_get_val_as_str(doc, "x", null);
-	}
-}
-class Json_qry_mgr_fxt {
-	private final Json_parser json_parser = new Json_parser();
-	public Json_doc Make_json(String... ary) {return json_parser.Parse_by_apos_ary(ary);}
-	public void Test_get_val_as_str(Json_doc doc, String qry, String expd){
-		byte[][] qry_bry = Bry_.Split(Bry_.new_u8(qry), Byte_ascii.Slash);
-		Tfds.Eq(expd, doc.Get_val_as_str_or(qry_bry, null));
-	}
-}

400_xowa/src/gplx/core/json/Json_doc_wtr.java

@@ -1,98 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_doc_wtr {
-	private int indent = -2;
-	private Bry_bfr bfr = Bry_bfr.reset_(255);
-	public Json_doc_wtr Indent() {return Indent(indent);}
-	private Json_doc_wtr Indent(int v) {if (v > 0) bfr.Add_byte_repeat(Byte_ascii.Space, v); return this;}
-	public Json_doc_wtr Indent_add() {indent += 2; return this;}
-	public Json_doc_wtr Indent_del() {indent -= 2; return this;}
-	public Json_doc_wtr Nde_bgn() {Indent_add();	Indent(); bfr.Add_byte(Byte_ascii.Curly_bgn).Add_byte_nl(); return this;}
-	public Json_doc_wtr Nde_end() {					Indent(); bfr.Add_byte(Byte_ascii.Curly_end).Add_byte_nl(); Indent_del(); return this;}
-	public Json_doc_wtr Ary_bgn() {Indent_add();	Indent(); bfr.Add_byte(Byte_ascii.Brack_bgn).Add_byte_nl(); return this;}
-	public Json_doc_wtr Ary_end() {					Indent(); bfr.Add_byte(Byte_ascii.Brack_end).Add_byte_nl(); Indent_del(); return this;}
-	public Json_doc_wtr New_line() {bfr.Add_byte_nl(); return this;}
-	public Json_doc_wtr Str(byte[] v) {
-		if (v == null)
-			bfr.Add(Object_.Bry__null);
-		else
-			bfr.Add_byte(Byte_ascii.Quote).Add(v).Add_byte(Byte_ascii.Quote);
-		return this;
-	}
-	public Json_doc_wtr Int(int v) {bfr.Add_int_variable(v); return this;}
-	public Json_doc_wtr Double(double v) {bfr.Add_double(v); return this;}
-	public Json_doc_wtr Comma() {Indent(); bfr.Add_byte(Byte_ascii.Comma).Add_byte_nl(); return this;}
-	public Json_doc_wtr Kv_ary_empty(boolean comma, byte[] key) {
-		Key_internal(comma, key);
-		bfr.Add_byte(Byte_ascii.Brack_bgn).Add_byte(Byte_ascii.Brack_end);
-		bfr.Add_byte_nl();
-		return this;
-	}
-	public Json_doc_wtr Kv(boolean comma, byte[] key, byte[] val) {
-		Key_internal(comma, key);
-		Str(val);
-		bfr.Add_byte_nl();
-		return this;
-	}
-	public Json_doc_wtr Kv_double(boolean comma, byte[] key, double v) {
-		Key_internal(comma, key);
-		Double(v);
-		bfr.Add_byte_nl();
-		return this;
-	}
-	public Json_doc_wtr Kv(boolean comma, byte[] key, int v) {
-		Key_internal(comma, key);
-		Int(v);
-		bfr.Add_byte_nl();
-		return this;
-	}
-	public Json_doc_wtr Key(boolean comma, byte[] key) {
-		Key_internal(comma, key);
-		bfr.Add_byte_nl();
-		return this;
-	}
-	public Json_doc_wtr Val(boolean comma, int v) {
-		Val_internal(comma);
-		Int(v);
-		New_line();
-		return this;
-	}
-	public Json_doc_wtr Val(boolean comma, byte[] v) {
-		Val_internal(comma);
-		Str(v);
-		New_line();
-		return this;
-	}
-	Json_doc_wtr Val_internal(boolean comma) {
-		Indent();
-		bfr.Add_byte(comma ? Byte_ascii.Comma : Byte_ascii.Space);
-		bfr.Add_byte(Byte_ascii.Space);
-		return this;
-	}
-	Json_doc_wtr Key_internal(boolean comma, byte[] key) {
-		Indent();
-		bfr.Add_byte(comma ? Byte_ascii.Comma : Byte_ascii.Space);
-		bfr.Add_byte(Byte_ascii.Space);
-		Str(key);
-		bfr.Add_byte(Byte_ascii.Colon);
-		return this;
-	}
-	public byte[] Bld() {return bfr.Xto_bry_and_clear();}
-	public String Bld_as_str() {return bfr.Xto_str_and_clear();}
-}

400_xowa/src/gplx/core/json/Json_factory.java

@@ -1,29 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_factory {
-	public Json_itm		Null()												{return Json_itm_null.Null;}
-	public Json_itm		Bool_n()											{return Json_itm_bool.Bool_n;}
-	public Json_itm		Bool_y()											{return Json_itm_bool.Bool_y;}
-	public Json_itm_int	Int(Json_doc doc, int bgn, int end)					{return new Json_itm_int(doc, bgn, end);}
-	public Json_itm		Decimal(Json_doc doc, int bgn, int end)				{return new Json_itm_decimal(doc, bgn, end);}
-	public Json_itm		Str(Json_doc doc, int bgn, int end, boolean exact)		{return new Json_itm_str(doc, bgn, end, exact);}
-	public Json_kv		Kv(Json_itm key, Json_itm val)						{return new Json_kv(key, val);}
-	public Json_ary		Ary(int bgn, int end)								{return new Json_ary(bgn, end);}
-	public Json_nde		Nde(Json_doc doc, int bgn)							{return new Json_nde(doc, bgn);}
-}

400_xowa/src/gplx/core/json/Json_grp.java

@@ -1,34 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public interface Json_grp extends Json_itm {
-	void Src_end_(int v);
-	int Len();
-	Json_itm Get_at(int i);
-	void Add(Json_itm itm);
-}
-class Json_grp_ {
-	public static final Json_grp[] Ary_empty = new Json_grp[0];  
-	public static void Print_nl(Bry_bfr bfr) {								// \n\n can be caused by nested groups (EX: "[[]]"); only print 1
-		if (bfr.Bfr()[bfr.Len() - 1] != Byte_ascii.Nl)
-			bfr.Add_byte_nl();
-	}
-	public static void Print_indent(Bry_bfr bfr, int depth) {
-		if (depth > 0) bfr.Add_byte_repeat(Byte_ascii.Space, depth * 2);	// indent
-	}
-}

400_xowa/src/gplx/core/json/Json_itm.java

@@ -1,59 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public interface Json_itm {
-	byte		Tid();
-	int			Src_bgn();
-	int			Src_end();
-	Object		Data();
-	byte[]		Data_bry();
-	void		Print_as_json(Bry_bfr bfr, int depth);
-	boolean		Data_eq(byte[] comp);
-}
-class Json_itm_null extends Json_itm_base {
-	Json_itm_null() {this.Ctor(-1, -1);}
-	@Override public byte Tid() {return Json_itm_.Tid__null;}
-	@Override public Object Data() {return null;}
-	@Override public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add(Object_.Bry__null);}
-	@Override public byte[] Data_bry() {return Object_.Bry__null;}
-	public static final Json_itm_null Null = new Json_itm_null();
-}
-class Json_itm_bool extends Json_itm_base {
-	private boolean data;
-	public Json_itm_bool(boolean data) {this.data = data; this.Ctor(-1, -1);}
-	@Override public byte Tid() {return Json_itm_.Tid__bool;}
-	@Override public Object Data() {return data;}
-	@Override public byte[] Data_bry() {return data ? Json_itm_.Bry__true : Json_itm_.Bry__false;}
-	@Override public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add(data ? Json_itm_.Bry__true: Json_itm_.Bry__false);}
-	public static final Json_itm_bool Bool_n = new Json_itm_bool(false), Bool_y = new Json_itm_bool(true);
-}
-class Json_itm_decimal extends Json_itm_base {
-	private final Json_doc doc; private Decimal_adp data; private byte[] data_bry;
-	public Json_itm_decimal(Json_doc doc, int src_bgn, int src_end) {this.Ctor(src_bgn, src_end); this.doc = doc;}
-	@Override public byte Tid() {return Json_itm_.Tid__decimal;}
-	@Override public Object Data() {
-		if (data == null)
-			data = Decimal_adp_.parse(String_.new_a7(this.Data_bry()));
-		return data;
-	}
-	@Override public byte[] Data_bry() {
-		if (data_bry == null) data_bry = Bry_.Mid(doc.Src(), this.Src_bgn(), this.Src_end());
-		return data_bry;
-	}
-	@Override public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add_mid(doc.Src(), this.Src_bgn(), this.Src_end());}
-}

400_xowa/src/gplx/core/json/Json_itm_base.java

@@ -1,29 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public abstract class Json_itm_base implements Json_itm {
-	public abstract byte Tid();
-	public void Ctor(int src_bgn, int src_end) {this.src_bgn = src_bgn; this.src_end = src_end;}
-	public int Src_bgn() {return src_bgn;} private int src_bgn;
-	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.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;}
-}

400_xowa/src/gplx/core/json/Json_itm_int.java

@@ -1,35 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_itm_int extends Json_itm_base {
-	private final Json_doc doc;
-	private byte[] data_bry; private int data; private boolean data_is_null = true;
-	public Json_itm_int(Json_doc doc, int src_bgn, int src_end) {this.Ctor(src_bgn, src_end); this.doc = doc;}
-	@Override public byte Tid() {return Json_itm_.Tid__int;}
-	public int Data_as_int() {
-		if (data_is_null) {
-			data = doc.Utl_num_parser().Parse(doc.Src(), Src_bgn(), Src_end()).Rv_as_int();
-			data_is_null = false;
-		}
-		return data;
-	}
-	@Override public Object Data() {return Data_as_int();}
-	@Override public byte[] Data_bry() {if (data_bry == null) data_bry = Bry_.Mid(doc.Src(), this.Src_bgn(), this.Src_end()); return data_bry;}
-	@Override public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add_mid(doc.Src(), this.Src_bgn(), this.Src_end());}
-	public static Json_itm_int cast(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid__int ? null : (Json_itm_int)v;}
-}

400_xowa/src/gplx/core/json/Json_itm_str.java

@@ -1,78 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-class Json_itm_str extends Json_itm_base {
-	private final boolean exact; private final Json_doc doc;
-	private String data_str; private byte[] data_bry = null;
-	public Json_itm_str(Json_doc doc, int src_bgn, int src_end, boolean exact) {this.Ctor(src_bgn + 1, src_end - 1); this.doc = doc; this.exact = exact;}
-	@Override public byte Tid() {return Json_itm_.Tid__str;}
-	@Override public void Print_as_json(Bry_bfr bfr, int depth) {
-		bfr.Add_byte(Byte_ascii.Quote);
-		gplx.html.Html_utl.Escape_html_to_bfr(bfr, doc.Src(), this.Src_bgn(), this.Src_end(), true, true, true, true, false);	// false to apos for backwards compatibility
-		bfr.Add_byte(Byte_ascii.Quote);
-	}
-	@Override public Object Data() {
-		if (data_str == null) {
-			if (data_bry == null)
-				data_bry = Data_make_bry();
-			data_str = String_.new_u8(data_bry);
-		}
-		return data_str;
-	}
-	@Override public byte[] Data_bry() {if (data_bry == null) data_bry = Data_make_bry(); return data_bry;}
-	@Override public boolean Data_eq(byte[] comp) {
-		if (exact) return Bry_.Eq(comp, doc.Src(), this.Src_bgn(), this.Src_end());
-		if (data_bry == null) data_bry = Data_make_bry();
-		return Bry_.Match(data_bry, comp);
-	}
-	private byte[] Data_make_bry() {
-		byte[] src = doc.Src(); int bgn = this.Src_bgn(), end = this.Src_end();
-		if (exact) return Bry_.Mid(src, bgn, end);
-		Bry_bfr bfr = doc.Bfr();
-		byte[] utf8_bry = doc.Tmp_u8_bry();
-		for (int i = bgn; i < end; i++) {
-			byte b = src[i];
-			switch (b) {
-				case Byte_ascii.Backslash:
-					b = src[++i];
-					switch (b) {	// NOTE: must properly unescape chars; EX:wd.q:2; DATE:2014-04-23
-						case Byte_ascii.Ltr_t:				bfr.Add_byte(Byte_ascii.Tab); break;
-						case Byte_ascii.Ltr_n:				bfr.Add_byte(Byte_ascii.Nl); break;
-						case Byte_ascii.Ltr_r:				bfr.Add_byte(Byte_ascii.Cr); break;
-						case Byte_ascii.Ltr_b:				bfr.Add_byte(Byte_ascii.Backfeed); break;
-						case Byte_ascii.Ltr_f:				bfr.Add_byte(Byte_ascii.Formfeed); break;
-						case Byte_ascii.Ltr_u:
-							int utf8_val = gplx.texts.HexDecUtl.parse_or(src, i + 1, i + 5, -1);
-							int len = gplx.intl.Utf16_.Encode_int(utf8_val, utf8_bry, 0);
-							bfr.Add_mid(utf8_bry, 0, len);
-							i += 4;
-							break;	// \uFFFF	4 hex-dec
-						case Byte_ascii.Backslash:
-						case Byte_ascii.Slash:
-						default:
-							bfr.Add_byte(b);	break;	// \?		" \ / b f n r t
-					}
-					break;
-				default:
-					bfr.Add_byte(b);
-					break;
-			}		
-		}
-		return bfr.Xto_bry_and_clear();
-	}
-}

400_xowa/src/gplx/core/json/Json_itm_tmp.java

@@ -1,31 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_itm_tmp implements Json_itm {	// TEST:
-	public Json_itm_tmp(byte tid, String data) {this.tid = tid; this.data = data;}
-	public byte Tid() {return tid;} private byte tid;
-	public byte[] Data_bry() {return Bry_.new_u8(Object_.Xto_str_strict_or_empty(data));}
-	public int Src_bgn() {return -1;}
-	public int Src_end() {return -1;}
-	public Object Data() {return data;} private String data;
-	public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add_str(data);}
-	public boolean Data_eq(byte[] comp) {return false;}
-	public void Clear() {}
-	public static Json_itm new_str_(String v)	{return new Json_itm_tmp(Json_itm_.Tid__str, "\"" + v + "\"");}
-	public static Json_itm new_int_(int v)		{return new Json_itm_tmp(Json_itm_.Tid__int, Int_.Xto_str(v));}
-}

400_xowa/src/gplx/core/json/Json_kv.java

@@ -1,39 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_kv extends Json_itm_base {
-	public Json_kv(Json_itm key, Json_itm val) {this.key = key; this.val = val;}
-	@Override public byte Tid() {return Json_itm_.Tid__kv;}
-	public Json_itm Key() {return key;} private final Json_itm key;
-	public Json_itm Val() {return val;} private final Json_itm val;
-	public byte[] Key_as_bry() {return key.Data_bry();}
-	public String Key_as_str() {return (String)key.Data();}
-	public byte[] Val_as_bry() {return val.Data_bry();}
-	public Json_nde Val_as_nde() {return Json_nde.cast(val);}
-	public Json_ary Val_as_ary() {return Json_ary.cast(val);}
-	public boolean Key_eq(byte[] comp) {return ((Json_itm_str)key).Data_eq(comp);}
-	@Override public Object Data() {return null;}
-	@Override public byte[] Data_bry() {return null;}
-	@Override public void Print_as_json(Bry_bfr bfr, int depth) {
-		key.Print_as_json(bfr, depth);
-		bfr.Add_byte(Byte_ascii.Colon);
-		val.Print_as_json(bfr, depth);
-	}
-	public static final Json_kv[] Ary_empty = new Json_kv[0];
-	public static Json_kv cast(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid__kv ? null : (Json_kv)v;}
-}

400_xowa/src/gplx/core/json/Json_kv_ary_srl.java

@@ -1,61 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_kv_ary_srl {
-	public static KeyVal Kv_by_itm(Json_itm itm) {
-		switch (itm.Tid()) {
-			case Json_itm_.Tid__kv:
-				Json_kv kv = (Json_kv)itm;
-				return KeyVal_.new_(kv.Key_as_str(), Val_by_itm(kv.Val()));
-			default:
-				throw Err_.new_unhandled(itm.Tid());
-		}
-	}
-	private static Object Val_by_itm(Json_itm itm) {
-		switch (itm.Tid()) {
-			case Json_itm_.Tid__bool:		return Bool_.To_str_lower(Bool_.cast(itm.Data()));
-			case Json_itm_.Tid__int:
-			case Json_itm_.Tid__null:
-			case Json_itm_.Tid__str:
-			case Json_itm_.Tid__decimal:	return itm.Data();
-			case Json_itm_.Tid__ary:		return Val_by_itm_ary((Json_ary)itm);
-			case Json_itm_.Tid__nde:		return Val_by_itm_nde((Json_nde)itm);
-			case Json_itm_.Tid__kv:			// kv should never be val; EX: "a":"b":c; not possible
-			default:						throw Err_.new_unhandled(itm.Tid());
-		}
-	}
-	private static KeyVal[] Val_by_itm_ary(Json_ary itm) {
-		int subs_len = itm.Len();
-		KeyVal[] rv = new KeyVal[subs_len];
-		for (int i = 0; i < subs_len; i++) {
-			Json_itm sub = itm.Get_at(i);
-			KeyVal kv = KeyVal_.new_(Int_.Xto_str(i + Int_.Base1), Val_by_itm(sub));
-			rv[i] = kv;
-		}
-		return rv;
-	}
-	public static KeyVal[] Val_by_itm_nde(Json_nde itm) {
-		int subs_len = itm.Len();
-		KeyVal[] rv = new KeyVal[subs_len];
-		for (int i = 0; i < subs_len; i++) {
-			Json_itm sub = itm.Get_at(i);
-			rv[i] = Kv_by_itm(sub);
-		}
-		return rv;
-	}
-}

400_xowa/src/gplx/core/json/Json_kv_ary_srl_tst.java

@@ -1,50 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-import org.junit.*;
-public class Json_kv_ary_srl_tst {
-	@Before public void init() {fxt.Clear();} private Json_kv_ary_srl_fxt fxt = new Json_kv_ary_srl_fxt();
-	@Test   public void Null()					{fxt.Test_parse("{'k0':null}"					, fxt.ary_(fxt.kv_str_("k0", null)));}
-	@Test   public void Bool_n()				{fxt.Test_parse("{'k0':false}"					, fxt.ary_(fxt.kv_bool_("k0", false)));}
-	@Test   public void Num()					{fxt.Test_parse("{'k0':123}"					, fxt.ary_(fxt.kv_int_("k0", 123)));}
-	@Test   public void Str()					{fxt.Test_parse("{'k0':'v0'}"					, fxt.ary_(fxt.kv_str_("k0", "v0")));}
-	@Test   public void Num_dec()				{fxt.Test_parse("{'k0':1.23}"					, fxt.ary_(fxt.kv_dec_("k0", Decimal_adp_.parse("1.23"))));}
-	@Test   public void Ary_int()				{fxt.Test_parse("{'k0':[1,2,3]}"				, fxt.ary_(fxt.kv_obj_("k0", fxt.ary_(fxt.kv_int_("1", 1), fxt.kv_int_("2", 2), fxt.kv_int_("3", 3)))));}
-	@Test   public void Ary_empty()				{fxt.Test_parse("{'k0':[]}"						, fxt.ary_(fxt.kv_obj_("k0", fxt.ary_())));}
-	@Test   public void Subs_int()				{fxt.Test_parse("{'k0':{'k00':1,'k01':2}}"		, fxt.ary_(fxt.kv_obj_("k0", fxt.ary_(fxt.kv_int_("k00", 1), fxt.kv_int_("k01", 2)))));}
-	@Test   public void Subs_empty()			{fxt.Test_parse("{'k0':{}}"						, fxt.ary_(fxt.kv_obj_("k0", fxt.ary_())));}
-}
-class Json_kv_ary_srl_fxt {
-	public void Clear() {
-		if (parser == null) {
-			parser = new Json_parser();
-		}
-	}	private Json_parser parser;
-	public void Test_parse(String raw_str, KeyVal[] expd) {
-		byte[] raw_bry = Json_parser_tst.Replace_apos(Bry_.new_u8(raw_str));
-		Json_doc doc = parser.Parse(raw_bry);
-		KeyVal[] actl = Json_kv_ary_srl.Val_by_itm_nde(doc.Root_nde());
-		Tfds.Eq_str_lines(KeyVal_.Ary_to_str(expd), KeyVal_.Ary_to_str(actl));
-	}
-	public KeyVal[] ary_(KeyVal... ary) {return ary;}
-	public KeyVal kv_obj_(String key, Object val)		{return KeyVal_.new_(key, val);}
-	public KeyVal kv_str_(String key, String val)		{return KeyVal_.new_(key, val);}
-	public KeyVal kv_int_(String key, int val)			{return KeyVal_.new_(key, val);}
-	public KeyVal kv_bool_(String key, boolean val)		{return KeyVal_.new_(key, Bool_.To_str_lower(val));}
-	public KeyVal kv_dec_(String key, Decimal_adp val)	{return KeyVal_.new_(key, val.To_str());}
-}

400_xowa/src/gplx/core/json/Json_nde.java

@@ -1,100 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_nde extends Json_itm_base implements Json_grp {		
-	private Json_itm[] subs = Json_itm_.Ary_empty; private int subs_len = 0, subs_max = 0;
-	public Json_nde(Json_doc jdoc, int src_bgn) {this.jdoc = jdoc; this.Ctor(src_bgn, -1);}
-	@Override public byte Tid() {return Json_itm_.Tid__nde;}
-	public Json_doc Doc() {return jdoc;} private final Json_doc jdoc;
-	public void Src_end_(int v) {this.src_end = v;}
-	@Override public Object Data() {return null;}
-	@Override public byte[] Data_bry() {return null;}
-	public int Len() {return subs_len;}
-	public Json_kv Get_at_as_kv(int i) {
-		Json_itm rv_itm = Get_at(i);
-		Json_kv rv = Json_kv.cast(rv_itm); if (rv == null) throw Err_.new_("json", "sub is not kv", "i", i, "src", Bry_.Mid(jdoc.Src(), this.Src_bgn(), src_end));
-		return rv;
-	}
-	public Json_itm Get_at(int i) {return subs[i];}
-	public Json_kv Get_kv(byte[] key) {return Json_kv.cast(Get_itm(key));}
-	public Json_nde Get(String key) {return Get(Bry_.new_u8(key));}
-	public Json_nde Get(byte[] key) {
-		Json_kv kv = Json_kv.cast(this.Get_itm(key)); if (kv == null) throw Err_.new_("json", "kv not found", "key", key);
-		Json_nde rv = Json_nde.cast(kv.Val()); if (rv == null) throw Err_.new_("json", "nde not found", "key", key);
-		return rv;
-	}
-	public Json_itm Get_itm(byte[] key) {
-		for (int i = 0; i < subs_len; i++) {
-			Json_itm itm = subs[i];
-			if (itm.Tid() == Json_itm_.Tid__kv) {
-				Json_kv itm_as_kv = (Json_kv)itm;
-				if (Bry_.Eq(key, itm_as_kv.Key().Data_bry()))
-					return itm;
-			}
-		}
-		return null;
-	}
-	public boolean Has(byte[] key) {return Get_bry(key, null) != null;}
-	public byte[] Get_bry(byte[] key) {
-		byte[] rv = Get_bry(key, null); if (rv == null) throw Err_.new_("json", "key missing", "key", key);
-		return rv;
-	}
-	public byte[] Get_bry_or_null(String key) {return Get_bry(Bry_.new_u8(key), null);}
-	public byte[] Get_bry_or_null(byte[] key) {return Get_bry(key, null);}
-	public byte[] Get_bry(byte[] key, byte[] or) {
-		Json_itm kv_obj = Get_itm(key);
-		if (kv_obj == null) return or;	// key not found;
-		if (kv_obj.Tid() != Json_itm_.Tid__kv) return or; // key is not a key_val
-		Json_kv kv = (Json_kv)kv_obj;
-		Json_itm val = kv.Val();
-		return (val == null) ? or : val.Data_bry();
-	}
-	public Json_nde Add_many(Json_itm... ary) {
-		int len = ary.length;
-		for (int i = 0; i < len; i++)
-			Add(ary[i]);
-		return this;
-	}
-	public void Add(Json_itm itm) {
-		int new_len = subs_len + 1;
-		if (new_len > subs_max) {	// ary too small >>> expand
-			subs_max = new_len * 2;
-			Json_itm[] new_subs = new Json_itm[subs_max];
-			Array_.Copy_to(subs, 0, new_subs, 0, subs_len);
-			subs = new_subs;
-		}
-		subs[subs_len] = (Json_itm)itm;
-		subs_len = new_len;
-	}
-	@Override public void Print_as_json(Bry_bfr bfr, int depth) {
-		if (bfr.Len() != 0)
-			bfr.Add_byte_nl();
-		Json_grp_.Print_indent(bfr, depth);
-		bfr.Add_byte(Byte_ascii.Curly_bgn).Add_byte(Byte_ascii.Space);
-		for (int i = 0; i < subs_len; i++) {
-			if (i != 0) {
-				Json_grp_.Print_nl(bfr); Json_grp_.Print_indent(bfr, depth);
-				bfr.Add_byte(Byte_ascii.Comma).Add_byte(Byte_ascii.Space);
-			}
-			subs[i].Print_as_json(bfr, depth + 1);
-		}
-		Json_grp_.Print_nl(bfr); Json_grp_.Print_indent(bfr, depth);
-		bfr.Add_byte(Byte_ascii.Curly_end).Add_byte_nl();
-	}
-	public static Json_nde cast(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid__nde ? null : (Json_nde)v;}
-}

400_xowa/src/gplx/core/json/Json_parser.java

@@ -1,180 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_parser {
-	private byte[] src; private int src_len, pos; private final Number_parser num_parser = new Number_parser();
-	public Json_factory Factory() {return factory;} private final Json_factory factory = new Json_factory();
-	public Json_doc Parse_by_apos_ary(String... ary) {return Parse_by_apos(String_.Concat_lines_nl(ary));}
-	public Json_doc Parse_by_apos(String s) {return Parse(Bry_.Replace(Bry_.new_u8(s), Byte_ascii.Apos, Byte_ascii.Quote));}
-	public Json_doc Parse(String src) {return Parse(Bry_.new_u8(src));}
-	public Json_doc Parse(byte[] src) {
-		synchronized (factory) {
-			this.src = src;				if (src == null) return null;
-			this.src_len = src.length;	if (src_len == 0) return null;
-			this.pos = 0;
-			Skip_ws();
-			boolean root_is_nde = true;
-			switch (src[pos]) {
-				case Byte_ascii.Curly_bgn:	root_is_nde = Bool_.Y; break;
-				case Byte_ascii.Brack_bgn:	root_is_nde = Bool_.N; break;
-				default:					return null;
-			}
-			Skip_ws();
-			Json_doc doc = new Json_doc();
-			Json_grp root = null;
-			if (root_is_nde)
-				root = Make_nde(doc);
-			else
-				root = Make_ary(doc);
-			doc.Ctor(src, root);
-			return doc;
-		}
-	}
-	private Json_nde Make_nde(Json_doc doc) {
-		++pos;	// brack_bgn
-		Json_nde nde = new Json_nde(doc, pos);
-		while (pos < src_len) {
-			Skip_ws();
-			if (src[pos] == Byte_ascii.Curly_end) 	{++pos; return nde;}
-			else									nde.Add(Make_kv(doc));
-			Skip_ws();
-			switch (src[pos++]) {
-				case Byte_ascii.Comma:			break;
-				case Byte_ascii.Curly_end:		return nde;
-				default: throw Err_.new_unhandled(src[pos - 1]);
-			}
-		}
-		throw Err_.new_wo_type("eos inside nde");
-	}
-	private Json_itm Make_kv(Json_doc doc) {
-		Json_itm key = Make_string(doc);
-		Skip_ws();
-		Chk(Byte_ascii.Colon);
-		Skip_ws();
-		Json_itm val = Make_val(doc);
-		return new Json_kv(key, val);
-	}
-	private Json_itm Make_val(Json_doc doc) {
-		while (pos < src_len) {
-			byte b = src[pos];
-			switch (b) {
-				case Byte_ascii.Ltr_n:		return Make_literal(Bry_null_ull	, 3, factory.Null());
-				case Byte_ascii.Ltr_f:		return Make_literal(Bry_bool_alse	, 4, factory.Bool_n());
-				case Byte_ascii.Ltr_t:		return Make_literal(Bry_bool_rue	, 3, factory.Bool_y());
-				case Byte_ascii.Quote:		return Make_string(doc);
-				case Byte_ascii.Num_0: case Byte_ascii.Num_1: case Byte_ascii.Num_2: case Byte_ascii.Num_3: case Byte_ascii.Num_4:
-				case Byte_ascii.Num_5: case Byte_ascii.Num_6: case Byte_ascii.Num_7: case Byte_ascii.Num_8: case Byte_ascii.Num_9:
-				case Byte_ascii.Dash:		return Make_num(doc);
-				case Byte_ascii.Brack_bgn:	return Make_ary(doc);
-				case Byte_ascii.Curly_bgn:	return Make_nde(doc);
-			}
-			throw Err_.new_unhandled(Char_.To_str(b));
-		}
-		throw Err_.new_wo_type("eos reached in val");
-	}
-	private Json_itm Make_literal(byte[] remainder, int remainder_len, Json_itm singleton) {
-		++pos;	// 1st char
-		int literal_end = pos + remainder_len;
-		if (Bry_.Eq(remainder, src, pos, literal_end)) {
-			pos = literal_end;
-			return singleton;
-		}
-		throw Err_.new_("json.parser", "invalid literal", "excerpt", Bry_.Mid_by_len_safe(src, pos - 1, 16));
-	}
-	private Json_itm Make_string(Json_doc doc) {
-		int bgn = pos++;	// ++: quote_bgn
-		boolean exact = true; 
-		while (pos < src_len) {
-			switch (src[pos]) {
-				case Byte_ascii.Backslash:
-					++pos;	// backslash
-					switch (src[pos]) {
-						case Byte_ascii.Ltr_u:		pos += 4; break;	// \uFFFF	4 hex-dec
-						default:					++pos;	break;		// \?		" \ / b f n r t
-					}
-					exact = false;
-					break;
-				case Byte_ascii.Quote:
-					return factory.Str(doc, bgn, ++pos, exact);	// ++: quote_end
-				default:
-					++pos;
-					break;
-			}		
-		}
-		throw Err_.new_wo_type("eos reached inside quote");
-	}
-	private Json_itm Make_num(Json_doc doc) {
-		int num_bgn = pos;
-		boolean loop = true;
-		while (loop) {
-			if (pos == src_len) throw Err_.new_wo_type("eos reached inside num");
-			switch (src[pos]) {
-				case Byte_ascii.Num_0: case Byte_ascii.Num_1: case Byte_ascii.Num_2: case Byte_ascii.Num_3: case Byte_ascii.Num_4:
-				case Byte_ascii.Num_5: case Byte_ascii.Num_6: case Byte_ascii.Num_7: case Byte_ascii.Num_8: case Byte_ascii.Num_9:
-					++pos;
-					break;
-				case Byte_ascii.Dot:
-				case Byte_ascii.Dash: case Byte_ascii.Plus:
-				case Byte_ascii.Ltr_E: case Byte_ascii.Ltr_e:	// e e+ e- E E+ E-
-					++pos;
-					break;
-				default:
-					loop = false;
-					break;
-			}
-		}
-		num_parser.Parse(src, num_bgn, pos);
-		return num_parser.Has_frac() 
-			? factory.Decimal(doc, num_bgn, pos)
-			: factory.Int(doc, num_bgn, pos);
-	}
-	private Json_ary Make_ary(Json_doc doc) {
-		Json_ary rv = factory.Ary(pos++, pos);	// brack_bgn
-		while (pos < src_len) {
-			Skip_ws();
-			if (src[pos] == Byte_ascii.Brack_end) 	{++pos; return rv;}
-			else									rv.Add(Make_val(doc));
-			Skip_ws();
-			switch (src[pos]) {
-				case Byte_ascii.Comma:			++pos; break;
-				case Byte_ascii.Brack_end:		++pos; return rv;
-			}
-		}
-		throw Err_.new_wo_type("eos inside ary");
-	}
-	private void Skip_ws() {
-		while (pos < src_len) {
-			switch (src[pos]) {
-				case Byte_ascii.Space: case Byte_ascii.Nl: case Byte_ascii.Tab: case Byte_ascii.Cr: ++pos; break;
-				default: return;
-			}
-		}
-	}
-	private void Chk(byte expd) {
-		if (src[pos] == expd)
-			++pos;
-		else
-			throw err_(src, pos, "expected '{0}' but got '{1}'", Char_.To_str(expd), Char_.To_str(src[pos]));
-	}
-	private Err err_(byte[] src, int bgn, String fmt, Object... args) {return err_(src, bgn, src.length, fmt, args);}
-	private Err err_(byte[] src, int bgn, int src_len, String fmt, Object... args) {
-		String msg = String_.Format(fmt, args) + " " + Int_.Xto_str(bgn) + " " + String_.new_u8_by_len(src, bgn, 20);
-		return Err_.new_wo_type(msg);
-	}
-	private static final byte[] Bry_bool_rue = Bry_.new_a7("rue"), Bry_bool_alse = Bry_.new_a7("alse"), Bry_null_ull = Bry_.new_a7("ull");
-}

400_xowa/src/gplx/core/json/Json_parser__itm__base.java

@@ -1,74 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-import gplx.core.primitives.*;
-public abstract class Json_parser__itm__base {
-	protected String context;
-	protected final Hash_adp_bry hash = Hash_adp_bry.cs();
-	protected final Bry_bfr tmp_bfr = Bry_bfr.new_(255);
-	protected String[] keys;
-	protected Json_kv[] atrs;
-	protected Json_itm cur_itm;
-	protected int keys_len;
-	public void Ctor(String... keys) {
-		this.keys = keys;
-		this.keys_len = keys.length;
-		for (int i = 0; i < keys_len; ++i)
-			hash.Add(Bry_.new_u8(keys[i]), Int_obj_val.new_(i));
-		this.atrs = new Json_kv[keys_len];
-	}
-	public int Kv__int(Json_kv[] ary, int i)			{return Bry_.To_int(ary[i].Val_as_bry());}
-	public long Kv__long(Json_kv[] ary, int i)			{return Bry_.To_long_or(ary[i].Val_as_bry(), 0);}
-	public long Kv__long_or_0(Json_kv[] ary, int i)		{
-		Json_kv kv = ary[i]; if (kv == null) return 0;
-		return Bry_.To_long_or(kv.Val_as_bry(), 0);
-	}
-	public byte[] Kv__bry(Json_kv[] ary, int i)	{
-		byte[] rv = Kv__bry_or_null(ary, i); if (rv == null) throw Err_.new_("json.parser", "missing val", "key", context + "." + keys[i], "excerpt", Json_itm_.To_bry(tmp_bfr, cur_itm));
-		return rv;
-	}
-	public byte[][] Kv__bry_ary(Json_kv[] ary, int i) {
-		return ary[i].Val_as_ary().Xto_bry_ary();
-	}
-	public byte[] Kv__bry_or_empty(Json_kv[] ary, int i) {
-		byte[] rv = Kv__bry_or_null(ary, i);
-		return rv == null ? Bry_.Empty : rv;
-	}
-	public byte[] Kv__bry_or_null(Json_kv[] ary, int i)	{
-		Json_kv kv = ary[i]; if (kv == null) return null;
-		Json_itm val = kv.Val();			
-		return  kv == null ? null : val.Data_bry();
-	}
-	public boolean Kv__mw_bool(Json_kv[] ary, int i)	{
-		Json_kv kv = ary[i]; if (kv == null) return false;
-		Json_itm val = kv.Val();
-		if (	val.Tid() == Json_itm_.Tid__str
-			&&	Bry_.Len_eq_0(val.Data_bry())) {
-			return true;
-		}
-		else {
-			Warn("unknown val: val=" + String_.new_u8(kv.Data_bry()) + " excerpt=" + String_.new_u8(Json_itm_.To_bry(tmp_bfr, cur_itm)), kv);
-			return false;
-		}
-	}
-	public boolean Kv__has(Json_kv[] ary, int i)			{return Kv__bry_or_empty(ary, i) != null;}
-	protected abstract void Parse_hook_nde(Json_nde sub, Json_kv[] atrs);
-	protected void Warn(String msg, Json_kv kv) {
-		Gfo_usr_dlg_.I.Warn_many("", "", msg + ": path=~{0}.~{1} excerpt=~{2}", context, kv.Key_as_bry(), Json_itm_.To_bry(tmp_bfr, cur_itm));
-	}
-}

400_xowa/src/gplx/core/json/Json_parser__list_nde__base.java

@@ -1,70 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-import gplx.core.primitives.*;
-public class Json_parser__list_nde__base extends Json_parser__itm__base {
-	public void Parse_grp(String context, Json_grp grp) {
-		this.context = context;
-		int len = grp.Len();
-		for (int i = 0; i < len; ++i) {
-			Json_nde sub = null;
-			if (grp.Tid() == Json_itm_.Tid__nde) {
-				Json_kv kv = Json_nde.cast(grp).Get_at_as_kv(i);
-				sub = kv.Val_as_nde();
-			}
-			else {
-				sub = Json_nde.cast(grp.Get_at(i));
-			}
-			Parse_nde(context, sub);
-		}
-	}
-	public void Parse_nde(String context, Json_nde nde) {
-		this.cur_itm = nde;
-		for (int j = 0; j < keys_len; ++j)
-			atrs[j] = null;
-		int atr_len = nde.Len();
-		for (int j = 0; j < atr_len; ++j) {
-			Json_kv atr = nde.Get_at_as_kv(j);
-			Object idx_obj = hash.Get_by_bry(atr.Key_as_bry());
-			if (idx_obj == null) {Warn("unknown key", atr); continue;}
-			int idx_int = ((Int_obj_val)idx_obj).Val();
-			atrs[idx_int] = atr;
-		}
-		Parse_hook_nde(nde, atrs);
-	}
-	public void Parse_to_list_as_bry(String context, Json_ary ary, Ordered_hash list) {
-		this.cur_itm = ary;
-		int len = ary.Len();
-		for (int i = 0; i < len; ++i) {
-			byte[] val = ary.Get_at(i).Data_bry();
-			list.Add(val, val);
-		}
-	}
-	public void Parse_to_list_as_kv(String context, Json_nde nde, Ordered_hash list) {
-		this.cur_itm = nde;
-		int len = nde.Len();
-		for (int i = 0; i < len; ++i) {
-			Json_kv sub = nde.Get_at_as_kv(i);
-			byte[] key = sub.Key_as_bry();
-			byte[] val = Parse_to_list_as_kv__get_val(sub, key);
-			list.Add(key, KeyVal_.new_(String_.new_u8(key), String_.new_u8(val)));
-		}
-	}
-	@gplx.Virtual protected byte[] Parse_to_list_as_kv__get_val(Json_kv sub, byte[] key) {return sub.Val_as_bry();}
-	@Override protected void Parse_hook_nde(Json_nde sub, Json_kv[] atrs) {}
-}

400_xowa/src/gplx/core/json/Json_parser_tst.java

@@ -1,100 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-import org.junit.*;
-public class Json_parser_tst {
-	private final Json_parser_fxt fxt = new Json_parser_fxt();
-	@Before public void init() {fxt.Clear();}
-	@Test   public void Null()					{fxt.Test_parse_val0("{'k0':null}"			, null);}
-	@Test   public void Bool_n()				{fxt.Test_parse_val0("{'k0':false}"			, false);}
-	@Test   public void Bool_y()				{fxt.Test_parse_val0("{'k0':true}"			, true);}
-	@Test   public void Num()					{fxt.Test_parse_val0("{'k0':123}"			, 123);}
-	@Test   public void Num_neg()				{fxt.Test_parse_val0("{'k0':-123}"			, -123);}
-	@Test   public void Str()					{fxt.Test_parse_val0("{'k0':'v0'}"			, "v0");}
-	@Test   public void Str_esc_quote()			{fxt.Test_parse_val0("{'k0':'a\\\"b'}"		, "a\"b");}
-	@Test   public void Str_esc_hex4()			{fxt.Test_parse_val0("{'k0':'a\\u0021b'}"	, "a!b");}
-	@Test   public void Num_dec()				{fxt.Test_parse("{'k0':1.23}"				, fxt.itm_nde_().Add_many(fxt.itm_kv_dec_("k0", "1.23")));}
-	@Test   public void Num_exp()				{fxt.Test_parse("{'k0':1e+2}"				, fxt.itm_nde_().Add_many(fxt.itm_kv_dec_("k0", "1e+2")));}
-	@Test   public void Num_mix()				{fxt.Test_parse("{'k0':-1.23e-1}"			, fxt.itm_nde_().Add_many(fxt.itm_kv_dec_("k0", "-1.23e-1")));}
-	@Test   public void Str_many()				{fxt.Test_parse("{'k0':'v0','k1':'v1','k2':'v2'}", fxt.itm_nde_().Add_many(fxt.itm_kv_("k0", "v0"), fxt.itm_kv_("k1", "v1"), fxt.itm_kv_("k2", "v2")));}
-	@Test   public void Ary_empty()				{fxt.Test_parse("{'k0':[]}", fxt.itm_nde_().Add_many(fxt.itm_kv_ary_int_("k0")));}
-	@Test   public void Ary_int()				{fxt.Test_parse("{'k0':[1,2,3]}", fxt.itm_nde_().Add_many(fxt.itm_kv_ary_int_("k0", 1, 2, 3)));}
-	@Test   public void Ary_str()				{fxt.Test_parse("{'k0':['a','b','c']}", fxt.itm_nde_().Add_many(fxt.itm_kv_ary_str_("k0", "a", "b", "c")));}
-	@Test   public void Ary_ws()				{fxt.Test_parse("{'k0': [ 1 , 2 , 3 ] }", fxt.itm_nde_().Add_many(fxt.itm_kv_ary_int_("k0", 1, 2, 3)));}
-	@Test   public void Subs_int()				{fxt.Test_parse("{'k0':{'k00':1}}", fxt.itm_nde_().Add_many(fxt.itm_kv_("k0", fxt.itm_nde_().Add_many(fxt.itm_kv_("k00", 1)))));}
-	@Test   public void Subs_empty()			{fxt.Test_parse("{'k0':{}}", fxt.itm_nde_().Add_many(fxt.itm_kv_("k0", fxt.itm_nde_())));}
-	@Test   public void Subs_ws()				{fxt.Test_parse("{'k0': { 'k00' : 1 } }", fxt.itm_nde_().Add_many(fxt.itm_kv_("k0", fxt.itm_nde_().Add_many(fxt.itm_kv_("k00", 1)))));}
-	@Test   public void Ws()					{fxt.Test_parse(" { 'k0' : 'v0' } ", fxt.itm_nde_().Add_many(fxt.itm_kv_("k0", "v0")));}
-	@Test   public void Root_is_ary()			{fxt.Test_parse("[ 1 , 2 , 3 ]", fxt.itm_ary_().Add_many(fxt.itm_int_(1), fxt.itm_int_(2), fxt.itm_int_(3)));}
-	public static String Replace_apos_as_str(String v) {return String_.new_u8(Replace_apos(Bry_.new_u8(v)));}
-	public static byte[] Replace_apos(byte[] v) {return Bry_.Replace(v, Byte_ascii.Apos, Byte_ascii.Quote);}
-}
-class Json_parser_fxt {
-	public void Clear() {
-		if (parser == null) {
-			parser = new Json_parser();
-			factory = parser.Factory();
-		}
-	}	Json_parser parser; Json_factory factory; Bry_bfr tmp_bfr = Bry_bfr.reset_(255);
-	public Json_itm itm_int_(int v)						{return Json_itm_tmp.new_int_(v);}
-	Json_itm itm_str_(String v)							{return Json_itm_tmp.new_str_(v);}
-	public Json_ary itm_ary_()							{return factory.Ary(-1, -1);}
-	public Json_nde itm_nde_()							{return factory.Nde(null, -1);}
-	public Json_kv itm_kv_null_(String k)				{return factory.Kv(itm_str_(k), factory.Null());}
-	public Json_kv itm_kv_(String k, String v)			{return factory.Kv(itm_str_(k), itm_str_(v));}
-	public Json_kv itm_kv_(String k, int v)				{return factory.Kv(itm_str_(k), itm_int_(v));}
-	public Json_kv itm_kv_(String k, boolean v)			{return factory.Kv(itm_str_(k), v ? factory.Bool_y() : factory.Bool_n());}
-	public Json_kv itm_kv_dec_(String k, String v)		{return factory.Kv(itm_str_(k), new Json_itm_tmp(Json_itm_.Tid__decimal, v));}
-	public Json_kv itm_kv_(String k, Json_nde v)	{return factory.Kv(itm_str_(k), v);}
-	public Json_kv itm_kv_ary_int_(String k, int... v) {
-		Json_ary ary = factory.Ary(-1, -1);
-		int len = v.length;
-		for (int i = 0; i < len; i++)
-			ary.Add(itm_int_(v[i]));
-		return factory.Kv(itm_str_(k), ary);
-	}
-	public Json_kv itm_kv_ary_str_(String k, String... v) {
-		Json_ary ary = factory.Ary(-1, -1);
-		int len = v.length;
-		for (int i = 0; i < len; i++)
-			ary.Add(itm_str_(v[i]));
-		return factory.Kv(itm_str_(k), ary);
-	}
-	public void Test_parse(String raw_str, Json_itm... expd_ary) {
-		byte[] raw = Json_parser_tst.Replace_apos(Bry_.new_u8(raw_str));
-		Json_doc doc = parser.Parse(raw);
-		doc.Root_grp().Print_as_json(tmp_bfr, 0);
-		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);
-	}
-	public void Test_parse_val0(String raw_str, Object expd) {
-		byte[] raw = Json_parser_tst.Replace_apos(Bry_.new_u8(raw_str));
-		Json_doc doc = parser.Parse(raw);
-		Json_kv kv = Json_kv.cast(doc.Root_nde().Get_at(0));	// assume root has kv as first sub; EX: {"a":"b"}
-		Object actl = kv.Val().Data();	 // NOTE: Data_bry is escaped val; EX: a\"b has DataBry of a"b
-		Tfds.Eq(expd, actl);
-	}
-	String Xto_str(byte[] raw, Json_doc doc, Json_itm[] ary, int bgn, int end) {
-		for (int i = bgn; i < end; i++) {
-			Json_itm itm = ary[i];
-			itm.Print_as_json(tmp_bfr, 0);
-		}
-		return tmp_bfr.Xto_str_and_clear();
-	}
-}

400_xowa/src/gplx/core/json/Json_wtr.java

@@ -1,230 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-import gplx.core.primitives.*;
-public class Json_wtr {
-	private final Bry_bfr bfr = Bry_bfr.new_(255);
-	private final Int_ary idx_stack = new Int_ary(4);
-	private int idx = 0;
-	private int indent;
-	public Bry_bfr Bfr() {return bfr;}
-	public void Indent_(int v) {this.indent = v;}
-	public byte Opt_quote_byte() {return opt_quote_byte;} public Json_wtr Opt_quote_byte_(byte v) {opt_quote_byte = v; return this;} private byte opt_quote_byte = Byte_ascii.Quote;
-	public boolean Opt_ws() {return opt_ws;} public Json_wtr Opt_ws_(boolean v) {opt_ws = v; return this;} private boolean opt_ws = true;
-	public byte[] To_bry_and_clear() {return bfr.Xto_bry_and_clear();}
-	public String To_str_and_clear() {return bfr.Xto_str_and_clear();}
-	public Json_wtr Clear() {
-		indent = -1;
-		idx_stack.Clear();
-		idx = 0;
-		return this;
-	}
-	public Json_wtr Doc_nde_bgn() {return Write_grp_bgn(Sym_nde_bgn);}
-	public Json_wtr Doc_nde_end() {Write_grp_end(Bool_.Y, Sym_nde_end); return Write_nl();}
-	public Json_wtr Doc_ary_bgn() {return Write_grp_bgn(Sym_ary_bgn);}
-	public Json_wtr Doc_ary_end() {Write_grp_end(Bool_.N, Sym_ary_end); return Write_nl();}
-	public Json_wtr Nde_bgn(String key) {return Nde_bgn(Bry_.new_u8(key));}
-	public Json_wtr Nde_bgn(byte[] key) {
-		Write_indent_itm();
-		Write_key(key);
-		Write_nl();
-		return Write_grp_bgn(Sym_nde_bgn);
-	}
-	public Json_wtr Nde_end() {
-		Write_grp_end(Bool_.Y, Sym_nde_end);
-		return Write_nl();
-	}
-	public Json_wtr Ary_bgn(String nde) {
-		Write_indent_itm();
-		Write_key(Bry_.new_u8(nde));
-		return Ary_bgn_keyless();
-	}
-	private Json_wtr Ary_bgn_keyless() {
-		Write_nl();
-		return Write_grp_bgn(Sym_ary_bgn);
-	}
-	public Json_wtr Ary_itm_str(String itm) {return Ary_itm_by_type_tid(Type_adp_.Tid__str, itm);}
-	public Json_wtr Ary_itm_bry(byte[] itm) {return Ary_itm_by_type_tid(Type_adp_.Tid__bry, itm);}
-	public Json_wtr Ary_itm_obj(Object itm) {return Ary_itm_by_type_tid(Type_adp_.To_tid_obj(itm), itm);}
-	public Json_wtr Ary_itm_by_type_tid(int itm_type_tid, Object itm) {
-		Write_indent_itm();
-		Write_val_obj(itm_type_tid, itm);
-		Write_nl();
-		++idx;
-		return this;
-	}
-	public Json_wtr Ary_end() {
-		Write_grp_end(Bool_.N, Sym_ary_end);
-		return Write_nl();
-	}
-	public Json_wtr Kv_bool_as_mw(String key, boolean val)	{
-		if (val) Kv_bry(key, Bry_.Empty);	// if true, write 'key:""'; if false, write nothing
-		return this;
-	}
-	public Json_wtr Kv_bool(String key, boolean val)		{return Kv_bool(Bry_.new_u8(key), val);}
-	public Json_wtr Kv_bool(byte[] key, boolean val)		{return Kv_raw(key, val ? Bool_.True_bry : Bool_.False_bry);}
-	public Json_wtr Kv_int(String key, int val)			{return Kv_raw(Bry_.new_u8(key), Int_.Xto_bry(val));}
-	public Json_wtr Kv_long(String key, long val)		{return Kv_raw(Bry_.new_u8(key), Bry_.new_a7(Long_.Xto_str(val)));}
-	public Json_wtr Kv_float(String key, float val)		{return Kv_raw(Bry_.new_u8(key), Bry_.new_a7(Float_.Xto_str(val)));}
-	public Json_wtr Kv_double(String key, double val)	{return Kv_raw(Bry_.new_u8(key), Bry_.new_a7(Double_.Xto_str(val)));}
-	private Json_wtr Kv_raw(byte[] key, byte[] val) {
-		Write_indent_itm();
-		Write_key(key);
-		bfr.Add(val);
-		Write_nl();
-		return this;
-	}
-	public Json_wtr Kv_str(String key, String val) {return Kv_bry(Bry_.new_u8(key), Bry_.new_u8(val));}
-	public Json_wtr Kv_str(byte[] key, String val) {return Kv_bry(key, Bry_.new_u8(val));}
-	public Json_wtr Kv_bry(String key, byte[] val) {return Kv_bry(Bry_.new_u8(key), val);}
-	public Json_wtr Kv_bry(byte[] key, byte[] val) {
-		Write_indent_itm();
-		Write_key(key);
-		Write_str(val);
-		Write_nl();
-		return this;
-	}
-	public Json_wtr Kv_obj(byte[] key, Object val, int val_tid) {
-		Write_indent_itm();
-		Write_key(key);
-		Write_val_obj(val_tid, val);
-		Write_nl();
-		return this;
-	}
-	private Json_wtr Write_grp_bgn(byte[] grp_sym) {return Write_grp_bgn(grp_sym, Bool_.Y);}
-	private Json_wtr Write_grp_bgn(byte[] grp_sym, boolean write_indent) {
-		idx_stack.Add(idx);
-		idx = 0;
-		++indent;
-		if (write_indent) Write_indent();
-		bfr.Add(grp_sym);
-		return this;
-	}
-	private Json_wtr Write_grp_end(boolean grp_is_nde, byte[] grp_sym) {
-		if ((grp_is_nde && idx == 0) || (!grp_is_nde && idx == 0))
-			Write_nl();
-		Write_indent();
-		--indent;
-		bfr.Add(grp_sym);
-		this.idx = idx_stack.Pop_or(0);
-		return this;
-	}
-	private Json_wtr Write_key(byte[] bry) {
-		Write_str(bry);				// "key"
-		bfr.Add_byte_colon();		// ":"
-		++idx;
-		return this;
-	}
-	private void Write_val_obj(int type_tid, Object obj) {
-		switch (type_tid) {
-			case Type_adp_.Tid__null:				bfr.Add(Object_.Bry__null); break;
-			case Type_adp_.Tid__bool:				bfr.Add_bool(Bool_.cast(obj)); break;
-			case Type_adp_.Tid__byte:				bfr.Add_byte(Byte_.cast(obj)); break;
-			case Type_adp_.Tid__int:				bfr.Add_int_variable(Int_.cast(obj)); break;
-			case Type_adp_.Tid__long:				bfr.Add_long_variable(Long_.cast(obj)); break;
-			case Type_adp_.Tid__float:				bfr.Add_float(Float_.cast(obj)); break;
-			case Type_adp_.Tid__double:				bfr.Add_double(Double_.cast(obj)); break;
-			case Type_adp_.Tid__str:				Write_str(Bry_.new_u8((String)obj)); break;
-			case Type_adp_.Tid__bry:				Write_str((byte[])obj); break;
-			case Type_adp_.Tid__char:				
-			case Type_adp_.Tid__date:
-			case Type_adp_.Tid__decimal:			Write_str(Bry_.new_u8(Object_.Xto_str_strict_or_empty(obj))); break;
-			case Type_adp_.Tid__obj:
-				Class<?> type = obj.getClass();
-				if (Type_adp_.Eq(type, KeyVal[].class)) {
-					if (idx == 0) {	// if nde, and first item, then put on new line
-						bfr.Del_by_1();
-						if (opt_ws) {
-							bfr.Add_byte_nl();
-							++indent;
-							Write_indent();
-							--indent;
-						}
-					}
-					KeyVal[] kvy = (KeyVal[])obj;
-					Write_grp_bgn(Sym_nde_bgn, Bool_.N);
-					int kvy_len = kvy.length;
-					for (int i = 0; i < kvy_len; ++i) {
-						KeyVal kv = kvy[i];
-						Object kv_val = kv.Val();
-						Kv_obj(Bry_.new_u8(kv.Key()), kv_val, Type_adp_.To_tid_obj(kv_val));
-					}
-					Write_grp_end(Bool_.Y, Sym_nde_end);
-				}
-				else if (Type_adp_.Is_array(type))
-					Write_val_ary(obj);
-				else
-					throw Err_.new_unhandled(type);
-				break;
-			default:								throw Err_.new_unhandled(type_tid);
-		}
-	}
-	private void Write_val_ary(Object ary_obj) {
-		Ary_bgn_keyless();
-		Object ary = Array_.cast(ary_obj);	
-		int len = Array_.Len(ary);
-		for (int i = 0; i < len; ++i) {
-			Object itm = Array_.Get_at(ary, i);
-			Ary_itm_obj(itm);
-		}
-		Write_grp_end(Bool_.N, Sym_ary_end);
-	}
-	private void Write_str(byte[] bry) {
-		if (bry == null) {bfr.Add(Object_.Bry__null); return;}
-		int len = bry.length;
-		bfr.Add_byte(opt_quote_byte);
-		for (int i = 0; i < len; ++i) {
-			byte b = bry[i];
-			switch (b) {
-				case Byte_ascii.Backslash:	bfr.Add_byte(Byte_ascii.Backslash).Add_byte(b); break; // "\"	-> "\\"; needed else js will usurp \ as escape; EX: "\&" -> "&"; DATE:2014-06-24
-				case Byte_ascii.Quote:		bfr.Add_byte(Byte_ascii.Backslash).Add_byte(b); break;
-				case Byte_ascii.Apos:		bfr.Add_byte(b); break;
-				case Byte_ascii.Nl:			bfr.Add_byte_repeat(Byte_ascii.Backslash, 2).Add_byte(Byte_ascii.Ltr_n); break;	// "\n" -> "\\n"
-				case Byte_ascii.Cr:			break;// skip
-				default:					bfr.Add_byte(b); break;
-			}
-		}
-		bfr.Add_byte(opt_quote_byte);
-	}
-	private void Write_indent_itm() {
-		if (idx == 0) {
-			if (opt_ws)
-				bfr.Add_byte_space();
-		}
-		else {
-			Write_indent();
-			bfr.Add(Sym_itm_spr);
-			if (opt_ws) bfr.Add_byte_space();
-		}
-	}
-	private void Write_indent() {
-		if (opt_ws && indent > 0)
-			bfr.Add_byte_repeat(Byte_ascii.Space, indent * 2);
-	}
-	private Json_wtr Write_nl() {
-		if (opt_ws) bfr.Add_byte_nl();
-		return this;
-	}
-	private static final byte[]
-	  Sym_nde_bgn	= Bry_.new_a7("{")
-	, Sym_nde_end	= Bry_.new_a7("}")
-	, Sym_ary_bgn	= Bry_.new_a7("[")
-	, Sym_ary_end	= Bry_.new_a7("]")
-	, Sym_itm_spr	= Bry_.new_a7(",")
-	;
-}

400_xowa/src/gplx/core/json/Json_wtr_tst.java

@@ -1,114 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.json; import gplx.*; import gplx.core.*;
-import org.junit.*;
-public class Json_wtr_tst {
-	@Before public void init() {fxt.Clear();} private final Json_wtr_fxt fxt = new Json_wtr_fxt();
-	@Test   public void Root() {
-		fxt.Wtr().Doc_nde_bgn().Doc_nde_end();
-		fxt.Test
-		( "{"
-		, "}"
-		);
-	}
-	@Test   public void Kv() {
-		fxt.Wtr()
-			.Doc_nde_bgn()
-			.Kv_str("k0", "v0")
-			.Kv_str("k1", "v1")
-			.Doc_nde_end();
-		fxt.Test
-		( "{ 'k0':'v0'"
-		, ", 'k1':'v1'"
-		, "}"
-		);
-	}
-	@Test   public void Nde() {
-		fxt.Wtr()
-			.Doc_nde_bgn()
-				.Nde_bgn("s0")
-					.Nde_bgn("s00")
-					.Nde_end()
-				.Nde_end()
-				.Nde_bgn("s1")
-					.Nde_bgn("s10")
-					.Nde_end()
-				.Nde_end()
-			.Doc_nde_end();
-		fxt.Test
-		( "{ 's0':"
-		, "  { 's00':"
-		, "    {"
-		, "    }"
-		, "  }"
-		, ", 's1':"
-		, "  { 's10':"
-		, "    {"
-		, "    }"
-		, "  }"
-		, "}"
-		);
-	}
-	@Test   public void Ary() {
-		fxt.Wtr()
-			.Doc_nde_bgn()
-			.Ary_bgn("a0")
-			.Ary_itm_str("v0")
-			.Ary_itm_str("v1")
-			.Ary_end()
-			.Doc_nde_end();
-		fxt.Test
-		( "{ 'a0':"
-		, "  [ 'v0'"
-		, "  , 'v1'"
-		, "  ]"
-		, "}"
-		);
-	}
-	@Test   public void Nde__nested() {
-		fxt.Wtr()
-			.Doc_nde_bgn()
-			.Ary_bgn("a0")
-				.Ary_itm_obj(KeyVal_.Ary
-				(	KeyVal_.new_("k1", "v1")
-				,	KeyVal_.new_("k2", "v2")
-				))
-			.Ary_end()
-			.Doc_nde_end();
-		fxt.Test
-		( "{ 'a0':"
-		, "  ["
-		, "    { 'k1':'v1'"
-		, "    , 'k2':'v2'"
-		, "    }"
-		, "  ]"
-		, "}"
-		);
-	}
-}
-class Json_wtr_fxt {
-	private final Json_wtr wtr = new Json_wtr().Opt_quote_byte_(Byte_ascii.Apos);
-	public void Clear() {wtr.Clear();}
-	public Json_wtr Wtr() {return wtr;}
-	public void Test(String... expd) {
-		Tfds.Eq_ary_str
-		( String_.Ary_add(expd, String_.Ary(""))		// json_wtr always ends with "}\n"; rather than add "\n" to each test, just add it here
-		, String_.SplitLines_nl(String_.new_u8(wtr.To_bry_and_clear()))
-		);
-	}
-}

400_xowa/src/gplx/core/lists/StatRng.java

@@ -0,0 +1,142 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.lists; import gplx.*; import gplx.core.*;
+class StatRng_fxt {	// UNUSED:useful for stat processing
+	StatRng rng;
+	public StatRng_fxt ini_(int lo_ary_len, int hi_ary_len, int... slot_hi_ary) {
+		rng = new StatRng(lo_ary_len, hi_ary_len, slot_hi_ary);
+		return this;
+	}
+	public StatRng_fxt tst_(int... vals) {
+		for (int i = 0; i < vals.length; i++) {
+			int val = vals[i];
+			rng.Assign(val, val);
+		}
+		Tfds.Eq(expd_count, rng.Count, "Count");
+		Tfds.Eq(expd_lo, rng.Lo, "Lo");
+		Tfds.Eq(expd_hi, rng.Hi, "Hi");
+		Tfds.Eq_float(expd_avg, rng.Avg());
+		Tfds.Eq_ary(expd_lo_ary, XtoIntAry(rng.Lo_ary), "Lo_ary");
+		Tfds.Eq_ary(expd_hi_ary, XtoIntAry(rng.Hi_ary), "Hi_ary");
+		Tfds.Eq_ary(expd_slots, XtoIntAry(rng.Slot_ary), "Slots");
+		return this;
+	}
+	int[] XtoIntAry(StatItm[] ary) {
+		int[] rv = new int[ary.length];
+		for (int i = 0; i < rv.length; i++)
+			rv[i] = ary[i].Val;
+		return rv;
+	}
+	int[] XtoIntAry(StatRng[] ary) {
+		int[] rv = new int[ary.length];
+		for (int i = 0; i < rv.length; i++)
+			rv[i] = ary[i].Count;
+		return rv;
+	}
+	public StatRng_fxt Count_(int v) {expd_count = v; return this;} private int expd_count; 
+	public StatRng_fxt Lo_(int v) {expd_lo = v; return this;} private int expd_lo; 
+	public StatRng_fxt Hi_(int v) {expd_hi = v; return this;} private int expd_hi; 
+	public StatRng_fxt Avg_(float v) {expd_avg = v; return this;} float expd_avg;
+	public StatRng_fxt Lo_ary_(int... v) {expd_lo_ary = v; return this;} private int[] expd_lo_ary; 
+	public StatRng_fxt Hi_ary_(int... v) {expd_hi_ary = v; return this;} private int[] expd_hi_ary; 
+	public StatRng_fxt Slots_(int... v) {expd_slots = v; return this;} private int[] expd_slots; 
+}
+class StatRng {
+//		public String Key;
+	public int Lo = Int_.Max_value;
+	public int Hi = Int_.Min_value;
+	public long Sum = 0;
+	public int Count = 0;
+	public float Avg() {return Sum  / Count;}
+	public final StatItm[] Lo_ary;
+	public int Lo_ary_bound;
+	public int Lo_ary_len;
+	public final StatItm[] Hi_ary;
+	public int Hi_ary_bound;
+	public int Hi_ary_len;
+	public StatRng[] Slot_ary;
+	public int Slot_ary_len;
+	public StatRng(int lo_ary_len, int hi_ary_len, int... slot_hi_ary) {
+		this.Lo_ary_len = lo_ary_len;
+		this.Lo_ary_bound = Int_.Max_value;
+		this.Lo_ary = NewBoundAry(lo_ary_len, Int_.Max_value);		
+		this.Hi_ary_len = hi_ary_len;
+		this.Hi_ary_bound = Int_.Min_value;
+		this.Hi_ary = NewBoundAry(hi_ary_len, Int_.Min_value);
+		if (slot_hi_ary != null && slot_hi_ary.length > 0) {
+			Slot_ary_len = slot_hi_ary.length + 1; // + 1 to hold max value
+			Slot_ary = new StatRng[Slot_ary_len];
+			int slot_lo = Int_.Min_value;
+			for (int i = 0; i < Slot_ary_len - 1; i++) {
+				int slot_hi = slot_hi_ary[i];
+				Slot_ary[i] = NewSlot(slot_lo, slot_hi);
+				slot_lo = slot_hi;
+			}
+			Slot_ary[Slot_ary_len - 1] = NewSlot(slot_lo, Int_.Max_value);
+		}
+	}
+	public void Assign(Object key, int val) {
+		if (val < Lo) Lo = val;
+		if (val > Hi) Hi = val;
+		Sum += val;
+		++Count;
+		
+		if (Slot_ary_len > 0) {
+			for (int i = 0; i < Slot_ary_len; i++) {
+				StatRng slot = Slot_ary[i];
+				if (val >= slot.Lo && val < slot.Hi)
+					slot.Assign(key, val);
+			}
+		}
+		if (val < Lo_ary_bound) {
+			Lo_ary_bound = CalcCutoff(Lo_ary, CompareAble_.More, Int_.Min_value, key, val);
+		} 
+		if (val > Hi_ary_bound) {
+			Hi_ary_bound = CalcCutoff(Hi_ary, CompareAble_.Less, Int_.Max_value, key, val);
+		} 
+	}
+	int CalcCutoff(StatItm[] ary, int comp, int bgn_bound, Object key, int val) {
+		int new_bound = bgn_bound;
+		for (int i = 0; i < ary.length; i++) {
+			StatItm itm = ary[i];
+			if (Int_.Compare(itm.Val, val) == comp) {
+				itm = new StatItm(key, val);
+				ary[i] = itm;
+			}
+			if (Int_.Compare(itm.Val, new_bound) == comp) new_bound = itm.Val;
+		}
+		return new_bound;
+	}
+	StatRng NewSlot(int lo, int hi) {
+		StatRng rv = new StatRng(0, 0);
+		rv.Lo = lo;
+		rv.Hi = hi;
+		return rv;
+	}
+	StatItm[] NewBoundAry(int len, int dflt) {
+		StatItm[] rv = new StatItm[len];
+		for (int i = 0; i < len; i++)
+			rv[i] = new StatItm(null, dflt);
+		return rv;
+	}
+}
+class StatItm {
+	public Object Key;
+	public int Val;
+	public StatItm(Object key, int val) {this.Key = key; this.Val = val;}
+}

400_xowa/src/gplx/core/lists/StatRng_tst.java

@@ -0,0 +1,39 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.lists; import gplx.*; import gplx.core.*;
+import org.junit.*;
+public class StatRng_tst {
+//		Mwl_parser_fxt fx = new Mwl_parser_fxt(); Pf_func_lang_rsc rsc = Pf_func_lang_rsc._;
+	StatRng_fxt fx = new StatRng_fxt();
+	@Test  public void Empty()				{
+ 			fx.ini_(1, 1, 5);
+		fx.Count_(7).Lo_(2).Hi_(8).Avg_(5)
+		.Lo_ary_(2)
+		.Hi_ary_(8)
+		.Slots_(3, 4);
+		fx.tst_(5,7,2,8,3,4,6);
+	}
+//@Test  public void Basic() {fx.Test_parse_tmpl_str_test("{{#switch:{{{1}}}|a=1|b=2|3}}", "{{test|a}}", "1");}
+//@Test  public void Basic() {fx.Test_parse_tmpl_str_test("{{#switch:{{{1}}}|b=2|#default=3|a=1}}", "{{test|a}}", "1");}
+//@Test  public void Basic() {fx.Test_parse_tmpl_str_test("{{#switch:{{{1}}}|a|b|c=1|d=2}}", "{{test|a}}", "1");}
+}
+/*
+public class Pf_func_switch_tst {
+//		Mwl_parser_fxt fx = new Mwl_parser_fxt(); Pf_func_lang_rsc rsc = Pf_func_lang_rsc._;
+
+*/

400_xowa/src/gplx/core/net/Gfo_inet_conn.java

@@ -18,6 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.core.net; import gplx.*; import gplx.core.*;
 public interface Gfo_inet_conn {
 	void		Clear();
-	void		Upload_data(byte[] url, byte[] data);
-	byte[]		Download_data(byte[] url);
+	void		Upload_by_bytes(String url, byte[] data);
+	byte[]		Download_as_bytes_or_null(String url);	// return null instead of throwing exception
 }

400_xowa/src/gplx/core/net/Gfo_inet_conn_.java

@@ -17,18 +17,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.core.net; import gplx.*; import gplx.core.*;
 public class Gfo_inet_conn_ {
-	public static Gfo_inet_conn new_mem_hash() {return new Gfo_inet_conn__mem__hash();}
-	public static Gfo_inet_conn new_mem_pile() {return new Gfo_inet_conn__mem__pile();}
+	public static Gfo_inet_conn new_http()		{return new Gfo_inet_conn__http();}
+	public static Gfo_inet_conn new_mem_hash()	{return new Gfo_inet_conn__mem__hash();}
+	public static Gfo_inet_conn new_mem_pile()	{return new Gfo_inet_conn__mem__pile();}
 }
 class Gfo_inet_conn__mem__hash implements Gfo_inet_conn {
 	private final Hash_adp_bry hash = Hash_adp_bry.cs();
 	public void		Clear() {hash.Clear();}
-	public void		Upload_data(byte[] url, byte[] data) {hash.Add(url, data);}
-	public byte[]	Download_data(byte[] url) {return (byte[])hash.Get_by(url);}
+	public void		Upload_by_bytes(String url, byte[] data) {hash.Add(url, data);}
+	public byte[]	Download_as_bytes_or_null(String url) {return (byte[])hash.Get_by(url);}
 }
 class Gfo_inet_conn__mem__pile implements Gfo_inet_conn {
 	private final List_adp pile = List_adp_.new_();
 	public void		Clear() {pile.Clear();}
-	public void		Upload_data(byte[] url, byte[] data) {pile.Add(data);}
-	public byte[]	Download_data(byte[] url) {return (byte[])List_adp_.Pop_last(pile);}
+	public void		Upload_by_bytes(String url, byte[] data) {pile.Add(data);}
+	public byte[]	Download_as_bytes_or_null(String url) {return (byte[])List_adp_.Pop_last(pile);}
 }

400_xowa/src/gplx/core/net/Gfo_inet_conn__http.java

@@ -15,14 +15,14 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.json; import gplx.*; import gplx.core.*;
-public class Json_itm_ {
-	public static final Json_itm[] Ary_empty = new Json_itm[0];
-	public static final byte Tid__unknown = 0, Tid__null = 1, Tid__bool = 2, Tid__int = 3, Tid__decimal = 4, Tid__str = 5, Tid__kv = 6, Tid__ary = 7, Tid__nde = 8;
-	public static final byte[] Bry__true = Bool_.True_bry, Bry__false = Bool_.False_bry, Bry__null = Object_.Bry__null;
-	public static byte[] To_bry(Bry_bfr bfr, Json_itm itm) {
-		if (itm == null) return Bry_.Empty;
-		itm.Print_as_json(bfr, 0);
-		return bfr.Xto_bry_and_clear();
+package gplx.core.net; import gplx.*; import gplx.core.*;
+import gplx.ios.*;
+class Gfo_inet_conn__http implements Gfo_inet_conn {
+	private final IoEngine_xrg_downloadFil downloader = IoEngine_xrg_downloadFil.new_("", Io_url_.Empty);
+	public void		Clear()										{throw Err_.new_unsupported();}
+	public void		Upload_by_bytes(String url, byte[] data)	{throw Err_.new_unsupported();}
+	public byte[]	Download_as_bytes_or_null(String url) {
+		try {return downloader.Exec_as_bry(url);}
+		catch (Exception e) {Err_.Noop(e); return null;}
 	}
 }

400_xowa/src/gplx/core/net/Gfo_qarg_mgr.java

@@ -16,6 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.core.net; import gplx.*; import gplx.core.*;
+import gplx.langs.htmls.encoders.*;
 public class Gfo_qarg_mgr {
 	private final List_adp list = List_adp_.new_();
 	private final Hash_adp hash = Hash_adp_bry.cs();

400_xowa/src/gplx/core/net/Gfo_url_parser.java

@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.core.net; import gplx.*; import gplx.core.*;
-import gplx.core.primitives.*; import gplx.core.btries.*;
+import gplx.core.primitives.*; import gplx.core.btries.*; import gplx.langs.htmls.encoders.*;
 public class Gfo_url_parser {
 	private final Btrie_slim_mgr protocols = Btrie_slim_mgr.ci_a7();	// ASCII:url_protocol; EX:"http:", "ftp:", etc
 	private final Bry_ary segs_ary = new Bry_ary(4), qargs = new Bry_ary(4);
@@ -46,7 +46,7 @@ public class Gfo_url_parser {
 			rel = true;
 		}
 		if (!rel) {	// search for ":"; NOTE: only search if not rel; i.e.: "//"
-			int colon_pos = Bry_finder.Find_fwd(src, Byte_ascii.Colon, pos, src_end);	// no colon found; EX: "//a.org/b"; "a.org/b"
+			int colon_pos = Bry_find_.Find_fwd(src, Byte_ascii.Colon, pos, src_end);	// no colon found; EX: "//a.org/b"; "a.org/b"
 			if (colon_pos != Bry_.NotFound)											// colon found; EX: "http://" or "https://"
 				pos = colon_pos + Int_.Const_dlm_len;
 			if (pos < src_end && src[pos] == Byte_ascii.Slash) {					// skip slash after colon
@@ -55,7 +55,7 @@ public class Gfo_url_parser {
 					pos += 1;
 			}
 		}
-		int slash_pos = Bry_finder.Find_fwd(src, Byte_ascii.Slash, pos, src_end);
+		int slash_pos = Bry_find_.Find_fwd(src, Byte_ascii.Slash, pos, src_end);
 		if (slash_pos == Bry_.NotFound)												// no terminating slash; EX: http://a.org
 			slash_pos = src_end;
 		slash_pos = Bry_.Trim_end_pos(src, slash_pos);
@@ -79,7 +79,7 @@ public class Gfo_url_parser {
 		int pos = src_bgn;
 		Object protocol_obj = protocols.Match_bgn(src, src_bgn, src_end);
 		pos = protocols.Match_pos();
-		pos = Bry_finder.Find_fwd_while(src, pos, src_end, Byte_ascii.Slash);
+		pos = Bry_find_.Find_fwd_while(src, pos, src_end, Byte_ascii.Slash);
 		if (protocol_obj == null) {
 			this.protocol_tid = Gfo_protocol_itm.Tid_unknown;
 		}
@@ -130,7 +130,7 @@ public class Gfo_url_parser {
 			case Area__qarg_key_1st:
 			case Area__qarg_key_nth:
 				if (anch_nth_bgn == -1)
-					anch_nth_bgn = Bry_finder.Find_bwd(src, Byte_ascii.Hash, src_end);
+					anch_nth_bgn = Bry_find_.Find_bwd(src, Byte_ascii.Hash, src_end);
 				if (pos == anch_nth_bgn) {
 					End_area(pos, b);
 					area = Area__anch;

400_xowa/src/gplx/core/net/Http_request_parser.java

@@ -64,7 +64,7 @@ public class Http_request_parser {
 					server_wtr.Write_str_w_nl(String_.Format("http.request.parser; unknown line; line={0} request={1}", line_str, To_str()));
 					continue;
 				}
-				int val_bgn = Bry_finder.Find_fwd_while_ws(line, trie.Match_pos(), line_len);	// skip ws after key; EX: "Host: "
+				int val_bgn = Bry_find_.Find_fwd_while_ws(line, trie.Match_pos(), line_len);	// skip ws after key; EX: "Host: "
 				int tid = ((Int_obj_val)o).Val();
 				switch (tid) {
 					case Tid_get:
@@ -91,7 +91,7 @@ public class Http_request_parser {
 		}
 	}
 	private void Parse_type(int tid, int val_bgn, byte[] line, int line_len) {	// EX: "POST /xowa-cmd:exec_as_json HTTP/1.1"
-		int url_end = Bry_finder.Find_bwd(line, Byte_ascii.Space, line_len); if (url_end == Bry_finder.Not_found) throw Err_.new_wo_type("invalid protocol", "line", line, "request", To_str());
+		int url_end = Bry_find_.Find_bwd(line, Byte_ascii.Space, line_len); if (url_end == Bry_find_.Not_found) throw Err_.new_wo_type("invalid protocol", "line", line, "request", To_str());
 		switch (tid) {
 			case Tid_get	: this.type = Http_request_itm.Type_get; break;
 			case Tid_post	: this.type = Http_request_itm.Type_post; break;
@@ -102,8 +102,8 @@ public class Http_request_parser {
 	}
 	private void Parse_content_type(int val_bgn, byte[] line, int line_len) {	// EX: Content-Type: multipart/form-data; boundary=---------------------------72432484930026
 		// handle wolfram and other clients; DATE:2015-08-03
-		int boundary_bgn = Bry_finder.Find_fwd(line, Tkn_boundary, val_bgn, line_len); if (boundary_bgn == Bry_finder.Not_found) return; // PURPOSE: ignore content-type for GET calls like by Mathematica server; DATE:2015-08-04 // throw Err_.new_wo_type("invalid content_type", "line", line, "request", To_str());
-		int content_type_end = Bry_finder.Find_bwd(line, Byte_ascii.Semic, boundary_bgn);
+		int boundary_bgn = Bry_find_.Find_fwd(line, Tkn_boundary, val_bgn, line_len); if (boundary_bgn == Bry_find_.Not_found) return; // PURPOSE: ignore content-type for GET calls like by Mathematica server; DATE:2015-08-04 // throw Err_.new_wo_type("invalid content_type", "line", line, "request", To_str());
+		int content_type_end = Bry_find_.Find_bwd(line, Byte_ascii.Semic, boundary_bgn);
 		this.content_type = Bry_.Mid(line, val_bgn, content_type_end);
 		this.content_type_boundary = Bry_.Add(Tkn_content_type_boundary_end, Bry_.Mid(line, boundary_bgn += Tkn_boundary.length, line_len));
 	}
@@ -142,7 +142,7 @@ public class Http_request_parser {
 		int tkn_len = tkn.length;
 		if (!Bry_.Match(src, src_pos, src_pos + tkn_len, tkn)) throw Err_.new_wo_type("http.request.parser; invalid form_data line", "tkn", tkn, "line", src, "request", To_str());
 		int rv = src_pos += tkn_len;
-		return Bry_finder.Find_fwd_while_ws(src, rv, src_len);
+		return Bry_find_.Find_fwd_while_ws(src, rv, src_len);
 	}
 	private String To_str() {return Make_request_itm().To_str(tmp_bfr, Bool_.N);}
 	private static final int Tid_get = 1, Tid_post = 2, Tid_host = 3, Tid_user_agent = 4, Tid_accept = 5, Tid_accept_language = 6, Tid_accept_encoding = 7, Tid_dnt = 8

400_xowa/src/gplx/core/primitives/Int_ary.java

@@ -46,6 +46,10 @@ public class Int_ary {
 		ary[len] = v;
 		++len;
 	}
+	public int Pop_or_fail() {
+		if (len == 0) throw Err_.new_("core.int_ary", "stack is empty");
+		return Pop_or(-1);
+	}
 	public int Pop_or(int or) {
 		if (len == 0) return or;
 		int rv = ary[len - 1];

400_xowa/src/gplx/core/primitives/Int_ary_bldr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.ints; import gplx.*; import gplx.core.*;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 public class Int_ary_bldr {
 	public Int_ary_bldr(int len) {ary = new int[len];}
 	public Int_ary_bldr Set(int idx, int val) {ary[idx] = val; return this;}

400_xowa/src/gplx/core/primitives/Int_pool.java

@@ -0,0 +1,59 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
+public class Int_pool {
+	private final List_adp available_list = List_adp_.new_(); private int available_len;
+	private int uid_max = -1;
+	public void Clear() {
+		available_list.Clear();
+		available_len = 0;
+		uid_max = -1;
+	}
+	public int Get_next() {
+		synchronized (available_list) {
+			if (available_len == 0)
+				return ++uid_max;
+			else {
+				Int_obj_val val = (Int_obj_val)List_adp_.Pop_last(available_list);
+				--available_len;
+				return val.Val();
+			}
+		}
+	}
+	public void Del(int v) {
+		if (v > uid_max) throw Err_.new_("core", "value is greater than range", "value", v, "max", uid_max);
+		synchronized (available_list) {
+			if (available_len == 0 && v == uid_max) {
+				--this.uid_max;
+				return;
+			}
+			if (available_len == uid_max) {
+				available_list.Sort();
+				for (int i = 0; i < available_len; ++i) {
+					Int_obj_val itm = (Int_obj_val)available_list.Get_at(i);
+					if (i != itm.Val()) throw Err_.new_("core", "available_list out of order", "contents", available_list.To_str());
+				}
+				this.Clear();
+			}
+			else {
+				available_list.Add(Int_obj_val.new_(v));
+				++available_len;
+			}
+		}
+	}
+}

400_xowa/src/gplx/core/primitives/Int_pool_tst.java

@@ -0,0 +1,67 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
+import org.junit.*;
+public class Int_pool_tst {
+	private final Int_pool_tstr tstr = new Int_pool_tstr();
+	@Before public void init() {tstr.Clear();}
+	@Test  public void Get__one() {
+		tstr.Test_get(0);
+	}
+	@Test  public void Get__many() {
+		tstr.Test_get(0);
+		tstr.Test_get(1);
+		tstr.Test_get(2);
+	}
+	@Test  public void Del__one() {
+		tstr.Test_get(0);
+		tstr.Exec_del(0);
+		tstr.Test_get(0);
+	}
+	@Test  public void Del__sequential() {
+		tstr.Test_get(0);
+		tstr.Test_get(1);
+		tstr.Test_get(2);
+		tstr.Exec_del(2).Test_get(2);
+		tstr.Exec_del(2);
+		tstr.Exec_del(1);
+		tstr.Exec_del(0).Test_get(0);
+	}
+	@Test  public void Del__out_of_order() {
+		tstr.Test_get(0);
+		tstr.Test_get(1);
+		tstr.Test_get(2);
+		tstr.Exec_del(0).Test_get(0);
+		tstr.Exec_del(0);
+		tstr.Exec_del(1);
+		tstr.Exec_del(2);
+		tstr.Test_get(0);
+	}
+}
+class Int_pool_tstr {
+	private final Int_pool pool = new Int_pool();
+	public void Clear() {pool.Clear();}
+	public Int_pool_tstr Test_get(int expd) {
+		Tfds.Eq(expd, pool.Get_next());
+		return this;
+	}
+	public Int_pool_tstr Exec_del(int val) {
+		pool.Del(val);
+		return this;
+	}
+}

400_xowa/src/gplx/core/primitives/Number_parser.java

@@ -0,0 +1,181 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
+public class Number_parser {
+	public int				Rv_as_int() {return (int)int_val;} private long int_val = 0;
+	public Decimal_adp		Rv_as_dec() {return dec_val == null ? Decimal_adp_.long_(int_val) : dec_val;} private Decimal_adp dec_val = null;
+	public boolean				Has_err()  {return has_err;} private boolean has_err;
+	public boolean				Has_frac() {return has_frac;} private boolean has_frac;
+	public boolean				Hex_enabled() {return hex_enabled;} public Number_parser Hex_enabled_(boolean v) {hex_enabled = v; return this;} private boolean hex_enabled;
+	public Number_parser	Ignore_chars_(byte[] v) {this.ignore_chars = v; return this;} private byte[] ignore_chars;
+	public Number_parser	Ignore_space_at_end_y_() {this.ignore_space_at_end = true; return this;} private boolean ignore_space_at_end;
+	public void	Clear() {
+		ignore_chars = null;
+	}
+	public Number_parser Parse(byte[] src) {return Parse(src, 0, src.length);}
+	public Number_parser Parse(byte[] ary, int bgn, int end) {
+		int loop_bgn = end - 1, loop_end = bgn - 1, exp_multiplier = 1, factor = 10;
+		long multiplier = 1, frc_multiplier = 1;
+		int_val = 0; dec_val = null; boolean comma_nil = true;
+		long frc_int = 0;
+		has_err = false; has_frac = false; boolean has_exp = false, has_neg = false, exp_neg = false, has_plus = false, has_num = false;
+		boolean input_is_hex = false;
+		if (hex_enabled) {
+			if (loop_end + 2 < end) {		// ArrayOutOfBounds check
+				byte b_2 = ary[loop_end + 2];
+				switch (b_2) {
+					case Byte_ascii.Ltr_x:
+					case Byte_ascii.Ltr_X:								// is 2nd char x?
+						if (ary[loop_end + 1] == Byte_ascii.Num_0) {	// is 1st char 0?
+							factor = 16;
+							input_is_hex = true;
+						}
+						break;
+					default:
+						break;
+				}
+			}
+		}
+		for (int i = loop_bgn; i > loop_end; i--) {
+			byte cur = ary[i];
+			switch (cur) {
+				case Byte_ascii.Num_0:
+				case Byte_ascii.Num_1:
+				case Byte_ascii.Num_2:
+				case Byte_ascii.Num_3:
+				case Byte_ascii.Num_4:
+				case Byte_ascii.Num_5:
+				case Byte_ascii.Num_6:
+				case Byte_ascii.Num_7:
+				case Byte_ascii.Num_8:
+				case Byte_ascii.Num_9:
+					int_val += (cur - Byte_ascii.Num_0) * multiplier;
+					multiplier *= factor;
+					has_num = true;
+					break;
+				case Byte_ascii.Dot:
+					if (has_frac) return Has_err_y_();
+					frc_int = int_val;
+					int_val = 0;
+					frc_multiplier = multiplier;
+					multiplier = 1;
+					has_frac = true;
+					break;
+				case Byte_ascii.Comma:
+					if (comma_nil)
+						comma_nil = false;
+					else
+						return Has_err_y_();
+					break;
+				case Byte_ascii.Dash:
+					if (has_neg) return Has_err_y_();
+					has_neg = true;
+					break;
+				case Byte_ascii.Space:
+					if		(i == bgn) {}	// space at bgn
+					else if (i == end - 1 && ignore_space_at_end) {}	// ignore space at end; DATE:2015-04-29
+					else
+						return Has_err_y_();
+					break;
+				case Byte_ascii.Plus:
+					if (has_plus) return Has_err_y_();
+					has_plus = true;
+					break;
+				case Byte_ascii.Ltr_e:
+				case Byte_ascii.Ltr_E:
+					if (input_is_hex) {
+						int_val += 14 * multiplier;	// NOTE: 14=value of e/E
+						multiplier *= factor;
+						has_num = true;						
+					}
+					else {
+						if (has_exp) return Has_err_y_();
+						exp_neg = has_neg;
+						exp_multiplier = (int)Math_.Pow(10, int_val);
+						int_val = 0;
+						multiplier = 1;
+						has_exp = true;
+						has_neg = false;
+						has_plus = false;	// allow +1E+2
+					}
+					break;
+				case Byte_ascii.Ltr_A:
+				case Byte_ascii.Ltr_B:
+				case Byte_ascii.Ltr_C:
+				case Byte_ascii.Ltr_D:
+				case Byte_ascii.Ltr_F:
+					if (input_is_hex) {
+						int_val += (cur - Byte_ascii.Ltr_A + 10) * multiplier;
+						multiplier *= factor;
+						has_num = true;
+					}
+					else
+						return Has_err_y_();
+					break;
+				case Byte_ascii.Ltr_a:
+				case Byte_ascii.Ltr_b:
+				case Byte_ascii.Ltr_c:
+				case Byte_ascii.Ltr_d:
+				case Byte_ascii.Ltr_f:
+					if (input_is_hex) {
+						int_val += (cur - Byte_ascii.Ltr_a + 10) * multiplier;
+						multiplier *= factor;
+						has_num = true;
+					}
+					else
+						return Has_err_y_();
+					break;
+				case Byte_ascii.Ltr_x:
+				case Byte_ascii.Ltr_X:
+					if (input_is_hex)
+						return (factor == 16) ? this : Has_err_y_();	// check for '0x'
+					else
+						return Has_err_y_();
+				default:
+					if (ignore_chars != null) {
+						int ignore_chars_len = ignore_chars.length;
+						boolean ignored = false;
+						for (int j = 0; j < ignore_chars_len; ++j) {
+							if (cur == ignore_chars[j]) {
+								ignored = true;
+								break;
+							}
+						}
+						if (ignored) continue;
+					}
+					return Has_err_y_();
+			}
+		}			
+		if (!has_num) return Has_err_y_();	// handles situations wherein just symbols; EX: "+", ".", "-.", " ,  " etc.
+		if (has_frac) {
+			long full_val = (((int_val * frc_multiplier) + frc_int));
+			if (has_neg) full_val *= -1;
+			if (has_exp) {
+				if (exp_neg)	frc_multiplier	*= exp_multiplier;	// divide, so apply to frc
+				else			full_val		*= exp_multiplier;	// multiply, so apply to full_val
+			}
+			dec_val = Decimal_adp_.divide_(full_val, frc_multiplier);
+		}
+		else {
+			if (has_neg) int_val *= -1;
+			if (has_exp) int_val = exp_neg ? int_val / exp_multiplier : int_val * exp_multiplier;
+		}
+		return this;
+	}
+	private Number_parser Has_err_y_() {has_err = true; return this;}
+}

400_xowa/src/gplx/core/primitives/Number_parser_tst.java

@@ -0,0 +1,103 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
+import org.junit.*;
+public class Number_parser_tst {
+	private final Number_parser_fxt fxt = new Number_parser_fxt();
+	@Before public void init() {fxt.Clear();}
+	@Test  public void Integer() {
+		fxt.Test_int("1", 1);
+		fxt.Test_int("1234", 1234);
+		fxt.Test_int("1234567890", 1234567890);
+		fxt.Test_int("-1234", -1234);
+		fxt.Test_int("+1", 1);
+		fxt.Test_int("00001", 1);
+	}
+	@Test  public void Decimal() {
+		fxt.Test_dec("1.23", Decimal_adp_.parse("1.23"));
+		fxt.Test_dec("1.023", Decimal_adp_.parse("1.023"));
+		fxt.Test_dec("-1.23", Decimal_adp_.parse("-1.23"));
+	}
+	@Test  public void Double_long() {
+		fxt.Test_dec(".42190046219457", Decimal_adp_.parse(".42190046219457"));
+	}
+	@Test  public void Exponent() {
+		fxt.Test_int("1E2", 100);
+		fxt.Test_dec("1.234E2", Decimal_adp_.parse("123.4"));
+		fxt.Test_dec("1.234E-2", Decimal_adp_.parse(".01234"));
+		fxt.Test_dec("123.4E-2", Decimal_adp_.parse("1.234"));
+		fxt.Test_dec("+6.0E-3", Decimal_adp_.parse(".006"));
+	}
+	@Test  public void Err() {
+		fxt.Test_err("+", true);
+		fxt.Test_err("-", true);
+		fxt.Test_err("a", true);
+		fxt.Test_err("1-2", false);
+		fxt.Test_err("1..1", true);
+		fxt.Test_err("1,,1", true);
+		fxt.Test_err("1", false);
+	}
+	@Test  public void Hex() {
+		fxt.Test_hex("0x1"	, 1);
+		fxt.Test_hex("0xF"	, 15);
+		fxt.Test_hex("0x20"	, 32);
+		fxt.Test_hex("x20"	, 0, false);
+		fxt.Test_hex("d"	, 0, false);	// PURPOSE: d was being converted to 13; no.w:Hovedbanen; DATE:2014-04-13
+	}
+	@Test  public void Ignore() {
+		fxt.Init_ignore("\n\t");
+		fxt.Test_int("1"	, 1);
+		fxt.Test_int("1\n"	, 1);
+		fxt.Test_int("1\t"	, 1);
+		fxt.Test_int("1\n2"	, 12);
+		fxt.Test_err("1\r"	, true);
+	}
+}
+class Number_parser_fxt {
+	private final Number_parser parser = new Number_parser();
+	public void Clear() {parser.Clear();}
+	public void Init_ignore(String chars) {parser.Ignore_chars_(Bry_.new_a7(chars));}
+	public void Test_int(String raw, int expd) {
+		byte[] raw_bry = Bry_.new_a7(raw);
+		int actl = parser.Parse(raw_bry, 0, raw_bry.length).Rv_as_int(); 
+		Tfds.Eq(expd, actl, raw);
+	}
+	public void Test_dec(String raw, Decimal_adp expd) {
+		byte[] raw_bry = Bry_.new_a7(raw);
+		Decimal_adp actl = parser.Parse(raw_bry, 0, raw_bry.length).Rv_as_dec(); 
+		Tfds.Eq(expd.To_double(), actl.To_double(), raw);
+	}
+	public void Test_err(String raw, boolean expd) {
+		byte[] raw_bry = Bry_.new_a7(raw);
+		boolean actl = parser.Parse(raw_bry, 0, raw_bry.length).Has_err(); 
+		Tfds.Eq(expd, actl, raw);
+	}
+	public void Test_hex(String raw, int expd_val) {Test_hex(raw, expd_val, true);}
+	public void Test_hex(String raw, int expd_val, boolean expd_pass) {
+		parser.Hex_enabled_(true);
+		byte[] raw_bry = Bry_.new_a7(raw);
+		int actl = parser.Parse(raw_bry, 0, raw_bry.length).Rv_as_int();
+		if (expd_pass) {
+			Tfds.Eq(expd_val, actl, raw);
+			Tfds.Eq(true, !parser.Has_err());
+		}
+		else 
+			Tfds.Eq(false, !parser.Has_err());
+		parser.Hex_enabled_(false);
+	}
+}

400_xowa/src/gplx/core/primitives/Obj_ary_parser_base.java

@@ -0,0 +1,58 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
+public abstract class Obj_ary_parser_base {
+	int pos_len = 4; int[] pos;
+	protected abstract void Ary_len_(int v);
+	protected abstract void Parse_itm(byte[] bry, int bgn, int end);
+	protected void Parse_core(byte[] bry, int bgn, int end, byte dlm_1, byte dlm_2) {
+		if (pos == null) pos = new int[pos_len];
+		if (end - bgn == 0) {
+			this.Ary_len_(0);
+			return;
+		}
+		int pos_idx = 0;
+		int dlm_last = -1;	// NOTE: -1 b/c dlm_2 can be 0 (Byte_ascii.Null) and need to do dlm_last != dlm_2 check below
+		for (int i = bgn; i < end; i++) {
+			byte b = bry[i];
+			if (b == dlm_1 || b == dlm_2) {
+				if (pos_idx == pos_len - 1) {	// -1 b/c pos[] will always be count_of_dlm + 1
+					pos_len *= 2;
+					int[] pos_new = new int[pos_len];
+					Array_.Copy(pos, pos_new);
+					pos = pos_new;
+				} 
+				pos[pos_idx++] = i;
+				dlm_last = b;
+			}
+		}
+		if (dlm_last != dlm_2)
+			pos[pos_idx++] = end;
+		this.Ary_len_(pos_idx);
+		int parse_bgn = bgn; 
+		for (int i = 0; i < pos_idx; i++) {
+			int parse_end = pos[i];
+			this.Parse_itm(bry, parse_bgn, parse_end);
+			parse_bgn = parse_end + 1;
+		}
+		if (pos_len > 255) {	// reset
+			pos_len = 4;
+			pos = null;
+		}
+	}	
+}

400_xowa/src/gplx/core/regxs/Gfo_pattern.java

@@ -1,50 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.regxs; import gplx.*; import gplx.core.*;
-public class Gfo_pattern {
-	private final Gfo_pattern_itm[] itms; private final int itms_len;
-	private final Gfo_pattern_ctx ctx = new Gfo_pattern_ctx();
-	public Gfo_pattern(byte[] raw) {
-		this.raw = raw;
-		itms = Gfo_pattern_itm_.Compile(raw);
-		itms_len = itms.length;
-	}
-	public byte[] Raw() {return raw;} private byte[] raw;
-	public boolean Match(byte[] val) {
-		int val_len = val.length;
-		int val_pos = 0;
-		ctx.Init(itms_len);
-		for (int i = 0; i < itms_len; ++i) {
-			Gfo_pattern_itm itm = itms[i];
-			ctx.Itm_idx_(i);
-			val_pos = itm.Match(ctx, val, val_len, val_pos);
-			if (!ctx.Rslt_pass()) return false;
-		}
-		return ctx.Rslt_pass() && val_pos == val_len;
-	}
-	public static Gfo_pattern[] Parse_to_ary(byte[] raw) {
-		byte[][] patterns = Bry_.Split(raw, Byte_ascii.Semic, true);
-		int patterns_len = patterns.length;
-		Gfo_pattern[] rv = new Gfo_pattern[patterns_len];
-		for (int i = 0; i < patterns_len; ++i) {
-			byte[] pattern = patterns[i];
-			rv[i] = new Gfo_pattern(pattern);
-		}
-		return rv;
-	}
-}

400_xowa/src/gplx/core/regxs/Gfo_pattern_ctx.java

@@ -1,31 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.regxs; import gplx.*; import gplx.core.*;
-public class Gfo_pattern_ctx {
-	public boolean Rslt_pass() {return rslt;} private boolean rslt;
-	public void Rslt_fail_() {rslt = false;}
-	public boolean Prv_was_wild() {return prv_was_wild;} public void Prv_was_wild_(boolean v) {prv_was_wild = v;} private boolean prv_was_wild;
-	private int itm_len;
-	public int Itm_idx() {return itm_idx;} public void Itm_idx_(int v) {itm_idx = v;} private int itm_idx;
-	public boolean Itm_idx_is_last() {return itm_idx == itm_len - 1;}
-	public void Init(int itm_len) {
-		this.rslt = true;
-		this.itm_len = itm_len;
-		this.prv_was_wild = false;
-	}
-}

400_xowa/src/gplx/core/regxs/Gfo_pattern_itm.java

@@ -1,64 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.regxs; import gplx.*; import gplx.core.*;
-import gplx.core.strings.*;
-public interface Gfo_pattern_itm {
-	byte Tid();
-	void Compile(byte[] src, int bgn, int end);
-	int Match(Gfo_pattern_ctx ctx, byte[] src, int src_len, int pos);
-	void Xto_str(String_bldr sb);
-}
-class Gfo_pattern_itm_text implements Gfo_pattern_itm {
-	public Gfo_pattern_itm_text() {}
-	public byte Tid() {return Gfo_pattern_itm_.Tid_text;}
-	public byte[] Text() {return text;} private byte[] text; private int text_len;
-	public void Xto_str(String_bldr sb) {sb.Add(this.Tid()).Add("|" + String_.new_u8(text));}
-	public void Compile(byte[] src, int bgn, int end) {
-		this.text = Bry_.Mid(src, bgn, end);
-		this.text_len = end - bgn;
-	}
-	public int Match(Gfo_pattern_ctx ctx, byte[] src, int src_len, int pos) {
-		boolean pass = false;
-		int text_end = pos + text_len;
-		if (text_end > src_len) text_end = src_len;
-		if (ctx.Prv_was_wild()) {
-			int text_bgn = Bry_finder.Find_fwd(src, text, pos);
-			pass = text_bgn != Bry_finder.Not_found;
-			if (pass)
-				pos = text_bgn + text_len;
-		}
-		else {
-			pass = Bry_.Match(src, pos, text_end, text);
-			if (pass)
-				pos = text_end;
-		}
-		if (!pass) ctx.Rslt_fail_();
-		ctx.Prv_was_wild_(false);
-		return pos;
-	}
-}
-class Gfo_pattern_itm_wild implements Gfo_pattern_itm {
-	public byte Tid() {return Gfo_pattern_itm_.Tid_wild;}
-	public void Compile(byte[] src, int bgn, int end) {}
-	public int Match(Gfo_pattern_ctx ctx, byte[] src, int src_len, int pos) {
-		ctx.Prv_was_wild_(true);
-		return ctx.Itm_idx_is_last() ? src_len : pos;
-	}
-	public void Xto_str(String_bldr sb) {sb.Add(this.Tid()).Add("|*");}
-	public static final Gfo_pattern_itm_wild _ = new Gfo_pattern_itm_wild(); Gfo_pattern_itm_wild() {}
-}

400_xowa/src/gplx/core/regxs/Gfo_pattern_itm_.java

@@ -1,51 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.regxs; import gplx.*; import gplx.core.*;
-public class Gfo_pattern_itm_ {
-	public static final byte Tid_text = 0, Tid_wild = 1;
-	public static Gfo_pattern_itm[] Compile(byte[] raw) {
-		List_adp rv = List_adp_.new_();
-		int raw_len = raw.length;
-		int itm_bgn = -1;
-		Gfo_pattern_itm itm = null;
-		int pos = 0;
-		while (true) {
-			boolean last = pos == raw_len;
-			byte b = last ? Byte_ascii.Null : raw[pos];
-			switch (b) {
-				case Byte_ascii.Null:
-					if (itm != null) {itm.Compile(raw, itm_bgn, pos); itm = null; itm_bgn = -1;}
-					break;
-				case Byte_ascii.Star:
-					if (itm != null) {itm.Compile(raw, itm_bgn, pos); itm = null; itm_bgn = -1;}
-					rv.Add(Gfo_pattern_itm_wild._);
-					break;
-				default:
-					if (itm_bgn == -1) {
-						itm_bgn = pos;
-						itm = new Gfo_pattern_itm_text();
-						rv.Add(itm);
-					}
-					break;
-			}
-			++pos;
-			if (last) break;
-		}
-		return (Gfo_pattern_itm[])rv.To_ary_and_clear(Gfo_pattern_itm.class);
-	}
-}

400_xowa/src/gplx/core/regxs/Gfo_pattern_tst.java

@@ -1,93 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.regxs; import gplx.*; import gplx.core.*;
-import org.junit.*; import gplx.core.strings.*;
-public class Gfo_pattern_tst {
-	@Before public void init() {fxt.Clear();} private Gfo_pattern_itm_fxt fxt = new Gfo_pattern_itm_fxt();
-	@Test  public void Compile() {
-		fxt.Test_Compile("a"		, fxt.itm_text_("a"));
-		fxt.Test_Compile("*"		, fxt.itm_wild_());
-		fxt.Test_Compile("a*"		, fxt.itm_text_("a"), fxt.itm_wild_());
-		fxt.Test_Compile("*a"		, fxt.itm_wild_(), fxt.itm_text_("a"));
-		fxt.Test_Compile("*ab*"		, fxt.itm_wild_(), fxt.itm_text_("ab"), fxt.itm_wild_());
-		fxt.Test_Compile(""			);
-	}
-	@Test  public void Match() {
-		Gfo_pattern pattern = fxt.pattern_("abc");
-		fxt.Test_Match_y(pattern, "abc");
-		fxt.Test_Match_n(pattern, "ab", "a", "bc", "Abc", "");
-	}
-	@Test  public void Match_all() {
-		Gfo_pattern pattern = fxt.pattern_("*");
-		fxt.Test_Match_y(pattern, "a", "abc", "");
-	}
-	@Test  public void Match_bgn() {
-		Gfo_pattern pattern = fxt.pattern_("abc*");
-		fxt.Test_Match_y(pattern, "abc", "abcdef");
-		fxt.Test_Match_n(pattern, "abd", "aabc", "");
-	}
-	@Test  public void Match_end() {
-		Gfo_pattern pattern = fxt.pattern_("*abc");
-		fxt.Test_Match_y(pattern, "abc", "xyzabc");
-		fxt.Test_Match_n(pattern, "abcd", "");
-	}
-	@Test  public void Match_mid() {
-		Gfo_pattern pattern = fxt.pattern_("a*c*e");
-		fxt.Test_Match_y(pattern, "ace", "abcde");
-		fxt.Test_Match_n(pattern, "abc", "");
-	}
-	@Test  public void Bug_ctx() {	// PURPOSE.fix: cb was true b/c ctx was not reset correctly
-		Gfo_pattern pattern = fxt.pattern_("b*");
-		fxt.Test_Match_y(pattern, "bc");
-		fxt.Test_Match_n(pattern, "cb");
-	}
-}
-class Gfo_pattern_itm_fxt {
-	public void Clear() {}
-	public Gfo_pattern pattern_(String raw) {return new Gfo_pattern(Bry_.new_u8(raw));}
-	public void Test_Match_y(Gfo_pattern pattern, String... itms) {Test_Match(pattern, itms, Bool_.Y);}
-	public void Test_Match_n(Gfo_pattern pattern, String... itms) {Test_Match(pattern, itms, Bool_.N);}
-	private void Test_Match(Gfo_pattern pattern, String[] itms, boolean expd) {
-		int len = itms.length;
-		for (int i = 0; i < len; i++) {
-			String itm = itms[i];
-			Tfds.Eq(expd, pattern.Match(Bry_.new_u8(itm)), "pattern={0} itm={1} expd={2}", String_.new_u8(pattern.Raw()), itm, expd);
-		}
-	}
-	public Gfo_pattern_itm_wild itm_wild_() {return Gfo_pattern_itm_wild._;}
-	public Gfo_pattern_itm_text itm_text_(String raw) {
-		Gfo_pattern_itm_text rv = new Gfo_pattern_itm_text();
-		byte[] bry = Bry_.new_u8(raw);
-		rv.Compile(bry, 0, bry.length);
-		return rv;
-	}
-	public void Test_Compile(String raw, Gfo_pattern_itm... expd) {
-		Gfo_pattern_itm[] actl = Gfo_pattern_itm_.Compile(Bry_.new_u8(raw));
-		Tfds.Eq(Ary_xto_str(expd), Ary_xto_str(actl));
-	}
-	private static String Ary_xto_str(Gfo_pattern_itm[] ary) {
-		int len = ary.length;
-		String_bldr sb = String_bldr_.new_();
-		for (int i = 0; i < len; i++) {
-			if (i != 0) sb.Add_char_nl();
-			Gfo_pattern_itm itm = ary[i];
-			itm.Xto_str(sb);
-		}
-		return sb.Xto_str_and_clear();
-	}
-}

400_xowa/src/gplx/core/tests/Tst_chkr.java

@@ -15,20 +15,16 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.core.html.parsers; import gplx.*; import gplx.core.*; import gplx.core.html.*;
-import gplx.xowa.*;
-import gplx.xowa.parsers.xndes.*;
-interface Gfo_html_tkn {
-	int Tid();
-	byte[] Key();
-	void Process(byte[] src, Xop_xatr_hash hash);
+package gplx.core.tests; import gplx.*; import gplx.core.*;
+public interface Tst_chkr {
+	Class<?> TypeOf();
+	int Chk(Tst_mgr mgr, String path, Object actl);
 }
-class Gfo_html_tkn_ {
-	public static final int Tid_link = 1;
-	public static final byte[] Key_link = Bry_.new_a7("link");
-}
-class Gfo_html_tkn__link implements Gfo_html_tkn {
-	public int Tid() {return Gfo_html_tkn_.Tid_link;}
-	public byte[] Key() {return Gfo_html_tkn_.Key_link;}
-	@gplx.Virtual public void Process(byte[] src, Xop_xatr_hash hash) {}
+class Tst_chkr_null implements Tst_chkr {
+	public Class<?> TypeOf() {return Object.class;}
+	public int Chk(Tst_mgr mgr, String path, Object actl) {
+		mgr.Results().Add(Tst_itm.fail_("!=", path, "<cast type>", "<NULL TYPE>",  Type_adp_.NameOf_obj(actl)));
+//			mgr.Results().Add(Tst_itm.fail_("!=", path, "<cast value>", "<NULL VAL>", Object_.Xto_str_strict_or_null(actl)));
+		return 1;
+	}
 }

400_xowa/src/gplx/core/tests/Tst_mgr.java

@@ -0,0 +1,134 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package gplx.core.tests; import gplx.*; import gplx.core.*;
+import gplx.core.strings.*;
+public class Tst_mgr {
+	public Tst_mgr ThrowError_n_() {throwError = false; return this;} private boolean throwError = true;
+	public List_adp Results() {return results;} List_adp results = List_adp_.new_();
+	public KeyValHash Vars() {return vars;} KeyValHash vars = KeyValHash.new_();
+	public Object Vars_get_by_key(String key) {return vars.FetchValOr(key, null);}
+	public String Vars_get_bry_as_str(String key, int bgn, int end) {
+		byte[] bry = (byte[])vars.FetchValOr(key, null); if (bry == null) return String_.Empty;
+		if (bgn < 0 || end > bry.length || end < bgn || end < 0) return "<<OUT OF BOUNDS>>";
+		return String_.new_u8(Bry_.Mid(bry, bgn, end));
+	}
+	public int Tst_val(boolean skip, String path, String name, Object expd, Object actl) {
+		Tst_itm itm = Tst_itm.eq_(skip, path, name, expd, actl);
+		results.Add(itm);
+		return itm.Pass() ? 0 : 1;
+	}
+	public int Tst_val_ary(boolean skip, String path, String name, Object expd, Object actl) {	
+		Tst_itm itm = Tst_itm.eq_(skip, path, name, To_str(expd), To_str(actl));
+		results.Add(itm);
+		return itm.Pass() ? 0 : 1;
+	}
+	public void Tst_obj(Tst_chkr expd, Object actl) {
+		results.Clear();
+		int err = Tst_sub_obj(expd, actl, "", 0);
+		if (throwError && err > 0) throw Err_.new_wo_type(Build());
+	}
+	public void Tst_ary(String ownerPath, Tst_chkr[] expd_ary, Object[] actl_ary) {
+		results.Clear();
+		Tst_ary_inner(ownerPath, expd_ary, actl_ary);
+	}
+	private void Tst_ary_inner(String ownerPath, Tst_chkr[] expd_ary, Object[] actl_ary) {
+		int expd_ary_len = expd_ary.length, actl_ary_len = actl_ary.length;
+		int max_len = expd_ary_len > actl_ary_len ? expd_ary_len : actl_ary_len;
+		int err = 0;
+		for (int i = 0; i < max_len; i++) {
+			String path = ownerPath + Int_.Xto_str(i);
+			Tst_chkr expd_obj = i < expd_ary_len ? expd_ary[i] : Tst_mgr.Null_chkr;
+			Object actl_obj = i < actl_ary_len ? actl_ary[i] : "<NULL OBJ>";
+			String actl_type = i < actl_ary_len ? Type_adp_.NameOf_obj(actl_obj) : "<NULL TYPE>";
+			err += Tst_inner(expd_obj, actl_obj, actl_type, path, err);
+		}
+		if (throwError && err > 0) {
+			String s = Build();
+			throw Err_.new_wo_type(s);
+		}
+	}
+	public int Tst_sub_obj(Tst_chkr expd, Object actl, String path, int err) {
+		return Tst_inner(expd, actl, actl == null ? "<NULL>" : Type_adp_.NameOf_obj(actl), path, err);
+	}
+	public int Tst_sub_ary(Tst_chkr[] expd_subs, Object[] actl_subs, String path, int err) {
+		Tst_ary_inner(path + ".", expd_subs, actl_subs);
+		return err;
+	}
+	int Tst_inner(Tst_chkr expd_obj, Object actl_obj, String actl_type, String path, int err) {
+		if (actl_obj == null || !Type_adp_.IsAssignableFrom(expd_obj.TypeOf(), actl_obj.getClass())) {
+			results.Add(Tst_itm.fail_("!=", path, "<cast type>", Type_adp_.NameOf_type(expd_obj.TypeOf()), actl_type));
+			return 1;
+//				results.Add(Tst_itm.fail_("!=", path, "<cast value>", Object_.Xto_str_strict_or_null(expd_obj.ValueOf()), Object_.Xto_str_strict_or_null(actl_obj)));
+		}
+		else {
+			return expd_obj.Chk(this, path, actl_obj);
+		}
+	}
+	String To_str(Object ary) {	
+		if (ary == null) return "<NULL>";
+		int len = Array_.Len(ary);
+		for (int i = 0; i < len; i++) {
+			Object itm = Array_.Get_at(ary, i);
+			ary_sb.Add(Object_.Xto_str_strict_or_null_mark(itm)).Add(",");
+		}
+		return ary_sb.Xto_str_and_clear();
+	}	String_bldr ary_sb = String_bldr_.new_();
+	String Build() {
+		String_bldr sb = String_bldr_.new_();
+		int comp_max = 0, path_max =0, name_max = 0;
+		int len = results.Count();
+		for (int i = 0; i < len; i++) {
+			Tst_itm itm = (Tst_itm)results.Get_at(i);
+			comp_max = Max(comp_max, itm.Comp());
+			path_max = Max(path_max, itm.Path());
+			name_max = Max(name_max, itm.Name());
+		}
+		for (int i = 0; i < len; i++) {
+			Tst_itm itm = (Tst_itm)results.Get_at(i);
+			sb.Add_fmt("\n{0}  {1}  {2}  '{3}'", String_.PadEnd(itm.Comp(), comp_max, " "), "#" + String_.PadEnd(itm.Path(), path_max, " "), "@" + String_.PadEnd(itm.Name(), name_max, " ") + ":", itm.Expd());
+			if (!itm.Pass())
+				sb.Add_fmt("\n{0}  {1}  {2}  '{3}'", String_.PadEnd("", comp_max, " "), " " + String_.PadEnd("", path_max, " "), " " + String_.PadEnd("", name_max, " ") + " ", itm.Actl());
+		}
+		return sb.Xto_str_and_clear();
+	}
+	int Max(int max, String s) {int len = String_.Len(s); return len > max ? len : max;}
+	public static final Tst_chkr Null_chkr = new Tst_chkr_null();
+}
+class Tst_itm {
+	public boolean Pass() {return pass;} private boolean pass;
+	public boolean Skip() {return skip;} private boolean skip;
+	public String Comp() {return comp;} public Tst_itm Comp_(String v) {comp = v; return this;} private String comp = "";
+	public String Path() {return path;} public Tst_itm Path_(String v) {path = v; return this;} private String path = "";
+	public String Name() {return name;} public Tst_itm Name_(String v) {name = v; return this;} private String name = "";
+	public String Expd() {return expd;} public Tst_itm Expd_(String v) {expd = v; return this;} private String expd = "";
+	public String Actl() {return actl;} public Tst_itm Actl_(String v) {actl = v; return this;} private String actl = "";
+	public static Tst_itm eq_(boolean skip, String path, String name, Object expd, Object actl) {
+		boolean pass = skip ? true : Object_.Eq(expd, actl);
+		String comp = pass ? "==" : "!=";
+		String expd_str = Object_.Xto_str_strict_or_null_mark(expd);
+		String actl_str = Object_.Xto_str_strict_or_null_mark(actl);
+		if (skip) expd_str = actl_str;
+		return new_(skip, pass, comp, path, name, expd_str, actl_str);
+	}
+	public static Tst_itm fail_(String comp, String path, String name, String expd, String actl) {return new_(false, false, comp, path, name, expd, actl);}
+	public static Tst_itm new_(boolean skip, boolean pass, String comp, String path, String name, String expd, String actl) {
+		Tst_itm rv = new Tst_itm();
+		rv.skip = skip; rv.pass = pass; rv.comp = comp; rv.path = path; rv.name = name;; rv.expd = expd; rv.actl = actl;
+		return rv;
+	}
+}

400_xowa/src/gplx/core/xmls/Gfo_xml_wtr.java

@@ -1,151 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.xmls; import gplx.*; import gplx.core.*;
-public class Gfo_xml_wtr {
-	private final Bry_bfr bfr = Bry_bfr.reset_(255), txt_bfr = Bry_bfr.reset_(32);
-	private byte quote_byte = Byte_ascii.Apos;
-	private byte[] quote_escape = Bry_quote_1_escape;
-	private List_adp nde_stack = List_adp_.new_();
-	private Gfo_xml_nde nde_cur = null;
-	private int indent = 0;
-	public void Quote_(boolean apos) {
-		if (apos) {
-			this.quote_byte = Byte_ascii.Apos;
-			this.quote_escape = Bry_quote_1_escape;
-		}
-		else {
-			this.quote_byte = Byte_ascii.Quote;
-			this.quote_escape = Bry_quote_2_escape;
-		}
-	}
-	public Gfo_xml_wtr Nde_lhs_bgn_grp(String v) {return Nde_lhs_bgn(Bool_.Y, v);}
-	public Gfo_xml_wtr Nde_lhs_bgn_itm(String v) {return Nde_lhs_bgn(Bool_.N, v);}
-	private Gfo_xml_wtr Nde_lhs_bgn(boolean grp, String v) {
-		nde_cur = new Gfo_xml_nde(grp, v);
-		nde_stack.Add(nde_cur);
-		bfr.Add_byte_repeat(Byte_ascii.Space, indent);
-		bfr.Add_byte(Byte_ascii.Angle_bgn).Add_str_u8(v);
-		indent += 2;
-		return this;
-	}
-	public Gfo_xml_wtr Nde_lhs_end() {
-		bfr.Add_byte(Byte_ascii.Angle_end);
-		if (nde_cur.Grp()) bfr.Add_byte_nl();
-		return this;
-	}
-	public Gfo_xml_wtr Nde_lhs(String v) {return Nde_lhs(Bool_.Y, v);}
-	private Gfo_xml_wtr Nde_lhs(boolean grp, String v) {
-		this.Nde_lhs_bgn(grp, v);
-		this.Nde_lhs_end();
-		return this;
-	}
-	public Gfo_xml_wtr Nde_rhs() {
-		Gfo_xml_nde nde = (Gfo_xml_nde)List_adp_.Pop(nde_stack);
-		indent -= 2;
-		if (nde.Grp()) bfr.Add_byte_repeat(Byte_ascii.Space, indent);
-		bfr.Add(Bry_nde_rhs_bgn).Add_str_u8(nde.Name()).Add_byte(Byte_ascii.Angle_end);	// EX: </node>
-		bfr.Add_byte_nl();
-		return this;
-	}
-	public Gfo_xml_wtr Nde_txt_str(String name, String text) {
-		this.Nde_lhs(Bool_.N, name);
-		this.Txt_str_u8(text);
-		this.Nde_rhs();
-		return this;
-	}
-	public Gfo_xml_wtr Nde_txt_bry(String name, byte[] text) {
-		this.Nde_lhs(Bool_.N, name);
-		this.Txt_bry(text);
-		this.Nde_rhs();
-		return this;
-	}
-	public Gfo_xml_wtr Nde_txt_int(String name, int text) {
-		this.Nde_lhs(Bool_.N, name);
-		this.Txt_bry(Int_.Xto_bry(text));
-		this.Nde_rhs();
-		return this;
-	}
-	public Gfo_xml_wtr Atr_bgn(String key) {
-		bfr.Add_byte_space().Add_str_u8(key).Add_byte(Byte_ascii.Eq).Add_byte(quote_byte);
-		return this;
-	}
-	public Gfo_xml_wtr Atr_val_str_a7(String v)		{bfr.Add_str_a7(v); return this;}
-	public Gfo_xml_wtr Atr_val_str_u8(String v)		{bfr.Add_str_u8 (v); return this;}
-	public Gfo_xml_wtr Atr_val_bry		(byte[] v)	{bfr.Add(v); return this;}
-	public Gfo_xml_wtr Atr_val_int		(int v)		{bfr.Add_int_variable(v); return this;}
-	public Gfo_xml_wtr Atr_end() {
-		bfr.Add_byte(quote_byte);
-		return this;
-	}
-	public Gfo_xml_wtr Atr_kv_int(String key, int val)			{return Atr_kv_bry(key, Int_.Xto_bry(val));}
-	public Gfo_xml_wtr Atr_kv_str_a7(String key, String val)	{return Atr_kv_bry(key, Bry_.new_a7(val));}
-	public Gfo_xml_wtr Atr_kv_str_u8(String key, String val)	{return Atr_kv_bry(key, Bry_.new_u8(val));}
-	public Gfo_xml_wtr Atr_kv_bry(String key, byte[] val) {
-		bfr.Add_byte_space().Add_str_u8(key);
-		bfr.Add_byte(Byte_ascii.Eq);
-		Atr_val_quote(val);
-		return this;
-	}
-	private Gfo_xml_wtr Atr_val_quote(byte[] val_bry) {
-		bfr.Add_byte(quote_byte);
-		bfr.Add_bry_escape(quote_byte, quote_escape, val_bry, 0, val_bry.length);
-		bfr.Add_byte(quote_byte);
-		return this;
-	}
-	public Gfo_xml_wtr Txt_bry(byte[] txt) {
-		int len = txt.length;
-		boolean dirty = false;
-		for (int i = 0; i < len; ++i) {
-			byte[] escape = null;
-			byte b = txt[i];
-			switch (b) {
-				case Byte_ascii.Lt:		escape = Bry_escape_lt; break;
-				case Byte_ascii.Gt:		escape = Bry_escape_gt; break;
-				case Byte_ascii.Amp:	escape = Bry_escape_amp; break;
-				default: break;
-			}
-			if (escape != null && !dirty) {
-				bfr.Add_mid(txt, 0, i);
-				dirty = true;
-			}
-			if (dirty) {
-				if (escape == null) bfr.Add_byte(b);
-				else				bfr.Add(escape);
-			}
-		}
-		if (dirty)	bfr.Add_bfr_and_clear(txt_bfr);
-		else		bfr.Add(txt);
-		return this;
-	}
-	public Gfo_xml_wtr Txt_str_u8(String txt)	{return Txt_bry(Bry_.new_u8(txt));}
-	public String Bld_str() {return bfr.Xto_str_and_clear();}
-	private static final byte[]
-	  Bry_nde_rhs_bgn		= Bry_.new_a7("</")
-//		, Bry_nde_inline		= Bry_.new_a7("/>")
-	, Bry_quote_1_escape	= Bry_.new_a7("&apos;")
-	, Bry_quote_2_escape	= Bry_.new_a7("&quot;")
-	, Bry_escape_lt			= Bry_.new_a7("&lt;")
-	, Bry_escape_gt			= Bry_.new_a7("&gt;")
-	, Bry_escape_amp		= Bry_.new_a7("&amp;")
-	;
-}
-class Gfo_xml_nde {
-	public Gfo_xml_nde(boolean grp, String name) {this.grp = grp; this.name = name;}
-	public boolean Grp() {return grp;} private final boolean grp;
-	public String Name() {return name;} private final String name;
-}

400_xowa/src/gplx/core/xmls/Gfo_xml_wtr_tst.java

@@ -1,81 +0,0 @@
-/*
-XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012 gnosygnu@gmail.com
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package gplx.core.xmls; import gplx.*; import gplx.core.*;
-import org.junit.*;
-public class Gfo_xml_wtr_tst {
-	private final Gfo_xml_wtr_fxt fxt = new Gfo_xml_wtr_fxt();
-	@Before public void init() {}
-	@Test   public void Root() {
-		fxt.Wtr().Nde_lhs("a").Nde_rhs();
-		fxt.Test_bld("<a>", "</a>");
-	}
-	@Test   public void Nest() {
-		fxt.Wtr()
-			.Nde_lhs("a")
-			.	Nde_lhs("a_a")
-			.		Nde_lhs("a_a_a")
-			.		Nde_rhs()
-			.	Nde_rhs()
-			.Nde_rhs()
-			;
-		fxt.Test_bld
-		( "<a>"
-		, "  <a_a>"
-		, "    <a_a_a>"
-		, "    </a_a_a>"
-		, "  </a_a>"
-		, "</a>"
-		);
-	}
-	@Test   public void Atrs() {
-		fxt.Wtr()
-			.Nde_lhs_bgn_itm("a")
-			.Atr_kv_str_a7("b", "b1")
-			.Nde_lhs_end()
-			.Nde_rhs()
-		;
-		fxt.Test_bld("<a b='b1'></a>");
-	}
-	@Test   public void Atrs_escape() {
-		fxt.Wtr()
-			.Nde_lhs_bgn_itm("a")
-			.Atr_kv_str_a7("b", "'\"<>&")
-			.Nde_lhs_end()
-			.Nde_rhs()
-		;
-		fxt.Test_bld("<a b='&apos;\"<>&'></a>");
-	}
-	@Test   public void Nde_txt() {
-		fxt.Wtr()
-			.Nde_txt_str("a", "a123")
-		;
-		fxt.Test_bld("<a>a123</a>");
-	}
-	@Test   public void Nde_txt_escape() {
-		fxt.Wtr()
-			.Nde_txt_str("a", "'\"<>&x")
-		;
-		fxt.Test_bld("<a>'\"&lt;&gt;&amp;x</a>");
-	}
-}
-class Gfo_xml_wtr_fxt {		
-	public Gfo_xml_wtr Wtr() {return wtr;} private final Gfo_xml_wtr wtr = new Gfo_xml_wtr();
-	public void Test_bld(String... lines) {
-		Tfds.Eq_str_lines(String_.Concat_lines_nl_skip_last(lines), wtr.Bld_str());
-	}
-}