Changeset 463cb33 for src

Timestamp:

Jul 16, 2020, 2:59:56 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c82af9f

Parents:

519f11c (diff), 3f06c05 (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

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (modified) (4 diffs)
• Parser/ExpressionNode.cc (modified) (7 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Thu Aug 04 18:33:00 2016
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Thu Aug 04 18:33:00 2016
-// Update Count     : 1
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jul 16 10:17:00 2020
+// Update Count     : 2
 //
 #include "InstantiateGeneric.h"
@@ -297 +297 @@
         }
 
+        template< typename AggrInst >
+        static AggrInst * asForward( AggrInst * decl ) {
+                if ( !decl->body ) {
+                        return nullptr;
+                }
+                decl = decl->clone();
+                decl->body = false;
+                deleteAll( decl->members );
+                decl->members.clear();
+                return decl;
+        }
+
         void GenericInstantiator::stripDtypeParams( AggregateDecl *base, std::list< TypeDecl* >& baseParams, const std::list< TypeExpr* >& typeSubs ) {
                 substituteMembers( base->get_members(), baseParams, typeSubs );
@@ -373 +385 @@
                                 concDecl->set_body( inst->get_baseStruct()->has_body() );
                                 substituteMembers( inst->get_baseStruct()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
-                                insert( inst, typeSubs, concDecl ); // must insert before recursion
+                                // Forward declare before recursion. (TODO: Only when needed, #199.)
+                                insert( inst, typeSubs, concDecl );
+                                if ( StructDecl *forwardDecl = asForward( concDecl ) ) {
+                                        declsToAddBefore.push_back( forwardDecl );
+                                }
                                 concDecl->acceptMutator( *visitor ); // recursively instantiate members
                                 declsToAddBefore.push_back( concDecl ); // must occur before declaration is added so that member instantiations appear first
@@ -423 +439 @@
                                 concDecl->set_body( inst->get_baseUnion()->has_body() );
                                 substituteMembers( inst->get_baseUnion()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
-                                insert( inst, typeSubs, concDecl ); // must insert before recursion
+                                // Forward declare before recursion. (TODO: Only when needed, #199.)
+                                insert( inst, typeSubs, concDecl );
+                                if ( UnionDecl *forwardDecl = asForward( concDecl ) ) {
+                                        declsToAddBefore.push_back( forwardDecl );
+                                }
                                 concDecl->acceptMutator( *visitor ); // recursively instantiate members
                                 declsToAddBefore.push_back( concDecl ); // must occur before declaration is added so that member instantiations appear first

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 13 21:12:02 2020
-// Update Count     : 1043
+// Last Modified On : Wed Jul 15 08:24:08 2020
+// Update Count     : 1046
 //
 
@@ -222 +222 @@
                         } else {                                                                        // octal int128 constant
                                 unsigned int len = str.length();
-                                char buf[32];
-                                __int128 val = v;
-                                
                                 if ( len > 1 + 43 || (len == 1 + 43 && str[0] > '3') ) SemanticError( yylloc, "128-bit octal constant to large " + str );
                                 if ( len <= 1 + 21 ) {                                  // value < 21 octal digitis
@@ -230 +227 @@
                                 } else {
                                         sscanf( &str[len - 21], "%llo", &v );
-                                        val = v;                                                        // store bits
+                                        __int128 val = v;                                       // accumulate bits
                                         str[len - 21] ='\0';                            // shorten string
                                         sscanf( &str[len == 43 ? 1 : 0], "%llo", &v );
@@ -240 +237 @@
                                         } // if
                                         v = val >> 64; v2 = (uint64_t)val;      // replace octal constant with 2 hex constants
+                                        char buf[32];
                                         sprintf( buf, "%#llx", v2 );
                                         str2 = buf;
@@ -256 +254 @@
                         #define P10_UINT64 10'000'000'000'000'000'000ULL // 19 zeroes
                         unsigned int len = str.length();
-                        char buf[32];
-                        __int128 val = v;
-
                         if ( str.length() == 39 && str > (Unsigned ? "340282366920938463463374607431768211455" : "170141183460469231731687303715884105727") )
                                 SemanticError( yylloc, "128-bit decimal constant to large " + str );
@@ -265 +260 @@
                         } else {
                                 sscanf( &str[len - 19], "%llu", &v );
-                                val = v;                                                                // store bits
+                                __int128 val = v;                                               // accumulate bits
                                 str[len - 19] ='\0';                                    // shorten string
                                 sscanf( &str[len == 39 ? 1 : 0], "%llu", &v );
@@ -275 +270 @@
                                 } // if
                                 v = val >> 64; v2 = (uint64_t)val;              // replace decimal constant with 2 hex constants
+                                char buf[32];
                                 sprintf( buf, "%#llx", v2 );
                                 str2 = buf;