From 1eceb5e36002cfca610f18d78e2b99336c04fbe5 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <mmstickman@gmail.com>
Date: Sat, 26 Aug 2017 14:53:15 -0400
Subject: [PATCH] Complete Assignment Type Checking
---
Cargo.lock | 22 +++---
Cargo.toml | 2 +-
src/parser/types/parse.rs | 2 +
src/shell/assignments.rs | 161 +++++++++++++++++++++++++++++++-------
4 files changed, 148 insertions(+), 39 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index af47e2d1..74a3b43c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,19 +5,19 @@ dependencies = [
"ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "calculate 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "calculate 0.3.0 (git+https://github.com/redox-os/calc.git)",
"fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
"libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "liner 0.4.0 (git+https://github.com/MovingtoMars/liner/)",
+ "liner 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"smallstring 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -64,8 +64,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "calculate"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+version = "0.3.0"
+source = "git+https://github.com/redox-os/calc.git#ca15759a3722960ff8ba50e709804348c2807ba1"
[[package]]
name = "cfg-if"
@@ -113,8 +113,8 @@ dependencies = [
[[package]]
name = "liner"
-version = "0.4.0"
-source = "git+https://github.com/MovingtoMars/liner/#f5948dadb4c2abaa39bf9d6c887b2bbc899c06bf"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bytecount 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -208,7 +208,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "smallvec"
-version = "0.4.2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -293,7 +293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
"checksum bytecount 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "4bbeb7c30341fce29f6078b4bdf876ea4779600866e98f5b2d203a534f195050"
-"checksum calculate 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b593017444d7b7d0d1cacfea9dd28a507e42cfd30c5366130d14e1e16eb33e0"
+"checksum calculate 0.3.0 (git+https://github.com/redox-os/calc.git)" = "<none>"
"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
"checksum fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344"
"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
@@ -301,7 +301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
"checksum libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "8a014d9226c2cc402676fbe9ea2e15dd5222cd1dd57f576b5b283178c944a264"
"checksum libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be99f814beb3e9503a786a592c909692bb6d4fc5a695f6ed7987223acfbd5194"
-"checksum liner 0.4.0 (git+https://github.com/MovingtoMars/liner/)" = "<none>"
+"checksum liner 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be5a42003ac3b83b02a169e11741f2946327e52bf1118591b61750610769c3f1"
"checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
"checksum nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47e49f6982987135c5e9620ab317623e723bd06738fd85377e8d55f57c8b6487"
"checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c"
@@ -313,7 +313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72f20b8f3c060374edb8046591ba28f62448c369ccbdc7b02075103fb3a9e38d"
"checksum smallstring 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30950abdb5b38f56a0e181ae56ed64a539b64fa77ea6325147203dc7faeb087f"
"checksum smallvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4f8266519bc1d17d0b5b16f6c21295625d562841c708f6376f49028a43e9c11e"
-"checksum smallvec 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b5864faef64ccadecaafebd8d57ae1b27ce8190c8c491d4a284400bb6fa639ae"
+"checksum smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8fcd03faf178110ab0334d74ca9631d77f94c8c11cc77fcb59538abf0025695d"
"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
"checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
"checksum unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946"
diff --git a/Cargo.toml b/Cargo.toml
index 6aa6b694..5aad4008 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,7 +35,7 @@ glob = "0.2"
# Provides a macro for lazily-evalulated statics
lazy_static = "0.2"
# Provides the line editor / prompt for the shell
-liner = { git = "https://github.com/MovingtoMars/liner/" }
+liner = "0.4"
# Provides permutations of strings in brace expansions
permutate = "0.3"
# Enables strings to be stored inline on the stack, when possible.
diff --git a/src/parser/types/parse.rs b/src/parser/types/parse.rs
index 61ee31ab..b3fe44b3 100644
--- a/src/parser/types/parse.rs
+++ b/src/parser/types/parse.rs
@@ -9,12 +9,14 @@ pub struct TypeArg<'a> {
#[derive(Debug, PartialEq)]
pub enum TypeError<'a> {
Invalid(&'a str),
+ BadValue(TypePrimitive),
}
impl<'a> Display for TypeError<'a> {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
match *self {
TypeError::Invalid(parm) => write!(f, "invalid type supplied: {}", parm),
+ TypeError::BadValue(expected) => write!(f, "expected {}", expected),
}
}
}
diff --git a/src/shell/assignments.rs b/src/shell/assignments.rs
index 355fc8f6..611c59b6 100644
--- a/src/shell/assignments.rs
+++ b/src/shell/assignments.rs
@@ -6,9 +6,8 @@ use super::status::*;
use parser::expand_string;
use parser::types::assignments::*;
use parser::types::parse::*;
-// use parser::assignments::{Binding, Operator, Value};
-
-use types::{ArrayVariableContext, VariableContext};
+use smallvec::SmallVec;
+use types::{Array, ArrayVariableContext, VariableContext};
fn print_vars(list: &VariableContext) {
let stdout = io::stdout();
@@ -66,9 +65,22 @@ impl<'a> VariableStore for Shell<'a> {
for action in assignment_actions {
match action {
Ok(Action::UpdateArray(key, Operator::Equal, expression)) => {
- // TODO: Handle different array types accordingly.
- let value = expand_string(expression, self, false);
- self.variables.set_array(key.name, value);
+ let values = expand_string(expression, self, false);
+ let use_original = match array_is_valid(&values, key.kind) {
+ Ok(Some(normalized)) => {
+ self.variables.set_array(key.name, normalized);
+ false
+ }
+ Ok(None) => true,
+ Err(why) => {
+ eprintln!("ion: assignment error: {}", why);
+ return FAILURE;
+ }
+ };
+
+ if use_original {
+ self.variables.set_array(key.name, values);
+ }
}
Ok(Action::UpdateArray(..)) => {
eprintln!("ion: arithmetic operators on array expressions aren't supported yet.");
@@ -76,6 +88,14 @@ impl<'a> VariableStore for Shell<'a> {
}
Ok(Action::UpdateString(key, operator, expression)) => {
let value = expand_string(expression, self, false).join(" ");
+ let value = match string_is_valid(&value, key.kind) {
+ Ok(value) => value,
+ Err(why) => {
+ eprintln!("ion: assignment error: {}", why);
+ return FAILURE;
+ }
+ };
+
if !integer_math(self, key, operator, &value) {
return FAILURE;
}
@@ -106,8 +126,22 @@ impl<'a> VariableStore for Shell<'a> {
for action in assignment_actions {
match action {
Ok(Action::UpdateArray(key, Operator::Equal, expression)) => {
- let value = expand_string(expression, self, false);
- env::set_var(key.name, &value.join(" "));
+ let values = expand_string(expression, self, false);
+ let use_original = match array_is_valid(&values, key.kind) {
+ Ok(Some(normalized)) => {
+ env::set_var(key.name, normalized.join(" "));
+ false
+ }
+ Ok(None) => true,
+ Err(why) => {
+ eprintln!("ion: assignment error: {}", why);
+ return FAILURE;
+ }
+ };
+
+ if use_original {
+ env::set_var(key.name, values.join(" "));
+ }
}
Ok(Action::UpdateArray(..)) => {
eprintln!("ion: arithmetic operators on array expressions aren't supported yet.");
@@ -115,7 +149,15 @@ impl<'a> VariableStore for Shell<'a> {
}
Ok(Action::UpdateString(key, operator, expression)) => {
let value = expand_string(expression, self, false).join(" ");
- if !integer_math_export(key, operator, &value) {
+ let value = match string_is_valid(&value, key.kind) {
+ Ok(value) => value,
+ Err(why) => {
+ eprintln!("ion: assignment error: {}", why);
+ return FAILURE;
+ }
+ };
+
+ if !integer_math_export(key, operator, value) {
return FAILURE;
}
}
@@ -147,6 +189,71 @@ impl<'a> VariableStore for Shell<'a> {
}
}
+fn is_boolean(value: &str) -> Result<&str, ()> {
+ if ["true", "1", "y"].contains(&value) {
+ Ok("true")
+ } else if ["false", "0", "n"].contains(&value) {
+ Ok("false")
+ } else {
+ Err(())
+ }
+}
+
+fn string_is_valid(value: &str, expected: TypePrimitive) -> Result<&str, TypeError> {
+ match expected {
+ TypePrimitive::Any | TypePrimitive::Str => Ok(value),
+ TypePrimitive::Boolean => is_boolean(value).map_err(|_| TypeError::BadValue(expected)),
+ TypePrimitive::Integer => {
+ if value.parse::<i64>().is_ok() {
+ Ok(value)
+ } else {
+ Err(TypeError::BadValue(expected))
+ }
+ }
+ TypePrimitive::Float => {
+ if value.parse::<f64>().is_ok() {
+ Ok(value)
+ } else {
+ Err(TypeError::BadValue(expected))
+ }
+ }
+ _ => unreachable!(),
+ }
+}
+
+fn array_is_valid(values: &[String], expected: TypePrimitive) -> Result<Option<Array>, TypeError> {
+ match expected {
+ TypePrimitive::AnyArray | TypePrimitive::StrArray => Ok(None),
+ TypePrimitive::BooleanArray => {
+ let mut output = SmallVec::new();
+ for value in values {
+ let value = is_boolean(value.as_str())
+ .map_err(|_| TypeError::BadValue(expected))?
+ .into();
+ output.push(value);
+ }
+ Ok(Some(output))
+ }
+ TypePrimitive::IntegerArray => {
+ for value in values {
+ if !value.parse::<i64>().is_ok() {
+ return Err(TypeError::BadValue(expected));
+ }
+ }
+ Ok(None)
+ }
+ TypePrimitive::FloatArray => {
+ for value in values {
+ if !value.parse::<f64>().is_ok() {
+ return Err(TypeError::BadValue(expected));
+ }
+ }
+ Ok(None)
+ }
+ _ => unreachable!(),
+ }
+}
+
// NOTE: Here there be excessively long functions.
fn integer_math(shell: &mut Shell, key: TypeArg, operator: Operator, value: &str) -> bool {
@@ -168,9 +275,9 @@ fn integer_math(shell: &mut Shell, key: TypeArg, operator: Operator, value: &str
}
return false;
} else if let TypePrimitive::Integer = key.kind {
- match shell.variables.get_var_or_empty(key.name).parse::<u64>() {
+ match shell.variables.get_var_or_empty(key.name).parse::<i64>() {
Ok(lhs) => {
- match value.parse::<u64>() {
+ match value.parse::<i64>() {
Ok(rhs) => {
let value = (lhs + rhs).to_string();
shell.variables.set_var(key.name, &value);
@@ -204,9 +311,9 @@ fn integer_math(shell: &mut Shell, key: TypeArg, operator: Operator, value: &str
}
return false;
} else if let TypePrimitive::Integer = key.kind {
- match shell.variables.get_var_or_empty(key.name).parse::<u64>() {
+ match shell.variables.get_var_or_empty(key.name).parse::<i64>() {
Ok(lhs) => {
- match value.parse::<u64>() {
+ match value.parse::<i64>() {
Ok(rhs) => {
let value = (lhs / rhs).to_string();
shell.variables.set_var(key.name, &value);
@@ -240,9 +347,9 @@ fn integer_math(shell: &mut Shell, key: TypeArg, operator: Operator, value: &str
}
return false;
} else if let TypePrimitive::Integer = key.kind {
- match shell.variables.get_var_or_empty(key.name).parse::<u64>() {
+ match shell.variables.get_var_or_empty(key.name).parse::<i64>() {
Ok(lhs) => {
- match value.parse::<u64>() {
+ match value.parse::<i64>() {
Ok(rhs) => {
let value = (lhs - rhs).to_string();
shell.variables.set_var(key.name, &value);
@@ -276,9 +383,9 @@ fn integer_math(shell: &mut Shell, key: TypeArg, operator: Operator, value: &str
}
return false;
} else if let TypePrimitive::Integer = key.kind {
- match shell.variables.get_var_or_empty(key.name).parse::<u64>() {
+ match shell.variables.get_var_or_empty(key.name).parse::<i64>() {
Ok(lhs) => {
- match value.parse::<u64>() {
+ match value.parse::<i64>() {
Ok(rhs) => {
let value = (lhs * rhs).to_string();
shell.variables.set_var(key.name, &value);
@@ -312,7 +419,7 @@ fn integer_math(shell: &mut Shell, key: TypeArg, operator: Operator, value: &str
}
return false;
} else if let TypePrimitive::Integer = key.kind {
- match shell.variables.get_var_or_empty(key.name).parse::<u64>() {
+ match shell.variables.get_var_or_empty(key.name).parse::<i64>() {
Ok(lhs) => {
match value.parse::<u32>() {
Ok(rhs) => {
@@ -357,9 +464,9 @@ fn integer_math_export(key: TypeArg, operator: Operator, value: &str) -> bool {
}
return false;
} else if let TypePrimitive::Integer = key.kind {
- match env::var(key.name).unwrap_or("".into()).parse::<u64>() {
+ match env::var(key.name).unwrap_or("".into()).parse::<i64>() {
Ok(lhs) => {
- match value.parse::<u64>() {
+ match value.parse::<i64>() {
Ok(rhs) => {
let value = (lhs + rhs).to_string();
env::set_var(key.name, &value);
@@ -393,9 +500,9 @@ fn integer_math_export(key: TypeArg, operator: Operator, value: &str) -> bool {
}
return false;
} else if let TypePrimitive::Integer = key.kind {
- match env::var(key.name).unwrap_or("".into()).parse::<u64>() {
+ match env::var(key.name).unwrap_or("".into()).parse::<i64>() {
Ok(lhs) => {
- match value.parse::<u64>() {
+ match value.parse::<i64>() {
Ok(rhs) => {
let value = (lhs / rhs).to_string();
env::set_var(key.name, &value);
@@ -429,9 +536,9 @@ fn integer_math_export(key: TypeArg, operator: Operator, value: &str) -> bool {
}
return false;
} else if let TypePrimitive::Integer = key.kind {
- match env::var(key.name).unwrap_or("".into()).parse::<u64>() {
+ match env::var(key.name).unwrap_or("".into()).parse::<i64>() {
Ok(lhs) => {
- match value.parse::<u64>() {
+ match value.parse::<i64>() {
Ok(rhs) => {
let value = (lhs - rhs).to_string();
env::set_var(key.name, &value);
@@ -465,9 +572,9 @@ fn integer_math_export(key: TypeArg, operator: Operator, value: &str) -> bool {
}
return false;
} else if let TypePrimitive::Integer = key.kind {
- match env::var(key.name).unwrap_or("".into()).parse::<u64>() {
+ match env::var(key.name).unwrap_or("".into()).parse::<i64>() {
Ok(lhs) => {
- match value.parse::<u64>() {
+ match value.parse::<i64>() {
Ok(rhs) => {
let value = (lhs * rhs).to_string();
env::set_var(key.name, &value);
@@ -501,7 +608,7 @@ fn integer_math_export(key: TypeArg, operator: Operator, value: &str) -> bool {
}
return false;
} else if let TypePrimitive::Integer = key.kind {
- match env::var(key.name).unwrap_or("".into()).parse::<u64>() {
+ match env::var(key.name).unwrap_or("".into()).parse::<i64>() {
Ok(lhs) => {
match value.parse::<u32>() {
Ok(rhs) => {
--
GitLab