rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lists of chars as strings

Browse Source
This commit is contained in:
bakaq
2024-08-16 00:34:46 -03:00
parent 7afc08af47
commit 8736526b35
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/machine/parsed_results.rs
View File

@@ -194,6 +194,20 @@ impl Value {
let head = term_stack.pop().unwrap(); let head = term_stack.pop().unwrap();
let list = match tail { let list = match tail {
Value::Atom(atom) if atom == "[]" => match head {
Value::Atom(ref a) if a.chars().collect::<Vec<_>>().len() == 1 => {
// Handle lists of char as strings
Value::String(a.to_string())
}
_ => Value::List(vec![head]),
},
Value::List(elems) if elems.is_empty() => match head {
Value::Atom(ref a) if a.chars().collect::<Vec<_>>().len() == 1 => {
// Handle lists of char as strings
Value::String(a.to_string())
},
_ => Value::List(vec![head]),
},
Value::List(mut elems) => { Value::List(mut elems) => {
elems.insert(0, head); elems.insert(0, head);
Value::List(elems) Value::List(elems)
@@ -213,13 +227,6 @@ impl Value {
Value::List(elems) Value::List(elems)
} }
}, },
Value::Atom(atom) if atom == "[]" => match head {
Value::Atom(ref a) if a.chars().collect::<Vec<_>>().len() == 1 => {
// Handle lists of char as strings
Value::String(a.to_string())
}
_ => Value::List(vec![head]),
},
_ => Value::Structure(".".into(), vec![head, tail]), _ => Value::Structure(".".into(), vec![head, tail]),
}; };
term_stack.push(list); term_stack.push(list);