Commit2eb87ca

authored

Merge pull requestRustPython#4367 from andersk/star-order

Prohibit starred arguments after double-starred arguments

2 parents27d315c +52ce437 commit2eb87caCopy full SHA for 2eb87ca

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1453,8 +1453,6 @@ def test_kwargs_last2(self):`
`1453`	`1453`	`"positional argument follows "`
`1454`	`1454`	`"keyword argument unpacking")`
`1455`	`1455`
`1456`		`-# TODO: RUSTPYTHON`
`1457`		`-@unittest.expectedFailure`
`1458`	`1456`	`deftest_kwargs_last3(self):`
`1459`	`1457`	`self._check_error("int(*{'base': 10}, ['2'])",`
`1460`	`1458`	`"iterable argument unpacking follows "`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ pub enum LexicalErrorType {`
`22`	`22`	`TabsAfterSpaces,`
`23`	`23`	`DefaultArgumentError,`
`24`	`24`	`PositionalArgumentError,`
	`25`	`+UnpackedArgumentError,`
`25`	`26`	`DuplicateKeywordArgumentError,`
`26`	`27`	`UnrecognizedToken{tok:char},`
`27`	`28`	`FStringError(FStringErrorType),`
`@@ -55,6 +56,12 @@ impl fmt::Display for LexicalErrorType {`
`55`	`56`	`LexicalErrorType::PositionalArgumentError =>{`
`56`	`57`	`write!(f,"positional argument follows keyword argument")`
`57`	`58`	`}`
	`59`	`+LexicalErrorType::UnpackedArgumentError =>{`
	`60`	`+write!(`
	`61`	`+ f,`
	`62`	`+"iterable argument unpacking follows keyword argument unpacking"`
	`63`	`+)`
	`64`	`+}`
`58`	`65`	`LexicalErrorType::UnrecognizedToken{ tok} =>{`
`59`	`66`	`write!(f,"Got unexpected token {tok}")`
`60`	`67`	`}`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ pub fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentList, Lexi`
`55`	`55`
`56`	`56`	`letmut keyword_names =`
`57`	`57`	`FxHashSet::with_capacity_and_hasher(func_args.len(),Default::default());`
	`58`	`+letmut double_starred =false;`
`58`	`59`	`for(name, value)in func_args{`
`59`	`60`	`match name{`
`60`	`61`	`Some((start, end, name)) =>{`
`@@ -67,6 +68,8 @@ pub fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentList, Lexi`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`keyword_names.insert(keyword_name.clone());`
	`71`	`+}else{`
	`72`	`+ double_starred =true;`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`keywords.push(ast::Keyword::new(`
`@@ -76,12 +79,18 @@ pub fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentList, Lexi`
`76`	`79`	`));`
`77`	`80`	`}`
`78`	`81`	`None =>{`
`79`		`-// Allow starred args after keyword arguments.`
	`82`	`+// Allow starred arguments after keyword arguments but`
	`83`	`+// not after double-starred arguments.`
`80`	`84`	`if !keywords.is_empty() && !is_starred(&value){`
`81`	`85`	`returnErr(LexicalError{`
`82`	`86`	`error:LexicalErrorType::PositionalArgumentError,`
`83`	`87`	`location: value.location,`
`84`	`88`	`});`
	`89`	`+}elseif double_starred{`
	`90`	`+returnErr(LexicalError{`
	`91`	`+error:LexicalErrorType::UnpackedArgumentError,`
	`92`	`+location: value.location,`
	`93`	`+});`
`85`	`94`	`}`
`86`	`95`
`87`	`96`	`args.push(value);`

Comments

(0)