Skip to content

Commit 9469acd

Browse files
slozierslozier
authored
Changes from 3.6 (#2027)
* Changes from 3.6 * Remove AsyncStatement.cs
1 parent 3843d11 commit 9469acd

File tree

11 files changed

+162
-170
lines changed

11 files changed

+162
-170
lines changed

‎src/core/IronPython/Compiler/Ast/AsyncForStatement.cs‎

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
using System.Threading;
88

9-
using Microsoft.Scripting;
9+
using IronPython.Runtime.Binding;
10+
using IronPython.Runtime.Exceptions;
11+
1012
using MSAst = System.Linq.Expressions;
1113

1214
namespace IronPython.Compiler.Ast {
@@ -70,60 +72,42 @@ private Statement BuildDesugared() {
7072
var iterName = $"__asyncfor_iter{id}";
7173
var runningName = $"__asyncfor_running{id}";
7274

73-
// Helper to create nodes with proper parent and span
74-
NameExpression MakeName(string name) {
75-
var n = new NameExpression(name) { Parent = parent };
76-
n.IndexSpan = span;
77-
return n;
78-
}
79-
80-
T WithSpan<T>(T node) where T : Node {
75+
// Helper to assign proper parent and span to nodes
76+
T SetScope<T>(T node) where T : Node {
77+
node.Parent = parent;
8178
node.IndexSpan = span;
8279
return node;
8380
}
8481

8582
// _iter = ITER.__aiter__()
86-
var aiterAttr = WithSpan(new MemberExpression(List, "__aiter__") { Parent = parent });
87-
var aiterCall = WithSpan(new CallExpression(aiterAttr, null, null) { Parent = parent });
88-
var assignIter = WithSpan(new AssignmentStatement(new Expression[] { MakeName(iterName) }, aiterCall) { Parent = parent });
83+
var aiterCall = SetScope(new UnaryExpression(PythonOperationKind.AIter, List));
84+
var assignIter = SetScope(new AssignmentStatement([SetScope(new NameExpression(iterName))], aiterCall));
8985

9086
// running = True
91-
var trueConst = new ConstantExpression(true) { Parent = parent }; trueConst.IndexSpan = span;
92-
var assignRunning = WithSpan(new AssignmentStatement(new Expression[] { MakeName(runningName) }, trueConst) { Parent = parent });
87+
var trueConst = SetScope(new ConstantExpression(true));
88+
var assignRunning = SetScope(new AssignmentStatement([SetScope(new NameExpression(runningName))], trueConst));
9389

9490
// TARGET = await __aiter.__anext__()
95-
var anextAttr = WithSpan(new MemberExpression(MakeName(iterName), "__anext__") { Parent = parent });
96-
var anextCall = WithSpan(new CallExpression(anextAttr, null, null) { Parent = parent });
91+
var anextCall = SetScope(new UnaryExpression(PythonOperationKind.ANext, SetScope(new NameExpression(iterName))));
9792
var awaitNext = new AwaitExpression(anextCall);
98-
var assignTarget = WithSpan(new AssignmentStatement(new Expression[] { Left }, awaitNext) { Parent = parent });
93+
var assignTarget = SetScope(new AssignmentStatement([Left], awaitNext));
9994

10095
// except StopAsyncIteration: __running = False
101-
var falseConst = new ConstantExpression(false) { Parent = parent }; falseConst.IndexSpan = span;
102-
var stopRunning = WithSpan(new AssignmentStatement(
103-
new Expression[] { MakeName(runningName) }, falseConst) { Parent = parent });
104-
var handler = WithSpan(new TryStatementHandler(
105-
MakeName("StopAsyncIteration"),
106-
null!,
107-
WithSpan(new SuiteStatement(new Statement[] { stopRunning }) { Parent = parent })
108-
) { Parent = parent });
96+
var falseConst = SetScope(new ConstantExpression(false));
97+
var stopRunning = SetScope(new AssignmentStatement([SetScope(new NameExpression(runningName))], falseConst));
98+
var handler = SetScope(new TryStatementHandler(SetScope(new NameExpression(nameof(PythonExceptions.StopAsyncIteration))), null!, SetScope(new SuiteStatement([stopRunning]))));
10999
handler.HeaderIndex = span.End;
110100

111101
// try/except/else block
112-
var tryExcept = WithSpan(new TryStatement(
113-
assignTarget,
114-
new[] { handler },
115-
WithSpan(new SuiteStatement(new Statement[] { Body }) { Parent = parent }),
116-
null!
117-
) { Parent = parent });
102+
var tryExcept = SetScope(new TryStatement(assignTarget, [handler], SetScope(new SuiteStatement([Body])), null));
118103
tryExcept.HeaderIndex = span.End;
119104

120105
// while __running: try/except/else
121-
var whileStmt = new WhileStatement(MakeName(runningName), tryExcept, Else);
106+
var whileStmt = new WhileStatement(SetScope(new NameExpression(runningName)), tryExcept, Else);
122107
whileStmt.SetLoc(GlobalParent, span.Start, span.End, span.End);
123108
whileStmt.Parent = parent;
124109

125-
var suite = WithSpan(new SuiteStatement(new Statement[] { assignIter, assignRunning, whileStmt }) { Parent = parent });
126-
return suite;
110+
return SetScope(new SuiteStatement([assignIter, assignRunning, whileStmt]));
127111
}
128112

129113
public override MSAst.Expression Reduce() {

‎src/core/IronPython/Compiler/Ast/AsyncStatement.cs‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/core/IronPython/Compiler/Ast/AsyncWithStatement.cs‎

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -52,57 +52,42 @@ private Statement BuildDesugared() {
5252
// finally:
5353
// await mgr.__aexit__(None, None, None)
5454

55-
// Helper to create nodes with proper parent and span
56-
NameExpression MakeName(string name) {
57-
var n = new NameExpression(name) { Parent = parent };
58-
n.IndexSpan = span;
59-
return n;
55+
// Helper to assign proper parent and span to nodes
56+
T SetScope<T>(T node) where T : Node {
57+
node.Parent = parent;
58+
node.IndexSpan = span;
59+
return node;
6060
}
6161

6262
// mgr = EXPR
63-
var assignMgr = new AssignmentStatement(new Expression[] { MakeName("__asyncwith_mgr") }, ContextManager) { Parent = parent };
64-
assignMgr.IndexSpan = span;
63+
var assignMgr = SetScope(new AssignmentStatement([SetScope(new NameExpression("__asyncwith_mgr"))], ContextManager));
6564

6665
// await mgr.__aenter__()
67-
var aenterAttr = new MemberExpression(MakeName("__asyncwith_mgr"), "__aenter__") { Parent = parent };
68-
aenterAttr.IndexSpan = span;
69-
var aenterCall = new CallExpression(aenterAttr, null, null) { Parent = parent };
70-
aenterCall.IndexSpan = span;
66+
var aenterAttr = SetScope(new MemberExpression(SetScope(new NameExpression("__asyncwith_mgr")), "__aenter__"));
67+
var aenterCall = SetScope(new CallExpression(aenterAttr, null, null));
7168
var awaitEnter = new AwaitExpression(aenterCall);
7269

7370
Statement bodyStmt;
74-
if (Variable != null) {
71+
if (Variable is not null) {
7572
// VAR = await value; BLOCK
76-
var assignVar = new AssignmentStatement(new Expression[] { Variable }, awaitEnter) { Parent = parent };
77-
assignVar.IndexSpan = span;
78-
bodyStmt = new SuiteStatement(new Statement[] { assignVar, Body }) { Parent = parent };
73+
var assignVar = SetScope(new AssignmentStatement([Variable], awaitEnter));
74+
bodyStmt = new SuiteStatement([assignVar, Body]) { Parent = parent };
7975
} else {
80-
var exprStmt = new ExpressionStatement(awaitEnter) { Parent = parent };
81-
exprStmt.IndexSpan = span;
82-
bodyStmt = new SuiteStatement(new Statement[] { exprStmt, Body }) { Parent = parent };
76+
var exprStmt = SetScope(new ExpressionStatement(awaitEnter));
77+
bodyStmt = new SuiteStatement([exprStmt, Body]) { Parent = parent };
8378
}
8479

8580
// await mgr.__aexit__(None, None, None)
86-
var aexitAttr = new MemberExpression(MakeName("__asyncwith_mgr"), "__aexit__") { Parent = parent };
87-
aexitAttr.IndexSpan = span;
88-
var none1 = new ConstantExpression(null) { Parent = parent }; none1.IndexSpan = span;
89-
var none2 = new ConstantExpression(null) { Parent = parent }; none2.IndexSpan = span;
90-
var none3 = new ConstantExpression(null) { Parent = parent }; none3.IndexSpan = span;
91-
var aexitCallNormal = new CallExpression(aexitAttr,
92-
new Expression[] { none1, none2, none3 }, null) { Parent = parent };
93-
aexitCallNormal.IndexSpan = span;
81+
var aexitAttr = SetScope(new MemberExpression(SetScope(new NameExpression("__asyncwith_mgr")), "__aexit__"));
82+
var none = SetScope(new ConstantExpression(null));
83+
var aexitCallNormal = SetScope(new CallExpression(aexitAttr, [none, none, none], null));
9484
var awaitExitNormal = new AwaitExpression(aexitCallNormal);
9585

9686
// try/finally: await __aexit__ on normal exit
97-
var finallyExprStmt = new ExpressionStatement(awaitExitNormal) { Parent = parent };
98-
finallyExprStmt.IndexSpan = span;
99-
var tryFinally = new TryStatement(bodyStmt, null, null, finallyExprStmt) { Parent = parent };
100-
tryFinally.IndexSpan = span;
101-
tryFinally.HeaderIndex = span.End;
102-
103-
var suite = new SuiteStatement(new Statement[] { assignMgr, tryFinally }) { Parent = parent };
104-
suite.IndexSpan = span;
105-
return suite;
87+
var finallyExprStmt = SetScope(new ExpressionStatement(awaitExitNormal));
88+
var tryFinally = SetScope(new TryStatement(bodyStmt, null, null, finallyExprStmt) { HeaderIndex = span.End });
89+
90+
return SetScope(new SuiteStatement([assignMgr, tryFinally]));
10691
}
10792

10893
public override MSAst.Expression Reduce() {

‎src/core/IronPython/Compiler/Ast/PythonNameBinder.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,6 @@ public override bool Walk(AsyncForStatement node) {
351351
node.Parent = _currentScope;
352352
return base.Walk(node);
353353
}
354-
// AsyncStatement
355-
public override bool Walk(AsyncStatement node) {
356-
node.Parent = _currentScope;
357-
return base.Walk(node);
358-
}
359354
// AsyncWithStatement
360355
public override bool Walk(AsyncWithStatement node) {
361356
node.Parent = _currentScope;

‎src/core/IronPython/Compiler/Ast/PythonWalker.Generated.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,6 @@ public virtual void PostWalk(AssignmentStatement node) { }
144144
public virtual bool Walk(AsyncForStatement node) { return true; }
145145
public virtual void PostWalk(AsyncForStatement node) { }
146146

147-
// AsyncStatement
148-
public virtual bool Walk(AsyncStatement node) { return true; }
149-
public virtual void PostWalk(AsyncStatement node) { }
150-
151147
// AsyncWithStatement
152148
public virtual bool Walk(AsyncWithStatement node) { return true; }
153149
public virtual void PostWalk(AsyncWithStatement node) { }
@@ -415,10 +411,6 @@ public override void PostWalk(AssignmentStatement node) { }
415411
public override bool Walk(AsyncForStatement node) { return false; }
416412
public override void PostWalk(AsyncForStatement node) { }
417413

418-
// AsyncStatement
419-
public override bool Walk(AsyncStatement node) { return false; }
420-
public override void PostWalk(AsyncStatement node) { }
421-
422414
// AsyncWithStatement
423415
public override bool Walk(AsyncWithStatement node) { return false; }
424416
public override void PostWalk(AsyncWithStatement node) { }

‎src/core/IronPython/Compiler/Ast/UnaryExpression.cs‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,25 @@
22
// The .NET Foundation licenses this file to you under the Apache 2.0 License.
33
// See the LICENSE file in the project root for more information.
44

5-
using MSAst = System.Linq.Expressions;
5+
#nullable enable
66

7-
using System;
87
using System.Diagnostics;
98

109
using IronPython.Runtime.Binding;
1110

12-
namespace IronPython.Compiler.Ast {
13-
using Ast = MSAst.Expression;
14-
using AstUtils = Microsoft.Scripting.Ast.Utils;
11+
using MSAst = System.Linq.Expressions;
1512

13+
namespace IronPython.Compiler.Ast {
1614
public class UnaryExpression : Expression {
1715
public UnaryExpression(PythonOperator op, Expression expression) {
1816
Operator = op;
17+
OperationKind = PythonOperatorToOperatorString(op);
18+
Expression = expression;
19+
EndIndex = expression.EndIndex;
20+
}
21+
22+
internal UnaryExpression(PythonOperationKind op, Expression expression) {
23+
OperationKind = op;
1924
Expression = expression;
2025
EndIndex = expression.EndIndex;
2126
}
@@ -24,13 +29,10 @@ public UnaryExpression(PythonOperator op, Expression expression) {
2429

2530
public PythonOperator Operator { get; }
2631

27-
public override MSAst.Expression Reduce() {
28-
return GlobalParent.Operation(
29-
typeof(object),
30-
PythonOperatorToOperatorString(Operator),
31-
Expression
32-
);
33-
}
32+
internal PythonOperationKind OperationKind { get; }
33+
34+
public override MSAst.Expression Reduce()
35+
=> GlobalParent.Operation(typeof(object), OperationKind, Expression);
3436

3537
public override void Walk(PythonWalker walker) {
3638
if (walker.Walk(this)) {

0 commit comments

Comments
 (0)