Fix emitting hexlike strings without quotes
The emitter omitted quotes for strings that start with `0x` those would subsequently be parsed as strings again. This should fix #133.
This commit is contained in:
parent
bd87698008
commit
faf6e2a8a6
2 changed files with 49 additions and 6 deletions
|
@ -336,6 +336,7 @@ fn need_quotes(string: &str) -> bool {
|
||||||
]
|
]
|
||||||
.contains(&string)
|
.contains(&string)
|
||||||
|| string.starts_with('.')
|
|| string.starts_with('.')
|
||||||
|
|| string.starts_with("0x")
|
||||||
|| string.parse::<i64>().is_ok()
|
|| string.parse::<i64>().is_ok()
|
||||||
|| string.parse::<f64>().is_ok()
|
|| string.parse::<f64>().is_ok()
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,22 +2,64 @@ extern crate yaml_rust;
|
||||||
|
|
||||||
use yaml_rust::{Yaml, YamlEmitter, YamlLoader};
|
use yaml_rust::{Yaml, YamlEmitter, YamlLoader};
|
||||||
|
|
||||||
fn test_round_trip(original: &Yaml) {
|
fn roundtrip(original: &Yaml) {
|
||||||
let mut out = String::new();
|
let mut emitted = String::new();
|
||||||
YamlEmitter::new(&mut out).dump(original).unwrap();
|
YamlEmitter::new(&mut emitted).dump(original).unwrap();
|
||||||
let documents = YamlLoader::load_from_str(&out).unwrap();
|
|
||||||
|
let documents = YamlLoader::load_from_str(&emitted).unwrap();
|
||||||
|
println!("emitted {}", emitted);
|
||||||
|
|
||||||
assert_eq!(documents.len(), 1);
|
assert_eq!(documents.len(), 1);
|
||||||
assert_eq!(documents[0], *original);
|
assert_eq!(documents[0], *original);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn double_roundtrip(original: &str) {
|
||||||
|
let parsed = YamlLoader::load_from_str(&original).unwrap();
|
||||||
|
|
||||||
|
let mut serialized = String::new();
|
||||||
|
YamlEmitter::new(&mut serialized).dump(&parsed[0]).unwrap();
|
||||||
|
|
||||||
|
let reparsed = YamlLoader::load_from_str(&serialized).unwrap();
|
||||||
|
|
||||||
|
assert_eq!(parsed, reparsed);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_escape_character() {
|
fn test_escape_character() {
|
||||||
let y = Yaml::String("\x1b".to_owned());
|
let y = Yaml::String("\x1b".to_owned());
|
||||||
test_round_trip(&y);
|
roundtrip(&y);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_colon_in_string() {
|
fn test_colon_in_string() {
|
||||||
let y = Yaml::String("x: %".to_owned());
|
let y = Yaml::String("x: %".to_owned());
|
||||||
test_round_trip(&y);
|
roundtrip(&y);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_numberlike_strings() {
|
||||||
|
let docs = [
|
||||||
|
r#"x: "1234""#, r#"x: "01234""#, r#""1234""#,
|
||||||
|
r#""01234""#, r#"" 01234""#, r#""0x1234""#,
|
||||||
|
r#"" 0x1234""#,
|
||||||
|
];
|
||||||
|
|
||||||
|
for doc in &docs {
|
||||||
|
roundtrip(&Yaml::String(doc.to_string()));
|
||||||
|
double_roundtrip(&doc);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Example from https://github.com/chyh1990/yaml-rust/issues/133
|
||||||
|
#[test]
|
||||||
|
fn test_issue133() {
|
||||||
|
|
||||||
|
let doc = YamlLoader::load_from_str("\"0x123\"").unwrap().pop().unwrap();
|
||||||
|
assert_eq!(doc, Yaml::String("0x123".to_string()));
|
||||||
|
|
||||||
|
let mut out_str = String::new();
|
||||||
|
YamlEmitter::new(&mut out_str).dump(&doc).unwrap();
|
||||||
|
let doc2 = YamlLoader::load_from_str(&out_str).unwrap().pop().unwrap();
|
||||||
|
assert_eq!(doc, doc2); // This failed because the type has changed to a number now
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue