[BUGFIX] Allow colons in PCRE part of default namespace

Fixes: hoaproject#113
ohader · Oct 6, 2020 · 2242418 · 2242418
1 parent 90c9b80
commit 2242418
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Llk/Llk.php b/Llk/Llk.php
@@ -314,7 +314,7 @@ public static function parsePP($pp, &$tokens, &$rules, &$pragmas, $streamName)
                                 $matches[3] .
                             ')';
                     }
-                } elseif (0 !== preg_match('#^%token\h+(?:([^:]+):)?([^\h]+)\h+(.*?)(?:\h+->\h+(.*))?$#u', $line, $matches)) {
+                } elseif (0 !== preg_match('#^%token\h+(?:([^:\h]+):)?([^\h]+)\h+(.*?)(?:\h+->\h+(.*))?$#u', $line, $matches)) {
                     if (empty($matches[1])) {
                         $matches[1] = 'default';
                     }

diff --git a/Test/Unit/Llk/Llk.php b/Test/Unit/Llk/Llk.php
@@ -214,7 +214,8 @@ public function case_parse_tokens()
                     '%token  foobar1            bazqux1' . "\n" .
                     '%token  sourceNS1:foobar2  bazqux2' . "\n" .
                     '%token  sourceNS2:foobar3  bazqux3  -> destinationNS' . "\n" .
-                    '%token  foobar4            barqux4  -> destinationNS'
+                    '%token  foobar4            barqux4  -> destinationNS' . "\n" .
+                    '%token  foobar5            ns:bar   -> destinationNS'
             )
             ->when($result = SUT::parsePP($pp, $tokens, $rules, $pragmas, 'streamFoo'))
             ->then
@@ -224,7 +225,8 @@ public function case_parse_tokens()
                     ->isEqualTo([
                         'default' => [
                             'foobar1'               => 'bazqux1',
-                            'foobar4:destinationNS' => 'barqux4'
+                            'foobar4:destinationNS' => 'barqux4',
+                            'foobar5:destinationNS' => 'ns:bar',
                         ],
                         'sourceNS1' => [
                             'foobar2' => 'bazqux2'