From ca37dcd305e3d5b322b0e502e9ebd83cdc33b990 Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Fri, 27 Oct 2017 12:48:58 -0300 Subject: Add extraneous space remove for punctuation --- RGens/src/main/java/bjc/rgens/newparser/RGrammar.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'RGens/src/main/java/bjc/rgens') diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java index 17f6d43..0ac0a16 100644 --- a/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java +++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammar.java @@ -177,7 +177,22 @@ public class RGrammar { generateCase(start, new GenerationState(contents, rnd, vars)); - return contents.toString().replaceAll("\\s+", " "); + String body = contents.toString(); + + /* + * Collapse duplicate spaces. + */ + body = body.replaceAll("\\s+", " "); + + /* + * Remove extraneous spaces around punctutation marks. + * + * This can be done in the grammars, but it is very tedious to + * do so. + */ + body = body.replaceAll(" ([,:().'\"\\[\\]/]) ", "$1 "); + + return body; } /* Generate a rule case. */ -- cgit v1.2.3