arcayr/saphyr-serde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add parse for Yaml

Browse source
This commit is contained in:
Yuheng Chen 2015-05-25 03:29:52 +08:00
parent 2b73808939
commit b070a75ccb
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
saphyr/Cargo.toml
View file

@ -2,6 +2,3 @@
name = "yaml-rust" name = "yaml-rust"
version = "0.1.0" version = "0.1.0"
authors = ["Yuheng Chen <yuhengchen@sensetime.com>"] authors = ["Yuheng Chen <yuhengchen@sensetime.com>"]
[dependencies]
regex = "*"

3
saphyr/src/lib.rs
View file

@ -1,8 +1,7 @@
extern crate regex;
pub mod yaml; pub mod yaml;
pub mod scanner; pub mod scanner;
pub mod parser; pub mod parser;
#[test] #[test]
fn it_works() { fn it_works() {
} }

15
saphyr/src/yaml.rs
View file

@ -1,7 +1,7 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::ops::Index; use std::ops::Index;
use std::string; use std::string;
use regex::Regex; use std::str::FromStr;
#[derive(Clone, PartialEq, PartialOrd, Debug, Eq, Ord)] #[derive(Clone, PartialEq, PartialOrd, Debug, Eq, Ord)]
pub enum Yaml { pub enum Yaml {
@ -65,10 +65,6 @@ pub fn $name(&self) -> Option<$t> {
); );
); );
// these regex are from libyaml-rust project
macro_rules! regex(
($s:expr) => (Regex::new($s).unwrap());
);
impl Yaml { impl Yaml {
define_as!(as_i64, i64, I64); define_as!(as_i64, i64, I64);
define_as!(as_bool, bool, Boolean); define_as!(as_bool, bool, Boolean);
@ -91,12 +87,11 @@ impl Yaml {
} }
} }
pub fn as_f64(&self) -> Option<f64> { pub fn parse<T: FromStr>(&self) -> Option<T> {
// XXX(chenyh) precompile me // XXX(chenyh) precompile me
let float_pattern = regex!(r"^([-+]?)(\.[0-9]+|[0-9]+(\.[0-9]*)?([eE][-+]?[0-9]+)?)$");
match *self { match *self {
Yaml::String(ref v) if float_pattern.is_match(v) => { Yaml::String(ref v) => {
v.parse::<f64>().ok() v.parse::<T>().ok()
}, },
_ => None _ => None
} }
@ -146,7 +141,7 @@ c: [1, 2]
let mut parser = Parser::new(s.chars()); let mut parser = Parser::new(s.chars());
let out = parser.load().unwrap(); let out = parser.load().unwrap();
assert_eq!(out["a"].as_str().unwrap(), "1"); assert_eq!(out["a"].as_str().unwrap(), "1");
assert_eq!(out["c"][1].as_str().unwrap(), "2"); assert_eq!(out["c"][1].parse::<i32>().unwrap(), 2);
assert!(out["d"][0].is_badvalue()); assert!(out["d"][0].is_badvalue());
//assert_eq!(out.as_hash().unwrap()[&Yaml::String("a".to_string())].as_i64().unwrap(), 1i64); //assert_eq!(out.as_hash().unwrap()[&Yaml::String("a".to_string())].as_i64().unwrap(), 1i64);
} }