From b1843eba7db22344e49b9060f60dbf89c7720bbd Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Wed, 8 Apr 2015 01:44:43 +0300
Subject: [PATCH] cast to array instead of checking is_assoc

---
 template.lime       |  2 +-
 template.parser.php |  8 ++++----
 template.php        | 11 +----------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/template.lime b/template.lime
index de15ad8..96752f8 100644
--- a/template.lime
+++ b/template.lime
@@ -162,7 +162,7 @@ c_for = for varref/varref "=" exp/exp "-->" chunks/cs "<!--" "END" {
     $$ = "\$stack[] = ".$varref[0].";
 \$stack[] = ".$varref_index.";
 \$stack[] = 0;
-foreach (self::array1($exp[0]) as \$item) {
+foreach ((array)($exp[0]) as \$item) {
 ".$varref[0]." = \$item;
 ".$varref_index." = \$stack[count(\$stack)-1]++;
 ".$cs."}
diff --git a/template.parser.php b/template.parser.php
index 78ee898..f69c444 100644
--- a/template.parser.php
+++ b/template.parser.php
@@ -4,7 +4,7 @@
  * Homepage: http://yourcmc.ru/wiki/VMX::Template
  * License: GNU GPLv3 or later
  * Author: Vitaliy Filippov, 2006-2015
- * Version: V3 (LALR), 2015-03-09
+ * Version: V3 (LALR), 2015-04-08
  *
  * This file contains the implementation of VMX::Template compiler.
  * It is only used when a template is compiled in runtime.
@@ -3761,7 +3761,7 @@ class VMXTemplateParser extends lime_parser {
         $result = "\$stack[] = ".$varref[0].";
     \$stack[] = ".$varref_index.";
     \$stack[] = 0;
-    foreach (self::array1($exp[0]) as \$item) {
+    foreach ((array)($exp[0]) as \$item) {
     ".$varref[0]." = \$item;
     ".$varref_index." = \$stack[count(\$stack)-1]++;
     ".$cs."}
@@ -4992,5 +4992,5 @@ class VMXTemplateParser extends lime_parser {
   );
 }
 
-// Time: 2,6265029907227 seconds
-// Memory: 11885624 bytes
+// Time: 3,1172089576721 seconds
+// Memory: 11886108 bytes
diff --git a/template.php b/template.php
index 3f7219a..bc7d504 100644
--- a/template.php
+++ b/template.php
@@ -8,7 +8,7 @@
  * Homepage: http://yourcmc.ru/wiki/VMX::Template
  * License: GNU GPLv3 or later
  * Author: Vitaliy Filippov, 2006-2015
- * Version: V3 (LALR), 2015-03-09
+ * Version: V3 (LALR), 2015-04-08
  *
  * The template engine is split into two parts:
  * (1) This file - always used when running templates
@@ -476,15 +476,6 @@ class VMXTemplate
         throw new VMXTemplateException("Unknown block or function '$block'$errorinfo");
     }
 
-    static function array1($a)
-    {
-        if (is_null($a))
-            return array();
-        if (is_array($a) && !self::is_assoc($a))
-            return $a;
-        return array($a);
-    }
-
     // No-op, just returns the single argument. Needed to workaround ($expression)['key'] and ($expression)->m() issues.
     static function noop($a)
     {