bug fixes and performance improvements

src/external/conv/parse_float.rs

@@ -2,14 +2,12 @@
 use chumsky::Parser;
 
 use std::fmt::Debug;
-use std::hash::Hash;
 
 use super::super::assertion_error::AssertionError;
+use crate::external::litconv::with_lit;
 use crate::parse::float_parser;
+use crate::representations::{interpreted::ExprInst, Literal};
 use crate::{atomic_impl, atomic_redirect, externfn_impl};
-use crate::foreign::ExternError;
-use crate::representations::{Primitive, Literal};
-use crate::representations::interpreted::Clause;
 
 /// ParseFloat a number
 /// 
@@ -17,30 +15,27 @@ use crate::representations::interpreted::Clause;
 
 #[derive(Clone)]
 pub struct ParseFloat1;
-externfn_impl!(ParseFloat1, |_: &Self, c: Clause| {Ok(ParseFloat0{c})});
+externfn_impl!(ParseFloat1, |_: &Self, x: ExprInst| {Ok(ParseFloat0{x})});
 
 /// Applied to_string function
 /// 
 /// Prev state: [ParseFloat1]
 
-#[derive(Debug, Clone, PartialEq, Hash)]
-pub struct ParseFloat0{ c: Clause }
-atomic_redirect!(ParseFloat0, c);
-atomic_impl!(ParseFloat0, |Self{ c }: &Self| {
-  let literal: &Literal = c.try_into()
-    .map_err(|_| AssertionError::ext(c.clone(), "a literal value"))?;
-  let number = match literal {
+#[derive(Debug, Clone)]
+pub struct ParseFloat0{ x: ExprInst }
+atomic_redirect!(ParseFloat0, x);
+atomic_impl!(ParseFloat0, |Self{ x }: &Self| {
+  let number = with_lit(x, |l| Ok(match l {
     Literal::Str(s) => {
       let parser = float_parser();
-      parser.parse(s.as_str()).map_err(|_| AssertionError{
-        value: c.clone(), assertion: "cannot be parsed into a float"
-      }.into_extern())?
+      parser.parse(s.as_str())
+        .map_err(|_| AssertionError::ext(x.clone(), "cannot be parsed into a float"))?
     }
     Literal::Num(n) => *n,
     Literal::Uint(i) => (*i as u32).into(),
-    Literal::Char(char) => char.to_digit(10).ok_or(AssertionError{
-      value: c.clone(), assertion: "is not a decimal digit"
-    }.into_extern())?.into()
-  };
-  Ok(Clause::P(Primitive::Literal(Literal::Num(number))))
+    Literal::Char(char) => char.to_digit(10)
+      .ok_or(AssertionError::ext(x.clone(), "is not a decimal digit"))?
+      .into()
+  }))?;
+  Ok(number.into())
 });