update select changes in spec

WebAssembly · Mar 2, 2016 · 14cc71b · 14cc71b
1 parent af8073f
commit 14cc71b
Show file tree

Hide file tree

Showing 7 changed files with 188 additions and 188 deletions.
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
@@ -314,7 +314,7 @@ struct PrintSExpression : public WasmVisitor<PrintSExpression, void> {
   }
   void visitSelect(Select *curr) {
     o << '(';
-    prepareColor(o) << printWasmType(curr->type) << ".select";
+    prepareColor(o) << "select";
     incIndent();
     printFullLine(curr->ifTrue);
     printFullLine(curr->ifFalse);

diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
@@ -524,7 +524,6 @@ class SExpressionWasmBuilder {
           abort_on(op);
         }
         case 's': {
-          if (op[1] == 'e') return makeSelect(s, type);
           if (op[1] == 'h') {
             if (op[2] == 'l') return makeBinary(s, BinaryOp::Shl, type);
             return makeBinary(s, op[4] == 'u' ? BinaryOp::ShrU : BinaryOp::ShrS, type);
@@ -598,7 +597,8 @@ class SExpressionWasmBuilder {
           abort_on(str);
         }
         case 's': {
-          if (str[1] == 'e') return makeSetLocal(s);
+          if (str[1] == 'e' && str[2] == 't') return makeSetLocal(s);
+          if (str[1] == 'e' && str[2] == 'l') return makeSelect(s);
           abort_on(str);
         }
         case 'r': {
@@ -637,12 +637,12 @@ class SExpressionWasmBuilder {
     return ret;
   }
 
-  Expression* makeSelect(Element& s, WasmType type) {
+  Expression* makeSelect(Element& s) {
     auto ret = allocator.alloc<Select>();
     ret->ifTrue = parseExpression(s[1]);
     ret->ifFalse = parseExpression(s[2]);
     ret->condition = parseExpression(s[3]);
-    ret->type = type;
+    ret->finalize();
     return ret;
   }