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.7.3.1

Browse Source
This commit is contained in:
gnosygnu
2015-07-19 23:16:49 -04:00
parent 794b5a232f
commit 8e041d6e06
834 changed files with 4749 additions and 4461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
140_dbs/src/gplx/dbs/metas/parsers/Meta_fld_wkr__base.java
View File

@@ -97,7 +97,7 @@ class Meta_fld_wkr__default extends Meta_fld_wkr__base {
case Byte_ascii.Quote:
case Byte_ascii.Apos:
int bgn_pos = rdr.Pos() + 1;
int end_pos = Bry_finder.Find_fwd(src, b, bgn_pos); if (end_pos == Bry_finder.Not_found) throw Exc_.new_("unclosed quote", "snip", rdr.Mid_by_len_safe(40));
int end_pos = Bry_finder.Find_fwd(src, b, bgn_pos); if (end_pos == Bry_finder.Not_found) throw Err_.new_wo_type("unclosed quote", "snip", rdr.Mid_by_len_safe(40));
default_val = Bry_.Mid(src, bgn_pos, end_pos);
rdr.Pos_(end_pos + 1);
break;
@@ -107,7 +107,7 @@ class Meta_fld_wkr__default extends Meta_fld_wkr__base {
default_val = rdr.Read_int_to_non_num();
break;
default:
throw Exc_.new_("invalid field_default", "snip", rdr.Mid_by_len_safe(40));
throw Err_.new_wo_type("invalid field_default", "snip", rdr.Mid_by_len_safe(40));
}
fld.Default_val_(default_val);
}

8
140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__fld.java
View File

@@ -21,17 +21,17 @@ public class Meta_parser__fld {
public Meta_type_itm Parse_type(Bry_rdr rdr) {
rdr.Skip_ws();
Object type_obj = type_trie.Match_bgn(rdr.Src(), rdr.Pos(), rdr.Src_len());
if (type_obj == null) throw Exc_.new_("invalid fld type", "snip", rdr.Mid_by_len_safe(40));
if (type_obj == null) throw Err_.new_wo_type("invalid fld type", "snip", rdr.Mid_by_len_safe(40));
Meta_parser__fld_itm type_itm = (Meta_parser__fld_itm)type_obj;
rdr.Pos_add(type_itm.Word().length);
int paren_itms_count = type_itm.Paren_itms_count();
int len_1 = Int_.MinValue, len_2 = Int_.MinValue;
if (paren_itms_count > 0) {
rdr.Skip_ws().Chk_byte_or_fail(Byte_ascii.Paren_bgn);
len_1 = rdr.Skip_ws().Read_int_to_non_num(); if (len_1 == Int_.MinValue) throw Exc_.new_("invalid fld len_1", "snip", rdr.Mid_by_len_safe(40));
len_1 = rdr.Skip_ws().Read_int_to_non_num(); if (len_1 == Int_.MinValue) throw Err_.new_wo_type("invalid fld len_1", "snip", rdr.Mid_by_len_safe(40));
if (paren_itms_count == 2) {
rdr.Skip_ws().Chk_byte_or_fail(Byte_ascii.Comma);
len_2 = rdr.Skip_ws().Read_int_to_non_num(); if (len_2 == Int_.MinValue) throw Exc_.new_("invalid fld len_2", "snip", rdr.Mid_by_len_safe(40));
len_2 = rdr.Skip_ws().Read_int_to_non_num(); if (len_2 == Int_.MinValue) throw Err_.new_wo_type("invalid fld len_2", "snip", rdr.Mid_by_len_safe(40));
}
rdr.Skip_ws().Chk_byte_or_fail(Byte_ascii.Paren_end);
}
@@ -49,7 +49,7 @@ public class Meta_parser__fld {
case Byte_ascii.Comma: return fld;
case Byte_ascii.Paren_end: return fld;
}
Object type_obj = fld_trie.Match_bgn(src, rdr.Pos(), src_len); if (type_obj == null) throw Exc_.new_("invalid", "snip", rdr.Mid_by_len_safe(40));
Object type_obj = fld_trie.Match_bgn(src, rdr.Pos(), src_len); if (type_obj == null) throw Err_.new_wo_type("invalid", "snip", rdr.Mid_by_len_safe(40));
Meta_fld_wkr__base type_wkr = (Meta_fld_wkr__base)type_obj;
switch (type_wkr.Tid()) {
case Meta_fld_wkr__base.Tid_end_comma:

6
140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__tbl.java
View File

@@ -39,14 +39,14 @@ public class Meta_parser__tbl {
private void Parse_flds() {
byte[] src = rdr.Src();
while (true) {
Meta_fld_itm fld = fld_parser.Parse_fld(rdr); if (fld == null) throw Exc_.new_("unknown field", "src", rdr.Src());
Meta_fld_itm fld = fld_parser.Parse_fld(rdr); if (fld == null) throw Err_.new_wo_type("unknown field", "src", rdr.Src());
tbl.Flds().Add(fld);
int pos = rdr.Pos();
byte b = pos == rdr.Src_len() ? Byte_ascii.Nil : src[pos];
byte b = pos == rdr.Src_len() ? Byte_ascii.Null : src[pos];
switch (b) {
case Byte_ascii.Comma: rdr.Pos_add_one(); break;
case Byte_ascii.Paren_end: rdr.Pos_add_one(); return;
default: throw Exc_.new_("premature end of flds", "src", rdr.Mid_by_len_safe(40));
default: throw Err_.new_wo_type("premature end of flds", "src", rdr.Mid_by_len_safe(40));
}
}
}

6
140_dbs/src/gplx/dbs/metas/parsers/Sql_bry_rdr.java
View File

@@ -34,8 +34,8 @@ public class Sql_bry_rdr extends Bry_rdr { public byte[] Read_sql_identifier()
return Bry_.Mid(src, bgn, end);
}
@Override public Bry_rdr Skip_ws() {
byte b_0 = pos < src_len ? src[pos] : Byte_ascii.Nil;
byte bgn_1 = Byte_ascii.Nil;
byte b_0 = pos < src_len ? src[pos] : Byte_ascii.Null;
byte bgn_1 = Byte_ascii.Null;
byte[] end_bry = null;
switch (b_0) {
case Byte_ascii.Dash: bgn_1 = Byte_ascii.Dash; end_bry = Comm_end_line; break;
@@ -46,7 +46,7 @@ public class Sql_bry_rdr extends Bry_rdr { public byte[] Read_sql_identifier()
default:
return this;
}
byte b_1 = pos + 1 < src_len ? src[pos + 1] : Byte_ascii.Nil;
byte b_1 = pos + 1 < src_len ? src[pos + 1] : Byte_ascii.Null;
if (b_1 != bgn_1) return this;
int end_pos = Bry_finder.Find_fwd(src, end_bry, pos + 2, src_len);
if (end_pos == Bry_finder.Not_found) return this;