github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[wgsl] add min/max support

Browse Source
This commit is contained in:
Dzmitry Malyshau
2020-12-06 01:20:43 -05:00
committed by Dzmitry Malyshau
parent ef4e8cacf9
commit b597bc5af6
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/front/wgsl/mod.rs
View File

@@ -626,6 +626,17 @@ impl Parser {
})
} else {
match word {
"min" | "max" => {
lexer.expect(Token::Paren('('))?;
let a = self.parse_primary_expression(lexer, ctx.reborrow())?;
lexer.expect(Token::Separator(','))?;
let b = self.parse_primary_expression(lexer, ctx.reborrow())?;
lexer.expect(Token::Paren(')'))?;
Some(crate::Expression::Call {
origin: crate::FunctionOrigin::External(word.to_string()),
arguments: vec![a, b],
})
}
"dot" => {
lexer.expect(Token::Paren('('))?;
let a = self.parse_primary_expression(lexer, ctx.reborrow())?;

14
src/front/wgsl/tests.rs
View File

@@ -6,6 +6,20 @@ fn parse_types() {
assert!(parse_str("const a : x32 = 2;").is_err());
}
#[test]
fn parse_type_cast() {
parse_str(
"
const a : i32 = 2;
fn main() {
var x: f32 = f32(a);
#x = f32(i32(a + 1) / 2); //TODO
}
",
)
.unwrap();
}
#[test]
fn parse_if() {
parse_str(