From 885bd579d980d3672f30ce06eb64c9c393f9ea1d Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <mmstickman@gmail.com>
Date: Wed, 2 Aug 2017 00:14:23 -0400
Subject: [PATCH] Enable Redirecting Functions
Also enables background functions, but there's an issue with the shell hanging when a function is sent to te background
---
examples/function_piping.ion | 12 ++++++++++++
src/parser/pipelines/mod.rs | 7 +++++++
src/shell/mod.rs | 4 ++--
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/examples/function_piping.ion b/examples/function_piping.ion
index 3c242a60..89aeaf1f 100644
--- a/examples/function_piping.ion
+++ b/examples/function_piping.ion
@@ -17,3 +17,15 @@ fn format_with pat
end
echo one two three four five | format_with "-"
+
+fn square
+ read x
+ echo $(( x * x ))
+end
+
+fn mult x
+ read y
+ echo $(( y * x ))
+end
+
+echo 5 | square | mult 3
diff --git a/src/parser/pipelines/mod.rs b/src/parser/pipelines/mod.rs
index 27832c61..b3039988 100644
--- a/src/parser/pipelines/mod.rs
+++ b/src/parser/pipelines/mod.rs
@@ -65,6 +65,13 @@ impl Pipeline {
stdout.file = expand_string(stdout.file.as_str(), expanders, false).join(" ");
}
}
+
+ pub fn requires_piping(&self) -> bool {
+ self.jobs.len() > 1 ||
+ self.stdin != None ||
+ self.stdout != None ||
+ self.jobs.last().unwrap().kind == JobKind::Background
+ }
}
impl fmt::Display for Pipeline {
diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 22e2ed21..adb23a57 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -180,7 +180,7 @@ impl<'a> Shell<'a> {
builtins.get(key)
} {
// Run the 'main' of the command and set exit_status
- if pipeline.jobs.len() == 1 && pipeline.stdin == None && pipeline.stdout == None {
+ if !pipeline.requires_piping() {
if self.flags & PRINT_COMMS != 0 { eprintln!("> {}", pipeline.to_string()); }
let borrowed = &pipeline.jobs[0].args;
let small: SmallVec<[&str; 4]> = borrowed.iter()
@@ -192,7 +192,7 @@ impl<'a> Shell<'a> {
}
// Branch else if -> input == shell function and set the exit_status
} else if let Some(function) = self.functions.get(&pipeline.jobs[0].command).cloned() {
- if pipeline.jobs.len() == 1 {
+ if !pipeline.requires_piping() {
let args: &[String] = pipeline.jobs[0].args.deref();
let args: Vec<&str> = args.iter().map(AsRef::as_ref).collect();
match function.execute(self, &args) {
--
GitLab