mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v2.8.3.1
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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:{"
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user