From a75a8ce201af32757509c57f70dda478f4ca40a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20=C3=96qvist?= <jesper.oqvist@cs.lth.se>
Date: Mon, 18 May 2020 17:55:32 +0200
Subject: [PATCH] [cleanup] Remove duplicated code
---
src/jastadd/ast/Comments.jrag | 2 +-
src/jastadd/ast/JastAddCodeGen.jadd | 10 +---------
src/jastadd/ast/JragCodeGen.jrag | 4 +---
3 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/jastadd/ast/Comments.jrag b/src/jastadd/ast/Comments.jrag
index 3a6731f5..6728c9d6 100644
--- a/src/jastadd/ast/Comments.jrag
+++ b/src/jastadd/ast/Comments.jrag
@@ -142,7 +142,7 @@ outer: while (true) {
* @param obj original class body object
* @return generated javadoc comment
*/
- public String ASTDecl.docComment(ClassBodyObject obj) {
+ public String TypeDecl.docComment(ClassBodyObject obj) {
JavaDocParser parser = new JavaDocParser();
TemplateContext tt = templateContext();
tt.bind("SourceComment", parser.parse(obj.comments));
diff --git a/src/jastadd/ast/JastAddCodeGen.jadd b/src/jastadd/ast/JastAddCodeGen.jadd
index b2c19256..1ba4b6ac 100644
--- a/src/jastadd/ast/JastAddCodeGen.jadd
+++ b/src/jastadd/ast/JastAddCodeGen.jadd
@@ -298,15 +298,7 @@ aspect JastAddCodeGen {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
PrintStream stream = new PrintStream(bos, true, "UTF-8");
stream.println(typeDeclarationString());
- StringBuffer buf = new StringBuffer();
- for (ClassBodyObject obj : classBodyDecls) {
- org.jastadd.jrag.AST.SimpleNode n = obj.node;
- buf.append(config().indent);
- buf.append(obj.modifiers());
- n.jjtAccept(new ClassBodyDeclUnparser(), buf);
- buf.append("\n\n");
- }
- stream.println(buf.toString());
+ emitMembers(stream);
emitAbstractSyns(stream);
emitInhDeclarations(stream);
stream.close();
diff --git a/src/jastadd/ast/JragCodeGen.jrag b/src/jastadd/ast/JragCodeGen.jrag
index 6e3cd692..7a132ce4 100644
--- a/src/jastadd/ast/JragCodeGen.jrag
+++ b/src/jastadd/ast/JragCodeGen.jrag
@@ -289,9 +289,7 @@ aspect JragCodeGen {
}
}
- public void TypeDecl.emitMembers(PrintStream out) { }
-
- public void ASTDecl.emitMembers(PrintStream out) {
+ public void TypeDecl.emitMembers(PrintStream out) {
for (ClassBodyObject obj : classBodyDecls) {
org.jastadd.jrag.AST.SimpleNode node = obj.node;
out.print(obj.modifiers());
--
GitLab