Use ruff_text_size

Author: MichaReiser

Cargo.lock

@@ -1,19 +1,18 @@
-[package]
-name = "rustpython"
-version = "0.2.0"
-authors = ["RustPython Team"]
-edition = "2021"
-rust-version = "1.67.1"
-description = "A python interpreter written in rust."
-repository = "https://github.com/RustPython/RustPython"
-license = "MIT"
-include = ["LICENSE", "Cargo.toml", "src/**/*.rs"]
+#[package]
+#name = "rustpython"
+#version = "0.2.0"
+#authors = ["RustPython Team"]
+#edition = "2021"
+#rust-version = "1.67.1"
+#description = "A python interpreter written in rust."
+#repository = "https://github.com/RustPython/RustPython"
+#license = "MIT"
+#include = ["LICENSE", "Cargo.toml", "src/**/*.rs"]
 
 [workspace]
 resolver = "2"
 members = [
-    "compiler", "compiler/ast", "compiler/core", "compiler/codegen", "compiler/parser",
-    ".", "common", "derive", "jit", "vm", "pylib", "stdlib", "wasm/lib", "derive-impl",
+    "ruff_text_size", "compiler/ast", "compiler/parser"
 ]
 
 [workspace.dependencies]
@@ -56,59 +55,59 @@ thread_local = "1.1.4"
 unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
 widestring = "0.5.1"
 
-[features]
-default = ["threading", "stdlib", "zlib", "importlib", "encodings", "rustpython-parser/lalrpop"]
-importlib = ["rustpython-vm/importlib"]
-encodings = ["rustpython-vm/encodings"]
-stdlib = ["rustpython-stdlib", "rustpython-pylib"]
-flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"]
-freeze-stdlib = ["rustpython-vm/freeze-stdlib", "rustpython-pylib?/freeze-stdlib"]
-jit = ["rustpython-vm/jit"]
-threading = ["rustpython-vm/threading", "rustpython-stdlib/threading"]
-zlib = ["stdlib", "rustpython-stdlib/zlib"]
-bz2 = ["stdlib", "rustpython-stdlib/bz2"]
-ssl = ["rustpython-stdlib/ssl"]
-ssl-vendor = ["rustpython-stdlib/ssl-vendor"]
-
-[dependencies]
-rustpython-compiler = { path = "compiler", version = "0.2.0" }
-rustpython-parser = { path = "compiler/parser", version = "0.2.0" }
-rustpython-pylib = { path = "pylib", optional = true, default-features = false }
-rustpython-stdlib = { path = "stdlib", optional = true, default-features = false }
-rustpython-vm = { path = "vm", version = "0.2.0", default-features = false, features = ["compiler"] }
-
-atty = { workspace = true }
-cfg-if = { workspace = true }
-log = { workspace = true }
-flame = { workspace = true, optional = true }
-
-clap = "2.34"
-dirs = { package = "dirs-next", version = "2.0.0" }
-env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] }
-flamescope = { version = "0.1.2", optional = true }
-
-[target.'cfg(windows)'.dependencies]
-libc = { workspace = true }
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rustyline = { workspace = true }
-
-[dev-dependencies]
-cpython = "0.7.0"
-criterion = "0.3.5"
-python3-sys = "0.7.0"
-
-[[bench]]
-name = "execution"
-harness = false
-
-[[bench]]
-name = "microbenchmarks"
-harness = false
-
-[[bin]]
-name = "rustpython"
-path = "src/main.rs"
+#[features]
+#default = ["threading", "stdlib", "zlib", "importlib", "encodings", "rustpython-parser/lalrpop"]
+#importlib = ["rustpython-vm/importlib"]
+#encodings = ["rustpython-vm/encodings"]
+#stdlib = ["rustpython-stdlib", "rustpython-pylib"]
+#flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"]
+#freeze-stdlib = ["rustpython-vm/freeze-stdlib", "rustpython-pylib?/freeze-stdlib"]
+#jit = ["rustpython-vm/jit"]
+#threading = ["rustpython-vm/threading", "rustpython-stdlib/threading"]
+#zlib = ["stdlib", "rustpython-stdlib/zlib"]
+#bz2 = ["stdlib", "rustpython-stdlib/bz2"]
+#ssl = ["rustpython-stdlib/ssl"]
+#ssl-vendor = ["rustpython-stdlib/ssl-vendor"]
+
+#[dependencies]
+#rustpython-compiler = { path = "compiler", version = "0.2.0" }
+#rustpython-parser = { path = "compiler/parser", version = "0.2.0" }
+#rustpython-pylib = { path = "pylib", optional = true, default-features = false }
+#rustpython-stdlib = { path = "stdlib", optional = true, default-features = false }
+#rustpython-vm = { path = "vm", version = "0.2.0", default-features = false, features = ["compiler"] }
+
+#atty = { workspace = true }
+#cfg-if = { workspace = true }
+#log = { workspace = true }
+#flame = { workspace = true, optional = true }
+#
+#clap = "2.34"
+#dirs = { package = "dirs-next", version = "2.0.0" }
+#env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] }
+#flamescope = { version = "0.1.2", optional = true }
+#
+#[target.'cfg(windows)'.dependencies]
+#libc = { workspace = true }
+#
+#[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+#rustyline = { workspace = true }
+#
+#[dev-dependencies]
+#cpython = "0.7.0"
+#criterion = "0.3.5"
+#python3-sys = "0.7.0"
+
+#[[bench]]
+#name = "execution"
+#harness = false
+#
+#[[bench]]
+#name = "microbenchmarks"
+#harness = false
+#
+#[[bin]]
+#name = "rustpython"
+#path = "src/main.rs"
 
 [profile.dev.package."*"]
 opt-level = 3

Cargo.toml

@@ -11,10 +11,8 @@ license = "MIT"
 default = ["constant-optimization", "fold"]
 constant-optimization = ["fold"]
 fold = []
-unparse = ["rustpython-common"]
 
 [dependencies]
-rustpython-compiler-core = { path = "../core", version = "0.2.0" }
-rustpython-common = { path = "../../common", version = "0.2.0", optional = true }
+ruff_text_size =  { path = "../../ruff_text_size" }
 
 num-bigint = { workspace = true }

compiler/ast/Cargo.toml

@@ -3,27 +3,83 @@
 #![allow(clippy::derive_partial_eq_without_eq)]
 
 pub use crate::constant::*;
-pub use crate::Location;
+use ruff_text_size::{TextRange, TextSize};
+use std::ops::Deref;
 
 type Ident = String;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct Located<T, U = ()> {
-    pub location: Location,
-    pub end_location: Option<Location>,
+    pub range: TextRange,
     pub custom: U,
     pub node: T,
 }
 
-impl<T> Located<T> {
-    pub fn new(location: Location, end_location: Location, node: T) -> Self {
+impl<T, U> Located<T, U> {
+    pub fn new(location: TextSize, end_location: TextSize, node: T) -> Self
+    where
+        U: Default,
+    {
         Self {
-            location,
-            end_location: Some(end_location),
-            custom: (),
+            custom: U::default(),
+            range: TextRange::new(location, end_location),
             node,
         }
     }
+
+    pub fn with_range(node: T, range: TextRange) -> Self
+    where
+        U: Default,
+    {
+        Self {
+            range,
+            custom: U::default(),
+            node,
+        }
+    }
+
+    #[inline]
+    pub const fn start(&self) -> TextSize {
+        self.range.start()
+    }
+
+    #[inline]
+    pub fn custom(&self) -> &U {
+        &self.custom
+    }
+
+    #[inline]
+    pub fn node(&self) -> &T {
+        &self.node
+    }
+
+    #[inline]
+    pub fn into_node(self) -> T {
+        self.node
+    }
+
+    #[inline]
+    pub fn into_custom(self) -> U {
+        self.custom
+    }
+
+    #[inline]
+    pub const fn range(&self) -> TextRange {
+        self.range
+    }
+
+    #[inline]
+    pub const fn end(&self) -> TextSize {
+        self.range.end()
+    }
+}
+
+impl<T, U> Deref for Located<T, U> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        &self.node
+    }
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -536,8 +592,7 @@ pub mod fold {
     ) -> Result<Located<MT, F::TargetU>, F::Error> {
         Ok(Located {
             custom: folder.map_user(node.custom)?,
-            location: node.location,
-            end_location: node.end_location,
+            range: node.range,
             node: f(folder, node.node)?,
         })
     }

compiler/ast/src/ast_gen.rs

@@ -1,5 +1,4 @@
 use num_bigint::BigInt;
-pub use rustpython_compiler_core::ConversionFlag;
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum Constant {
@@ -122,8 +121,7 @@ impl<U> crate::fold::Fold<U> for ConstantOptimizer {
                 Ok(crate::Expr {
                     node: expr,
                     custom: node.custom,
-                    location: node.location,
-                    end_location: node.end_location,
+                    range: node.range,
                 })
             }
             _ => crate::fold::fold_expr(self, node),
@@ -134,68 +132,61 @@ impl<U> crate::fold::Fold<U> for ConstantOptimizer {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use ruff_text_size::TextRange;
 
     #[cfg(feature = "constant-optimization")]
     #[test]
     fn test_constant_opt() {
         use crate::{fold::Fold, *};
 
-        let start = Default::default();
-        let end = None;
+        let range = TextRange::default();
         let custom = ();
         let ast = Located {
-            location: start,
-            end_location: end,
+            range,
             custom,
             node: ExprKind::Tuple {
                 ctx: ExprContext::Load,
                 elts: vec![
                     Located {
-                        location: start,
-                        end_location: end,
+                        range,
                         custom,
                         node: ExprKind::Constant {
                             value: BigInt::from(1).into(),
                             kind: None,
                         },
                     },
                     Located {
-                        location: start,
-                        end_location: end,
+                        range,
                         custom,
                         node: ExprKind::Constant {
                             value: BigInt::from(2).into(),
                             kind: None,
                         },
                     },
                     Located {
-                        location: start,
-                        end_location: end,
+                        range,
                         custom,
                         node: ExprKind::Tuple {
                             ctx: ExprContext::Load,
                             elts: vec![
                                 Located {
-                                    location: start,
-                                    end_location: end,
+                                    range,
                                     custom,
                                     node: ExprKind::Constant {
                                         value: BigInt::from(3).into(),
                                         kind: None,
                                     },
                                 },
                                 Located {
-                                    location: start,
-                                    end_location: end,
+                                    range,
                                     custom,
                                     node: ExprKind::Constant {
                                         value: BigInt::from(4).into(),
                                         kind: None,
                                     },
                                 },
                                 Located {
-                                    location: start,
-                                    end_location: end,
+                                    range,
                                     custom,
                                     node: ExprKind::Constant {
                                         value: BigInt::from(5).into(),
@@ -214,8 +205,7 @@ mod tests {
         assert_eq!(
             new_ast,
             Located {
-                location: start,
-                end_location: end,
+                range,
                 custom,
                 node: ExprKind::Constant {
                     value: Constant::Tuple(vec![

compiler/ast/src/constant.rs

@@ -3,10 +3,9 @@ mod constant;
 #[cfg(feature = "fold")]
 mod fold_helpers;
 mod impls;
-#[cfg(feature = "unparse")]
-mod unparse;
 
 pub use ast_gen::*;
-pub use rustpython_compiler_core::Location;
+
+pub use ruff_text_size::TextSize as Location;
 
 pub type Suite<U = ()> = Vec<Stmt<U>>;