Change to data interfaces, as well as prepare to rewrite parser

1 files changed, 0 insertions, 136 deletions

diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTInliner.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTInliner.java
deleted file mode 100644
index ef4a904..0000000
--- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTInliner.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package bjc.dicelang.ast;
-
-import java.util.function.Function;
-
-import bjc.dicelang.ast.nodes.DiceASTType;
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.nodes.VariableDiceNode;
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.FunctionalMap;
-import bjc.utils.parserutils.AST;
-
-/**
- * Inline references in a dice AST, replacing variable references with what
- * the variables refer to
- * 
- * @author ben
- *
- */
-public class DiceASTInliner {
-	private static class NodeInliner
-			implements Function<IDiceASTNode, AST<IDiceASTNode>> {
-		private FunctionalMap<String, AST<IDiceASTNode>> enviroment;
-
-		public NodeInliner(FunctionalMap<String, AST<IDiceASTNode>> env) {
-			enviroment = env;
-		}
-
-		@Override
-		public AST<IDiceASTNode> apply(IDiceASTNode nod) {
-			if (nod.getType() == DiceASTType.VARIABLE) {
-				return expandNode((VariableDiceNode) nod);
-			} else {
-				return new AST<>(nod);
-			}
-		}
-
-		protected AST<IDiceASTNode>
-				expandNode(VariableDiceNode variableNode) {
-			String varName = variableNode.getVariable();
-
-			if (!enviroment.containsKey(varName)) {
-				throw new IllegalArgumentException(
-						"Attempted to freeze reference"
-								+ " to an undefined variable " + varName);
-			}
-
-			return enviroment.get(varName);
-		}
-	}
-
-	private static final class SelectiveInliner extends NodeInliner {
-
-		private FunctionalList<String> variableNames;
-
-		public SelectiveInliner(
-				FunctionalMap<String, AST<IDiceASTNode>> env,
-				FunctionalList<String> varNames) {
-			super(env);
-
-			variableNames = varNames;
-		}
-
-		@Override
-		protected AST<IDiceASTNode>
-				expandNode(VariableDiceNode variableNode) {
-			if (variableNames.contains(variableNode.getVariable())) {
-				return super.expandNode(variableNode);
-			} else {
-				return new AST<>(variableNode);
-			}
-		}
-	}
-
-	/**
-	 * Inline the references in an AST
-	 * 
-	 * @param tree
-	 *            The tree to inline references in
-	 * @param env
-	 *            The enviroment to get reference values from
-	 * @return The tree with references inlined
-	 */
-	public static AST<IDiceASTNode> inlineAST(AST<IDiceASTNode> tree,
-			FunctionalMap<String, AST<IDiceASTNode>> env) {
-		return selectiveInline(tree, env);
-	}
-
-	/**
-	 * Inline the references in an expression backed by an AST
-	 * 
-	 * @param tree
-	 *            The tree-backed expression to inline references in
-	 * @param env
-	 *            The enviroment to get reference values from
-	 * @return The tree with references inlined
-	 */
-	public static AST<IDiceASTNode> inlineAST(DiceASTExpression tree,
-			FunctionalMap<String, DiceASTExpression> env) {
-		return inlineAST(tree.getAst(),
-				env.mapValues(expression -> expression.getAst()));
-	}
-
-	/**
-	 * Inline references to specified variables
-	 * 
-	 * @param tree
-	 *            The tree-backed expression to inline references in
-	 * @param env
-	 *            The enviroment to resolve variables against
-	 * @param varNames
-	 *            The names of the variables to inline
-	 * @return An AST with the specified variables inlined
-	 */
-	public static AST<IDiceASTNode> selectiveInline(AST<IDiceASTNode> tree,
-			FunctionalMap<String, AST<IDiceASTNode>> env,
-			String... varNames) {
-		return selectiveInline(tree, env, new FunctionalList<>(varNames));
-	}
-
-	/**
-	 * Inline references to specified variables
-	 * 
-	 * @param tree
-	 *            The tree-backed expression to inline references in
-	 * @param env
-	 *            The enviroment to resolve variables against
-	 * @param varNames
-	 *            The names of the variables to inline
-	 * @return An AST with the specified variables inline
-	 */
-	public static AST<IDiceASTNode> selectiveInline(AST<IDiceASTNode> tree,
-			FunctionalMap<String, AST<IDiceASTNode>> env,
-			FunctionalList<String> varNames) {
-		return tree.expand(new SelectiveInliner(env, varNames));
-	}
-}
\ No newline at end of file