refactor(CodePrinter): simplify printing logic by removing redundant indentation calls and enhancing attribute handling

Author: LindonAliu

lib/ASTPrinter/CodePrinter.cpp

@@ -47,7 +47,6 @@ class CodePrinter : public ASTVisitor<CodePrinter> {
     /// @param node The FunctionDecl node to print
     void visitFunctionDecl(FunctionDecl *node)
     {
-        printIndent();
         printDeclPrefix(node);
 
         _out << "func " << node->getName();
@@ -69,7 +68,6 @@ class CodePrinter : public ASTVisitor<CodePrinter> {
     /// @param node The StructDecl node to print
     void visitStructDecl(StructDecl *node)
     {
-        printIndent();
         printDeclPrefix(node);
 
         _out << "struct " << node->getName() << " {\n";
@@ -92,7 +90,6 @@ class CodePrinter : public ASTVisitor<CodePrinter> {
     /// @param node The EnumDecl node to print
     void visitEnumDecl(EnumDecl *node)
     {
-        printIndent();
         printDeclPrefix(node);
 
         _out << "enum " << node->getName() << " {\n";
@@ -115,9 +112,7 @@ class CodePrinter : public ASTVisitor<CodePrinter> {
     /// @param node The FieldDecl node to print
     void visitFieldDecl(FieldDecl *node)
     {
-        printIndent();
-        visitAttributeList(node->getAttributes());
-        printVisibility(node->getVisibility());
+        printDeclPrefix(node);
 
         _out << node->getName();
 
@@ -135,7 +130,7 @@ class CodePrinter : public ASTVisitor<CodePrinter> {
     /// @param node The ParamDecl node to print
     void visitParamDecl(ParamDecl *node)
     {
-        visitAttributeList(node->getAttributes());
+        visit(node->getAttributes());
         _out << node->getName() << ": ";
         printType(node->getType());
     }
@@ -201,7 +196,8 @@ class CodePrinter : public ASTVisitor<CodePrinter> {
     /// @param decl The declaration to print prefix for
     void printDeclPrefix(DeclBase *decl)
     {
-        visitAttributeList(decl->getAttributes());
+        printIndent();
+        visit(decl->getAttributes());
         printVisibility(decl->getVisibility());
     }
 

test/functional/run/print-interface.glu

@@ -2,35 +2,34 @@
 // RUN: gluc --print-interface %s | FileCheck -v %s
 //
 
+// CHECK:private struct S {
+// CHECK-NEXT:    private a: Int32
+// CHECK-NEXT:    public b: Int32
+// CHECK-NEXT:}
 struct S {
     a: Int,
     public b: Int,
 }
 
+// CHECK:private enum E {
+// CHECK-NEXT:    private A,
+// CHECK-NEXT:    private B,
+// CHECK-NEXT:    private C,
+// CHECK-NEXT:}
 enum E {
     A,
     B,
     C,
 }
 
+// CHECK:private func foo(s: S, @unused e: E) -> Int32;
 func foo(s: S, @unused e: E) -> Int {
     let result = s.a + s.b;
     return result;
 }
 
+// CHECK:@linkage_name("borabora") public func bar();
 @linkage_name("borabora")
 public func bar() -> Void {
     // do nothing
 }
-
-// CHECK:private struct S {
-// CHECK-NEXT:    private a: Int32
-// CHECK-NEXT:    public b: Int32
-// CHECK-NEXT:}
-// CHECK-NEXT:private enum E {
-// CHECK-NEXT:    private A,
-// CHECK-NEXT:    private B,
-// CHECK-NEXT:    private C,
-// CHECK-NEXT:}
-// CHECK-NEXT:private func foo(s: S, @unused e: E) -> Int32;
-// CHECK-NEXT:@linkage_name("borabora") public func bar();