summaryrefslogtreecommitdiff
path: root/src/wast-parser.cc
diff options
context:
space:
mode:
authorBen Smith <binjimin@gmail.com>2017-11-21 14:51:34 -0800
committerGitHub <noreply@github.com>2017-11-21 14:51:34 -0800
commita630c95d472dc1615640bfe7d33849d45631778c (patch)
treee9b4e6b3568d70f1fa767c2cc0a5d2d0eca7263a /src/wast-parser.cc
parent49b7984544ddaf14d5e2f1ad9115dad7e9a2b299 (diff)
downloadwabt-a630c95d472dc1615640bfe7d33849d45631778c.tar.gz
wabt-a630c95d472dc1615640bfe7d33849d45631778c.tar.bz2
wabt-a630c95d472dc1615640bfe7d33849d45631778c.zip
Rename {wake,wait} -> atomic.{wake,wait} (#672)
This was recently changed in the spec.
Diffstat (limited to 'src/wast-parser.cc')
-rw-r--r--src/wast-parser.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/wast-parser.cc b/src/wast-parser.cc
index 577b18c7..90412538 100644
--- a/src/wast-parser.cc
+++ b/src/wast-parser.cc
@@ -165,12 +165,12 @@ bool IsPlainInstr(TokenType token_type) {
case TokenType::GrowMemory:
case TokenType::Throw:
case TokenType::Rethrow:
- case TokenType::Wake:
- case TokenType::Wait:
case TokenType::AtomicLoad:
case TokenType::AtomicStore:
case TokenType::AtomicRmw:
case TokenType::AtomicRmwCmpxchg:
+ case TokenType::AtomicWake:
+ case TokenType::AtomicWait:
return true;
default:
return false;
@@ -1431,17 +1431,19 @@ Result WastParser::ParsePlainInstr(std::unique_ptr<Expr>* out_expr) {
CHECK_RESULT(ParsePlainInstrVar<RethrowExpr>(loc, out_expr));
break;
- case TokenType::Wake: {
+ case TokenType::AtomicWake: {
Token token = Consume();
ErrorUnlessOpcodeEnabled(token);
- CHECK_RESULT(ParsePlainLoadStoreInstr<WakeExpr>(loc, token, out_expr));
+ CHECK_RESULT(
+ ParsePlainLoadStoreInstr<AtomicWakeExpr>(loc, token, out_expr));
break;
}
- case TokenType::Wait: {
+ case TokenType::AtomicWait: {
Token token = Consume();
ErrorUnlessOpcodeEnabled(token);
- CHECK_RESULT(ParsePlainLoadStoreInstr<WaitExpr>(loc, token, out_expr));
+ CHECK_RESULT(
+ ParsePlainLoadStoreInstr<AtomicWaitExpr>(loc, token, out_expr));
break;
}