Adds truncate, half-up rounding functions

.gitignore

@@ -10,3 +10,6 @@
 # Generated by Cargo
 /target/
 Cargo.lock
+*.swp
+*.swo
+/decimal-macros/target/

Cargo.toml

@@ -1,29 +1,49 @@
 [package]
 name = "decimal"
-version = "2.0.4"
-authors = ["Alkis Evlogimenos <alkis@evlogimenos.com>"]
+version = "2.4.0"
+authors = ["Alkis Evlogimenos <alkis@evlogimenos.com>", "Jonathan Strong <jstrong@tioscapital.com>"]
 build = "build.rs"
 description = "Decimal floating point arithmetic for Rust"
-repository = "https://github.com/alkis/decimal"
-documentation = "https://alkis.github.io/decimal"
-keywords = ["decimal", "decNumber"]
-license = "Apache-2.0"
+autobins = false
+edition = "2018"
 
-[badges]
-travis-ci = { repository = "alkis/decimal" }
+[lib]
+name = "decimal"
+path = "src/lib.rs"
+
+[[bin]]
+path = "src/bytes.rs"
+name = "bytes"
+
+[[bin]]
+path = "src/to_string.rs"
+name = "to-string"
+
+[[bin]]
+path = "src/run_test.rs"
+name = "run-test"
 
 [dependencies]
 bitflags = "1"
 libc = "0.2"
 ord_subset = { optional = true, version = "3" }
 rustc-serialize = { optional = true, version = "0.3" }
 serde = { optional = true, version = "1" }
+clap = { features = [], version = "2" }
+faster = { git = "https://github.com/AdamNiederer/faster", branch = "master", optional = true }
+slog = { version = "2", optional = true }
+approx = "0.1"
 
 [features]
-default = ["ord_subset", "rustc-serialize", "serde"]
+default = ["ord_subset", "serde", "slog"]
 
 [build-dependencies]
 cc = "1"
 
 [dev-dependencies]
 serde_json = "1"
+rand = "0.4"
+decimal-macros = { version = "0.2", path = "decimal-macros" }
+
+[profile.test]
+opt-level = 2

README.md

@@ -1,10 +1,5 @@
 # decimal
 
-[![Travis](https://img.shields.io/travis/alkis/decimal.svg)](https://travis-ci.org/alkis/decimal)
-![Downloads](https://img.shields.io/crates/d/decimal.svg)
-[![Crates.io](https://img.shields.io/crates/v/decimal.svg)](https://crates.io/crates/decimal)
-![Apache license](https://img.shields.io/crates/l/decimal.svg)
-
 Decimal Floating Point arithmetic for rust based on the [decNumber
 library](http://speleotrove.com/decimal/decnumber.html).
 

build.rs

@@ -7,6 +7,7 @@ fn main() {
         "0"
     };
     cc::Build::new()
+        .warnings(false)
         .include("decNumber")
         .file("decNumber/decContext.c")
         .file("decNumber/decDouble.c")

decNumber/decCommon.c

@@ -1607,6 +1607,16 @@ char * decFloatToString(const decFloat *df, char *string){
   pre=(Int)(c-cstart)+exp;         // length+exp  [c->LSD+1]
   // [here, pre-exp is the digits count (==1 for zero)]
 
+  // if (exp>0) {
+  //
+  // if (exp>0 || pre<-7) {
+  //
+  // neither of the above variations worked during an attempt to
+  // remove exponential form entirely from this function. In both
+  // cases it ended up returning "0.00" for 1e-8
+  //
+  // - JS 6/1/18
+  //
   if (exp>0 || pre<-5) {           // need exponential form
     e=pre-1;                       // calculate E value
     pre=1;                         // assume one digit before '.'

decimal-macros/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "decimal-macros"
+version = "0.2.0"
+authors = ["Callum Tolley <cgtrolley@gmail.com>"]
+
+[lib]
+name = "decimal_macros"
+proc-macro = true
+
+[dependencies]
+decimal = { path = "../" }
+libc = "~0.2"
+quote = "0.6"
+proc-macro2 = "0.4"
+
+[build-dependencies]
+gcc = "0.3"

decimal-macros/src/lib.rs

@@ -0,0 +1,43 @@
+extern crate decimal;
+extern crate proc_macro;
+#[macro_use]
+extern crate quote;
+extern crate proc_macro2;
+
+use proc_macro::TokenStream;
+use std::str::FromStr;
+
+#[proc_macro]
+pub fn d128(input: TokenStream) -> TokenStream {
+    let source = input.to_string();
+    let source = source.replace(" ", "");
+    let source = source.replace("_", "");
+
+    let d = match decimal::d128::from_str(&source[..]) {
+        Ok(d) => d,
+        Err(e) => panic!("Unexpected decimal format for {}: {:?}", source, e),
+    };
+    let bytes: [u8; 16] = d.as_bytes();
+    let iter = bytes.iter();
+    let expanded = quote! {
+        ::decimal::d128::from_raw_bytes([ #(#iter,)* ])
+    };
+    expanded.into()
+}
+
+#[proc_macro]
+pub fn d64(input: TokenStream) -> TokenStream {
+    let source = input.to_string();
+    let source = source.replace(" ", "");
+    let source = source.replace("_", "");
+    let d = match decimal::d64::from_str(&source[..]) {
+        Ok(d) => d,
+        Err(e) => panic!("Unexpected decimal format for {}: {:?}", source, e),
+    };
+    let bytes: [u8; 8] = d.as_bytes();
+    let iter = bytes.iter();
+    let expanded = quote! {
+        ::decimal::d64::from_raw_bytes([ #(#iter,)* ])
+    };
+    expanded.into()
+}