Changeset 3b56166 for src/SymTab/Mangler.cc

Timestamp:

Feb 10, 2020, 11:17:38 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

3966d9a, 41efd33

Parents:

807a632 (diff), d231700 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/SymTab/Mangler.cc (modified) (4 diffs)

src/SymTab/Mangler.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:40:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 30 13:46:10 2019
-// Update Count     : 26
+// Last Modified On : Fri Dec 13 23:43:49 2019
+// Update Count     : 28
 //
 #include "Mangler.h"
@@ -26 +26 @@
 #include "Common/SemanticError.h"        // for SemanticError
 #include "Common/utility.h"              // for toString
-#include "Parser/LinkageSpec.h"          // for Spec, isOverridable, AutoGen, Int...
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
+#include "SynTree/LinkageSpec.h"         // for Spec, isOverridable, AutoGen, Int...
 #include "SynTree/Declaration.h"         // for TypeDecl, DeclarationWithType
 #include "SynTree/Expression.h"          // for TypeExpr, Expression, operator<<
@@ -654 +654 @@
                         // aside from the assert false.
                         assertf(false, "Mangler_new should not visit typedecl: %s", toCString(decl));
-                        assertf( decl->kind < ast::TypeVar::Kind::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", decl->kind );
+                        assertf( decl->kind < ast::TypeDecl::Kind::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", decl->kind );
                         mangleName << Encoding::typeVariables[ decl->kind ] << ( decl->name.length() ) << decl->name;
                 }
@@ -674 +674 @@
                                         for ( const ast::TypeDecl * decl : ptype->forall ) {
                                                 switch ( decl->kind ) {
-                                                case ast::TypeVar::Kind::Dtype:
+                                                case ast::TypeDecl::Kind::Dtype:
                                                         dcount++;
                                                         break;
-                                                case ast::TypeVar::Kind::Ftype:
+                                                case ast::TypeDecl::Kind::Ftype:
                                                         fcount++;
                                                         break;
-                                                case ast::TypeVar::Kind::Ttype:
+                                                case ast::TypeDecl::Kind::Ttype:
                                                         vcount++;
                                                         break;