rustpython-bytecode -> rustpython-compiler-core

Cargo.toml

@@ -6,7 +6,7 @@ authors = ["RustPython Team"]
 edition = "2021"
 
 [dependencies]
-rustpython-bytecode = { path = "bytecode" }
+rustpython-compiler-core = { path = "core" }
 rustpython-codegen = { path = "codegen" }
 rustpython-parser = { path = "parser" }
 

ast/Cargo.toml

@@ -12,5 +12,5 @@ unparse = ["rustpython-common"]
 
 [dependencies]
 num-bigint = "0.4.3"
-rustpython-bytecode = { path = "../bytecode" }
+rustpython-compiler-core = { path = "../core" }
 rustpython-common = { path = "../../common", optional = true }

ast/src/constant.rs

@@ -1,5 +1,5 @@
 use num_bigint::BigInt;
-pub use rustpython_bytecode::ConversionFlag;
+pub use rustpython_compiler_core::ConversionFlag;
 
 #[derive(Debug, PartialEq)]
 pub enum Constant {

codegen/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 rustpython-ast = { path = "../ast", features = ["unparse"] }
-rustpython-bytecode = { path = "../bytecode", version = "0.1.1" }
+rustpython-compiler-core = { path = "../core", version = "0.1.1" }
 
 ahash = "0.7.6"
 indexmap = "1.8.1"

codegen/src/compile.rs

@@ -15,10 +15,10 @@ use itertools::Itertools;
 use num_complex::Complex64;
 use num_traits::ToPrimitive;
 use rustpython_ast as ast;
-use rustpython_bytecode::{self as bytecode, CodeObject, ConstantData, Instruction};
+use rustpython_compiler_core::{self as bytecode, CodeObject, ConstantData, Instruction};
 use std::borrow::Cow;
 
-pub use rustpython_bytecode::Mode;
+pub use rustpython_compiler_core::Mode;
 
 type CompileResult<T> = Result<T, CodegenError>;
 
@@ -2698,7 +2698,7 @@ fn compile_constant(value: &ast::Constant) -> ConstantData {
 mod tests {
     use super::{CompileOpts, Compiler};
     use crate::symboltable::SymbolTable;
-    use rustpython_bytecode::CodeObject;
+    use rustpython_compiler_core::CodeObject;
     use rustpython_parser::parser;
 
     fn compile_exec(source: &str) -> CodeObject {

codegen/src/ir.rs

@@ -1,5 +1,5 @@
 use crate::IndexSet;
-use rustpython_bytecode::{CodeFlags, CodeObject, ConstantData, Instruction, Label, Location};
+use rustpython_compiler_core::{CodeFlags, CodeObject, ConstantData, Instruction, Label, Location};
 
 pub type BlockIdx = Label;
 

core/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "rustpython-bytecode"
+name = "rustpython-compiler-core"
 description = "RustPython specific bytecode."
 version = "0.1.2"
 authors = ["RustPython Team"]

core/src/bytecode.rs

@@ -1,12 +1,6 @@
 //! Implement python as a virtual machine with bytecodes. This module
 //! implements bytecode structure.
 
-#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/main/logo.png")]
-#![doc(html_root_url = "https://docs.rs/rustpython-bytecode/")]
-
-mod mode;
-pub use mode::Mode;
-
 use bitflags::bitflags;
 use bstr::ByteSlice;
 use itertools::Itertools;
@@ -27,7 +21,7 @@ impl Location {
     ///
     /// # Example
     /// ```
-    /// use rustpython_bytecode::Location;
+    /// use rustpython_compiler_core::Location;
     /// let loc = Location::new(10, 10);
     /// ```
     pub fn new(row: usize, column: usize) -> Self {
@@ -433,7 +427,7 @@ bitflags! {
 ///
 /// # Examples
 /// ```
-/// use rustpython_bytecode::ConstantData;
+/// use rustpython_compiler_core::ConstantData;
 /// let a = ConstantData::Float {value: 120f64};
 /// let b = ConstantData::Boolean {value: false};
 /// assert_ne!(a, b);
@@ -599,8 +593,8 @@ pub enum TestOperator {
 /// # Examples
 ///
 /// ```
-/// use rustpython_bytecode::Instruction::BinaryOperation;
-/// use rustpython_bytecode::BinaryOperator::Add;
+/// use rustpython_compiler_core::Instruction::BinaryOperation;
+/// use rustpython_compiler_core::BinaryOperator::Add;
 /// let op = BinaryOperation {op: Add};
 /// ```
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -943,7 +937,7 @@ impl Instruction {
     /// # Examples
     ///
     /// ```
-    /// use rustpython_bytecode::{Instruction, Label};
+    /// use rustpython_compiler_core::{Instruction, Label};
     /// let label = Label(0xF);
     /// let jump_inst = Instruction::Jump {target: label};
     /// assert!(jump_inst.unconditional_branch())
@@ -960,7 +954,7 @@ impl Instruction {
     /// # Examples
     ///
     /// ```
-    /// use rustpython_bytecode::{Instruction, Label, UnaryOperator};
+    /// use rustpython_compiler_core::{Instruction, Label, UnaryOperator};
     /// let jump_instruction = Instruction::Jump {target: Label(0xF)};
     /// let invert_instruction = Instruction::UnaryOperation {op: UnaryOperator::Invert};
     /// assert_eq!(jump_instruction.stack_effect(true), 0);

core/src/lib.rs

@@ -0,0 +1,8 @@
+#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/main/logo.png")]
+#![doc(html_root_url = "https://docs.rs/rustpython-compiler-core/")]
+
+pub mod bytecode;
+mod mode;
+
+pub use bytecode::*;
+pub use mode::Mode;

src/lib.rs

@@ -1,13 +1,13 @@
-use rustpython_bytecode::CodeObject;
 use rustpython_codegen::{compile, symboltable};
+use rustpython_compiler_core::CodeObject;
 use rustpython_parser::{
     ast::{fold::Fold, ConstantOptimizer, Location},
     parser,
 };
 use std::fmt;
 
-pub use rustpython_bytecode::Mode;
 pub use rustpython_codegen::compile::CompileOpts;
+pub use rustpython_compiler_core::Mode;
 
 #[derive(Debug, thiserror::Error)]
 pub enum CodegenErrorType {