There were some Parser duties that were being mushed into the CommentScript for no good reason.

Author: nedtwigg

src/main/java/com/diffplug/freshmark/CommentScript.java

@@ -78,7 +78,7 @@ protected CommentScript(String intron, String exon, String regex) {
 	final Parser parser;
 
 	/** Compiles a single section/script/input combo into the appropriate output. */
-	final Parser.Compiler compiler = new Parser.Compiler() {
+	final Parser.SectionCompiler compiler = new Parser.SectionCompiler() {
 		@Override
 		public String compileSection(String section, String script, String input) {
 			return Errors.rethrow().get(() -> {
@@ -90,20 +90,7 @@ public String compileSection(String section, String script, String input) {
 				engine.put("input", input);
 				// evaluate the script and get the result
 				engine.eval(templatedProgram);
-				String compiled = Check.cast(engine.get("output"), String.class);
-				// make sure that the compiled output starts and ends with a newline,
-				// so that the tags stay separated separated nicely
-				if (!compiled.startsWith("\n")) {
-					compiled = "\n" + compiled;
-				}
-				if (!compiled.endsWith("\n")) {
-					compiled = compiled + "\n";
-				}
-				return parser.intron + " " + section + "\n" +
-						script +
-						parser.exon +
-						compiled +
-						parser.intron + " /" + section + " " + parser.exon;
+				return Check.cast(engine.get("output"), String.class);
 			});
 		}
 	};

src/main/java/com/diffplug/freshmark/CommentScriptMustache.java

@@ -57,13 +57,15 @@ protected CommentScriptMustache(String intron, String exon, String regex) {
 		super(intron, exon, regex);
 	}
 
+	/** Replaces whatever is inside of {@code {{key}}} tags using the {@code keyToValue} function. */
 	protected String template(String section, String script) {
-		return mustacheTemplate(script, key -> keyToValue(section, script));
+		return mustacheTemplate(script, key -> keyToValue(section, key));
 	}
 
+	/** For the given section, return the templated value for the given key. */
 	protected abstract String keyToValue(String section, String script);
 
-	/** Replaces whatever is inside of {@code {{key}}} tags using the {@code keyToValue} function. */
+	/** Mustache templating. */
 	static String mustacheTemplate(String input, Function<String, String> keyToValue) {
 		Matcher matcher = MUSTACHE_PATTERN.matcher(input);
 		StringBuilder result = new StringBuilder(input.length() * 3 / 2);

src/main/java/com/diffplug/freshmark/Parser.java

@@ -33,28 +33,53 @@ class Parser {
 	/**
 	 * Given an input string, parses out the body sections from the tag sections.
 	 * 
-	 * @param input 	the raw input string
+	 * @param rawInput 	the raw input string
 	 * @param body		called for every chunk of text outside a tag
 	 * @param tag		called for every chunk of text inside a tag
 	 */
-	void bodyAndTags(String input, Consumer<String> body, Consumer<String> tag) {
-		Matcher matcher = pattern.matcher(input);
+	protected void bodyAndTags(String rawInput, Consumer<String> body, Consumer<String> tag) {
+		Matcher matcher = pattern.matcher(rawInput);
 		int last = 0;
 		while (matcher.find()) {
 			if (matcher.start() > last) {
-				body.accept(input.substring(last, matcher.start()));
+				body.accept(rawInput.substring(last, matcher.start()));
 			}
 			tag.accept(matcher.group(1));
 			last = matcher.end();
 		}
-		if (last < input.length()) {
-			body.accept(input.substring(last));
+		if (last < rawInput.length()) {
+			body.accept(rawInput.substring(last));
 		}
 	}
 
+	/**
+	 * Reassembles a section/script/output chunk back into
+	 * the full file.
+	 * 
+	 * @param section
+	 * @param script
+	 * @param output
+	 * @return
+	 */
+	protected String reassemble(String section, String script, String output) {
+		// make sure that the compiled output starts and ends with a newline,
+		// so that the tags stay separated separated nicely
+		if (!output.startsWith("\n")) {
+			output = "\n" + output;
+		}
+		if (!output.endsWith("\n")) {
+			output = output + "\n";
+		}
+		return intron + " " + section + "\n" +
+				script +
+				exon +
+				output +
+				intron + " /" + section + " " + exon;
+	}
+
 	/** Interface which can compile a single section of a FreshMark document. */
 	@FunctionalInterface
-	interface Compiler {
+	public interface SectionCompiler {
 		String compileSection(String section, String program, String in);
 	}
 
@@ -65,7 +90,7 @@ interface Compiler {
 	 * @param compiler	used to compile each section
 	 * @return 			the compiled output string
 	 */
-	String compile(String fullInput, Compiler compiler) {
+	public String compile(String fullInput, SectionCompiler compiler) {
 		StringBuilder result = new StringBuilder(fullInput.length() * 3 / 2);
 		/** Associates errors with the part of the input that caused it. */
 		class ErrorFormatter {
@@ -102,37 +127,37 @@ private int countNewlines(String str) {
 		class State {
 			/** The section for which we're looking for a close tag. */
 			String section;
-			/** The program for that section. */
-			String program;
-			/** The raw input which will be passed to the program. */
+			/** The script for that section. */
+			String script;
+			/** The raw input which will be passed to the script. */
 			String input;
 
 			void body(String body) {
 				assert(input == null);
 				if (section == null) {
-					assert(program == null);
+					assert(script == null);
 					result.append(body);
 				} else {
-					assert(program != null);
+					assert(script != null);
 					input = body;
 				}
 			}
 
 			void tag(String tag) {
 				if (section == null) {
-					assert(program == null);
+					assert(script == null);
 					assert(input == null);
 					// we were looking for an open tag, and now we've got one
 					int firstLine = tag.indexOf('\n');
 					if (firstLine < 0 || tag.length() <= firstLine) {
-						throw new IllegalArgumentException("Section doesn't contain a program.");
+						throw new IllegalArgumentException("Section doesn't contain a script.");
 					}
 					// the section name is the first line (trimmed)
 					section = tag.substring(0, firstLine).trim();
-					// the program is the second line
-					program = tag.substring(firstLine + 1);
+					// the script is the second line
+					script = tag.substring(firstLine + 1);
 				} else {
-					assert(program != null);
+					assert(script != null);
 					assert(input != null);
 					// we were looking for a close tag
 					String closing = tag.trim();
@@ -141,11 +166,12 @@ void tag(String tag) {
 						throw new IllegalArgumentException("Expecting '/" + section + "'");
 					}
 					// and we found one!  compile it and accumulate the result
-					String chunk = compiler.compileSection(section, program, input);
-					result.append(chunk);
+					String compiled = compiler.compileSection(section, script, input);
+					String reassembled = reassemble(section, script, compiled);
+					result.append(reassembled);
 					// wipe the state
 					section = null;
-					program = null;
+					script = null;
 					input = null;
 				}
 			}

src/test/java/com/diffplug/freshmark/ParserTest.java

@@ -20,8 +20,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.diffplug.common.base.StringPrinter;
-
 public class ParserTest {
 	static final Parser freshmarkParser = new FreshMark(null, null).parser;
 
@@ -58,15 +56,7 @@ public void testCompileNoTags() {
 
 	@Test
 	public void testCompileWiring() {
-		testCaseCompileSuccess("simple.txt", StringPrinter.buildStringFromLines(
-				"Some stuff",
-				"Nothing special",
-				"section: simple",
-				"program: output = 'BLOOPEY\\n' + input + 'DOOP\\n';",
-				"input: ",
-				"Does this work?",
-				"",
-				"Why yes!  Yes it does."));
+		testCaseCompileSuccess("simple.txt", TestResource.getTestResource("simple_compiled.txt"));
 	}
 
 	static void testCaseCompileSuccess(String file, String expected) {
@@ -90,7 +80,7 @@ public void testCompileMismatched() {
 
 	@Test
 	public void testCompileNoProgram() {
-		testCaseCompileError("noprogram.txt", "Error on line 3: Section doesn't contain a program.");
+		testCaseCompileError("noprogram.txt", "Error on line 3: Section doesn't contain a script.");
 	}
 
 	static void testCaseCompileError(String file, String expected) {

src/test/resources/simple_compiled.txt

@@ -0,0 +1,11 @@
+Some stuff
+Nothing special
+<!---freshmark simple
+output = 'BLOOPEY\n' + input + 'DOOP\n';
+-->
+section: simple
+program: output = 'BLOOPEY\n' + input + 'DOOP\n';
+input: 
+Does this work?
+<!---freshmark /simple -->
+Why yes!  Yes it does.