From 09683c66abe21884e0ce036807e736887aa039c2 Mon Sep 17 00:00:00 2001 From: wurstbroteater Date: Thu, 11 Feb 2021 10:32:02 +0100 Subject: [PATCH] started refactoring to new lib --- .../variantsync/core/ast/{ => data}/AST.java | 19 ++++++++++++++----- .../core/ast/{ => parser}/JsonParserAST.java | 4 ++-- .../ast/{ => parser}/LineBasedParser.java | 5 ++++- .../java/de/variantsync/core/ASTTest.java | 2 +- .../de/variantsync/core/JsonParserTest.java | 4 ++-- .../variantsync/core/LineBasedParserTest.java | 4 ++-- 6 files changed, 25 insertions(+), 13 deletions(-) rename de.variantsync.core/src/main/java/de/variantsync/core/ast/{ => data}/AST.java (87%) rename de.variantsync.core/src/main/java/de/variantsync/core/ast/{ => parser}/JsonParserAST.java (94%) rename de.variantsync.core/src/main/java/de/variantsync/core/ast/{ => parser}/LineBasedParser.java (92%) diff --git a/de.variantsync.core/src/main/java/de/variantsync/core/ast/AST.java b/de.variantsync.core/src/main/java/de/variantsync/core/ast/data/AST.java similarity index 87% rename from de.variantsync.core/src/main/java/de/variantsync/core/ast/AST.java rename to de.variantsync.core/src/main/java/de/variantsync/core/ast/data/AST.java index 4dcbd09..fd4168d 100644 --- a/de.variantsync.core/src/main/java/de/variantsync/core/ast/AST.java +++ b/de.variantsync.core/src/main/java/de/variantsync/core/ast/data/AST.java @@ -1,4 +1,4 @@ -package de.variantsync.core.ast; +package de.variantsync.core.ast.data; import java.util.*; @@ -24,8 +24,19 @@ public class AST { private final String INDENT_STRING = " "; /** - * TODO: - sanity check like: A Directory can't have direct child Line or Lines are always leaf nodes - add - toString - equals - compareTo ? - hash ? - - * toList ? - size - get - contains - remove

- testing + * TODO:
+ * - sanity check like: A Directory can't have direct child Line or Lines are always leaf nodes
+ * - add
+ * - toString
+ * - equals
+ * - compareTo ?
+ * - hash ?
+ * - toList ?
+ * - size
+ * - get
+ * - contains
+ * - remove
+ * - testing
*/ @Override @@ -38,8 +49,6 @@ public String toString() { // result.append(value + "\n"); HashSet levelFinished = new HashSet<>(); // eg. is level 3 finished? - // levelFinished.add(level[0]); - // level[0]++; toString(result, this, level, levelFinished, false); } diff --git a/de.variantsync.core/src/main/java/de/variantsync/core/ast/JsonParserAST.java b/de.variantsync.core/src/main/java/de/variantsync/core/ast/parser/JsonParserAST.java similarity index 94% rename from de.variantsync.core/src/main/java/de/variantsync/core/ast/JsonParserAST.java rename to de.variantsync.core/src/main/java/de/variantsync/core/ast/parser/JsonParserAST.java index 310fbbf..80abf49 100644 --- a/de.variantsync.core/src/main/java/de/variantsync/core/ast/JsonParserAST.java +++ b/de.variantsync.core/src/main/java/de/variantsync/core/ast/parser/JsonParserAST.java @@ -1,4 +1,4 @@ -package de.variantsync.core.ast; +package de.variantsync.core.ast.parser; import java.io.IOException; import java.lang.reflect.Type; @@ -8,7 +8,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import de.variantsync.core.ast.AST; +import de.variantsync.core.ast.data.AST; import de.variantsync.core.interfaces.Grammar; public class JsonParserAST { diff --git a/de.variantsync.core/src/main/java/de/variantsync/core/ast/LineBasedParser.java b/de.variantsync.core/src/main/java/de/variantsync/core/ast/parser/LineBasedParser.java similarity index 92% rename from de.variantsync.core/src/main/java/de/variantsync/core/ast/LineBasedParser.java rename to de.variantsync.core/src/main/java/de/variantsync/core/ast/parser/LineBasedParser.java index b0a1aad..97e7deb 100644 --- a/de.variantsync.core/src/main/java/de/variantsync/core/ast/LineBasedParser.java +++ b/de.variantsync.core/src/main/java/de/variantsync/core/ast/parser/LineBasedParser.java @@ -1,4 +1,7 @@ -package de.variantsync.core.ast; +package de.variantsync.core.ast.parser; + +import de.variantsync.core.ast.data.AST; +import de.variantsync.core.ast.LineGrammar; import java.io.IOException; import java.nio.file.DirectoryStream; diff --git a/de.variantsync.core/src/test/java/de/variantsync/core/ASTTest.java b/de.variantsync.core/src/test/java/de/variantsync/core/ASTTest.java index 81d4de4..ae0d52f 100644 --- a/de.variantsync.core/src/test/java/de/variantsync/core/ASTTest.java +++ b/de.variantsync.core/src/test/java/de/variantsync/core/ASTTest.java @@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals; import java.util.Arrays; -import de.variantsync.core.ast.AST; +import de.variantsync.core.ast.data.AST; import de.variantsync.core.ast.LineGrammar; import org.junit.Before; import org.junit.Test; diff --git a/de.variantsync.core/src/test/java/de/variantsync/core/JsonParserTest.java b/de.variantsync.core/src/test/java/de/variantsync/core/JsonParserTest.java index 41da52f..23cf283 100644 --- a/de.variantsync.core/src/test/java/de/variantsync/core/JsonParserTest.java +++ b/de.variantsync.core/src/test/java/de/variantsync/core/JsonParserTest.java @@ -7,8 +7,8 @@ import java.nio.file.Path; import java.util.Arrays; -import de.variantsync.core.ast.AST; -import de.variantsync.core.ast.JsonParserAST; +import de.variantsync.core.ast.data.AST; +import de.variantsync.core.ast.parser.JsonParserAST; import de.variantsync.core.ast.LineGrammar; import org.junit.Before; import org.junit.Test; diff --git a/de.variantsync.core/src/test/java/de/variantsync/core/LineBasedParserTest.java b/de.variantsync.core/src/test/java/de/variantsync/core/LineBasedParserTest.java index 46b82b7..078e2de 100644 --- a/de.variantsync.core/src/test/java/de/variantsync/core/LineBasedParserTest.java +++ b/de.variantsync.core/src/test/java/de/variantsync/core/LineBasedParserTest.java @@ -7,8 +7,8 @@ import java.nio.file.Paths; import java.util.Arrays; -import de.variantsync.core.ast.AST; -import de.variantsync.core.ast.LineBasedParser; +import de.variantsync.core.ast.data.AST; +import de.variantsync.core.ast.parser.LineBasedParser; import de.variantsync.core.ast.LineGrammar; import org.junit.Before; import org.junit.Rule;