use super::{
streams::Stream, Atom, AtomCell, HeapCellValue, HeapCellValueTag, Machine, MachineConfig,
- QueryResolutionLine, QueryResult, Value,
+ QueryResolutionLine, QueryResult, PrologTerm,
};
pub struct QueryState<'a> {
return Some(Ok(QueryResolutionLine::False));
}
- let mut bindings: BTreeMap<String, Value> = BTreeMap::new();
+ let mut bindings: BTreeMap<String, PrologTerm> = BTreeMap::new();
let var_dict = &term_write_result.var_dict;
}
let mut term =
- Value::from_heapcell(machine, *term_to_be_printed, &mut var_names.clone());
+ PrologTerm::from_heapcell(machine, *term_to_be_printed, &mut var_names.clone());
- if let Value::Var(ref term_str) = term {
+ if let PrologTerm::Var(ref term_str) = term {
if *term_str == var_name {
continue;
}
var_dict.get_index_of(&VarKey::VarPtr(Var::Named(term_str.clone()).into()));
if let Some(idx) = term_idx {
if idx < var_name_idx {
- let new_term = Value::Var(var_name);
+ let new_term = PrologTerm::Var(var_name);
let new_var_name = term_str.into();
term = new_term;
var_name = new_var_name;
#[cfg(test)]
mod tests {
use super::*;
- use crate::machine::{QueryMatch, QueryResolution, Value};
+ use crate::machine::{QueryMatch, QueryResolution, Term};
#[test]
#[cfg_attr(miri, ignore = "it takes too long to run")]
output,
Ok(QueryResolution::Matches(vec![
QueryMatch::from(btreemap! {
- "P" => Value::from("p1"),
+ "P" => Term::from("p1"),
}),
QueryMatch::from(btreemap! {
- "P" => Value::from("p2"),
+ "P" => Term::from("p2"),
}),
]))
);
result,
Ok(QueryResolution::Matches(vec![QueryMatch::from(
btreemap! {
- "C" => Value::Atom("c".into()),
- "Actions" => Value::Atom("[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]".into()),
+ "C" => Term::Atom("c".into()),
+ "Actions" => Term::Atom("[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]".into()),
}
),]))
);
result,
Ok(QueryResolution::Matches(vec![QueryMatch::from(
btreemap! {
- "C" => Value::Atom("xyz".into()),
- "Actions" => Value::Atom("[{action: \"addLink\", source: \"this\", predicate: \"recipe://title\", target: \"literal://string:Meta%20Muffins\"}]".into()),
+ "C" => Term::Atom("xyz".into()),
+ "Actions" => Term::Atom("[{action: \"addLink\", source: \"this\", predicate: \"recipe://title\", target: \"literal://string:Meta%20Muffins\"}]".into()),
}
),]))
);
result,
Ok(QueryResolution::Matches(vec![
QueryMatch::from(btreemap! {
- "Class" => Value::String("Todo".into())
+ "Class" => Term::String("Todo".into())
}),
QueryMatch::from(btreemap! {
- "Class" => Value::String("Recipe".into())
+ "Class" => Term::String("Recipe".into())
}),
]))
);
result,
Ok(QueryResolution::Matches(vec![QueryMatch::from(
btreemap! {
- "X" => Value::List(vec![
- Value::Integer(1.into()),
- Value::Integer(2.into()),
- Value::Integer(3.into()),
+ "X" => Term::List(vec![
+ Term::Integer(1.into()),
+ Term::Integer(2.into()),
+ Term::Integer(3.into()),
]),
}
),]))
output,
Ok(QueryResolution::Matches(vec![
QueryMatch::from(btreemap! {
- "P" => Value::from("p1"),
+ "P" => Term::from("p1"),
}),
QueryMatch::from(btreemap! {
- "P" => Value::from("p2"),
+ "P" => Term::from("p2"),
}),
]))
);
output,
Ok(QueryResolution::Matches(vec![QueryMatch::from(
btreemap! {
- "Result" => Value::List(
+ "Result" => Term::List(
Vec::from([
- Value::List([Value::from("p1"), Value::from("b")].into()),
- Value::List([Value::from("p2"), Value::from("b")].into()),
+ Term::List([Term::from("p1"), Term::from("b")].into()),
+ Term::List([Term::from("p2"), Term::from("b")].into()),
])
),
}
result,
Ok(QueryResolution::Matches(vec![QueryMatch::from(
btreemap! {
- "X" => Value::Atom(".".into()),
+ "X" => Term::Atom(".".into()),
}
)]))
);
result,
Ok(QueryResolution::Matches(vec![QueryMatch::from(
btreemap! {
- "X" => Value::Rational(RBig::from_parts(1.into(), 2u32.into())),
+ "X" => Term::Rational(RBig::from_parts(1.into(), 2u32.into())),
}
)]))
);
result,
Ok(QueryResolution::Matches(vec![QueryMatch::from(
btreemap! {
- "X" => Value::Integer(IBig::from(10).pow(100)),
+ "X" => Term::Integer(IBig::from(10).pow(100)),
}
)]))
);
let result = machine.run_query(query);
- let expected = Value::Structure(
+ let expected = Term::Structure(
// Composite term
"a".into(),
vec![
- Value::String("asdf".into()), // String
- Value::List(vec![
- Value::Integer(42.into()), // Fixnum
- Value::Float(2.54.into()), // Float
- Value::Atom("asdf".into()), // Atom
- Value::Atom("a".into()), // Char
- Value::Structure(
+ Term::String("asdf".into()), // String
+ Term::List(vec![
+ Term::Integer(42.into()), // Fixnum
+ Term::Float(2.54.into()), // Float
+ Term::Atom("asdf".into()), // Atom
+ Term::Atom("a".into()), // Char
+ Term::Structure(
// Partial string
".".into(),
vec![
- Value::Atom("a".into()),
- Value::Structure(
+ Term::Atom("a".into()),
+ Term::Structure(
".".into(),
vec![
- Value::Atom("b".into()),
- Value::Var("_A".into()), // Anonymous variable
+ Term::Atom("b".into()),
+ Term::Var("_A".into()), // Anonymous variable
],
),
],
),
- Value::Var("Z".into()), // Named variable
+ Term::Var("Z".into()), // Named variable
]),
],
);
result,
Ok(QueryResolution::Matches(vec![
QueryMatch::from(btreemap! {
- "A" => Value::List(vec![Value::Var("_A".into()), Value::Var("_C".into())]),
- "_B" => Value::Integer(1.into()),
+ "A" => Term::List(vec![Term::Var("_A".into()), Term::Var("_C".into())]),
+ "_B" => Term::Integer(1.into()),
}),
QueryMatch::from(btreemap! {
- "B" => Value::List(vec![Value::Var("_A".into()), Value::Var("_C".into())]),
+ "B" => Term::List(vec![Term::Var("_A".into()), Term::Var("_C".into())]),
}),
]))
);
result,
Ok(QueryResolution::Matches(vec![QueryMatch::from(
btreemap! {
- "X" => Value::Var("Y".into()),
- "Z" => Value::Var("W".into()),
+ "X" => Term::Var("Y".into()),
+ "Z" => Term::Var("W".into()),
}
),]))
);
fn write_prolog_value_as_json<W: Write>(
writer: &mut W,
- value: &Value,
+ value: &PrologTerm,
) -> Result<(), std::fmt::Error> {
match value {
- Value::Integer(i) => write!(writer, "{}", i),
- Value::Float(f) => write!(writer, "{}", f),
- Value::Rational(r) => write!(writer, "{}", r),
- Value::Atom(a) => writer.write_str(a.as_str()),
- Value::String(s) => {
+ PrologTerm::Integer(i) => write!(writer, "{}", i),
+ PrologTerm::Float(f) => write!(writer, "{}", f),
+ PrologTerm::Rational(r) => write!(writer, "{}", r),
+ PrologTerm::Atom(a) => writer.write_str(a.as_str()),
+ PrologTerm::String(s) => {
if let Err(_e) = serde_json::from_str::<serde_json::Value>(s.as_str()) {
//treat as string literal
//escape double quotes
writer.write_str(s)
}
}
- Value::List(l) => {
+ PrologTerm::List(l) => {
writer.write_char('[')?;
if let Some((first, rest)) = l.split_first() {
write_prolog_value_as_json(writer, first)?;
}
writer.write_char(']')
}
- Value::Structure(s, l) => {
+ PrologTerm::Structure(s, l) => {
write!(writer, "\"{}\":[", s.as_str())?;
if let Some((first, rest)) = l.split_first() {
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct QueryMatch {
- pub bindings: BTreeMap<String, Value>,
+ pub bindings: BTreeMap<String, PrologTerm>,
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum QueryResolutionLine {
True,
False,
- Match(BTreeMap<String, Value>),
+ Match(BTreeMap<String, PrologTerm>),
}
#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum Value {
+pub enum PrologTerm {
Integer(Integer),
Rational(Rational),
Float(OrderedFloat<f64>),
Atom(String),
String(String),
- List(Vec<Value>),
- Structure(String, Vec<Value>),
+ List(Vec<PrologTerm>),
+ Structure(String, Vec<PrologTerm>),
Var(String),
}
letters.into_iter().chain("_".chars()).rev().collect()
}
-impl Value {
+impl PrologTerm {
pub(crate) fn from_heapcell(
machine: &mut Machine,
heap_cell: HeapCellValue,
let head = term_stack.pop().unwrap();
let list = match tail {
- Value::Atom(atom) if atom == "[]" => match head {
- Value::Atom(ref a) if a.chars().collect::<Vec<_>>().len() == 1 => {
+ PrologTerm::Atom(atom) if atom == "[]" => match head {
+ PrologTerm::Atom(ref a) if a.chars().collect::<Vec<_>>().len() == 1 => {
// Handle lists of char as strings
- Value::String(a.to_string())
+ PrologTerm::String(a.to_string())
}
- _ => Value::List(vec![head]),
+ _ => PrologTerm::List(vec![head]),
},
- Value::List(elems) if elems.is_empty() => match head {
- Value::Atom(ref a) if a.chars().collect::<Vec<_>>().len() == 1 => {
+ PrologTerm::List(elems) if elems.is_empty() => match head {
+ PrologTerm::Atom(ref a) if a.chars().collect::<Vec<_>>().len() == 1 => {
// Handle lists of char as strings
- Value::String(a.to_string())
+ PrologTerm::String(a.to_string())
},
- _ => Value::List(vec![head]),
+ _ => PrologTerm::List(vec![head]),
},
- Value::List(mut elems) => {
+ PrologTerm::List(mut elems) => {
elems.insert(0, head);
- Value::List(elems)
+ PrologTerm::List(elems)
},
- Value::String(mut elems) => match head {
- Value::Atom(ref a) if a.chars().collect::<Vec<_>>().len() == 1 => {
+ PrologTerm::String(mut elems) => match head {
+ PrologTerm::Atom(ref a) if a.chars().collect::<Vec<_>>().len() == 1 => {
// Handle lists of char as strings
elems.insert(0, a.chars().next().unwrap());
- Value::String(elems)
+ PrologTerm::String(elems)
},
_ => {
- let mut elems: Vec<Value> = elems
+ let mut elems: Vec<PrologTerm> = elems
.chars()
- .map(|x| Value::Atom(x.into()))
+ .map(|x| PrologTerm::Atom(x.into()))
.collect();
elems.insert(0, head);
- Value::List(elems)
+ PrologTerm::List(elems)
}
},
_ => {
- Value::Structure(".".into(), vec![head, tail])
+ PrologTerm::Structure(".".into(), vec![head, tail])
}
};
term_stack.push(list);
(HeapCellValueTag::Var | HeapCellValueTag::AttrVar | HeapCellValueTag::StackVar) => {
let var = var_names.get(&addr).map(|x| x.borrow().clone());
match var {
- Some(Var::Named(name)) => term_stack.push(Value::Var(name)),
+ Some(Var::Named(name)) => term_stack.push(PrologTerm::Var(name)),
_ => {
let anon_name = loop {
// Generate a name for the anonymous variable
},
}
};
- term_stack.push(Value::Var(anon_name));
+ term_stack.push(PrologTerm::Var(anon_name));
},
}
}
(HeapCellValueTag::F64, f) => {
- term_stack.push(Value::Float(*f));
+ term_stack.push(PrologTerm::Float(*f));
}
(HeapCellValueTag::Char, c) => {
- term_stack.push(Value::Atom(c.into()));
+ term_stack.push(PrologTerm::Atom(c.into()));
}
(HeapCellValueTag::Fixnum, n) => {
- term_stack.push(Value::Integer(n.into()));
+ term_stack.push(PrologTerm::Integer(n.into()));
}
(HeapCellValueTag::Cons) => {
match Number::try_from(addr) {
- Ok(Number::Integer(i)) => term_stack.push(Value::Integer((*i).clone())),
- Ok(Number::Rational(r)) => term_stack.push(Value::Rational((*r).clone())),
+ Ok(Number::Integer(i)) => term_stack.push(PrologTerm::Integer((*i).clone())),
+ Ok(Number::Rational(r)) => term_stack.push(PrologTerm::Rational((*r).clone())),
_ => {}
}
}
(HeapCellValueTag::CStr, s) => {
- term_stack.push(Value::String(s.as_str().to_string()));
+ term_stack.push(PrologTerm::String(s.as_str().to_string()));
}
(HeapCellValueTag::Atom, (name, arity)) => {
//let h = iter.focus().value() as usize;
if arity == 0 {
let atom_name = name.as_str().to_string();
if atom_name == "[]" {
- term_stack.push(Value::List(vec![]));
+ term_stack.push(PrologTerm::List(vec![]));
} else {
- term_stack.push(Value::Atom(atom_name));
+ term_stack.push(PrologTerm::Atom(atom_name));
}
} else {
let subterms = term_stack
.drain(term_stack.len() - arity ..)
.collect();
- term_stack.push(Value::Structure(name.as_str().to_string(), subterms));
+ term_stack.push(PrologTerm::Structure(name.as_str().to_string(), subterms));
}
}
(HeapCellValueTag::PStr, atom) => {
let tail = term_stack.pop().unwrap();
match tail {
- Value::Atom(atom) => {
+ PrologTerm::Atom(atom) => {
if atom == "[]" {
- term_stack.push(Value::String(atom.as_str().to_string()));
+ term_stack.push(PrologTerm::String(atom.as_str().to_string()));
}
},
- Value::List(l) => {
- let mut list: Vec<Value> = atom
+ PrologTerm::List(l) => {
+ let mut list: Vec<PrologTerm> = atom
.as_str()
.to_string()
.chars()
- .map(|x| Value::Atom(x.to_string()))
+ .map(|x| PrologTerm::Atom(x.to_string()))
.collect();
list.extend(l.into_iter());
- term_stack.push(Value::List(list));
+ term_stack.push(PrologTerm::List(list));
},
_ => {
- let mut list: Vec<Value> = atom
+ let mut list: Vec<PrologTerm> = atom
.as_str()
.to_string()
.chars()
- .map(|x| Value::Atom(x.to_string()))
+ .map(|x| PrologTerm::Atom(x.to_string()))
.collect();
- let mut partial_list = Value::Structure(
+ let mut partial_list = PrologTerm::Structure(
".".into(),
vec![
list.pop().unwrap(),
);
while let Some(last) = list.pop() {
- partial_list = Value::Structure(
+ partial_list = PrologTerm::Structure(
".".into(),
vec![
last,
}
}
-impl From<BTreeMap<&str, Value>> for QueryMatch {
- fn from(bindings: BTreeMap<&str, Value>) -> Self {
+impl From<BTreeMap<&str, PrologTerm>> for QueryMatch {
+ fn from(bindings: BTreeMap<&str, PrologTerm>) -> Self {
QueryMatch {
bindings: bindings
.into_iter()
}
}
-impl From<BTreeMap<String, Value>> for QueryMatch {
- fn from(bindings: BTreeMap<String, Value>) -> Self {
+impl From<BTreeMap<String, PrologTerm>> for QueryMatch {
+ fn from(bindings: BTreeMap<String, PrologTerm>) -> Self {
QueryMatch { bindings }
}
}
_ => Ok(QueryResolutionLine::Match(
parse_prolog_response(&string)
.iter()
- .map(|(k, v)| -> Result<(String, Value), ()> {
+ .map(|(k, v)| -> Result<(String, PrologTerm), ()> {
let key = k.to_string();
let value = v.to_string();
- Ok((key, Value::try_from(value)?))
+ Ok((key, PrologTerm::try_from(value)?))
})
.filter_map(Result::ok)
.collect::<BTreeMap<_, _>>(),
result
}
-impl TryFrom<String> for Value {
+impl TryFrom<String> for PrologTerm {
type Error = ();
fn try_from(string: String) -> Result<Self, Self::Error> {
let trimmed = string.trim();
if let Ok(float_value) = string.parse::<f64>() {
- Ok(Value::Float(OrderedFloat(float_value)))
+ Ok(PrologTerm::Float(OrderedFloat(float_value)))
} else if let Ok(int_value) = string.parse::<i128>() {
- Ok(Value::Integer(int_value.into()))
+ Ok(PrologTerm::Integer(int_value.into()))
} else if trimmed.starts_with('\'') && trimmed.ends_with('\'')
|| trimmed.starts_with('"') && trimmed.ends_with('"')
{
- Ok(Value::String(trimmed[1..trimmed.len() - 1].into()))
+ Ok(PrologTerm::String(trimmed[1..trimmed.len() - 1].into()))
} else if trimmed.starts_with('[') && trimmed.ends_with(']') {
let split = split_nested_list(&trimmed[1..trimmed.len() - 1]);
let values = split
.into_iter()
- .map(Value::try_from)
+ .map(PrologTerm::try_from)
.collect::<Result<Vec<_>, _>>()?;
- Ok(Value::List(values))
+ Ok(PrologTerm::List(values))
} else if trimmed.starts_with('{') && trimmed.ends_with('}') {
let iter = trimmed[1..trimmed.len() - 1].split(',');
let mut values = vec![];
if items.len() == 2 {
let _key = items[0].to_string();
let value = items[1].to_string();
- values.push(Value::try_from(value)?);
+ values.push(PrologTerm::try_from(value)?);
}
}
- Ok(Value::Structure("{}".into(), values))
+ Ok(PrologTerm::Structure("{}".into(), values))
} else if trimmed.starts_with("<<") && trimmed.ends_with(">>") {
let iter = trimmed[2..trimmed.len() - 2].split(',');
let mut values = vec![];
if items.len() == 2 {
let _key = items[0].to_string();
let value = items[1].to_string();
- values.push(Value::try_from(value)?);
+ values.push(PrologTerm::try_from(value)?);
}
}
- Ok(Value::Structure("<<>>".into(), values))
+ Ok(PrologTerm::Structure("<<>>".into(), values))
} else if !trimmed.contains(',') && !trimmed.contains('\'') && !trimmed.contains('"') {
- Ok(Value::String(trimmed.into()))
+ Ok(PrologTerm::String(trimmed.into()))
} else {
Err(())
}
}
}
-impl From<&str> for Value {
+impl From<&str> for PrologTerm {
fn from(str: &str) -> Self {
- Value::String(str.to_string())
+ PrologTerm::String(str.to_string())
}
}
projects / scryer-prolog.git / commitdiff