mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v1.9.2.1
This commit is contained in:
@@ -39,7 +39,7 @@ class GfmlUsrMsgs {
|
||||
Err rv = Err_.new_("gfml parse error");
|
||||
for (int i = 0; i < bldr.Doc().UsrMsgs().Count(); i++) {
|
||||
UsrMsg um = (UsrMsg)bldr.Doc().UsrMsgs().FetchAt(i);
|
||||
rv.Add("err" + Int_.XtoStr(i), um.XtoStr());
|
||||
rv.Add("err" + Int_.Xto_str(i), um.XtoStr());
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
@@ -66,12 +66,12 @@ class GfmlStringHighlighter {
|
||||
int gap = nxtMarkBgn - endPos;
|
||||
if (gap > 0) {
|
||||
int gapDigits = Int_.DigitCount(gap);
|
||||
posBfr.Add_fmt("[{0}]", Int_.XtoStr_PadBgn(gap, gapDigits));
|
||||
posBfr.Add_fmt("[{0}]", Int_.Xto_str_pad_bgn(gap, gapDigits));
|
||||
rawBfr.Add_fmt("[{0}]", String_.Repeat(".", gapDigits));
|
||||
symBfr.Add_fmt(" {0} ", String_.Repeat(" ", gapDigits));
|
||||
}
|
||||
if (curMark.Sym() != ' ')
|
||||
symList.Add(String_.Format("[{0}] {1} {2}", Int_.XtoStr_PadBgn(curMark.Pos(), rawLenDigits), curMark.Sym(), curMark.Msg()));
|
||||
symList.Add(String_.Format("[{0}] {1} {2}", Int_.Xto_str_pad_bgn(curMark.Pos(), rawLenDigits), curMark.Sym(), curMark.Msg()));
|
||||
}
|
||||
if (rawBfrBgn == 0) {
|
||||
posBfr.Add_at(0, "<");
|
||||
|
||||
@@ -82,7 +82,7 @@ class SqlCmd_quote_end implements GfmlBldrCmd {
|
||||
GfmlTkn pnd = (GfmlTkn)list.FetchAt(i);
|
||||
sb.Add(pnd.Val());
|
||||
}
|
||||
//Int_.XtoStr(bldr.CurNdeFrame().Nde().SubTkns().length)
|
||||
//Int_.Xto_str(bldr.CurNdeFrame().Nde().SubTkns().length)
|
||||
GfmlAtr atr = GfmlAtr.new_(GfmlTkn_.raw_("word"), GfmlTkn_.raw_(sb.XtoStr()), GfmlType_.String);
|
||||
bldr.CurNdeFrame().CurNde().SubObjs_Add(atr);
|
||||
bldr.Frames_end();
|
||||
|
||||
@@ -57,7 +57,7 @@ class GfmlTypeCompiler_fxt {
|
||||
for (int i = 0; i < max; i++) {
|
||||
GfmlFld_mok expdFld = (GfmlFld_mok)tstr.List_FetchAtOrNull(expd.Subs(), i);
|
||||
GfmlFld_mok actlFld = (GfmlFld_mok)tstr.List_FetchAtOrNull(actl.Subs(), i);
|
||||
tstr.SubName_push(Int_.XtoStr(i) + " fld");
|
||||
tstr.SubName_push(Int_.Xto_str(i) + " fld");
|
||||
tst(tstr, expdFld, actlFld);
|
||||
tstr.SubName_pop();
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ class GfmlNde_mok implements GfmlItm_mok {
|
||||
public ListAdp Subs() {return subs;}
|
||||
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_.XtoStr(subs.Count()));
|
||||
sb.Add_kv("key=", key).Add_kv("hnd=", hnd).Add_kv("typ=", typ).Add_kv("subs=", Int_.Xto_str(subs.Count()));
|
||||
return sb.XtoStr();
|
||||
}
|
||||
public GfmlNde_mok Subs_(GfmlItm_mok... ary) {
|
||||
@@ -141,7 +141,7 @@ class GfmlTypeResolver_fxt {
|
||||
for (int i = 0; i < max; i++) {
|
||||
GfmlItm_mok expdSub = (GfmlItm_mok)tstr.List_FetchAtOrNull(expd.Subs(), i);
|
||||
GfmlItm_mok actlSub = (GfmlItm_mok)tstr.List_FetchAtOrNull(actl.Subs(), i);
|
||||
tstr.SubName_push(Int_.XtoStr(i));
|
||||
tstr.SubName_push(Int_.Xto_str(i));
|
||||
if (expdSub == null) {
|
||||
GfmlNde_mok mm = GfmlNde_mok.as_(actlSub);
|
||||
String actlSubStr = mm == null ? "sub:null" : mm.XtoStrStub();
|
||||
|
||||
@@ -68,7 +68,7 @@ class GfmlTkn_mok {
|
||||
for (int i = 0; i < max; i++) {
|
||||
GfmlTkn_mok expdSub = (GfmlTkn_mok)tstr.List_FetchAtOrNull(expd.Subs(), i);
|
||||
GfmlTkn_mok actlSub = (GfmlTkn_mok)tstr.List_FetchAtOrNull(actl.Subs(), i);
|
||||
tstr.SubName_push(Int_.XtoStr(i));
|
||||
tstr.SubName_push(Int_.Xto_str(i));
|
||||
tst(tstr, expdSub, actlSub);
|
||||
tstr.SubName_pop();
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ class TimerWatch {
|
||||
this.End();
|
||||
Tfds.Write(XtoStr_ms() + " " + text);
|
||||
}
|
||||
public String XtoStr_ms() {return Long_.XtoStr(duration);}
|
||||
public String XtoStr_ms() {return Long_.Xto_str(duration);}
|
||||
public static TimerWatch new_() {
|
||||
TimerWatch rv = new TimerWatch();
|
||||
rv.Bgn();
|
||||
|
||||
Reference in New Issue
Block a user