Skip to content

Update AST for extended unpacking #1172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slozier merged 1 commit into from
Apr 16, 2021
Merged

Update AST for extended unpacking #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 37 additions & 48 deletions Src/IronPython/Modules/_ast.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,17 +1022,14 @@ internal override AstExpression Revert() {
[PythonType]
public class Call : expr {
public Call() {
_fields = PythonTuple.MakeTuple(new[] { nameof(func), nameof(args), nameof(keywords), nameof(starargs), nameof(kwargs) });
_fields = PythonTuple.MakeTuple(new[] { nameof(func), nameof(args), nameof(keywords) });
}

public Call(expr func, PythonList args, PythonList keywords, expr starargs, expr kwargs,
[Optional]int? lineno, [Optional]int? col_offset)
public Call(expr func, PythonList args, PythonList keywords, [Optional] int? lineno, [Optional] int? col_offset)
: this() {
this.func = func;
this.args = args;
this.keywords = keywords;
this.starargs = starargs;
this.kwargs = kwargs;
_lineno = lineno;
_col_offset = col_offset;
}
Expand All @@ -1043,31 +1040,33 @@ internal Call(CallExpression call)
keywords = new PythonList();
func = Convert(call.Target);
foreach (Arg arg in call.Args) {
if (arg.Name == null)
if (arg.Name == "*") {
var loc = arg.Start;
args.Add(new Starred(Convert(arg.Expression), Load.Instance, loc.Line, loc.Column));
} else {
args.Add(Convert(arg.Expression));
else // name == "*"
starargs = Convert(arg.Expression);
}
}
foreach (Arg arg in call.Kwargs) {
if (arg.Name == "**")
kwargs = Convert(arg.Expression);
else // name is proper
keywords.Add(new keyword(arg));
keywords.Add(new keyword(arg.Name == "**" ? null : arg.Name, Convert(arg.Expression)));
}
}

internal override AstExpression Revert() {
AstExpression target = expr.Revert(func);
List<Arg> newArgs = new List<Arg>();
List<Arg> newKwargs = new List<Arg>();
foreach (expr ex in args)
newArgs.Add(new Arg(expr.Revert(ex)));
if (null != starargs)
newArgs.Add(new Arg("*", expr.Revert(starargs)));
foreach (keyword kw in keywords)
newKwargs.Add(new Arg(kw.arg, expr.Revert(kw.value)));
if (null != kwargs)
newKwargs.Add(new Arg("**", expr.Revert(kwargs)));
foreach (expr ex in args) {
if (ex is Starred starred) {
newArgs.Add(new Arg("*", starred.value?.Revert()));
} else {
newArgs.Add(new Arg(ex?.Revert()));
}
}
foreach (keyword kw in keywords) {
newKwargs.Add(new Arg(kw.arg is null ? "**" : kw.arg, kw.value?.Revert()));
}

return new CallExpression(target, newArgs, newKwargs);
}

Expand All @@ -1076,26 +1075,19 @@ internal override AstExpression Revert() {
public PythonList args { get; set; }

public PythonList keywords { get; set; }

public expr starargs { get; set; } // TODO: remove in 3.5

public expr kwargs { get; set; } // TODO: remove in 3.5
}

[PythonType]
public class ClassDef : stmt {
public ClassDef() {
_fields = PythonTuple.MakeTuple(new[] { nameof(name), nameof(bases), nameof(keywords), nameof(starargs), nameof(kwargs), nameof(body), nameof(decorator_list) });
_fields = PythonTuple.MakeTuple(new[] { nameof(name), nameof(bases), nameof(keywords), nameof(body), nameof(decorator_list) });
}

public ClassDef(string name, PythonList bases, PythonList keywords, object starargs, object kwargs, PythonList body, PythonList decorator_list,
[Optional]int? lineno, [Optional]int? col_offset)
public ClassDef(string name, PythonList bases, PythonList keywords, PythonList body, PythonList decorator_list, [Optional] int? lineno, [Optional] int? col_offset)
: this() {
this.name = name;
this.bases = bases;
this.keywords = keywords;
this.starargs = starargs;
this.kwargs = kwargs;
this.body = body;
this.decorator_list = decorator_list;
_lineno = lineno;
Expand All @@ -1107,17 +1099,16 @@ internal ClassDef(ClassDefinition def)
name = def.Name;
bases = new PythonList(def.Bases.Count);
foreach (Arg arg in def.Bases) {
if (arg.Name == null)
if (arg.Name == "*") {
var loc = arg.Start;
bases.Add(new Starred(Convert(arg.Expression), Load.Instance, loc.Line, loc.Column));
} else {
bases.Add(Convert(arg.Expression));
else // name == "*"
starargs = Convert(arg.Expression);
}
}
keywords = new PythonList(def.Keywords.Count);
foreach (Arg arg in def.Keywords) {
if (arg.Name == "**")
kwargs = Convert(arg.Expression);
else // name is proper
keywords.Add(new keyword(arg));
keywords.Add(new keyword(arg.Name == "**" ? null : arg.Name, Convert(arg.Expression)));
}
body = ConvertStatements(def.Body);
if (def.Decorators != null) {
Expand All @@ -1132,14 +1123,16 @@ internal ClassDef(ClassDefinition def)
internal override Statement Revert() {
List<Arg> newBases = new List<Arg>();
List<Arg> newKeywords = new List<Arg>();
foreach (expr ex in bases)
newBases.Add(new Arg(expr.Revert(ex)));
if (null != starargs)
newBases.Add(new Arg("*", expr.Revert(starargs)));
foreach (keyword kw in keywords)
newKeywords.Add(new Arg(kw.arg, expr.Revert(kw.value)));
if (null != kwargs)
newKeywords.Add(new Arg("**", expr.Revert(kwargs)));
foreach (expr ex in bases) {
if (ex is Starred starred) {
newBases.Add(new Arg("*", starred.value?.Revert()));
} else {
newBases.Add(new Arg(ex?.Revert()));
}
}
foreach (keyword kw in keywords) {
newKeywords.Add(new Arg(kw.arg is null ? "**" : kw.arg, kw.value?.Revert()));
}

ClassDefinition cd = new ClassDefinition(name, newBases, newKeywords, RevertStmts(body));
if (decorator_list.Count != 0)
Expand All @@ -1153,10 +1146,6 @@ internal override Statement Revert() {

public PythonList keywords { get; set; }

public object starargs { get; set; } // TODO: remove in 3.5

public object kwargs { get; set; } // TODO: remove in 3.5

public PythonList body { get; set; }

public PythonList decorator_list { get; set; }
Expand Down
Loading