v2.8.3.1

110_gfml/src_100_tkn/gplx/gfml/GfmlTkn.java

@@ -32,7 +32,7 @@ class GfmlTknAry_ {
 		String_bldr sb = String_bldr_.new_();
 		for (GfmlTkn tkn : ary)
 			sb.Add(tkn.Raw());
-		return sb.XtoStr();
+		return sb.To_str();
 	}
 	@gplx.Internal protected static String XtoVal(GfmlTkn[] ary) {return XtoVal(ary, 0, ary.length);}
 	static String XtoVal(GfmlTkn[] ary, int bgn, int end) {
@@ -41,6 +41,6 @@ class GfmlTknAry_ {
 			GfmlTkn tkn = ary[i];
 			sb.Add(tkn.Val());
 		}
-		return sb.XtoStr();
+		return sb.To_str();
 	}
 }

110_gfml/src_200_type/gplx/gfml/GfmlFld.java

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

110_gfml/src_300_gdoc/gplx/gfml/GfmlAtr.java

@@ -25,7 +25,7 @@ public class GfmlAtr implements GfmlItm {
 	public int		SubObjs_Count()			{return subObjs.Count();}
 	public GfmlObj	SubObjs_GetAt(int i)	{return (GfmlObj)subObjs.Get_at(i);} GfmlObjList subObjs = GfmlObjList.new_();	// PERF?: make capacity 3 instead of 8
 	public void		SubObjs_Add(GfmlObj o)	{subObjs.Add(o);}
-	public String	XtoStr() {return String_.Concat(this.Key(), "=", this.DatTkn().Val());}
+	public String	To_str() {return String_.Concat(this.Key(), "=", this.DatTkn().Val());}
 	@gplx.Internal protected void	Key_set(String v) {keyTkn = GfmlTkn_.val_(v);}	// used for 1 test
 
 	public static GfmlAtr as_(Object obj) {return obj instanceof GfmlAtr ? (GfmlAtr)obj : null;}

110_gfml/src_300_gdoc/gplx/gfml/GfmlDocPos.java

@@ -52,7 +52,7 @@ public class GfmlDocPos implements CompareAble {
 		int newIdx = ary[oldLen - 1];
 		return new GfmlDocPos(newAry, newIdx);
 	}
-	@Override public String toString() {return path;} public String XtoStr() {return path;}
+	@Override public String toString() {return path;} public String To_str() {return path;}
 	void MakePath() {
 		String_bldr sb = String_bldr_.new_();
 		for (int i = 0; i < ary.length; i++) {
@@ -60,7 +60,7 @@ public class GfmlDocPos implements CompareAble {
 			sb.Add("_");
 		}
 		sb.Add(idx);
-		path = sb.XtoStr();
+		path = sb.To_str();
 	}
 	int[] ary; int idx;
 	@gplx.Internal protected GfmlDocPos(int[] ary, int idx) {this.ary = ary; this.idx = idx;}

110_gfml/src_300_gdoc/gplx/gfml/GfmlDoc_.java

@@ -39,7 +39,7 @@ class GfmlUsrMsgs {
 		Err rv = Err_.new_wo_type("gfml parse error");
 		for (int i = 0; i < bldr.Doc().UsrMsgs().Count(); i++) {
 			UsrMsg um = (UsrMsg)bldr.Doc().UsrMsgs().Get_at(i);
-			rv.Args_add("err" + Int_.Xto_str(i), um.XtoStr());
+			rv.Args_add("err" + Int_.Xto_str(i), um.To_str());
 		}
 		return rv;
 	}

110_gfml/src_300_gdoc/gplx/gfml/GfmlItm.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.gfml; import gplx.*;
-public interface GfmlItm extends GfmlObj, XtoStrAble {
+public interface GfmlItm extends GfmlObj, To_str_able {
 	GfmlTkn		KeyTkn(); String Key(); // Key() is alternative to Key().Val()
 	GfmlType	Type();
 	boolean		KeyedSubObj();

110_gfml/src_300_gdoc/gplx/gfml/GfmlNde.java

@@ -40,7 +40,7 @@ public class GfmlNde implements GfmlItm {
 	public GfmlDocPos		DocPos() {return docPos;} GfmlDocPos docPos = GfmlDocPos_.Null;
 	public GfmlItmKeys		SubKeys() {return subKeys;} GfmlItmKeys subKeys = GfmlItmKeys.new_();
 	public GfmlItmHnds		SubHnds() {return subHnds;} GfmlItmHnds subHnds = GfmlItmHnds.new_();
-	public String			XtoStr() {return GfmlDocWtr_.xtoStr_(this);}
+	public String			To_str() {return GfmlDocWtr_.xtoStr_(this);}
 	public void				UpdateNde(String hnd) {
 		for (int i = 0; i < subHnds.Count(); i++) {
 			GfmlNde nde = (GfmlNde)subHnds.Get_at(i);

110_gfml/src_500_build/gplx/gfml/GfmlStringHighlighter.java

@@ -80,9 +80,9 @@ class GfmlStringHighlighter {
 			symBfr.Add_at(0, " ");
 		}
 		List_adp rv = List_adp_.new_();
-		rv.Add(posBfr.XtoStr());
-		rv.Add(rawBfr.XtoStr());
-		rv.Add(symBfr.XtoStr());
+		rv.Add(posBfr.To_str());
+		rv.Add(rawBfr.To_str());
+		rv.Add(symBfr.To_str());
 		if (symList.Count() > 0)
 			rv.Add("");
 		for (int i = 0; i < symList.Count(); i++)

110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataNde.java

@@ -79,7 +79,7 @@ public class GfmlDataNde {
 class GfmlDataWtr2 extends DataWtr_base implements DataWtr {
 	@Override public void WriteData(String name, Object val) {
 		GfmlTkn nameTkn = GfmlTkn_.raw_(name);
-		GfmlTkn valTkn = GfmlTkn_.raw_(XtoStr(val));
+		GfmlTkn valTkn = GfmlTkn_.raw_(To_str(val));
 		GfmlAtr atr = GfmlAtr.new_(nameTkn, valTkn, GfmlType_.String);
 		GfmlNde nde = gdoc.RootNde().SubHnds().Get_at(0);
 		nde.SubKeys().Add(atr);
@@ -91,8 +91,8 @@ class GfmlDataWtr2 extends DataWtr_base implements DataWtr {
 	@Override public void WriteNodeEnd() {}
 	public void WriteLeafEnd() {}
 	public void Clear() {}
-	public String XtoStr() {return "";}
-	String XtoStr(Object obj) {
+	public String To_str() {return "";}
+	String To_str(Object obj) {
 		if (obj == null) return "''";
 		String s = obj.toString();
 		return String_.Concat("'", String_.Replace(s, "'", "''"), "'");

110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataRdr.java

@@ -35,7 +35,7 @@ public class GfmlDataRdr extends GfmlDataRdr_base {
 		rv.SetNode(nde);
 		return rv;
 	}
-	public static DataRdr wtr_(DataWtr wtr) {return raw_root_(wtr.XtoStr());}
+	public static DataRdr wtr_(DataWtr wtr) {return raw_root_(wtr.To_str());}
 	@Override public SrlMgr SrlMgr_new(Object o) {return new GfmlDataRdr();}
 	@gplx.Internal protected GfmlDataRdr() {
 		this.Parse_set(true);

110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataRdr_base.java

@@ -54,7 +54,7 @@ public abstract class GfmlDataRdr_base extends DataRdr_base implements DataRdr {
 		return rv;
 	}		
 	public void Rls() {}
-	public String XtoStr() {return curNde.XtoStr();}
+	public String To_str() {return curNde.To_str();}
 	@gplx.Internal protected void SetNode(GfmlNde curNde) {this.curNde = curNde; this.list = curNde.SubHnds();}
 	GfmlNde curNde; GfmlItmHnds list; int pos = -1;
 }

110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataWtr.java

@@ -29,7 +29,7 @@ public class GfmlDataWtr extends DataWtr_base implements DataWtr {
 		if (nde.SubKeys().Count() != 0) AddTkn_nullVal(keyedSpr);	// add keyedSprTkn if not first
 		GfmlTkn keyTkn = AddTkn_raw(name);
 		AddTkn_raw("=");
-		GfmlTkn valTkn = AddTkn_raw(XtoStr(val));
+		GfmlTkn valTkn = AddTkn_raw(To_str(val));
 		GfmlAtr atr = GfmlAtr.new_(keyTkn, valTkn, GfmlType_.String);
 		nde.SubObjs_Add(atr);
 	}
@@ -72,13 +72,13 @@ public class GfmlDataWtr extends DataWtr_base implements DataWtr {
 	public void Clear() {nde.SubObjs_Clear();}
 	public void WriteTableBgn(String name, GfoFldList fields) {}
 	public void CloseBranchHdr(boolean isInline) {}
-	public String XtoStr() {
+	public String To_str() {
 		while (stack.Count() > 0) {	// auto-close all nodes
 			WriteNodeEnd();
 		}
 		return GfmlDocWtr_.xtoStr_(gdoc.RootNde());
 	}
-	String XtoStr(Object obj) {
+	String To_str(Object obj) {
 		if (obj == null) return "''";
 		String s = Object_.Xto_str_strict_or_empty(obj);
 		return String_.Concat("'", String_.Replace(s, "'", "''"), "'");

110_gfml/src_600_rdrWtr/gplx/gfml/SqlDoc.java

@@ -83,7 +83,7 @@ class SqlCmd_quote_end implements GfmlBldrCmd {
 			sb.Add(pnd.Val());
 		}
 		//Int_.Xto_str(bldr.CurNdeFrame().Nde().SubTkns().length)
-		GfmlAtr atr = GfmlAtr.new_(GfmlTkn_.raw_("word"), GfmlTkn_.raw_(sb.XtoStr()), GfmlType_.String);
+		GfmlAtr atr = GfmlAtr.new_(GfmlTkn_.raw_("word"), GfmlTkn_.raw_(sb.To_str()), GfmlType_.String);
 		bldr.CurNdeFrame().CurNde().SubObjs_Add(atr);
 		bldr.Frames_end();
 	}

110_gfml/tst/gplx/gfml/ymoks_GfmlAtr_GfmlNde_mok.java

@@ -31,7 +31,7 @@ class GfmlAtr_mok implements GfmlItm_mok {
 	public String XtoStrStub() {
 		String_bldr sb = String_bldr_.new_();
 		sb.Add_kv("key=", key).Add_kv("val=", val);
-		return sb.XtoStr();
+		return sb.To_str();
 	}
         public static final GfmlAtr_mok Null = new GfmlAtr_mok().Key_(String_.Null_mark).Val_(String_.Null_mark);
 	public static GfmlAtr_mok as_(Object obj) {return obj instanceof GfmlAtr_mok ? (GfmlAtr_mok)obj : null;}
@@ -54,7 +54,7 @@ class GfmlNde_mok implements GfmlItm_mok {
 	public String XtoStrStub() {
 		String_bldr sb = String_bldr_.new_();
 		sb.Add_kv("key=", key).Add_kv("hnd=", hnd).Add_kv("typ=", typ).Add_kv("subs=", Int_.Xto_str(subs.Count()));
-		return sb.XtoStr();
+		return sb.To_str();
 	}
 	public GfmlNde_mok Subs_(GfmlItm_mok... ary) {
 		for (GfmlItm_mok itm : ary)

110_gfml/tst/gplx/gfml/ymoks_GfmlTyp_GfmlFld_mok.java

@@ -37,7 +37,7 @@ class GfmlFld_mok {
 		GfmlTkn tkn = GfmlTkn_.as_(gobj);
 		if (tkn != null) return tkn.Raw();
 		GfmlNde nde = GfmlNde.as_(gobj);
-		return nde.XtoStr();
+		return nde.To_str();
 	}
 }
 class GfmlTyp_mok {

110_gfml/tst/gplx/gfml/z081_GfmlDataWtr_tst.java

@@ -65,7 +65,7 @@ public class z081_GfmlDataWtr_tst {
 		tst_XtoStr(wtr, "root:key='data''s';");
 	}
 	void tst_XtoStr(DataWtr wtr, String expd) {
-		String actl = wtr.XtoStr();
+		String actl = wtr.To_str();
 		Tfds.Eq(expd, actl);
 	}
 }

110_gfml/tst/gplx/gfml/z082_GfmlDataWtrOpts_tst.java

@@ -48,7 +48,7 @@ public class z082_GfmlDataWtrOpts_tst {
 		tst_XtoStr(wtr, String_.Concat("root:{key1='data1';}"));			
 	}
 	void tst_XtoStr(DataWtr wtr, String expd) {
-		String actl = wtr.XtoStr();
+		String actl = wtr.To_str();
 		Tfds.Eq(expd, actl);
 	}
 }

110_gfml/tst/gplx/gfml/z601_edit_atr_tst.java

@@ -121,7 +121,7 @@ class GfmlUpdateFx {
 			GfmlUpdateCmd cmd = (GfmlUpdateCmd)cmds.Get_at(i);
 			cmd.Exec(actlDoc);
 		}
-		String actl = actlDoc.RootNde().XtoStr();
+		String actl = actlDoc.RootNde().To_str();
 		Tfds.Eq(expd, actl);
 		cmds.Clear();
 		return this;

110_gfml/tst/gplx/gfml/z803_useCase_KbdKeyboard_tst.java

@@ -58,7 +58,7 @@ public class z803_useCase_KbdKeyboard_tst {
 		Io_url url = Tfds.RscDir.GenSubFil_nest("110_gfml", "cfgs_archive", "gfui-keyboard-ui.cfg.gfml");
 		raw = Io_mgr.I.LoadFilStr(url);
 		gdoc = GfmlDoc_.parse_any_eol_(raw);
-//			Tfds.Write(gdoc.RootNde().XtoStr());
+//			Tfds.Write(gdoc.RootNde().To_str());
 	}
 	String TypeHeader = String_.Concat
 		(	"_type:{"

110_gfml/tst/gplx/gfml/z811_useCase_GfmlIoSql_tst.java

@@ -36,9 +36,9 @@ public class z811_useCase_GfmlIoSql_tst {
 	void tst_Doc(String raw, GfmlNdeWrapper expd) {
 		GfmlDoc doc = SqlDoc.XtoDoc(raw);
 		GfmlNde actl = (GfmlNde)doc.RootNde();
-		Tfds.Eq_ary_str(XtoStr(expd.Nde()), XtoStr(actl));
+		Tfds.Eq_ary_str(To_str(expd.Nde()), To_str(actl));
 	}
-	String[] XtoStr(GfmlNde nde) {
+	String[] To_str(GfmlNde nde) {
 		List_adp list = List_adp_.new_();
 		for (int i = 0; i < nde.SubObjs_Count(); i++) {
 			GfmlAtr atr = (GfmlAtr)nde.SubObjs_GetAt(i);

110_gfml/tst/gplx/gfml/z901_perf_tst.java

@@ -29,7 +29,7 @@ public class z901_perf_tst {
 //			sbXml.Add(longText);
 //			sbXml.Add("/>");
 //			tmr.Bgn();
-//			gplx.xmls.XmlDoc_.parse_(sbXml.XtoStr());
+//			gplx.xmls.XmlDoc_.parse_(sbXml.To_str());
 //			tmr.End_and_print("xml");	// 400
 
 		String_bldr sbGfml = String_bldr_.new_();
@@ -40,11 +40,11 @@ public class z901_perf_tst {
 //			sbGfml.Add(longText);
 		}
 //			tmr.Bgn();
-//			gplx.texts.CharStream.pos0_(sbGfml.XtoStr());
+//			gplx.texts.CharStream.pos0_(sbGfml.To_str());
 //			tmr.End_and_print("char");	// 1700
 
 		tmr.Bgn();
-		GfmlDoc_.parse_any_eol_(sbGfml.XtoStr());
+		GfmlDoc_.parse_any_eol_(sbGfml.To_str());
 		tmr.End_and_print("gfml");	// 1700
 	}
 	//@Test