bc", "a<pre><pre><pre>bc");
+ }
+ @Test public void Ext__unclosed() { // COVERS: "Infinite backtrack"
+ fxt.Test__parse("aa<pre bcd");
+ }
+ @Test public void Ext__noinclude() { // COVERS: " and just become tags"
+ fxt.Init__for_inclusion_(Bool_.N);
+ fxt.Test__parse("abcde", "a<includeonly>b<noinclude>c</noinclude>d</includeonly>e");
+ }
+ @Test public void Heading() {
+ fxt.Test__parse(String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "== b1 =="
+ , "z"
+ ), String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "== b1 =="
+ , "z"
+ ));
+ }
+ @Test public void Heading__eos__no_nl() {
+ fxt.Test__parse(String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "== b1 =="
+ ), String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "== b1 =="
+ ));
+ }
+ @Test public void Heading__bos__implied_nl() { // COVERS: "Is this the start of a heading?"
+ fxt.Test__parse(String_.Concat_lines_nl_skip_last
+ ( "== b1 =="
+ , "z"
+ ), String_.Concat_lines_nl_skip_last
+ ( "== b1 =="
+ , "z"
+ ));
+ }
+ @Test public void Heading__dwim__y() { // COVERS: "DWIM: This looks kind of like a name/value separator."
+ fxt.Test__parse(String_.Concat_lines_nl_skip_last
+ ( "a{{b|"
+ , "=c="
+ , "}}d"
+ ), String_.Concat_lines_nl_skip_last
+ ( "ab"
+ , "=c="
+ , "d"
+ ));
+ }
+ @Test public void Heading__dwim__n() { // COVERS: "DWIM: This looks kind of like a name/value separator."
+ fxt.Test__parse(String_.Concat_lines_nl_skip_last
+ ( "a{{b|"
+ , "==c=="
+ , "}}d"
+ ), String_.Concat_lines_nl_skip_last
+ ( "ab"
+ , "==c==" // NOTE: verified against MW:1.29; possible-h line hit
+ , "d"
+ ));
+ }
+ @Test public void Heading__comment() { // COVERS: "Comment found at line end"
+ fxt.Test__parse(String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "==b== "
+ , ""
+ ), String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "==b== <!--c-->"
+ , ""
+ ));
+ }
+ @Test public void Heading__consecutive__5() { // COVERS: "This is just a single String of equals signs on its own line"
+ fxt.Test__parse(String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "====="
+ , ""
+ ), String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "====="
+ , ""
+ ));
+ }
+ @Test public void Heading__consecutive__1() { // COVERS: "Single equals sign on its own line, count=0"
+ fxt.Test__parse(String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "="
+ , ""
+ ), String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "="
+ , ""
+ ));
+ }
+ @Test public void Heading__unclosed() { // COVERS: "No match, no , just pass down the inner src"
+ fxt.Test__parse(String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "===b"
+ , ""
+ ), String_.Concat_lines_nl_skip_last
+ ( "a"
+ , "===b"
+ , ""
+ ));
+ }
+ @Test public void Inclusion__n() {
+ fxt.Init__for_inclusion_(Bool_.N);
+ fxt.Test__parse("abc", "a<onlyinclude>b</onlyinclude>c");
+ }
+ @Test public void Inclusion__y() {
+ fxt.Init__for_inclusion_(Bool_.Y);
+ fxt.Test__parse("abc", "a<onlyinclude>b</onlyinclude>c");
+ }
+ @Test public void Ignored__noinclude() { // COVERS: "Handle ignored tags"
+ fxt.Init__for_inclusion_(Bool_.N);
+ fxt.Test__parse("abc", "a<noinclude>b</noinclude>c");
+ }
+}
+class XomwPreprocessor__fxt {
+ private boolean hash_enabled = Bool_.Y;
+ private boolean for_inclusion = false;
+ public XomwPreprocessor__fxt() {
+ }
+ public void Clear() {
+ hash_enabled = true;
+ for_inclusion = false;
+ }
+ public void Init__for_inclusion_(boolean v) {for_inclusion = v;}
+ public XomwPreprocessor__fxt Init__hash_y() {hash_enabled = Bool_.Y; return this;}
+ public void Test__parse(String src_str, String expd) {
+ List_adp list = List_adp_.New();
+ if (hash_enabled) {
+ XomwParser parser = new XomwParser(XomwEnv_fxt.NewTest());
+ XomwPreprocessor_Hash wkr_hash = new XomwPreprocessor_Hash(parser);
+ parser.mStripList.Add("pre");
+ list.Add(wkr_hash);
+ }
+
+ for (int i = 0; i < list.Len(); i++) {
+ XomwPreprocessor wkr = (XomwPreprocessor)list.Get_at(i);
+ String actl = wkr.preprocessToDbg(src_str, for_inclusion);
+ Tfds.Eq_str_lines(expd, actl, src_str);
+ }
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/mediawiki/languages/XomwLanguage.java b/400_xowa/src/gplx/xowa/mediawiki/languages/XomwLanguage.java
index 32874b1d2..dabe6faae 100644
--- a/400_xowa/src/gplx/xowa/mediawiki/languages/XomwLanguage.java
+++ b/400_xowa/src/gplx/xowa/mediawiki/languages/XomwLanguage.java
@@ -4585,7 +4585,7 @@ public class XomwLanguage {
// For unknown languages, fallbackSequence returns an empty array,
// hardcode fallback to 'en' in that case.
Object rv = XomwLanguage.getLocalisationCache().getItem(code, "fallbackSequence");
- return rv == null ? XophpArray.New().Add("en") : (XophpArray)rv;
+ return rv == null ? XophpArray.New("en") : (XophpArray)rv;
}
// /**
diff --git a/400_xowa/src/gplx/xowa/mediawiki/languages/XomwLanguage_tst.java b/400_xowa/src/gplx/xowa/mediawiki/languages/XomwLanguage_tst.java
index beda9ac0b..19b86815b 100644
--- a/400_xowa/src/gplx/xowa/mediawiki/languages/XomwLanguage_tst.java
+++ b/400_xowa/src/gplx/xowa/mediawiki/languages/XomwLanguage_tst.java
@@ -114,8 +114,8 @@ public class XomwLanguage_tst {
fxt.Test_commafy("-1234567890" , "-1,23,45,67,890");
}
@Test public void handleExplicitPluralForms() {
- fxt.Test__handleExplicitPluralForms__string("1", XophpArray.New().Add("1=one"), "one");
- fxt.Test__handleExplicitPluralForms__array("1", XophpArray.New().Add("no_match"), XophpArray.New().Add(0, "no_match"));
+ fxt.Test__handleExplicitPluralForms__string("1", XophpArray.New("1=one"), "one");
+ fxt.Test__handleExplicitPluralForms__array("1", XophpArray.New("no_match"), XophpArray.New().Add(0, "no_match"));
}
@Test public void getPluralRuleIndexNumber() {
fxt.Init__pluralRulesXml
diff --git a/400_xowa/src/gplx/xowa/mediawiki/vendor/wikimedia/cldr_plural_rule_parser/src/XomwRange.java b/400_xowa/src/gplx/xowa/mediawiki/vendor/wikimedia/cldr_plural_rule_parser/src/XomwRange.java
index 05c10e3cb..e49a50662 100644
--- a/400_xowa/src/gplx/xowa/mediawiki/vendor/wikimedia/cldr_plural_rule_parser/src/XomwRange.java
+++ b/400_xowa/src/gplx/xowa/mediawiki/vendor/wikimedia/cldr_plural_rule_parser/src/XomwRange.java
@@ -36,7 +36,7 @@ class XomwRange {
if (end == null) {
this.parts.Add(start);
} else {
- this.parts.Add(XophpArray.New().Add(start).Add(end));
+ this.parts.Add(XophpArray.New(start, end));
}
}
diff --git a/baselib/src/gplx/objects/strings/bfrs/String_bfr.java b/baselib/src/gplx/objects/strings/bfrs/String_bfr.java
index f6631e4dd..64a94734b 100644
--- a/baselib/src/gplx/objects/strings/bfrs/String_bfr.java
+++ b/baselib/src/gplx/objects/strings/bfrs/String_bfr.java
@@ -17,6 +17,7 @@ package gplx.objects.strings.bfrs; import gplx.*; import gplx.objects.*; import
import java.lang.*;
import gplx.objects.primitives.*;
import gplx.objects.errs.*;
+import gplx.objects.strings.unicodes.*;
public class String_bfr {
private java.lang.StringBuilder sb = new java.lang.StringBuilder();
public boolean Has_none() {return this.Len() == 0;}
@@ -32,6 +33,16 @@ public class String_bfr {
Add_char(c);
return this;
}
+ public String_bfr Add_char_by_code(int code) {
+ if (code >= Ustring_.Surrogate_cp_bgn && code <= Ustring_.Surrogate_cp_end) {
+ sb.append((char)((code - 0x10000) / 0x400 + 0xD800));
+ sb.append((char)((code - 0x10000) % 0x400 + 0xDC00));
+ }
+ else {
+ sb.append((char)code);
+ }
+ return this;
+ }
public String_bfr Add_int_pad_bgn(char pad_char, int str_len, int val) {
int digit_len = Int_.Count_digits(val);
int pad_len = str_len - digit_len;