Changeset 71bd8c6

Timestamp:

Jul 8, 2015, 4:47:08 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

e5609dd

Parents:

cc79d97

Message:

fix isVarLen in array types, fix loss of typedef when variable of aggregate type is declared, fix duplicate typedef with arrays of constant size

Location:

src

Files:

• CodeGen/GenType.cc (modified) (2 diffs)
• Parser/DeclarationNode.cc (modified) (3 diffs)
• Parser/ParseNode.cc (modified) (2 diffs)
• SymTab/TypeEquality.cc (modified) (2 diffs)

src/CodeGen/GenType.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:36:02 2015
-// Update Count     : 9
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 08 16:08:24 2015
+// Update Count     : 10
 //
 
@@ -93 +93 @@
                         os << "_Atomic ";
                 } // if
-                if ( isVarLen ) {
-                        os << "*";
-                } // if
                 if ( dimension != 0 ) {
                         CodeGenerator cg( os );
                         dimension->accept( cg );
+                } else if ( isVarLen ) {
+                        // no dimension expression on a VLA
+                        // means it came in with the * token
+                        os << "*";
                 } // if
                 os << "]";

src/Parser/DeclarationNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 12:34:05 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul  3 12:35:02 2015
-// Update Count     : 108
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 08 16:40:37 2015
+// Update Count     : 121
 //
 
@@ -284 +284 @@
         newnode->type->array->dimension = size;
         newnode->type->array->isStatic = isStatic;
-        newnode->type->array->isVarLen = false;
+        if ( newnode->type->array->dimension == 0 || dynamic_cast<ConstantNode *>( newnode->type->array->dimension ) ) {
+                newnode->type->array->isVarLen = false;
+        } else {
+                newnode->type->array->isVarLen = true;
+        } // if
         return newnode->addQualifiers( qualifiers );
 }
@@ -464 +468 @@
                         bitfieldWidth = o->bitfieldWidth;
                 } // if
+
+                // there may be typedefs chained onto the type
+                if ( o->get_link() ) {
+                        set_link( o->get_link()->clone() );
+                }
+
         } // if
         delete o;

src/Parser/ParseNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:26:29 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  6 20:17:58 2015
-// Update Count     : 23
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 08 14:46:45 2015
+// Update Count     : 25
 // 
 
@@ -41 +41 @@
 
 ParseNode *ParseNode::set_link( ParseNode *next_ ) {
-        ParseNode *follow;
-
         if ( next_ == 0 ) return this;
 
-        for ( follow = this; follow->next != 0; follow = follow->next );
-        follow->next = next_;
+        get_last()->next = next_;
 
         return this;

src/SymTab/TypeEquality.cc

@@ -10 +10 @@
 // Created On       : Tue Jul 07 16:28:29 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 08 13:41:53 2015
-// Update Count     : 34
+// Last Modified On : Wed Jul 08 16:20:09 2015
+// Update Count     : 35
 //
 
@@ -102 +102 @@
                         }
 
+                        if ( ! arrayType->get_isVarLen() && ! at->get_isVarLen() ) {
+                                ConstantExpr * ce1 = dynamic_cast< ConstantExpr * >( arrayType->get_dimension() );
+                                ConstantExpr * ce2 = dynamic_cast< ConstantExpr * >( at->get_dimension() );
+                                assert(ce1 && ce2);
+
+                                Constant * c1 = ce1->get_constant();
+                                Constant * c2 = ce2->get_constant();
+
+                                result = result && c1->get_value() == c2->get_value();
+                        }
+
                         other = at->get_base();
                         arrayType->get_base()->accept( *this );