Merge branch '1BADragon:main' into main

Author: CedarMatt

Cargo.toml

@@ -1,36 +1,34 @@
 [package]
 name = "rscel"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [features]
-default = ["program_cache"]
+default = []
 ast_ser = []
-program_cache = []
+debug_output = []
 python = ["dep:pyo3"]
 console_error_panic_hook = ["dep:console_error_panic_hook"]
 wasm = [
-  "dep:wasm-bindgen", "dep:serde-wasm-bindgen", "dep:js-sys", 
+  "dep:wasm-bindgen", "dep:serde-wasm-bindgen", "dep:js-sys",
   "console_error_panic_hook", "chrono/wasmbind"
 ]
 
 
 [dependencies]
-parsel = "0.12.0"
 test-case = "3.1.0"
-regex = "1.9.1"
-once_cell = "1.18.0"
-serde = { version = "1.0.171", features = ["derive", "rc"] }
+regex = "1.9.4"
+serde = { version = "1.0.188", features = ["derive", "rc"] }
 serde_with = { version = "3.0.0", features = ["chrono"] }
-serde_json = { version = "1.0.100", features = ["raw_value"] }
+serde_json = { version = "1.0.105", features = ["raw_value"] }
 chrono = { version = "0.4.26", features = ["serde"] }
 duration-str = "0.5.1"
 
 # Dependencies for python bindings
-pyo3 = { version = "0.19.1", optional = true, features = ["extension-module", "chrono"] }
+pyo3 = { version = "0.19.2", optional = true, features = ["extension-module", "chrono"] }
 
 # Dependencies for wasm bindings
 wasm-bindgen = { version = "0.2.87", optional = true}

Makefile

@@ -28,5 +28,8 @@ python-binding-release: .env
 wasm-example: wasm-binding
 	cd examples/wasm && npm start
 
+wasm-example-release: wasm-binding-release
+	cd examples/wasm && npm start
+
 .PHONY: all
 all: wasm-binding python-binding

README.md

@@ -28,4 +28,14 @@ let res = ctx.exec("main", &exec_ctx).unwrap(); // ValueCell::Int(6)
 assert!(TryInto::<i64>::try_into(res).unwrap() == 6);
 ```
 
+## Current Benchmark Times
+| Bench Run                | Time           |
+|--------------------------|----------------|
+|Run One No Binding:       |  0.000310S     |
+|Run Many No Binding:      |  0.003657S     |
+|Run One With Binding:     |  0.000033S     |
+|Run Many With Bindings:   |  0.004281S     |
+|Build Many:               |  0.002312S     |
+|Build Many With Bindings: |  0.051369S     |
+
 Build status: [![Rust](https://github.com/1BADragon/rscel/actions/workflows/rust.yml/badge.svg)](https://github.com/1BADragon/rscel/actions/workflows/rust.yml)

examples/eval.rs

@@ -0,0 +1,18 @@
+use rscel::{BindContext, CelContext};
+use std::env;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+    let mut context = CelContext::new();
+    let mut exec = BindContext::new();
+
+    context.add_program_str("prog", &args[1]).unwrap();
+
+    if args.len() > 2 {
+        exec.bind_params_from_json_obj(args[2].parse().unwrap())
+            .unwrap();
+    }
+
+    let res = context.exec("prog", &exec).unwrap();
+    println!("{}", res);
+}

examples/prog2json.rs

@@ -1,6 +1,6 @@
 use std::env;
 
-use rscel::Program;
+use rscel::{CelCompiler, StringTokenizer};
 
 fn main() {
     let args: Vec<String> = env::args().collect();
@@ -10,6 +10,10 @@ fn main() {
         return;
     }
 
-    let prog = Program::from_source(&args[1]).unwrap();
+    let mut tokenizer = StringTokenizer::with_input(&args[1]);
+    let prog = CelCompiler::with_tokenizer(&mut tokenizer)
+        .compile()
+        .unwrap();
+
     println!("{}", serde_json::to_string_pretty(&prog).unwrap());
 }

examples/wasm/package.json

@@ -26,9 +26,6 @@
     "webpack-dev-server": "^4.15.0"
   },
   "dependencies": {
-    "@fluentui/react": "^8.109.3",
-    "@fluentui/react-components": "^9.19.1",
-    "@fluentui/theme": "^2.6.29",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rscel": "file:../../pkg"

examples/wasm/src/app.tsx

@@ -1,14 +1,11 @@
 import CelComponent from "./pages/CelComponent";
-import { ThemeProvider } from "@fluentui/react";
 import { Card } from "@fluentui/react-components";
 import * as React from "react";
 
 export default function App() {
   return (
-    <ThemeProvider>
-      <Card style={{ height: "640px", width: "480px", margin: "auto" }}>
-        <CelComponent />
-      </Card>
-    </ThemeProvider>
+    <Card style={{ height: "640px", width: "480px", margin: "auto" }}>
+      <CelComponent />
+    </Card>
   );
 }

examples/wasm/src/index.js

@@ -1,6 +1,10 @@
-import ReactDOM from "react-dom";
 import React from "react";
+import { createRoot } from 'react-dom/client';
 
 import App from "./app.tsx";
 
-ReactDOM.render(<App />, document.getElementById("app"));
+
+const domNode = document.getElementById("app");
+const root = createRoot(domNode);
+
+root.render(<App />);

examples/wasm/src/pages/CelComponent.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import "./CelComponent.css";
 
 import init, { cel_eval, cel_details, CelFloat } from "rscel";
-import { useState } from "react";
+import { useState, useEffect } from "react";
 
 export default function CelComponent() {
   const [isInit, setIsInit] = useState<boolean>(false);
@@ -11,9 +11,11 @@ export default function CelComponent() {
   const [params, setParams] = useState<string[]>([]);
   const [paramVals, setParamVals] = useState<any>({});
 
-  init().then((_res: any) => {
-    setIsInit(true);
-  });
+  useEffect(() => {
+    init().then((_res: any) => {
+      setIsInit(true);
+    });
+  }, []);
 
   if (!isInit) {
     return <div>Loading...</div>;
@@ -30,7 +32,9 @@ export default function CelComponent() {
               setParamVals((old: any) => {
                 try {
                   let newObj = { ...old };
-                  newObj[val] = Number(event.target.value);
+                  const floatval = new CelFloat(Number(event.target.value));
+
+                  newObj[val] = floatval;
                   setErrorMessage("");
                   return newObj;
                 } catch (e) {
@@ -58,21 +62,25 @@ export default function CelComponent() {
       <div style={{ display: "flex", rowGap: "10px", justifyContent: "right" }}>
         <button
           onClick={() => {
-            const details = cel_details(prog);
+            const res = cel_details(prog);
 
-            if (details.success) {
-              setParams(details.result.get("params"));
+            if (res.success) {
+              console.log(res);
+              const details = res.result.get("details");
+              setParams(details.get("params"));
               setErrorMessage("");
             } else {
-              setErrorMessage(`${details.error.kind}: ${details.error.msg}`);
+              setErrorMessage(`${res.error.kind}: ${res.error.msg}`);
             }
           }}
         >
           Analyze
         </button>
         <button
           onClick={() => {
+            console.log(paramVals);
             const result = cel_eval(prog, paramVals);
+            console.log(result);
 
             if (result.success) {
               setErrorMessage(`Result: ${result.result.toString()}`);