Changeset d63eeb0 for src/ResolvExpr

Timestamp:

Feb 9, 2016, 3:25:05 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, with_gc

Children:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

Location:

src/ResolvExpr

Files:

• Alternative.cc (modified) (1 diff)
• AlternativeFinder.cc (modified) (2 diffs)
• AlternativeFinder.h (modified) (2 diffs)
• AlternativePrinter.cc (modified) (1 diff)
• Resolver.cc (modified) (1 diff)
• TypeEnvironment.cc (modified) (1 diff)
• Unify.cc (modified) (1 diff)
• Unify.h (modified) (1 diff)

src/ResolvExpr/Alternative.cc ¶

@@ -17 +17 @@
 #include "SynTree/Type.h"
 #include "SynTree/Expression.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 namespace ResolvExpr {

src/ResolvExpr/AlternativeFinder.cc ¶

@@ -38 +38 @@
 #include "Tuples/TupleAssignment.h"
 #include "Tuples/NameMatcher.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 extern bool resolvep;
@@ -811 +811 @@
         }
 
+        template< typename StructOrUnionType >
+        void AlternativeFinder::addOffsetof( StructOrUnionType *aggInst, const std::string &name ) {
+                std::list< Declaration* > members;
+                aggInst->lookup( name, members );
+                for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
+                        if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( *i ) ) {
+                                alternatives.push_back( Alternative( new OffsetofExpr( aggInst->clone(), dwt->clone() ), env, Cost::zero ) );
+                                renameTypes( alternatives.back().expr );
+                        } else {
+                                assert( false );
+                        }
+                }
+        }
+        
+        void AlternativeFinder::visit( UntypedOffsetofExpr *offsetofExpr ) {
+                AlternativeFinder funcFinder( indexer, env );
+                if ( StructInstType *structInst = dynamic_cast< StructInstType* >( offsetofExpr->get_type() ) ) {
+                        addOffsetof( structInst, offsetofExpr->get_member() );
+                } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( offsetofExpr->get_type() ) ) {
+                        addOffsetof( unionInst, offsetofExpr->get_member() );
+                }
+        }
+        
+        void AlternativeFinder::visit( OffsetofExpr *offsetofExpr ) {
+                alternatives.push_back( Alternative( offsetofExpr->clone(), env, Cost::zero ) );
+        }
+
         void AlternativeFinder::resolveAttr( DeclarationWithType *funcDecl, FunctionType *function, Type *argType, const TypeEnvironment &env ) {
                 // assume no polymorphism

src/ResolvExpr/AlternativeFinder.h ¶

@@ -56 +56 @@
                 virtual void visit( ConstantExpr *constantExpr ); 
                 virtual void visit( SizeofExpr *sizeofExpr );
-                virtual void visit( AlignofExpr *sizeofExpr );
+                virtual void visit( AlignofExpr *alignofExpr );
+                virtual void visit( UntypedOffsetofExpr *offsetofExpr );
+                virtual void visit( OffsetofExpr *offsetofExpr );
                 virtual void visit( AttrExpr *attrExpr );
                 virtual void visit( LogicalExpr *logicalExpr );
@@ -67 +69 @@
 
           private:
+                /// Adds alternatives for member expressions, given the aggregate, conversion cost for that aggregate, and name of the member
                 template< typename StructOrUnionType > void addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const std::string &name );
+                /// Adds alternatives for offsetof expressions, given the base type and name of the member
+                template< typename StructOrUnionType > void addOffsetof( StructOrUnionType *aggInst, const std::string &name );
                 bool instantiateFunction( std::list< DeclarationWithType* >& formals, /*const*/ AltList &actuals, bool isVarArgs, OpenVarSet& openVars, TypeEnvironment &resultEnv, AssertionSet &resultNeed, AssertionSet &resultHave );
                 template< typename OutputIterator >

src/ResolvExpr/AlternativePrinter.cc ¶

@@ -20 +20 @@
 #include "SynTree/Type.h"
 #include "SynTree/Expression.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 namespace ResolvExpr {

src/ResolvExpr/Resolver.cc ¶

@@ -24 +24 @@
 #include "SynTree/Initializer.h"
 #include "SymTab/Indexer.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 #include <iostream>

src/ResolvExpr/TypeEnvironment.cc ¶

@@ -20 +20 @@
 #include "SynTree/Type.h"
 #include "SynTree/TypeSubstitution.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 namespace ResolvExpr {

src/ResolvExpr/Unify.cc ¶

@@ -25 +25 @@
 #include "SynTree/Declaration.h"
 #include "SymTab/Indexer.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 

src/ResolvExpr/Unify.h ¶

@@ -24 +24 @@
 #include "SymTab/Indexer.h"
 #include "TypeEnvironment.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 namespace ResolvExpr {