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

youknowone · youknowone · commit 65df1fe9b662 · 2022-08-22T08:42:20.000+09:00
diff --git a/compiler/ast/asdl_rs.py b/compiler/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
diff --git a/compiler/ast/src/ast_gen.rs b/compiler/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;
 
diff --git a/compiler/ast/src/lib.rs b/compiler/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>>;
diff --git a/compiler/ast/src/location.rs b/compiler/ast/src/location.rs
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -15,7 +15,7 @@ use itertools::Itertools;
 use num_complex::Complex64;
 use num_traits::ToPrimitive;
 use rustpython_ast as ast;
-use rustpython_compiler_core::{self as bytecode, CodeObject, ConstantData, Instruction};
+use rustpython_compiler_core::{self as bytecode, CodeObject, ConstantData, Instruction, Location};
 use std::borrow::Cow;
 
 pub use rustpython_compiler_core::Mode;
@@ -64,7 +64,7 @@ struct Compiler {
     code_stack: Vec<ir::CodeInfo>,
     symbol_table_stack: Vec<SymbolTable>,
     source_path: String,
-    current_source_location: ast::Location,
+    current_source_location: Location,
     qualified_path: Vec<String>,
     done_with_future_stmts: bool,
     future_annotations: bool,
@@ -220,7 +220,7 @@ impl Compiler {
             code_stack: vec![module_code],
             symbol_table_stack: Vec::new(),
             source_path,
-            current_source_location: ast::Location::default(),
+            current_source_location: Location::default(),
             qualified_path: Vec::new(),
             done_with_future_stmts: false,
             future_annotations: false,
@@ -237,7 +237,7 @@ impl Compiler {
     fn error(&self, error: CodegenErrorType) -> CodegenError {
         self.error_loc(error, self.current_source_location)
     }
-    fn error_loc(&self, error: CodegenErrorType, location: ast::Location) -> CodegenError {
+    fn error_loc(&self, error: CodegenErrorType, location: Location) -> CodegenError {
         CodegenError {
             error,
             location,
@@ -2617,7 +2617,7 @@ impl Compiler {
         code.current_block = block;
     }
 
-    fn set_source_location(&mut self, location: ast::Location) {
+    fn set_source_location(&mut self, location: Location) {
         self.current_source_location = location;
     }
 
@@ -2672,7 +2672,7 @@ fn try_get_constant_string(values: &[ast::Expr]) -> Option<String> {
     }
 }
 
-fn compile_location(location: &ast::Location) -> bytecode::Location {
+fn compile_location(location: &Location) -> bytecode::Location {
     bytecode::Location::new(location.row(), location.column())
 }
 
diff --git a/compiler/codegen/src/error.rs b/compiler/codegen/src/error.rs
@@ -1,5 +1,4 @@
-use rustpython_ast::Location;
-
+use rustpython_compiler_core::Location;
 use std::{error::Error, fmt};
 
 #[derive(Debug)]
@@ -91,7 +90,7 @@ impl Error for CodegenErrorType {}
 
 impl fmt::Display for CodegenError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{} at {}", self.error, self.location)
+        self.location.fmt_with(f, &self.error)
     }
 }
 
diff --git a/compiler/codegen/src/symboltable.rs b/compiler/codegen/src/symboltable.rs
@@ -11,7 +11,8 @@ use crate::{
     error::{CodegenError, CodegenErrorType},
     IndexMap,
 };
-use rustpython_ast::{self as ast, Location};
+use rustpython_ast as ast;
+use rustpython_compiler_core::Location;
 use std::{borrow::Cow, fmt};
 
 /// Captures all symbols in the current scope, and has a list of subscopes in this scope.
diff --git a/compiler/core/src/location.rs b/compiler/core/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.
     ///
diff --git a/compiler/parser/src/error.rs b/compiler/parser/src/error.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)
     }
 }
 
diff --git a/compiler/parser/src/function.rs b/compiler/parser/src/function.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>,
diff --git a/compiler/parser/src/parser.rs b/compiler/parser/src/parser.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.
diff --git a/compiler/src/lib.rs b/compiler/src/lib.rs
@@ -30,13 +30,10 @@ impl fmt::Display for CompileError {
         let loc = self.location;
         if let Some(ref stmt) = self.statement {
             // visualize the error when location and statement are provided
-            write!(
-                f,
-                "{}",
-                loc.visualize(stmt, &format_args!("{} at {}", self.error, loc))
-            )
+            loc.fmt_with(f, &self.error)?;
+            write!(f, "\n{stmt}{arrow:>pad$}", pad = loc.column(), arrow = "^")
         } else {
-            write!(f, "{} at {}", self.error, loc)
+            loc.fmt_with(f, &self.error)
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-use rustpython_ast::Location;`
`2`		`-`
	`1`	`+use rustpython_compiler_core::Location;`
`3`	`2`	`use std::{error::Error, fmt};`
`4`	`3`
`5`	`4`	`#[derive(Debug)]`
`@@ -91,7 +90,7 @@ impl Error for CodegenErrorType {}`
`91`	`90`
`92`	`91`	`impl fmt::Display for CodegenError {`
`93`	`92`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
`94`		`- write!(f, "{} at {}", self.error, self.location)`
	`93`	`+ self.location.fmt_with(f, &self.error)`
`95`	`94`	`}`
`96`	`95`	`}`
`97`	`96`