Restructure for object construction

src/main/java/builders/Compiler.java → src/main/java/component_construction/Compiler.java

@@ -1,4 +1,4 @@
-package builders;
+package component_construction;
 
 import code_generation.CodeGenerator;
 import grammar_objects.Token;

src/main/java/builders/ParameterError.java → src/main/java/component_construction/ParameterError.java

@@ -1,4 +1,4 @@
-package builders;
+package component_construction;
 
 public class ParameterError extends RuntimeException {
     public ParameterError(String message) {

src/main/java/builders/CompilerBuilder.java → src/main/java/component_construction/builders/CompilerBuilder.java

@@ -1,12 +1,17 @@
-package builders;
+package component_construction.builders;
 
 import java.util.*;
 
-import builders.bundles.GrammarBundle;
 import grammar_objects.*;
 import lexical_analysis.*;
 import syntax_analysis.SyntaxAnalyser;
 import code_generation.CodeGenerator;
+import component_construction.Compiler;
+import component_construction.ParameterError;
+import component_construction.bundles.GrammarBundle;
+import component_construction.factories.code_generation.CodeGeneratorFactory;
+import component_construction.factories.lexical_analysis.LexicalAnalyserFactory;
+import component_construction.factories.syntax_analysis.SyntaxAnalyserFactory;
 
 public class CompilerBuilder {
     protected LexicalAnalyserFactory lexicalAnalyserFactory;

src/main/java/builders/bundles/GrammarBundle.java → src/main/java/component_construction/bundles/GrammarBundle.java

@@ -1,4 +1,4 @@
-package builders.bundles;
+package component_construction.bundles;
 
 import grammar_objects.*;
 import lexical_analysis.DynamicTokenRegex;

src/main/java/builders/bundles/LexicalBundle.java → src/main/java/component_construction/bundles/LexicalBundle.java

@@ -1,4 +1,4 @@
-package builders.bundles;
+package component_construction.bundles;
 
 import lexical_analysis.DynamicTokenRegex;
 

src/main/java/builders/concrete_factories/BasicCodeGenFactory.java → src/main/java/component_construction/factories/code_generation/BasicCodeGenFactory.java

@@ -1,6 +1,5 @@
-package builders.concrete_factories;
+package component_construction.factories.code_generation;
 
-import builders.CodeGeneratorFactory;
 import code_generation.*;
 import grammar_objects.RuleConvertor;
 

src/main/java/builders/CodeGeneratorFactory.java → src/main/java/component_construction/factories/code_generation/CodeGeneratorFactory.java

@@ -1,4 +1,4 @@
-package builders;
+package component_construction.factories.code_generation;
 
 import code_generation.CodeGenerator;
 import grammar_objects.RuleConvertor;

src/main/java/builders/concrete_factories/BNFConvertor.java → src/main/java/component_construction/factories/grammar/BNFConvertor.java

@@ -1,8 +1,7 @@
-package builders.concrete_factories;
+package component_construction.factories.grammar;
 
 import java.util.*;
 
-import builders.GrammarFactory;
 import grammar_objects.*;
 
 import java.util.regex.Matcher;

src/main/java/builders/GrammarFactory.java → src/main/java/component_construction/factories/grammar/GrammarFactory.java

@@ -1,4 +1,4 @@
-package builders;
+package component_construction.factories.grammar;
 
 import grammar_objects.Grammar;
 

src/main/java/builders/concrete_factories/GeneralLexicalAnalyserFactory.java → src/main/java/component_construction/factories/lexical_analysis/GeneralLexicalAnalyserFactory.java

@@ -1,6 +1,5 @@
-package builders.concrete_factories;
+package component_construction.factories.lexical_analysis;
 
-import builders.LexicalAnalyserFactory;
 import lexical_analysis.*;
 
 public class GeneralLexicalAnalyserFactory implements LexicalAnalyserFactory {

src/main/java/builders/LexicalAnalyserFactory.java → src/main/java/component_construction/factories/lexical_analysis/LexicalAnalyserFactory.java

@@ -1,4 +1,4 @@
-package builders;
+package component_construction.factories.lexical_analysis;
 
 import lexical_analysis.*;
 

src/main/java/builders/concrete_factories/CLR1ParserFactory.java → src/main/java/component_construction/factories/syntax_analysis/CLR1ParserFactory.java

@@ -1,6 +1,5 @@
-package builders.concrete_factories;
+package component_construction.factories.syntax_analysis;
 
-import builders.SyntaxAnalyserFactory;
 import grammar_objects.GrammarParts;
 import syntax_analysis.*;
 

src/main/java/builders/SyntaxAnalyserFactory.java → src/main/java/component_construction/factories/syntax_analysis/SyntaxAnalyserFactory.java

@@ -1,4 +1,4 @@
-package builders;
+package component_construction.factories.syntax_analysis;
 
 import grammar_objects.*;
 import syntax_analysis.SyntaxAnalyser;

src/test/java/builders/CompilerTests.java → src/test/java/component_construction/CompilerTests.java

@@ -1,11 +1,14 @@
-package builders;
+package component_construction;
 import static org.junit.jupiter.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
 
+import component_construction.builders.CompilerBuilder;
+import component_construction.factories.code_generation.BasicCodeGenFactory;
+import component_construction.factories.lexical_analysis.GeneralLexicalAnalyserFactory;
+import component_construction.factories.syntax_analysis.CLR1ParserFactory;
 import grammars.basic_identifier.BasicIdentifierGrammar;
 import grammars.basic_identifier.convertors.XToYToXSemantic;
-import builders.concrete_factories.*;
 import lexical_analysis.DynamicTokenRegex;
 import syntax_analysis.parsing.ParseFailedException;
 import test_aids.GrammarType;

src/test/java/builders/CompilerBuilderTests.java → src/test/java/component_construction/builders/CompilerBuilderTests.java

@@ -1,9 +1,12 @@
-package builders;
+package component_construction.builders;
 import static org.junit.jupiter.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
 
-import builders.concrete_factories.*;
+import component_construction.ParameterError;
+import component_construction.factories.code_generation.BasicCodeGenFactory;
+import component_construction.factories.lexical_analysis.GeneralLexicalAnalyserFactory;
+import component_construction.factories.syntax_analysis.CLR1ParserFactory;
 import grammars.basic_identifier.BasicIdentifierGrammar;
 import grammars.basic_identifier.convertors.XToYToXSemantic;
 import lexical_analysis.DynamicTokenRegex;

src/test/java/builders/concrete_factories/BNFConvertorTests.java → src/test/java/component_construction/factories/grammar/BNFConvertorTests.java

@@ -1,8 +1,8 @@
-package builders.concrete_factories;
+package component_construction.factories.grammar;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
-import builders.concrete_factories.BNFConvertor.InvalidEscapeCharacterException;
+import component_construction.factories.grammar.BNFConvertor.InvalidEscapeCharacterException;
 import grammar_objects.*;
 
 public class BNFConvertorTests {