Changeset c1c1112 for src/Parser/TypeData.cc

Timestamp:

Aug 25, 2016, 9:14:06 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

4e2b9710

Parents:

2acf5fc

Message:

fix segment fault when printing syntax error, more refactoring of parser code

File:

• src/Parser/TypeData.cc (modified) (5 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 18 23:48:44 2016
-// Update Count     : 64
+// Last Modified On : Wed Aug 24 13:46:55 2016
+// Update Count     : 69
 //
 
@@ -244 +244 @@
         using std::string;
 
-        printEnums( qualifiers.begin(), qualifiers.end(), DeclarationNode::qualifierName, os );
+        for ( int i = 0; i < DeclarationNode::NoOfQualifier; i += 1 ) {
+                if ( qualifiers[i] ) os << DeclarationNode::qualifierName[ i ] << ' ';
+        } // for
 
         if ( forall ) {
@@ -425 +427 @@
                 if ( ! toplevel && aggregate->fields ) {
                         ret = clone();
-                        ret->qualifiers.clear();
+//                      ret->qualifiers.reset();
                 } // if
                 break;
@@ -431 +433 @@
                 if ( ! toplevel && enumeration->constants ) {
                         ret = clone();
-                        ret->qualifiers.clear();
+//                      ret->qualifiers.reset();
                 } // if
                 break;
@@ -554 +556 @@
 Type::Qualifiers TypeData::buildQualifiers() const {
         Type::Qualifiers q;
-        for ( std::list< DeclarationNode::Qualifier >::const_iterator i = qualifiers.begin(); i != qualifiers.end(); ++i ) {
-                switch ( *i ) {
-                  case DeclarationNode::Const:
-                        q.isConst = true;
-                        break;
-                  case DeclarationNode::Volatile:
-                        q.isVolatile = true;
-                        break;
-                  case DeclarationNode::Restrict:
-                        q.isRestrict = true;
-                        break;
-                  case DeclarationNode::Lvalue:
-                        q.isLvalue = true;
-                        break;
-                  case DeclarationNode::Atomic:
-                        q.isAtomic = true;
-                        break;
-                } // switch
-        } // for
+        q.isConst = qualifiers[ DeclarationNode::Const ];
+        q.isVolatile = qualifiers[ DeclarationNode::Volatile ];
+        q.isRestrict = qualifiers[ DeclarationNode::Restrict ];
+        q.isLvalue = qualifiers[ DeclarationNode::Lvalue ];
+        q.isAtomic = qualifiers[ DeclarationNode::Atomic ];;
         return q;
 }