Add pre-globals

Author: TheOnlyMrCat

README.md

@@ -63,8 +63,7 @@ features are currently supported, however. A list of supported features follows:
   * `$VAR` environment variables
   * `$(echo)` internal subcommands
   * `$1` positional arguments
+  * `$@` all positional arguments
 * Single and double-quoted arguments
 * Command chaining by `&&`, `||`, and `|` (no `;`, just use newlines)
-
-(In the latest pre-release):
 * `VAR=val` Environment variable setting (with interpolation)

src/main.rs

@@ -300,6 +300,19 @@ pub fn run(args: &[&str], cwd: &Path, inherit_verbosity: Verbosity, capture_stdo
 			let mut output_acc = Vec::new();
 			//TODO: Instead, find all scripts that would run given the target and phases?
             for &phase in phases {
+				match &rf.get_pre_global_script(phase) {
+					Some(script) => {
+						out::phase_message(&output_stream, phase, "pre-global");
+						let (success, output) = exec::shell(&script.commands, &rf, &exec_config, capture_stdout, env_remap);
+						if capture_stdout {
+							output_acc.extend(output.into_iter());
+						}
+						if !success {
+							return (expect_fail, output_acc);
+						}
+					},
+					None => {}
+				}
                 if let Some(ref run_target) = run_target {
 					match rf.get_target(&run_target) {
 						Some(target) => match &target[phase] {

src/parser.rs

@@ -176,6 +176,7 @@ pub fn parse_runscript(source: RunscriptSource) -> Result<Runscript, RunscriptPa
 			source: source.source.clone(),
 			includes: Vec::new(),
 			scripts: Scripts {
+				pre_global_target: EnumMap::new(),
 				global_target: EnumMap::new(),
 				default_target: EnumMap::new(),
 				targets: HashMap::new(),
@@ -325,6 +326,15 @@ fn parse_root<T: Iterator<Item = (usize, char)> + std::fmt::Debug>(context: &mut
 					});
 				}
 				context.runfile.scripts.global_target[phase] = Some(script);
+			} else if name == "<" {
+				if let Some(prev_script) = &context.runfile.scripts.pre_global_target[phase] {
+					return Err(RunscriptParseErrorData::MultipleDefinition {
+						previous_location: prev_script.location.clone(),
+						new_location: script.location,
+						target_name: name,
+					})
+				}
+				context.runfile.scripts.pre_global_target[phase] = Some(script);
 			} else {
 				if name.chars().any(|c| !(c.is_ascii_alphanumeric() || c == '_' || c == '-')) {
 					return Err(RunscriptParseErrorData::InvalidID { location: context.get_loc(i + 1), found: name });

src/script.rs

@@ -31,6 +31,10 @@ pub struct RunscriptInclude {
 /// The exectable scripts defined by a [`Runscript`](struct.Runscript.html)
 #[derive(Debug)]
 pub struct Scripts {
+	/// The scripts defined under `#<`
+	/// 
+	/// These scripts are executed in their respective `ScriptPhase` before the targeted target.
+	pub pre_global_target: EnumMap<ScriptPhase, Option<Script>>,
 	/// The scripts defined under `##`
 	/// 
 	/// These scripts are executed in their respective `ScriptPhase` after the targeted target.
@@ -174,6 +178,22 @@ impl Runscript {
 			}
 		}
 	}
+
+	pub fn get_pre_global_script(&self, phase: ScriptPhase) -> Option<&Script> {
+		match self.scripts.pre_global_target[phase].as_ref() {
+			Some(script) => {
+				Some(&script)
+			},
+			_ => {
+				for include in &self.includes {
+					if let Some(script) = include.runscript.scripts.pre_global_target[phase].as_ref() {
+						return Some(&script);
+					}
+				}
+				None
+			}
+		}
+	}
 }
 
 impl Display for ScriptEntry {

test/phases.run

@@ -10,7 +10,7 @@ echo Build
 echo BuildAndRun Default
 #/
 
-## br
+#< br
 echo BuildAndRun Explicit
 #/