mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
'v3.3.4.1'
This commit is contained in:
@@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>110_gfml</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
@@ -52,7 +52,7 @@ class GfmlLxr_singleton implements GfmlLxr, GfoEvObj {
|
||||
String oldRaw = singletonTkn.Raw();
|
||||
singletonTkn = val;
|
||||
hooks = String_.Ary(val.Raw());
|
||||
GfoEvMgr_.PubVals(this, GfmlLxr_.CmdTknChanged_evt, KeyVal_.new_("old", oldRaw), KeyVal_.new_("new", val.Raw()), KeyVal_.new_("lxr", this));
|
||||
GfoEvMgr_.PubVals(this, GfmlLxr_.CmdTknChanged_evt, Keyval_.new_("old", oldRaw), Keyval_.new_("new", val.Raw()), Keyval_.new_("lxr", this));
|
||||
}
|
||||
public String[] Hooks() {return hooks;} private String[] hooks;
|
||||
public GfmlTkn MakeTkn(CharStream stream, int hookLength) {
|
||||
|
||||
@@ -60,14 +60,14 @@ class GfmlParse_fxt {
|
||||
UsrMsg_mok actlUmm = UsrMsg_mok.new_(actlUm);
|
||||
tstr.Eq_str(expdUm.Main(), actlUmm.Main(), "main");
|
||||
for (int j = 0; j < expdUm.Args().Count(); j++) {
|
||||
KeyVal expdKv = (KeyVal)expdUm.Args().Get_at(j);
|
||||
KeyVal actlKv = (KeyVal)actlUmm.Args().Get_by(expdKv.Key());
|
||||
Keyval expdKv = (Keyval)expdUm.Args().Get_at(j);
|
||||
Keyval actlKv = (Keyval)actlUmm.Args().Get_by(expdKv.Key());
|
||||
Object actlVal = actlKv == null ? String_.Null_mark : actlKv.Val();
|
||||
tstr.Eq_str(expdKv.Val(), actlVal, expdKv.Key());
|
||||
}
|
||||
for (int j = 0; j < expdUm.Required().Count(); j++) {
|
||||
String expdKv = (String)expdUm.Required().Get_at(j);
|
||||
KeyVal actlKv = (KeyVal)actlUmm.Args().Get_by(expdKv);
|
||||
Keyval actlKv = (Keyval)actlUmm.Args().Get_by(expdKv);
|
||||
Object actlVal = actlKv == null ? String_.Null_mark : actlKv.Val();
|
||||
Object actlValV = actlKv == null ? "<<REQD>>" : actlKv.Val();
|
||||
tstr.Eq_str(actlValV, actlVal, expdKv);
|
||||
|
||||
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
package gplx.gfml; import gplx.*;
|
||||
class UsrMsg_mok {
|
||||
public String Main() {return main;} public UsrMsg_mok Main_(String v) {main = v; return this;} private String main;
|
||||
public UsrMsg_mok Add_(String k, Object o) {hash.Add(k, KeyVal_.new_(k, o)); return this;}
|
||||
public UsrMsg_mok Add_(String k, Object o) {hash.Add(k, Keyval_.new_(k, o)); return this;}
|
||||
public UsrMsg_mok Require_(String k) {required.Add(k, k); return this;}
|
||||
public Ordered_hash Args() {return hash;} Ordered_hash hash = Ordered_hash_.New();
|
||||
public Ordered_hash Required() {return required;} Ordered_hash required = Ordered_hash_.New();
|
||||
@@ -27,7 +27,7 @@ class UsrMsg_mok {
|
||||
if (um != null) {
|
||||
rv.main = um.Hdr();
|
||||
for (int i = 0; i < um.Args().Count(); i++) {
|
||||
KeyVal kv = (KeyVal)um.Args().Get_at(i);
|
||||
Keyval kv = (Keyval)um.Args().Get_at(i);
|
||||
rv.Add_(kv.Key(), kv.Val());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ public class z801_useCase_DataRdr_tst {
|
||||
subRdr = rdr.Subs_byName_moveFirst("point");
|
||||
fx_rdr.tst_Atrs(subRdr, kv_("x", "1"), kv_("y", "2"));
|
||||
}
|
||||
KeyVal kv_(String key, Object val) {return KeyVal_.new_(key, val);}
|
||||
Keyval kv_(String key, Object val) {return Keyval_.new_(key, val);}
|
||||
DataRdr_Fxt fx_rdr = DataRdr_Fxt.Instance;
|
||||
DataRdr rdr, subRdr;
|
||||
}
|
||||
@@ -71,8 +71,8 @@ class DataRdr_Fxt {
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
@gplx.Internal protected void tst_Atrs(DataRdr rdr, KeyVal... expdAry) {
|
||||
KeyVal[] actlAry = new KeyVal[rdr.FieldCount()];
|
||||
@gplx.Internal protected void tst_Atrs(DataRdr rdr, Keyval... expdAry) {
|
||||
Keyval[] actlAry = new Keyval[rdr.FieldCount()];
|
||||
for (int i = 0; i < actlAry.length; i++)
|
||||
actlAry[i] = rdr.KeyValAt(i);
|
||||
Tfds.Eq_ary_str(expdAry, actlAry);
|
||||
|
||||
Reference in New Issue
Block a user