Fixed issue where macros couldn't be called twice

src/main/java/com/mitchellbosecke/pebble/node/NodeMacro.java

@@ -45,7 +45,7 @@ public void compileGetNameMethod(Compiler compiler) {
 	}
 
 	public void compileInit(Compiler compiler) {
-		compiler.write("public void init(){").indent();
+		compiler.write("public void init(){").indent().newline();
 
 		for (NodeExpression arg : args.getArgs()) {
 			NodeExpressionDeclaration variableDeclaration = (NodeExpressionDeclaration) arg;

src/main/java/com/mitchellbosecke/pebble/template/PebbleTemplateImpl.java

@@ -119,6 +119,7 @@ protected Object getAttribute(Context context, Object object, String attribute,
 
 	public void registerMacro(Macro macro) {
 		macros.put(macro.getName(), macro);
+		macro.init();
 	}
 
 	public boolean hasMacro(String macroName) {
@@ -143,7 +144,6 @@ public String macro(String macroName, Context context, Object... args) throws Pe
 			found = true;
 			Macro macro = macros.get(macroName);
 
-			macro.init();
 			result = macro.call(context, args);
 		}
 

src/test/java/com/mitchellbosecke/pebble/CoreTagsTest.java

@@ -128,8 +128,23 @@ public void testMacro() throws PebbleException, IOException {
 
 		Writer writer = new StringWriter();
 		template.evaluate(writer);
-		assertEquals("	<input name=\"company\" value=\"forcorp\" type=\"text\" />\n",
-				writer.toString());
+		assertEquals("	<input name=\"company\" value=\"google\" type=\"text\" />\n", writer.toString());
+	}
+
+	/**
+	 * There was an issue where the second invokation of a macro
+	 * did not have access to the original arguments any more.
+	 * 
+	 * @throws PebbleException
+	 * @throws IOException
+	 */
+	@Test
+	public void testMacroInvokedTwice() throws PebbleException, IOException {
+		PebbleTemplate template = pebble.compile("template.macroDouble.peb");
+
+		Writer writer = new StringWriter();
+		template.evaluate(writer);
+		assertEquals("onetwo", writer.toString());
 	}
 
 	/**

src/test/resources/templates/template.macro1.peb

@@ -1,4 +1,4 @@
-{{ input("company", "forcorp", "text") }}
+{{ input("company", "google", "text") }}
 {% macro input(name, value, type) %}
 	<input name="{{ name }}" value="{{ value }}" type="{{ type }}" />
 {% endmacro %}

src/test/resources/templates/template.macroDouble.peb

@@ -0,0 +1,5 @@
+{{ repeat('one') }}
+{{ repeat('two') }}
+{% macro repeat(input) %}
+{{ input }}
+{% endmacro %}