Changeset db0b3ce for src/GenPoly

Timestamp:

Dec 14, 2015, 4:28:46 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

5e92fee

Parents:

56fcd77

Message:

Initial draft of switch-over of size/align names

Location:

src/GenPoly

Files:

• Box.cc (modified) (2 diffs)
• ScrubTyVars.cc (modified) (2 diffs)
• ScrubTyVars.h (modified) (1 diff)

src/GenPoly/Box.cc

@@ -309 +309 @@
                                         Type *concrete = env->lookup( tyParm->first );
                                         if ( concrete ) {
-                                                // TODO add alignment
                                                 arg = appExpr->get_args().insert( arg, new SizeofExpr( concrete->clone() ) );
+                                                arg++;
+                                                arg = appExpr->get_args().insert( arg, new AlignofExpr( concrete->clone() ) );
                                                 arg++;
                                         } else {
@@ -1008 +1009 @@
                         std::list< DeclarationWithType *>::iterator last = funcType->get_parameters().begin();
                         std::list< DeclarationWithType *> inferredParams;
-                        // TODO add alignment
                         ObjectDecl *newObj = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0 );
 //   ObjectDecl *newFunPtr = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) ), 0 );
                         for ( std::list< TypeDecl *>::const_iterator tyParm = funcType->get_forall().begin(); tyParm != funcType->get_forall().end(); ++tyParm ) {
-                                ObjectDecl *thisParm;
-                                // add all size parameters to parameter list
+                                ObjectDecl *sizeParm, *alignParm;
+                                // add all size and alignment parameters to parameter list
                                 if ( (*tyParm)->get_kind() == TypeDecl::Any ) {
-                                        thisParm = newObj->clone();
-                                        thisParm->set_name( (*tyParm)->get_name() );
-                                        last = funcType->get_parameters().insert( last, thisParm );
+                                        sizeParm = newObj->clone();
+                                        sizeParm->set_name( std::string("_sizeof_") + (*tyParm)->get_name() );
+                                        last = funcType->get_parameters().insert( last, sizeParm );
+                                        ++last;
+                                        alignParm = newObj->clone();
+                                        alignParm->set_name( std::string("_alignof_") + (*tyParm)->get_name() );
+                                        last = funcType->get_parameters().insert( last, alignParm );
                                         ++last;
                                 }

src/GenPoly/ScrubTyVars.cc

@@ -13 +13 @@
 // Update Count     : 2
 //
+
+#include <string>
 
 #include "GenPoly.h"
@@ -42 +44 @@
 
         Expression * ScrubTyVars::mutate( SizeofExpr *szeof ) {
-                // sizeof( T ) => T parameter, which is the size of T
+                // sizeof( T ) => _sizeof_T parameter, which is the size of T
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( szeof->get_type() ) ) {
-                        Expression *expr = new NameExpr( typeInst->get_name() );
+                        Expression *expr = new NameExpr( std::string("_sizeof_") + typeInst->get_name() );
                         return expr;
                 } else {
                         return Mutator::mutate( szeof );
+                } // if
+        }
+
+        Expression * ScrubTyVars::mutate( AlignofExpr *algnof ) {
+                // alignof( T ) => _alignof_T parameter, which is the alignment of T
+                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( algnof->get_type() ) ) {
+                        Expression *expr = new NameExpr( std::string("_alignof_") + typeInst->get_name() );
+                        return expr;
+                } else {
+                        return Mutator::mutate( algnof );
                 } // if
         }

src/GenPoly/ScrubTyVars.h

@@ -36 +36 @@
                 virtual Type* mutate( TypeInstType *typeInst );
                 Expression* mutate( SizeofExpr *szeof );
+                Expression* mutate( AlignofExpr *algnof );
                 virtual Type* mutate( PointerType *pointer );
           private: