From a58281ca114359cd6e65f5daaf086636aa18b0b0 Mon Sep 17 00:00:00 2001 From: Thomas Lively Date: Thu, 4 Jan 2024 14:25:18 -0800 Subject: Require `then` and `else` with `if` (#6201) We previously supported (and primarily used) a non-standard text format for conditionals in which the condition, if-true expression, and if-false expression were all simply s-expression children of the `if` expression. The standard text format, however, requires the use of `then` and `else` forms to introduce the if-true and if-false arms of the conditional. Update the legacy text parser to require the standard format and update all tests to match. Update the printer to print the standard format as well. The .wast and .wat test inputs were mechanically updated with this script: https://gist.github.com/tlively/85ae7f01f92f772241ec994c840ccbb1 --- test/lit/passes/optimize-instructions-exceptions.wast | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'test/lit/passes/optimize-instructions-exceptions.wast') diff --git a/test/lit/passes/optimize-instructions-exceptions.wast b/test/lit/passes/optimize-instructions-exceptions.wast index 9d22224fb..dcb649129 100644 --- a/test/lit/passes/optimize-instructions-exceptions.wast +++ b/test/lit/passes/optimize-instructions-exceptions.wast @@ -13,7 +13,9 @@ ;; CHECK-NEXT: (i32.const 456) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (then + ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) (func $test @@ -34,7 +36,9 @@ ) ) ) - (nop) + (then + (nop) + ) ) ) ) -- cgit v1.2.3