Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitcb4bd51

Browse files
authored
Merge pull requestRustPython#4373 from andersk/named
Allow named expression in subscript and set comprehension
2 parentsdee1337 +6b12aee commitcb4bd51

File tree

2 files changed

+21
-23
lines changed

2 files changed

+21
-23
lines changed

‎Lib/test/test_named_expressions.py‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -340,27 +340,25 @@ def test_named_expression_assignment_16(self):
340340
fib= {(c:=a): (a:=b)+ (b:=a+c)-bfor__inrange(6)}
341341
self.assertEqual(fib, {1:2,2:3,3:5,5:8,8:13,13:21})
342342

343-
# TODO: RUSTPYTHON, SyntaxError
344-
# def test_named_expression_assignment_17(self):
345-
# a = [1]
346-
# element = a[b:=0]
347-
# self.assertEqual(b, 0)
348-
# self.assertEqual(element, a[0])
349-
350-
# TODO: RUSTPYTHON, SyntaxError
351-
# def test_named_expression_assignment_18(self):
352-
# class TwoDimensionalList:
353-
# def __init__(self, two_dimensional_list):
354-
# self.two_dimensional_list = two_dimensional_list
355-
356-
# def __getitem__(self, index):
357-
# return self.two_dimensional_list[index[0]][index[1]]
358-
359-
# a = TwoDimensionalList([[1], [2]])
360-
# element = a[b:=0, c:=0]
361-
# self.assertEqual(b, 0)
362-
# self.assertEqual(c, 0)
363-
# self.assertEqual(element, a.two_dimensional_list[b][c])
343+
deftest_named_expression_assignment_17(self):
344+
a= [1]
345+
element=a[b:=0]
346+
self.assertEqual(b,0)
347+
self.assertEqual(element,a[0])
348+
349+
deftest_named_expression_assignment_18(self):
350+
classTwoDimensionalList:
351+
def__init__(self,two_dimensional_list):
352+
self.two_dimensional_list=two_dimensional_list
353+
354+
def__getitem__(self,index):
355+
returnself.two_dimensional_list[index[0]][index[1]]
356+
357+
a=TwoDimensionalList([[1], [2]])
358+
element=a[b:=0,c:=0]
359+
self.assertEqual(b,0)
360+
self.assertEqual(c,0)
361+
self.assertEqual(element,a.two_dimensional_list[b][c])
364362

365363

366364

‎compiler/parser/python.lalrpop‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ SubscriptList: ast::Expr = {
10371037
};
10381038

10391039
Subscript: ast::Expr = {
1040-
Test<"all">,
1040+
NamedExpressionTest,
10411041
<location:@L> <e1:Test<"all">?> ":" <e2:Test<"all">?> <e3:SliceOp?> <end_location:@R> => {
10421042
let lower = e1.map(Box::new);
10431043
let upper = e2.map(Box::new);
@@ -1199,7 +1199,7 @@ Atom<Goal>: ast::Expr = {
11991199
custom: (),
12001200
node: ast::ExprKind::Set { elts }
12011201
},
1202-
<location:@L> "{" <elt:Test<"all">> <generators:CompFor> "}" <end_location:@R> => {
1202+
<location:@L> "{" <elt:NamedExpressionTest> <generators:CompFor> "}" <end_location:@R> => {
12031203
ast::Expr {
12041204
location,
12051205
end_location: Some(end_location),

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp