Implemented GRAILS-8518 (Map iteration with g:each tag as it was in Grails 1.x.x)

Author: lhotari

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/GroovyPageRenderingTests.groovy

@@ -43,6 +43,12 @@ class GroovyPageRenderingTests extends AbstractGrailsTagTests {
         def result = applyTemplate(template, [toplist: [[sublist:['a','b']],[sublist:['c','d']]]])
         assertEquals 'abcd', result
     }
+    
+    void testForeachIteratingMap() {
+        def template='<g:each var="k,v" in="[a:1,b:2,c:3]">${k}=${v},</g:each>'
+        def result = applyTemplate(template, [:])
+        assertEquals 'a=1,b=2,c=3,', result
+    }
 
     void testForeachRenaming() {
         def template='<g:each in="${list}"><g:each in="${list}">.</g:each></g:each>'

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/taglib/GroovySyntaxTag.java

@@ -139,7 +139,13 @@ protected void doEachMethod(String in) {
             var = "_it"+ Math.abs(System.identityHashCode(this));
             foreachRenamedIt = var;
         }
-
+        
+        String[] entryVars=null;
+        if(hasVar && var.indexOf(',') > -1) {
+            entryVars = var.split("\\s*,\\s*");
+            var = "_entry" + Math.abs(System.identityHashCode(this));
+        }
+        
         out.print("for( " + var);
         out.print(" in "); // dot de-reference
         out.print(parser != null ? parser.getExpressionText(in, false) : extractAttributeValue(in));  // object
@@ -148,6 +154,9 @@ protected void doEachMethod(String in) {
         out.println();
         if (!hasVar) {
             out.println("changeItVariable(" + foreachRenamedIt +")" );
+        } else if (entryVars != null) {
+            out.println("def " + entryVars[0].trim() + "=" + var + ".getKey()");
+            out.println("def " + entryVars[1].trim() + "=" + var + ".getValue()");
         }
     }