Changeset 722c4831 for src

Timestamp:

May 22, 2019, 5:32:46 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

489bacf, f23de79d

Parents:

893e106

Message:

Temporary patch around Pass issues

Location:

src

Files:

• AST/Expr.cpp (modified) (1 diff)
• AST/GenericSubstitution.cpp (modified) (1 diff)
• AST/module.mk (modified) (1 diff)
• Makefile.in (modified) (4 diffs)

src/AST/Expr.cpp

@@ -159 +159 @@
         assert( aggregate->result );
 
-<<<<<<< HEAD
-        // #warning Needs GenericSubsitution.cpp building to work correctly
-        // result.set_and_mutate( mem->get_type() )->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;  // FIXME temporary patch
-
-        // take ownership of member type
-        result = mem->get_type();
-        // substitute aggregate generic parameters into member type
-        genericSubsitution( aggregate->result ).apply( result );
-        // ensure lvalue and appropriate restrictions from aggregate type
-        result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;
-=======
-//      assert(!"unimplemented; need TypeSubstitution, genericSubstitution");
->>>>>>> ef5ef56042ce2b547da955746d9986e26cf628ca
+        #warning Needs GenericSubsitution.cpp building to work correctly
+        result.set_and_mutate( mem->get_type() )->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;  // FIXME temporary patch
+
+        // // take ownership of member type
+        // result = mem->get_type();
+        // // substitute aggregate generic parameters into member type
+        // genericSubsitution( aggregate->result ).apply( result );
+        // // ensure lvalue and appropriate restrictions from aggregate type
+        // result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;
 }
 

src/AST/GenericSubstitution.cpp

@@ -31 +31 @@
                 TypeSubstitution sub;
 
-                const Type * previsit( const Type * ty ) {
+                void previsit( const Type * ty ) {
                         assertf( false, "Attempted generic substitution for non-aggregate type: %s", 
                                 toString( ty ).c_str() );
-                        return ty;
                 }
 
-                const ReferenceType * previsit( const ReferenceType * ty ) {
+                void previsit( const ReferenceType * ty ) {
                         // do nothing; allows substitution from base type
-                        return ty;
                 }
 
-                const ReferenceToType * previsit( const ReferenceToType * ty ) {
+                void previsit( const ReferenceToType * ty ) {
                         visit_children = false;
                         // build substitution from base parameters
                         const AggregateDecl * aggr = ty->aggr();
                         sub = TypeSubstitution{ aggr->params.begin(), aggr->params.end(), ty->params.begin() };
-                        return ty;
                 }
         };

src/AST/module.mk

@@ -21 +21 @@
         AST/DeclReplacer.cpp \
         AST/Expr.cpp \
-        AST/GenericSubstitution.cpp \
         AST/Init.cpp \
         AST/LinkageSpec.cpp \

src/Makefile.in

@@ -167 +167 @@
 am__objects_1 = AST/Attribute.$(OBJEXT) AST/Convert.$(OBJEXT) \
         AST/Decl.$(OBJEXT) AST/DeclReplacer.$(OBJEXT) \
-        AST/Expr.$(OBJEXT) AST/GenericSubstitution.$(OBJEXT) \
-        AST/Init.$(OBJEXT) AST/LinkageSpec.$(OBJEXT) \
-        AST/Node.$(OBJEXT) AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) \
-        AST/Stmt.$(OBJEXT) AST/Type.$(OBJEXT) \
-        AST/TypeSubstitution.$(OBJEXT)
+        AST/Expr.$(OBJEXT) AST/Init.$(OBJEXT) \
+        AST/LinkageSpec.$(OBJEXT) AST/Node.$(OBJEXT) \
+        AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) AST/Stmt.$(OBJEXT) \
+        AST/Type.$(OBJEXT) AST/TypeSubstitution.$(OBJEXT)
 am__objects_2 = CodeGen/CodeGenerator.$(OBJEXT) \
         CodeGen/FixMain.$(OBJEXT) CodeGen/GenType.$(OBJEXT) \
@@ -575 +574 @@
         AST/DeclReplacer.cpp \
         AST/Expr.cpp \
-        AST/GenericSubstitution.cpp \
         AST/Init.cpp \
         AST/LinkageSpec.cpp \
@@ -741 +739 @@
         AST/$(DEPDIR)/$(am__dirstamp)
 AST/Expr.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
-AST/GenericSubstitution.$(OBJEXT): AST/$(am__dirstamp) \
-        AST/$(DEPDIR)/$(am__dirstamp)
 AST/Init.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
 AST/LinkageSpec.$(OBJEXT): AST/$(am__dirstamp) \
@@ -1177 +1173 @@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/DeclReplacer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Expr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/GenericSubstitution.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Init.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/LinkageSpec.Po@am__quote@