Merge branch 'master' of https://github.com/kakserpom/quicky

Author: kakserpom

Quicky_compiler.class.php

@@ -302,9 +302,9 @@ public function _read_sequences($source) {
      */
 	public function _literal_callback($m) {
 		if (isset($m[2]) && ($m[2] !== '')) {
-			return $this->left_delimiter . 'rdelim' . $this->right_delimiter;
+			return $this->left_delimiter . '__ rdelim' . $this->right_delimiter;
 		}
-		return $this->left_delimiter . 'ldelim' . $this->right_delimiter;
+		return $this->left_delimiter . '__ ldelim' . $this->right_delimiter;
 	}
 
     /**
@@ -470,7 +470,7 @@ public function string_or_expr($s) {
      */
 	public function _parse_params($p, $plain = false) {
 		$params = array();
-		preg_match_all('~(?:\w+\s*=|(([\'"]).*?(?<!\\\\)\2|\w*\s*\(((?:(?R)|.)*?)\)'
+		preg_match_all('~(?:[\w\-]+\s*=|(([\'"]).*?(?<!\\\\)\2|\w*\s*\(((?:(?R)|.)*?)\)'
 							   . '|_?[\$#]\w+#?(?:\\[(?:(?R)|((?:[^\\]\'"]*(?:([\'"]).*?(?<!\\\\)\5)?)*))*?\\]|\.[\$#]?\w+#?|->\s*[\$#]?\w+(?:\(((?:(?R)|.)*?)\))?)*'
 							   . '|-?\d+|(?<=^|[\s\)\:\.=+\-<>])(?:\w+)(?=$|[\s\|\.\:\(=+\-<>])))'
 							   . '(?:\|@?\s*\w+(?:\:\s*(?:[^\:\|\'"\s]*(?:([\'"]).*?(?<!\\\\)\1[^\:\|\'"]*)*))*)*'
@@ -479,7 +479,7 @@ public function _parse_params($p, $plain = false) {
 		foreach ($m as $v) {
 			$s = count($v);
 			if (($s == 1) || ($s == 2) || ($s == 3)) {
-				if (preg_match('~^\w+\s*=$~', $v[0])) {
+				if (preg_match('~^[\w\-]+\s*=$~', $v[0])) {
 					$lastkey = ltrim(rtrim($v[0], " =\t"));
 				}
 				elseif ($lastkey !== '') {