Make v128.const i32x4 op conform to the SIMD draft (#1037)

* Update v128.const WAT parsing to conform to the SIMD draft

* manually fix indentation

* rename no_lanes to lane_count

* Fix parsing of OOB integers

* Update simd shuffle tests to new syntax

* Add the v128.const type tokens to the lexer.

1 files changed, 52 insertions, 52 deletions

diff --git a/test/typecheck/bad-simd-lane.txt b/test/typecheck/bad-simd-lane.txt
index db0c073c..28bd54ad 100644
--- a/test/typecheck/bad-simd-lane.txt
+++ b/test/typecheck/bad-simd-lane.txt
@@ -2,61 +2,61 @@
 ;;; ARGS*: --enable-simd
 ;;; ERROR: 1
 (module
-  (func (result i32) v128.const i32 0 0 0 0 i8x16.extract_lane_s 16)
-  (func (result i32) v128.const i32 0 0 0 0 i8x16.extract_lane_u 16)
-  (func (result i32) v128.const i32 0 0 0 0 i16x8.extract_lane_s 8)
-  (func (result i32) v128.const i32 0 0 0 0 i16x8.extract_lane_u 8)
-  (func (result i32) v128.const i32 0 0 0 0 i32x4.extract_lane 4)
-  (func (result f32) v128.const i32 0 0 0 0 f32x4.extract_lane 4)
-  (func (result f64) v128.const i32 0 0 0 0 f64x2.extract_lane 2)
+  (func (result i32) v128.const i32x4 0 0 0 0 i8x16.extract_lane_s 16)
+  (func (result i32) v128.const i32x4 0 0 0 0 i8x16.extract_lane_u 16)
+  (func (result i32) v128.const i32x4 0 0 0 0 i16x8.extract_lane_s 8)
+  (func (result i32) v128.const i32x4 0 0 0 0 i16x8.extract_lane_u 8)
+  (func (result i32) v128.const i32x4 0 0 0 0 i32x4.extract_lane 4)
+  (func (result f32) v128.const i32x4 0 0 0 0 f32x4.extract_lane 4)
+  (func (result f64) v128.const i32x4 0 0 0 0 f64x2.extract_lane 2)
 
-  (func (result v128) v128.const i32 0 0 0 0 i32.const 0 i8x16.replace_lane 16)
-  (func (result v128) v128.const i32 0 0 0 0 i32.const 0 i16x8.replace_lane 8)
-  (func (result v128) v128.const i32 0 0 0 0 i32.const 0 i32x4.replace_lane 4)
-  (func (result v128) v128.const i32 0 0 0 0 f32.const 0 f32x4.replace_lane 4)
-  (func (result v128) v128.const i32 0 0 0 0 f64.const 0 f64x2.replace_lane 2)
+  (func (result v128) v128.const i32x4 0 0 0 0 i32.const 0 i8x16.replace_lane 16)
+  (func (result v128) v128.const i32x4 0 0 0 0 i32.const 0 i16x8.replace_lane 8)
+  (func (result v128) v128.const i32x4 0 0 0 0 i32.const 0 i32x4.replace_lane 4)
+  (func (result v128) v128.const i32x4 0 0 0 0 f32.const 0 f32x4.replace_lane 4)
+  (func (result v128) v128.const i32x4 0 0 0 0 f64.const 0 f64x2.replace_lane 2)
 
   ;; Test a 64-bit index.
-  (func (result i32) v128.const i32 0 0 0 0 i8x16.extract_lane_s 0x100000000)
+  (func (result i32) v128.const i32x4 0 0 0 0 i8x16.extract_lane_s 0x100000000)
 )
 (;; STDERR ;;;
-out/test/typecheck/bad-simd-lane.txt:5:45: error: lane index must be less than 16 (got 16)
-  (func (result i32) v128.const i32 0 0 0 0 i8x16.extract_lane_s 16)
-                                            ^^^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:6:45: error: lane index must be less than 16 (got 16)
-  (func (result i32) v128.const i32 0 0 0 0 i8x16.extract_lane_u 16)
-                                            ^^^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:7:45: error: lane index must be less than 8 (got 8)
-  (func (result i32) v128.const i32 0 0 0 0 i16x8.extract_lane_s 8)
-                                            ^^^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:8:45: error: lane index must be less than 8 (got 8)
-  (func (result i32) v128.const i32 0 0 0 0 i16x8.extract_lane_u 8)
-                                            ^^^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:9:45: error: lane index must be less than 4 (got 4)
-  (func (result i32) v128.const i32 0 0 0 0 i32x4.extract_lane 4)
-                                            ^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:10:45: error: lane index must be less than 4 (got 4)
-  (func (result f32) v128.const i32 0 0 0 0 f32x4.extract_lane 4)
-                                            ^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:11:45: error: lane index must be less than 2 (got 2)
-  (func (result f64) v128.const i32 0 0 0 0 f64x2.extract_lane 2)
-                                            ^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:13:58: error: lane index must be less than 16 (got 16)
-  (func (result v128) v128.const i32 0 0 0 0 i32.const 0 i8x16.replace_lane 16)
-                                                         ^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:14:58: error: lane index must be less than 8 (got 8)
-  (func (result v128) v128.const i32 0 0 0 0 i32.const 0 i16x8.replace_lane 8)
-                                                         ^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:15:58: error: lane index must be less than 4 (got 4)
-  (func (result v128) v128.const i32 0 0 0 0 i32.const 0 i32x4.replace_lane 4)
-                                                         ^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:16:58: error: lane index must be less than 4 (got 4)
-  (func (result v128) v128.const i32 0 0 0 0 f32.const 0 f32x4.replace_lane 4)
-                                                         ^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:17:58: error: lane index must be less than 2 (got 2)
-  (func (result v128) v128.const i32 0 0 0 0 f64.const 0 f64x2.replace_lane 2)
-                                                         ^^^^^^^^^^^^^^^^^^
-out/test/typecheck/bad-simd-lane.txt:20:45: error: lane index must be less than 16 (got 4294967296)
-  (func (result i32) v128.const i32 0 0 0 0 i8x16.extract_lane_s 0x100000000)
-                                            ^^^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:5:47: error: lane index must be less than 16 (got 16)
+  (func (result i32) v128.const i32x4 0 0 0 0 i8x16.extract_lane_s 16)
+                                              ^^^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:6:47: error: lane index must be less than 16 (got 16)
+  (func (result i32) v128.const i32x4 0 0 0 0 i8x16.extract_lane_u 16)
+                                              ^^^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:7:47: error: lane index must be less than 8 (got 8)
+  (func (result i32) v128.const i32x4 0 0 0 0 i16x8.extract_lane_s 8)
+                                              ^^^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:8:47: error: lane index must be less than 8 (got 8)
+  (func (result i32) v128.const i32x4 0 0 0 0 i16x8.extract_lane_u 8)
+                                              ^^^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:9:47: error: lane index must be less than 4 (got 4)
+  (func (result i32) v128.const i32x4 0 0 0 0 i32x4.extract_lane 4)
+                                              ^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:10:47: error: lane index must be less than 4 (got 4)
+  (func (result f32) v128.const i32x4 0 0 0 0 f32x4.extract_lane 4)
+                                              ^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:11:47: error: lane index must be less than 2 (got 2)
+  (func (result f64) v128.const i32x4 0 0 0 0 f64x2.extract_lane 2)
+                                              ^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:13:60: error: lane index must be less than 16 (got 16)
+...unc (result v128) v128.const i32x4 0 0 0 0 i32.const 0 i8x16.replace_lane 16)
+                                                          ^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:14:60: error: lane index must be less than 8 (got 8)
+  (func (result v128) v128.const i32x4 0 0 0 0 i32.const 0 i16x8.replace_lane 8)
+                                                           ^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:15:60: error: lane index must be less than 4 (got 4)
+  (func (result v128) v128.const i32x4 0 0 0 0 i32.const 0 i32x4.replace_lane 4)
+                                                           ^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:16:60: error: lane index must be less than 4 (got 4)
+  (func (result v128) v128.const i32x4 0 0 0 0 f32.const 0 f32x4.replace_lane 4)
+                                                           ^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:17:60: error: lane index must be less than 2 (got 2)
+  (func (result v128) v128.const i32x4 0 0 0 0 f64.const 0 f64x2.replace_lane 2)
+                                                           ^^^^^^^^^^^^^^^^^^
+out/test/typecheck/bad-simd-lane.txt:20:47: error: lane index must be less than 16 (got 4294967296)
+  (func (result i32) v128.const i32x4 0 0 0 0 i8x16.extract_lane_s 0x100000000)
+                                              ^^^^^^^^^^^^^^^^^^^^
 ;;; STDERR ;;)