wesl 0.6.49 → 0.7.1

package/src/test/{ParseConditions.test.ts → ParseConditionsV2.test.ts}

@@ -24,7 +24,6 @@ test("@if(false) enable f16", () => {
     "module
       text '
         '
-      attribute @if(false)
       directive enable f16 @if
       text '
       '"
@@ -51,7 +50,7 @@ test("@if(false) const_assert true;", () => {
 
 test("@if(true) var x = 7", () => {
   const src = `
-    @if(true) var x = 7; 
+    @if(true) var x = 7;
   `;
   const ast = parseTest(src);
   const astString = astToString(ast.moduleElem);
@@ -65,7 +64,7 @@ test("@if(true) var x = 7", () => {
         typeDecl %x
           decl %x
         text ' = 7;'
-      text ' 
+      text '
       '"
   `);
 });
@@ -92,8 +91,8 @@ test("conditional statement", () => {
             text 'var '
             typeDecl %x
               decl %x
-            text ' = 1'
-          text ';
+            text ' = 1;'
+          text '
           '
           statement @if
             attribute @if(true)
@@ -129,10 +128,13 @@ test("compound statement", () => {
           statement @if
             attribute @if(false)
             text ' {
-            let '
-            typeDecl %x
-              decl %x
-            text ' = 1;
+            '
+            let %x
+              text 'let '
+              typeDecl %x
+                decl %x
+              text ' = 1;'
+            text '
           }'
           text '
         }'
@@ -158,15 +160,12 @@ test("conditional local var", () => {
         statement
           text '{
           '
-          statement @if
+          var %x @if
             attribute @if(true)
-            text ' '
-            var %x
-              text 'var '
-              typeDecl %x
-                decl %x
-              text ' = 1'
-            text ';'
+            text ' var '
+            typeDecl %x
+              decl %x
+            text ' = 1;'
           text '
         }'
       text '
@@ -240,14 +239,20 @@ test("@else with function", () => {
         attribute @if(DEBUG)
         decl %foo
         statement
-          text '{ return 1; }'
+          text '{'
+          statement
+            text ' return 1;'
+          text ' }'
       text '
         '
       fn foo() @else
         attribute @else
         decl %foo
         statement
-          text '{ return 2; }'
+          text '{'
+          statement
+            text ' return 2;'
+          text ' }'
       text '
       '"
   `);
@@ -271,7 +276,7 @@ test("@else with statement", () => {
         statement
           text '{
           '
-          statement @if
+          let %x @if
             attribute @if(A)
             text ' let '
             typeDecl %x
@@ -279,7 +284,7 @@ test("@else with statement", () => {
             text ' = 1.0;'
           text '
           '
-          statement @else
+          let %x @else
             attribute @else
             text ' let '
             typeDecl %x
@@ -312,18 +317,24 @@ test("@else compound statement", () => {
           '
           statement @if
             attribute @if(MOBILE)
-            text ' { let '
-            typeDecl %a
-              decl %a
-            text ' = 1; }'
+            text ' { '
+            let %a
+              text 'let '
+              typeDecl %a
+                decl %a
+              text ' = 1;'
+            text ' }'
           text '
           '
           statement @else
             attribute @else
-            text ' { let '
-            typeDecl %a
-              decl %a
-            text ' = 2; }'
+            text ' { '
+            let %a
+              text 'let '
+              typeDecl %a
+                decl %a
+              text ' = 2;'
+            text ' }'
           text '
         }'
       text '
@@ -358,16 +369,15 @@ test("@else with struct member", () => {
             ref f32
         text ',
           '
-        member @else x: vec3<f32>
+        member @else x: vec3<ref f32>
           attribute @else
           text ' '
           name x
           text ': '
-          type vec3<f32>
+          type vec3<ref f32>
             ref vec3
             text '<'
-            type f32
-              ref f32
+            ref f32
             text '>'
         text ',
         }'
@@ -432,30 +442,28 @@ test("parse @else fn", () => {
         attribute @if(FOO)
         decl %testFn
         statement
-          text '{ let '
-          typeDecl %a
-            decl %a
-          text ' = 0; }'
+          text '{ '
+          let %a
+            text 'let '
+            typeDecl %a
+              decl %a
+            text ' = 0;'
+          text ' }'
       text '
         '
       fn testFn() @else
         attribute @else
         decl %testFn
         statement
-          text '{ let '
-          typeDecl %a
-            decl %a
-          text ' = 1; }'
+          text '{ '
+          let %a
+            text 'let '
+            typeDecl %a
+              decl %a
+            text ' = 1;'
+          text ' }'
       text '
       '"
   `,
   );
 });
-
-// test("", () => {
-//   const src = `
-//   `;
-//   const ast = parseTest(src);
-//   const astString = astToString(ast.moduleElem);
-//   expect(astString).toMatchInlineSnapshot('tbd');
-// });

package/src/test/ParseErrorV2.test.ts

@@ -0,0 +1,73 @@
+import { expect, test } from "vitest";
+import { errorHighlight } from "../Util.ts";
+import { parseTest } from "./TestUtil.ts";
+
+test("parse fn foo() { invalid }", () => {
+  const src = "fn foo() { let }";
+  expect(() => parseTest(src)).toThrowErrorMatchingInlineSnapshot(`
+    [Error: ./test.wesl:1:16 error: Expected identifier after 'let'
+    fn foo() { let }
+                   ^]
+  `);
+});
+
+test("parse invalid if", () => {
+  const src = `fn foo() {
+  let a = 3;
+  if(1<1) { 🐈‍⬛ } else {  }
+  }`;
+  expect(() => parseTest(src)).toThrowErrorMatchingInlineSnapshot(`
+    [Error: ./test.wesl:3:13 error: Invalid token 🐈
+
+      if(1<1) { 🐈‍⬛ } else {  }
+                 ^^]
+  `);
+});
+
+test("parse invalid name", () => {
+  const src = "var package = 3;";
+  expect(() => parseTest(src)).toThrowErrorMatchingInlineSnapshot(`
+    [Error: ./test.wesl:1:5 error: Expected identifier after 'var'
+    var package = 3;
+        ^^^^^^^]
+  `);
+});
+
+test("error highlight", () => {
+  expect(errorHighlight("foo", [0, 2]).join("\n")).toBe(`foo
+^^`);
+  expect(errorHighlight("foo", [0, 1]).join("\n")).toBe(`foo
+^`);
+  expect(errorHighlight("foo", [0, 0]).join("\n")).toBe(`foo
+^`);
+  expect(errorHighlight("foo", [1, 2]).join("\n")).toBe(`foo
+ ^`);
+});
+
+test("@must_use with empty parens", () => {
+  const src = `@must_use() fn foo() -> u32 { return 0; }`;
+  expect(() => parseTest(src)).toThrow();
+});
+
+test("semicolon after continuing", () => {
+  const src = `fn f() { loop { break; continuing{}; } }`;
+  expect(() => parseTest(src)).toThrow();
+});
+
+test("package in middle of path", () => {
+  const src = `fn f() { foo::package::bar(); }`;
+  expect(() => parseTest(src)).toThrowErrorMatchingInlineSnapshot(`
+    [Error: ./test.wesl:1:15 error: Expected identifier after '::'
+    fn f() { foo::package::bar(); }
+                  ^^^^^^^]
+  `);
+});
+
+test("super in middle of type path", () => {
+  const src = `fn f(a: foo::super::Bar) {}`;
+  expect(() => parseTest(src)).toThrowErrorMatchingInlineSnapshot(`
+    [Error: ./test.wesl:1:14 error: Expected identifier after '::'
+    fn f(a: foo::super::Bar) {}
+                 ^^^^^]
+  `);
+});