Changeset f841241 for src/Parser/TypeData.cc

Timestamp:

Mar 15, 2017, 11:23:48 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

9243cc91, ecc7752

Parents:

3831b58 (diff), e61a35e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

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 : Tue Mar  7 08:08:21 2017
-// Update Count     : 538
+// Last Modified On : Tue Mar 14 15:01:44 2017
+// Update Count     : 548
 //
 
@@ -26 +26 @@
 using namespace std;
 
-TypeData::TypeData( Kind k ) : kind( k ), base( nullptr ), forall( nullptr ) {
+TypeData::TypeData( Kind k ) : kind( k ), base( nullptr ), forall( nullptr ) /*, PTR1( (void*)(0xdeadbeefdeadbeef)), PTR2( (void*)(0xdeadbeefdeadbeef) ) */ {
         switch ( kind ) {
           case Unknown:
@@ -50 +50 @@
                 function.newStyle = false;
                 break;
+                // Enum is an Aggregate, so both structures are initialized together.
+          case Enum:
+                // enumeration = new Enumeration_t;
+                enumeration.name = nullptr;
+                enumeration.constants = nullptr;
+                enumeration.body = false;
           case Aggregate:
                 // aggregate = new Aggregate_t;
@@ -63 +69 @@
                 aggInst.params = nullptr;
                 aggInst.hoistType = false;;
-                break;
-          case Enum:
-                // enumeration = new Enumeration_t;
-                enumeration.name = nullptr;
-                enumeration.constants = nullptr;
-                enumeration.body = false;
                 break;
           case Symbolic:
@@ -494 +494 @@
 Type::Qualifiers buildQualifiers( const TypeData * td ) {
         Type::Qualifiers q;
-        q.isConst = td->typeQualifiers[ DeclarationNode::Const ];
-        q.isVolatile = td->typeQualifiers[ DeclarationNode::Volatile ];
-        q.isRestrict = td->typeQualifiers[ DeclarationNode::Restrict ];
-        q.isLvalue = td->typeQualifiers[ DeclarationNode::Lvalue ];
-        q.isAtomic = td->typeQualifiers[ DeclarationNode::Atomic ];;
+        q.isConst = td->typeQualifiers.is_const;
+        q.isVolatile = td->typeQualifiers.is_volatile;
+        q.isRestrict = td->typeQualifiers.is_restrict;
+        q.isLvalue = td->typeQualifiers.is_lvalue;
+        q.isAtomic = td->typeQualifiers.is_atomic;
         return q;
 } // buildQualifiers