Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4367 from andersk/star-order

Browse Source 
Prohibit starred arguments after double-starred arguments
This commit is contained in:
Jim Fasarakis-Hilliard
2022-12-29 16:27:16 +02:00
committed by GitHub
parent 27d315c3d1 52ce437951
commit 2eb87cac71
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_syntax.py vendored
View File

@@ -1453,8 +1453,6 @@ class SyntaxTestCase(unittest.TestCase):
"positional argument follows "
"keyword argument unpacking")
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_kwargs_last3(self):
self._check_error("int(**{'base': 10}, *['2'])",
"iterable argument unpacking follows "

7
compiler/parser/src/error.rs
View File

@@ -22,6 +22,7 @@ pub enum LexicalErrorType {
TabsAfterSpaces,
DefaultArgumentError,
PositionalArgumentError,
UnpackedArgumentError,
DuplicateKeywordArgumentError,
UnrecognizedToken { tok: char },
FStringError(FStringErrorType),
@@ -55,6 +56,12 @@ impl fmt::Display for LexicalErrorType {
LexicalErrorType::PositionalArgumentError => {
write!(f, "positional argument follows keyword argument")
}
LexicalErrorType::UnpackedArgumentError => {
write!(
f,
"iterable argument unpacking follows keyword argument unpacking"
)
}
LexicalErrorType::UnrecognizedToken { tok } => {
write!(f, "Got unexpected token {tok}")
}

11
compiler/parser/src/function.rs
View File

@@ -55,6 +55,7 @@ pub fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentList, Lexi
let mut keyword_names =
FxHashSet::with_capacity_and_hasher(func_args.len(), Default::default());
let mut double_starred = false;
for (name, value) in func_args {
match name {
Some((start, end, name)) => {
@@ -67,6 +68,8 @@ pub fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentList, Lexi
}
keyword_names.insert(keyword_name.clone());
} else {
double_starred = true;
}
keywords.push(ast::Keyword::new(
@@ -76,12 +79,18 @@ pub fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentList, Lexi
));
}
None => {
// Allow starred args after keyword arguments.
// Allow starred arguments after keyword arguments but
// not after double-starred arguments.
if !keywords.is_empty() && !is_starred(&value) {
return Err(LexicalError {
error: LexicalErrorType::PositionalArgumentError,
location: value.location,
});
} else if double_starred {
return Err(LexicalError {
error: LexicalErrorType::UnpackedArgumentError,
location: value.location,
});
}
args.push(value);