integrate ast::Location into compilre-core::Location

Author: youknowone

ast/asdl_rs.py

@@ -645,7 +645,7 @@ def write_ast_def(mod, typeinfo, f):
         #![allow(clippy::derive_partial_eq_without_eq)]
         
         pub use crate::constant::*;
-        pub use crate::location::Location;
+        pub use crate::Location;
 
         type Ident = String;
         \n

ast/src/ast_gen.rs

@@ -3,7 +3,7 @@
 #![allow(clippy::derive_partial_eq_without_eq)]
 
 pub use crate::constant::*;
-pub use crate::location::Location;
+pub use crate::Location;
 
 type Ident = String;
 

ast/src/lib.rs

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

ast/src/location.rs

@@ -7,6 +7,16 @@ pub struct Location {
     pub(super) column: u32,
 }
 
+impl Location {
+    pub fn fmt_with(
+        &self,
+        f: &mut std::fmt::Formatter,
+        e: &impl std::fmt::Display,
+    ) -> std::fmt::Result {
+        write!(f, "{} at line {} column {}", e, self.row(), self.column())
+    }
+}
+
 impl Location {
     /// Creates a new Location object at the given row and column.
     ///

core/src/location.rs

@@ -1,12 +1,9 @@
 //! Define internal parse error types
 //! The goal is to provide a matching and a safe error API, maksing errors from LALR
-use lalrpop_util::ParseError as LalrpopError;
-
-use crate::ast::Location;
-use crate::token::Tok;
 
-use std::error::Error;
-use std::fmt;
+use crate::{ast::Location, token::Tok};
+use lalrpop_util::ParseError as LalrpopError;
+use std::{error::Error, fmt};
 
 /// Represents an error during lexical scanning.
 #[derive(Debug, PartialEq)]
@@ -186,7 +183,7 @@ impl ParseError {
 
 impl fmt::Display for ParseError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{} at {}", self.error, self.location)
+        self.location.fmt_with(f, &self.error)
     }
 }
 

parser/src/error.rs

@@ -1,8 +1,7 @@
-use ahash::RandomState;
-use std::collections::HashSet;
-
 use crate::ast;
 use crate::error::{LexicalError, LexicalErrorType};
+use ahash::RandomState;
+use std::collections::HashSet;
 
 pub struct ArgumentList {
     pub args: Vec<ast::Expr>,

parser/src/function.rs

@@ -5,13 +5,9 @@
 //! parse a whole program, a single statement, or a single
 //! expression.
 
-use std::iter;
-
-use crate::ast;
-use crate::error::ParseError;
-use crate::lexer;
 pub use crate::mode::Mode;
-use crate::python;
+use crate::{ast, error::ParseError, lexer, python};
+use std::iter;
 
 /*
  * Parse python code.