Changeset b69233ac for src/AST

Timestamp:

Jun 19, 2019, 6:05:09 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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:

c0f9efe

Parents:

17a0ede2

Message:

Port assertion satisfaction to new AST

Location:

src/AST

Files:

• Expr.hpp (modified) (3 diffs)
• porting.md (modified) (1 diff)

src/AST/Expr.hpp

@@ -47 +47 @@
 
         ParamEntry() : decl( 0 ), declptr( nullptr ), actualType( nullptr ), formalType( nullptr ), expr( nullptr ) {}
-        ParamEntry( UniqueId id, Decl * declptr, Type* actual, Type* formal, Expr* e )
+        ParamEntry( 
+                UniqueId id, const Decl * declptr, const Type * actual, const Type * formal, 
+                const Expr * e )
         : decl( id ), declptr( declptr ), actualType( actual ), formalType( formal ), expr( e ) {}
 };
@@ -129 +131 @@
                         case Params: return data.inferParams;
                         }
+                        assert(!"unreachable");
                         return *((InferredParams*)nullptr);
                 }
@@ -138 +141 @@
                         assert(!"Mode was not already Params");
                         return *((InferredParams*)nullptr);
+                }
+
+                void set_inferParams( InferredParams && ps ) {
+                        switch(mode) {
+                        case Slots: 
+                                data.resnSlots.~ResnSlots();
+                                // fallthrough
+                        case Empty: 
+                                new(&data.inferParams) InferredParams{ std::move( ps ) };
+                                mode = Params;
+                                break;
+                        case Params:
+                                data.inferParams = std::move( ps );
+                                break;
+                        }
                 }
 

src/AST/porting.md

@@ -308 +308 @@
 * pulled out conversion cost promotion into separate `promoteCvtCost` function
 
+`resolveAssertions` => `satisfyAssertions`
+* `ResolveAssertions.h` => `SatisfyAssertions.hpp`
+* `Resn*` => `Sat*`
+
 [1] https://gcc.gnu.org/onlinedocs/gcc-9.1.0/gcc/Type-Attributes.html#Type-Attributes