Changeset ef1da0e2 for src/AST

Timestamp:

Sep 20, 2022, 6:34:55 PM (3 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

79ae13d, a065f1f

Parents:

8f1e035

Message:

try to make parameter qualifier conversion work for assertions

Location:

src/AST

Files:

• Print.cpp (modified) (2 diffs)
• TypeEnvironment.hpp (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"
                 );
         };
@@ -1624 +1624 @@
 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/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 );