fix(cli): actually setup fs preprocessor

Author: alixinne

lang-cli/Cargo.toml

@@ -14,6 +14,7 @@ categories = ["command-line-interface", "parser-implementations", "rendering"]
 
 [dependencies]
 glsl-lang = { version = "=0.5.1", features = ["lexer-v2-full"] }
+glsl-lang-pp = { version = "=0.5.1" }
 lang-util = "=0.5.1"
 argh = "0.1"
 

lang-cli/src/main.rs

@@ -15,13 +15,14 @@
 
 #![deny(missing_docs)]
 
-use std::io::prelude::*;
+use std::{io::prelude::*, path::Path};
 
 use argh::FromArgs;
 
 use glsl_lang::{
     ast::{NodeDisplay, TranslationUnit},
-    parse::DefaultParse,
+    lexer::v2_full::fs::PreprocessorExt,
+    parse::IntoParseBuilderExt,
 };
 
 fn output_text(output: &mut dyn std::io::Write, tu: TranslationUnit) -> std::io::Result<()> {
@@ -94,7 +95,20 @@ impl<I: std::error::Error> std::fmt::Display for ParseError<I> {
 
 use miette::{NamedSource, Result};
 fn parse_tu(source: &str, path: &str) -> Result<glsl_lang::ast::TranslationUnit> {
-    match glsl_lang::ast::TranslationUnit::parse(source) {
+    let mut processor = glsl_lang_pp::processor::fs::StdProcessor::new();
+    let tu: Result<glsl_lang::ast::TranslationUnit, _> = processor
+        .open_source(
+            source,
+            Path::new(path).parent().unwrap_or_else(|| Path::new(".")),
+        )
+        .builder()
+        .parse()
+        .map(|(mut tu, _, iter)| {
+            iter.into_directives().inject(&mut tu);
+            tu
+        });
+
+    match tu {
         Ok(tu) => Ok(tu),
         Err(err) => {
             let pos = err.pos();