Changeset 3408

Timestamp:

08/31/2008 06:56:54 AM (3 months ago)

Author:

Geert

Message:

The mandatory router (regex) optimizations everybody was waiting for:

• compile() about 15% faster now
  
• keys() about 10% faster now
  
• other minor cleanups
  

Location:

trunk/system

Files:

• classes/router.php (modified) (14 diffs)
• config/routes.php (modified) (1 diff)

trunk/system/classes/router.php

@@ -26 +26 @@
         /**
          * Router setup routine. Called during the [system.routing][ref-esr]
-         * Event by default. 
+         * Event by default.
          *
          * [ref-esr]: http://docs.kohanaphp.com/events/system.routing
@@ -34 +34 @@
         public static function setup()
         {
-                // Remove all dot-paths from the URI, they are not valid
-                self::$current_uri = trim(preg_replace('#\.[\s./]*/#', '', self::$current_uri), '/');
-
                 // Set the complete URI
                 self::$complete_uri = self::$current_uri.self::$query_string;
@@ -48 +45 @@
                         (
                                 'Routing API Changed!',
-                                'Routing has been significantly changed, and your configuration '.
-                                'files are not up to date. Please check http://dev.kohanaphp.com/changeset/3366 '.
-                                'for more details.'
+                                'Routing has been significantly changed, and your configuration files are not up to date. '.
+                                'Please check http://dev.kohanaphp.com/changeset/3366 for more details.'
                         );
                 }
@@ -204 +200 @@
                 if (($strpos_fc = strpos(self::$current_uri, $fc)) !== FALSE)
                 {
-                        // Remove the front controller from the current uri
+                        // Remove the front controller from the current URI
                         self::$current_uri = substr(self::$current_uri, $strpos_fc + strlen($fc));
                 }
@@ -215 +211 @@
                         // Reduce multiple slashes into single slashes
                         self::$current_uri = preg_replace('#//+#', '/', self::$current_uri);
+
+                        // Remove all dot-paths from the URI, they are not valid
+                        self::$current_uri = preg_replace('#\.[\s./]*/#', '', self::$current_uri);
 
                         // Make sure the URL is not tainted with HTML characters
@@ -264 +263 @@
 
                 // Remove trailing parts from the URI
-                $uri = preg_replace('#/?\:.+$#', '', $uri);
+                $uri = preg_replace('#/?:.+$#', '', $uri);
 
                 return $uri;
@@ -281 +280 @@
 
                 // Find all keys that start with a colon
-                preg_match_all('#:([a-z]+)#', $uri, $keys);
-
-                return $keys[1];
-        }
-
-        /**
-         * Creates a [regular expression][ref-reg] that can be used to match a 
+                preg_match_all('#(?<=:)[a-z]+#', $uri, $keys);
+
+                return $keys[0];
+        }
+
+        /**
+         * Creates a [regular expression][ref-reg] that can be used to match a
          * route against a URI with [preg_match][ref-prm].
          *
@@ -302 +301 @@
 
                 // Regular expression end
-                $end = array();
+                $end = '';
 
                 // Nothing is optional yet
@@ -309 +308 @@
                 foreach ($uri as $i => $segment)
                 {
-                        // Regular expression
-                        $exp = array();
-
                         if ($segment[0] === ':')
                         {
                                 // Find the actual segment key and any trailing garbage
-                                preg_match('#^:([a-z]+)(.*)$#', $segment, $matches);
+                                preg_match('#^:([a-z]++)(.*)$#', $segment, $matches);
 
                                 // Segment key
                                 $key = $matches[1];
+
+                                // Regular expression
+                                $exp = '';
 
                                 if ($optional === FALSE AND isset($route[$key]))
@@ -329 +328 @@
                                 if ($optional === TRUE)
                                 {
-                                        // Start the expression as an optional match
-                                        $exp[] = '(?:';
+                                        // Start the expression as non-capturing group
+                                        $exp .= '(?:';
+
+                                        // End the expression as an optional match
+                                        $end .= ')?';
                                 }
 
@@ -336 +338 @@
                                 {
                                         // Add the slash from the previous segment
-                                        $exp[] = '/';
+                                        $exp .= '/';
                                 }
 
@@ -342 +344 @@
                                 {
                                         // Matches specified regex for the segment
-                                        $exp[] = '('.$route['regex'][$key].')';
+                                        $exp .= '('.$route['regex'][$key].')';
                                 }
                                 else
                                 {
-                                        // Default regex matches all characters
-                                        $exp[] = '([^/]+)';
+                                        // Default regex matches all characters except slashes
+                                        $exp .= '([^/]++)';
                                 }
 
@@ -353 +355 @@
                                 {
                                         // Add trailing segment junk
-                                        $exp[] = preg_quote($matches[2], '#');
-                                }
-
-                                if ($optional === TRUE)
-                                {
-                                        // End the expression
-                                        $end[] = ')?';
+                                        $exp .= preg_quote($matches[2], '#');
                                 }
 
                                 // Replace the segment with the segment expression
-                                $uri[$i] = implode('', $exp);
+                                $uri[$i] = $exp;
                         }
                         else
@@ -378 +374 @@
                 }
 
-                return implode('', $uri).implode('', $end);
+                return implode('', $uri).$end;
         }
 

trunk/system/config/routes.php

@@ -17 +17 @@
  * The converted regex for this route is:
  *
- *     (?:([^/]+)(?:/([^/]+)(?:/([^/]+))?)?)?
+ *     (?:([^/]++)(?:/([^/]++)(?:/([^/]++))?)?)?
  *
  * To define a specific pattern for a key, you can use the special "regex" key: