zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-26 19:00:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: Fix naming to not collide with String when using.

Browse Source
This commit is contained in:
Jeremy Wall 2018-06-10 14:13:08 -05:00
parent 62c7a44c69
commit 5d32dc83a4
8 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ast/mod.rs
View File

@ -330,7 +330,7 @@ pub enum Value {
Boolean(Positioned<bool>), Boolean(Positioned<bool>),
Int(Positioned<i64>), Int(Positioned<i64>),
Float(Positioned<f64>), Float(Positioned<f64>),
String(Positioned<String>), Str(Positioned<String>),
Symbol(Positioned<String>), Symbol(Positioned<String>),
// Complex Values // Complex Values
Tuple(Positioned<FieldList>), Tuple(Positioned<FieldList>),
@ -346,7 +346,7 @@ impl Value {
&Value::Boolean(_) => "Boolean".to_string(), &Value::Boolean(_) => "Boolean".to_string(),
&Value::Int(_) => "Integer".to_string(), &Value::Int(_) => "Integer".to_string(),
&Value::Float(_) => "Float".to_string(), &Value::Float(_) => "Float".to_string(),
&Value::String(_) => "String".to_string(), &Value::Str(_) => "String".to_string(),
&Value::Symbol(_) => "Symbol".to_string(), &Value::Symbol(_) => "Symbol".to_string(),
&Value::Tuple(_) => "Tuple".to_string(), &Value::Tuple(_) => "Tuple".to_string(),
&Value::List(_) => "List".to_string(), &Value::List(_) => "List".to_string(),
@ -377,7 +377,7 @@ impl Value {
&Value::Boolean(ref b) => format!("{}", b.val), &Value::Boolean(ref b) => format!("{}", b.val),
&Value::Int(ref i) => format!("{}", i.val), &Value::Int(ref i) => format!("{}", i.val),
&Value::Float(ref f) => format!("{}", f.val), &Value::Float(ref f) => format!("{}", f.val),
&Value::String(ref s) => format!("{}", s.val), &Value::Str(ref s) => format!("{}", s.val),
&Value::Symbol(ref s) => format!("{}", s.val), &Value::Symbol(ref s) => format!("{}", s.val),
&Value::Tuple(ref fs) => format!("{}", Self::fields_to_string(&fs.val)), &Value::Tuple(ref fs) => format!("{}", Self::fields_to_string(&fs.val)),
&Value::List(ref def) => format!("[{}]", Self::elems_to_string(&def.elems)), &Value::List(ref def) => format!("[{}]", Self::elems_to_string(&def.elems)),
@ -392,7 +392,7 @@ impl Value {
&Value::Boolean(ref b) => &b.pos, &Value::Boolean(ref b) => &b.pos,
&Value::Int(ref i) => &i.pos, &Value::Int(ref i) => &i.pos,
&Value::Float(ref f) => &f.pos, &Value::Float(ref f) => &f.pos,
&Value::String(ref s) => &s.pos, &Value::Str(ref s) => &s.pos,
&Value::Symbol(ref s) => &s.pos, &Value::Symbol(ref s) => &s.pos,
&Value::Tuple(ref fs) => &fs.pos, &Value::Tuple(ref fs) => &fs.pos,
&Value::List(ref def) => &def.pos, &Value::List(ref def) => &def.pos,
@ -409,7 +409,7 @@ impl Value {
&Value::Boolean(_), &Value::Boolean(_),
&Value::Int(_), &Value::Int(_),
&Value::Float(_), &Value::Float(_),
&Value::String(_), &Value::Str(_),
&Value::Symbol(_), &Value::Symbol(_),
&Value::Tuple(_), &Value::Tuple(_),
&Value::List(_), &Value::List(_),

28
src/build/mod.rs
View File

@ -83,7 +83,7 @@ pub enum Val {
Boolean(bool), Boolean(bool),
Int(i64), Int(i64),
Float(f64), Float(f64),
String(String), Str(String),
List(Vec<Rc<Val>>), List(Vec<Rc<Val>>),
Tuple(Vec<(Positioned<String>, Rc<Val>)>), Tuple(Vec<(Positioned<String>, Rc<Val>)>),
Macro(MacroDef), Macro(MacroDef),
@ -97,7 +97,7 @@ impl Val {
&Val::Boolean(_) => "Boolean".to_string(), &Val::Boolean(_) => "Boolean".to_string(),
&Val::Int(_) => "Integer".to_string(), &Val::Int(_) => "Integer".to_string(),
&Val::Float(_) => "Float".to_string(), &Val::Float(_) => "Float".to_string(),
&Val::String(_) => "String".to_string(), &Val::Str(_) => "String".to_string(),
&Val::List(_) => "List".to_string(), &Val::List(_) => "List".to_string(),
&Val::Tuple(_) => "Tuple".to_string(), &Val::Tuple(_) => "Tuple".to_string(),
&Val::Macro(_) => "Macro".to_string(), &Val::Macro(_) => "Macro".to_string(),
@ -113,7 +113,7 @@ impl Val {
&Val::Boolean(_), &Val::Boolean(_),
&Val::Int(_), &Val::Int(_),
&Val::Float(_), &Val::Float(_),
&Val::String(_), &Val::Str(_),
&Val::List(_), &Val::List(_),
&Val::Tuple(_), &Val::Tuple(_),
&Val::Macro(_) &Val::Macro(_)
@ -133,7 +133,7 @@ impl Val {
(&Val::Int(ref i), &Val::Int(ref ii)) => Ok(i == ii), (&Val::Int(ref i), &Val::Int(ref ii)) => Ok(i == ii),
(&Val::Float(ref f), &Val::Float(ref ff)) => Ok(f == ff), (&Val::Float(ref f), &Val::Float(ref ff)) => Ok(f == ff),
(&Val::Boolean(ref b), &Val::Boolean(ref bb)) => Ok(b == bb), (&Val::Boolean(ref b), &Val::Boolean(ref bb)) => Ok(b == bb),
(&Val::String(ref s), &Val::String(ref ss)) => Ok(s == ss), (&Val::Str(ref s), &Val::Str(ref ss)) => Ok(s == ss),
(&Val::List(ref ldef), &Val::List(ref rdef)) => { (&Val::List(ref ldef), &Val::List(ref rdef)) => {
if ldef.len() != rdef.len() { if ldef.len() != rdef.len() {
Ok(false) Ok(false)
@ -211,7 +211,7 @@ impl Val {
} }
pub fn is_string(&self) -> bool { pub fn is_string(&self) -> bool {
if let &Val::String(_) = self { if let &Val::Str(_) = self {
return true; return true;
} }
return false; return false;
@ -246,7 +246,7 @@ impl Display for Val {
&Val::Empty => write!(f, "EmptyValue"), &Val::Empty => write!(f, "EmptyValue"),
&Val::Float(ref ff) => write!(f, "Float({})", ff), &Val::Float(ref ff) => write!(f, "Float({})", ff),
&Val::Int(ref i) => write!(f, "Int({})", i), &Val::Int(ref i) => write!(f, "Int({})", i),
&Val::String(ref s) => write!(f, "String({})", s), &Val::Str(ref s) => write!(f, "String({})", s),
&Val::List(ref def) => { &Val::List(ref def) => {
try!(write!(f, "[\n")); try!(write!(f, "[\n"));
for v in def.iter() { for v in def.iter() {
@ -271,7 +271,7 @@ impl From<Val> for String {
match v { match v {
Val::Int(ref i) => format!("{}", i), Val::Int(ref i) => format!("{}", i),
Val::Float(ref f) => format!("{}", f), Val::Float(ref f) => format!("{}", f),
Val::String(ref s) => s.to_string(), Val::Str(ref s) => s.to_string(),
val => format!("<{}>", val), val => format!("<{}>", val),
} }
} }
@ -279,7 +279,7 @@ impl From<Val> for String {
impl From<String> for Val { impl From<String> for Val {
fn from(s: String) -> Val { fn from(s: String) -> Val {
Val::String(s) Val::Str(s)
} }
} }
@ -353,7 +353,7 @@ impl Builder {
&Value::Boolean(ref b) => Ok(Rc::new(Val::Boolean(b.val))), &Value::Boolean(ref b) => Ok(Rc::new(Val::Boolean(b.val))),
&Value::Int(ref i) => Ok(Rc::new(Val::Int(i.val))), &Value::Int(ref i) => Ok(Rc::new(Val::Int(i.val))),
&Value::Float(ref f) => Ok(Rc::new(Val::Float(f.val))), &Value::Float(ref f) => Ok(Rc::new(Val::Float(f.val))),
&Value::String(ref s) => Ok(Rc::new(Val::String(s.val.to_string()))), &Value::Str(ref s) => Ok(Rc::new(Val::Str(s.val.to_string()))),
&Value::Symbol(ref s) => self.lookup_sym(&(s.into())).ok_or(Box::new( &Value::Symbol(ref s) => self.lookup_sym(&(s.into())).ok_or(Box::new(
error::Error::new( error::Error::new(
format!( format!(
@ -682,9 +682,9 @@ impl Builder {
Val::Float(f) => { Val::Float(f) => {
eval_binary_expr!(&Val::Float(ff), pos, right, Val::Float(f + ff), "Float") eval_binary_expr!(&Val::Float(ff), pos, right, Val::Float(f + ff), "Float")
} }
Val::String(ref s) => match right.as_ref() { Val::Str(ref s) => match right.as_ref() {
&Val::String(ref ss) => { &Val::Str(ref ss) => {
return Ok(Rc::new(Val::String([s.to_string(), ss.clone()].concat()))) return Ok(Rc::new(Val::Str([s.to_string(), ss.clone()].concat())))
} }
val => { val => {
return Err(Box::new(error::Error::new( return Err(Box::new(error::Error::new(
@ -1035,7 +1035,7 @@ impl Builder {
vals.push(rcv.deref().clone()); vals.push(rcv.deref().clone());
} }
let formatter = format::Formatter::new(tmpl.clone(), vals); let formatter = format::Formatter::new(tmpl.clone(), vals);
Ok(Rc::new(Val::String(try!(formatter.render(&def.pos))))) Ok(Rc::new(Val::Str(try!(formatter.render(&def.pos)))))
} }
fn eval_call(&self, def: &CallDef) -> Result<Rc<Val>, Box<Error>> { fn eval_call(&self, def: &CallDef) -> Result<Rc<Val>, Box<Error>> {
@ -1081,7 +1081,7 @@ impl Builder {
// First resolve the target expression. // First resolve the target expression.
let v = try!(self.eval_expr(target)); let v = try!(self.eval_expr(target));
// Second ensure that the expression resolves to a string. // Second ensure that the expression resolves to a string.
if let &Val::String(ref name) = v.deref() { if let &Val::Str(ref name) = v.deref() {
// Third find the field with that name in the tuple. // Third find the field with that name in the tuple.
for &(ref fname, ref val_expr) in fields.iter() { for &(ref fname, ref val_expr) in fields.iter() {
if &fname.fragment == name { if &fname.fragment == name {

58
src/build/test.rs
View File

@ -174,25 +174,25 @@ fn test_eval_add_expr() {
( (
Expression::Binary(BinaryOpDef { Expression::Binary(BinaryOpDef {
kind: BinaryExprType::Add, kind: BinaryExprType::Add,
left: Box::new(Expression::Simple(Value::String(value_node!( left: Box::new(Expression::Simple(Value::Str(value_node!(
"foo".to_string(), "foo".to_string(),
1, 1,
1 1
)))), )))),
right: Box::new(Expression::Simple(Value::String(value_node!( right: Box::new(Expression::Simple(Value::Str(value_node!(
"bar".to_string(), "bar".to_string(),
1, 1,
1 1
)))), )))),
pos: Position::new(1, 0), pos: Position::new(1, 0),
}), }),
Val::String("foobar".to_string()), Val::Str("foobar".to_string()),
), ),
( (
Expression::Binary(BinaryOpDef { Expression::Binary(BinaryOpDef {
kind: BinaryExprType::Add, kind: BinaryExprType::Add,
left: Box::new(Expression::Simple(Value::List(ListDef { left: Box::new(Expression::Simple(Value::List(ListDef {
elems: vec![Expression::Simple(Value::String(value_node!( elems: vec![Expression::Simple(Value::Str(value_node!(
"foo".to_string(), "foo".to_string(),
1, 1,
1 1
@ -200,7 +200,7 @@ fn test_eval_add_expr() {
pos: Position::new(1, 1), pos: Position::new(1, 1),
}))), }))),
right: Box::new(Expression::Simple(Value::List(ListDef { right: Box::new(Expression::Simple(Value::List(ListDef {
elems: vec![Expression::Simple(Value::String(value_node!( elems: vec![Expression::Simple(Value::Str(value_node!(
"bar".to_string(), "bar".to_string(),
1, 1,
1 1
@ -210,8 +210,8 @@ fn test_eval_add_expr() {
pos: Position::new(1, 0), pos: Position::new(1, 0),
}), }),
Val::List(vec![ Val::List(vec![
Rc::new(Val::String("foo".to_string())), Rc::new(Val::Str("foo".to_string())),
Rc::new(Val::String("bar".to_string())), Rc::new(Val::Str("bar".to_string())),
]), ]),
), ),
], ],
@ -331,8 +331,8 @@ fn test_eval_simple_expr() {
Val::Float(2.0), Val::Float(2.0),
), ),
( (
Expression::Simple(Value::String(value_node!("foo".to_string(), 1, 1))), Expression::Simple(Value::Str(value_node!("foo".to_string(), 1, 1))),
Val::String("foo".to_string()), Val::Str("foo".to_string()),
), ),
( (
Expression::Simple(Value::Tuple(value_node!( Expression::Simple(Value::Tuple(value_node!(
@ -448,7 +448,7 @@ fn test_eval_selector_list_expr() {
b.out b.out
.entry(value_node!("var1".to_string(), 1, 1)) .entry(value_node!("var1".to_string(), 1, 1))
.or_insert(Rc::new(Val::List(vec![ .or_insert(Rc::new(Val::List(vec![
Rc::new(Val::String("val1".to_string())), Rc::new(Val::Str("val1".to_string())),
Rc::new(Val::Tuple(vec![( Rc::new(Val::Tuple(vec![(
value_node!("var2".to_string(), 1, 1), value_node!("var2".to_string(), 1, 1),
Rc::new(Val::Int(1)), Rc::new(Val::Int(1)),
@ -460,7 +460,7 @@ fn test_eval_selector_list_expr() {
Expression::Simple(Value::Selector( Expression::Simple(Value::Selector(
make_selector!(make_expr!("var1") => "0" => 1, 1), make_selector!(make_expr!("var1") => "0" => 1, 1),
)), )),
Val::String("val1".to_string()), Val::Str("val1".to_string()),
)], )],
b, b,
); );
@ -521,13 +521,13 @@ fn test_expr_copy_field_type_error() {
selector: make_selector!(make_expr!("tpl1")), selector: make_selector!(make_expr!("tpl1")),
fields: vec![( fields: vec![(
make_tok!("fld1", 1, 1), make_tok!("fld1", 1, 1),
Expression::Simple(Value::String(value_node!("2".to_string(), 1, 1))), Expression::Simple(Value::Str(value_node!("2".to_string(), 1, 1))),
)], )],
pos: Position::new(1, 0), pos: Position::new(1, 0),
}), }),
Val::Tuple(vec![( Val::Tuple(vec![(
value_node!("fld1".to_string(), 1, 1), value_node!("fld1".to_string(), 1, 1),
Rc::new(Val::String("2".to_string())), Rc::new(Val::Str("2".to_string())),
)]), )]),
)], )],
b, b,
@ -550,7 +550,7 @@ fn test_expr_copy() {
selector: make_selector!(make_expr!("tpl1")), selector: make_selector!(make_expr!("tpl1")),
fields: vec![( fields: vec![(
make_tok!("fld2", 1, 1), make_tok!("fld2", 1, 1),
Expression::Simple(Value::String(value_node!("2".to_string(), 1, 1))), Expression::Simple(Value::Str(value_node!("2".to_string(), 1, 1))),
)], )],
pos: Position::new(1, 0), pos: Position::new(1, 0),
}), }),
@ -563,7 +563,7 @@ fn test_expr_copy() {
(value_node!("fld1".to_string(), 1, 0), Rc::new(Val::Int(1))), (value_node!("fld1".to_string(), 1, 0), Rc::new(Val::Int(1))),
( (
value_node!("fld2".to_string(), 1, 1), value_node!("fld2".to_string(), 1, 1),
Rc::new(Val::String("2".to_string())), Rc::new(Val::Str("2".to_string())),
), ),
], ],
), ),
@ -579,7 +579,7 @@ fn test_expr_copy() {
), ),
( (
make_tok!("fld2", 1, 1), make_tok!("fld2", 1, 1),
Expression::Simple(Value::String(value_node!("2".to_string(), 1, 1))), Expression::Simple(Value::Str(value_node!("2".to_string(), 1, 1))),
), ),
], ],
pos: Position::new(1, 0), pos: Position::new(1, 0),
@ -588,7 +588,7 @@ fn test_expr_copy() {
(value_node!("fld1".to_string(), 1, 0), Rc::new(Val::Int(3))), (value_node!("fld1".to_string(), 1, 0), Rc::new(Val::Int(3))),
( (
value_node!("fld2".to_string(), 1, 0), value_node!("fld2".to_string(), 1, 0),
Rc::new(Val::String("2".to_string())), Rc::new(Val::Str("2".to_string())),
), ),
]), ]),
), ),
@ -622,7 +622,7 @@ fn test_macro_call() {
vec![( vec![(
Expression::Call(CallDef { Expression::Call(CallDef {
macroref: make_selector!(make_expr!("tstmac")), macroref: make_selector!(make_expr!("tstmac")),
arglist: vec![Expression::Simple(Value::String(value_node!( arglist: vec![Expression::Simple(Value::Str(value_node!(
"bar".to_string(), "bar".to_string(),
1, 1,
1 1
@ -631,7 +631,7 @@ fn test_macro_call() {
}), }),
Val::Tuple(vec![( Val::Tuple(vec![(
value_node!("foo".to_string(), 1, 1), value_node!("foo".to_string(), 1, 1),
Rc::new(Val::String("bar".to_string())), Rc::new(Val::Str("bar".to_string())),
)]), )]),
)], )],
b, b,
@ -644,7 +644,7 @@ fn test_macro_hermetic() {
let mut b = Builder::new(std::env::current_dir().unwrap()); let mut b = Builder::new(std::env::current_dir().unwrap());
b.out b.out
.entry(value_node!("arg1".to_string(), 1, 0)) .entry(value_node!("arg1".to_string(), 1, 0))
.or_insert(Rc::new(Val::String("bar".to_string()))); .or_insert(Rc::new(Val::Str("bar".to_string())));
b.out b.out
.entry(value_node!("tstmac".to_string(), 1, 0)) .entry(value_node!("tstmac".to_string(), 1, 0))
.or_insert(Rc::new(Val::Macro(MacroDef { .or_insert(Rc::new(Val::Macro(MacroDef {
@ -659,7 +659,7 @@ fn test_macro_hermetic() {
vec![( vec![(
Expression::Call(CallDef { Expression::Call(CallDef {
macroref: make_selector!(make_expr!("tstmac")), macroref: make_selector!(make_expr!("tstmac")),
arglist: vec![Expression::Simple(Value::String(value_node!( arglist: vec![Expression::Simple(Value::Str(value_node!(
"bar".to_string(), "bar".to_string(),
1, 1,
1 1
@ -668,7 +668,7 @@ fn test_macro_hermetic() {
}), }),
Val::Tuple(vec![( Val::Tuple(vec![(
value_node!("foo".to_string(), 1, 0), value_node!("foo".to_string(), 1, 0),
Rc::new(Val::String("bar".to_string())), Rc::new(Val::Str("bar".to_string())),
)]), )]),
)], )],
b, b,
@ -680,10 +680,10 @@ fn test_select_expr() {
let mut b = Builder::new(std::env::current_dir().unwrap()); let mut b = Builder::new(std::env::current_dir().unwrap());
b.out b.out
.entry(value_node!("foo".to_string(), 1, 0)) .entry(value_node!("foo".to_string(), 1, 0))
.or_insert(Rc::new(Val::String("bar".to_string()))); .or_insert(Rc::new(Val::Str("bar".to_string())));
b.out b.out
.entry(value_node!("baz".to_string(), 1, 0)) .entry(value_node!("baz".to_string(), 1, 0))
.or_insert(Rc::new(Val::String("boo".to_string()))); .or_insert(Rc::new(Val::Str("boo".to_string())));
test_expr_to_val( test_expr_to_val(
vec![ vec![
( (
@ -697,7 +697,7 @@ fn test_select_expr() {
tuple: vec![ tuple: vec![
( (
make_tok!("foo", 1, 1), make_tok!("foo", 1, 1),
Expression::Simple(Value::String(value_node!("2".to_string(), 1, 1))), Expression::Simple(Value::Str(value_node!("2".to_string(), 1, 1))),
), ),
( (
make_tok!("bar", 1, 1), make_tok!("bar", 1, 1),
@ -723,7 +723,7 @@ fn test_select_expr() {
), ),
( (
make_tok!("quux", 1, 1), make_tok!("quux", 1, 1),
Expression::Simple(Value::String(value_node!("2".to_string(), 1, 1))), Expression::Simple(Value::Str(value_node!("2".to_string(), 1, 1))),
), ),
], ],
pos: Position::new(1, 0), pos: Position::new(1, 0),
@ -759,7 +759,7 @@ fn test_select_expr_not_a_string() {
), ),
( (
make_tok!("quux", 1, 1), make_tok!("quux", 1, 1),
Expression::Simple(Value::String(value_node!("2".to_string(), 1, 1))), Expression::Simple(Value::Str(value_node!("2".to_string(), 1, 1))),
), ),
], ],
pos: Position::new(1, 0), pos: Position::new(1, 0),
@ -775,13 +775,13 @@ fn test_let_statement() {
let mut b = Builder::new(std::env::current_dir().unwrap()); let mut b = Builder::new(std::env::current_dir().unwrap());
let stmt = Statement::Let(LetDef { let stmt = Statement::Let(LetDef {
name: make_tok!("foo", 1, 1), name: make_tok!("foo", 1, 1),
value: Expression::Simple(Value::String(value_node!("bar".to_string(), 1, 1))), value: Expression::Simple(Value::Str(value_node!("bar".to_string(), 1, 1))),
}); });
b.build_stmt(&stmt).unwrap(); b.build_stmt(&stmt).unwrap();
test_expr_to_val( test_expr_to_val(
vec![( vec![(
Expression::Simple(Value::Symbol(value_node!("foo".to_string(), 1, 1))), Expression::Simple(Value::Symbol(value_node!("foo".to_string(), 1, 1))),
Val::String("bar".to_string()), Val::Str("bar".to_string()),
)], )],
b, b,
); );

2
src/convert/env.rs
View File

@ -69,7 +69,7 @@ impl EnvConverter {
&Val::Int(ref i) => { &Val::Int(ref i) => {
try!(write!(w, "{} ", i)); try!(write!(w, "{} ", i));
} }
&Val::String(ref s) => { &Val::Str(ref s) => {
try!(write!(w, "'{}' ", s)); try!(write!(w, "'{}' ", s));
} }
&Val::List(ref items) => { &Val::List(ref items) => {

2
src/convert/flags.rs
View File

@ -75,7 +75,7 @@ impl FlagConverter {
&Val::Int(ref i) => { &Val::Int(ref i) => {
try!(write!(w, "{} ", i)); try!(write!(w, "{} ", i));
} }
&Val::String(ref s) => { &Val::Str(ref s) => {
try!(write!(w, "'{}' ", s)); try!(write!(w, "'{}' ", s));
} }
&Val::List(ref _def) => { &Val::List(ref _def) => {

2
src/convert/json.rs
View File

@ -66,7 +66,7 @@ impl JsonConverter {
}; };
serde_json::Value::Number(n) serde_json::Value::Number(n)
} }
&Val::String(ref s) => serde_json::Value::String(s.clone()), &Val::Str(ref s) => serde_json::Value::String(s.clone()),
&Val::Macro(_) => { &Val::Macro(_) => {
eprintln!("Skipping macro encoding as null..."); eprintln!("Skipping macro encoding as null...");
serde_json::Value::Null serde_json::Value::Null

2
src/parse/mod.rs
View File

@ -42,7 +42,7 @@ named!(symbol<TokenIter, Value, error::Error>,
); );
fn str_to_value(s: &Token) -> ParseResult<Value> { fn str_to_value(s: &Token) -> ParseResult<Value> {
Ok(Value::String(value_node!( Ok(Value::Str(value_node!(
s.fragment.to_string(), s.fragment.to_string(),
s.pos.clone() s.pos.clone()
))) )))

20
src/parse/test.rs
View File

@ -319,7 +319,7 @@ fn test_expression_statement_parse() {
); );
assert_parse!( assert_parse!(
expression_statement("\"foo\";"), expression_statement("\"foo\";"),
Statement::Expression(Expression::Simple(Value::String(value_node!( Statement::Expression(Expression::Simple(Value::Str(value_node!(
"foo".to_string(), "foo".to_string(),
1, 1,
1 1
@ -327,7 +327,7 @@ fn test_expression_statement_parse() {
); );
assert_parse!( assert_parse!(
expression_statement("\"foo\" ;"), expression_statement("\"foo\" ;"),
Statement::Expression(Expression::Simple(Value::String(value_node!( Statement::Expression(Expression::Simple(Value::Str(value_node!(
"foo".to_string(), "foo".to_string(),
1, 1,
1 1
@ -335,7 +335,7 @@ fn test_expression_statement_parse() {
); );
assert_parse!( assert_parse!(
expression_statement(" \"foo\";"), expression_statement(" \"foo\";"),
Statement::Expression(Expression::Simple(Value::String(value_node!( Statement::Expression(Expression::Simple(Value::Str(value_node!(
"foo".to_string(), "foo".to_string(),
1, 1,
2 2
@ -351,7 +351,7 @@ fn test_expression_parse() {
); );
assert_parse!( assert_parse!(
expression("\"foo\""), expression("\"foo\""),
Expression::Simple(Value::String(value_node!("foo".to_string(), 1, 1))) Expression::Simple(Value::Str(value_node!("foo".to_string(), 1, 1)))
); );
assert_parse!( assert_parse!(
expression("1"), expression("1"),
@ -591,7 +591,7 @@ fn test_expression_parse() {
1, 1), 1, 1),
arglist: vec![ arglist: vec![
Expression::Simple(Value::Int(value_node!(1, 1, 10))), Expression::Simple(Value::Int(value_node!(1, 1, 10))),
Expression::Simple(Value::String(value_node!("foo".to_string(), 1, 13))), Expression::Simple(Value::Str(value_node!("foo".to_string(), 1, 13))),
], ],
pos: Position::new(1, 1), pos: Position::new(1, 1),
}) })
@ -663,7 +663,7 @@ fn test_call_parse() {
macroref: make_selector!(make_expr!("foo", 1, 1), 1, 1), macroref: make_selector!(make_expr!("foo", 1, 1), 1, 1),
arglist: vec![ arglist: vec![
Expression::Simple(Value::Int(value_node!(1, 1, 6))), Expression::Simple(Value::Int(value_node!(1, 1, 6))),
Expression::Simple(Value::String(value_node!("foo".to_string(), 1, 9))), Expression::Simple(Value::Str(value_node!("foo".to_string(), 1, 9))),
], ],
pos: Position::new(1, 1), pos: Position::new(1, 1),
}) })
@ -675,7 +675,7 @@ fn test_call_parse() {
macroref: make_selector!(make_expr!("foo") => [ make_tok!("bar", 1, 5) ] => 1, 1), macroref: make_selector!(make_expr!("foo") => [ make_tok!("bar", 1, 5) ] => 1, 1),
arglist: vec![ arglist: vec![
Expression::Simple(Value::Int(value_node!(1, 1, 10))), Expression::Simple(Value::Int(value_node!(1, 1, 10))),
Expression::Simple(Value::String(value_node!("foo".to_string(), 1, 13))), Expression::Simple(Value::Str(value_node!("foo".to_string(), 1, 13))),
], ],
pos: Position::new(1, 1), pos: Position::new(1, 1),
}) })
@ -958,7 +958,7 @@ fn test_tuple_parse() {
), ),
( (
make_tok!("bar", 1, 12), make_tok!("bar", 1, 12),
Expression::Simple(Value::String(value_node!( Expression::Simple(Value::Str(value_node!(
"1".to_string(), "1".to_string(),
Position::new(1, 18) Position::new(1, 18)
))), ))),
@ -978,7 +978,7 @@ fn test_tuple_parse() {
), ),
( (
make_tok!("bar", 2, 1), make_tok!("bar", 2, 1),
Expression::Simple(Value::String(value_node!( Expression::Simple(Value::Str(value_node!(
"1".to_string(), "1".to_string(),
Position::new(2, 7) Position::new(2, 7)
))), ))),
@ -1137,7 +1137,7 @@ fn test_field_value_parse() {
field_value("foo = \"1\""), field_value("foo = \"1\""),
( (
make_tok!("foo", 1, 1), make_tok!("foo", 1, 1),
Expression::Simple(Value::String(value_node!("1".to_string(), 1, 7))) Expression::Simple(Value::Str(value_node!("1".to_string(), 1, 7)))
) )
); );
assert_parse!( assert_parse!(