From c7fbd761c1cc8a8a553f79463ecb8dd02c43d0f8 Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Thu, 6 Sep 2018 16:26:40 -0300 Subject: Convert GenerationState.contents to private This is to prepare for replacing contents with a ReportWriter --- src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java | 4 ++-- .../java/bjc/rgens/parser/elements/vars/LiteralVariableElement.java | 2 +- src/main/java/bjc/rgens/parser/elements/vars/RRefVariableElement.java | 4 ++-- src/main/java/bjc/rgens/parser/elements/vars/VRefVariableElement.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/bjc/rgens/parser/elements/vars') diff --git a/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java index 99af354..17db660 100644 --- a/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java +++ b/src/main/java/bjc/rgens/parser/elements/vars/ARefVariableElement.java @@ -20,8 +20,8 @@ public class ARefVariableElement extends VariableElement { rl.generate(newState); - String res = newState.contents.toString(); + String res = newState.getContents(); - state.contents.append(res); + state.appendContents(res); } } diff --git a/src/main/java/bjc/rgens/parser/elements/vars/LiteralVariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/LiteralVariableElement.java index cf33c66..e7415f5 100644 --- a/src/main/java/bjc/rgens/parser/elements/vars/LiteralVariableElement.java +++ b/src/main/java/bjc/rgens/parser/elements/vars/LiteralVariableElement.java @@ -12,6 +12,6 @@ public class LiteralVariableElement extends VariableElement { } public void generate(GenerationState state) { - state.contents.append(val); + state.appendContents(val); } } diff --git a/src/main/java/bjc/rgens/parser/elements/vars/RRefVariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/RRefVariableElement.java index 5c0a768..e81e9f8 100644 --- a/src/main/java/bjc/rgens/parser/elements/vars/RRefVariableElement.java +++ b/src/main/java/bjc/rgens/parser/elements/vars/RRefVariableElement.java @@ -23,12 +23,12 @@ public class RRefVariableElement extends VariableElement { rl.generate(newState); - String res = newState.contents.toString(); + String res = newState.getContents(); if(forbidSpaces && res.contains(" ")) { throw new GrammarException(String.format("Spaces not allowed in this context (rule-reference %s)", state)); } - state.contents.append(res); + state.appendContents(res); } } diff --git a/src/main/java/bjc/rgens/parser/elements/vars/VRefVariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/VRefVariableElement.java index 1facd38..e65d876 100644 --- a/src/main/java/bjc/rgens/parser/elements/vars/VRefVariableElement.java +++ b/src/main/java/bjc/rgens/parser/elements/vars/VRefVariableElement.java @@ -19,6 +19,6 @@ public class VRefVariableElement extends VariableElement { throw new GrammarException(String.format("Cannot include variable %s w/ spaces in body in rule name", nam)); } - state.contents.append(strang); + state.appendContents(strang); } } -- cgit v1.2.3