Fix ArgWithDefault TextRange (#13)

astral-sh · Jun 20, 2023 · 08ebbe4 · 08ebbe4
1 parent ed3b4eb
commit 08ebbe4
Show file tree

Hide file tree

Showing 13 changed files with 12,521 additions and 5,423 deletions.
diff --git a/ast/src/lib.rs b/ast/src/lib.rs
@@ -22,7 +22,7 @@ mod ranged;
 
 #[cfg(feature = "malachite-bigint")]
 pub use malachite_bigint as bigint;
-#[cfg(feature = "num-bigint")]
+#[cfg(all(feature = "num-bigint", not(feature = "malachite-bigint")))]
 pub use num_bigint as bigint;
 
 pub use builtin::*;

diff --git a/format/Cargo.toml b/format/Cargo.toml
@@ -15,3 +15,6 @@ itertools = "0.10.5"
 num-traits = { workspace = true }
 num-bigint = { workspace = true, optional = true }
 malachite-bigint = { workspace = true, optional = true }
+
+[features]
+default = ["malachite-bigint"]
diff --git a/format/src/lib.rs b/format/src/lib.rs
@@ -1,6 +1,6 @@
 #[cfg(feature = "malachite-bigint")]
 pub use malachite_bigint as bigint;
-#[cfg(feature = "num-bigint")]
+#[cfg(all(feature = "num-bigint", not(feature = "malachite-bigint")))]
 pub use num_bigint as bigint;
 
 pub use crate::format::*;

diff --git a/parser/src/python.lalrpop b/parser/src/python.lalrpop
@@ -1067,8 +1067,12 @@ ParameterDefs<ArgType>: (Vec<ast::ArgWithDefault>, Vec<ast::ArgWithDefault>) = {
 
 ParameterDef<ArgType>: ast::ArgWithDefault = {
     <i:ArgType> => i,
-    <mut i:ArgType> "=" <e:Test<"all">> => {
+    <mut i:ArgType> "=" <e:Test<"all">> <end_location:@R> => {
         i.default = Some(Box::new(e));
+        #[cfg(feature = "all-nodes-with-ranges")]
+        {
+            i.range = optional_range(i.range.start(), end_location);
+        }
         i
     },
 };