Changeset 8a930c03 for src/AST/TypeEnvironment.hpp

Timestamp:

Jun 12, 2023, 12:05:58 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

fec8bd1

Parents:

2b78949 (diff), 38e266ca (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/AST/TypeEnvironment.hpp (modified) (4 diffs)

src/AST/TypeEnvironment.hpp

@@ -169 +169 @@
         /// Merge environment with this one, checking compatibility.
         /// Returns false if fails, but does NOT roll back partial changes.
-        bool combine( const TypeEnvironment & o, OpenVarSet & openVars, const SymbolTable & symtab );
+        bool combine( const TypeEnvironment & o, OpenVarSet & openVars );
 
         /// Add all type variables in environment to open var list
@@ -183 +183 @@
                 const TypeInstType * typeInst, const Type * bindTo, const TypeData & data,
                 AssertionSet & need, AssertionSet & have, const OpenVarSet & openVars,
-                ResolvExpr::WidenMode widen, const SymbolTable & symtab );
+                ResolvExpr::WidenMode widen );
 
         /// Binds the type classes represented by `var1` and `var2` together; will add one or both
@@ -190 +190 @@
                 const TypeInstType * var1, const TypeInstType * var2, TypeData && data,
                 AssertionSet & need, AssertionSet & have, const OpenVarSet & openVars,
-                ResolvExpr::WidenMode widen, const SymbolTable & symtab );
+                ResolvExpr::WidenMode widen );
 
         /// Disallows widening for all bindings in the environment
@@ -205 +205 @@
         /// Unifies the type bound of `to` with the type bound of `from`, returning false if fails
         bool mergeBound(
-                EqvClass & to, const EqvClass & from, OpenVarSet & openVars, const SymbolTable & symtab );
+                EqvClass & to, const EqvClass & from, OpenVarSet & openVars );
 
         /// Merges two type classes from local environment, returning false if fails
         bool mergeClasses(
-                ClassList::iterator to, ClassList::iterator from, OpenVarSet & openVars,
-                const SymbolTable & symtab );
+                ClassList::iterator to, ClassList::iterator from, OpenVarSet & openVars);
 
         /// Private lookup API; returns array index of string, or env.size() for not found