Fix more type identifiers in exports in WAT

Author: fitzgen

tests/misc_testsuite/component-model/fused.wast

@@ -910,11 +910,11 @@
       (type $c' (variant (case "a" u64) (case "b" float64)))
       (type $d' (variant (case "a" float32) (case "b" float64)))
       (type $e' (variant (case "a" float32) (case "b" s64)))
-      (export $a "t-a" (type (eq $a')))
-      (export $b "t-b" (type (eq $b')))
-      (export $c "t-c" (type (eq $c')))
-      (export $d "t-d" (type (eq $d')))
-      (export $e "t-e" (type (eq $e')))
+      (export "t-a" (type $a (eq $a')))
+      (export "t-b" (type $b (eq $b')))
+      (export "t-c" (type $c (eq $c')))
+      (export "t-d" (type $d (eq $d')))
+      (export "t-e" (type $e (eq $e')))
       (type $func_a (func (param "x" bool) (param "a" $a)))
       (type $func_b (func (param "x" bool) (param "b" $b)))
       (type $func_c (func (param "x" bool) (param "c" $c)))
@@ -1035,7 +1035,7 @@
         (case "c" (tuple float32 u32))
         (case "d" (tuple float32 u64 u8))
       ))
-      (export $a "t-a" (type (eq $a')))
+      (export "t-a" (type $a (eq $a')))
       (export "a" (func (param "x" u8) (param "a" $a)))
     ))
 
@@ -1264,12 +1264,12 @@
 
   (component $c2
     (import "a" (instance $i
-      (export $f1 "t-f1" (type (eq $f1')))
-      (export $f8 "t-f8" (type (eq $f8')))
-      (export $f9 "t-f9" (type (eq $f9')))
-      (export $f16 "t-f16" (type (eq $f16')))
-      (export $f17 "t-f17" (type (eq $f17')))
-      (export $f32 "t-f32" (type (eq $f32')))
+      (export "t-f1" (type $f1 (eq $f1')))
+      (export "t-f8" (type $f8 (eq $f8')))
+      (export "t-f9" (type $f9 (eq $f9')))
+      (export "t-f16" (type $f16 (eq $f16')))
+      (export "t-f17" (type $f17 (eq $f17')))
+      (export "t-f32" (type $f32 (eq $f32')))
       (export "f1" (func (param "a" $f1)))
       (export "f8" (func (param "a" $f8)))
       (export "f9" (func (param "a" $f9)))

tests/misc_testsuite/component-model/instance.wast

@@ -182,9 +182,9 @@
 (component
   (import "host" (instance $i
     (type $x' (record (field "x" u32)))
-    (export $x "x" (type (eq $x')))
+    (export "x" (type $x (eq $x')))
     (type $rec' (record (field "x" $x) (field "y" string)))
-    (export $rec "rec" (type (eq $rec')))
+    (export "rec" (type $rec (eq $rec')))
     (export "some-record" (type (eq $rec)))))
 )
 

tests/misc_testsuite/component-model/resources.wast

@@ -188,7 +188,7 @@
 ;; equality constraints also work
 (component
   (import "host" (instance
-    (export $r1 "resource1" (type (sub resource)))
+    (export "resource1" (type $r1 (sub resource)))
     (export "resource2" (type (sub resource)))
     (export "resource1-again" (type (eq $r1)))
   ))
@@ -199,7 +199,7 @@
   (component
     (import "host" (instance
       (export "resource1" (type (sub resource)))
-      (export $r1 "resource2" (type (sub resource)))
+      (export "resource2" (type $r1 (sub resource)))
       (export "resource1-again" (type (eq $r1)))
     ))
   )
@@ -208,7 +208,7 @@
 ;; equality constraints mean that types don't need to be supplied
 (component
   (import "host" (instance
-    (export $r1 "resource1" (type (sub resource)))
+    (export "resource1" (type $r1 (sub resource)))
     (export "resource2" (type (sub resource)))
     (export "this-name-is-not-provided-in-the-wast-harness" (type (eq $r1)))
   ))
@@ -217,7 +217,7 @@
 ;; simple properties of handles
 (component
   (import "host" (instance $host
-    (export $r "resource1" (type (sub resource)))
+    (export "resource1" (type $r (sub resource)))
     (export "[constructor]resource1" (func (param "r" u32) (result (own $r))))
     (export "[static]resource1.assert" (func (param "r" (own $r)) (param "rep" u32)))
   ))
@@ -268,7 +268,7 @@
 ;; Using an index that has never been valid is a trap
 (component
   (import "host" (instance $host
-    (export $r "resource1" (type (sub resource)))
+    (export "resource1" (type $r (sub resource)))
     (export "[static]resource1.assert" (func (param "r" (own $r)) (param "rep" u32)))
   ))
   (alias export $host "resource1" (type $r))
@@ -296,7 +296,7 @@
 ;; Using an index which was previously valid but no longer valid is also a trap.
 (component
   (import "host" (instance $host
-    (export $r "resource1" (type (sub resource)))
+    (export "resource1" (type $r (sub resource)))
     (export "[constructor]resource1" (func (param "r" u32) (result (own $r))))
     (export "[static]resource1.assert" (func (param "r" (own $r)) (param "rep" u32)))
   ))
@@ -338,7 +338,7 @@
 ;; Also invalid to pass a previously valid handle to the drop intrinsic
 (component
   (import "host" (instance $host
-    (export $r "resource1" (type (sub resource)))
+    (export "resource1" (type $r (sub resource)))
     (export "[constructor]resource1" (func (param "r" u32) (result (own $r))))
   ))
   (alias export $host "resource1" (type $r))
@@ -380,15 +380,15 @@
 ;; should not implicitly have access to that resource.
 (component
   (import "host" (instance $host
-    (export $r "resource1" (type (sub resource)))
+    (export "resource1" (type $r (sub resource)))
     (export "[constructor]resource1" (func (param "r" u32) (result (own $r))))
   ))
 
   ;; an inner component which upon instantiation will invoke the constructor,
   ;; assert that it's zero, and then forget about it.
   (component $inner
     (import "host" (instance $host
-      (export $r "resource1" (type (sub resource)))
+      (export "resource1" (type $r (sub resource)))
       (export "[constructor]resource1" (func (param "r" u32) (result (own $r))))
     ))
     (alias export $host "[constructor]resource1" (func $ctor))
@@ -534,7 +534,7 @@
 ;; should not be visible in the other.
 (component
   (import "host" (instance $host
-    (export $r "resource1" (type (sub resource)))
+    (export "resource1" (type $r (sub resource)))
     (export "[constructor]resource1" (func (param "r" u32) (result (own $r))))
   ))
   (alias export $host "resource1" (type $r))
@@ -745,7 +745,7 @@
 ;; Test dropping a host resource
 (component
   (import "host" (instance $host
-    (export $r "resource1" (type (sub resource)))
+    (export "resource1" (type $r (sub resource)))
     (export "[constructor]resource1" (func (param "r" u32) (result (own $r))))
     (export "[static]resource1.last-drop" (func (result u32)))
     (export "[static]resource1.drops" (func (result u32)))
@@ -809,7 +809,7 @@
 ;; Test some bare-bones basics of borrowed resources
 (component
   (import "host" (instance $host
-    (export $r "resource1" (type (sub resource)))
+    (export "resource1" (type $r (sub resource)))
     (export "[constructor]resource1" (func (param "r" u32) (result (own $r))))
     (export "[method]resource1.simple" (func (param "self" (borrow $r)) (param "rep" u32)))
     (export "[method]resource1.take-borrow" (func (param "self" (borrow $r)) (param "b" (borrow $r))))
@@ -886,7 +886,7 @@
 ;; Cannot pass out an owned resource when it's borrowed by the same call
 (component
   (import "host" (instance $host
-    (export $r "resource1" (type (sub resource)))
+    (export "resource1" (type $r (sub resource)))
     (export "[constructor]resource1" (func (param "r" u32) (result (own $r))))
     (export "[method]resource1.take-own" (func (param "self" (borrow $r)) (param "b" (own $r))))
   ))
@@ -927,7 +927,7 @@
 ;; Borrows must actually exist
 (component
   (import "host" (instance $host
-    (export $r "resource1" (type (sub resource)))
+    (export "resource1" (type $r (sub resource)))
     (export "[method]resource1.simple" (func (param "self" (borrow $r)) (param "b" u32)))
   ))
 
@@ -996,7 +996,7 @@
 
   (component $B
     (import "a" (instance $i
-      (export $t "t" (type (sub resource)))
+      (export "t" (type $t (sub resource)))
       (export "[constructor]t" (func (param "x" u32) (result (own $t))))
       (export "[method]t.assert" (func (param "self" (borrow $t)) (param "x" u32)))
       (export "[static]t.assert-own" (func (param "self" (own $t)) (param "x" u32)))

tests/misc_testsuite/component-model/types.wast

@@ -250,7 +250,7 @@
 
 (component
   (type (instance
-    (export $x "x" (instance
+    (export "x" (instance $x
       (type $t u32)
       (export "y" (type (eq $t)))
     ))
@@ -331,7 +331,7 @@
 (component
   (import "a" (instance
     (type $t1 u64)
-    (export $t2 "a" (type (eq $t1)))
+    (export "a" (type $t2 (eq $t1)))
     (export "b" (type (eq $t2)))
   ))
 )