Continued nom parser implementation

Cargo.toml

@@ -21,6 +21,7 @@ nom = "7.1.3"
 nom_locate = "4.2.0"
 nom-supreme = "0.8.0"
 substring = "1.4.5"
+accessors-rs = "0.1.0"
 
 [profile.release]
 opt-level = 3

src/root/nom_parser/parse_function/parse_evaluable.rs

@@ -192,7 +192,7 @@ pub fn parse_evaluable(s: Span, semicolon_terminated: bool) -> ParseResult<Span,
 
     debug_assert!(after.is_empty());
 
-    let mut evaluables: Vec<_> = evaluables.into_iter().map(|e| Some(e)).collect();
+    let mut evaluables: Vec<_> = enumerated.into_iter().map(|(_, e)| Some(e)).collect();
 
 
     fn recursively_convert_temp(base: TempOperation, evaluables: &mut Vec<Option<TempEvaluableTokens>>) -> EvaluableToken {
@@ -205,19 +205,24 @@ pub fn parse_evaluable(s: Span, semicolon_terminated: bool) -> ParseResult<Span,
 
         match base {
             TempOperation::Infix(lhs, op, rhs) => {
-                let lhs = recursively_convert_temp(lhs.into(), evaluables);
+                let lhs = recursively_convert_temp(*lhs, evaluables);
                 EvaluableToken {
                     location: lhs.location.clone(),
                     token: EvaluableTokens::InfixOperator(
                         b!(lhs),
                         op,
-                        b!(recursively_convert_temp(rhs.into(), evaluables))
+                        b!(recursively_convert_temp(*rhs, evaluables))
                     ),
                 }
-
             }
-            TempOperation::Prefix(_, _) => {
-
+            TempOperation::Prefix(op, operand) => {
+                EvaluableToken {
+                    location: op.location().clone(),
+                    token: EvaluableTokens::PrefixOperator(
+                        op,
+                        b!(recursively_convert_temp(*operand, evaluables))
+                    ),
+                }
             }
             TempOperation::Value(p) => {
                 not_operator(evaluables[p].take().unwrap())

src/root/nom_parser/parse_function/parse_operator.rs

@@ -1,3 +1,4 @@
+use accessors_rs::Accessors;
 use nom::Err::Error;
 use nom::error::{ErrorKind, ParseError};
 use nom::Parser;
@@ -33,8 +34,9 @@ pub fn get_priority(operator: &OperatorTokens) -> usize {
     panic!()
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Accessors)]
 pub struct OperatorToken {
+    #[accessors(get)]
     location: Location,
     operator: OperatorTokens,
 }