Merge branch 'master' into pp/add-ext

.github/workflows/build.yml

@@ -17,12 +17,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: cocogitto/[email protected]
-        with:
-          check-latest-tag-only: true
-          git-user: glsl-lang
-          git-user-email: [email protected]
-
       - uses: actions/cache@v4
         with:
           key: ${{ runner.os }}
@@ -44,6 +38,12 @@ jobs:
       - name: Check clippy lints
         run: cargo clippy -- -D warnings -A clippy::result_large_err
 
+      - uses: cocogitto/[email protected]
+        with:
+          check-latest-tag-only: true
+          git-user: glsl-lang
+          git-user-email: [email protected]
+
   test:
     name: Test crate
 

CHANGELOG.md

@@ -1,6 +1,14 @@
 ## [Unreleased]
 
 - - -
+## v0.7.0 - 2024-11-11
+#### Features
+- **(parser)** add type_qualifier only in decls (#56) - (b71dd7b) - Yorkie Makoto
+#### Miscellaneous Chores
+- **(version)** v0.6.1 [skip ci] - (8759d96) - glsl-lang
+
+- - -
+
 ## v0.6.1 - 2024-10-01
 #### Bug Fixes
 - **(transpiler)** append "precision" for precision decl (#53) - (1596970) - Yorkie Makoto

lang-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glsl-lang-cli"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Alixinne <[email protected]>"]
 edition = "2021"
 license = "BSD-3-Clause"
@@ -13,9 +13,9 @@ keywords = ["glsl", "language", "parser", "ast", "cli"]
 categories = ["command-line-interface", "parser-implementations", "rendering"]
 
 [dependencies]
-glsl-lang = { version = "=0.6.1", features = ["lexer-v2-full"] }
-glsl-lang-pp = { version = "=0.6.1" }
-lang-util = "=0.6.1"
+glsl-lang = { version = "=0.7.0", features = ["lexer-v2-full"] }
+glsl-lang-pp = { version = "=0.7.0" }
+lang-util = "=0.7.0"
 argh = "0.1"
 
 serde_json = { version = "1.0", optional = true }

lang-lexer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glsl-lang-lexer"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Alixinne <[email protected]>"]
 edition = "2021"
 license = "BSD-3-Clause"
@@ -13,8 +13,8 @@ keywords = ["glsl", "language", "parser"]
 categories = ["parser-implementations", "rendering"]
 
 [dependencies]
-glsl-lang-types = "=0.6.1"
-lang-util = { version = "=0.6.1", features = ["lalrpop"] }
+glsl-lang-types = "=0.7.0"
+lang-util = { version = "=0.7.0", features = ["lalrpop"] }
 
 thiserror = "1.0"
 
@@ -24,7 +24,7 @@ rserde = { version = "1.0", optional = true, features = ["derive"], package = "s
 logos = { version = "0.12", optional = true }
 
 # v2 lexer dependencies
-glsl-lang-pp = { version = "=0.6.1", optional = true }
+glsl-lang-pp = { version = "=0.7.0", optional = true }
 lalrpop-util = { version = "0.20.0", default-features = false, optional = true }
 
 [features]

lang-pp/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glsl-lang-pp"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Alixinne <[email protected]>"]
 edition = "2021"
 license = "BSD-3-Clause"
@@ -14,7 +14,7 @@ categories = ["parser-implementations", "rendering"]
 build = "build.rs"
 
 [dependencies]
-lang-util = "=0.6.1"
+lang-util = "=0.7.0"
 
 string_cache = "0.8"
 thiserror = "1.0"
@@ -32,7 +32,7 @@ itertools = { version = "0.13", optional = true }
 once_cell = { version = "1.17.1", optional = true }
 
 [dev-dependencies]
-lang-util-dev = "=0.6.1"
+lang-util-dev = "=0.7.0"
 
 expect-test = "1.3"
 encoding_rs = "0.8"

lang-quote/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glsl-lang-quote"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Alixinne <[email protected]>"]
 edition = "2021"
 license = "BSD-3-Clause"
@@ -17,7 +17,7 @@ proc-macro = true
 path = "src/lib.rs"
 
 [dependencies]
-glsl-lang = { version = "=0.6.1", default-features = false, features = ["lexer-v2-full"] }
+glsl-lang = { version = "=0.7.0", default-features = false, features = ["lexer-v2-full"] }
 
 proc-macro2 = "1"
 quote = "1"

lang-quote/src/tokenize.rs

@@ -1117,6 +1117,11 @@ fn tokenize_declaration(d: &ast::Declaration) -> TokenStream {
             let ident = tokenize_identifier(ident);
             quote! { glsl_lang::ast::DeclarationData::Invariant(#ident) }
         }
+
+        ast::DeclarationData::TypeOnly(ref q) => {
+            let q = tokenize_type_qualifier(q);
+            quote! { glsl_lang::ast::DeclarationData::TypeOnly(#q) }
+        }
     };
 
     let span = tokenize_span(&d.span);

lang-quote/tests/lib.rs

@@ -125,3 +125,10 @@ fn statement_var_decl() {
         }
     };
 }
+
+#[test]
+fn typeonly_multiview_qualifier() {
+    let _ = glsl! {
+        layout (num_views = 2) in;
+    };
+}

lang-types/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glsl-lang-types"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Alixinne <[email protected]>"]
 edition = "2021"
 license = "BSD-3-Clause"
@@ -13,7 +13,7 @@ keywords = ["glsl", "language", "parser"]
 categories = ["rendering"]
 
 [dependencies]
-lang-util = "=0.6.1"
+lang-util = "=0.7.0"
 thiserror = "1.0"
 
 rserde = { version = "1.0", optional = true, features = ["derive"], package = "serde" }

lang-types/src/ast.rs

@@ -991,6 +991,8 @@ pub enum DeclarationData {
     Block(Block),
     /// Invariant declaration
     Invariant(Identifier),
+    /// Type-only declaration
+    TypeOnly(TypeQualifier),
 }
 
 impl_node_content! {

lang-util-derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lang-util-derive"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Alixinne <[email protected]>"]
 edition = "2021"
 license = "BSD-3-Clause"

lang-util-dev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lang-util-dev"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Alixinne <[email protected]>"]
 edition = "2021"
 license = "BSD-3-Clause"

lang-util/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lang-util"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Alixinne <[email protected]>"]
 edition = "2021"
 license = "BSD-3-Clause"
@@ -13,7 +13,7 @@ keywords = ["language", "parser", "ast"]
 categories = ["parsing"]
 
 [dependencies]
-lang-util-derive = "=0.6.1"
+lang-util-derive = "=0.7.0"
 line-span = "0.1"
 smol_str = "0.2"
 text-size = "1.1"

lang/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glsl-lang"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Alixinne <[email protected]>"]
 edition = "2021"
 license = "BSD-3-Clause"
@@ -17,19 +17,19 @@ lalrpop-util = { version = "0.20.0", default-features = false, features = ["std"
 once_cell = "1.17.1"
 thiserror = "1.0"
 
-lang-util = { version = "=0.6.1", features = ["lalrpop"] }
-glsl-lang-pp = { version = "=0.6.1", optional = true }
-glsl-lang-lexer = { version = "=0.6.1", features = ["lalrpop"] }
-glsl-lang-types = "=0.6.1"
+lang-util = { version = "=0.7.0", features = ["lalrpop"] }
+glsl-lang-pp = { version = "=0.7.0", optional = true }
+glsl-lang-lexer = { version = "=0.7.0", features = ["lalrpop"] }
+glsl-lang-types = "=0.7.0"
 
 rserde = { version = "1.0", optional = true, features = ["derive"], package = "serde" }
 
 [build-dependencies]
 lalrpop = "0.20.0"
 
 [dev-dependencies]
-lang-util-dev = "=0.6.1"
-glsl-lang-pp = "=0.6.1"
+lang-util-dev = "=0.7.0"
+glsl-lang-pp = "=0.7.0"
 
 criterion = "0.5"
 expect-test = "1.3"

lang/src/parser.lalrpop

@@ -694,6 +694,7 @@ declaration: ast::Declaration = {
     <l:@L> <p:precision_declaration> ";" <r:@R> => p.spanned(l, r),
     <l:@L> <b:block_declaration> ";"     <r:@R> => ast::DeclarationData::Block(b).spanned(l, r),
     <l:@L> "invariant" <i:identifier> ";" <r:@R> => ast::DeclarationData::Invariant(i).spanned(l, r),
+    <l:@L> <q:type_qualifier> ";" <r:@R> => ast::DeclarationData::TypeOnly(q).spanned(l, r),
 };
 
 function_definition: ast::FunctionDefinition = {

lang/src/transpiler/glsl.rs

@@ -1540,6 +1540,9 @@ where
             f.write_char(' ')?;
             show_identifier(f, ident, state)?;
         }
+        ast::DeclarationData::TypeOnly(ref q) => {
+            show_type_qualifier(f, q, state)?;
+        }
     }
 
     state.write_declaration_terminator(f)

lang/src/visitor.rs

@@ -740,6 +740,8 @@ macro_rules! make_host_trait {
             ast::DeclarationData::Block(block) => block.$mthd_name(visitor),
 
             ast::DeclarationData::Invariant(ident) => ident.$mthd_name(visitor),
+
+            ast::DeclarationData::TypeOnly(q) => q.$mthd_name(visitor),
           }
         }
       }

xtask/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xtask"
-version = "0.6.1"
+version = "0.7.0"
 edition = "2021"
 
 [dependencies]