From aa4921102b16510859e181ff1ac299ca4f080a64 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <mmstickman@gmail.com>
Date: Sat, 8 Apr 2017 17:01:18 -0400
Subject: [PATCH] Implement the eval Builtin
---
src/builtins/mod.rs | 22 +++++++++++++++++++++-
src/parser/loops/for_grammar.rs | 4 ++--
src/parser/quotes.rs | 2 +-
src/parser/shell_expand/mod.rs | 6 +-----
src/shell/flow.rs | 2 +-
src/shell/mod.rs | 4 ++--
6 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/builtins/mod.rs b/src/builtins/mod.rs
index 412c6303..e6459b14 100644
--- a/src/builtins/mod.rs
+++ b/src/builtins/mod.rs
@@ -10,7 +10,8 @@ use std::collections::HashMap;
use std::io::{self, Write};
use std::process;
-use shell::{Shell, ShellHistory};
+use parser::QuoteTerminator;
+use shell::{Shell, FlowLogic, ShellHistory};
use status::*;
/// Structure which represents a Terminal's command.
@@ -155,6 +156,25 @@ impl Builtin {
});
/* Misc */
+ commands.insert("eval",
+ Builtin {
+ name: "eval",
+ help: "evaluates the evaluated expression",
+ main: box |args: &[String], shell: &mut Shell| -> i32 {
+ let evaluated_command = args[1..].join(" ");
+ let mut buffer = QuoteTerminator::new(evaluated_command);
+ if buffer.check_termination() {
+ shell.on_command(&buffer.consume());
+ shell.previous_status
+ } else {
+ let stderr = io::stderr();
+ let mut stderr = stderr.lock();
+ let _ = writeln!(stderr, "ion: supplied eval expression was not terminted");
+ FAILURE
+ }
+ },
+ });
+
commands.insert("exit",
Builtin {
name: "exit",
diff --git a/src/parser/loops/for_grammar.rs b/src/parser/loops/for_grammar.rs
index dc863dbf..4b961f6c 100644
--- a/src/parser/loops/for_grammar.rs
+++ b/src/parser/loops/for_grammar.rs
@@ -11,12 +11,12 @@ pub enum ForExpression {
impl ForExpression {
pub fn new(expression: &[String], dir_stack: &DirectoryStack, variables: &Variables) -> ForExpression {
- let mut output: Vec<String> = expression.iter()
+ let output: Vec<String> = expression.iter()
.flat_map(|expression| expand_string(expression, variables, dir_stack, true))
.collect();
if output.len() == 1 {
- let output = output.drain(..).next().unwrap();
+ let output = output.into_iter().next().unwrap();
{
let mut bytes_iterator = output.bytes().enumerate();
while let Some((id, byte)) = bytes_iterator.next() {
diff --git a/src/parser/quotes.rs b/src/parser/quotes.rs
index 5c3f6257..8e19fa12 100644
--- a/src/parser/quotes.rs
+++ b/src/parser/quotes.rs
@@ -18,7 +18,7 @@ impl QuoteTerminator {
self.buffer.push_str(if self.flags & TRIM != 0 { input.trim() } else { &input });
}
- pub fn is_terminated(&mut self) -> bool {
+ pub fn check_termination(&mut self) -> bool {
for character in self.buffer.bytes().skip(self.read) {
self.read += 1;
match character {
diff --git a/src/parser/shell_expand/mod.rs b/src/parser/shell_expand/mod.rs
index f549ccfe..cbebe709 100644
--- a/src/parser/shell_expand/mod.rs
+++ b/src/parser/shell_expand/mod.rs
@@ -67,21 +67,18 @@ fn expand_brace(current: &mut String, expanders: &mut Vec<Vec<String>>,
}
}
-#[inline(always)]
fn array_expand(elements: &[&str], expand_func: &ExpanderFunctions) -> Vec<String> {
elements.iter()
.flat_map(|element| expand_string(element, expand_func, false))
.collect()
}
-#[inline(always)]
fn array_nth(elements: &[&str], expand_func: &ExpanderFunctions, id: usize) -> String {
elements.iter()
.flat_map(|element| expand_string(element, expand_func, false))
.nth(id).unwrap_or_default()
}
-#[inline(always)]
fn array_range(elements: &[&str], expand_func: &ExpanderFunctions, start: usize, end: IndexPosition) -> Vec<String> {
match end {
IndexPosition::CatchAll => elements.iter()
@@ -93,11 +90,10 @@ fn array_range(elements: &[&str], expand_func: &ExpanderFunctions, start: usize,
}
}
-#[inline(always)]
fn slice_string(output: &mut String, expanded: &str, index: Index) {
match index {
Index::None => (),
- Index::All => output.push_str(&expanded),
+ Index::All => output.push_str(expanded),
Index::ID(id) => {
if let Some(character) = UnicodeSegmentation::graphemes(expanded, true).nth(id) {
output.push_str(character);
diff --git a/src/shell/flow.rs b/src/shell/flow.rs
index 08176786..23bb4b5e 100644
--- a/src/shell/flow.rs
+++ b/src/shell/flow.rs
@@ -259,7 +259,7 @@ impl<'a> FlowLogic for Shell<'a> {
match self.run_pipeline(&mut expression, false) {
Some(SUCCESS) => self.execute_statements(success),
_ => {
- for mut elseif in else_if.into_iter() {
+ for mut elseif in else_if {
if self.run_pipeline(&mut elseif.expression, false) == Some(SUCCESS) {
return self.execute_statements(elseif.success);
}
diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 1d81cace..e3ab8737 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -145,7 +145,7 @@ impl<'a> Shell<'a> {
pub fn terminate_quotes(&mut self, command: String) -> String {
let mut buffer = QuoteTerminator::new(command);
self.flow_control.level += 1;
- while !buffer.is_terminated() {
+ while !buffer.check_termination() {
loop {
if let Some(command) = self.readln() {
buffer.append(command);
@@ -175,7 +175,7 @@ impl<'a> Shell<'a> {
let mut lines = command_list.lines().map(|x| x.to_owned());
while let Some(command) = lines.next() {
let mut buffer = QuoteTerminator::new(command);
- while !buffer.is_terminated() {
+ while !buffer.check_termination() {
loop {
if let Some(command) = lines.next() {
buffer.append(command);
--
GitLab