wesl 0.7.26 → 0.7.28

package/src/test/ParseWeslV2.test.ts

@@ -15,8 +15,7 @@ test("parse fn foo() { }", () => {
     "module
       fn foo()
         decl %foo
-        statement
-          text '{ }'"
+        block"
   `);
 });
 
@@ -27,17 +26,13 @@ test("parse fn with calls", () => {
     "module
       fn foo()
         decl %foo
-        statement
-          text '{'
-          statement
-            text ' '
-            ref foo
-            text '();'
-          statement
-            text ' '
-            ref bar
-            text '();'
-          text ' }'"
+        block
+          call
+            call-expression call
+              ref foo
+          call
+            call-expression call
+              ref bar"
   `);
 });
 
@@ -67,13 +62,11 @@ test("parse global var", () => {
   expect(astString).toMatchInlineSnapshot(`
     "module
       gvar %x : i32
-        text 'var '
         typeDecl %x : i32
           decl %x
-          text ': '
           type i32
             ref i32
-        text ' = 1;'"
+        literal literal(1)"
   `);
 });
 
@@ -84,12 +77,9 @@ test("parse alias", () => {
   expect(astString).toMatchInlineSnapshot(`
     "module
       alias %Num=i32
-        text 'alias '
         decl %Num
-        text ' = '
         type i32
-          ref i32
-        text ';'"
+          ref i32"
   `);
 });
 
@@ -100,10 +90,9 @@ test("parse const", () => {
   expect(astString).toMatchInlineSnapshot(`
     "module
       const %y
-        text 'const '
         typeDecl %y
           decl %y
-        text ' = 11u;'"
+        literal literal(11u)"
   `);
 });
 
@@ -114,13 +103,10 @@ test("parse override ", () => {
   expect(astString).toMatchInlineSnapshot(`
     "module
       override %z : f32
-        text 'override '
         typeDecl %z : f32
           decl %z
-          text ': '
           type f32
-            ref f32
-        text ';'"
+            ref f32"
   `);
 });
 
@@ -131,11 +117,9 @@ test("parse const_assert", () => {
   expect(astString).toMatchInlineSnapshot(`
     "module
       assert
-        text 'const_assert '
-        ref x
-        text ' < '
-        ref y
-        text ';'"
+        binary-expression binop(<)
+          ref x
+          ref y"
   `);
 });
 
@@ -146,22 +130,15 @@ test("parse struct", () => {
   expect(astString).toMatchInlineSnapshot(`
     "module
       struct foo
-        text 'struct '
         decl %foo
-        text ' { '
         member bar: i32
           name bar
-          text ': '
           type i32
             ref i32
-        text ', '
         member zip: u32
           name zip
-          text ': '
           type u32
-            ref u32
-        text ', }'
-      text ' ;'"
+            ref u32"
   `);
 });
 
@@ -175,18 +152,10 @@ test("parse global diagnostic", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       directive diagnostic(off, derivative_uniformity)
-      text '
-
-        '
       fn main()
         decl %main
-        statement
-          text '{}'
-      text '
-        '"
+        block"
   `);
 });
 
@@ -199,9 +168,7 @@ test("parse @attribute before fn", () => {
       fn main() @compute
         attribute @compute
         decl %main
-        statement
-          text '{}'
-      text ' '"
+        block"
   `);
 });
 
@@ -215,16 +182,11 @@ test("parse @compute @workgroup_size(a, b, 1) before fn", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn main() @compute @workgroup_size
         attribute @compute
-        attribute @workgroup_size(ref a, ' ' ref b, ' 1')
+        attribute @workgroup_size(ref a, ref b, literal literal(1))
         decl %main
-        statement
-          text '{}'
-      text '
-        '"
+        block"
   `);
 });
 
@@ -238,28 +200,17 @@ test("parse top level var", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       gvar %u : Uniforms @group @binding
-        attribute @group('0')
-        text ' '
-        attribute @binding('0')
-        text ' var<uniform> '
+        attribute @group(literal literal(0))
+        attribute @binding(literal literal(0))
+        name uniform
         typeDecl %u : Uniforms
           decl %u
-          text ': '
           type Uniforms
             ref Uniforms
-        text ';'
-      text '      
-
-        '
       fn main()
         decl %main
-        statement
-          text '{}'
-      text '
-      '"
+        block"
   `);
 });
 
@@ -274,29 +225,17 @@ test("parse top level override and const", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       override %x
-        text 'override '
         typeDecl %x
           decl %x
-        text ' = 21;'
-      text '
-        '
+        literal literal(21)
       const %y
-        text 'const '
         typeDecl %y
           decl %y
-        text ' = 1;'
-      text '
-
-        '
+        literal literal(1)
       fn main()
         decl %main
-        statement
-          text '{}'
-      text '
-      '"
+        block"
   `);
 });
 
@@ -304,10 +243,7 @@ test("parse root level ;;", () => {
   const src = ";;";
   const ast = parseTest(src);
   const astString = astToString(ast.moduleElem);
-  expect(astString).toMatchInlineSnapshot(`
-    "module
-      text ';;'"
-  `);
+  expect(astString).toMatchInlineSnapshot(`"module"`);
 });
 
 test("parse simple alias", () => {
@@ -317,12 +253,9 @@ test("parse simple alias", () => {
   expect(astString).toMatchInlineSnapshot(`
     "module
       alias %NewType=OldType
-        text 'alias '
         decl %NewType
-        text ' = '
         type OldType
-          ref OldType
-        text ';'"
+          ref OldType"
   `);
 });
 
@@ -334,20 +267,12 @@ test("parse array alias", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
-      alias %Points3=array<ref Point, literal literal(3)>
-        text 'alias '
+      alias %Points3=array<Point, 3>
         decl %Points3
-        text ' = '
-        type array<ref Point, literal literal(3)>
+        type array<Point, 3>
           ref array
-          text '<'
           ref Point
-          text ', 3>'
-        text ';'
-      text '
-      '"
+          literal literal(3)"
   `);
 });
 
@@ -361,8 +286,7 @@ test("fnDecl parses fn with return type", () => {
         decl %foo
         type MyType
           ref MyType
-        statement
-          text '{ }'"
+        block"
   `);
 });
 
@@ -374,20 +298,14 @@ test("fnDecl parses :type specifier in fn args", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn foo(a: MyType)
         decl %foo
         param
           typeDecl %a : MyType
             decl %a
-            text ': '
             type MyType
               ref MyType
-        statement
-          text '{ }'
-      text '
-      '"
+        block"
   `);
 });
 
@@ -401,25 +319,14 @@ test("fnDecl parses :type specifier in fn block", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn foo()
         decl %foo
-        statement
-          text '{ 
-          '
+        block
           var %b : MyType
-            text 'var '
             typeDecl %b : MyType
               decl %b
-              text ':'
               type MyType
-                ref MyType
-            text ';'
-          text '
-        }'
-      text '
-      '"
+                ref MyType"
   `);
 });
 
@@ -430,22 +337,15 @@ test("parse type in <template> in fn args", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
-      fn foo(a: vec2<ref MyStruct>)
+      fn foo(a: vec2<MyStruct>)
         decl %foo
         param
-          typeDecl %a : vec2<ref MyStruct>
+          typeDecl %a : vec2<MyStruct>
             decl %a
-            text ': '
-            type vec2<ref MyStruct>
+            type vec2<MyStruct>
               ref vec2
-              text '<'
               ref MyStruct
-              text '>'
-        statement
-          text '{ }'
-      text ';'"
+        block"
   `);
 });
 
@@ -456,19 +356,16 @@ test("parse simple templated type", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      fn main(a: array<ref MyStruct, literal literal(4)>)
+      fn main(a: array<MyStruct, 4>)
         decl %main
         param
-          typeDecl %a : array<ref MyStruct, literal literal(4)>
+          typeDecl %a : array<MyStruct, 4>
             decl %a
-            text ': '
-            type array<ref MyStruct, literal literal(4)>
+            type array<MyStruct, 4>
               ref array
-              text '<'
               ref MyStruct
-              text ',4>'
-        statement
-          text '{ }'"
+              literal literal(4)
+        block"
   `);
 });
 
@@ -478,19 +375,16 @@ test("parse with space before template", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      fn main(a: array<ref MyStruct, literal literal(4)>)
+      fn main(a: array<MyStruct, 4>)
         decl %main
         param
-          typeDecl %a : array<ref MyStruct, literal literal(4)>
+          typeDecl %a : array<MyStruct, 4>
             decl %a
-            text ': '
-            type array<ref MyStruct, literal literal(4)>
+            type array<MyStruct, 4>
               ref array
-              text ' <'
               ref MyStruct
-              text ',4>'
-        statement
-          text '{ }'"
+              literal literal(4)
+        block"
   `);
 });
 
@@ -500,21 +394,18 @@ test("parse nested template that ends with >> ", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      fn main(a: vec2<array<ref MyStruct, literal literal(4)>>)
+      fn main(a: vec2<array<MyStruct, 4>>)
         decl %main
         param
-          typeDecl %a : vec2<array<ref MyStruct, literal literal(4)>>
+          typeDecl %a : vec2<array<MyStruct, 4>>
             decl %a
-            text ': '
-            type vec2<array<ref MyStruct, literal literal(4)>>
+            type vec2<array<MyStruct, 4>>
               ref vec2
-              text '<'
-              ref array
-              text ' <'
-              ref MyStruct
-              text ',4>>'
-        statement
-          text '{ }'"
+              type array<MyStruct, 4>
+                ref array
+                ref MyStruct
+                literal literal(4)
+        block"
   `);
 });
 
@@ -525,17 +416,14 @@ test("parse type in <template> in global var", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      gvar %x : array<ref MyStruct, literal literal(8)>
-        text 'var<private> '
-        typeDecl %x : array<ref MyStruct, literal literal(8)>
+      gvar %x : array<MyStruct, 8>
+        name private
+        typeDecl %x : array<MyStruct, 8>
           decl %x
-          text ':'
-          type array<ref MyStruct, literal literal(8)>
+          type array<MyStruct, 8>
             ref array
-            text '<'
             ref MyStruct
-            text ', 8>'
-        text ';'"
+            literal literal(8)"
   `);
 });
 
@@ -549,31 +437,20 @@ test("parse for(;;) {} not as a fn call", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn main()
         decl %main
-        statement
-          text '{'
-          statement
-            text '
-          for ('
+        block
+          for
             var %a
-              text 'var '
               typeDecl %a
                 decl %a
-              text ' = 1;'
-            text ' '
-            ref a
-            text ' < 10; '
-            ref a
-            text '++) '
-            statement
-              text '{}'
-          text '
-        }'
-      text '
-      '"
+              literal literal(1)
+            binary-expression binop(<)
+              ref a
+              literal literal(10)
+            increment
+              ref a
+            block"
   `);
 });
 
@@ -585,14 +462,9 @@ test("eolf followed by blank line", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn foo()
         decl %foo
-        statement
-          text '{ }'
-      text '
-      '"
+        block"
   `);
 });
 
@@ -609,35 +481,24 @@ test("parse fn with attributes and suffix comma", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-      '
-      fn main(grid: vec3<ref u32>, localIndex: u32) @compute @workgroup_size
+      fn main(grid: vec3<u32>, localIndex: u32) @compute @workgroup_size
         attribute @compute
-        attribute @workgroup_size(ref workgroupThreads, ' 1', ' 1')
+        attribute @workgroup_size(ref workgroupThreads, literal literal(1), literal literal(1))
         decl %main
         param
           attribute @builtin(global_invocation_id)
-          text ' '
-          typeDecl %grid : vec3<ref u32>
+          typeDecl %grid : vec3<u32>
             decl %grid
-            text ': '
-            type vec3<ref u32>
+            type vec3<u32>
               ref vec3
-              text '<'
               ref u32
-              text '>'
         param
           attribute @builtin(local_invocation_index)
-          text ' '
           typeDecl %localIndex : u32
             decl %localIndex
-            text ': '
             type u32
               ref u32
-        statement
-          text '{ }'
-      text '
-      '"
+        block"
   `);
 });
 
@@ -652,22 +513,18 @@ test("parse fn", () => {
         param
           typeDecl %x : i32
             decl %x
-            text ': '
             type i32
               ref i32
         param
           typeDecl %y : u32
             decl %y
-            text ': '
             type u32
               ref u32
         type f32
           ref f32
-        statement
-          text '{'
-          statement
-            text ' return 1.0;'
-          text ' }'"
+        block
+          return
+            literal literal(1.0)"
   `);
 });
 
@@ -680,9 +537,7 @@ test("parse @attribute before fn", () => {
       fn main() @compute
         attribute @compute
         decl %main
-        statement
-          text '{}'
-      text ' '"
+        block"
   `);
 });
 
@@ -704,13 +559,10 @@ test("parse foo::bar(); ", () => {
     "module
       fn main()
         decl %main
-        statement
-          text '{'
-          statement
-            text ' '
-            ref foo::bar
-            text '();'
-          text ' }'"
+        block
+          call
+            call-expression call
+              ref foo::bar"
   `);
 });
 
@@ -722,17 +574,13 @@ test("parse let x: foo::bar; ", () => {
     "module
       fn main()
         decl %main
-        statement
-          text '{ '
+        block
           let %x : foo::bar
-            text 'let '
             typeDecl %x : foo::bar
               decl %x
-              text ': '
               type foo::bar
                 ref foo::bar
-            text ' = 1;'
-          text ' }'"
+            literal literal(1)"
   `);
 });
 
@@ -746,24 +594,15 @@ test("parse var x: foo::bar;", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-         '
       gvar %x : foo::bar
-        text 'var<private> '
+        name private
         typeDecl %x : foo::bar
           decl %x
-          text ': '
           type foo::bar
             ref foo::bar
-        text ';'
-      text '
-         '
       fn main()
         decl %main
-        statement
-          text '{ }'
-      text '
-      '"
+        block"
   `);
 });
 
@@ -780,45 +619,24 @@ test("parse switch statement", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn main(x: i32)
         decl %main
         param
           typeDecl %x : i32
             decl %x
-            text ': '
             type i32
               ref i32
-        statement
-          text '{'
-          statement
-            text '
-          switch ('
-            ref x
-            text ') {'
+        block
+          switch
+            parenthesized-expression parens
+              ref x
             switch-clause
-              text '
-            case 1: '
-              statement
-                text '{'
-                statement
-                  text ' break;'
-                text ' }'
+              literal literal(1)
+              block
+                break
             switch-clause
-              text '
-            default: '
-              statement
-                text '{'
-                statement
-                  text ' break;'
-                text ' }'
-            text '
-          }'
-          text '
-        }'
-      text '
-      '"
+              block
+                break"
   `);
 });
 
@@ -836,48 +654,28 @@ test("parse switch statement-2", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-
-        '
       fn main(x: u32)
         decl %main
         param
           typeDecl %x : u32
             decl %x
-            text ': '
             type u32
               ref u32
-        statement
-          text '{'
-          statement
-            text '
-          switch ( '
-            ref code
-            text ' ) {'
+        block
+          switch
+            parenthesized-expression parens
+              ref code
             switch-clause
-              text '
-            case 5u: '
-              statement
-                text '{'
-                statement
-                  text ' if 1 > 0 '
-                  statement
-                    text '{ }'
-                text ' }'
+              literal literal(5u)
+              block
+                if
+                  binary-expression binop(>)
+                    literal literal(1)
+                    literal literal(0)
+                  block
             switch-clause
-              text '
-            default: '
-              statement
-                text '{'
-                statement
-                  text ' break;'
-                text ' }'
-            text '
-          }'
-          text '
-        }'
-      text '
-      '"
+              block
+                break"
   `);
 });
 
@@ -891,24 +689,15 @@ test("parse struct constructor in assignment", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn main()
         decl %main
-        statement
-          text '{
-          '
+        block
           var %x
-            text 'var '
             typeDecl %x
               decl %x
-            text ' = '
-            ref AStruct
-            text '(1u);'
-          text '
-        }'
-      text '
-       '"
+            call-expression call
+              ref AStruct
+              literal literal(1u)"
   `);
 });
 
@@ -922,24 +711,15 @@ test("parse struct.member (component_or_swizzle)", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn main()
         decl %main
-        statement
-          text '{
-            '
+        block
           let %x
-            text 'let '
             typeDecl %x
               decl %x
-            text ' = '
-            ref u
-            text '.frame;'
-          text '
-        }'
-      text '
-      '"
+            component-member-expression .
+              ref u
+              name frame"
   `);
 });
 
@@ -948,17 +728,14 @@ test("var<workgroup> work: array<u32, 128>;", ctx => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      gvar %work : array<ref u32, literal literal(128)>
-        text 'var<workgroup> '
-        typeDecl %work : array<ref u32, literal literal(128)>
+      gvar %work : array<u32, 128>
+        name workgroup
+        typeDecl %work : array<u32, 128>
           decl %work
-          text ': '
-          type array<ref u32, literal literal(128)>
+          type array<u32, 128>
             ref array
-            text '<'
             ref u32
-            text ', 128>'
-        text ';'"
+            literal literal(128)"
   `);
 });
 
@@ -969,11 +746,9 @@ test("fn f() { _ = 1; }", ctx => {
     "module
       fn f()
         decl %f
-        statement
-          text '{'
-          statement
-            text ' _ = 1;'
-          text ' }'"
+        block
+          assign
+            literal literal(1)"
   `);
 });
 
@@ -982,19 +757,17 @@ test("var foo: vec2<f32 >= vec2( 0.5, -0.5);", ctx => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      gvar %foo : vec2<ref f32>
-        text 'var '
-        typeDecl %foo : vec2<ref f32>
+      gvar %foo : vec2<f32>
+        typeDecl %foo : vec2<f32>
           decl %foo
-          text ': '
-          type vec2<ref f32>
+          type vec2<f32>
             ref vec2
-            text '<'
             ref f32
-            text ' >'
-        text '= '
-        ref vec2
-        text '( 0.5, -0.5);'"
+        call-expression call
+          ref vec2
+          literal literal(0.5)
+          unary-expression unop(-)
+            literal literal(0.5)"
   `);
 });
 
@@ -1005,22 +778,20 @@ test("fn main() { var tmp: array<i32, 1 << 1>=array(1, 2); }", ctx => {
     "module
       fn main()
         decl %main
-        statement
-          text '{ '
-          var %tmp : array<ref i32, binary-expression binop(<<)>
-            text 'var '
-            typeDecl %tmp : array<ref i32, binary-expression binop(<<)>
+        block
+          var %tmp : array<i32, 1 << 1>
+            typeDecl %tmp : array<i32, 1 << 1>
               decl %tmp
-              text ': '
-              type array<ref i32, binary-expression binop(<<)>
+              type array<i32, 1 << 1>
                 ref array
-                text '<'
                 ref i32
-                text ', 1 << 1>'
-            text '='
-            ref array
-            text '(1, 2);'
-          text ' }'"
+                binary-expression binop(<<)
+                  literal literal(1)
+                  literal literal(1)
+            call-expression call
+              ref array
+              literal literal(1)
+              literal literal(2)"
   `);
 });
 
@@ -1088,25 +859,14 @@ test(`parse ptr`, () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
-      gvar %particles : ptr<ref storage, ref f32, ref read_write>
-        text 'var '
-        typeDecl %particles : ptr<ref storage, ref f32, ref read_write>
+      gvar %particles : ptr<storage, f32, read_write>
+        typeDecl %particles : ptr<storage, f32, read_write>
           decl %particles
-          text ': '
-          type ptr<ref storage, ref f32, ref read_write>
+          type ptr<storage, f32, read_write>
             ref ptr
-            text '<'
             ref storage
-            text ', '
             ref f32
-            text ', '
-            ref read_write
-            text '>'
-        text ';'
-      text '
-      '"
+            ref read_write"
   `);
 });
 
@@ -1118,27 +878,16 @@ test(`parse ptr with internal array`, () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
-      gvar %particles : ptr<ref storage, array<ref f32>, ref read_write>
-        text 'var '
-        typeDecl %particles : ptr<ref storage, array<ref f32>, ref read_write>
+      gvar %particles : ptr<storage, array<f32>, read_write>
+        typeDecl %particles : ptr<storage, array<f32>, read_write>
           decl %particles
-          text ': '
-          type ptr<ref storage, array<ref f32>, ref read_write>
+          type ptr<storage, array<f32>, read_write>
             ref ptr
-            text '<'
             ref storage
-            text ', '
-            ref array
-            text '<'
-            ref f32
-            text '>, '
-            ref read_write
-            text '>'
-        text ';'
-      text '
-      '"
+            type array<f32>
+              ref array
+              ref f32
+            ref read_write"
   `);
 });
 
@@ -1152,35 +901,19 @@ test(`parse binding struct`, () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       struct Bindings
-        text 'struct '
         decl %Bindings
-        text ' {
-          '
-        member @group @binding particles: ptr<ref storage, array<ref f32>, ref read_write>
-          attribute @group('0')
-          text ' '
-          attribute @binding('0')
-          text ' '
+        member @group @binding particles: ptr<storage, array<f32>, read_write>
+          attribute @group(literal literal(0))
+          attribute @binding(literal literal(0))
           name particles
-          text ': '
-          type ptr<ref storage, array<ref f32>, ref read_write>
+          type ptr<storage, array<f32>, read_write>
             ref ptr
-            text '<'
             ref storage
-            text ', '
-            ref array
-            text '<'
-            ref f32
-            text '>, '
-            ref read_write
-            text '>'
-        text ', 
-        }'
-      text '
-      '"
+            type array<f32>
+              ref array
+              ref f32
+            ref read_write"
   `);
 });
 
@@ -1192,22 +925,17 @@ test(`parse struct reference`, () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn f()
         decl %f
-        statement
-          text '{ '
+        block
           let %x
-            text 'let '
             typeDecl %x
               decl %x
-            text ' = '
-            ref a
-            text '.b[0];'
-          text ' }'
-      text ';
-      '"
+            component-expression []
+              component-member-expression .
+                ref a
+                name b
+              literal literal(0)"
   `);
 });
 
@@ -1221,25 +949,22 @@ test("member reference with extra components", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-      '
       fn foo()
         decl %foo
-        statement
-          text '{'
-          statement
-            text '
-        '
-            ref output
-            text '[ '
-            ref out
-            text ' + 0u ] = '
-            ref c
-            text '.p0.t0.x;'
-          text '
-      }'
-      text '
-     '"
+        block
+          assign
+            component-expression []
+              ref output
+              binary-expression binop(+)
+                ref out
+                literal literal(0u)
+            component-member-expression .
+              component-member-expression .
+                component-member-expression .
+                  ref c
+                  name p0
+                name t0
+              name x"
   `);
 });
 
@@ -1253,26 +978,19 @@ test("parse let declaration", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn vertexMain()
         decl %vertexMain
-        statement
-          text '{
-          '
+        block
           let %char
-            text 'let '
             typeDecl %char
               decl %char
-            text ' = '
-            ref array
-            text '<'
-            ref u32
-            text ', 2>(0, 0);'
-          text '
-        }'
-      text '
-      '"
+            call-expression call
+              type array<u32, 2>
+                ref array
+                ref u32
+                literal literal(2)
+              literal literal(0)
+              literal literal(0)"
   `);
 });
 
@@ -1286,25 +1004,15 @@ test("parse let declaration with type", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn vertexMain()
         decl %vertexMain
-        statement
-          text '{
-          '
+        block
           let %char : u32
-            text 'let '
             typeDecl %char : u32
               decl %char
-              text ' : '
               type u32
                 ref u32
-            text ' = 0;'
-          text '
-        }'
-      text '
-      '"
+            literal literal(0)"
   `);
 });
 
@@ -1318,24 +1026,13 @@ test("separator in let assignment", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn vertexMain()
         decl %vertexMain
-        statement
-          text '{
-          '
+        block
           let %a
-            text 'let '
             typeDecl %a
               decl %a
-            text ' = '
-            ref b::c
-            text ';'
-          text '
-        }'
-      text '
-      '"
+            ref b::c"
   `);
 });
 
@@ -1349,21 +1046,12 @@ test("separator in fn call ", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn vertexMain()
         decl %vertexMain
-        statement
-          text '{'
-          statement
-            text '
-          '
-            ref b::c
-            text '();'
-          text '
-        }'
-      text '
-      '"
+        block
+          call
+            call-expression call
+              ref b::c"
   `);
 });
 
@@ -1380,76 +1068,40 @@ test("binding struct", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       struct Bindings
-        text 'struct '
         decl %Bindings
-        text ' {
-          '
-        member @group @binding particles: ptr<ref storage, array<ref f32>, ref read_write>
-          attribute @group('0')
-          text ' '
-          attribute @binding('0')
-          text ' '
+        member @group @binding particles: ptr<storage, array<f32>, read_write>
+          attribute @group(literal literal(0))
+          attribute @binding(literal literal(0))
           name particles
-          text ': '
-          type ptr<ref storage, array<ref f32>, ref read_write>
+          type ptr<storage, array<f32>, read_write>
             ref ptr
-            text '<'
             ref storage
-            text ', '
-            ref array
-            text '<'
-            ref f32
-            text '>, '
+            type array<f32>
+              ref array
+              ref f32
             ref read_write
-            text '>'
-        text ', 
-          '
-        member @group @binding uniforms: ptr<ref uniform, ref Uniforms>
-          attribute @group('0')
-          text ' '
-          attribute @binding('1')
-          text ' '
+        member @group @binding uniforms: ptr<uniform, Uniforms>
+          attribute @group(literal literal(0))
+          attribute @binding(literal literal(1))
           name uniforms
-          text ': '
-          type ptr<ref uniform, ref Uniforms>
+          type ptr<uniform, Uniforms>
             ref ptr
-            text '<'
             ref uniform
-            text ', '
             ref Uniforms
-            text '>'
-        text ', 
-          '
-        member @group @binding tex: texture_2d<ref rgba8unorm>
-          attribute @group('0')
-          text ' '
-          attribute @binding('2')
-          text ' '
+        member @group @binding tex: texture_2d<rgba8unorm>
+          attribute @group(literal literal(0))
+          attribute @binding(literal literal(2))
           name tex
-          text ': '
-          type texture_2d<ref rgba8unorm>
+          type texture_2d<rgba8unorm>
             ref texture_2d
-            text '<'
             ref rgba8unorm
-            text '>'
-        text ',
-          '
         member @group @binding samp: sampler
-          attribute @group('0')
-          text ' '
-          attribute @binding('3')
-          text ' '
+          attribute @group(literal literal(0))
+          attribute @binding(literal literal(3))
           name samp
-          text ': '
           type sampler
-            ref sampler
-        text ',
-        }'
-      text '
-      '"
+            ref sampler"
   `);
 });
 
@@ -1463,23 +1115,20 @@ test("memberRefs with extra components", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn main()
         decl %main
-        statement
-          text '{'
-          statement
-            text '
-          '
-            ref b
-            text '.particles[0] = '
-            ref b
-            text '.uniforms.foo;'
-          text '
-        }'
-      text '
-      '"
+        block
+          assign
+            component-expression []
+              component-member-expression .
+                ref b
+                name particles
+              literal literal(0)
+            component-member-expression .
+              component-member-expression .
+                ref b
+                name uniforms
+              name foo"
   `);
 });
 
@@ -1493,23 +1142,16 @@ test("memberRef with ref in array", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn main()
         decl %main
-        statement
-          text '{'
-          statement
-            text '
-          '
-            ref vsOut
-            text '.barycenticCoord['
-            ref vertNdx
-            text '] = 1.0;'
-          text '
-        }'
-      text '
-      '"
+        block
+          assign
+            component-expression []
+              component-member-expression .
+                ref vsOut
+                name barycenticCoord
+              ref vertNdx
+            literal literal(1.0)"
   `);
 });
 
@@ -1523,21 +1165,12 @@ test("parse inline package reference", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-        '
       fn main()
         decl %main
-        statement
-          text '{'
-          statement
-            text '
-          '
-            ref package::foo::bar
-            text '();'
-          text '
-        }'
-      text '
-      '"
+        block
+          call
+            call-expression call
+              ref package::foo::bar"
   `);
 });
 
@@ -1552,31 +1185,19 @@ test("parse @location", () => {
   const astString = astToString(ast.moduleElem);
   expect(astString).toMatchInlineSnapshot(`
     "module
-      text '
-          '
       fn fragmentMain(pos: vec4f) @fragment -> vec4f
         attribute @fragment
         decl %fragmentMain
         param
           attribute @builtin(position)
-          text ' '
           typeDecl %pos : vec4f
             decl %pos
-            text ': '
             type vec4f
               ref vec4f
         type vec4f
           ref vec4f
-        statement
-          text '{'
-          statement
-            text ' 
-            return '
-            ref pos
-            text ';'
-          text '
-          }'
-      text '
-      '"
+        block
+          return
+            ref pos"
   `);
 });