Move stuff about

MightyHelper · MightyHelper · commit b238633fbd7b · 2023-05-16T12:35:41.000-03:00
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/main/java/ko/carbonel/Utils.java b/src/main/java/ko/carbonel/Utils.java
@@ -2,7 +2,7 @@
 
 import ko.carbonel.compiler.config.ArgumentName;
 import ko.carbonel.compiler.config.Config;
-import ko.carbonel.compiler.intermediate.tinyRust.AttributeEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.AttributeEntry;
 import ko.carbonel.compiler.runner.TermFont;
 import ko.carbonel.compiler.stream.lexer.LexerToken;
 import ko.carbonel.syntax.grammar.algorithm.Factorizer;
diff --git a/src/main/java/ko/carbonel/compiler/exception/semantic/FieldRedeclaredError.java b/src/main/java/ko/carbonel/compiler/exception/semantic/FieldRedeclaredError.java
@@ -1,7 +1,7 @@
 package ko.carbonel.compiler.exception.semantic;
 
 
-import ko.carbonel.compiler.intermediate.tinyRust.VariableEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.VariableEntry;
 import ko.carbonel.compiler.stream.reader.FileLocation;
 
 import java.util.List;
diff --git a/src/main/java/ko/carbonel/compiler/exception/semantic/MethodOverrideError.java b/src/main/java/ko/carbonel/compiler/exception/semantic/MethodOverrideError.java
@@ -1,6 +1,6 @@
 package ko.carbonel.compiler.exception.semantic;
 
-import ko.carbonel.compiler.intermediate.tinyRust.MethodEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.MethodEntry;
 import ko.carbonel.compiler.stream.reader.FileLocation;
 
 public class MethodOverrideError extends SemanticError {
diff --git a/src/main/java/ko/carbonel/compiler/exception/semantic/ParameterCountMismatchError.java b/src/main/java/ko/carbonel/compiler/exception/semantic/ParameterCountMismatchError.java
@@ -1,6 +1,6 @@
 package ko.carbonel.compiler.exception.semantic;
 
-import ko.carbonel.compiler.intermediate.tinyRust.MethodEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.MethodEntry;
 
 public class ParameterCountMismatchError extends MethodOverrideError {
 	public ParameterCountMismatchError(MethodEntry inherited, MethodEntry local) {
diff --git a/src/main/java/ko/carbonel/compiler/exception/semantic/ParameterTypeMismatchError.java b/src/main/java/ko/carbonel/compiler/exception/semantic/ParameterTypeMismatchError.java
@@ -1,6 +1,6 @@
 package ko.carbonel.compiler.exception.semantic;
 
-import ko.carbonel.compiler.intermediate.tinyRust.MethodEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.MethodEntry;
 
 public class ParameterTypeMismatchError extends MethodOverrideError {
 	public ParameterTypeMismatchError(MethodEntry inherited, MethodEntry local, int i) {
diff --git a/src/main/java/ko/carbonel/compiler/exception/semantic/ReturnTypeMismatchError.java b/src/main/java/ko/carbonel/compiler/exception/semantic/ReturnTypeMismatchError.java
@@ -1,6 +1,6 @@
 package ko.carbonel.compiler.exception.semantic;
 
-import ko.carbonel.compiler.intermediate.tinyRust.MethodEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.MethodEntry;
 
 public class ReturnTypeMismatchError extends MethodOverrideError {
 	public ReturnTypeMismatchError(MethodEntry inherited, MethodEntry local) {
diff --git a/src/main/java/ko/carbonel/compiler/exception/semantic/StaticOverrideError.java b/src/main/java/ko/carbonel/compiler/exception/semantic/StaticOverrideError.java
@@ -1,6 +1,6 @@
 package ko.carbonel.compiler.exception.semantic;
 
-import ko.carbonel.compiler.intermediate.tinyRust.MethodEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.MethodEntry;
 
 public class StaticOverrideError extends MethodOverrideError {
 	public StaticOverrideError(MethodEntry inherited, MethodEntry local) {
diff --git a/src/main/java/ko/carbonel/compiler/exception/semantic/SuperclassNotExtendableError.java b/src/main/java/ko/carbonel/compiler/exception/semantic/SuperclassNotExtendableError.java
@@ -1,6 +1,6 @@
 package ko.carbonel.compiler.exception.semantic;
 
-import ko.carbonel.compiler.intermediate.tinyRust.TypeEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.TypeEntry;
 
 public class SuperclassNotExtendableError extends SemanticError {
 	public SuperclassNotExtendableError(TypeEntry superClass) {
diff --git a/src/main/java/ko/carbonel/compiler/generated/AttrTinyRustParser.java b/src/main/java/ko/carbonel/compiler/generated/AttrTinyRustParser.java
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/TSSerializer.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/TSSerializer.java
@@ -1,5 +1,9 @@
 package ko.carbonel.compiler.intermediate.tinyRust;
 
+import ko.carbonel.compiler.intermediate.tinyRust.ts.ClassEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.MethodEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.TypeEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.VariableEntry;
 import ko.carbonel.compiler.runner.TermFont;
 import ko.carbonel.json.PrettyJsonSerializer;
 
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/TinyRustSymbolTable.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/TinyRustSymbolTable.java
@@ -3,7 +3,11 @@
 import ko.carbonel.Logger;
 import ko.carbonel.compiler.exception.semantic.MethodRedeclaredError;
 import ko.carbonel.compiler.intermediate.SymbolTable;
-import ko.carbonel.compiler.intermediate.tinyRust.ast.*;
+import ko.carbonel.compiler.intermediate.tinyRust.ast.expression.*;
+import ko.carbonel.compiler.intermediate.tinyRust.ast.statement.*;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.ClassEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.MethodEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.ts.TypeEntry;
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustTokenType;
 import ko.carbonel.json.SerializeClass;
@@ -16,7 +20,7 @@
 import static ko.carbonel.json.SerializeClass.TS;
 
 public final class TinyRustSymbolTable implements SymbolTable {
-	static final String OBJECT = "Object";
+	public static final String OBJECT = "Object";
 	static final String STR = "Str";
 	static final String CHAR = "Char";
 	static final String BOOL = "Bool";
@@ -348,4 +352,10 @@ public void endMethodCall(){
 			Logger.output("Method call: " + methodCall);
 		}, it->it.arguments!=null);
 	}
+	@CalledByParser
+	public void expNew(){
+		NewExpressionEntry exp = new NewExpressionEntry();
+		expressionStack.push(exp);
+		Logger.output("New expression: " + exp);
+	}
 }
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/AttributeAccessEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/AttributeAccessEntry.java
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/EmptyStatementEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/EmptyStatementEntry.java
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/ExpressionEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/ExpressionEntry.java
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/MethodAccessEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/MethodAccessEntry.java
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/ReturnStatementEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/ReturnStatementEntry.java
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/StatementEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/StatementEntry.java
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/ArrayAccessExpressionEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/ArrayAccessExpressionEntry.java
@@ -1,4 +1,4 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.expression;
 
 import ko.carbonel.json.SerializeClass;
 
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/AttributeAccessEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/AttributeAccessEntry.java
@@ -0,0 +1,4 @@
+package ko.carbonel.compiler.intermediate.tinyRust.ast.expression;
+
+public class AttributeAccessEntry extends ExpressionEntry {
+}
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/BinaryExpressionEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/BinaryExpressionEntry.java
@@ -1,4 +1,4 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.expression;
 
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.json.SerializeClass;
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/ChainedExpressionEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/ChainedExpressionEntry.java
@@ -1,4 +1,4 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.expression;
 
 import ko.carbonel.json.SerializeClass;
 
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/ExpressionEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/ExpressionEntry.java
@@ -0,0 +1,5 @@
+package ko.carbonel.compiler.intermediate.tinyRust.ast.expression;
+
+public class ExpressionEntry {
+
+}
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/FieldAccessEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/FieldAccessEntry.java
@@ -1,4 +1,4 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.expression;
 
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.json.SerializeClass;
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/LiteralExpressionEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/LiteralExpressionEntry.java
@@ -1,4 +1,4 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.expression;
 
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.json.SerializeClass;
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/MethodAccessEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/MethodAccessEntry.java
@@ -0,0 +1,4 @@
+package ko.carbonel.compiler.intermediate.tinyRust.ast.expression;
+
+public class MethodAccessEntry extends AttributeAccessEntry {
+}
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/MethodCallExpressionEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/MethodCallExpressionEntry.java
@@ -1,4 +1,4 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.expression;
 
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.json.SerializeClass;
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/NewExpressionEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/NewExpressionEntry.java
@@ -0,0 +1,5 @@
+package ko.carbonel.compiler.intermediate.tinyRust.ast.expression;
+
+public class NewExpressionEntry extends ExpressionEntry {
+
+}
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/UnaryExpressionEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/UnaryExpressionEntry.java
@@ -1,4 +1,4 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.expression;
 
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.json.SerializeClass;
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/AssignStatementEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/AssignStatementEntry.java
@@ -1,5 +1,6 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.statement;
 
+import ko.carbonel.compiler.intermediate.tinyRust.ast.expression.ExpressionEntry;
 import ko.carbonel.json.SerializeClass;
 
 import static ko.carbonel.json.SerializeClass.AST;
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/BlockStatementEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/BlockStatementEntry.java
@@ -1,4 +1,4 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.statement;
 
 import ko.carbonel.json.SerializeClass;
 
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/EmptyStatementEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/EmptyStatementEntry.java
@@ -0,0 +1,4 @@
+package ko.carbonel.compiler.intermediate.tinyRust.ast.statement;
+
+public class EmptyStatementEntry extends StatementEntry {
+}
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/ExpressionStatementEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/ExpressionStatementEntry.java
@@ -1,5 +1,6 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.statement;
 
+import ko.carbonel.compiler.intermediate.tinyRust.ast.expression.ExpressionEntry;
 import ko.carbonel.json.SerializeClass;
 
 import java.util.Optional;
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/IfStatementEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/IfStatementEntry.java
@@ -1,5 +1,6 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.statement;
 
+import ko.carbonel.compiler.intermediate.tinyRust.ast.expression.ExpressionEntry;
 import ko.carbonel.json.SerializeClass;
 
 import static ko.carbonel.json.SerializeClass.AST;
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/ReturnStatementEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/ReturnStatementEntry.java
@@ -0,0 +1,4 @@
+package ko.carbonel.compiler.intermediate.tinyRust.ast.statement;
+
+public class ReturnStatementEntry extends StatementEntry {
+}
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/StatementEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/StatementEntry.java
@@ -0,0 +1,4 @@
+package ko.carbonel.compiler.intermediate.tinyRust.ast.statement;
+
+public class StatementEntry {
+}
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/WhileStatementEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/statement/WhileStatementEntry.java
@@ -1,5 +1,6 @@
-package ko.carbonel.compiler.intermediate.tinyRust.ast;
+package ko.carbonel.compiler.intermediate.tinyRust.ast.statement;
 
+import ko.carbonel.compiler.intermediate.tinyRust.ast.expression.ExpressionEntry;
 import ko.carbonel.json.SerializeClass;
 
 import static ko.carbonel.json.SerializeClass.AST;
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/AttributeEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/AttributeEntry.java
@@ -1,4 +1,4 @@
-package ko.carbonel.compiler.intermediate.tinyRust;
+package ko.carbonel.compiler.intermediate.tinyRust.ts;
 
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.json.SerializeClass;
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/ChainResolver.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/ChainResolver.java
@@ -1,8 +1,9 @@
-package ko.carbonel.compiler.intermediate.tinyRust;
+package ko.carbonel.compiler.intermediate.tinyRust.ts;
 
 import ko.carbonel.compiler.exception.semantic.ChainingOnPrimitiveError;
 import ko.carbonel.compiler.exception.semantic.ClassNotFoundError;
 import ko.carbonel.compiler.exception.semantic.FieldNotFoundError;
+import ko.carbonel.compiler.intermediate.tinyRust.TinyRustSymbolTable;
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustTokenType;
 
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/ClassEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/ClassEntry.java
@@ -1,7 +1,9 @@
-package ko.carbonel.compiler.intermediate.tinyRust;
+package ko.carbonel.compiler.intermediate.tinyRust.ts;
 
 import ko.carbonel.Utils;
 import ko.carbonel.compiler.exception.semantic.*;
+import ko.carbonel.compiler.intermediate.tinyRust.CalledByParser;
+import ko.carbonel.compiler.intermediate.tinyRust.TinyRustSymbolTable;
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.json.SerializeClass;
 
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/MethodEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/MethodEntry.java
@@ -1,10 +1,12 @@
-package ko.carbonel.compiler.intermediate.tinyRust;
+package ko.carbonel.compiler.intermediate.tinyRust.ts;
 
 import ko.carbonel.Utils;
 import ko.carbonel.compiler.exception.semantic.FieldRedeclaredError;
 import ko.carbonel.compiler.exception.semantic.FormalArgumentsAreNotUniqueError;
 import ko.carbonel.compiler.exception.semantic.VariablesAreNotUniqueError;
-import ko.carbonel.compiler.intermediate.tinyRust.ast.BlockStatementEntry;
+import ko.carbonel.compiler.intermediate.tinyRust.CalledByParser;
+import ko.carbonel.compiler.intermediate.tinyRust.TinyRustSymbolTable;
+import ko.carbonel.compiler.intermediate.tinyRust.ast.statement.BlockStatementEntry;
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.json.SerializeClass;
 
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/Scope.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/Scope.java
@@ -1,4 +1,4 @@
-package ko.carbonel.compiler.intermediate.tinyRust;
+package ko.carbonel.compiler.intermediate.tinyRust.ts;
 
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/TypeEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/TypeEntry.java
@@ -1,6 +1,7 @@
-package ko.carbonel.compiler.intermediate.tinyRust;
+package ko.carbonel.compiler.intermediate.tinyRust.ts;
 
 import ko.carbonel.compiler.exception.semantic.TypeDoesNotExistError;
+import ko.carbonel.compiler.intermediate.tinyRust.TinyRustSymbolTable;
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustTokenType;
 import ko.carbonel.json.SerializeClass;
diff --git a/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/VariableEntry.java b/src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/VariableEntry.java
@@ -1,5 +1,6 @@
-package ko.carbonel.compiler.intermediate.tinyRust;
+package ko.carbonel.compiler.intermediate.tinyRust.ts;
 
+import ko.carbonel.compiler.intermediate.tinyRust.TinyRustSymbolTable;
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.json.SerializeClass;
 
diff --git a/src/main/java/ko/carbonel/syntax/generator/AttrBNFParserGenerator.java b/src/main/java/ko/carbonel/syntax/generator/AttrBNFParserGenerator.java
@@ -4,15 +4,13 @@
 import ko.carbonel.compiler.config.ArgumentName;
 import ko.carbonel.compiler.config.Config;
 import ko.carbonel.compiler.generated.AttrBNFParser;
-import ko.carbonel.compiler.generated.BNFParser;
 import ko.carbonel.compiler.intermediate.bnf.AttributeCodeEntry;
 import ko.carbonel.compiler.intermediate.bnf.BNFSymbolTable;
 import ko.carbonel.compiler.intermediate.bnf.NonTerminalEntry;
 import ko.carbonel.compiler.intermediate.bnf.TerminalEntry;
-import ko.carbonel.compiler.stream.lexer.bnf.BNFLexer;
 import ko.carbonel.compiler.stream.lexer.bnf.model.BNFLexerToken;
 import ko.carbonel.compiler.stream.lexer.bnf.model.BNFTokenType;
-import ko.carbonel.compiler.stream.reader.FileSourceReader;
+import ko.carbonel.syntax.grammar.algorithm.model.RulesFactory;
 import ko.carbonel.syntax.grammar.generator.output.AttributeRuleCodeGenerator;
 
 public class AttrBNFParserGenerator extends Generator<AttrBNFParser> {
@@ -22,9 +20,7 @@ public AttrBNFParserGenerator() {
 
 	@Override
 	public void generate() {
-		BNFParser bnfParser = new BNFParser(new BNFLexer(new FileSourceReader(Config.getOrDefault(ArgumentName.INPUT_RS_FILE, grammarPath), false)));
-		bnfParser.parse();
-		generateAttrBNFCode(bnfParser.st);
+		generateAttrBNFCode(RulesFactory.createRulesFromBNF(Config.getOrDefault(ArgumentName.INPUT_RS_FILE, grammarPath)));
 	}
 
 	private void generateAttrBNFCode(BNFSymbolTable st) {
diff --git a/src/main/java/ko/carbonel/syntax/generator/TinyRustAttrGenerator.java b/src/main/java/ko/carbonel/syntax/generator/TinyRustAttrGenerator.java
@@ -2,14 +2,12 @@
 
 import ko.carbonel.compiler.ParserAssistant;
 import ko.carbonel.compiler.generated.AttrTinyRustParser;
-import ko.carbonel.compiler.generated.BNFParser;
 import ko.carbonel.compiler.intermediate.bnf.BNFSymbolTable;
 import ko.carbonel.compiler.intermediate.bnf.TerminalEntry;
 import ko.carbonel.compiler.intermediate.tinyRust.TinyRustSymbolTable;
-import ko.carbonel.compiler.stream.lexer.bnf.BNFLexer;
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustLexerToken;
 import ko.carbonel.compiler.stream.lexer.tinyRust.model.TinyRustTokenType;
-import ko.carbonel.compiler.stream.reader.FileSourceReader;
+import ko.carbonel.syntax.grammar.algorithm.model.RulesFactory;
 import ko.carbonel.syntax.grammar.generator.output.AttributeRuleCodeGenerator;
 
 public class TinyRustAttrGenerator extends Generator<AttrTinyRustParser> {
@@ -19,9 +17,7 @@ public TinyRustAttrGenerator() {
 
 	@Override
 	public void generate() {
-		BNFParser bnfParser = new BNFParser(new BNFLexer(new FileSourceReader(grammarPath, false)));
-		bnfParser.parse();
-		generateAttrCode(bnfParser.st);
+		generateAttrCode(RulesFactory.createRulesFromBNF(grammarPath));
 	}
 
 	private void generateAttrCode(BNFSymbolTable st) {
diff --git a/src/main/java/ko/carbonel/syntax/grammar/algorithm/model/RulesFactory.java b/src/main/java/ko/carbonel/syntax/grammar/algorithm/model/RulesFactory.java
diff --git a/src/main/java/ko/carbonel/syntax/grammar/productions/ProductionUI.java b/src/main/java/ko/carbonel/syntax/grammar/productions/ProductionUI.java
diff --git a/src/main/resources/grammar/main_attr.bnf b/src/main/resources/grammar/main_attr.bnf
diff --git a/src/test/java/ko/carbonel/compiler/generated/AttrTinyRustParserTest.java b/src/test/java/ko/carbonel/compiler/generated/AttrTinyRustParserTest.java
diff --git a/src/test/resources/ast/04.rs b/src/test/resources/ast/04.rs
