Clean up

Author: MightyHelper

.idea/workspace.xml

@@ -0,0 +1,32 @@
+package ko.carbonel.compiler.runner;
+
+import ko.carbonel.Logger;
+import ko.carbonel.compiler.AttributeParser;
+import ko.carbonel.compiler.ParserAssistant;
+import ko.carbonel.compiler.config.ArgumentName;
+import ko.carbonel.compiler.config.Config;
+import ko.carbonel.compiler.intermediate.SymbolTable;
+import ko.carbonel.compiler.stream.lexer.Lexer;
+import ko.carbonel.compiler.stream.lexer.LexerToken;
+import ko.carbonel.compiler.stream.reader.FileSourceReader;
+
+import java.util.function.Function;
+
+import static ko.carbonel.json.SerializeClass.Value.AST;
+import static ko.carbonel.json.SerializeClass.Value.TS;
+
+public class ASTParserRunner<P extends ParserAssistant<T, TT> & AttributeParser<S>, T extends LexerToken<TT>, TT extends Enum<TT>, S extends SymbolTable> extends STParserRunner<P, T, TT, S> {
+	public ASTParserRunner(Function<FileSourceReader, Lexer<T, TT>> lexerSupplier, Function<Lexer<T, TT>, P> parserSupplier, boolean doAlphabetCheck) {
+		super(lexerSupplier, parserSupplier, doAlphabetCheck);
+	}
+
+	@Override
+	protected void afterParse(P parser) {
+		parser.getSymbolTable().consolidate();
+		parser.getSymbolTable().checkExpressions();
+		Logger.output(Config.lang().semanticASTOK() + "\n");
+		outputIntermediateRepr(parser, ArgumentName.OUTPUT_TS_FILE, ".ts.json", TS);
+		outputIntermediateRepr(parser, ArgumentName.OUTPUT_AST_FILE, ".ast.json", AST);
+		logCompactRender(parser);
+	}
+}

src/main/java/ko/carbonel/compiler/runner/ASTParserRunner.java

@@ -10,6 +10,7 @@
 import ko.carbonel.compiler.exception.semantic.SemanticError;
 import ko.carbonel.compiler.runner.language.Language;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
@@ -58,4 +59,15 @@ protected void output(String s) {
 			System.exit(-1);
 		}
 	}
+
+	protected void outputParallelFile(String defaultExtension, String content) {
+		File file = new File(inputFileName);
+		String name = file.getName();
+		int i = name.lastIndexOf('.');
+		if (i > 0) name = name.substring(0, i);
+		name += defaultExtension;
+		File parentFile = file.getParentFile();
+		String newFileName = parentFile.getAbsolutePath() + "/" + name;
+		Utils.writeFile(newFileName, content);
+	}
 }

src/main/java/ko/carbonel/compiler/runner/Runner.java

@@ -1,20 +1,13 @@
 package ko.carbonel.compiler.runner;
 
-import ko.carbonel.Logger;
-import ko.carbonel.compiler.AttributeParser;
-import ko.carbonel.compiler.codegen.DeCompiler;
-import ko.carbonel.compiler.config.ArgumentName;
 import ko.carbonel.compiler.generated.AttrBNFParser;
 import ko.carbonel.compiler.generated.AttrTinyRustParser;
 import ko.carbonel.compiler.generated.BNFParser;
 import ko.carbonel.compiler.generated.TinyRustParser;
 import ko.carbonel.compiler.intermediate.tinyRust.TSSerializer;
-import ko.carbonel.compiler.intermediate.tinyRust.TinyRustSymbolTable;
 import ko.carbonel.compiler.stream.lexer.bnf.BNFLexer;
 import ko.carbonel.compiler.stream.lexer.tinyRust.TinyRustLexer;
 
-import static ko.carbonel.json.SerializeClass.Value.AST;
-
 public class Runners {
 	// if (!inputFileName.endsWith(".rs")) Logger.inputRSWarning();
 	public static final Runner TINY_RUST_PARSER = new GenericParserRunner<>(TinyRustLexer::new, TinyRustParser::new, true);
@@ -23,36 +16,7 @@ public class Runners {
 	public static final Runner ATTR_BNF_PARSER = new STParserRunner<>(BNFLexer::new, AttrBNFParser::new, false);
 	public static final Runner TINY_RUST_LEXER = new GenericLexerRunner<>(TinyRustLexer::new, true);
 	public static final Runner BNF_LEXER = new GenericLexerRunner<>(BNFLexer::new, false);
-
-	public static final Runner TINY_RUST_AST_PARSER = new STParserRunner<>(TinyRustLexer::new, AttrTinyRustParser::new, true){
-		protected void afterParse(AttrTinyRustParser parser) {
-			super.afterParse(parser);
-			String input = "";
-			TinyRustSymbolTable st = ((AttributeParser<TinyRustSymbolTable>)parser).getSymbolTable();
-			st.checkExpressions();
-			String serialize = TSSerializer.serialize(st);
-			Logger.output(serialize);
-
-			outputIntermediateRepr(parser, ArgumentName.OUTPUT_AST_FILE, ".ast.json", AST);
-//			outputParallelFile("rsC", DeCompiler.decompile(st));
-			Logger.output(DeCompiler.decompile(st));
-
-//			while (!input.equals("exit")){
-//				try {
-//					Logger.outputNoNewline("> ");
-//					input = new BufferedReader(new InputStreamReader(System.in)).readLine();
-//					TinyRustLexer tinyRustLexer = new TinyRustLexer(new StringSourceReader(input, true));
-//					List<TinyRustLexerToken> tokens = tinyRustLexer.stream().toList();
-//					Object o = ChainResolver.resolveChaining(st, tokens.stream().filter(it -> !it.type().equals(TinyRustTokenType.DOT)).toList());
-//					Logger.output(o != null ? o.toString() : null);
-//				} catch (IOException e) {
-//					throw new RuntimeException(e);
-//				} catch (CompilerError e){
-//					Logger.error(e.getMessage(), e);
-//				}
-//			}
-		}
-	};
+	public static final Runner TINY_RUST_AST_PARSER = new ASTParserRunner<>(TinyRustLexer::new, AttrTinyRustParser::new, true);
 
 	private Runners() {
 	}