ASC - non-case sensitive exclude checking, increase debugging (#568)

BrettMayson · Oct 10, 2023 · 23f5c7e · 23f5c7e
1 parent 6c53a2a
commit 23f5c7e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/bin/src/modules/asc.rs b/bin/src/modules/asc.rs
@@ -113,8 +113,9 @@ impl Module for ArmaScriptCompiler {
                         .asc()
                         .exclude()
                         .iter()
-                        .any(|e| entry.as_str().contains(e))
+                        .any(|e| entry.as_str().to_ascii_lowercase().contains(&e.to_ascii_lowercase()))
                     {
+                        debug!("asc excluded {}", entry);
                         continue;
                     }
                     entries.push(entry);
@@ -168,7 +169,7 @@ impl Module for ArmaScriptCompiler {
             config.add_include_dir(include.display().to_string());
         }
         for exclude in ctx.config().asc().exclude() {
-            config.add_exclude(exclude);
+        //     config.add_exclude(exclude); // not needed because we only demacro sqf that aren't in exclude
         }
         config.set_worker_threads(num_cpus::get());
         let mut f = File::create(tmp.join("sqfc.json"))?;
@@ -178,6 +179,9 @@ impl Module for ArmaScriptCompiler {
         let command = Command::new(tmp.join(SOURCE[0])).output()?;
         out_file.write_all(&command.stdout)?;
         out_file.write_all(&command.stderr)?;
+        if String::from_utf8(command.stdout.clone()).unwrap().contains("Parse Error") {
+            warn!("ASC 'Parse Error' - check .hemttout/asc.log");
+        }
         if command.status.success() {
             debug!("ASC took {:?}", start.elapsed().whole_milliseconds());
         } else {
@@ -192,7 +196,8 @@ impl Module for ArmaScriptCompiler {
             let from = tmp_output.join(&format!("{src}c"));
             let to = ctx.workspace().join(&format!("{dst}c"))?;
             if !from.exists() {
-                // Likely excluded
+                // sqf that have parse errors OR just empty//no-code
+                debug!("asc didn't process {}", src);
                 continue;
             }
             let mut f = File::open(from)?;