Fixed a bug when accessing array indices that contain a minus sign, it is now…

CHANGELOG

@@ -11,6 +11,9 @@
   passed the compiler directly to the get method with autoEscape enabled,
   the autoEscape was disabled in included templates - Thanks to Fabien 
   Potencier for notifying me.
+* Fixed a bug when accessing array indices that contain a minus sign, it 
+  is now possible to access those using {$var[index-foo]}, 
+  {$var['index-foo']} or {$index="index-foo"} {$var[$index]}
 
 [2009-07-18] 1.1.0
 ! BC Break: Dwoo::initGlobals() is only called once during the Dwoo object

lib/Dwoo.php

@@ -1230,7 +1230,7 @@ class Dwoo
 		}
 
 		if (is_array($varstr) === false) {
-			preg_match_all('#(\[|->|\.)?([^.[\]-]+)\]?#i', $varstr, $m);
+			preg_match_all('#(\[|->|\.)?((?:[^.[\]-]|-(?!>))+)\]?#i', $varstr, $m);
 		} else {
 			$m = $varstr;
 		}
@@ -1334,7 +1334,7 @@ class Dwoo
 				$varstr = 'dwoo'.$varstr;
 			}
 
-			preg_match_all('#(\[|->|\.)?([^.[\]-]+)\]?#i', $varstr, $m);
+			preg_match_all('#(\[|->|\.)?((?:[^.[\]-]|-(?!>))+)\]?#i', $varstr, $m);
 		}
 
 		$i = $m[2][0];

lib/Dwoo/Compiler.php

@@ -2283,7 +2283,7 @@ class Dwoo_Compiler implements Dwoo_ICompiler
 					}
 				}
 			} else {
-				preg_match_all('#(\[|->|\.)?([a-z0-9_]+|(\\\?[\'"])[^\3]*?\3)\]?#i', $key, $m);
+				preg_match_all('#(\[|->|\.)?((?:[a-z0-9_]|-(?!>))+|(\\\?[\'"])[^\3]*?\3)\]?#i', $key, $m);
 
 				$i = $m[2][0];
 				if ($i === '_parent' || $i === '_') {
@@ -2337,7 +2337,7 @@ class Dwoo_Compiler implements Dwoo_ICompiler
 				}
 			}
 		} else {
-			preg_match_all('#(\[|->|\.)?([a-z0-9_]+)\]?#i', $key, $m);
+			preg_match_all('#(\[|->|\.)?((?:[a-z0-9_]|-(?!>))+)\]?#i', $key, $m);
 			unset($m[0]);
 			$output = '$this->readVar('.str_replace("\n", '', var_export($m, true)).')';
 		}