From 44a8d9d2d56a311293ec86ea40df7126748300a1 Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Thu, 7 Jun 2018 20:37:51 -0300 Subject: Refactoring The main refactoring here is removing the type field from the various classes, but there are a few other smaller ones. This also contains the grounds for a refactoring on variable use --- .../parser/elements/vars/VariableElement.java | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java (limited to 'src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java') diff --git a/src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java b/src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java new file mode 100644 index 0000000..7a4260f --- /dev/null +++ b/src/main/java/bjc/rgens/parser/elements/vars/VariableElement.java @@ -0,0 +1,59 @@ +package bjc.rgens.parser.elements.vars; + +import bjc.rgens.parser.GenerationState; +import bjc.rgens.parser.GrammarException; + +import java.util.ArrayList; +import java.util.List; + +public abstract class VariableElement { + public abstract void generate(GenerationState state); + + public static List parseVariableElements(String varElm) { + boolean forbidSpaces = varElm.contains("-"); + + String[] parts; + + if(forbidSpaces) { + parts = varElm.split("(?<=[+-])|(?=[+-])"); + } else { + parts = new String[] { varElm }; + } + + return parseVariableElements(forbidSpaces, parts); + } + + public static List parseVariableElements(boolean forbidSpaces, String... parts) { + List elms = new ArrayList<>(parts.length); + + VariableElement prevElement = null; + + for (String part : parts) { + VariableElement elm = null; + + if(part.startsWith("$")) { + elm = new VRefVariableElement(forbidSpaces, part.substring(1)); + } else if (part.startsWith("@")) { + elm = new ARefVariableElement(forbidSpaces, part.substring(1)); + } else if (part.startsWith("%")) { + elm = new RRefVariableElement(forbidSpaces, part.substring(1)); + } else if (part.startsWith("/")) { + throw new GrammarException("Template variables aren't implemented yet"); + } else { + if(prevElement instanceof LiteralVariableElement) { + /* Aggregate chain literals together */ + ((LiteralVariableElement)prevElement).val += elm; + } else { + elm = new LiteralVariableElement(part); + } + } + + if(elm != null) { + elms.add(elm); + prevElement = elm; + } + } + + return elms; + } +} -- cgit v1.2.3