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

v2.8.3.1

Browse Source
This commit is contained in:
gnosygnu
2015-08-17 02:09:16 -04:00
parent 34c34f227c
commit df10db140c
421 changed files with 4867 additions and 2429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
100_core/src/gplx/Err.java
View File

@@ -47,7 +47,7 @@ public class Err extends RuntimeException {
public String To_str__full() {return To_str(Bool_.N, Bool_.Y);}
public String To_str__log() {return To_str(Bool_.Y, Bool_.Y);}
public String To_str__msg_only(){
return msgs_idx == 0 ? "<<MISSING ERROR MESSAGE>>" : msgs_ary[0].To_str(); // take 1st message only
return msgs_idx == 0 ? "<<MISSING ERROR MESSAGE>>" : msgs_ary[0].To_str_wo_type(); // take 1st message only
}
public String To_str__top_wo_args() {
return msgs_idx == 0 ? "<<MISSING ERROR MESSAGE>>" : msgs_ary[0].To_str_wo_args();

11
100_core/src/gplx/Err_.java
View File

@@ -50,17 +50,18 @@ public class Err_ {
}
public static String Message_lang(Exception e) {return e.getMessage();}
public static String Trace_lang(Exception e) {
String rv = "";
StackTraceElement[] ary = e.getStackTrace();
public static String Trace_lang(Exception e) {return Trace_lang_exec(e.getStackTrace());}
public static String Trace_lang(Error e) {return Trace_lang_exec(e.getStackTrace());}
private static String Trace_lang_exec(StackTraceElement[] ary) {
String rv = "";
int len = ary.length;
for (int i = 0; i < len; i++) {
if (i != 0) rv += "\n";
rv += ary[i].toString();
}
return rv;
}
public static boolean Type_match(Exception e, String type) {
}
public static boolean Type_match(Exception e, String type) {
Err exc = Err_.as_(e);
return exc == null ? false : exc.Type_match(type);
}

20
100_core/src/gplx/core/btries/Btrie_fast_mgr.java
View File

@@ -110,11 +110,11 @@ public class Btrie_fast_mgr {
}
return dirty ? tmp_bfr.Xto_bry_and_clear() : src;
}
public static Btrie_fast_mgr cs_() {return new Btrie_fast_mgr(false);}
public static Btrie_fast_mgr ci_ascii_() {return new Btrie_fast_mgr(true);}
public static Btrie_fast_mgr cs() {return new Btrie_fast_mgr(Bool_.N);}
public static Btrie_fast_mgr ci_a7() {return new Btrie_fast_mgr(Bool_.Y);}
public static Btrie_fast_mgr new_(boolean case_any) {return new Btrie_fast_mgr(case_any);}
Btrie_fast_mgr(boolean caseAny) {
root = new ByteTrieItm_fast(Byte_.Zero, null, caseAny);
Btrie_fast_mgr(boolean case_any) {
root = new ByteTrieItm_fast(Byte_.Zero, null, case_any);
}
}
class ByteTrieItm_fast {
@@ -122,7 +122,7 @@ class ByteTrieItm_fast {
public byte Key_byte() {return key_byte;} private byte key_byte;
public Object Val() {return val;} public void Val_set(Object val) {this.val = val;} Object val;
public boolean Ary_is_empty() {return ary_is_empty;} private boolean ary_is_empty;
public boolean CaseAny() {return caseAny;} public ByteTrieItm_fast CaseAny_(boolean v) {caseAny = v; return this;} private boolean caseAny;
public boolean CaseAny() {return case_any;} public ByteTrieItm_fast CaseAny_(boolean v) {case_any = v; return this;} private boolean case_any;
public void Clear() {
val = null;
for (int i = 0; i < 256; i++) {
@@ -135,22 +135,22 @@ class ByteTrieItm_fast {
ary_is_empty = true;
}
public ByteTrieItm_fast Ary_find(byte b) {
int key_byte = (caseAny && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
int key_byte = (case_any && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
return ary[key_byte];
}
public ByteTrieItm_fast Ary_add(byte b, Object val) {
int key_byte = (caseAny && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
ByteTrieItm_fast rv = new ByteTrieItm_fast(b, val, caseAny);
int key_byte = (case_any && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
ByteTrieItm_fast rv = new ByteTrieItm_fast(b, val, case_any);
ary[key_byte] = rv;
++ary_len;
ary_is_empty = false;
return rv;
}
public void Ary_del(byte b) {
int key_byte = (caseAny && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
int key_byte = (case_any && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
ary[key_byte] = null;
--ary_len;
ary_is_empty = ary_len == 0;
} int ary_len = 0;
public ByteTrieItm_fast(byte key_byte, Object val, boolean caseAny) {this.key_byte = key_byte; this.val = val; this.caseAny = caseAny;}
public ByteTrieItm_fast(byte key_byte, Object val, boolean case_any) {this.key_byte = key_byte; this.val = val; this.case_any = case_any;}
}

2
100_core/src/gplx/core/btries/Btrie_fast_mgr_tst.java
View File

@@ -59,7 +59,7 @@ public class Btrie_fast_mgr_tst {
class Btrie_fast_mgr_fxt {
private Btrie_fast_mgr trie;
public void Clear() {
trie = Btrie_fast_mgr.cs_();
trie = Btrie_fast_mgr.cs();
Init_add( 1 , Byte_ascii.Ltr_a);
Init_add(123 , Byte_ascii.Ltr_a, Byte_ascii.Ltr_b, Byte_ascii.Ltr_c);
}

2
100_core/src/gplx/core/btries/Btrie_slim_itm_tst.java
View File

@@ -44,6 +44,6 @@ public class Btrie_slim_itm_tst {
Object actl = actl_itm == null ? null : actl_itm.Val();
Tfds.Eq(expd, actl);
}
private void run_Add(byte... ary) {for (byte b : ary) itm.Ary_add(b, Char_.XtoStr((char)b));}
private void run_Add(byte... ary) {for (byte b : ary) itm.Ary_add(b, Char_.To_str((char)b));}
private void run_Del(byte... ary) {for (byte b : ary) itm.Ary_del(b);}
}

2
100_core/src/gplx/core/criterias/Criteria.java
View File

@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.core.criterias; import gplx.*; import gplx.core.*;
public interface Criteria extends XtoStrAble {
public interface Criteria extends To_str_able {
byte Tid();
boolean Matches(Object obj);
void Val_from_args(Hash_adp args);

2
100_core/src/gplx/core/criterias/Criteria_between.java
View File

@@ -28,7 +28,7 @@ public class Criteria_between implements Criteria {
}
public Comparable Lhs() {return lhs;} private Comparable lhs;
public Comparable Rhs() {return rhs;} private Comparable rhs;
public String XtoStr() {return String_.Concat_any("BETWEEN ", lhs, " AND ", rhs);}
public String To_str() {return String_.Concat_any("BETWEEN ", lhs, " AND ", rhs);}
public boolean Matches(Object compObj) {
Comparable comp = CompareAble_.as_(compObj);
int lhsResult = CompareAble_.CompareComparables(lhs, comp);

6
100_core/src/gplx/core/criterias/Criteria_bool_base.java
View File

@@ -22,7 +22,7 @@ public abstract class Criteria_bool_base implements Criteria {
public abstract boolean Matches(Object curVal);
public void Val_from_args(Hash_adp args) {lhs.Val_from_args(args); rhs.Val_from_args(args);}
public void Val_as_obj_(Object v) {throw Err_.new_unimplemented();}
public String XtoStr() {return String_.Concat(lhs.XtoStr(), " ", this.op_literal, " ", rhs.XtoStr());}
public String To_str() {return String_.Concat(lhs.To_str(), " ", this.op_literal, " ", rhs.To_str());}
public String Op_literal() {return op_literal;} private String op_literal;
public Criteria Lhs() {return lhs;} private Criteria lhs;
public Criteria Rhs() {return rhs;} private Criteria rhs;
@@ -44,7 +44,7 @@ class Criteria_const implements Criteria {
public boolean Matches(Object comp) {return val;} private final boolean val;
public void Val_from_args(Hash_adp args) {;}
public void Val_as_obj_(Object v) {throw Err_.new_unimplemented();}
public String XtoStr() {return String_.Concat(" IS ", Bool_.Xto_str_lower(val));}
public String To_str() {return String_.Concat(" IS ", Bool_.Xto_str_lower(val));}
}
class Criteria_not implements Criteria {
private final Criteria criteria;
@@ -53,5 +53,5 @@ class Criteria_not implements Criteria {
public boolean Matches(Object obj) {return !criteria.Matches(obj);}
public void Val_from_args(Hash_adp args) {criteria.Val_from_args(args);}
public void Val_as_obj_(Object v) {criteria.Val_as_obj_(v);}
public String XtoStr() {return String_.Concat_any(" NOT ", criteria.XtoStr());}
public String To_str() {return String_.Concat_any(" NOT ", criteria.To_str());}
}

2
100_core/src/gplx/core/criterias/Criteria_comp.java
View File

@@ -27,7 +27,7 @@ public class Criteria_comp implements Criteria {
Comparable comp = CompareAble_.as_(compObj);
return CompareAble_.Is(comp_mode, comp, val);
}
public String XtoStr() {return String_.Concat_any(XtoSymbol(), " ", val);}
public String To_str() {return String_.Concat_any(XtoSymbol(), " ", val);}
public String XtoSymbol() {
String comp_sym = comp_mode < CompareAble_.Same ? "<" : ">";
String eq_sym = comp_mode % 2 == CompareAble_.Same ? "=" : "";

2
100_core/src/gplx/core/criterias/Criteria_eq.java
View File

@@ -29,6 +29,6 @@ public class Criteria_eq implements Criteria {
boolean rv = Object_.Eq(val, comp);
return negated ? !rv : rv;
}
public String XtoStr() {return String_.Concat_any("= ", val);}
public String To_str() {return String_.Concat_any("= ", val);}
public static Criteria_eq as_(Object obj) {return obj instanceof Criteria_eq ? (Criteria_eq)obj : null;}
}

2
100_core/src/gplx/core/criterias/Criteria_fld.java
View File

@@ -33,7 +33,7 @@ public class Criteria_fld implements Criteria {
Object comp = GfoInvkAble_.InvkCmd(invk, key);
return crt.Matches(comp);
}
public String XtoStr() {return String_.Concat(key, " ", crt.XtoStr());}
public String To_str() {return String_.Concat(key, " ", crt.To_str());}
public static final String Key_null = null;
public static Criteria_fld as_(Object obj) {return obj instanceof Criteria_fld ? (Criteria_fld)obj : null;}
public static Criteria_fld new_(String key, Criteria crt) {return new Criteria_fld(key, crt);}

2
100_core/src/gplx/core/criterias/Criteria_in.java
View File

@@ -41,6 +41,6 @@ public class Criteria_in implements Criteria {
}
return negated ? !rv : rv;
}
public String XtoStr() {return String_.Concat_any("IN ", String_.Concat_any(ary));}
public String To_str() {return String_.Concat_any("IN ", String_.Concat_any(ary));}
public static Criteria_in as_(Object obj) {return obj instanceof Criteria_in ? (Criteria_in)obj : null;}
}

2
100_core/src/gplx/core/criterias/Criteria_ioMatch.java
View File

@@ -29,7 +29,7 @@ public class Criteria_ioMatch implements Criteria { // EX: url IOMATCH '*.xml|*.
boolean rv = pattern.Matches(comp.XtoCaseNormalized());
return match ? rv : !rv;
}
public String XtoStr() {return String_.Concat_any("IOMATCH ", pattern);}
public String To_str() {return String_.Concat_any("IOMATCH ", pattern);}
public static final String TokenName = "IOMATCH";
public static Criteria_ioMatch as_(Object obj) {return obj instanceof Criteria_ioMatch ? (Criteria_ioMatch)obj : null;}

2
100_core/src/gplx/core/criterias/Criteria_like.java
View File

@@ -31,6 +31,6 @@ public class Criteria_like implements Criteria {
boolean rv = pattern.Matches(comp);
return negated ? !rv : rv;
}
public String XtoStr() {return String_.Concat_any("LIKE ", pattern);}
public String To_str() {return String_.Concat_any("LIKE ", pattern);}
public static Criteria_like as_(Object obj) {return obj instanceof Criteria_like ? (Criteria_like)obj : null;}
}

2
100_core/src/gplx/core/regxs/Regx_adp__tst.java
View File

@@ -84,7 +84,7 @@ public class Regx_adp__tst implements TfdsEqListItmStr {
}
return rv.To_str_ary();
}
public String XtoStr(Object curObj, Object expdObj) {
public String To_str(Object curObj, Object expdObj) {
Regx_match cur = (Regx_match)curObj, expd = (Regx_match)expdObj;
String rv = "bgn=" + cur.Find_bgn();
if (expd != null && expd.Find_len() != Int_.MinValue) rv += " len=" + cur.Find_len();

2
100_core/src/gplx/core/regxs/Regx_bldr.java
View File

@@ -30,7 +30,7 @@ public class Regx_bldr {
sb.Add(Regx_bldr.Tkn_Escape);
sb.Add(c);
}
return sb.XtoStr();
return sb.To_str();
}
public static boolean RegxChar_chk(char c) {
return

12
100_core/src/gplx/core/strings/String_bldr.java
View File

@@ -31,7 +31,7 @@ public interface String_bldr {
String_bldr Add_spr_unless_first(String s, String spr, int i);
String_bldr Clear();
String Xto_str_and_clear();
String XtoStr();
String To_str();
int Count();
String_bldr Add(byte[] v);
String_bldr Add(String s);
@@ -71,12 +71,12 @@ abstract class String_bldr_base implements String_bldr {
}
public String_bldr Clear() {Del(0, Count()); return this;}
public String Xto_str_and_clear() {
String rv = XtoStr();
String rv = To_str();
Clear();
return rv;
}
@Override public String toString() {return XtoStr();}
public abstract String XtoStr();
@Override public String toString() {return To_str();}
public abstract String To_str();
public abstract int Count();
public abstract String_bldr Add_at(int idx, String s);
public abstract String_bldr Add(byte[] v);
@@ -89,7 +89,7 @@ abstract class String_bldr_base implements String_bldr {
}
class String_bldr_thread_single extends String_bldr_base {
private java.lang.StringBuilder sb = new java.lang.StringBuilder();
@Override public String XtoStr() {return sb.toString();}
@Override public String To_str() {return sb.toString();}
@Override public int Count() {return sb.length();}
@Override public String_bldr Add_at(int idx, String s) {sb.insert(idx, s); return this;}
@Override public String_bldr Add(byte[] v) {sb.append(String_.new_u8(v)); return this;}
@@ -102,7 +102,7 @@ class String_bldr_thread_single extends String_bldr_base {
}
class String_bldr_thread_multiple extends String_bldr_base {
private java.lang.StringBuffer sb = new java.lang.StringBuffer();
@Override public String XtoStr() {return sb.toString();}
@Override public String To_str() {return sb.toString();}
@Override public int Count() {return sb.length();}
@Override public String_bldr Add_at(int idx, String s) {sb.insert(idx, s); return this;}
@Override public String_bldr Add(byte[] v) {sb.append(String_.new_u8(v)); return this;}