rework

thesayyn · May 26, 2024 · 8cc6d21 · 8cc6d21
1 parent a5f0aca
commit 8cc6d21
Show file tree

Hide file tree

Showing 16 changed files with 621 additions and 93 deletions.
diff --git a/cel-rs/Cargo.toml b/cel-rs/Cargo.toml
@@ -15,6 +15,7 @@ ordered_hash_map = "0.4.0"
 regex = "1.4.2"
 lalrpop-util = "0.19.1"
 lazy_static = "1.4.0"
+unescape = "0.1.0"
 
 [dev-dependencies]
 cel-spec = {path = "../cel-spec"}

diff --git a/cel-rs/src/eval.rs b/cel-rs/src/eval.rs
@@ -1,5 +1,8 @@
+use std::collections::HashMap;
+use std::rc::Rc;
+
 use crate::parser::{Atom, Expression, RelationOp};
-use crate::value::value::{Val};
+use crate::value::value::Val;
 use crate::Context;
 
 #[derive(Default)]
@@ -47,24 +50,7 @@ impl Eval {
     //         crate::parser::Member::Fields(_) => todo!("Fields"),
     //     }
     // }
-    // fn eval_map(&self, entries: Vec<(Expression, Expression)>, ctx: &mut Context) -> Value {
-    //     let mut map = OrderedHashMap::with_capacity(entries.len());
-    //     for (kexpr, vexpr) in entries {
-    //         let k = self.eval(kexpr, ctx).unpack();
-    //         let v = self.eval(vexpr, ctx).unpack();
-    //         map.insert(k, v);
-    //     }
-    //     Value::Map(Rc::new(map))
-    // }
 
-    // fn eval_list(&self, elems: Vec<Expression>, ctx: &mut Context) -> Value {
-    //     let mut list = Vec::with_capacity(elems.len());
-    //     for expr in elems {
-    //         let v = self.eval(expr, ctx).unpack();
-    //         list.push(v);
-    //     }
-    //     Value::List(Rc::new(list))
-    // }
 
     pub fn eval(&self, expr: Expression, ctx: &mut Context) -> Val {
         match expr {
@@ -88,8 +74,8 @@ impl Eval {
             Expression::Unary(_, _) => todo!(),
             Expression::Member(_, _) => todo!(),
             Expression::FunctionCall(_) => todo!(),
-            Expression::List(_) => todo!(),
-            Expression::Map(_) => todo!(),
+            Expression::List(values) => self.eval_list(values, ctx),
+            Expression::Map(entries) => self.eval_map(entries, ctx),
             Expression::Atom(atom) => self.eval_atom(atom, ctx),
             Expression::Ident(ident) => ctx
                 .resolve(&ident)
@@ -98,6 +84,26 @@ impl Eval {
         }
     }
 
+    fn eval_map(&self, entries: Vec<(Expression, Expression)>, ctx: &mut Context) -> Val {
+        let mut map = HashMap::with_capacity(entries.len());
+        for (kexpr, vexpr) in entries {
+            let k = self.eval(kexpr, ctx);
+            let v = self.eval(vexpr, ctx);
+            map.insert(k, v);
+        }
+        Val::new_map(Rc::new(map))
+    }
+
+
+    fn eval_list(&self, elems: Vec<Expression>, ctx: &mut Context) -> Val {
+        let mut list = Vec::with_capacity(elems.len());
+        for expr in elems {
+            let v = self.eval(expr, ctx);
+            list.push(v);
+        }
+        Val::new_list(Rc::new(list))
+    }
+
     pub fn eval_atom(&self, atom: Atom, ctx: &mut Context) -> Val {
         match atom {
             Atom::Int(i) => Val::new_int(i),

diff --git a/cel-rs/src/lib.rs b/cel-rs/src/lib.rs
@@ -6,4 +6,5 @@ mod parser;
 
 // public api
 pub use crate::program::Program;
-pub use crate::context::Context;
+pub use crate::context::Context;
+pub use value::value::{Val, Value};
diff --git a/cel-rs/src/parser/cel.lalrpop b/cel-rs/src/parser/cel.lalrpop
@@ -1,4 +1,5 @@
 use crate::parser::{RelationOp, ArithmeticOp, Expression, UnaryOp, Member, Atom};
+use crate::parser::parse;
 use std::rc::Rc;
 
 grammar;
@@ -90,24 +91,28 @@ RelationOp: RelationOp = {
 
 Atom: Atom = {
     // Integer literals
-    r"-?[0-9]+" => Atom::Int(<>.parse().unwrap()),
-    r"-?0[xX]([0-9a-fA-F]+)" => Atom::Int(i64::from_str_radix(<>, 16).unwrap()),
+
+    r"-?[0-9]+" => Atom::Int(<>.parse().expect("failed to parse int")),
+
+    r"0[xX]([0-9a-fA-F]+)" => Atom::Int(i64::from_str_radix(<>.trim_start_matches("0x").trim_start_matches("0X"), 16).unwrap()),
+    r"-0[xX]([0-9a-fA-F]+)" => Atom::Int(-i64::from_str_radix(<>.trim_start_matches("-0x").trim_start_matches("-0x"), 16).unwrap()),
+
     // LALRPOP does not support regex capture groups. https://github.com/lalrpop/lalrpop/issues/575
     r"-?[0-9]+[uU]" => Atom::UInt(<>.trim_end_matches(|c| c == 'u' || c == 'U').parse().unwrap()),
-    r"-?0[xX]([0-9a-fA-F]+)[uU]" => Atom::UInt(u64::from_str_radix(<>.trim_end_matches(|c| c == 'u' || c == 'U'), 16).unwrap()),
+    r"0[xX]([0-9a-fA-F]+)[uU]" => Atom::UInt(u64::from_str_radix(<>.trim_start_matches("0x").trim_start_matches("0X").trim_end_matches(|c| c == 'u' || c == 'U'), 16).expect("heyo")),
 
     // Float with decimals and optional exponent
     r"([-+]?[0-9]*\.[0-9]+([eE][-+]?[0-9]+)?)" => Atom::Float(<>.parse().unwrap()),
     // Float with no decimals and required exponent
     r"[-+]?[0-9]+[eE][-+]?[0-9]+" => Atom::Float(<>.parse().unwrap()),
 
     // Double quoted string
-    "r"? <s:r#""(\\.|[^"\n])*""#> => Atom::String(Rc::new(s[1..s.len()-1].into())),
-    "r"? <s:r#""""(\\.|[^"{3}])*""""#> => Atom::String(Rc::new(s[3..s.len()-3].into())),
+    "r"? <s:r#""(\\.|[^"\n])*""#> => Atom::String(Rc::new(parse::parse_str(&s[1..s.len()-1]))),
+    "r"? <s:r#""""(\\.|[^"{3}])*""""#> => Atom::String(Rc::new(parse::parse_str(&s[3..s.len()-3]))),
 
     // Single quoted string
-    "r"? <s:r#"'(\\.|[^'\n])*'"#> => Atom::String(Rc::new(s[1..s.len()-1].into())),
-    "r"? <s:r#"'''(\\.|[^'{3}])*'''"#> => Atom::String(Rc::new(s[3..s.len()-3].into())),
+    "r"? <s:r#"'(\\.|[^'\n])*'"#> => Atom::String(Rc::new(parse::parse_str(&s[1..s.len()-1]))),
+    "r"? <s:r#"'''(\\.|[^'{3}])*'''"#> => Atom::String(Rc::new(parse::parse_str(&s[3..s.len()-3]))),
 
 
     // Double quoted bytes

diff --git a/cel-rs/src/parser/mod.rs b/cel-rs/src/parser/mod.rs
@@ -1,6 +1,7 @@
 use lalrpop_util::lalrpop_mod;
 
 pub mod ast;
+pub mod parse;
 pub use ast::*;
 
 lalrpop_mod!(

diff --git a/cel-rs/src/parser/parse.rs b/cel-rs/src/parser/parse.rs
@@ -0,0 +1,5 @@
+use unescape::unescape;
+
+pub fn parse_str(str: &str) -> String {
+    unescape(str).unwrap_or(String::new())
+}
diff --git a/cel-rs/src/program.rs b/cel-rs/src/program.rs
@@ -113,6 +113,18 @@ pub mod tests {
         assert_eq!(eval_program!(r#"2 == 2"#), Val::new_bool(true));
     }
 
+    #[test]
+    fn self_eval_int_hex_negative() {
+        let expr = r#"-0x55555555"#;
+        let program = crate::Program::new(expr);
+        assert!(program.is_ok(), "failed to parse '{}'", expr);
+        let program = program.unwrap();
+        let mut ctx = crate::Context::default();
+        let value = program.eval(&mut ctx);
+        let expected_value = crate::Val::new_int(-1431655765);
+        assert_eq!(value, expected_value, r#""{:?}" did not match "{:?}""#, value, expected_value);
+    }
+
 
 //     fn calc_string_string(args: Vec<Value>) -> Value {
 //         println!("{:?}", args);

diff --git a/cel-rs/src/value/bool.rs b/cel-rs/src/value/bool.rs
@@ -32,12 +32,13 @@ impl Value for Bool {
     }
 
     fn compare(&self, other: &Val) -> Option<Val> {
-        other.as_bool().map(|ob| {
-            (&self.0).cmp(ob).into()
-        })
+        other.as_bool().map(|ob| (&self.0).cmp(ob).into())
     }
 
-    fn equals(&self, other: &Val) -> Option<Val> {
-        other.as_bool().map(|f| Val::new_bool(&self.0 == f))
+    fn equals(&self, other: &Val) -> Val {
+        other
+            .as_bool()
+            .map(|f| Val::new_bool(&self.0 == f))
+            .unwrap_or(Val::new_bool(false))
     }
 }
diff --git a/cel-rs/src/value/error.rs b/cel-rs/src/value/error.rs
@@ -1,3 +1,5 @@
+use core::fmt;
+
 use super::{value::{Value, Val}, ty::Ty};
 
 #[derive(Eq, PartialEq)]
@@ -6,6 +8,12 @@ pub struct Error {
     error: String,
 }
 
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "error(id = {:?}, message = {})", self.id, self.error)
+    }
+}
+
 impl Error {
     pub fn new(error: String) -> Val {
         return Val::new(Self { id: None, error });

diff --git a/cel-rs/src/value/map.rs b/cel-rs/src/value/map.rs
@@ -0,0 +1,51 @@
+use std::{collections::HashMap, rc::Rc};
+use crate::{Val, Value};
+use super::ty::Ty;
+
+pub struct Map(Rc<HashMap<Val, Val>>);
+
+impl Map {
+    pub fn new(h: Rc<HashMap<Val, Val>>) -> Self {
+        Self(h)
+    }
+}
+
+impl Value for Map {
+    fn ty(&self) -> super::ty::Ty {
+        Ty::Map
+    }
+
+    fn native_value(&self) -> &dyn std::any::Any {
+        &self.0
+    }
+
+    fn equals(&self, other: &Val) -> Val {
+        other
+            .native_value()
+            .downcast_ref::<Rc<HashMap<Val, Val>>>()
+            .map(|other| {
+                if other.len() != self.0.len() {
+                    return Val::new_bool(false);
+                }
+
+                for (k, v) in self.0.iter() {
+                    let ov = other.get(k);
+                    if !ov.is_none() {
+                        return Val::new_bool(false);
+                    }
+
+                    // TODO: use value.equals once all types support it.
+                    if !ov
+                        .unwrap()
+                        .compare(v)
+                        .is_some_and(|o| o.as_int() == Some(&0))
+                    {
+                        return Val::new_bool(false);
+                    }
+                }
+
+                return Val::new_bool(true);
+            })
+            .unwrap_or(Val::new_bool(false))
+    }
+}
diff --git a/cel-rs/src/value/mod.rs b/cel-rs/src/value/mod.rs
@@ -12,3 +12,4 @@ pub mod bytes;
 pub mod double;
 pub mod uint;
 pub mod int;
+pub mod map;