Changeset 2c57025 for src/GenPoly/Box.cc

Timestamp:

Nov 25, 2016, 6:11:03 PM (8 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:

0f35657

Parents:

186fd86

Message:

add support for built-in sized trait which decouples size/alignment information from otype parameters, add test for sized trait

File:

• src/GenPoly/Box.cc (modified) (11 diffs)

src/GenPoly/Box.cc

@@ -275 +275 @@
 
                 for ( std::list< TypeDecl* >::const_iterator decl = decls.begin(); decl != decls.end(); ++decl ) {
-                        if ( (*decl)->get_kind() == TypeDecl::Any ) {
+                        if ( (*decl)->isComplete() ) {
                                 otypeDecls.push_back( *decl );
                         }
@@ -719 +719 @@
 
                 TypeDecl *Pass1::mutate( TypeDecl *typeDecl ) {
-                        scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
+                        addToTyVarMap( typeDecl, scopeTyVars );
                         return Mutator::mutate( typeDecl );
                 }
@@ -774 +774 @@
                                 ResolvExpr::EqvClass eqvClass;
                                 assert( env );
-                                if ( tyParm->second == TypeDecl::Any ) {
+                                if ( tyParm->second.isComplete ) {
                                         Type *concrete = env->lookup( tyParm->first );
                                         if ( concrete ) {
@@ -1278 +1278 @@
                         std::list< Expression *>::iterator paramBegin = appExpr->get_args().begin();
 
-                        TyVarMap exprTyVars( (TypeDecl::Kind)-1 );
+                        TyVarMap exprTyVars( TypeDecl::Data{} );
                         makeTyVarMap( function, exprTyVars );
                         ReferenceToType *dynRetType = isDynRet( function, exprTyVars );
@@ -1428 +1428 @@
 
                                                 // skip non-otype parameters (ftype/dtype)
+                                                // xxx - should this check whether the type is complete instead?
                                                 if ( (*forallIt)->get_kind() != TypeDecl::Any ) continue;
 
@@ -1553 +1554 @@
 
                 TypeDecl * Pass2::mutate( TypeDecl *typeDecl ) {
-                        scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
+                        addToTyVarMap( typeDecl, scopeTyVars );
                         if ( typeDecl->get_base() ) {
                                 return handleDecl( typeDecl, typeDecl->get_base() );
@@ -1597 +1598 @@
                                 ObjectDecl *sizeParm, *alignParm;
                                 // add all size and alignment parameters to parameter list
-                                if ( (*tyParm)->get_kind() == TypeDecl::Any ) {
+                                if ( (*tyParm)->isComplete() ) {
                                         TypeInstType parmType( Type::Qualifiers(), (*tyParm)->get_name(), *tyParm );
                                         std::string parmName = mangleType( &parmType );
@@ -1706 +1707 @@
 
                 TypeDecl * PolyGenericCalculator::mutate( TypeDecl *typeDecl ) {
-                        scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
+                        addToTyVarMap( typeDecl, scopeTyVars );
                         return Parent::mutate( typeDecl );
                 }
@@ -1870 +1871 @@
                         for ( ; baseParam != baseParams.end() && typeParam != typeParams.end(); ++baseParam, ++typeParam ) {
                                 // skip non-otype parameters
-                                if ( (*baseParam)->get_kind() != TypeDecl::Any ) continue;
+                                if ( ! (*baseParam)->isComplete() ) continue;
                                 TypeExpr *typeExpr = dynamic_cast< TypeExpr* >( *typeParam );
                                 assert( typeExpr && "all otype parameters should be type expressions" );
@@ -2082 +2083 @@
 //   Initializer *init = 0;
 //   std::list< Expression *> designators;
-//   scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
+//   addToTyVarMap( typeDecl, scopeTyVars );
 //   if ( typeDecl->get_base() ) {
 //     init = new SimpleInit( new SizeofExpr( handleDecl( typeDecl, typeDecl->get_base() ) ), designators );
@@ -2088 +2089 @@
 //   return new ObjectDecl( typeDecl->get_name(), Declaration::Extern, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::UnsignedInt ), init );
 
-                        scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
+                        addToTyVarMap( typeDecl, scopeTyVars );
                         return Mutator::mutate( typeDecl );
                 }