Changeset 6e8bd43 for src/SynTree

Timestamp:

Mar 16, 2017, 7:41:45 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

64b6913, 68fe077a

Parents:

905eca1

Message:

cleanup interface to qualifiers/specifiers

Location:

src/SynTree

Files:

• FunctionDecl.cc (modified) (3 diffs)
• NamedTypeDecl.cc (modified) (3 diffs)
• ObjectDecl.cc (modified) (3 diffs)
• Type.cc (modified) (2 diffs)
• Type.h (modified) (4 diffs)

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  7 07:54:58 2017
-// Update Count     : 68
+// Last Modified On : Wed Mar 15 23:33:43 2017
+// Update Count     : 72
 //
 
@@ -65 +65 @@
         printAll( get_attributes(), os, indent );
 
-        DeclarationNode::print_StorageClass( os, get_storageClasses() );
-        DeclarationNode::print_FuncSpec( os, get_funcSpec() );
+        get_storageClasses().print( os );
+        get_funcSpec().print( os );
 
         if ( get_type() ) {
@@ -91 +91 @@
         // xxx - should printShort print attributes?
 
-        DeclarationNode::print_StorageClass( os, get_storageClasses() );
-        DeclarationNode::print_FuncSpec( os, get_funcSpec() );
+        get_storageClasses().print( os );
+        get_funcSpec().print( os );
 
         if ( get_type() ) {

src/SynTree/NamedTypeDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  7 07:39:41 2017
-// Update Count     : 10
+// Last Modified On : Wed Mar 15 23:25:41 2017
+// Update Count     : 12
 //
 
@@ -39 +39 @@
                 os << get_name() << ": ";
         } // if
-        DeclarationNode::print_StorageClass( os, get_storageClasses() );
+        get_storageClasses().print( os );
         os << typeString();
         if ( base ) {
@@ -61 +61 @@
                 os << get_name() << ": ";
         } // if
-        DeclarationNode::print_StorageClass( os, get_storageClasses() );
+        get_storageClasses().print( os );
         os << typeString();
         if ( base ) {

src/SynTree/ObjectDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  7 07:55:24 2017
-// Update Count     : 54
+// Last Modified On : Wed Mar 15 23:26:22 2017
+// Update Count     : 57
 //
 
@@ -47 +47 @@
         printAll( get_attributes(), os, indent );
 
-        DeclarationNode::print_StorageClass( os, get_storageClasses() );
+        get_storageClasses().print( os );
 
         if ( get_type() ) {
@@ -81 +81 @@
         // xxx - should printShort print attributes?
 
-        DeclarationNode::print_StorageClass( os, get_storageClasses() );
+        get_storageClasses().print( os );
 
         if ( get_type() ) {

src/SynTree/Type.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 15 21:22:16 2017
-// Update Count     : 15
+// Last Modified On : Wed Mar 15 23:14:35 2017
+// Update Count     : 19
 //
 
@@ -59 +59 @@
 }
 
-const char * Type::QualifierNames[] = { "const", "restrict", "volatile", "lvalue", "mutex", "_Atomic", "NoTypeQualifierNames" };
+const char * Type::Qualifiers::Names[] = { "const", "restrict", "volatile", "lvalue", "mutex", "_Atomic" };
 
 void Type::print( std::ostream &os, int indent ) const {

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 15 21:28:09 2017
-// Update Count     : 85
+// Last Modified On : Wed Mar 15 23:28:33 2017
+// Update Count     : 89
 //
 
@@ -24 +24 @@
 class Type : public BaseSyntaxNode {
   public:
-        static const char * QualifierNames[];
-
         enum { Const = 1 << 0, Restrict = 1 << 1, Volatile = 1 << 2, Lvalue = 1 << 3, Mutex = 1 << 4, Atomic = 1 << 5, NumTypeQualifier = 6 };
         union Qualifiers {
+                static const char * Names[];
                 enum { Mask = ~(Restrict | Lvalue) };
                 unsigned int val;
@@ -38 +37 @@
                         bool isAtomic : 1;
                 };
+
                 Qualifiers() : val( 0 ) {}
                 Qualifiers( unsigned int val ) : val( val ) {}
@@ -80 +80 @@
                                 for ( unsigned int i = 0; i < NumTypeQualifier; i += 1 ) {
                                         if ( (*this)[i] ) {
-                                                os << QualifierNames[i] << ' ';
+                                                os << Names[i] << ' ';
                                         } // if
                                 } // for