Small lexer optimisation using the \G assertion.

Savageman · Nov 30, 2013 · f20b2fc · f20b2fc
1 parent 067d223
commit f20b2fc
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Llk/Lexer.php b/Llk/Lexer.php
@@ -260,14 +260,14 @@ protected function matchLexeme ( $lexeme, $regex, $offset ) {
 
         $_regex = str_replace('#', '\#', $regex);
         $preg   = preg_match(
-            '#(?|' . $_regex . ')#u',
+            '#\G(?|' . $_regex . ')#u',
             $this->_text,
             $matches,
-            PREG_OFFSET_CAPTURE,
+            0,
             $offset
         );
 
-        if(0 === $preg || $offset !== $matches[0][1])
+        if(0 === $preg)
             return null;
 
         if('' === $matches[0])
@@ -277,8 +277,8 @@ protected function matchLexeme ( $lexeme, $regex, $offset ) {
 
         return array(
             'token'  => $lexeme,
-            'value'  => $matches[0][0],
-            'length' => mb_strlen($matches[0][0])
+            'value'  => $matches[0],
+            'length' => mb_strlen($matches[0])
         );
     }
 }