#78 - added support for array literals

dparnell · Nov 16, 2024 · 52c22d0 · 52c22d0
1 parent b4be88f
commit 52c22d0
Show file tree

Hide file tree

Showing 7 changed files with 1,116 additions and 1,081 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 # wgsl plugin Changelog
 
 ## Unreleased
+- support array literals
 
 ## 0.0.34 - 2024-10-26
 

diff --git a/examples/ticket_78.wgsl b/examples/ticket_78.wgsl
@@ -13,4 +13,6 @@ fn vs_main(@builtin(vertex_index) in_vertex_index: u32) -> Vertex {
 @fragment
 fn fs_main(in: Vertex) -> @location(0) vec4f {
 	return vec4(1.0, 0.0, 0.0, 1.0);
-}
+}
+
+const pos = array(vec2f(0, -1), vec2f(1, -1), vec2f(0, 0), vec2f(1, 0));
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@
 pluginGroup = wgslplugin
 pluginName = wgsl
 # SemVer format -> https://semver.org
-pluginVersion = 0.0.34
+pluginVersion = 0.0.35
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

diff --git a/src/main/gen/wgslplugin/language/_WgslLexer.java b/src/main/gen/wgslplugin/language/_WgslLexer.java
diff --git a/src/main/gen/wgslplugin/language/parser/WgslParser.java b/src/main/gen/wgslplugin/language/parser/WgslParser.java
diff --git a/src/main/java/wgslplugin/language/WGSLLexer.flex b/src/main/java/wgslplugin/language/WGSLLexer.flex
@@ -43,6 +43,7 @@ import static wgslplugin.language.psi.WGSLTypes.*;
 %type IElementType
 %unicode
 
+%state ARRAY_SPEC
 %state TYPE_SPEC
 %state BIND_SPEC
 %state ATTRIBUTE
@@ -76,15 +77,16 @@ IDENT = ([a-zA-Z_][0-9a-zA-Z_][0-9a-zA-Z_]*)|([a-zA-Z][0-9a-zA-Z_]*)
 <YYINITIAL, ATTRIBUTE>  "true"                                   { return TRUE; }
 <YYINITIAL, ATTRIBUTE>  "false"                                  { return FALSE; }
 <YYINITIAL, ATTRIBUTE>  {DECIMAL_FLOAT_LITERAL}                  { return DECIMAL_FLOAT_LITERAL; }
-<YYINITIAL, ATTRIBUTE>  {HEX_FLOAT_LITERAL}         { return HEX_FLOAT_LITERAL; }
-<YYINITIAL>  "[["                                   { pushState(ATTRIBUTE); return ATTR_LEFT; }
-<YYINITIAL, TYPE_SPEC, BIND_SPEC, ATTRIBUTE>  ","              { return COMMA; }
-<ATTRIBUTE>  "]]"                                   { popState(); return ATTR_RIGHT; }
-<YYINITIAL, ATTRIBUTE>  "("                         { return PAREN_LEFT; }
-<TYPE_SPEC>  "("                                    { popState(); return PAREN_LEFT; }
-<YYINITIAL, ATTRIBUTE>  ")"                         { return PAREN_RIGHT; }
-<YYINITIAL, TYPE_SPEC>  "array"                 { pushState(TYPE_SPEC); return ARRAY; }
-<YYINITIAL>  "<"                                { return LESS_THAN; }
+<YYINITIAL, ATTRIBUTE>  {HEX_FLOAT_LITERAL}                      { return HEX_FLOAT_LITERAL; }
+<YYINITIAL>  "[["                                                { pushState(ATTRIBUTE); return ATTR_LEFT; }
+<YYINITIAL, TYPE_SPEC, BIND_SPEC, ATTRIBUTE>  ","                { return COMMA; }
+<ATTRIBUTE>  "]]"                                                { popState(); return ATTR_RIGHT; }
+<YYINITIAL, ATTRIBUTE>  "("                                      { return PAREN_LEFT; }
+<TYPE_SPEC>  "("                                                 { popState(); return PAREN_LEFT; }
+<YYINITIAL, ATTRIBUTE>  ")"                                      { return PAREN_RIGHT; }
+<YYINITIAL>  "array"                                             { pushState(ARRAY_SPEC); return ARRAY; }
+<TYPE_SPEC>  "array"                                             { pushState(TYPE_SPEC); return ARRAY; }
+<YYINITIAL>  "<"                                                 { return LESS_THAN; }
 <TYPE_SPEC, BIND_SPEC>  "<"                     { return TYPE_LESS_THAN; }
 <YYINITIAL>  ">"                                { return GREATER_THAN; }
 <TYPE_SPEC, BIND_SPEC>  ">"                     { popState(); return TYPE_GREATER_THAN; }
@@ -94,6 +96,9 @@ IDENT = ([a-zA-Z_][0-9a-zA-Z_][0-9a-zA-Z_]*)|([a-zA-Z][0-9a-zA-Z_]*)
 <YYINITIAL>  ";"                                { return SEMICOLON; }
 <YYINITIAL>  "@"                                { return AT; }
 
+<ARRAY_SPEC> "(" { popState(); return PAREN_LEFT; }
+<ARRAY_SPEC> "<" { popState(); pushState(TYPE_SPEC); return TYPE_LESS_THAN; }
+
 <PREPROCESSOR, PREPROCESSOR_NESTED> "{"         { pushState(PREPROCESSOR_NESTED); return PREPROCESSOR_DECLARATION; }
 <PREPROCESSOR, PREPROCESSOR_NESTED> "}"         { popState(); return PREPROCESSOR_DECLARATION; }
 

diff --git a/src/main/java/wgslplugin/language/wgsl.bnf b/src/main/java/wgslplugin/language/wgsl.bnf
@@ -273,7 +273,7 @@ const_expression ::=
 primary_expression ::=
       func_call_statement
     | variable_reference
-    | type_decl argument_expression_list
+    | (type_decl | ARRAY) argument_expression_list
     | const_literal
     | paren_expression
     | BITCAST TYPE_LESS_THAN type_decl TYPE_GREATER_THAN paren_expression