@@ -11,19 +11,26 @@ class RouteInfo{

     public $result;

     // The route name

     public $name;

+    // The type the route - should be one of defined in the class constants

+    public $type;

     // BeforeAction event handlers;

     public $beforeAction;

     // AfterAction event handlers;

     public $afterAction;

     // AfterResult event handlers;

     public $afterResult;

+

+    //RouteInfo types:

+    public const L3 = "L3";

+    public const REGEX = "REGEX";

-    public function __construct($method, $path, $result, $name = '')

+    public function __construct($method, $path, $result, $name = '', $type = self::L3)

     {

         $this->path = $path;

         $this->method = $method;

         $this->result = $result;

         $this->name = $name;

+        $this->type = $type;

         $this->beforeAction = array();

         $this->afterAction = array();

         $this->afterResult = array();

@@ -25,6 +25,12 @@ class Router{

         return $this;

     }

+    public function add_preg($method, $path, $result, $name = ''){

+        $this->routes[] = new RouteInfo($method, $path, $result, $name, RouteInfo::REGEX);

+        if(isset($name)&&$name!='') $this->routeNameIndex[$name] = &$this->routes[count($this->routes)-1];

+        return $this;

+    }

+

     public function add404($result){

         return $this->add('404', '', $result, _L3_ROUTE_404_NAME);

     }

@@ -53,6 +59,32 @@ class Router{

         return $this->add('ANY', $path, $result, $name);

     }

+    // Regular expression based routes

+

+    public function get_preg($path, $result, $name = ''){

+        return $this->add_preg('GET', $path, $result, $name);

+    }

+

+    public function post_preg($path, $result, $name = ''){

+        return $this->add_preg('POST', $path, $result, $name);

+    }

+

+    public function put_preg($path, $result, $name = ''){

+        return $this->add_preg('PUT', $path, $result, $name);

+    }

+

+    public function patch_preg($path, $result, $name = ''){

+        return $this->add_preg('PATCH', $path, $result, $name);

+    }

+

+    public function delete_preg($path, $result, $name = ''){

+        return $this->add_preg('DELETE', $path, $result, $name);

+    }

+

+    public function any_preg($path, $result, $name = ''){

+        return $this->add_preg('ANY', $path, $result, $name);

+    }

+

     public function addBeforeAction($event_handler){

         $this->routes[count($this->routes)-1]->addBeforeAction($event_handler);

         return $this;

@@ -74,36 +106,49 @@ class Router{

         $curi = count($auri);

         foreach ($this->routes as $routeInfo) {

-            

-            $route = $routeInfo->path;

-            $method = $routeInfo->method;

-            if($method=='ANY' || strpos($request->method,$method)!==false){

-                $aroute = explode('/', trim($route, "/ \t\n\r\0\x0B"));

-                //print_r($aroute);

-                if($curi==count($aroute)){ //compare path element count

-                    //optimistic assumption :)

-                    $matchResult = true;

-                    for($i = 0; $i<$curi; $i++){

-                        $pathPartName = trim($aroute[$i],'{}');

-                        if($aroute[$i]==$pathPartName){

-                            if($auri[$i]!=$pathPartName){

-                                //echo "diffrence found";

-                                $matchResult = false;

-                                break;

+            if($routeInfo->type == RouteInfo::L3){

+                $route = $routeInfo->path;

+                $method = $routeInfo->method;

+                if($method=='ANY' || strpos($request->method,$method)!==false){

+                    $aroute = explode('/', trim($route, "/ \t\n\r\0\x0B"));

+                    //print_r($aroute);

+                    if($curi==count($aroute)){ //compare path element count

+                        //optimistic assumption :)

+                        $matchResult = true;

+                        for($i = 0; $i<$curi; $i++){

+                            $pathPartName = trim($aroute[$i],'{}');

+                            if($aroute[$i]==$pathPartName){

+                                if($auri[$i]!=$pathPartName){

+                                    //echo "diffrence found";

+                                    $matchResult = false;

+                                    break;

+                                }

                             }

-                        }

-                        else{ // {...} found -> catch $uri variable

-                            $value = $auri[$i];

-                            $valueKey = explode(':', $pathPartName);

-                            //validation

-                            if(isset($valueKey[1]) && $valueKey[1]=='int'){

-                                $value = intval($value);

+                            else{ // {...} found -> catch $uri variable

+                                $value = $auri[$i];

+                                $valueKey = explode(':', $pathPartName);

+                                //validation

+                                if(isset($valueKey[1]) && $valueKey[1]=='int'){

+                                    $value = intval($value);

+                                }

+                                //value store...

+                                $this->parsedParameters[$valueKey[0]] = $value;

                             }

-                            //value store...

-                            $this->parsedParameters[$valueKey[0]] = $value;

+                        }

+                        if($matchResult){ // match found

+                            $this->depth = $curi;

+                            $this->routeInfo = $routeInfo;

+                            return $routeInfo->result;

                         }

                     }

-                    if($matchResult){ // match found

+                }

+            }

+            if($routeInfo->type == RouteInfo::REGEX){

+                $route_pattern = $routeInfo->path;

+                $method = $routeInfo->method;

+                if($method=='ANY' || strpos($request->method, $method)!==false){

+                    if(\preg_match($route_pattern, $request->path, $match)){

+                        $this->parsedParameters = $match;

                         $this->depth = $curi;

                         $this->routeInfo = $routeInfo;

                         return $routeInfo->result;

@@ -142,12 +187,15 @@ class Router{

     public function link($name, $parameters){

         $route = $this->routeNameIndex[$name];

+        if($route->type == RouteInfo::REGEX){

+            throw new \Exception("Method Router::link not applicable to REGEX routes.");

+        }

         $fields = array_keys($parameters);

         $values = array_values($parameters);

         array_walk($fields, function (&$item, $key){

             $item = "/\{".$item."\}/";

         });

-        return preg_replace($fields, $values, $route->Path);

+        return preg_replace($fields, $values, $route->path);

     }

     public function getParameter($name){