Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

v1.10.2.1

Browse Source
This commit is contained in:
gnosygnu
2014-10-13 00:13:41 -04:00
parent cd5a440404
commit d6561b3c1f
514 changed files with 1899 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
110_gfml/.classpath
View File

@@ -9,6 +9,6 @@
<classpathentry kind="src" path="src_600_rdrWtr"/>
<classpathentry kind="src" path="/100_core"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
110_gfml/src_100_tkn/gplx/gfml/GfmlLxr_.java
View File

@@ -89,7 +89,7 @@ class GfmlLxr_group implements GfmlLxr {
hookLength = trie.LastMatchCount;
}
if (ignoreOutput) return GfmlTkn_.IgnoreOutput;
String raw = sb.XtoStrAndClear();
String raw = sb.Xto_str_and_clear();
return outputTkn.MakeNew(raw, raw);
}
public GfmlLxr SubLxr() {throw Err_sublxr();}

2
110_gfml/src_200_type/gplx/gfml/GfmlFld.java
View File

@@ -27,7 +27,7 @@ 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.XtoStrAndClear();}
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 static final GfmlFld Null = new_(false, GfmlItmKeys.NullKey, GfmlType_.AnyKey);

4
110_gfml/src_200_type/gplx/gfml/GfmlTypeMakr.java
View File

@@ -38,8 +38,8 @@ class GfmlTypeMakr {
return rv;
}
public void AddSubFld(GfmlFld subFld) {AddSubFld_imp(owner, subFld);}
public GfmlType[] XtoAry() {
GfmlType[] rv = (GfmlType[])list.XtoAry(GfmlType.class);
public GfmlType[] Xto_bry() {
GfmlType[] rv = (GfmlType[])list.Xto_ary(GfmlType.class);
list.Clear();
owner = null;
return rv;

4
110_gfml/src_300_gdoc/gplx/gfml/GfmlDocWtr_.java
View File

@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.gfml; import gplx.*;
public class GfmlDocWtr_ {
public String XtoStrAndClear() {return sb.XtoStrAndClear();}
public String Xto_str_and_clear() {return sb.Xto_str_and_clear();}
public void BuildAttrib(GfmlAtr atr) {Build(atr);}
public void BuildNode(GfmlNde nde) {Build(nde);}
void Build(GfmlItm owner) {
@@ -34,6 +34,6 @@ public class GfmlDocWtr_ {
public static String xtoStr_(GfmlNde nde) {
GfmlDocWtr_ wtr = new GfmlDocWtr_();
wtr.BuildNode(nde);
return wtr.XtoStrAndClear();
return wtr.Xto_str_and_clear();
}
}

2
110_gfml/src_400_pragma/gplx/gfml/GfmlPragmaDefault.java
View File

@@ -48,7 +48,7 @@ class GfmlPragmaDefault implements GfmlPragma {
makr.MakeSubTypeAsOwner( "_default");
makr.MakeSubTypeAsOwner( "type", "typeKey");
makr.MakeSubTypeAsOwner( "atr", "key", "val");
return makr.XtoAry();
return makr.Xto_bry();
}
public static GfmlPragmaDefault new_() {return new GfmlPragmaDefault();} GfmlPragmaDefault() {}
public static final GfmlTkn Default_none = GfmlTkn_.raw_("DEFAULT NONE");

2
110_gfml/src_400_pragma/gplx/gfml/GfmlPragmaLxrFrm.java
View File

@@ -58,7 +58,7 @@ class GfmlPragmaLxrFrm implements GfmlPragma {
}
public GfmlType[] MakePragmaTypes(GfmlTypeMakr makr) {
makr.MakeRootType("_lxr_frame", "_lxr_frame", "key", "type", "bgn", "end");
return makr.XtoAry();
return makr.Xto_bry();
}
public static GfmlPragmaLxrFrm new_() {return new GfmlPragmaLxrFrm();} GfmlPragmaLxrFrm() {}
}

2
110_gfml/src_400_pragma/gplx/gfml/GfmlPragmaLxrSym.java
View File

@@ -49,7 +49,7 @@ class GfmlPragmaLxrSym implements GfmlPragma {
makr.MakeRootType("_lxr_sym", "_lxr_sym", "key", "raw");
GfmlFld fld = GfmlFld.new_(true, "cmd", GfmlType_.StringKey).DefaultTkn_(GfmlTkn_.val_("gfml.elm_data"));
makr.AddSubFld(fld);
return makr.XtoAry();
return makr.Xto_bry();
}
public static GfmlPragmaLxrSym new_() {return new GfmlPragmaLxrSym();} GfmlPragmaLxrSym() {}
public static final String CacheLog_key = "log:var";

2
110_gfml/src_400_pragma/gplx/gfml/GfmlPragmaType.java
View File

@@ -45,7 +45,7 @@ class GfmlPragmaType implements GfmlPragma {
makr.MakeSubTypeAsOwner( "type", "name", "key");
makr.MakeSubTypeAsOwner( "fld", "name", "default", "type");
makr.AddSubFld(GfmlFld.new_(false, "fld", "_type/type/fld"));
return makr.XtoAry();
return makr.Xto_bry();
}
public static final String CacheLog_key = "log:type";
@gplx.Internal protected static void ExecList(GfmlTypRegy regy, OrderedHash list, ListAdp replaced) {

2
110_gfml/src_400_pragma/gplx/gfml/GfmlPragmaVar.java
View File

@@ -41,7 +41,7 @@ class GfmlPragmaVar implements GfmlPragma {
public GfmlType[] MakePragmaTypes(GfmlTypeMakr makr) {
makr.MakeSubTypeAsOwner (pragmaKey);
makr.MakeSubType ( "text", "key", "val", "ctx");
return makr.XtoAry();
return makr.Xto_bry();
}
void ExecList(HashAdp cache, ListAdp list) {
GfmlVarCtx ctx = null;

2
110_gfml/tst/gplx/gfml/yfxts_GfmlParse_fxt.java
View File

@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx.gfml; import gplx.*;
class GfmlParse_fxt {
public GfmlNde_mok nde_() {return GfmlNde_mok.new_();}
public GfmlTkn_mok tkn_grp_ary_(String... ary) {return GfmlTkn_mok.new_().Subs_(GfmlTkn_mok.XtoAry(ary));}
public GfmlTkn_mok tkn_grp_ary_(String... ary) {return GfmlTkn_mok.new_().Subs_(GfmlTkn_mok.Xto_bry(ary));}
public GfmlTkn_mok tkn_grp_(GfmlTkn_mok... ary) {return GfmlTkn_mok.new_().Subs_(ary);}
public GfmlTkn_mok tkn_itm_(String r) {return GfmlTkn_mok.new_().Raw_(r);}
public void ini_RootLxr_Add(GfmlLxr... ary) {rootLxr.SubLxr_Add(ary);}

2
110_gfml/tst/gplx/gfml/ymoks_GfmlTkn_mok.java
View File

@@ -55,7 +55,7 @@ class GfmlTkn_mok {
}
}
}
public static GfmlTkn_mok[] XtoAry(String... ary) {
public static GfmlTkn_mok[] Xto_bry(String... ary) {
GfmlTkn_mok[] rv = new GfmlTkn_mok[ary.length];
for (int i = 0; i < rv.length; i++)
rv[i] = GfmlTkn_mok.new_().Raw_(ary[i]);

2
110_gfml/tst/gplx/gfml/z091_GfmlLxr_basic_tst.java
View File

@@ -61,7 +61,7 @@ public class z091_GfmlLxr_basic_tst {
if (tkn == GfmlTkn_.EndOfStream) break;
list.Add(tkn.Raw());
}
String[] actl = (String[])list.XtoAry(String.class);
String[] actl = (String[])list.Xto_ary(String.class);
Tfds.Eq_ary(expd, actl);
return tkn;
}

2
110_gfml/tst/gplx/gfml/z400_GfmlTypeMakr_tst.java
View File

@@ -56,7 +56,7 @@ public class z400_GfmlTypeMakr_tst {
Tfds.Eq(expdKey, typeMakr.Owner().Key());
}
void tst_XtoAry(GfmlTypeMakr typeMakr, String... expdAry) {
GfmlType[] actlTypeAry = typeMakr.XtoAry();
GfmlType[] actlTypeAry = typeMakr.Xto_bry();
String[] actlAry = new String[actlTypeAry.length];
for (int i = 0; i < actlAry.length; i++) {
actlAry[i] = actlTypeAry[i].Key();

4
110_gfml/tst/gplx/gfml/z424_types_apply_ndes_nest_tst.java
View File

@@ -22,7 +22,7 @@ public class z424_types_apply_ndes_nest_tst {
GfmlTypeMakr makr = GfmlTypeMakr.new_();
makr.MakeRootType("gfml.item", "item");
makr.MakeSubType("pos", "x", "y");
fx.Regy().Add_ary(makr.XtoAry());
fx.Regy().Add_ary(makr.Xto_bry());
} GfmlTypeCompiler_fxt fx = GfmlTypeCompiler_fxt.new_();
@Test public void InvokeByHnd() {
fx.tst_Resolve
@@ -52,7 +52,7 @@ public class z424_types_apply_ndes_nest_tst {
GfmlTypeMakr makr = GfmlTypeMakr.new_();
makr.MakeRootType("font", "size");
makr.MakeSubType("color", "name");
fx.Regy().Add_ary(makr.XtoAry());
fx.Regy().Add_ary(makr.Xto_bry());
fx.tst_Resolve
( fx.nde_().Hnd_("color").Atru_("blue")
, fx.nde_().Typ_(GfmlType_.AnyKey).Atru_("blue")// confirm that subFlds in other types are not selectable by name; i.e.: must be font/color, not just color