Changeset 0698aa1 for src/SynTree

Timestamp:

Jul 12, 2017, 4:44:44 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

cda7889

Parents:

aca65621

Message:

Add stripReferences, fix createDeref and makeSub to work with reference types

Location:

src/SynTree

Files:

• Expression.cc (modified) (2 diffs)
• Type.cc (modified) (1 diff)
• Type.h (modified) (1 diff)

src/SynTree/Expression.cc

@@ -335 +335 @@
 namespace {
         TypeSubstitution makeSub( Type * t ) {
-                if ( StructInstType * aggInst = dynamic_cast< StructInstType * >( t ) ) {
+                if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( t ) ) {
+                        return makeSub( refType->get_base() );
+                } else if ( StructInstType * aggInst = dynamic_cast< StructInstType * >( t ) ) {
                         return TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->get_parameters().begin() );
                 } else if ( UnionInstType * aggInst = dynamic_cast< UnionInstType * >( t ) ) {
@@ -400 +402 @@
         if ( Type * type = expr->get_result() ) {
                 Type * base = InitTweak::getPointerBase( type );
-                if ( ! base ) {
-                        std::cerr << type << std::endl;
-                }
-                assertf( base, "expected pointer type in dereference\n" );
-                ret->set_result( maybeClone( base ) );
+                assertf( base, "expected pointer type in dereference (type was %s)", toString( type ).c_str() );
+                ret->set_result( new ReferenceType( Type::Qualifiers(), base->clone() ) );
         }
         return ret;

src/SynTree/Type.cc

@@ -65 +65 @@
 const char * Type::QualifiersNames[] = { "const", "restrict", "volatile", "lvalue", "mutex", "_Atomic" };
 
-Type *Type::stripDeclarator() {
+Type * Type::stripDeclarator() {
         Type * type = this;
         while ( Type * at = InitTweak::getPointerBase( type ) ) {
                 type = at;
+        }
+        return type;
+}
+
+Type * Type::stripReferences() {
+        Type * type = this;
+        while ( ReferenceType * ref = dynamic_cast<ReferenceType *>( type ) ) {
+                type = ref->get_base();
         }
         return type;

src/SynTree/Type.h

@@ -158 +158 @@
 
         /// return type without outer pointers and arrays
-        Type *stripDeclarator();
+        Type * stripDeclarator();
+
+        /// return type without outer references
+        Type * stripReferences();
 
         virtual bool isComplete() const { return true; }