Changeset d73e667

Timestamp:

Mar 25, 2025, 12:24:20 PM (6 days ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

446dde5, 8ef0bf7

Parents:

399074a (diff), b5978ca (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

Location:

src/AST

Files:

• Type.cpp (modified) (1 diff)
• Type.hpp (modified) (1 diff)

src/AST/Type.cpp ¶

@@ -167 +167 @@
 bool TypeInstType::isComplete() const { return base->sized; }
 
+static std::string toTypeString( int usage, int id, std::string const & name ) {
+        return "_" + std::to_string( usage ) + "_" + std::to_string( id ) + "_" + name;
+}
+
+std::string TypeInstType::typeString() const {
+        return ( 0 < formal_usage ) ? toTypeString( formal_usage, expr_id, name ) : name;
+}
+
 std::string TypeEnvKey::typeString() const {
-        return std::string("_") + std::to_string(formal_usage)
-                + "_" + std::to_string(expr_id) + "_" + base->name;
+        return toTypeString( formal_usage, expr_id, base->name );
 }
 

src/AST/Type.hpp ¶

@@ -383 +383 @@
         const Type * accept( Visitor & v ) const override { return v.visit( this ); }
 
-        std::string typeString() const {
-                if (formal_usage > 0) return std::string("_") + std::to_string(formal_usage) + "_" + std::to_string(expr_id) + "_" + name;
-                else return name;
-        }
+        std::string typeString() const;
 private:
         TypeInstType * clone() const override { return new TypeInstType{ *this }; }