Merge branch 'vkobinski/master'

Author: steinerkelvin

Cargo.lock

@@ -0,0 +1,19 @@
+[package]
+name = "benda"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "benda"
+crate-type = ["cdylib"]
+
+[dependencies]
+pyo3 = { version = "0.21.2", features = [] }
+bend-lang = "0.2.33"
+num-bigint = "0.4.5"
+num-traits = "0.2.19"
+rustpython-parser = "0.3.1"
+# Bend uses a indexmap to store its ADTs.
+# So we need to use this dependency to be able to construct one.
+indexmap = "2.2.3"

crates/benda/Cargo.toml

@@ -0,0 +1,20 @@
+use bend::diagnostics::{Diagnostics, DiagnosticsConfig};
+use bend::fun::{Book, Term};
+use bend::{CompileOpts, RunOpts};
+
+pub fn run(book: &Book) -> Option<(Term, String, Diagnostics)> {
+    let run_opts = RunOpts::default();
+    let compile_opts = CompileOpts::default().set_all();
+    let diagnostics_cfg = DiagnosticsConfig::default();
+    let args = None;
+
+    bend::run_book(
+        book.clone(),
+        run_opts,
+        compile_opts,
+        diagnostics_cfg,
+        args,
+        "run",
+    )
+    .unwrap()
+}

crates/benda/src/benda_ffi/mod.rs

@@ -0,0 +1,126 @@
+use bend::imp;
+use num_traits::ToPrimitive;
+use parser::Parser;
+use pyo3::prelude::*;
+use pyo3::types::{PyDict, PyFunction, PyString, PyTuple};
+use rustpython_parser::{parse, Mode};
+use types::extract_type;
+use types::tree::{Leaf, Node, Tree};
+use types::u24::u24;
+mod benda_ffi;
+mod parser;
+mod types;
+
+#[pyfunction]
+fn switch() -> PyResult<String> {
+    Ok("Ok".to_string())
+}
+
+#[pyclass(name = "bjit")]
+pub struct PyBjit {
+    wraps: Py<PyAny>,
+}
+
+#[pymethods]
+impl PyBjit {
+    #[new]
+    fn __new__(wraps: Py<PyAny>) -> Self {
+        PyBjit { wraps }
+    }
+    #[pyo3(signature = (*args, **_kwargs))]
+    fn __call__(
+        &self,
+        py: Python<'_>,
+        args: &Bound<'_, PyTuple>,
+        _kwargs: Option<&Bound<'_, PyDict>>,
+    ) -> PyResult<Py<PyAny>> {
+        let arg_names_temp: Bound<PyAny>;
+
+        let (name, filename, arg_names, argcount) =
+            match self.wraps.downcast_bound::<PyFunction>(py) {
+                Ok(inner) => {
+                    let name = inner.getattr("__name__").unwrap();
+                    let code = inner.getattr("__code__").unwrap();
+                    let filename = code.getattr("co_filename").unwrap();
+
+                    arg_names_temp = code.getattr("co_varnames").unwrap();
+                    let arg_names =
+                        arg_names_temp.downcast::<PyTuple>().unwrap();
+                    let argcount = code
+                        .getattr("co_argcount")
+                        .unwrap()
+                        .to_string()
+                        .parse::<u32>()
+                        .unwrap();
+
+                    (name, filename, arg_names, argcount)
+                }
+                Err(_) => todo!(),
+            };
+
+        let mut arg_list: Vec<String> = vec![];
+
+        for (index, arg) in arg_names.iter().enumerate() {
+            if index >= argcount.to_usize().unwrap() {
+                break;
+            }
+
+            arg_list.push(arg.to_string());
+        }
+
+        let mut parsed_types: Vec<(String, imp::Expr)> = vec![];
+
+        for (index, arg) in
+            args.downcast::<PyTuple>().unwrap().iter().enumerate()
+        {
+            parsed_types.push((
+                arg_list.get(index).unwrap().to_string(),
+                extract_type(arg).unwrap(),
+            ));
+        }
+
+        let code = std::fs::read_to_string(filename.to_string()).unwrap();
+        let module = parse(code.as_str(), Mode::Module, "main.py").unwrap();
+
+        let mut val: Option<Bound<PyString>> = None;
+
+        match module {
+            rustpython_parser::ast::Mod::Module(mods) => {
+                for (index, stmt) in mods.body.iter().enumerate() {
+                    if let rustpython_parser::ast::Stmt::FunctionDef(fun_def) =
+                        stmt
+                    {
+                        if fun_def.name == name.to_string() {
+                            let mut parser = Parser::new(
+                                mods.body.clone(),
+                                index,
+                                parsed_types.clone(),
+                            );
+                            let return_val =
+                                parser.parse(fun_def.name.as_ref(), &[]);
+                            val = Some(PyString::new_bound(
+                                py,
+                                return_val.as_str(),
+                            ));
+                            break;
+                        }
+                    }
+                }
+            }
+            _ => unimplemented!(),
+        }
+
+        Ok(val.unwrap().into())
+    }
+}
+
+#[pymodule]
+fn benda(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
+    m.add_function(wrap_pyfunction!(switch, m)?)?;
+    m.add_class::<PyBjit>()?;
+    m.add_class::<u24>()?;
+    m.add_class::<Tree>()?;
+    m.add_class::<Node>()?;
+    m.add_class::<Leaf>()?;
+    Ok(())
+}

crates/benda/src/lib.rs

@@ -0,0 +1,24 @@
+mod parser;
+
+use pyo3::prelude::*;
+use rustpython_parser::{parse, Mode};
+
+mod benda_ffi;
+
+fn main() -> PyResult<()> {
+    let filename = String::from("main.py");
+
+    let code = std::fs::read_to_string(filename).unwrap();
+    let module = parse(code.as_str(), Mode::Module, "main.py").unwrap();
+
+    match module {
+        rustpython_parser::ast::Mod::Module(_mods) => {
+            //let mut parser = Parser::new(mods.body, 0);
+            //let val = parser.parse(&String::from("sum_tree"), &["tree".to_string()]);
+            //println!("Return {:?}", val);
+        }
+        _ => todo!(),
+    }
+
+    Ok(())
+}

crates/benda/src/main.rs

@@ -0,0 +1,3 @@
+pub enum BuiltIn {
+    Switch,
+}