Pre: Handle SrcVar.
This commit is contained in:
parent
62fda71fbc
commit
6544ca1594
1 changed files with 33 additions and 14 deletions
|
@ -147,7 +147,11 @@ impl FromValue<SrcVar> for SrcVar {
|
||||||
impl SrcVar {
|
impl SrcVar {
|
||||||
pub fn from_symbol(sym: &PlainSymbol) -> Option<SrcVar> {
|
pub fn from_symbol(sym: &PlainSymbol) -> Option<SrcVar> {
|
||||||
if sym.is_src_symbol() {
|
if sym.is_src_symbol() {
|
||||||
|
if sym.0 == "$" {
|
||||||
|
Some(SrcVar::DefaultSrc)
|
||||||
|
} else {
|
||||||
Some(SrcVar::NamedSrc(sym.plain_name().to_string()))
|
Some(SrcVar::NamedSrc(sym.plain_name().to_string()))
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
@ -185,19 +189,34 @@ pub enum FnArg {
|
||||||
|
|
||||||
impl FromValue<FnArg> for FnArg {
|
impl FromValue<FnArg> for FnArg {
|
||||||
fn from_value(v: edn::ValueAndSpan) -> Option<FnArg> {
|
fn from_value(v: edn::ValueAndSpan) -> Option<FnArg> {
|
||||||
// TODO: support SrcVars.
|
use edn::SpannedValue::*;
|
||||||
Variable::from_value(v.clone()) // TODO: don't clone!
|
|
||||||
.and_then(|v| Some(FnArg::Variable(v)))
|
|
||||||
.or_else(|| {
|
|
||||||
println!("from_value {}", v.inner);
|
|
||||||
match v.inner {
|
match v.inner {
|
||||||
edn::SpannedValue::Integer(i) => Some(FnArg::EntidOrInteger(i)),
|
Integer(x) =>
|
||||||
edn::SpannedValue::Boolean(b) => Some(FnArg::Constant(NonIntegerConstant::Boolean(b))),
|
Some(FnArg::EntidOrInteger(x)),
|
||||||
edn::SpannedValue::BigInteger(x) => Some(FnArg::Constant(NonIntegerConstant::BigInteger(x))),
|
PlainSymbol(ref x) if x.is_src_symbol() =>
|
||||||
edn::SpannedValue::Float(f) => Some(FnArg::Constant(NonIntegerConstant::Float(f))),
|
SrcVar::from_symbol(x).map(FnArg::SrcVar),
|
||||||
edn::SpannedValue::Text(ref s) => Some(FnArg::Constant(NonIntegerConstant::Text(Rc::new(s.clone())))),
|
PlainSymbol(ref x) if x.is_var_symbol() =>
|
||||||
_ => unimplemented!(),
|
Variable::from_symbol(x).map(FnArg::Variable),
|
||||||
}})
|
PlainSymbol(_) => None,
|
||||||
|
NamespacedKeyword(ref x) =>
|
||||||
|
Some(FnArg::Ident(x.clone())),
|
||||||
|
Boolean(x) =>
|
||||||
|
Some(FnArg::Constant(NonIntegerConstant::Boolean(x))),
|
||||||
|
Float(x) =>
|
||||||
|
Some(FnArg::Constant(NonIntegerConstant::Float(x))),
|
||||||
|
BigInteger(ref x) =>
|
||||||
|
Some(FnArg::Constant(NonIntegerConstant::BigInteger(x.clone()))),
|
||||||
|
Text(ref x) =>
|
||||||
|
// TODO: intern strings. #398.
|
||||||
|
Some(FnArg::Constant(NonIntegerConstant::Text(Rc::new(x.clone())))),
|
||||||
|
Nil |
|
||||||
|
NamespacedSymbol(_) |
|
||||||
|
Keyword(_) |
|
||||||
|
Vector(_) |
|
||||||
|
List(_) |
|
||||||
|
Set(_) |
|
||||||
|
Map(_) => None,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue