Fix tests for new match syntax

unicode-org · Dec 9, 2024 · 03cba1f · 03cba1f
1 parent 0c26388
commit 03cba1f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/icu4c/source/i18n/messageformat2_parser.cpp b/icu4c/source/i18n/messageformat2_parser.cpp
@@ -2022,7 +2022,7 @@ void Parser::parseSelectors(UErrorCode& status) {
         return;
     }
 
-    while (isWhitespace(peek()) || isBidiControl(peek()) isKeyStart(peek())) {
+    while (isWhitespace(peek()) || isBidiControl(peek()) || isKeyStart(peek())) {
         parseOptionalWhitespace();
         // Restore the precondition.
         // Trailing whitespace is allowed.

diff --git a/testdata/message2/bidi.json b/testdata/message2/bidi.json
@@ -54,39 +54,39 @@
     {
         "comment": "match-statement s variant *(o variant)",
         "src": [".local $x = {1 :number}\n",
-                ".match {$x}\n",
+                ".match $x\n",
                 "1 {{one}}\n",
                 "\u061C * {{other}}"],
         "exp": "one"
     },
     {
         "comment": "match-statement s variant *(o variant)",
         "src": [".local $x = {1 :number}",
-                ".match {$x} \u061c",
+                ".match $x \u061c",
                 "1 {{one}}",
                 "* {{other}}"],
         "exp": "one"
     },
     {
         "comment": "match-statement s variant *(o variant)",
         "src": [".local $x = {1 :number}",
-                ".match {$x}\u061c",
+                ".match $x \u061c",
                 "1 {{one}}",
                 "* {{other}}"],
         "exp": "one"
     },
     {
         "comment": "variant = key *(s key) quoted-pattern",
         "src": [".local $x = {1 :number} .local $y = {$x :number}",
-                ".match {$x} {$y}",
+                ".match $x $y\n",
                 "1 \u200E 1 {{one}}",
                 "* * {{other}}"],
         "exp": "one"
     },
     {
         "comment": "variant = key *(s key) quoted-pattern",
         "src": [".local $x = {1 :number} .local $y = {$x :number}",
-                ".match {$x} {$y}",
+                ".match $x $y\n",
                 "1\u200E 1 {{one}}",
                 "* * {{other}}"],
         "exp": "one"

diff --git a/testdata/message2/matches-whitespace.json b/testdata/message2/matches-whitespace.json
@@ -6,7 +6,7 @@
   },
   "tests": [
     { "src": ".local $one = {1 :string} .local $bar = {bar :string} .match $one $bar one * {{one}} * * {{other}}",
-      "exp": "one" },
+      "exp": "other" },
     { "src": ".local $foo = {foo :string} .local $bar = {bar :string} .match $foo $bar one * {{one}}* * {{other}}",
       "exp": "other" },
     { "src": ".local $foo = {foo :string} .local $bar = {bar :string} .match $foo $bar one *{{one}} * * {{foo}}",