Fix ArgWithDefault TextRange (#13)

astral-sh · Jul 17, 2023 · dc8f422 · dc8f422
1 parent f39a6de
commit dc8f422
Show file tree

Hide file tree

Showing 13 changed files with 1,356 additions and 1,293 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
@@ -1087,8 +1087,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
     },
 };

diff --git a/parser/src/python.rs b/parser/src/python.rs
diff --git a/...rc/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap b/...rc/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap
diff --git a/...hots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap b/...hots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap
diff --git a/...hon_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap b/...hon_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap
diff --git a/..._function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap b/..._function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap
diff --git a/...er/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap b/...er/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap
diff --git a/.../src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args_with_defaults.snap b/.../src/snapshots/rustpython_parser__function__tests__lambda_kw_only_args_with_defaults.snap
diff --git a/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args_with_defaults.snap b/parser/src/snapshots/rustpython_parser__function__tests__lambda_pos_args_with_defaults.snap
diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap