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

Fix parsing of floats

Browse Source
This commit is contained in:
Nicolas Luck
2023-08-24 18:10:47 +02:00
parent bfb3164a0d
commit c25888288a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/machine/lib_machine.rs
View File

@@ -52,7 +52,7 @@ impl Machine {
.iter() .iter()
// 4. Trim and remove empty lines // 4. Trim and remove empty lines
.map(|s| s.trim()) .map(|s| s.trim())
.map(|s| s.replace(".", "")) .map(|s| if s.ends_with(".") { s[..s.len()-1].to_string() } else { s.to_string() })
.filter(|s| !s.is_empty()) .filter(|s| !s.is_empty())
// 5. Parse into QueryResolutionLine // 5. Parse into QueryResolutionLine
.map(QueryResolutionLine::try_from) .map(QueryResolutionLine::try_from)

8
src/machine/parsed_results.rs
View File

@@ -163,7 +163,13 @@ impl TryFrom<String> for Value {
fn try_from(string: String) -> Result<Self, Self::Error> { fn try_from(string: String) -> Result<Self, Self::Error> {
let trimmed = string.trim(); let trimmed = string.trim();
if trimmed.starts_with("'") && trimmed.ends_with("'") { if let Ok(float_value) = string.parse::<f64>() {
println!("float value: {} -> {}", string, float_value);
Ok(Value::Float(OrderedFloat(float_value)))
} else if let Ok(int_value) = string.parse::<i128>() {
println!("int value: {} -> {}", string, int_value);
Ok(Value::Integer(int_value.into()))
} else if trimmed.starts_with("'") && trimmed.ends_with("'") {
Ok(Value::String(trimmed[1..trimmed.len() - 1].into())) Ok(Value::String(trimmed[1..trimmed.len() - 1].into()))
} else if trimmed.starts_with("\"") && trimmed.ends_with("\"") { } else if trimmed.starts_with("\"") && trimmed.ends_with("\"") {
Ok(Value::String(trimmed[1..trimmed.len() - 1].into())) Ok(Value::String(trimmed[1..trimmed.len() - 1].into()))