Merge pull request RustPython#4422 from harupy/impl-Default-for-Location

youknowone · web-flow · commit ba427c86909f · 2023-01-06T01:43:15.000+09:00
Implement `Default` for `Location`
diff --git a/compiler/core/src/location.rs b/compiler/core/src/location.rs
@@ -1,12 +1,18 @@
 use serde::{Deserialize, Serialize};
 
 /// Sourcecode location.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct Location {
     pub(super) row: u32,
     pub(super) column: u32,
 }
 
+impl Default for Location {
+    fn default() -> Self {
+        Self { row: 1, column: 0 }
+    }
+}
+
 impl Location {
     pub fn fmt_with(
         &self,
diff --git a/compiler/parser/src/lexer.rs b/compiler/parser/src/lexer.rs
@@ -153,7 +153,7 @@ pub type LexResult = Result<Spanned, LexicalError>;
 
 #[inline]
 pub fn make_tokenizer(source: &str) -> impl Iterator<Item = LexResult> + '_ {
-    make_tokenizer_located(source, Location::new(1, 0))
+    make_tokenizer_located(source, Location::default())
 }
 
 pub fn make_tokenizer_located(
diff --git a/compiler/parser/src/string_parser.rs b/compiler/parser/src/string_parser.rs
@@ -541,8 +541,8 @@ mod tests {
             source,
             StringKind::FString,
             false,
-            Location::new(1, 0),
-            Location::new(1, source.len() + 3), // 3 for prefix and quotes
+            Location::default(),
+            Location::default().with_col_offset(source.len() + 3), // 3 for prefix and quotes
         )
         .parse()
     }

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ pub type LexResult = Result<Spanned, LexicalError>;`
`153`	`153`
`154`	`154`	`#[inline]`
`155`	`155`	`pub fn make_tokenizer(source: &str) -> impl Iterator<Item = LexResult> + '_ {`
`156`		`- make_tokenizer_located(source, Location::new(1, 0))`
	`156`	`+ make_tokenizer_located(source, Location::default())`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`pub fn make_tokenizer_located(`
Original file line number	Diff line number	Diff line change
`@@ -541,8 +541,8 @@ mod tests {`
`541`	`541`	`source,`
`542`	`542`	`StringKind::FString,`
`543`	`543`	`false,`
`544`		`- Location::new(1, 0),`
`545`		`- Location::new(1, source.len() + 3), // 3 for prefix and quotes`
	`544`	`+ Location::default(),`
	`545`	`+ Location::default().with_col_offset(source.len() + 3), // 3 for prefix and quotes`
`546`	`546`	`)`
`547`	`547`	`.parse()`
`548`	`548`	`}`