mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
'v3.6.3.1'
This commit is contained in:
@@ -50,7 +50,7 @@ class GfmlParse_fxt {
|
||||
public void tst_Err(String raw, UsrMsg_mok... expdErrs) {
|
||||
bldr.ThrowErrors_set(false);
|
||||
GfmlDoc actlDoc = bldr.XtoGfmlDoc(raw);
|
||||
List_adp expd = List_adp_.new_(), actl = actlDoc.UsrMsgs();
|
||||
List_adp expd = List_adp_.New(), actl = actlDoc.UsrMsgs();
|
||||
expd.Add_many((Object[])expdErrs);
|
||||
TfdsTstr_fxt tstr = TfdsTstr_fxt.new_();
|
||||
int max = tstr.List_Max(expd, actl);
|
||||
|
||||
@@ -33,7 +33,7 @@ class GfmlAtr_mok implements GfmlItm_mok {
|
||||
sb.Add_kv("key=", key).Add_kv("val=", val);
|
||||
return sb.To_str();
|
||||
}
|
||||
public static final GfmlAtr_mok Null = new GfmlAtr_mok().Key_(String_.Null_mark).Val_(String_.Null_mark);
|
||||
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;}
|
||||
public static GfmlAtr_mok new_(String key, String val) {
|
||||
GfmlAtr_mok rv = new GfmlAtr_mok();
|
||||
@@ -60,7 +60,7 @@ class GfmlNde_mok implements GfmlItm_mok {
|
||||
for (GfmlItm_mok itm : ary)
|
||||
subs.Add(itm);
|
||||
return this;
|
||||
} List_adp subs = List_adp_.new_();
|
||||
} List_adp subs = List_adp_.New();
|
||||
|
||||
public GfmlNde_mok Atrk_(String k, String v) {subs.Add(GfmlAtr_mok.new_(k, v)); return this;}
|
||||
public GfmlNde_mok Atru_(String v) {subs.Add(GfmlAtr_mok.new_(GfmlTkn_.NullVal, v)); return this;}
|
||||
@@ -91,8 +91,8 @@ class GfmlNde_mok implements GfmlItm_mok {
|
||||
return rv;
|
||||
}
|
||||
public static GfmlNde_mok as_(Object obj) {return obj instanceof GfmlNde_mok ? (GfmlNde_mok)obj : null;}
|
||||
public static final GfmlNde_mok Null = new GfmlNde_mok().Hnd_(String_.Null_mark).Typ_(String_.Null_mark);
|
||||
public static final GfmlNde_mok ErrAtr = new GfmlNde_mok().Hnd_("<<ErrAtr>>").Typ_("<<ErrAtr>>");
|
||||
public static final GfmlNde_mok Null = new GfmlNde_mok().Hnd_(String_.Null_mark).Typ_(String_.Null_mark);
|
||||
public static final GfmlNde_mok ErrAtr = new GfmlNde_mok().Hnd_("<<ErrAtr>>").Typ_("<<ErrAtr>>");
|
||||
public static GfmlNde_mok new_() {return new GfmlNde_mok();} GfmlNde_mok() {}
|
||||
public static GfmlNde_mok gfmlNde_(GfmlNde nde) {return InitNde(nde);}
|
||||
static GfmlNde_mok InitNde(GfmlNde nde) {
|
||||
|
||||
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
package gplx.gfml; import gplx.*;
|
||||
class GfmlTkn_mok {
|
||||
public String Raw() {return raw;} public GfmlTkn_mok Raw_(String v) {raw = v; return this;} private String raw;
|
||||
public List_adp Subs() {return list;} List_adp list = List_adp_.new_();
|
||||
public List_adp Subs() {return list;} List_adp list = List_adp_.New();
|
||||
public GfmlTkn_mok Subs_(GfmlTkn_mok... ary) {
|
||||
for (GfmlTkn_mok itm : ary)
|
||||
list.Add(itm);
|
||||
|
||||
@@ -43,7 +43,7 @@ class GfmlFld_mok {
|
||||
class GfmlTyp_mok {
|
||||
public String Name() {return name;} public GfmlTyp_mok Name_(String v) {name = v; return this;} private String name;
|
||||
public String Key() {return key;} public GfmlTyp_mok Key_(String v) {key = v; return this;} private String key;
|
||||
public List_adp Subs() {return subFlds;} List_adp subFlds = List_adp_.new_();
|
||||
public List_adp Subs() {return subFlds;} List_adp subFlds = List_adp_.New();
|
||||
public GfmlTyp_mok Atrs_(String... ary) {
|
||||
for (String itm : ary)
|
||||
subFlds.Add(GfmlFld_mok.new_().ini_atr_(itm));
|
||||
|
||||
@@ -54,7 +54,7 @@ public class z091_GfmlLxr_basic_tst {
|
||||
}
|
||||
GfmlTkn tst_Fetch(String raw, String... expd) {
|
||||
CharStream stream = CharStream.pos0_(raw);
|
||||
List_adp list = List_adp_.new_();
|
||||
List_adp list = List_adp_.New();
|
||||
GfmlTkn tkn = null;
|
||||
while (true) {
|
||||
tkn = rootLxr.MakeTkn(stream, 0);
|
||||
|
||||
@@ -36,7 +36,7 @@ public class z451_dflts_compile_tst {
|
||||
( fx_typ.nde_().Atrs_("x", "10")
|
||||
, fx_typ.nde_().Atrs_("y", "20")
|
||||
));
|
||||
List_adp list = List_adp_.new_();
|
||||
List_adp list = List_adp_.New();
|
||||
pragma.CompileSubNde(gnde, list);
|
||||
fx.tst_List(list
|
||||
, fx.make_("point", "x", "10")
|
||||
|
||||
@@ -30,7 +30,7 @@ public class z455_dflts_scope_tst {
|
||||
tst_FetchOrNullByPos(regy, "point", rootPos, "point", "x", "y");
|
||||
tst_FetchOrNullByPos(regy, "point", currPos, "point", "x", "y");
|
||||
|
||||
List_adp list = List_adp_.new_();
|
||||
List_adp list = List_adp_.New();
|
||||
list.Add(GfmlDefaultItem.new_("point", "z", GfmlTkn_.raw_("0")));
|
||||
GfmlDefaultPragma_bgnCmd.ExecList(regy, currPos, list);
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ class GfmlUpdateFx {
|
||||
public GfmlUpdateCmd_atr atr_() {return GfmlUpdateCmd_atr.new_();}
|
||||
public GfmlUpdateCmd_nde nde_() {return GfmlUpdateCmd_nde.new_();}
|
||||
public String Raw() {return raw;} public GfmlUpdateFx Raw_(String v) {raw = v; return this;} private String raw;
|
||||
public GfmlUpdateFx Update_(GfmlUpdateCmd cmd) {cmds.Add(cmd); return this;} List_adp cmds = List_adp_.new_();
|
||||
public GfmlUpdateFx Update_(GfmlUpdateCmd cmd) {cmds.Add(cmd); return this;} List_adp cmds = List_adp_.New();
|
||||
public GfmlUpdateFx tst_(String expd) {
|
||||
GfmlDoc actlDoc = GfmlDataNde.new_any_eol_(raw).Doc();
|
||||
for (int i = 0; i < cmds.Count(); i++) {
|
||||
|
||||
@@ -39,7 +39,7 @@ public class z811_useCase_GfmlIoSql_tst {
|
||||
Tfds.Eq_ary_str(To_str(expd.Nde()), To_str(actl));
|
||||
}
|
||||
String[] To_str(GfmlNde nde) {
|
||||
List_adp list = List_adp_.new_();
|
||||
List_adp list = List_adp_.New();
|
||||
for (int i = 0; i < nde.SubObjs_Count(); i++) {
|
||||
GfmlAtr atr = (GfmlAtr)nde.SubObjs_GetAt(i);
|
||||
list.Add(atr.Key() + "=" + atr.DatTkn().Raw());
|
||||
|
||||
Reference in New Issue
Block a user