Changeset 7f62b708 for src

Timestamp:

Jul 5, 2021, 4:57:41 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8f1a99e

Parents:

e84ab3d

Message:

Step 2 of $thread to thread$ Missed some of the source

Location:

src

Files:

• Concurrency/Waitfor.cc (modified) (1 diff)
• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)
• ResolvExpr/CandidateFinder.cpp (modified) (2 diffs)

src/Concurrency/Waitfor.cc

@@ -244 +244 @@
                         decl_mask = decl;
                 }
-                else if( decl->name == "$monitor" ) {
+                else if( decl->name == "monitor$" ) {
                         assert( !decl_monitor );
                         decl_monitor = decl;

src/ResolvExpr/AlternativeFinder.cc

@@ -1302 +1302 @@
 
                 try {
-                        // Attempt 1 : turn (thread&)X into ($thread&)X.__thrd
+                        // Attempt 1 : turn (thread&)X into (thread$&)X.__thrd
                         // Clone is purely for memory management
                         std::unique_ptr<Expression> tech1 { new UntypedMemberExpr(new NameExpr(castExpr->concrete_target.field), castExpr->arg->clone()) };
@@ -1313 +1313 @@
                 } catch(SemanticErrorException & ) {}
 
-                // Fallback : turn (thread&)X into ($thread&)get_thread(X)
+                // Fallback : turn (thread&)X into (thread$&)get_thread(X)
                 std::unique_ptr<Expression> fallback { UntypedExpr::createDeref( new UntypedExpr(new NameExpr(castExpr->concrete_target.getter), { castExpr->arg->clone() })) };
                 // don't prune here, since it's guaranteed all alternatives will have the same type

src/ResolvExpr/CandidateFinder.cpp

@@ -1180 +1180 @@
 
                         try {
-                                // Attempt 1 : turn (thread&)X into ($thread&)X.__thrd
+                                // Attempt 1 : turn (thread&)X into (thread$&)X.__thrd
                                 // Clone is purely for memory management
                                 std::unique_ptr<const ast::Expr> tech1 { new ast::UntypedMemberExpr(loc, new ast::NameExpr(loc, castExpr->concrete_target.field), castExpr->arg) };
@@ -1191 +1191 @@
                         } catch(SemanticErrorException & ) {}
 
-                        // Fallback : turn (thread&)X into ($thread&)get_thread(X)
+                        // Fallback : turn (thread&)X into (thread$&)get_thread(X)
                         std::unique_ptr<const ast::Expr> fallback { ast::UntypedExpr::createDeref(loc,  new ast::UntypedExpr(loc, new ast::NameExpr(loc, castExpr->concrete_target.getter), { castExpr->arg })) };
                         // don't prune here, since it's guaranteed all alternatives will have the same type