compiler/porcelain wrapper

coolreader18 · coolreader18 · commit 4528f1721060 · 2020-11-07T15:43:23.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,8 +10,8 @@ include = ["LICENSE", "Cargo.toml", "src/**/*.rs"]
 
 [workspace]
 members = [
-    ".", "ast", "bytecode", "common", "compiler", "derive",
-    "jit", "parser", "vm", "vm/pylib-crate", "wasm/lib",
+    ".", "ast", "bytecode", "common", "compiler", "compiler/porcelain",
+    "derive", "jit", "parser", "vm", "vm/pylib-crate", "wasm/lib",
 ]
 
 [[bench]]
@@ -31,7 +31,6 @@ ssl = ["rustpython-vm/ssl"]
 log = "0.4"
 env_logger = "0.7"
 clap = "2.33"
-rustpython-compiler = { path = "compiler", version = "0.1.1" }
 rustpython-parser = { path = "parser", version = "0.1.1" }
 rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, features = ["compile-parse"] }
 pylib = { package = "rustpython-pylib", path = "vm/pylib-crate", version = "0.1.0", default-features = false, optional = true }
diff --git a/ast/Cargo.toml b/ast/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rustpython-ast"
 version = "0.1.0"
-authors = ["Noah <33094578+coolreader18@users.noreply.github.com>"]
+authors = ["RustPython Team"]
 edition = "2018"
 
 [dependencies]
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "rustpython-compiler"
+name = "rustpython-compiler-core"
 version = "0.1.2"
 description = "Compiler for python code into bytecode for the rustpython VM."
 authors = ["RustPython Team"]
diff --git a/compiler/porcelain/Cargo.toml b/compiler/porcelain/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "rustpython-compiler"
+version = "0.1.2"
+description = "A usability wrapper around rustpython-parser and rustpython-compiler-core"
+authors = ["RustPython Team"]
+edition = "2018"
+
+[dependencies]
+thiserror = "1.0"
+rustpython-compiler-core = { path = ".." }
+rustpython-parser = { path = "../../parser" }
+rustpython-bytecode = { path = "../../bytecode" }
diff --git a/compiler/porcelain/src/lib.rs b/compiler/porcelain/src/lib.rs
@@ -1,14 +1,15 @@
 use rustpython_bytecode::bytecode::CodeObject;
-use rustpython_compiler::{compile, symboltable};
+use rustpython_compiler_core::{compile, symboltable};
 use rustpython_parser::{ast::Location, parser};
 use std::fmt;
 
 pub use compile::{CompileOpts, Mode};
+pub use symboltable::{Symbol, SymbolScope, SymbolTable, SymbolTableType};
 
 #[derive(Debug, thiserror::Error)]
 pub enum CompileErrorType {
     #[error(transparent)]
-    Compile(#[from] rustpython_compiler::error::CompileErrorType),
+    Compile(#[from] rustpython_compiler_core::error::CompileErrorType),
     #[error(transparent)]
     Parse(#[from] rustpython_parser::error::ParseErrorType),
 }
@@ -38,7 +39,7 @@ impl fmt::Display for CompileError {
 }
 
 impl CompileError {
-    fn from_compile(error: rustpython_compiler::error::CompileError, source: &str) -> Self {
+    fn from_compile(error: rustpython_compiler_core::error::CompileError, source: &str) -> Self {
         CompileError {
             error: error.error.into(),
             location: error.location,
@@ -99,7 +100,7 @@ pub fn compile(
     res.map_err(|e| CompileError::from_compile(e, source))
 }
 
-pub(crate) fn compile_symtable(
+pub fn compile_symtable(
     source: &str,
     mode: compile::Mode,
     source_path: &str,
diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -15,8 +15,7 @@ syn = { version = "1.0", features = ["full"] }
 syn-ext = { version = "0.2.1", features = ["full"] }
 quote = "1.0"
 proc-macro2 = "1.0"
-rustpython-compiler = { path = "../compiler", version = "0.1.1" }
-rustpython-parser = { path = "../parser", version = "0.1.1" }
+rustpython-compiler = { path = "../compiler/porcelain", version = "0.1.1" }
 rustpython-bytecode = { path = "../bytecode", version = "0.1.1" }
 maplit = "1.0"
 once_cell = "1.3.1"
diff --git a/derive/src/compile_bytecode.rs b/derive/src/compile_bytecode.rs
@@ -18,8 +18,7 @@ use once_cell::sync::Lazy;
 use proc_macro2::{Span, TokenStream as TokenStream2};
 use quote::quote;
 use rustpython_bytecode::bytecode::{CodeObject, FrozenModule};
-use rustpython_compiler::compile;
-use rustpython_parser::parser;
+use rustpython_compiler as compile;
 use std::collections::HashMap;
 use std::env;
 use std::fs;
@@ -44,40 +43,21 @@ struct CompilationSource {
 }
 
 impl CompilationSource {
-    fn compile_string<D: std::fmt::Display, F: Fn() -> D>(
+    fn compile_string<D: std::fmt::Display, F: FnOnce() -> D>(
         &self,
         source: &str,
         mode: compile::Mode,
         module_name: String,
         origin: F,
     ) -> Result<CodeObject, Diagnostic> {
-        let parse_err = |err| {
-            Diagnostic::spans_error(
-                self.span,
-                format!("Python parse error from {}: {}", origin(), err),
-            )
-        };
-        let opts = compile::CompileOpts::default();
-        let res = match mode {
-            compile::Mode::Exec => {
-                let ast = parser::parse_program(source).map_err(parse_err)?;
-                compile::compile_program(ast, module_name, opts)
-            }
-            compile::Mode::Eval => {
-                let statement = parser::parse_statement(source).map_err(parse_err)?;
-                compile::compile_statement_eval(statement, module_name, opts)
-            }
-            compile::Mode::Single => {
-                let ast = parser::parse_program(source).map_err(parse_err)?;
-                compile::compile_program_single(ast, module_name, opts)
-            }
-        };
-        res.map_err(|err| {
-            Diagnostic::spans_error(
-                self.span,
-                format!("Python compile error from {}: {}", origin(), err),
-            )
-        })
+        compile::compile(source, mode, module_name, compile::CompileOpts::default()).map_err(
+            |err| {
+                Diagnostic::spans_error(
+                    self.span,
+                    format!("Python compile error from {}: {}", origin(), err),
+                )
+            },
+        )
     }
 
     fn compile(
diff --git a/src/main.rs b/src/main.rs
@@ -5,9 +5,9 @@ extern crate env_logger;
 extern crate log;
 
 use clap::{App, AppSettings, Arg, ArgMatches};
-use rustpython_compiler::compile;
 use rustpython_vm::{
     builtins::PyInt,
+    compile,
     exceptions::print_exception,
     match_class,
     pyobject::{BorrowValue, ItemProtocol, PyResult, TypeProtocol},
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -41,7 +41,7 @@ mt19937 = "1.0"
 log = "0.4"
 rustpython-derive = { path = "../derive", version = "0.1.2" }
 rustpython-parser = { path = "../parser", optional = true, version = "0.1.2" }
-rustpython-compiler = { path = "../compiler", optional = true, version = "0.1.2" }
+rustpython-compiler = { path = "../compiler/porcelain", optional = true, version = "0.1.2" }
 rustpython-bytecode = { path = "../bytecode", version = "0.1.2" }
 rustpython-jit = { path = "../jit", optional = true, version = "0.1.2" }
 rustpython-pylib = { path = "pylib-crate", optional = true, version = "0.1.0" }
diff --git a/vm/src/builtins/make_module.rs b/vm/src/builtins/make_module.rs
@@ -21,6 +21,8 @@ mod decl {
     use crate::builtins::pytype::PyTypeRef;
     use crate::byteslike::PyBytesLike;
     use crate::common::{hash::PyHash, str::to_ascii};
+    #[cfg(feature = "rustpython-compiler")]
+    use crate::compile;
     use crate::exceptions::PyBaseExceptionRef;
     use crate::function::{single_or_tuple_any, Args, FuncArgs, KwArgs, OptionalArg};
     use crate::iterator;
@@ -36,8 +38,6 @@ mod decl {
     use crate::{py_io, sysmodule};
     use num_bigint::Sign;
     use num_traits::{Signed, ToPrimitive, Zero};
-    #[cfg(feature = "rustpython-compiler")]
-    use rustpython_compiler::compile;
 
     #[pyfunction]
     fn abs(x: PyObjectRef, vm: &VirtualMachine) -> PyResult {
diff --git a/vm/src/eval.rs b/vm/src/eval.rs
@@ -1,7 +1,7 @@
+use crate::compile;
 use crate::pyobject::PyResult;
 use crate::scope::Scope;
 use crate::VirtualMachine;
-use rustpython_compiler::compile;
 
 pub fn eval(vm: &VirtualMachine, source: &str, scope: Scope, source_path: &str) -> PyResult {
     match vm.compile(source, compile::Mode::Eval, source_path.to_owned()) {
diff --git a/vm/src/lib.rs b/vm/src/lib.rs
@@ -48,8 +48,6 @@ pub mod builtins;
 mod bytesinner;
 pub mod byteslike;
 pub mod cformat;
-#[cfg(feature = "rustpython-compiler")]
-pub mod compile;
 mod coroutine;
 mod dictdatatype;
 #[cfg(feature = "rustpython-compiler")]
@@ -81,6 +79,8 @@ mod vm;
 pub use self::vm::{InitParameter, Interpreter, PySettings, VirtualMachine};
 pub use rustpython_bytecode::*;
 pub use rustpython_common as common;
+#[cfg(feature = "rustpython-compiler")]
+pub use rustpython_compiler as compile;
 
 #[doc(hidden)]
 pub mod __exports {
diff --git a/vm/src/stdlib/dis.rs b/vm/src/stdlib/dis.rs
@@ -6,9 +6,9 @@ mod decl {
     use crate::builtins::dict::PyDictRef;
     use crate::builtins::pystr::PyStrRef;
     use crate::bytecode::CodeFlags;
+    use crate::compile;
     use crate::pyobject::{BorrowValue, ItemProtocol, PyObjectRef, PyResult, TryFromObject};
     use crate::vm::VirtualMachine;
-    use rustpython_compiler::compile;
 
     #[pyfunction]
     fn dis(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
diff --git a/vm/src/stdlib/symtable.rs b/vm/src/stdlib/symtable.rs
@@ -6,10 +6,9 @@ mod decl {
 
     use crate::builtins::pystr::PyStrRef;
     use crate::builtins::pytype::PyTypeRef;
-    use crate::compile;
+    use crate::compile::{self, Symbol, SymbolScope, SymbolTable, SymbolTableType};
     use crate::pyobject::{BorrowValue, PyRef, PyResult, PyValue, StaticType};
     use crate::vm::VirtualMachine;
-    use rustpython_compiler::symboltable;
 
     /// symtable. Return top level SymbolTable.
     /// See docs: https://docs.python.org/3/library/symtable.html?highlight=symtable#symtable.symtable
@@ -33,7 +32,7 @@ mod decl {
         Ok(py_symbol_table.into_ref(vm))
     }
 
-    fn to_py_symbol_table(symtable: symboltable::SymbolTable) -> PySymbolTable {
+    fn to_py_symbol_table(symtable: SymbolTable) -> PySymbolTable {
         PySymbolTable { symtable }
     }
 
@@ -43,7 +42,7 @@ mod decl {
     #[pyattr]
     #[pyclass(name = "SymbolTable")]
     struct PySymbolTable {
-        symtable: symboltable::SymbolTable,
+        symtable: SymbolTable,
     }
 
     impl fmt::Debug for PySymbolTable {
@@ -82,7 +81,7 @@ mod decl {
 
         #[pymethod(name = "is_optimized")]
         fn is_optimized(&self) -> bool {
-            self.symtable.typ == symboltable::SymbolTableType::Function
+            self.symtable.typ == SymbolTableType::Function
         }
 
         #[pymethod(name = "lookup")]
@@ -160,8 +159,8 @@ mod decl {
     #[pyattr]
     #[pyclass(name = "Symbol")]
     struct PySymbol {
-        symbol: symboltable::Symbol,
-        namespaces: Vec<symboltable::SymbolTable>,
+        symbol: Symbol,
+        namespaces: Vec<SymbolTable>,
     }
 
     impl fmt::Debug for PySymbol {
@@ -206,7 +205,7 @@ mod decl {
 
         #[pymethod(name = "is_nonlocal")]
         fn is_nonlocal(&self) -> bool {
-            matches!(self.symbol.scope, symboltable::SymbolScope::Nonlocal)
+            matches!(self.symbol.scope, SymbolScope::Nonlocal)
         }
 
         #[pymethod(name = "is_referenced")]
diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml
@@ -15,7 +15,7 @@ default = ["freeze-stdlib"]
 freeze-stdlib = ["rustpython-vm/freeze-stdlib"]
 
 [dependencies]
-rustpython-compiler = { path = "../../compiler" }
+rustpython-compiler = { path = "../../compiler/porcelain" }
 rustpython-parser = { path = "../../parser" }
 rustpython-common = { path = "../../common" }
 # no threading feature for rustpython-vm -- doesn't much matter anyway, but it might be more optimized
