Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ keywords = ["json", "jsonm", "compress"]

[dependencies]
serde = "1.0.228"
regex = "1"

[dependencies.serde_json]
version = "1.0"
Expand Down
5 changes: 1 addition & 4 deletions src/packer.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
extern crate regex;
extern crate serde;
extern crate serde_json;

use self::regex::Regex;
use self::serde::Serialize;
use serde_json::Value;
use std::collections::HashMap;
Expand Down Expand Up @@ -339,8 +337,7 @@ impl Packer {

if value.is_string() {
self.memoise(str_value, map_key, false);
let re = Regex::new(r"^[0-9.]|^~").unwrap();
if re.is_match(str_value) {
if str_value.starts_with(|c: char| c.is_ascii_digit() || c == '.' || c == '~') {
return json!("~".to_owned() + str_value);
}
}
Expand Down
19 changes: 13 additions & 6 deletions src/unpacker.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
extern crate regex;
extern crate serde;
extern crate serde_json;

use self::regex::Regex;
use self::serde::Deserialize;
use serde_json::Value;
use std::collections::HashMap;
Expand All @@ -17,6 +15,17 @@ const TYPE_VALUE: i64 = 1;
const TYPE_STRING: i64 = 2;
const MAX_PACK_COMPLEX_OBJECT_SIZE: usize = 12;

fn starts_like_float(string: &str) -> bool {
let rest = string.strip_prefix('-').unwrap_or(string);
let after_digits = rest.trim_start_matches(|c: char| c.is_ascii_digit());
after_digits.len() < rest.len() && after_digits.starts_with('.')
}

fn starts_like_number(string: &str) -> bool {
let rest = string.strip_prefix('-').unwrap_or(string);
rest.starts_with(|c: char| c.is_ascii_digit() || c == '.')
}

#[derive(Default, Debug)]
pub struct Unpacker {
dict: HashMap<u64, String>,
Expand Down Expand Up @@ -296,8 +305,7 @@ impl Unpacker {
}
};

let re = Regex::new(r"^-?[0-9]+\.").unwrap();
if re.is_match(string) {
if starts_like_float(string) {
let _p: Value = match string.parse::<f64>() {
Ok(parse_number) => {
self.add_to_dict(string);
Expand All @@ -307,8 +315,7 @@ impl Unpacker {
};
};

let re = Regex::new(r"^-?[0-9\.]").unwrap();
if re.is_match(string) {
if starts_like_number(string) {
let _p: Value = match string.parse::<i64>() {
Ok(parse_number) => {
self.add_to_dict(string);
Expand Down
Loading