Changeset c14cff1 for src/SymTab

Timestamp:

Feb 25, 2016, 5:16:15 PM (8 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:

071a31a

Parents:

a9a259c (diff), ac1ed49 (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

Location:

src/SymTab

Files:

• FixFunction.cc (modified) (1 diff)
• FixFunction.h (modified) (1 diff)
• ImplementationType.cc (modified) (2 diffs)
• Mangler.cc (modified) (1 diff)
• Mangler.h (modified) (1 diff)
• TypeEquality.cc (modified) (2 diffs)

src/SymTab/FixFunction.cc

@@ -72 +72 @@
                 return tupleType;
         }
+
+        Type * FixFunction::mutate(VarArgsType *varArgsType) {
+                return varArgsType;
+        }
 } // namespace SymTab
 

src/SymTab/FixFunction.h

@@ -41 +41 @@
                 virtual Type* mutate(TypeInstType *aggregateUseType);
                 virtual Type* mutate(TupleType *tupleType);
+                virtual Type* mutate(VarArgsType *varArgsType);
   
                 bool isVoid;

src/SymTab/ImplementationType.cc

@@ -40 +40 @@
                 virtual void visit(TypeInstType *aggregateUseType);
                 virtual void visit(TupleType *tupleType);
+                virtual void visit(VarArgsType *varArgsType);
 
                 Type *result;                   // synthesized
@@ -116 +117 @@
                 result = newType;
         }
+
+        void ImplementationType::visit(VarArgsType *varArgsType) {
+        }
 } // namespace SymTab
 

src/SymTab/Mangler.cc

@@ -224 +224 @@
                 acceptAll( tupleType->get_types(), *this );
                 mangleName << "_";
+        }
+
+        void Mangler::visit( VarArgsType *varArgsType ) {
+                mangleName << "VARGS";
         }
 

src/SymTab/Mangler.h

@@ -45 +45 @@
                 virtual void visit( TypeInstType *aggregateUseType );
                 virtual void visit( TupleType *tupleType );
+                virtual void visit( VarArgsType *varArgsType );
   
                 std::string get_mangleName() { return mangleName.str(); }

src/SymTab/TypeEquality.cc

@@ -41 +41 @@
                 virtual void visit( EnumInstType *enumInst );
                 virtual void visit( TypeInstType *typeInst );
+                virtual void visit( VarArgsType *varArgsType );
 
                 void handleQualifiers( Type * t );
@@ -191 +192 @@
                 }
         }
+
+        void TypeEquality::visit( VarArgsType *varArgsType ) {
+                // don't handle qualifiers; var args pack shouldn't have any
+                if ( ! dynamic_cast< VarArgsType * >( other ) ) {
+                        result = false;
+                }
+        }
 } // namespace SymTab