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

Browse Source
This commit is contained in:
gnosygnu
2015-05-24 22:43:55 -04:00
parent 6eec99a713
commit 51e6188c1e
1577 changed files with 11555 additions and 10080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
400_xowa/src_140_lang/gplx/xowa/Xobcl_kwd_row.java
View File

@@ -24,5 +24,5 @@ public class Xobcl_kwd_row {
}
public byte[] Key() {return key;} private byte[] key;
public byte[][] Itms() {return itms;} private byte[][] itms;
public boolean Itms_has(byte[] key) {return itms_hash.Has(key);} private OrderedHash itms_hash = OrderedHash_.new_bry_();
public boolean Itms_has(byte[] key) {return itms_hash.Has(key);} private Ordered_hash itms_hash = Ordered_hash_.new_bry_();
}

4
400_xowa/src_140_lang/gplx/xowa/Xol_csv_parser.java
View File

@@ -57,7 +57,7 @@ public class Xol_csv_parser {
int utf_pos = i + 2;
for (int j = 0; j < utf_len; j++) {
int utf_int = Int_.Xto_int_hex(src, utf_pos, utf_pos + 4);
if (utf_int == -1) throw Err_mgr._.fmt_(GRP_KEY, "parse_invalid_escape_u", "invalid value for \\u: ~{0}", String_.new_utf8_(src, bgn, end));
if (utf_int == -1) throw Err_mgr._.fmt_(GRP_KEY, "parse_invalid_escape_u", "invalid value for \\u: ~{0}", String_.new_u8(src, bgn, end));
utf_bytes[utf_idx++] = (byte)utf_int;
utf_pos += 6;
}
@@ -77,7 +77,7 @@ public class Xol_csv_parser {
}
}
private static final String GRP_KEY = "Xol_csv_parser";
private static final byte[] Bry_pipe = Bry_.new_ascii_("\\u007C");
private static final byte[] Bry_pipe = Bry_.new_a7("\\u007C");
private static final Bry_bfr tmp_bfr = Bry_bfr.reset_(255);
public static final Xol_csv_parser _ = new Xol_csv_parser(); Xol_csv_parser() {}
}

4
400_xowa/src_140_lang/gplx/xowa/Xol_csv_parser_tst.java
View File

@@ -30,11 +30,11 @@ class Xol_csv_parser_fxt {
Xol_csv_parser parser = Xol_csv_parser._; Bry_bfr tmp_bfr = Bry_bfr.reset_(255);
public void Clear() {}
public void Tst_save(String raw, String expd) {
parser.Save(tmp_bfr, Bry_.new_utf8_(raw));
parser.Save(tmp_bfr, Bry_.new_u8(raw));
Tfds.Eq(expd, tmp_bfr.Xto_str_and_clear());
}
public void Tst_load(String expd, String raw_str) {
byte[] raw = Bry_.new_utf8_(raw_str);
byte[] raw = Bry_.new_u8(raw_str);
parser.Load(tmp_bfr, raw, 0, raw.length);
Tfds.Eq(expd, tmp_bfr.Xto_str_and_clear());
}

396
400_xowa/src_140_lang/gplx/xowa/Xol_kwd_grp_.java
View File

@@ -222,204 +222,204 @@ public static final int Id__max = 198;
private static byte[] ary_itm_(int id) {
switch (id) {
case Xol_kwd_grp_.Id_redirect: return Bry_.new_utf8_("redirect");
case Xol_kwd_grp_.Id_notoc: return Bry_.new_utf8_("notoc");
case Xol_kwd_grp_.Id_nogallery: return Bry_.new_utf8_("nogallery");
case Xol_kwd_grp_.Id_forcetoc: return Bry_.new_utf8_("forcetoc");
case Xol_kwd_grp_.Id_toc: return Bry_.new_utf8_("toc");
case Xol_kwd_grp_.Id_noeditsection: return Bry_.new_utf8_("noeditsection");
case Xol_kwd_grp_.Id_noheader: return Bry_.new_utf8_("noheader");
case Xol_kwd_grp_.Id_utc_month_int_len2: return Bry_.new_utf8_("currentmonth");
case Xol_kwd_grp_.Id_utc_month_int: return Bry_.new_utf8_("currentmonth1");
case Xol_kwd_grp_.Id_utc_month_name: return Bry_.new_utf8_("currentmonthname");
case Xol_kwd_grp_.Id_utc_month_gen: return Bry_.new_utf8_("currentmonthnamegen");
case Xol_kwd_grp_.Id_utc_month_abrv: return Bry_.new_utf8_("currentmonthabbrev");
case Xol_kwd_grp_.Id_utc_day_int: return Bry_.new_utf8_("currentday");
case Xol_kwd_grp_.Id_utc_day_int_len2: return Bry_.new_utf8_("currentday2");
case Xol_kwd_grp_.Id_utc_day_name: return Bry_.new_utf8_("currentdayname");
case Xol_kwd_grp_.Id_utc_year: return Bry_.new_utf8_("currentyear");
case Xol_kwd_grp_.Id_utc_time: return Bry_.new_utf8_("currenttime");
case Xol_kwd_grp_.Id_utc_hour: return Bry_.new_utf8_("currenthour");
case Xol_kwd_grp_.Id_lcl_month_int_len2: return Bry_.new_utf8_("localmonth");
case Xol_kwd_grp_.Id_lcl_month_int: return Bry_.new_utf8_("localmonth1");
case Xol_kwd_grp_.Id_lcl_month_name: return Bry_.new_utf8_("localmonthname");
case Xol_kwd_grp_.Id_lcl_month_gen: return Bry_.new_utf8_("localmonthnamegen");
case Xol_kwd_grp_.Id_lcl_month_abrv: return Bry_.new_utf8_("localmonthabbrev");
case Xol_kwd_grp_.Id_lcl_day_int: return Bry_.new_utf8_("localday");
case Xol_kwd_grp_.Id_lcl_day_int_len2: return Bry_.new_utf8_("localday2");
case Xol_kwd_grp_.Id_lcl_day_name: return Bry_.new_utf8_("localdayname");
case Xol_kwd_grp_.Id_lcl_year: return Bry_.new_utf8_("localyear");
case Xol_kwd_grp_.Id_lcl_time: return Bry_.new_utf8_("localtime");
case Xol_kwd_grp_.Id_lcl_hour: return Bry_.new_utf8_("localhour");
case Xol_kwd_grp_.Id_num_pages: return Bry_.new_utf8_("numberofpages");
case Xol_kwd_grp_.Id_num_articles: return Bry_.new_utf8_("numberofarticles");
case Xol_kwd_grp_.Id_num_files: return Bry_.new_utf8_("numberoffiles");
case Xol_kwd_grp_.Id_num_users: return Bry_.new_utf8_("numberofusers");
case Xol_kwd_grp_.Id_num_users_active: return Bry_.new_utf8_("numberofactiveusers");
case Xol_kwd_grp_.Id_num_edits: return Bry_.new_utf8_("numberofedits");
case Xol_kwd_grp_.Id_num_views: return Bry_.new_utf8_("numberofviews");
case Xol_kwd_grp_.Id_ttl_page_txt: return Bry_.new_utf8_("pagename");
case Xol_kwd_grp_.Id_ttl_page_url: return Bry_.new_utf8_("pagenamee");
case Xol_kwd_grp_.Id_ns_txt: return Bry_.new_utf8_("namespace");
case Xol_kwd_grp_.Id_ns_url: return Bry_.new_utf8_("namespacee");
case Xol_kwd_grp_.Id_ns_talk_txt: return Bry_.new_utf8_("talkspace");
case Xol_kwd_grp_.Id_ns_talk_url: return Bry_.new_utf8_("talkspacee");
case Xol_kwd_grp_.Id_ns_subj_txt: return Bry_.new_utf8_("subjectspace");
case Xol_kwd_grp_.Id_ns_subj_url: return Bry_.new_utf8_("subjectspacee");
case Xol_kwd_grp_.Id_ttl_full_txt: return Bry_.new_utf8_("fullpagename");
case Xol_kwd_grp_.Id_ttl_full_url: return Bry_.new_utf8_("fullpagenamee");
case Xol_kwd_grp_.Id_ttl_leaf_txt: return Bry_.new_utf8_("subpagename");
case Xol_kwd_grp_.Id_ttl_leaf_url: return Bry_.new_utf8_("subpagenamee");
case Xol_kwd_grp_.Id_ttl_base_txt: return Bry_.new_utf8_("basepagename");
case Xol_kwd_grp_.Id_ttl_base_url: return Bry_.new_utf8_("basepagenamee");
case Xol_kwd_grp_.Id_ttl_talk_txt: return Bry_.new_utf8_("talkpagename");
case Xol_kwd_grp_.Id_ttl_talk_url: return Bry_.new_utf8_("talkpagenamee");
case Xol_kwd_grp_.Id_ttl_subj_txt: return Bry_.new_utf8_("subjectpagename");
case Xol_kwd_grp_.Id_ttl_subj_url: return Bry_.new_utf8_("subjectpagenamee");
case Xol_kwd_grp_.Id_msg: return Bry_.new_utf8_("msg");
case Xol_kwd_grp_.Id_subst: return Bry_.new_utf8_("subst");
case Xol_kwd_grp_.Id_safesubst: return Bry_.new_utf8_("safesubst");
case Xol_kwd_grp_.Id_msgnw: return Bry_.new_utf8_("msgnw");
case Xol_kwd_grp_.Id_img_thumbnail: return Bry_.new_utf8_("img_thumbnail");
case Xol_kwd_grp_.Id_img_manualthumb: return Bry_.new_utf8_("img_manualthumb");
case Xol_kwd_grp_.Id_img_framed: return Bry_.new_utf8_("img_framed");
case Xol_kwd_grp_.Id_img_frameless: return Bry_.new_utf8_("img_frameless");
case Xol_kwd_grp_.Id_img_upright: return Bry_.new_utf8_("img_upright");
case Xol_kwd_grp_.Id_img_upright_factor: return Bry_.new_utf8_("img_upright_factor");
case Xol_kwd_grp_.Id_img_border: return Bry_.new_utf8_("img_border");
case Xol_kwd_grp_.Id_img_align: return Bry_.new_utf8_("img_align");
case Xol_kwd_grp_.Id_img_valign: return Bry_.new_utf8_("img_valign");
case Xol_kwd_grp_.Id_img_alt: return Bry_.new_utf8_("img_alt");
case Xol_kwd_grp_.Id_img_class: return Bry_.new_utf8_("img_class");
case Xol_kwd_grp_.Id_img_caption: return Bry_.new_utf8_("img_caption");
case Xol_kwd_grp_.Id_img_link_url: return Bry_.new_utf8_("img_link_url");
case Xol_kwd_grp_.Id_img_link_title: return Bry_.new_utf8_("img_link_title");
case Xol_kwd_grp_.Id_img_link_target: return Bry_.new_utf8_("img_link_target");
case Xol_kwd_grp_.Id_img_link_none: return Bry_.new_utf8_("img_link_none");
case Xol_kwd_grp_.Id_img_width: return Bry_.new_utf8_("img_width");
case Xol_kwd_grp_.Id_img_page: return Bry_.new_utf8_("img_page");
case Xol_kwd_grp_.Id_img_none: return Bry_.new_utf8_("img_none");
case Xol_kwd_grp_.Id_img_right: return Bry_.new_utf8_("img_right");
case Xol_kwd_grp_.Id_img_center: return Bry_.new_utf8_("img_center");
case Xol_kwd_grp_.Id_img_left: return Bry_.new_utf8_("img_left");
case Xol_kwd_grp_.Id_img_baseline: return Bry_.new_utf8_("img_baseline");
case Xol_kwd_grp_.Id_img_sub: return Bry_.new_utf8_("img_sub");
case Xol_kwd_grp_.Id_img_super: return Bry_.new_utf8_("img_super");
case Xol_kwd_grp_.Id_img_top: return Bry_.new_utf8_("img_top");
case Xol_kwd_grp_.Id_img_text_top: return Bry_.new_utf8_("img_text_top");
case Xol_kwd_grp_.Id_img_middle: return Bry_.new_utf8_("img_middle");
case Xol_kwd_grp_.Id_img_bottom: return Bry_.new_utf8_("img_bottom");
case Xol_kwd_grp_.Id_img_text_bottom: return Bry_.new_utf8_("img_text_bottom");
case Xol_kwd_grp_.Id_img_link: return Bry_.new_utf8_("img_link");
case Xol_kwd_grp_.Id_i18n_int: return Bry_.new_utf8_("int");
case Xol_kwd_grp_.Id_site_sitename: return Bry_.new_utf8_("sitename");
case Xol_kwd_grp_.Id_url_ns: return Bry_.new_utf8_("ns");
case Xol_kwd_grp_.Id_url_nse: return Bry_.new_utf8_("nse");
case Xol_kwd_grp_.Id_url_localurl: return Bry_.new_utf8_("localurl");
case Xol_kwd_grp_.Id_url_localurle: return Bry_.new_utf8_("localurle");
case Xol_kwd_grp_.Id_site_articlepath: return Bry_.new_utf8_("articlepath");
case Xol_kwd_grp_.Id_site_server: return Bry_.new_utf8_("server");
case Xol_kwd_grp_.Id_site_servername: return Bry_.new_utf8_("servername");
case Xol_kwd_grp_.Id_site_scriptpath: return Bry_.new_utf8_("scriptpath");
case Xol_kwd_grp_.Id_site_stylepath: return Bry_.new_utf8_("stylepath");
case Xol_kwd_grp_.Id_i18n_grammar: return Bry_.new_utf8_("grammar");
case Xol_kwd_grp_.Id_i18n_gender: return Bry_.new_utf8_("gender");
case Xol_kwd_grp_.Id_notitleconvert: return Bry_.new_utf8_("notitleconvert");
case Xol_kwd_grp_.Id_nocontentconvert: return Bry_.new_utf8_("nocontentconvert");
case Xol_kwd_grp_.Id_utc_week: return Bry_.new_utf8_("currentweek");
case Xol_kwd_grp_.Id_utc_dow: return Bry_.new_utf8_("currentdow");
case Xol_kwd_grp_.Id_lcl_week: return Bry_.new_utf8_("localweek");
case Xol_kwd_grp_.Id_lcl_dow: return Bry_.new_utf8_("localdow");
case Xol_kwd_grp_.Id_rev_id: return Bry_.new_utf8_("revisionid");
case Xol_kwd_grp_.Id_rev_day_int: return Bry_.new_utf8_("revisionday");
case Xol_kwd_grp_.Id_rev_day_int_len2: return Bry_.new_utf8_("revisionday2");
case Xol_kwd_grp_.Id_rev_month_int_len2: return Bry_.new_utf8_("revisionmonth");
case Xol_kwd_grp_.Id_rev_month_int: return Bry_.new_utf8_("revisionmonth1");
case Xol_kwd_grp_.Id_rev_year: return Bry_.new_utf8_("revisionyear");
case Xol_kwd_grp_.Id_rev_timestamp: return Bry_.new_utf8_("revisiontimestamp");
case Xol_kwd_grp_.Id_rev_user: return Bry_.new_utf8_("revisionuser");
case Xol_kwd_grp_.Id_i18n_plural: return Bry_.new_utf8_("plural");
case Xol_kwd_grp_.Id_url_fullurl: return Bry_.new_utf8_("fullurl");
case Xol_kwd_grp_.Id_url_fullurle: return Bry_.new_utf8_("fullurle");
case Xol_kwd_grp_.Id_str_lcfirst: return Bry_.new_utf8_("lcfirst");
case Xol_kwd_grp_.Id_str_ucfirst: return Bry_.new_utf8_("ucfirst");
case Xol_kwd_grp_.Id_str_lc: return Bry_.new_utf8_("lc");
case Xol_kwd_grp_.Id_str_uc: return Bry_.new_utf8_("uc");
case Xol_kwd_grp_.Id_raw: return Bry_.new_utf8_("raw");
case Xol_kwd_grp_.Id_page_displaytitle: return Bry_.new_utf8_("displaytitle");
case Xol_kwd_grp_.Id_str_rawsuffix: return Bry_.new_utf8_("rawsuffix");
case Xol_kwd_grp_.Id_newsectionlink: return Bry_.new_utf8_("newsectionlink");
case Xol_kwd_grp_.Id_nonewsectionlink: return Bry_.new_utf8_("nonewsectionlink");
case Xol_kwd_grp_.Id_site_currentversion: return Bry_.new_utf8_("currentversion");
case Xol_kwd_grp_.Id_url_urlencode: return Bry_.new_utf8_("urlencode");
case Xol_kwd_grp_.Id_url_anchorencode: return Bry_.new_utf8_("anchorencode");
case Xol_kwd_grp_.Id_utc_timestamp: return Bry_.new_utf8_("currenttimestamp");
case Xol_kwd_grp_.Id_lcl_timestamp: return Bry_.new_utf8_("localtimestamp");
case Xol_kwd_grp_.Id_site_directionmark: return Bry_.new_utf8_("directionmark");
case Xol_kwd_grp_.Id_i18n_language: return Bry_.new_utf8_("language");
case Xol_kwd_grp_.Id_site_contentlanguage: return Bry_.new_utf8_("contentlanguage");
case Xol_kwd_grp_.Id_site_pagesinnamespace: return Bry_.new_utf8_("pagesinnamespace");
case Xol_kwd_grp_.Id_num_admins: return Bry_.new_utf8_("numberofadmins");
case Xol_kwd_grp_.Id_str_formatnum: return Bry_.new_utf8_("formatnum");
case Xol_kwd_grp_.Id_str_padleft: return Bry_.new_utf8_("padleft");
case Xol_kwd_grp_.Id_str_padright: return Bry_.new_utf8_("padright");
case Xol_kwd_grp_.Id_misc_special: return Bry_.new_utf8_("special");
case Xol_kwd_grp_.Id_page_defaultsort: return Bry_.new_utf8_("defaultsort");
case Xol_kwd_grp_.Id_url_filepath: return Bry_.new_utf8_("filepath");
case Xol_kwd_grp_.Id_misc_tag: return Bry_.new_utf8_("tag");
case Xol_kwd_grp_.Id_hiddencat: return Bry_.new_utf8_("hiddencat");
case Xol_kwd_grp_.Id_site_pagesincategory: return Bry_.new_utf8_("pagesincategory");
case Xol_kwd_grp_.Id_rev_pagesize: return Bry_.new_utf8_("pagesize");
case Xol_kwd_grp_.Id_index: return Bry_.new_utf8_("index");
case Xol_kwd_grp_.Id_noindex: return Bry_.new_utf8_("noindex");
case Xol_kwd_grp_.Id_site_numberingroup: return Bry_.new_utf8_("numberingroup");
case Xol_kwd_grp_.Id_staticredirect: return Bry_.new_utf8_("staticredirect");
case Xol_kwd_grp_.Id_rev_protectionlevel: return Bry_.new_utf8_("protectionlevel");
case Xol_kwd_grp_.Id_str_formatdate: return Bry_.new_utf8_("formatdate");
case Xol_kwd_grp_.Id_url_path: return Bry_.new_utf8_("url_path");
case Xol_kwd_grp_.Id_url_wiki: return Bry_.new_utf8_("url_wiki");
case Xol_kwd_grp_.Id_url_query: return Bry_.new_utf8_("url_query");
case Xol_kwd_grp_.Id_xtn_expr: return Bry_.new_utf8_("expr");
case Xol_kwd_grp_.Id_xtn_if: return Bry_.new_utf8_("if");
case Xol_kwd_grp_.Id_xtn_ifeq: return Bry_.new_utf8_("ifeq");
case Xol_kwd_grp_.Id_xtn_ifexpr: return Bry_.new_utf8_("ifexpr");
case Xol_kwd_grp_.Id_xtn_iferror: return Bry_.new_utf8_("iferror");
case Xol_kwd_grp_.Id_xtn_switch: return Bry_.new_utf8_("switch");
case Xol_kwd_grp_.Id_xtn_default: return Bry_.new_utf8_("default");
case Xol_kwd_grp_.Id_xtn_ifexist: return Bry_.new_utf8_("ifexist");
case Xol_kwd_grp_.Id_xtn_time: return Bry_.new_utf8_("time");
case Xol_kwd_grp_.Id_xtn_timel: return Bry_.new_utf8_("timel");
case Xol_kwd_grp_.Id_xtn_rel2abs: return Bry_.new_utf8_("rel2abs");
case Xol_kwd_grp_.Id_xtn_titleparts: return Bry_.new_utf8_("titleparts");
case Xol_kwd_grp_.Id_xowa_dbg: return Bry_.new_utf8_("xowa_dbg");
case Xol_kwd_grp_.Id_ogg_noplayer: return Bry_.new_utf8_("noplayer");
case Xol_kwd_grp_.Id_ogg_noicon: return Bry_.new_utf8_("noicon");
case Xol_kwd_grp_.Id_ogg_thumbtime: return Bry_.new_utf8_("thumbtime");
case Xol_kwd_grp_.Id_xtn_geodata_coordinates: return Bry_.new_utf8_("coordinates");
case Xol_kwd_grp_.Id_url_canonicalurl: return Bry_.new_utf8_("canonicalurl");
case Xol_kwd_grp_.Id_url_canonicalurle: return Bry_.new_utf8_("canonicalurle");
case Xol_kwd_grp_.Id_lst: return Bry_.new_utf8_("lst");
case Xol_kwd_grp_.Id_lstx: return Bry_.new_utf8_("lstx");
case Xol_kwd_grp_.Id_invoke: return Bry_.new_utf8_("invoke");
case Xol_kwd_grp_.Id_property: return Bry_.new_utf8_("property");
case Xol_kwd_grp_.Id_noexternallanglinks: return Bry_.new_utf8_("noexternallanglinks");
case Xol_kwd_grp_.Id_ns_num: return Bry_.new_utf8_("namespacenumber");
case Xol_kwd_grp_.Id_page_id: return Bry_.new_utf8_("pageid");
case Xol_kwd_grp_.Id_disambig: return Bry_.new_utf8_("disambiguation");
case Xol_kwd_grp_.Id_nocommafysuffix: return Bry_.new_utf8_("nosep");
case Xol_kwd_grp_.Id_xowa: return Bry_.new_utf8_("xowa");
case Xol_kwd_grp_.Id_mapSources_deg2dd: return Bry_.new_utf8_("deg2dd");
case Xol_kwd_grp_.Id_mapSources_dd2dms: return Bry_.new_utf8_("dd2dms");
case Xol_kwd_grp_.Id_mapSources_geoLink: return Bry_.new_utf8_("geolink");
case Xol_kwd_grp_.Id_geoCrumbs_isin: return Bry_.new_utf8_("isin");
case Xol_kwd_grp_.Id_relatedArticles: return Bry_.new_utf8_("relatedArticles");
case Xol_kwd_grp_.Id_insider: return Bry_.new_utf8_("insider");
case Xol_kwd_grp_.Id_massMessage_target: return Bry_.new_utf8_("target");
case Xol_kwd_grp_.Id_cascadingSources: return Bry_.new_utf8_("cascadingSources");
case Xol_kwd_grp_.Id_pendingChangeLevel: return Bry_.new_utf8_("pendingChangeLevel");
case Xol_kwd_grp_.Id_pagesUsingPendingChanges: return Bry_.new_utf8_("pagesUsingPendingChanges");
case Xol_kwd_grp_.Id_bang: return Bry_.new_utf8_("!");
case Xol_kwd_grp_.Id_wbreponame: return Bry_.new_utf8_("wbreponame");
case Xol_kwd_grp_.Id_redirect: return Bry_.new_u8("redirect");
case Xol_kwd_grp_.Id_notoc: return Bry_.new_u8("notoc");
case Xol_kwd_grp_.Id_nogallery: return Bry_.new_u8("nogallery");
case Xol_kwd_grp_.Id_forcetoc: return Bry_.new_u8("forcetoc");
case Xol_kwd_grp_.Id_toc: return Bry_.new_u8("toc");
case Xol_kwd_grp_.Id_noeditsection: return Bry_.new_u8("noeditsection");
case Xol_kwd_grp_.Id_noheader: return Bry_.new_u8("noheader");
case Xol_kwd_grp_.Id_utc_month_int_len2: return Bry_.new_u8("currentmonth");
case Xol_kwd_grp_.Id_utc_month_int: return Bry_.new_u8("currentmonth1");
case Xol_kwd_grp_.Id_utc_month_name: return Bry_.new_u8("currentmonthname");
case Xol_kwd_grp_.Id_utc_month_gen: return Bry_.new_u8("currentmonthnamegen");
case Xol_kwd_grp_.Id_utc_month_abrv: return Bry_.new_u8("currentmonthabbrev");
case Xol_kwd_grp_.Id_utc_day_int: return Bry_.new_u8("currentday");
case Xol_kwd_grp_.Id_utc_day_int_len2: return Bry_.new_u8("currentday2");
case Xol_kwd_grp_.Id_utc_day_name: return Bry_.new_u8("currentdayname");
case Xol_kwd_grp_.Id_utc_year: return Bry_.new_u8("currentyear");
case Xol_kwd_grp_.Id_utc_time: return Bry_.new_u8("currenttime");
case Xol_kwd_grp_.Id_utc_hour: return Bry_.new_u8("currenthour");
case Xol_kwd_grp_.Id_lcl_month_int_len2: return Bry_.new_u8("localmonth");
case Xol_kwd_grp_.Id_lcl_month_int: return Bry_.new_u8("localmonth1");
case Xol_kwd_grp_.Id_lcl_month_name: return Bry_.new_u8("localmonthname");
case Xol_kwd_grp_.Id_lcl_month_gen: return Bry_.new_u8("localmonthnamegen");
case Xol_kwd_grp_.Id_lcl_month_abrv: return Bry_.new_u8("localmonthabbrev");
case Xol_kwd_grp_.Id_lcl_day_int: return Bry_.new_u8("localday");
case Xol_kwd_grp_.Id_lcl_day_int_len2: return Bry_.new_u8("localday2");
case Xol_kwd_grp_.Id_lcl_day_name: return Bry_.new_u8("localdayname");
case Xol_kwd_grp_.Id_lcl_year: return Bry_.new_u8("localyear");
case Xol_kwd_grp_.Id_lcl_time: return Bry_.new_u8("localtime");
case Xol_kwd_grp_.Id_lcl_hour: return Bry_.new_u8("localhour");
case Xol_kwd_grp_.Id_num_pages: return Bry_.new_u8("numberofpages");
case Xol_kwd_grp_.Id_num_articles: return Bry_.new_u8("numberofarticles");
case Xol_kwd_grp_.Id_num_files: return Bry_.new_u8("numberoffiles");
case Xol_kwd_grp_.Id_num_users: return Bry_.new_u8("numberofusers");
case Xol_kwd_grp_.Id_num_users_active: return Bry_.new_u8("numberofactiveusers");
case Xol_kwd_grp_.Id_num_edits: return Bry_.new_u8("numberofedits");
case Xol_kwd_grp_.Id_num_views: return Bry_.new_u8("numberofviews");
case Xol_kwd_grp_.Id_ttl_page_txt: return Bry_.new_u8("pagename");
case Xol_kwd_grp_.Id_ttl_page_url: return Bry_.new_u8("pagenamee");
case Xol_kwd_grp_.Id_ns_txt: return Bry_.new_u8("namespace");
case Xol_kwd_grp_.Id_ns_url: return Bry_.new_u8("namespacee");
case Xol_kwd_grp_.Id_ns_talk_txt: return Bry_.new_u8("talkspace");
case Xol_kwd_grp_.Id_ns_talk_url: return Bry_.new_u8("talkspacee");
case Xol_kwd_grp_.Id_ns_subj_txt: return Bry_.new_u8("subjectspace");
case Xol_kwd_grp_.Id_ns_subj_url: return Bry_.new_u8("subjectspacee");
case Xol_kwd_grp_.Id_ttl_full_txt: return Bry_.new_u8("fullpagename");
case Xol_kwd_grp_.Id_ttl_full_url: return Bry_.new_u8("fullpagenamee");
case Xol_kwd_grp_.Id_ttl_leaf_txt: return Bry_.new_u8("subpagename");
case Xol_kwd_grp_.Id_ttl_leaf_url: return Bry_.new_u8("subpagenamee");
case Xol_kwd_grp_.Id_ttl_base_txt: return Bry_.new_u8("basepagename");
case Xol_kwd_grp_.Id_ttl_base_url: return Bry_.new_u8("basepagenamee");
case Xol_kwd_grp_.Id_ttl_talk_txt: return Bry_.new_u8("talkpagename");
case Xol_kwd_grp_.Id_ttl_talk_url: return Bry_.new_u8("talkpagenamee");
case Xol_kwd_grp_.Id_ttl_subj_txt: return Bry_.new_u8("subjectpagename");
case Xol_kwd_grp_.Id_ttl_subj_url: return Bry_.new_u8("subjectpagenamee");
case Xol_kwd_grp_.Id_msg: return Bry_.new_u8("msg");
case Xol_kwd_grp_.Id_subst: return Bry_.new_u8("subst");
case Xol_kwd_grp_.Id_safesubst: return Bry_.new_u8("safesubst");
case Xol_kwd_grp_.Id_msgnw: return Bry_.new_u8("msgnw");
case Xol_kwd_grp_.Id_img_thumbnail: return Bry_.new_u8("img_thumbnail");
case Xol_kwd_grp_.Id_img_manualthumb: return Bry_.new_u8("img_manualthumb");
case Xol_kwd_grp_.Id_img_framed: return Bry_.new_u8("img_framed");
case Xol_kwd_grp_.Id_img_frameless: return Bry_.new_u8("img_frameless");
case Xol_kwd_grp_.Id_img_upright: return Bry_.new_u8("img_upright");
case Xol_kwd_grp_.Id_img_upright_factor: return Bry_.new_u8("img_upright_factor");
case Xol_kwd_grp_.Id_img_border: return Bry_.new_u8("img_border");
case Xol_kwd_grp_.Id_img_align: return Bry_.new_u8("img_align");
case Xol_kwd_grp_.Id_img_valign: return Bry_.new_u8("img_valign");
case Xol_kwd_grp_.Id_img_alt: return Bry_.new_u8("img_alt");
case Xol_kwd_grp_.Id_img_class: return Bry_.new_u8("img_class");
case Xol_kwd_grp_.Id_img_caption: return Bry_.new_u8("img_caption");
case Xol_kwd_grp_.Id_img_link_url: return Bry_.new_u8("img_link_url");
case Xol_kwd_grp_.Id_img_link_title: return Bry_.new_u8("img_link_title");
case Xol_kwd_grp_.Id_img_link_target: return Bry_.new_u8("img_link_target");
case Xol_kwd_grp_.Id_img_link_none: return Bry_.new_u8("img_link_none");
case Xol_kwd_grp_.Id_img_width: return Bry_.new_u8("img_width");
case Xol_kwd_grp_.Id_img_page: return Bry_.new_u8("img_page");
case Xol_kwd_grp_.Id_img_none: return Bry_.new_u8("img_none");
case Xol_kwd_grp_.Id_img_right: return Bry_.new_u8("img_right");
case Xol_kwd_grp_.Id_img_center: return Bry_.new_u8("img_center");
case Xol_kwd_grp_.Id_img_left: return Bry_.new_u8("img_left");
case Xol_kwd_grp_.Id_img_baseline: return Bry_.new_u8("img_baseline");
case Xol_kwd_grp_.Id_img_sub: return Bry_.new_u8("img_sub");
case Xol_kwd_grp_.Id_img_super: return Bry_.new_u8("img_super");
case Xol_kwd_grp_.Id_img_top: return Bry_.new_u8("img_top");
case Xol_kwd_grp_.Id_img_text_top: return Bry_.new_u8("img_text_top");
case Xol_kwd_grp_.Id_img_middle: return Bry_.new_u8("img_middle");
case Xol_kwd_grp_.Id_img_bottom: return Bry_.new_u8("img_bottom");
case Xol_kwd_grp_.Id_img_text_bottom: return Bry_.new_u8("img_text_bottom");
case Xol_kwd_grp_.Id_img_link: return Bry_.new_u8("img_link");
case Xol_kwd_grp_.Id_i18n_int: return Bry_.new_u8("int");
case Xol_kwd_grp_.Id_site_sitename: return Bry_.new_u8("sitename");
case Xol_kwd_grp_.Id_url_ns: return Bry_.new_u8("ns");
case Xol_kwd_grp_.Id_url_nse: return Bry_.new_u8("nse");
case Xol_kwd_grp_.Id_url_localurl: return Bry_.new_u8("localurl");
case Xol_kwd_grp_.Id_url_localurle: return Bry_.new_u8("localurle");
case Xol_kwd_grp_.Id_site_articlepath: return Bry_.new_u8("articlepath");
case Xol_kwd_grp_.Id_site_server: return Bry_.new_u8("server");
case Xol_kwd_grp_.Id_site_servername: return Bry_.new_u8("servername");
case Xol_kwd_grp_.Id_site_scriptpath: return Bry_.new_u8("scriptpath");
case Xol_kwd_grp_.Id_site_stylepath: return Bry_.new_u8("stylepath");
case Xol_kwd_grp_.Id_i18n_grammar: return Bry_.new_u8("grammar");
case Xol_kwd_grp_.Id_i18n_gender: return Bry_.new_u8("gender");
case Xol_kwd_grp_.Id_notitleconvert: return Bry_.new_u8("notitleconvert");
case Xol_kwd_grp_.Id_nocontentconvert: return Bry_.new_u8("nocontentconvert");
case Xol_kwd_grp_.Id_utc_week: return Bry_.new_u8("currentweek");
case Xol_kwd_grp_.Id_utc_dow: return Bry_.new_u8("currentdow");
case Xol_kwd_grp_.Id_lcl_week: return Bry_.new_u8("localweek");
case Xol_kwd_grp_.Id_lcl_dow: return Bry_.new_u8("localdow");
case Xol_kwd_grp_.Id_rev_id: return Bry_.new_u8("revisionid");
case Xol_kwd_grp_.Id_rev_day_int: return Bry_.new_u8("revisionday");
case Xol_kwd_grp_.Id_rev_day_int_len2: return Bry_.new_u8("revisionday2");
case Xol_kwd_grp_.Id_rev_month_int_len2: return Bry_.new_u8("revisionmonth");
case Xol_kwd_grp_.Id_rev_month_int: return Bry_.new_u8("revisionmonth1");
case Xol_kwd_grp_.Id_rev_year: return Bry_.new_u8("revisionyear");
case Xol_kwd_grp_.Id_rev_timestamp: return Bry_.new_u8("revisiontimestamp");
case Xol_kwd_grp_.Id_rev_user: return Bry_.new_u8("revisionuser");
case Xol_kwd_grp_.Id_i18n_plural: return Bry_.new_u8("plural");
case Xol_kwd_grp_.Id_url_fullurl: return Bry_.new_u8("fullurl");
case Xol_kwd_grp_.Id_url_fullurle: return Bry_.new_u8("fullurle");
case Xol_kwd_grp_.Id_str_lcfirst: return Bry_.new_u8("lcfirst");
case Xol_kwd_grp_.Id_str_ucfirst: return Bry_.new_u8("ucfirst");
case Xol_kwd_grp_.Id_str_lc: return Bry_.new_u8("lc");
case Xol_kwd_grp_.Id_str_uc: return Bry_.new_u8("uc");
case Xol_kwd_grp_.Id_raw: return Bry_.new_u8("raw");
case Xol_kwd_grp_.Id_page_displaytitle: return Bry_.new_u8("displaytitle");
case Xol_kwd_grp_.Id_str_rawsuffix: return Bry_.new_u8("rawsuffix");
case Xol_kwd_grp_.Id_newsectionlink: return Bry_.new_u8("newsectionlink");
case Xol_kwd_grp_.Id_nonewsectionlink: return Bry_.new_u8("nonewsectionlink");
case Xol_kwd_grp_.Id_site_currentversion: return Bry_.new_u8("currentversion");
case Xol_kwd_grp_.Id_url_urlencode: return Bry_.new_u8("urlencode");
case Xol_kwd_grp_.Id_url_anchorencode: return Bry_.new_u8("anchorencode");
case Xol_kwd_grp_.Id_utc_timestamp: return Bry_.new_u8("currenttimestamp");
case Xol_kwd_grp_.Id_lcl_timestamp: return Bry_.new_u8("localtimestamp");
case Xol_kwd_grp_.Id_site_directionmark: return Bry_.new_u8("directionmark");
case Xol_kwd_grp_.Id_i18n_language: return Bry_.new_u8("language");
case Xol_kwd_grp_.Id_site_contentlanguage: return Bry_.new_u8("contentlanguage");
case Xol_kwd_grp_.Id_site_pagesinnamespace: return Bry_.new_u8("pagesinnamespace");
case Xol_kwd_grp_.Id_num_admins: return Bry_.new_u8("numberofadmins");
case Xol_kwd_grp_.Id_str_formatnum: return Bry_.new_u8("formatnum");
case Xol_kwd_grp_.Id_str_padleft: return Bry_.new_u8("padleft");
case Xol_kwd_grp_.Id_str_padright: return Bry_.new_u8("padright");
case Xol_kwd_grp_.Id_misc_special: return Bry_.new_u8("special");
case Xol_kwd_grp_.Id_page_defaultsort: return Bry_.new_u8("defaultsort");
case Xol_kwd_grp_.Id_url_filepath: return Bry_.new_u8("filepath");
case Xol_kwd_grp_.Id_misc_tag: return Bry_.new_u8("tag");
case Xol_kwd_grp_.Id_hiddencat: return Bry_.new_u8("hiddencat");
case Xol_kwd_grp_.Id_site_pagesincategory: return Bry_.new_u8("pagesincategory");
case Xol_kwd_grp_.Id_rev_pagesize: return Bry_.new_u8("pagesize");
case Xol_kwd_grp_.Id_index: return Bry_.new_u8("index");
case Xol_kwd_grp_.Id_noindex: return Bry_.new_u8("noindex");
case Xol_kwd_grp_.Id_site_numberingroup: return Bry_.new_u8("numberingroup");
case Xol_kwd_grp_.Id_staticredirect: return Bry_.new_u8("staticredirect");
case Xol_kwd_grp_.Id_rev_protectionlevel: return Bry_.new_u8("protectionlevel");
case Xol_kwd_grp_.Id_str_formatdate: return Bry_.new_u8("formatdate");
case Xol_kwd_grp_.Id_url_path: return Bry_.new_u8("url_path");
case Xol_kwd_grp_.Id_url_wiki: return Bry_.new_u8("url_wiki");
case Xol_kwd_grp_.Id_url_query: return Bry_.new_u8("url_query");
case Xol_kwd_grp_.Id_xtn_expr: return Bry_.new_u8("expr");
case Xol_kwd_grp_.Id_xtn_if: return Bry_.new_u8("if");
case Xol_kwd_grp_.Id_xtn_ifeq: return Bry_.new_u8("ifeq");
case Xol_kwd_grp_.Id_xtn_ifexpr: return Bry_.new_u8("ifexpr");
case Xol_kwd_grp_.Id_xtn_iferror: return Bry_.new_u8("iferror");
case Xol_kwd_grp_.Id_xtn_switch: return Bry_.new_u8("switch");
case Xol_kwd_grp_.Id_xtn_default: return Bry_.new_u8("default");
case Xol_kwd_grp_.Id_xtn_ifexist: return Bry_.new_u8("ifexist");
case Xol_kwd_grp_.Id_xtn_time: return Bry_.new_u8("time");
case Xol_kwd_grp_.Id_xtn_timel: return Bry_.new_u8("timel");
case Xol_kwd_grp_.Id_xtn_rel2abs: return Bry_.new_u8("rel2abs");
case Xol_kwd_grp_.Id_xtn_titleparts: return Bry_.new_u8("titleparts");
case Xol_kwd_grp_.Id_xowa_dbg: return Bry_.new_u8("xowa_dbg");
case Xol_kwd_grp_.Id_ogg_noplayer: return Bry_.new_u8("noplayer");
case Xol_kwd_grp_.Id_ogg_noicon: return Bry_.new_u8("noicon");
case Xol_kwd_grp_.Id_ogg_thumbtime: return Bry_.new_u8("thumbtime");
case Xol_kwd_grp_.Id_xtn_geodata_coordinates: return Bry_.new_u8("coordinates");
case Xol_kwd_grp_.Id_url_canonicalurl: return Bry_.new_u8("canonicalurl");
case Xol_kwd_grp_.Id_url_canonicalurle: return Bry_.new_u8("canonicalurle");
case Xol_kwd_grp_.Id_lst: return Bry_.new_u8("lst");
case Xol_kwd_grp_.Id_lstx: return Bry_.new_u8("lstx");
case Xol_kwd_grp_.Id_invoke: return Bry_.new_u8("invoke");
case Xol_kwd_grp_.Id_property: return Bry_.new_u8("property");
case Xol_kwd_grp_.Id_noexternallanglinks: return Bry_.new_u8("noexternallanglinks");
case Xol_kwd_grp_.Id_ns_num: return Bry_.new_u8("namespacenumber");
case Xol_kwd_grp_.Id_page_id: return Bry_.new_u8("pageid");
case Xol_kwd_grp_.Id_disambig: return Bry_.new_u8("disambiguation");
case Xol_kwd_grp_.Id_nocommafysuffix: return Bry_.new_u8("nosep");
case Xol_kwd_grp_.Id_xowa: return Bry_.new_u8("xowa");
case Xol_kwd_grp_.Id_mapSources_deg2dd: return Bry_.new_u8("deg2dd");
case Xol_kwd_grp_.Id_mapSources_dd2dms: return Bry_.new_u8("dd2dms");
case Xol_kwd_grp_.Id_mapSources_geoLink: return Bry_.new_u8("geolink");
case Xol_kwd_grp_.Id_geoCrumbs_isin: return Bry_.new_u8("isin");
case Xol_kwd_grp_.Id_relatedArticles: return Bry_.new_u8("relatedArticles");
case Xol_kwd_grp_.Id_insider: return Bry_.new_u8("insider");
case Xol_kwd_grp_.Id_massMessage_target: return Bry_.new_u8("target");
case Xol_kwd_grp_.Id_cascadingSources: return Bry_.new_u8("cascadingSources");
case Xol_kwd_grp_.Id_pendingChangeLevel: return Bry_.new_u8("pendingChangeLevel");
case Xol_kwd_grp_.Id_pagesUsingPendingChanges: return Bry_.new_u8("pagesUsingPendingChanges");
case Xol_kwd_grp_.Id_bang: return Bry_.new_u8("!");
case Xol_kwd_grp_.Id_wbreponame: return Bry_.new_u8("wbreponame");
default: throw Err_mgr._.unhandled_(id);
}
}

4
400_xowa/src_140_lang/gplx/xowa/Xol_kwd_parse_data_tst.java
View File

@@ -31,8 +31,8 @@ public class Xol_kwd_parse_data_tst {
Xol_kwd_parse_data_tst Tst_strip(String v) {
Bry_bfr tmp = Bry_bfr.new_();
Byte_obj_ref rslt = Byte_obj_ref.zero_();
byte[] actl = Xol_kwd_parse_data.Strip(tmp, Bry_.new_ascii_(v), rslt);
Tfds.Eq(key, String_.new_ascii_(actl));
byte[] actl = Xol_kwd_parse_data.Strip(tmp, Bry_.new_a7(v), rslt);
Tfds.Eq(key, String_.new_a7(actl));
return this;
}
}

14
400_xowa/src_140_lang/gplx/xowa/Xol_lang.java
View File

@@ -23,8 +23,8 @@ public class Xol_lang implements GfoInvkAble {
private Xoa_lang_mgr lang_mgr;
public Xoa_lang_mgr Lang_mgr() {return lang_mgr;}
public Xol_lang(Xoa_lang_mgr lang_mgr, byte[] key_bry) {
this.key_bry = key_bry; this.key_str = String_.new_utf8_(key_bry);
Xol_lang_itm lang_itm = Xol_lang_itm_.Get_by_key(key_bry); if (lang_itm == null) throw Err_.new_fmt_("unknown lang_key: {0}", String_.new_utf8_(key_bry));
this.key_bry = key_bry; this.key_str = String_.new_u8(key_bry);
Xol_lang_itm lang_itm = Xol_lang_itm_.Get_by_key(key_bry); if (lang_itm == null) throw Err_.new_fmt_("unknown lang_key: {0}", String_.new_u8(key_bry));
lang_id = lang_itm.Id();
this.lang_mgr = lang_mgr;
func_regy = new Xol_func_name_regy(lang_mgr, this);
@@ -97,7 +97,7 @@ public class Xol_lang implements GfoInvkAble {
else if (ctx.Match(k, Invk_fallback_load)) Exec_fallback_load(m.ReadBry("v"));
else if (ctx.Match(k, Invk_numbers)) return num_mgr;
else if (ctx.Match(k, Invk_link_trail)) return lnki_trail_mgr;
else if (ctx.Match(k, Invk_x_axis_end)) return String_.new_utf8_(X_axis_end());
else if (ctx.Match(k, Invk_x_axis_end)) return String_.new_u8(X_axis_end());
else if (ctx.Match(k, Invk_this)) return this;
else if (ctx.Match(k, Xoae_app.Invk_app)) return Xoa_app_.Gfs_mgr().Root_invk();
else return GfoInvkAble_.Rv_unhandled;
@@ -117,7 +117,7 @@ public class Xol_lang implements GfoInvkAble {
this.loaded = true;
boolean lang_is_en = lang_id == Xol_lang_itm_.Id_en;
if (!lang_is_en) Xol_lang_.Lang_init(this);
message_mgr.Itm_by_key_or_new(Bry_.new_utf8_("Lang")).Atrs_set(key_bry, false, false); // set "Lang" keyword; EX: for "fr", "{{int:Lang}}" -> "fr"
message_mgr.Itm_by_key_or_new(Bry_.new_u8("Lang")).Atrs_set(key_bry, false, false); // set "Lang" keyword; EX: for "fr", "{{int:Lang}}" -> "fr"
Load_lang(key_bry);
ns_aliases.Ary_add_(Xow_ns_.Canonical); // NOTE: always add English canonical as aliases to all languages
this.Evt_lang_changed();
@@ -133,12 +133,12 @@ public class Xol_lang implements GfoInvkAble {
}
private void Load_lang(byte[] v) {
Xoa_gfs_mgr gfs_mgr = Xoa_app_.Gfs_mgr(); Xoa_fsys_mgr app_fsys_mgr = gfs_mgr.App_fsys_mgr();
gfs_mgr.Run_url_for(this, Xol_lang_.xo_lang_fil_(app_fsys_mgr, String_.new_ascii_(v)));
gfs_mgr.Run_url_for(this, Xol_lang_.xo_lang_fil_(app_fsys_mgr, String_.new_a7(v)));
gfs_mgr.Run_url_for(gfs_mgr.Root_invk(), Xol_cnv_mgr.Bld_url(app_fsys_mgr, key_str));
}
private static final byte[]
Dir_bry_ltr = Bry_.new_ascii_("ltr"), Dir_bry_rtl = Bry_.new_ascii_("rtl")
, X_axis_end_right = Bry_.new_ascii_("right"), X_axis_end_left = Bry_.new_ascii_("left")
Dir_bry_ltr = Bry_.new_a7("ltr"), Dir_bry_rtl = Bry_.new_a7("rtl")
, X_axis_end_right = Bry_.new_a7("right"), X_axis_end_left = Bry_.new_a7("left")
;
public static final int Tid_lower = 1, Tid_upper = 2;
private static byte[][] Fallbacy_bry_ary__bld(byte[] v) {

2
400_xowa/src_140_lang/gplx/xowa/Xol_lang_.java
View File

@@ -44,7 +44,7 @@ public class Xol_lang_ {
return Char_tid_misc;
}
}
public static final byte[] Key_en = Bry_.new_ascii_("en");
public static final byte[] Key_en = Bry_.new_a7("en");
public static void Lang_init(Xol_lang lang) {
lang.Num_mgr().Separators_mgr().Set(Xol_num_mgr.Separators_key__grp, Xol_num_mgr.Separators_key__grp);
lang.Num_mgr().Separators_mgr().Set(Xol_num_mgr.Separators_key__dec, Xol_num_mgr.Separators_key__dec);

12
400_xowa/src_140_lang/gplx/xowa/Xol_lang_srl.java
View File

@@ -21,14 +21,14 @@ public class Xol_lang_srl {
public static Xow_ns[] Load_ns_grps(byte[] src) {
int src_len = src.length, pos = 0, fld_bgn = 0;
int cur_id = -1;
ListAdp rv = ListAdp_.new_(); Xol_csv_parser csv_parser = Xol_csv_parser._;
List_adp rv = List_adp_.new_(); Xol_csv_parser csv_parser = Xol_csv_parser._;
while (true) {
boolean last = pos == src_len; // NOTE: logic occurs b/c of \n}~-> dlm which gobbles up last \n
byte b = last ? Byte_ascii.NewLine : src[pos];
switch (b) {
case Byte_ascii.Pipe:
cur_id = Bry_.Xto_int_or(src, fld_bgn, pos, Int_.MinValue);
if (cur_id == Int_.MinValue) throw Err_mgr._.fmt_(GRP_KEY, "invalid_id", "invalid_id: ~{0}", String_.new_utf8_(src, fld_bgn, pos));
if (cur_id == Int_.MinValue) throw Err_mgr._.fmt_(GRP_KEY, "invalid_id", "invalid_id: ~{0}", String_.new_u8(src, fld_bgn, pos));
fld_bgn = pos + 1;
break;
case Byte_ascii.NewLine:
@@ -44,12 +44,12 @@ public class Xol_lang_srl {
if (last) break;
++pos;
}
return (Xow_ns[])rv.Xto_ary(Xow_ns.class);
return (Xow_ns[])rv.To_ary(Xow_ns.class);
} private static final String GRP_KEY = "xowa.lang.srl";
public static void Load_keywords(Xol_kwd_mgr keyword_mgr, byte[] src) {
int src_len = src.length, pos = 0, fld_bgn = 0, fld_idx = 0;
boolean cur_cs = false; byte[] cur_key = Bry_.Empty;
ListAdp cur_words = ListAdp_.new_();
List_adp cur_words = List_adp_.new_();
Xol_csv_parser csv_parser = Xol_csv_parser._;
while (true) {
boolean last = pos == src_len; // NOTE: logic occurs b/c of \n}~-> dlm which gobbles up last \n
@@ -81,7 +81,7 @@ public class Xol_lang_srl {
if (cur_words.Count() > 0) { // guard against blank line wiping out entries; EX: "toc|0|toc1\n\n"; 2nd \n will get last grp and make 0 entries
int cur_id = Xol_kwd_grp_.Id_by_bry(cur_key); if (cur_id == -1) throw Err_mgr._.fmt_(GRP_KEY, "invalid_keyword", "key does not have id: ~{0}", cur_id);
Xol_kwd_grp grp = keyword_mgr.Get_or_new(cur_id);
grp.Srl_load(cur_cs, (byte[][])cur_words.Xto_ary(byte[].class));
grp.Srl_load(cur_cs, (byte[][])cur_words.To_ary(byte[].class));
}
fld_bgn = pos + 1;
fld_idx = 0;
@@ -93,7 +93,7 @@ public class Xol_lang_srl {
if (last) break;
++pos;
}
// return (Xol_kwd_grp[])rv.Xto_ary(typeof(Xol_kwd_grp));
// return (Xol_kwd_grp[])rv.To_ary(typeof(Xol_kwd_grp));
}
public static void Load_messages(Xol_msg_mgr msg_mgr, byte[] src) {
int src_len = src.length, pos = 0, fld_bgn = 0;

48
400_xowa/src_140_lang/gplx/xowa/Xol_lang_srl_tst.java
View File

@@ -112,7 +112,7 @@ public class Xol_lang_srl_tst {
fxt.Run_save_msg_mgr(msg_mgr, Xol_lang.Invk_messages, raw);
}
@Test public void Fallback() {
Io_mgr._.SaveFilStr(Xol_lang_.xo_lang_fil_(fxt.App().Fsys_mgr(), "zh-hans"), String_.Concat_lines_nl
Io_mgr.I.SaveFilStr(Xol_lang_.xo_lang_fil_(fxt.App().Fsys_mgr(), "zh-hans"), String_.Concat_lines_nl
( "this"
, ".keywords"
, " .load_text("
@@ -162,9 +162,9 @@ public class Xol_lang_srl_tst {
fxt.Tst_messages(fxt.Lang().Msg_mgr(), fxt.msg_("sunday", "sunday1"), fxt.msg_("monday", "monday1"));
}
@Test public void Fallback_circular() { // PURPOSE: pt and pt-br cite each other as fallback in Messages*.php; DATE:2013-02-18
Io_mgr._.SaveFilStr(Xol_lang_.xo_lang_fil_(fxt.App().Fsys_mgr(), "pt") , "fallback_load('pt-br');");
Io_mgr._.SaveFilStr(Xol_lang_.xo_lang_fil_(fxt.App().Fsys_mgr(), "pt-br") , "fallback_load('pt');");
Xol_lang lang = new Xol_lang(fxt.App().Lang_mgr(), Bry_.new_ascii_("pt"));
Io_mgr.I.SaveFilStr(Xol_lang_.xo_lang_fil_(fxt.App().Fsys_mgr(), "pt") , "fallback_load('pt-br');");
Io_mgr.I.SaveFilStr(Xol_lang_.xo_lang_fil_(fxt.App().Fsys_mgr(), "pt-br") , "fallback_load('pt');");
Xol_lang lang = new Xol_lang(fxt.App().Lang_mgr(), Bry_.new_a7("pt"));
lang.Init_by_load();
}
@Test public void Num_fmt() {
@@ -200,21 +200,21 @@ public class Xol_lang_srl_tst {
class Xol_lang_srl_fxt {
public void Clear() {
app = Xoa_app_fxt.app_();
lang = new Xol_lang(app.Lang_mgr(), Bry_.new_utf8_("fr"));
lang = new Xol_lang(app.Lang_mgr(), Bry_.new_u8("fr"));
Xoa_gfs_mgr.Msg_parser_init(); // required by fallback_load
} GfsCtx ctx = GfsCtx.new_(); Gfs_bldr bldr = new Gfs_bldr(); //Bry_bfr tmp_bfr = Bry_bfr.reset_(255);
public Xoae_app App() {return app;} private Xoae_app app;
public Xol_lang Lang() {return lang;} private Xol_lang lang;
public Xow_ns ns_(int id, String s) {return new Xow_ns(id, Xow_ns_case_.Id_1st, Bry_.new_utf8_(s), false);}
public Xol_specials_itm special_(String key, String... words) {return new Xol_specials_itm(Bry_.new_utf8_(key), Bry_.Ary(words));}
public Xow_ns ns_(int id, String s) {return new Xow_ns(id, Xow_ns_case_.Id_1st, Bry_.new_u8(s), false);}
public Xol_specials_itm special_(String key, String... words) {return new Xol_specials_itm(Bry_.new_u8(key), Bry_.Ary(words));}
public Xol_kwd_grp kwd_(String key, boolean case_match, String... words) {
Xol_kwd_grp rv = new Xol_kwd_grp(Bry_.new_utf8_(key));
Xol_kwd_grp rv = new Xol_kwd_grp(Bry_.new_u8(key));
rv.Srl_load(case_match, Bry_.Ary(words));
return rv;
}
public Xol_msg_itm msg_(String key, String val) {
Xol_msg_itm rv = lang.Msg_mgr().Itm_by_key_or_new(Bry_.new_utf8_(key));
rv.Atrs_set(Bry_.new_utf8_(val), false, false);
Xol_msg_itm rv = lang.Msg_mgr().Itm_by_key_or_new(Bry_.new_u8(key));
rv.Atrs_set(Bry_.new_u8(val), false, false);
return rv;
}
public Xol_lang_srl_fxt Init_clear() {
@@ -222,7 +222,7 @@ class Xol_lang_srl_fxt {
return this;
}
public Xol_lang_srl_fxt Init_separators(String k, String v) {
lang.Num_mgr().Separators_mgr().Set(Bry_.new_utf8_(k), Bry_.new_utf8_(v));
lang.Num_mgr().Separators_mgr().Set(Bry_.new_u8(k), Bry_.new_u8(v));
return this;
}
public void Invk(String raw) {
@@ -232,7 +232,7 @@ class Xol_lang_srl_fxt {
app.Gfs_mgr().Run_str_for(lang, raw);
}
public void Tst_ns_grp(Xol_ns_grp grp, Xow_ns... expd_ns) {
Tfds.Eq_str_lines(Xto_str(expd_ns), Xto_str(Xto_ary(grp)));
Tfds.Eq_str_lines(Xto_str(expd_ns), Xto_str(To_ary(grp)));
}
public void Run_save_ns_grp(Xol_ns_grp grp, String invk, String raw) {
Xol_lang_srl.Save_ns_grps(bldr, grp, invk);
@@ -254,15 +254,15 @@ class Xol_lang_srl_fxt {
Xol_lang_srl.Save_specials(bldr, specials_mgr);
Tfds.Eq_str_lines("." + raw, bldr.Bfr().Xto_str_and_clear());
}
public void Tst_num_fmt(String raw, String expd) {Tfds.Eq(expd, String_.new_utf8_(lang.Num_mgr().Format_num(Bry_.new_utf8_(raw))));}
public void Tst_num_fmt(String raw, String expd) {Tfds.Eq(expd, String_.new_u8(lang.Num_mgr().Format_num(Bry_.new_u8(raw))));}
public void Tst_keywords(Xol_kwd_mgr kwd_mgr, Xol_kwd_grp... ary) {
Tfds.Eq_str_lines(Xto_str(ary), Xto_str(Xto_ary(kwd_mgr)));
Tfds.Eq_str_lines(Xto_str(ary), Xto_str(To_ary(kwd_mgr)));
}
public void Tst_messages(Xol_msg_mgr msg_mgr, Xol_msg_itm... ary) {
Tfds.Eq_str_lines(Xto_str(ary), Xto_str(Xto_ary(msg_mgr)));
Tfds.Eq_str_lines(Xto_str(ary), Xto_str(To_ary(msg_mgr)));
}
public void Tst_specials(Xol_specials_mgr specials_mgr, Xol_specials_itm... expd) {
Tfds.Eq_str_lines(Xto_str(expd), Xto_str(Xto_ary(specials_mgr)));
Tfds.Eq_str_lines(Xto_str(expd), Xto_str(To_ary(specials_mgr)));
}
private String Xto_str(Xol_specials_itm[] ary) {
int len = ary.length;
@@ -277,7 +277,7 @@ class Xol_lang_srl_fxt {
}
return sb.Xto_str_and_clear();
}
private Xol_specials_itm[] Xto_ary(Xol_specials_mgr specials_mgr) {
private Xol_specials_itm[] To_ary(Xol_specials_mgr specials_mgr) {
int len = specials_mgr.Count();
Xol_specials_itm[] rv = new Xol_specials_itm[len];
for (int i = 0; i < len; i++)
@@ -292,22 +292,22 @@ class Xol_lang_srl_fxt {
}
return sb.Xto_str_and_clear();
}
Xow_ns[] Xto_ary(Xol_ns_grp ary) {
Xow_ns[] To_ary(Xol_ns_grp ary) {
int len = ary.Len();
Xow_ns[] rv = new Xow_ns[len];
for (int i = 0; i < len; i++)
rv[i] = ary.Get_at(i);
return rv;
}
Xol_kwd_grp[] Xto_ary(Xol_kwd_mgr kwd_mgr) {
Xol_kwd_grp[] To_ary(Xol_kwd_mgr kwd_mgr) {
int len = kwd_mgr.Len();
ListAdp rv = ListAdp_.new_();
List_adp rv = List_adp_.new_();
for (int i = 0; i < len; i++) {
Xol_kwd_grp kwd_grp = kwd_mgr.Get_at(i);
if (kwd_grp == null) continue;
rv.Add(kwd_grp);
}
return (Xol_kwd_grp[])rv.Xto_ary(Xol_kwd_grp.class);
return (Xol_kwd_grp[])rv.To_ary(Xol_kwd_grp.class);
}
String Xto_str(Xol_kwd_grp[] ary) {
int len = ary.length;
@@ -323,15 +323,15 @@ class Xol_lang_srl_fxt {
}
return sb.Xto_str_and_clear();
}
Xol_msg_itm[] Xto_ary(Xol_msg_mgr msg_mgr) {
Xol_msg_itm[] To_ary(Xol_msg_mgr msg_mgr) {
int len = msg_mgr.Itms_max();
ListAdp rv = ListAdp_.new_();
List_adp rv = List_adp_.new_();
for (int i = 0; i < len; i++) {
Xol_msg_itm itm = msg_mgr.Itm_by_id_or_null(i);
if (itm == null || !itm.Dirty()) continue;
rv.Add(itm);
}
return (Xol_msg_itm[])rv.Xto_ary(Xol_msg_itm.class);
return (Xol_msg_itm[])rv.To_ary(Xol_msg_itm.class);
}
String Xto_str(Xol_msg_itm[] ary) {
int len = ary.length;

4
400_xowa/src_140_lang/gplx/xowa/Xol_lnki_trail_mgr.java
View File

@@ -26,7 +26,7 @@ public class Xol_lnki_trail_mgr implements GfoInvkAble {
public void Del(byte[] v) {trie.Del(v);}
private void Add(String... ary) {
for (String itm_str : ary) {
byte[] itm = Bry_.new_utf8_(itm_str);
byte[] itm = Bry_.new_u8(itm_str);
trie.Add_obj(itm, itm);
}
}
@@ -67,7 +67,7 @@ public class Xol_lnki_trail_mgr implements GfoInvkAble {
}
byte Add_rng_extract(GfoMsg m, String key) {
byte[] bry = m.ReadBry(key);
if (bry.length != 1) throw Err_.new_fmt_("argument must be ascii character: ~{0} ~{1}", key, String_.new_utf8_(bry));
if (bry.length != 1) throw Err_.new_fmt_("argument must be ascii character: ~{0} ~{1}", key, String_.new_u8(bry));
return bry[0];
}
}

6
400_xowa/src_140_lang/gplx/xowa/Xol_lnki_trail_mgr_tst.java
View File

@@ -27,15 +27,15 @@ class Xol_lnki_trail_mgr_fxt {
Xol_lang lang; Xol_lnki_trail_mgr lnki_trail_mgr;
public void Clear() {
Xoae_app app = Xoa_app_fxt.app_();
lang = new Xol_lang(app.Lang_mgr(), Bry_.new_utf8_("fr"));
lang = new Xol_lang(app.Lang_mgr(), Bry_.new_u8("fr"));
lnki_trail_mgr = lang.Lnki_trail_mgr();
}
public void Test_add_bulk(String raw, String... expd_ary) {
lnki_trail_mgr.Add_bulk(Bry_.new_utf8_(raw));
lnki_trail_mgr.Add_bulk(Bry_.new_u8(raw));
int expd_len = expd_ary.length;
Tfds.Eq(expd_len, lang.Lnki_trail_mgr().Count());
for (int i = 0; i < expd_len; i++) {
byte[] expd_bry = Bry_.new_utf8_(expd_ary[i]);
byte[] expd_bry = Bry_.new_u8(expd_ary[i]);
byte[] actl_bry = (byte[])lnki_trail_mgr.Trie().Match_bgn(expd_bry, 0, expd_bry.length);
Tfds.Eq_bry(expd_bry, actl_bry);
}

2
400_xowa/src_140_lang/gplx/xowa/Xol_msg_itm_.java
View File

@@ -252,7 +252,7 @@ public static final int
, Id_xowa_wikidata_links_special = 230
;
public static final int Id__max = 231;
public static Xol_msg_itm new_(int id, String key, String val) {return new_(id, Bry_.new_utf8_(key), Bry_.new_utf8_(val));}
public static Xol_msg_itm new_(int id, String key, String val) {return new_(id, Bry_.new_u8(key), Bry_.new_u8(val));}
public static Xol_msg_itm new_(int id, byte[] key, byte[] val) {
Xol_msg_itm rv = new Xol_msg_itm(id, key);
update_val_(rv, val);

2
400_xowa/src_140_lang/gplx/xowa/Xol_msg_itm_tst.java
View File

@@ -34,6 +34,6 @@ class Xol_msg_itm_fxt {
}
public void Test_val(String val, String expd) {
Xol_msg_itm itm = Xol_msg_itm_.new_(0, "test", val);
Tfds.Eq(expd, String_.new_utf8_(itm.Val()), "has_fmt_arg");
Tfds.Eq(expd, String_.new_u8(itm.Val()), "has_fmt_arg");
}
}

16
400_xowa/src_140_lang/gplx/xowa/Xol_msg_mgr.java
View File

@@ -32,7 +32,7 @@ public class Xol_msg_mgr implements GfoInvkAble {
}
public int Itms_max() {return itms_max;} private Xol_msg_itm[] itms; int itms_max = Xol_msg_itm_.Id__max; int itms_id_next = Xol_msg_itm_.Id__max;
public Xol_msg_itm Itm_by_id_or_null(int id) {return id < itms_max ? itms[id] : null;}
public Xol_msg_itm Itm_by_key_or_null(byte[] key) {return (Xol_msg_itm)hash.Fetch(key);}
public Xol_msg_itm Itm_by_key_or_null(byte[] key) {return (Xol_msg_itm)hash.Get_by(key);}
public Xol_msg_itm Itms_new(byte[] msg_key) {
Xol_msg_itm rv = new Xol_msg_itm(itms_id_next++, msg_key);
Itms_reg(rv);
@@ -40,12 +40,12 @@ public class Xol_msg_mgr implements GfoInvkAble {
}
public Xol_msg_itm Itm_by_key_or_new(String key, String val) {return Itm_by_key_or_new(key, val, false);} // TEST:
public Xol_msg_itm Itm_by_key_or_new(String key, String val, boolean has_fmt_arg) { // TEST:
Xol_msg_itm rv = Itm_by_key_or_new(Bry_.new_utf8_(key));
Xol_msg_itm_.update_val_(rv, Bry_.new_utf8_(val));
Xol_msg_itm rv = Itm_by_key_or_new(Bry_.new_u8(key));
Xol_msg_itm_.update_val_(rv, Bry_.new_u8(val));
return rv;
}
public Xol_msg_itm Itm_by_key_or_new(byte[] key) {
Object o = hash.Fetch(key);
Object o = hash.Get_by(key);
Xol_msg_itm rv = null;
if (o == null) { // key not found; likely not a system_id; generate a custom one
rv = new Xol_msg_itm(itms_id_next++, key);
@@ -55,7 +55,7 @@ public class Xol_msg_mgr implements GfoInvkAble {
rv = (Xol_msg_itm)o;
}
return rv;
} HashAdp hash;
} Hash_adp hash;
public byte[] Val_by_id(int id) { // NOTE: Val_by_id needs to exist on lang (not wiki_msg_mgr); {{#time}} can pass in lang, and will need to call lang's msg_mgr directly
Xol_msg_itm itm = Itm_by_id_or_null(id);
return itm == null ? null : itm.Val();
@@ -67,7 +67,7 @@ public class Xol_msg_mgr implements GfoInvkAble {
if (itm.Has_tmpl_txt()) rv = wiki.Parser().Parse_text_to_wtxt(rv);
return rv;
}
public byte[] Val_by_str_or_empty(String str) {return Val_by_bry_or(Bry_.new_utf8_(str), Bry_.Empty);}
public byte[] Val_by_str_or_empty(String str) {return Val_by_bry_or(Bry_.new_u8(str), Bry_.Empty);}
public byte[] Val_by_bry_or(byte[] bry, byte[] or) {
Xol_msg_itm itm = Itm_by_key_or_null(bry);
return itm == null ? or : itm.Val();
@@ -94,8 +94,8 @@ public class Xol_msg_mgr implements GfoInvkAble {
rv[i] = Xol_msg_itm_.new_(i);
return rv;
}
private static HashAdp Hash_new(Xol_msg_itm[] ary) {
HashAdp rv = Hash_adp_bry.ci_ascii_(); // ASCII:MW messages are currently all ASCII
private static Hash_adp Hash_new(Xol_msg_itm[] ary) {
Hash_adp rv = Hash_adp_bry.ci_ascii_(); // ASCII:MW messages are currently all ASCII
for (int i = 0; i < Xol_msg_itm_.Id__max; i++) {
Xol_msg_itm itm = ary[i]; if (itm == null) continue; // NOTE: can be null when msg_mgr is owned by wiki
rv.Add(itm.Key(), itm);

18
400_xowa/src_140_lang/gplx/xowa/Xol_msg_mgr_tst.java
View File

@@ -43,22 +43,22 @@ class Xol_msg_mgr_fxt {
return this;
} private Xoae_app app; Xowe_wiki wiki; Xow_msg_mgr mgr;
public void Test_val_by_key(String val, String expd) {
Xol_msg_itm itm = wiki.Lang().Msg_mgr().Itm_by_key_or_new(Bry_.new_ascii_("test"));
itm.Atrs_set(Bry_.new_ascii_(val), false, true);
Tfds.Eq(expd, String_.new_utf8_(wiki.Msg_mgr().Val_by_key_obj(Bry_.new_ascii_("test"))), "has_tmpl_txt");
Xol_msg_itm itm = wiki.Lang().Msg_mgr().Itm_by_key_or_new(Bry_.new_a7("test"));
itm.Atrs_set(Bry_.new_a7(val), false, true);
Tfds.Eq(expd, String_.new_u8(wiki.Msg_mgr().Val_by_key_obj(Bry_.new_a7("test"))), "has_tmpl_txt");
}
public void Test_mediaWiki_msg(String raw, String expd) {
byte[] msg_ttl = Bry_.new_ascii_("MediaWiki:msg_ttl");
wiki.Db_mgr().Save_mgr().Data_create(Xoa_ttl.parse_(wiki, msg_ttl), Bry_.new_ascii_(raw));
Tfds.Eq(expd, String_.new_utf8_(wiki.Msg_mgr().Val_by_key_obj(Bry_.new_ascii_("msg_ttl"))));
byte[] msg_ttl = Bry_.new_a7("MediaWiki:msg_ttl");
wiki.Db_mgr().Save_mgr().Data_create(Xoa_ttl.parse_(wiki, msg_ttl), Bry_.new_a7(raw));
Tfds.Eq(expd, String_.new_u8(wiki.Msg_mgr().Val_by_key_obj(Bry_.new_a7("msg_ttl"))));
}
public void Test_val_html_accesskey_and_title(String init_title, String init_accesskey, String expd) {
if (init_title != null) new_msg_itm_("tooltip-test" , init_title);
if (init_accesskey != null) new_msg_itm_("accesskey-test" , init_accesskey);
Tfds.Eq(expd, String_.new_ascii_(wiki.Msg_mgr().Val_html_accesskey_and_title(Bry_.new_ascii_("test"))));
Tfds.Eq(expd, String_.new_a7(wiki.Msg_mgr().Val_html_accesskey_and_title(Bry_.new_a7("test"))));
}
private void new_msg_itm_(String key, String val) {
Xol_msg_itm itm = wiki.Lang().Msg_mgr().Itm_by_key_or_new(Bry_.new_ascii_(key));
itm.Atrs_set(Bry_.new_ascii_(val), false, true);
Xol_msg_itm itm = wiki.Lang().Msg_mgr().Itm_by_key_or_new(Bry_.new_a7(key));
itm.Atrs_set(Bry_.new_a7(val), false, true);
}
}

8
400_xowa/src_140_lang/gplx/xowa/Xol_specials_mgr.java
View File

@@ -17,13 +17,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa; import gplx.*;
public class Xol_specials_mgr implements GfoInvkAble {
private OrderedHash hash_by_special = OrderedHash_.new_bry_(), hash_by_aliases = OrderedHash_.new_bry_();
private Ordered_hash hash_by_special = Ordered_hash_.new_bry_(), hash_by_aliases = Ordered_hash_.new_bry_();
public Xol_specials_mgr(Xol_lang lang) {this.lang = lang;} private Xol_lang lang;
public void Clear() {hash_by_special.Clear();}
public int Count() {return hash_by_special.Count();}
public Xol_specials_itm Get_at(int i) {return (Xol_specials_itm)hash_by_special.FetchAt(i);}
public Xol_specials_itm Get_by_alias(byte[] alias) {return (Xol_specials_itm)hash_by_aliases.Fetch(alias);}
public Xol_specials_itm Get_by_key(byte[] special) {return (Xol_specials_itm)hash_by_special.Fetch(special);}
public Xol_specials_itm Get_at(int i) {return (Xol_specials_itm)hash_by_special.Get_at(i);}
public Xol_specials_itm Get_by_alias(byte[] alias) {return (Xol_specials_itm)hash_by_aliases.Get_by(alias);}
public Xol_specials_itm Get_by_key(byte[] special) {return (Xol_specials_itm)hash_by_special.Get_by(special);}
public void Add(byte[] special, byte[][] alias_ary) {
Xol_specials_itm itm = new Xol_specials_itm(special, alias_ary);
hash_by_special.Add(special, itm);