Changeset 6b224a52 for src/Parser/DeclarationNode.cc

Timestamp:

Aug 25, 2017, 12:11:53 PM (7 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:

bf7b9da7

Parents:

135b431 (diff), f676b84 (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/DeclarationNode.cc (modified) (3 diffs)

src/Parser/DeclarationNode.cc

@@ -340 +340 @@
 } // DeclarationNode::newTypeDecl
 
-DeclarationNode * DeclarationNode::newPointer( DeclarationNode * qualifiers ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Pointer );
+DeclarationNode * DeclarationNode::newPointer( DeclarationNode * qualifiers, OperKinds kind ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = new TypeData( kind == OperKinds::PointTo ? TypeData::Pointer : TypeData::Reference );
         if ( qualifiers ) {
                 return newnode->addQualifiers( qualifiers );
@@ -759 +759 @@
 DeclarationNode * DeclarationNode::addPointer( DeclarationNode * p ) {
         if ( p ) {
-                assert( p->type->kind == TypeData::Pointer );
+                assert( p->type->kind == TypeData::Pointer || TypeData::Reference );
                 setBase( p->type );
                 p->type = nullptr;
@@ -781 +781 @@
 DeclarationNode * DeclarationNode::addNewPointer( DeclarationNode * p ) {
         if ( p ) {
-                assert( p->type->kind == TypeData::Pointer );
+                assert( p->type->kind == TypeData::Pointer || p->type->kind == TypeData::Reference );
                 if ( type ) {
                         switch ( type->kind ) {