Changeset 23b6643f for src/SymTab

Timestamp:

Sep 20, 2016, 4:47:34 PM (9 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:

1132b62

Parents:

aefcc3b (diff), db46512 (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 tuples

Conflicts:

src/Makefile.in
src/ResolvExpr/Unify.cc
src/SynTree/Type.h

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

@@ -77 +77 @@
                 return varArgsType;
         }
+
+        Type * FixFunction::mutate(ZeroType *zeroType) {
+                return zeroType;
+        }
+
+        Type * FixFunction::mutate(OneType *oneType) {
+                return oneType;
+        }
 } // namespace SymTab
 

src/SymTab/FixFunction.h

@@ -42 +42 @@
                 virtual Type* mutate(TupleType *tupleType);
                 virtual Type* mutate(VarArgsType *varArgsType);
+                virtual Type* mutate(ZeroType *zeroType);
+                virtual Type* mutate(OneType *oneType);
   
                 bool isVoid;

src/SymTab/ImplementationType.cc

@@ -41 +41 @@
                 virtual void visit(TupleType *tupleType);
                 virtual void visit(VarArgsType *varArgsType);
+                virtual void visit(ZeroType *zeroType);
+                virtual void visit(OneType *oneType);
 
                 Type *result;                   // synthesized
@@ -120 +122 @@
         void ImplementationType::visit(VarArgsType *varArgsType) {
         }
+
+        void ImplementationType::visit(ZeroType *zeroType) {
+        }
+
+        void ImplementationType::visit(OneType *oneType) {
+        }
 } // namespace SymTab
 

src/SymTab/Mangler.cc

@@ -229 +229 @@
                 printQualifiers( varArgsType );
                 mangleName << "VARGS";
+        }
+
+        void Mangler::visit( ZeroType *zeroType ) {
+                mangleName << "Z";
+        }
+
+        void Mangler::visit( OneType *oneType ) {
+                mangleName << "O";
         }
 

src/SymTab/Mangler.h

@@ -46 +46 @@
                 virtual void visit( TupleType *tupleType );
                 virtual void visit( VarArgsType *varArgsType );
+                virtual void visit( ZeroType *zeroType );
+                virtual void visit( OneType *oneType );
   
                 std::string get_mangleName() { return mangleName.str(); }

src/SymTab/TypeEquality.cc

@@ -42 +42 @@
                 virtual void visit( TypeInstType *typeInst );
                 virtual void visit( VarArgsType *varArgsType );
+                virtual void visit( ZeroType *zeroType );
+                virtual void visit( OneType *oneType );
 
                 void handleQualifiers( Type * t );
@@ -199 +201 @@
                 }
         }
+
+        void TypeEquality::visit( ZeroType *zeroType ) {
+                handleQualifiers( zeroType );
+                if ( ! dynamic_cast< ZeroType * >( other ) ) {
+                        result = false;
+                }
+        }
+
+        void TypeEquality::visit( OneType *oneType ) {
+                handleQualifiers( oneType );
+                if ( ! dynamic_cast< OneType * >( other ) ) {
+                        result = false;
+                }
+        }
 } // namespace SymTab