Changeset a065f1f for src/AST

Timestamp:

Sep 20, 2022, 8:37:17 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

53a768d

Parents:

4520b77e (diff), ef1da0e2 (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:

• Create.cpp (added)
• Create.hpp (added)
• Print.cpp (modified) (2 diffs)
• Type.hpp (modified) (1 diff)
• TypeEnvironment.hpp (modified) (1 diff)
• module.mk (modified) (1 diff)

src/AST/Print.cpp

@@ -90 +90 @@
 
                 static constexpr auto Qualifiers = make_array<const char*>(
-                        "const", "restrict", "volatile", "lvalue", "mutex", "_Atomic"
+                        "const", "restrict", "volatile", "mutex", "_Atomic"
                 );
         };
@@ -1635 +1635 @@
 constexpr array<const char*, 3> Printer::Names::FuncSpecifiers;
 constexpr array<const char*, 6> Printer::Names::StorageClasses;
-constexpr array<const char*, 6> Printer::Names::Qualifiers;
+constexpr array<const char*, 5> Printer::Names::Qualifiers;
 }

src/AST/Type.hpp

@@ -412 +412 @@
                 std::string typeString() const { return std::string("_") + std::to_string(formal_usage) + "_" + std::to_string(expr_id) + "_" + base->name; }
                 bool operator==(const TypeEnvKey & other) const { return base == other.base && formal_usage == other.formal_usage && expr_id == other.expr_id; }
-
         };
 

src/AST/TypeEnvironment.hpp

@@ -56 +56 @@
 struct AssertCompare {
         bool operator()( const VariableExpr * d1, const VariableExpr * d2 ) const {
+                auto kind1 = ast::SymbolTable::getSpecialFunctionKind(d1->var->name);
+                auto kind2 = ast::SymbolTable::getSpecialFunctionKind(d2->var->name);
+                // heuristics optimization: force special functions to go last
+                if (kind1 > kind2) return true;
+                else if (kind1 < kind2) return false;
+
                 int cmp = d1->var->name.compare( d2->var->name );
                 return cmp < 0 || ( cmp == 0 && d1->result < d2->result );

src/AST/module.mk

@@ -24 +24 @@
         AST/Copy.cpp \
         AST/Copy.hpp \
+        AST/Create.cpp \
+        AST/Create.hpp \
         AST/CVQualifiers.hpp \
         AST/Decl.cpp \