From 59ee8e9ced649392e9b3ce80494556c50e46a4d8 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <mmstickman@gmail.com>
Date: Sun, 8 Oct 2017 11:20:05 -0400
Subject: [PATCH] Switch to d128 fork of calculate Addresses precision issues
with floating point math by converting all usage of f64 to d128 from the
decimal crate.
---
Cargo.lock | 53 +++++++++++++++++++++++++++++++++++++++++---
Cargo.toml | 2 +-
src/builtins/calc.rs | 3 ++-
3 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index fff5993b..02e5e476 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ dependencies = [
"ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"app_dirs 1.1.1 (git+https://github.com/redox-os/app-dirs-rs.git)",
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "calculate 0.3.0 (git+https://github.com/redox-os/calc.git)",
+ "calculate 0.3.0 (git+https://github.com/mmstick/calc.git?branch=decimal)",
"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.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -57,6 +57,11 @@ name = "bitflags"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
+name = "bitflags"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "bytecount"
version = "0.1.7"
@@ -65,18 +70,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "calculate"
version = "0.3.0"
-source = "git+https://github.com/redox-os/calc.git#ca15759a3722960ff8ba50e709804348c2807ba1"
+source = "git+https://github.com/mmstick/calc.git?branch=decimal#448b06dd19b6c22d7be6b2ead129ae253a6cf6ff"
+dependencies = [
+ "decimal 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
name = "cfg-if"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
+name = "decimal"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ord_subset 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
[[package]]
name = "fnv"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
+name = "gcc"
+version = "0.3.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "glob"
version = "0.2.11"
@@ -149,6 +175,11 @@ dependencies = [
"winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "ord_subset"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "permutate"
version = "0.3.2"
@@ -184,6 +215,16 @@ name = "regex-syntax"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
+name = "rustc-serialize"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "shell32-sys"
version = "0.1.1"
@@ -292,10 +333,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum app_dirs 1.1.1 (git+https://github.com/redox-os/app-dirs-rs.git)" = "<none>"
"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 bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5cde24d1b2e2216a726368b2363a273739c91f4e3eb4e0dd12d672d396ad989"
"checksum bytecount 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "4bbeb7c30341fce29f6078b4bdf876ea4779600866e98f5b2d203a534f195050"
-"checksum calculate 0.3.0 (git+https://github.com/redox-os/calc.git)" = "<none>"
+"checksum calculate 0.3.0 (git+https://github.com/mmstick/calc.git?branch=decimal)" = "<none>"
"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
+"checksum decimal 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8e3bfe070d7876527c8f901afc27b4190a715b6e52c8961f72fb35430960e80"
"checksum fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344"
+"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c9e5e58fa1a4c3b915a561a78a22ee0cac6ab97dca2504428bc1cb074375f8d5"
@@ -305,11 +349,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"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"
+"checksum ord_subset 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bdb8b8c275824bc609c8294f20a55d37d808a1b071cec596da746ce4df0405e8"
"checksum permutate 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53b7d5b19a715ffab38693a9dd44b067fdfa2b18eef65bd93562dfe507022fae"
"checksum redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "8dde11f18c108289bef24469638a04dce49da56084f2d50618b226e47eb04509"
"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
"checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
"checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
+"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
+"checksum serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "6a7046c9d4c6c522d10b2d098f9bebe2bef227e0e74044d8c1bfcf6b476af799"
"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"
diff --git a/Cargo.toml b/Cargo.toml
index 85c63b5a..294b2afe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,7 @@ app_dirs = {git = "https://github.com/redox-os/app-dirs-rs.git"}
# Provides methods for bitwise flag operations
bitflags = "0.9.1"
# Provides inline arithmetic expression and `calc` functionality
-calculate = {git = "https://github.com/redox-os/calc.git"}
+calculate = {git = "https://github.com/mmstick/calc.git", branch="decimal"}
# A faster hashing algorithm for the hash maps in the shell.
fnv = "1.0"
# Performs globbing on words that are detected to be potentially globbable.
diff --git a/src/builtins/calc.rs b/src/builtins/calc.rs
index 59ec8f05..21d128ae 100644
--- a/src/builtins/calc.rs
+++ b/src/builtins/calc.rs
@@ -18,9 +18,10 @@ pub(crate) fn calc(args: &[&str]) -> Result<(), String> {
Err(e) => writeln!(stdout, "{}", e),
};
} else {
- let prompt = b"[]> ";
+ let prompt = b"ion-calc: ";
loop {
let _ = stdout.write(prompt);
+ let _ = stdout.flush();
let mut input = String::new();
let _ = io::stdin().read_line(&mut input);
if input.is_empty() {
--
GitLab