[griddynamics#1028][feature] - Reusing code with macros: replacing va…

…riables in class cast expressions too
rsvato · Sep 3, 2013 · 2ca9c3e · 2ca9c3e
1 parent 9ea793b
commit 2ca9c3e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/...com/griddynamics/genesis/template/dsl/groovy/transformations/MacroASTTransformation.scala b/...com/griddynamics/genesis/template/dsl/groovy/transformations/MacroASTTransformation.scala
@@ -70,6 +70,9 @@ class ApplyVariablesVisitor(values: Map[String, Expression], replacements: mutab
       }
       case constant: ConstantExpression if constant.getText.startsWith("$") =>
         values.get(constant.getText).getOrElse(constant)
+      case cast: CastExpression => {
+        new CastExpression(cast.getType, transform(cast.getExpression), cast.isIgnoringAutoboxing)
+      }
       case other => other
     }
   }

diff --git a/backend/src/test/resources/groovy/Macros.genesis b/backend/src/test/resources/groovy/Macros.genesis
@@ -7,10 +7,13 @@ template {
 
     def MY_CONSTANT = "Set from constant"
 
+    def xxx = {"Call from closure"}
+
     defmacro "create_steps": { $message = "default" ->
         1 + 2
         teststep {
             text = $message
+            skip = ($message as Boolean)
         }
     }
 
@@ -72,6 +75,7 @@ template {
             macro:create_steps($message: "Set with map")
             macro:create_steps()
             macro:simple()
+            macro:create_steps($message: xxx)
         }
     }
 

diff --git a/backend/src/test/scala/com/griddynamics/genesis/service/impl/MacrosTest.scala b/backend/src/test/scala/com/griddynamics/genesis/service/impl/MacrosTest.scala
@@ -38,15 +38,15 @@ class MacrosTest extends AssertionsForJUnit with MockitoSugar with DSLTestUniver
     val template: Option[TemplateDefinition] = templateService.findTemplate(0, "Macros", "0.1", 0)
     val workflow = template.flatMap(_.getWorkflow("macros")).get
     val steps = workflow.embody(Map())
-    expectResult(5)(steps.regular.size)
+    expectResult(6)(steps.regular.size)
     val initialPhase: Option[StepBuilder] = steps.regular.find(_.phase == "auto_0")
     val secondPhase: Option[StepBuilder] = steps.regular.find(_.phase == "auto_1")
     assert(initialPhase.isDefined)
     assert(initialPhase.get.getPrecedingPhases.isEmpty)
     assert(secondPhase.isDefined)
     assert(secondPhase.get.getPrecedingPhases.contains("auto_0"))
     steps.regular.zip(Seq("Static", "Passed from macro call",
-        "Set with map", "default", "Set from constant")).map({
+        "Set with map", "default", "Set from constant", "Call from closure")).map({
       case (step, message) => step.newStep.actualStep match {
         case nothing: DoNothingStep => expectResult(message)(nothing.name)
       }