From 5ff49cfa9cc620df1c6936ea2e9fd1a86616900f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 26 Jan 2014 15:22:07 -0800 Subject: [PATCH 001/932] initial version --- pom.xml | 102 ++++++++++++++++++ .../cloudbees/groovy/cps/Continuation.java | 17 +++ .../com/cloudbees/groovy/cps/Program.java | 8 ++ .../cloudbees/groovy/cps/ProgramState.java | 15 +++ 4 files changed, 142 insertions(+) create mode 100644 pom.xml create mode 100644 src/main/java/com/cloudbees/groovy/cps/Continuation.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/Program.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/ProgramState.java diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..22d440456 --- /dev/null +++ b/pom.xml @@ -0,0 +1,102 @@ + + 4.0.0 + + + org.kohsuke + pom + 6 + + + groovy-cps + 1.0-SNAPSHOT + + Groovy CPS Execcution + + + + UTF-8 + + + + + + org.apache.maven.plugins + maven-site-plugin + + + org.kohsuke + doxia-module-markdown + 1.0 + + + + + org.codehaus.gmaven + gmaven-plugin + 1.5 + + + + generateStubs + compile + generateTestStubs + testCompile + + + + + 1.8 + + + + org.codehaus.gmaven.runtime + gmaven-runtime-1.8 + 1.5 + + + + + + + org.kathrynhuxtable.maven.wagon + wagon-gitsite + 0.3.1 + + + + + + + org.codehaus.groovy + groovy + 1.8.5 + + + junit + junit + 3.8.1 + test + + + + + scm:git:git@github.com/kohsuke/${project.artifactId}.git + scm:git:ssh://git@github.com/kohsuke/${project.artifactId}.git + http://${project.artifactId}.kohsuke.org/ + + + + + github-pages + gitsite:git@github.com/kohsuke/${project.artifactId}.git + + + + + + + maven-javadoc-plugin + + + + diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java new file mode 100644 index 000000000..b8f461075 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -0,0 +1,17 @@ +package com.cloudbees.groovy.cps; + +/** + * @author Kohsuke Kawaguchi + */ +public interface Continuation { + void execute(Object r); + + /** + * Indicates the end of a program. + */ + final static Continuation HALT = new Continuation() { + public void execute(Object r) { + throw new IllegalStateException(); + } + }; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Program.java b/src/main/java/com/cloudbees/groovy/cps/Program.java new file mode 100644 index 000000000..f59a36706 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Program.java @@ -0,0 +1,8 @@ +package com.cloudbees.groovy.cps; + +/** + * @author Kohsuke Kawaguchi + */ +public interface Program { + ProgramState execute(Continuation k); +} diff --git a/src/main/java/com/cloudbees/groovy/cps/ProgramState.java b/src/main/java/com/cloudbees/groovy/cps/ProgramState.java new file mode 100644 index 000000000..961a645bc --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/ProgramState.java @@ -0,0 +1,15 @@ +package com.cloudbees.groovy.cps; + +/** + * @author Kohsuke Kawaguchi + */ +public class ProgramState { + Program p; + Continuation k; + + ProgramState step() { + return p.execute(k); + } + + Object +} From 3949d2f76022e582fc052c0118f41c402a7e8754 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 26 Jan 2014 15:51:35 -0800 Subject: [PATCH 002/932] Continue to evolve this code --- .../cloudbees/groovy/cps/Continuation.java | 11 +------ .../groovy/cps/{Program.java => Env.java} | 4 +-- .../com/cloudbees/groovy/cps/Function.java | 19 ++++++++++++ .../java/com/cloudbees/groovy/cps/Next.java | 30 +++++++++++++++++++ .../cloudbees/groovy/cps/ProgramState.java | 15 ---------- 5 files changed, 52 insertions(+), 27 deletions(-) rename src/main/java/com/cloudbees/groovy/cps/{Program.java => Env.java} (51%) create mode 100644 src/main/java/com/cloudbees/groovy/cps/Function.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/Next.java delete mode 100644 src/main/java/com/cloudbees/groovy/cps/ProgramState.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index b8f461075..c10b763e5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -4,14 +4,5 @@ * @author Kohsuke Kawaguchi */ public interface Continuation { - void execute(Object r); - - /** - * Indicates the end of a program. - */ - final static Continuation HALT = new Continuation() { - public void execute(Object r) { - throw new IllegalStateException(); - } - }; + Next accept(Object r); } diff --git a/src/main/java/com/cloudbees/groovy/cps/Program.java b/src/main/java/com/cloudbees/groovy/cps/Env.java similarity index 51% rename from src/main/java/com/cloudbees/groovy/cps/Program.java rename to src/main/java/com/cloudbees/groovy/cps/Env.java index f59a36706..d0940275c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Program.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -1,8 +1,8 @@ package com.cloudbees.groovy.cps; /** + * For variable lookup. * @author Kohsuke Kawaguchi */ -public interface Program { - ProgramState execute(Continuation k); +public class Env { } diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java new file mode 100644 index 000000000..c4a8b5212 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -0,0 +1,19 @@ +package com.cloudbees.groovy.cps; + +/** + * @author Kohsuke Kawaguchi + */ +public interface Function { + Next apply(Env e, Continuation k, Object... args); + + /** + * Indicates the end of a program. + */ + final static Function HALT = new Function() { + public Next apply(Env e, Continuation k, Object... args) { + Next next = new Next(HALT, e, k); + next.yield = args[0]; + return next; + } + }; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java new file mode 100644 index 000000000..a32552e1f --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -0,0 +1,30 @@ +package com.cloudbees.groovy.cps; + +/** + * Remaining computation to execute. To work around the lack of tail-call optimization + * + * @author Kohsuke Kawaguchi + */ +public class Next { + Function f; + Env e; + Continuation k; + Object[] args; + + /** + * If the program getting executed wants to yield a value and suspend its execution, + * this value is set to non-null. + */ + Object yield; + + public Next(Function f, Env e, Continuation k, Object... args) { + this.f = f; + this.e = e; + this.k = k; + this.args = args; + } + + public static Next start(Function f, Object... args) { + return new Next(f,new Env(),) + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/ProgramState.java b/src/main/java/com/cloudbees/groovy/cps/ProgramState.java deleted file mode 100644 index 961a645bc..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/ProgramState.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cloudbees.groovy.cps; - -/** - * @author Kohsuke Kawaguchi - */ -public class ProgramState { - Program p; - Continuation k; - - ProgramState step() { - return p.execute(k); - } - - Object -} From cf3cf14ef643e1f617322db0fe8e9cf423afaa31 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 26 Jan 2014 16:06:41 -0800 Subject: [PATCH 003/932] Maybe I was mixing Function and Expression? --- .../cloudbees/groovy/cps/Continuation.java | 8 -------- .../com/cloudbees/groovy/cps/Function.java | 4 ++-- .../java/com/cloudbees/groovy/cps/Next.java | 19 ++++++++++++++++--- 3 files changed, 18 insertions(+), 13 deletions(-) delete mode 100644 src/main/java/com/cloudbees/groovy/cps/Continuation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java deleted file mode 100644 index c10b763e5..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.cloudbees.groovy.cps; - -/** - * @author Kohsuke Kawaguchi - */ -public interface Continuation { - Next accept(Object r); -} diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java index c4a8b5212..0dba20f78 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -4,13 +4,13 @@ * @author Kohsuke Kawaguchi */ public interface Function { - Next apply(Env e, Continuation k, Object... args); + Next apply(Env e, Function k, Object... args); /** * Indicates the end of a program. */ final static Function HALT = new Function() { - public Next apply(Env e, Continuation k, Object... args) { + public Next apply(Env e, Function k, Object... args) { Next next = new Next(HALT, e, k); next.yield = args[0]; return next; diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index a32552e1f..5f5c50b7e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,5 +1,7 @@ package com.cloudbees.groovy.cps; +import static com.cloudbees.groovy.cps.Function.*; + /** * Remaining computation to execute. To work around the lack of tail-call optimization * @@ -8,7 +10,7 @@ public class Next { Function f; Env e; - Continuation k; + Function k; Object[] args; /** @@ -17,7 +19,7 @@ public class Next { */ Object yield; - public Next(Function f, Env e, Continuation k, Object... args) { + public Next(Function f, Env e, Function k, Object... args) { this.f = f; this.e = e; this.k = k; @@ -25,6 +27,17 @@ public Next(Function f, Env e, Continuation k, Object... args) { } public static Next start(Function f, Object... args) { - return new Next(f,new Env(),) + return new Next(f,new Env(), HALT, args); + } + + /** + * Resumes the execution of this program state, until it yields a value or finishes computation. + */ + public Next resume() { + Next n = this; + do { + n = n.f.apply(n.e, n.k, n.args); + } while(n.yield==null); + return n; } } From c38027117dbb0dcd557b09ff0bf7935ebae7791c Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 26 Jan 2014 16:41:31 -0800 Subject: [PATCH 004/932] I'm still confused --- .../cloudbees/groovy/cps/Continuation.java | 21 +++++++++++++++++ .../com/cloudbees/groovy/cps/Expression.java | 17 ++++++++++++++ .../com/cloudbees/groovy/cps/Function.java | 19 --------------- .../java/com/cloudbees/groovy/cps/Next.java | 12 +++++----- .../cloudbees/groovy/cps/impl/Constant.java | 23 +++++++++++++++++++ .../com/cloudbees/groovy/cps/impl/Plus.java | 16 +++++++++++++ .../com/cloudbees/groovy/cps/TestProgram.java | 10 ++++++++ 7 files changed, 93 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/Continuation.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/Expression.java delete mode 100644 src/main/java/com/cloudbees/groovy/cps/Function.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/Constant.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/Plus.java create mode 100644 src/test/java/com/cloudbees/groovy/cps/TestProgram.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java new file mode 100644 index 000000000..12fb5f6b3 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -0,0 +1,21 @@ +package com.cloudbees.groovy.cps; + +import static com.cloudbees.groovy.cps.Expression.NOOP; + +/** + * @author Kohsuke Kawaguchi + */ +public interface Continuation { + Next receive(Env e, Object o); + + /** + * Indicates the end of a program. + */ + final static Continuation HALT = new Continuation() { + public Next receive(Env e, Object o) { + Next next = new Next(NOOP, e, HALT); + next.yield = o; + return next; + } + }; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Expression.java b/src/main/java/com/cloudbees/groovy/cps/Expression.java new file mode 100644 index 000000000..66ead54b6 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Expression.java @@ -0,0 +1,17 @@ +package com.cloudbees.groovy.cps; + +/** + * @author Kohsuke Kawaguchi + */ +public interface Expression { + Next eval(Env e, Continuation k, Object... args); + + /** + * A function that does nothing. + */ + final static Expression NOOP = new Expression() { + public Next eval(Env e, Continuation k, Object... args) { + return k.receive(e,null); + } + }; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java deleted file mode 100644 index 0dba20f78..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cloudbees.groovy.cps; - -/** - * @author Kohsuke Kawaguchi - */ -public interface Function { - Next apply(Env e, Function k, Object... args); - - /** - * Indicates the end of a program. - */ - final static Function HALT = new Function() { - public Next apply(Env e, Function k, Object... args) { - Next next = new Next(HALT, e, k); - next.yield = args[0]; - return next; - } - }; -} diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 5f5c50b7e..5937f9b26 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,6 +1,6 @@ package com.cloudbees.groovy.cps; -import static com.cloudbees.groovy.cps.Function.*; +import static com.cloudbees.groovy.cps.Continuation.HALT; /** * Remaining computation to execute. To work around the lack of tail-call optimization @@ -8,9 +8,9 @@ * @author Kohsuke Kawaguchi */ public class Next { - Function f; + Expression f; Env e; - Function k; + Continuation k; Object[] args; /** @@ -19,14 +19,14 @@ public class Next { */ Object yield; - public Next(Function f, Env e, Function k, Object... args) { + public Next(Expression f, Env e, Continuation k, Object... args) { this.f = f; this.e = e; this.k = k; this.args = args; } - public static Next start(Function f, Object... args) { + public static Next start(Expression f, Object... args) { return new Next(f,new Env(), HALT, args); } @@ -36,7 +36,7 @@ public static Next start(Function f, Object... args) { public Next resume() { Next n = this; do { - n = n.f.apply(n.e, n.k, n.args); + n = n.f.eval(n.e, n.k, n.args); } while(n.yield==null); return n; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java b/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java new file mode 100644 index 000000000..f2d092674 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java @@ -0,0 +1,23 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Expression; +import com.cloudbees.groovy.cps.Next; + +/** + * + * + * @author Kohsuke Kawaguchi + */ +public class Constant implements Expression { + private final Object value; + + public Constant(Object value) { + this.value = value; + } + + public Next eval(Env e, Continuation k, Object... args) { + return k.receive(e,value); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Plus.java b/src/main/java/com/cloudbees/groovy/cps/impl/Plus.java new file mode 100644 index 000000000..e19a654e7 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Plus.java @@ -0,0 +1,16 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Expression; +import com.cloudbees.groovy.cps.Next; + +/** + * @author Kohsuke Kawaguchi + */ +public class Plus implements Expression { + public Next eval(Env e, Continuation k, Object... args) { + // TODO: this bogus plus operator is just a test + return k.receive(e, args[0].toString()+args[1].toString()); + } +} diff --git a/src/test/java/com/cloudbees/groovy/cps/TestProgram.java b/src/test/java/com/cloudbees/groovy/cps/TestProgram.java new file mode 100644 index 000000000..a83a7eb20 --- /dev/null +++ b/src/test/java/com/cloudbees/groovy/cps/TestProgram.java @@ -0,0 +1,10 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.Constant; + +/** + * @author Kohsuke Kawaguchi + */ +public class TestProgram { + public final Expression onePlusTwo = new Constant(1).eval(); +} From 90ba006ee20f9cb4013727c5f5fa72931fff7cc0 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 26 Jan 2014 17:47:13 -0800 Subject: [PATCH 005/932] Making real progress now. --- pom.xml | 5 ++ .../com/cloudbees/groovy/cps/Builder.java | 86 +++++++++++++++++++ .../cloudbees/groovy/cps/Continuation.java | 4 +- .../java/com/cloudbees/groovy/cps/Env.java | 14 ++- .../com/cloudbees/groovy/cps/Expression.java | 4 +- .../com/cloudbees/groovy/cps/Function.java | 55 ++++++++++++ .../java/com/cloudbees/groovy/cps/Next.java | 12 ++- .../cloudbees/groovy/cps/impl/Constant.java | 2 +- .../com/cloudbees/groovy/cps/impl/Plus.java | 16 ---- 9 files changed, 169 insertions(+), 29 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/Builder.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/Function.java delete mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/Plus.java diff --git a/pom.xml b/pom.xml index 22d440456..0d674054a 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,11 @@ groovy 1.8.5 + + com.google.guava + guava + 11.0.1 + junit junit diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java new file mode 100644 index 000000000..67bcab2b1 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -0,0 +1,86 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Kohsuke Kawaguchi + */ +public class Builder { + public Expression constant(Object o) { + return new Constant(o); + } + + public Expression sequence(final Expression exp1, final Expression exp2) { + return new Expression() { + public Next eval(Env e, final Continuation k) { + return new Next(exp1,e,new Continuation() { + public Next receive(Env e, Object _) { + return new Next(exp2,e,k); + } + }); + } + }; + } + + public Expression getLocalVariable(final String name) { + return new Expression() { + public Next eval(Env e, Continuation k) { + return k.receive(e, e.get(name)); + } + }; + } + + public Expression setLocalVariable(final String name, final Expression rhs) { + return new Expression() { + public Next eval(final Env e, final Continuation k) { + return rhs.eval(e,new Continuation() { + public Next receive(Env _, Object o) { + e.set(name,o); + return k.receive(_,o); + } + }); + } + }; + } + + public Expression _if(final Expression cond, final Expression then, final Expression els) { + return new Expression() { + public Next eval(final Env e, final Continuation k) { + return cond.eval(e,new Continuation() { + public Next receive(Env _, Object o) { + return (asBoolean(o) ? then : els).eval(e,k); + } + }); + } + }; + } + + public Expression functionCall(final String name, final Expression[] argExps) { + return new Expression() { + public Next eval(Env e, final Continuation k) { + final List args = new ArrayList(argExps.length); // this is where we build up actual arguments + + final Function f = e.resolveFunction(name); // body of the function + + Next n = null; + for (int i=argExps.length-1; i>=0; i--) { + final Next nn = n; + n = new Next(argExps[i], e, new Continuation() { + public Next receive(Env e, Object o) { + args.add(o); + if (nn!=null) + return nn; + else + return f.invoke(args,k); + } + }); + } + return n; + } + }; + } + +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 12fb5f6b3..87f05708a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -1,11 +1,13 @@ package com.cloudbees.groovy.cps; -import static com.cloudbees.groovy.cps.Expression.NOOP; +import static com.cloudbees.groovy.cps.Expression.*; /** * @author Kohsuke Kawaguchi */ public interface Continuation { + // this method cannot evaluate any expression on its own + // TODO: does 'env' makes sense here? Next receive(Env e, Object o); /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index d0940275c..a39f747e6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -1,8 +1,18 @@ package com.cloudbees.groovy.cps; /** - * For variable lookup. + * For variable lookup. This is local variables. + * * @author Kohsuke Kawaguchi */ -public class Env { +public interface Env { + /** + * Resolves functions visible at the current scope. + */ + Function resolveFunction(String name); + + Object get(String name); + void set(String name, Object value); + + } diff --git a/src/main/java/com/cloudbees/groovy/cps/Expression.java b/src/main/java/com/cloudbees/groovy/cps/Expression.java index 66ead54b6..34604178c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Expression.java +++ b/src/main/java/com/cloudbees/groovy/cps/Expression.java @@ -4,13 +4,13 @@ * @author Kohsuke Kawaguchi */ public interface Expression { - Next eval(Env e, Continuation k, Object... args); + Next eval(Env e, Continuation k); /** * A function that does nothing. */ final static Expression NOOP = new Expression() { - public Next eval(Env e, Continuation k, Object... args) { + public Next eval(Env e, Continuation k) { return k.receive(e,null); } }; diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java new file mode 100644 index 000000000..809db01e9 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -0,0 +1,55 @@ +package com.cloudbees.groovy.cps; + +import com.google.common.collect.ImmutableList; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Kohsuke Kawaguchi + */ +public class Function { + final Expression body; + final ImmutableList parameters; + + public Function(Expression body, List parameters) { + this.body = body; + this.parameters = ImmutableList.copyOf(parameters); + } + + public Next invoke(List args, Continuation k) { + return new Next(body, new EnvImpl(null,args), k); + } + + /** + * New stack frame created when calling a function. + */ + class EnvImpl implements Env { + final Object _this; + // TODO: delegate? + final Map locals = new HashMap(); + + EnvImpl(Object _this, List args) { + this._this = _this; + assert args.size()==parameters.size(); // TODO: varargs + + for (int i=0; i Date: Mon, 27 Jan 2014 13:33:26 -0500 Subject: [PATCH 006/932] More progress --- TODO.txt | 4 + pom.xml | 2 +- .../com/cloudbees/groovy/cps/Builder.java | 112 +++++++++++++++++- .../java/com/cloudbees/groovy/cps/Env.java | 7 +- .../com/cloudbees/groovy/cps/Function.java | 5 + .../java/com/cloudbees/groovy/cps/Next.java | 6 - .../com/cloudbees/groovy/cps/TestProgram.java | 22 +++- 7 files changed, 142 insertions(+), 16 deletions(-) create mode 100644 TODO.txt diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 000000000..6469d7d5e --- /dev/null +++ b/TODO.txt @@ -0,0 +1,4 @@ +- Continuation shouldn't probably take Env +- function call needs to correctly identify the receiver, + and if the receiver is synchronous, it needs to call it like one + maybe by rewriting an asynchronous function to a synchronous function that returns a 'Function' object \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0d674054a..1eeac8d4e 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ junit junit - 3.8.1 + 4.11 test diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 67bcab2b1..a9b45e2a7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps; import com.cloudbees.groovy.cps.impl.Constant; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import java.util.ArrayList; import java.util.List; @@ -9,10 +10,25 @@ * @author Kohsuke Kawaguchi */ public class Builder { + private static final Expression NOOP = new Constant(null); + + public Expression noop() { + return NOOP; + } + public Expression constant(Object o) { return new Constant(o); } + public Expression sequence(Expression... bodies) { + if (bodies.length==0) return NOOP; + + Expression e = bodies[0]; + for (int i=1; i Function + + return args.eval(e,new Continuation() { + public Next receive(Env _, Object args) { + return f.invoke((List)args,k); + } + }); + } + }); + } + }; + } + + /** + * Returns an expression that evaluates all the arguments and return it as a {@link List}. + */ + private Expression evalArgs(final Expression... argExps) { return new Expression() { public Next eval(Env e, final Continuation k) { final List args = new ArrayList(argExps.length); // this is where we build up actual arguments - final Function f = e.resolveFunction(name); // body of the function - Next n = null; - for (int i=argExps.length-1; i>=0; i--) { + for (int i = argExps.length - 1; i >= 0; i--) { final Next nn = n; n = new Next(argExps[i], e, new Continuation() { public Next receive(Env e, Object o) { args.add(o); - if (nn!=null) + if (nn != null) return nn; else - return f.invoke(args,k); + return k.receive(e,args); } }); } @@ -83,4 +182,5 @@ public Next receive(Env e, Object o) { }; } + } diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index a39f747e6..14c4ca00f 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -14,5 +14,10 @@ public interface Env { Object get(String name); void set(String name, Object value); - + /** + * Creates a new block scope, which doesn't hide current variables, but newly declared variables + * will be local to the new environment. + */ + Env newBlockScope(); + // TODO: How do we correctly assign local variables to its scope? } diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java index 809db01e9..0ff4a947a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -51,5 +51,10 @@ public Object get(String name) { public void set(String name, Object value) { locals.put(name,value); } + + public Env newBlockScope() { + // TODO + return this; + } } } diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 78c5496a7..c184cb0f0 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,7 +1,5 @@ package com.cloudbees.groovy.cps; -import static com.cloudbees.groovy.cps.Continuation.*; - /** * Remaining computation to execute. To work around the lack of tail-call optimization * @@ -24,10 +22,6 @@ public Next(Expression f, Env e, Continuation k) { this.k = k; } - public static Next start(Expression f) { - return new Next(f,new Env(), HALT); - } - /** * Resumes the execution of this program state, until it yields a value or finishes computation. */ diff --git a/src/test/java/com/cloudbees/groovy/cps/TestProgram.java b/src/test/java/com/cloudbees/groovy/cps/TestProgram.java index a83a7eb20..2e9e2886c 100644 --- a/src/test/java/com/cloudbees/groovy/cps/TestProgram.java +++ b/src/test/java/com/cloudbees/groovy/cps/TestProgram.java @@ -1,10 +1,28 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.Constant; +import org.junit.Test; /** * @author Kohsuke Kawaguchi */ public class TestProgram { - public final Expression onePlusTwo = new Constant(1).eval(); + /** + * + */ + @Test + public void test1() { + Builder b = new Builder(); + + /* + sum = 0; + for (x=0; x<10; x++) { + sum += x; + } + println sum; + */ + b.sequence( + b.setLocalVariable("sum", b.constant(0)), + b._for( b.setLocalVariable("x",b.constant(1)), null, ) + + } } From 1a0510fd3caf7490feadc1fb58f8088f2387c09d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Jan 2014 14:06:56 -0500 Subject: [PATCH 007/932] it makes sense to compile workflow methods to a regular method that immediately returns a Function. --- .../com/cloudbees/groovy/cps/Builder.java | 58 +++++++++++++++---- .../com/cloudbees/groovy/cps/Function.java | 4 +- 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index a9b45e2a7..019ed882d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -2,6 +2,8 @@ import com.cloudbees.groovy.cps.impl.Constant; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +import org.codehaus.groovy.runtime.callsite.CallSite; +import org.codehaus.groovy.runtime.callsite.CallSiteArray; import java.util.ArrayList; import java.util.List; @@ -127,27 +129,36 @@ private boolean asBoolean(Object o) { } } - /** - * Constant to represent function invocation without LHS. - */ - private static final Object NO_LHS = "NO LHS"; - /** * LHS.name(...) */ public Expression functionCall(final Expression lhs, final String name, Expression... argExps) { + final CallSite callSite = fakeCallSite(name); final Expression args = evalArgs(argExps); + return new Expression() { public Next eval(final Env e, final Continuation k) { return new Next(lhs,e, new Continuation() {// evaluate lhs public Next receive(Env _, final Object lhs) { - - // TODO: does this happen before or after the arguments are evaluated? - final Function f = null; // TODO: resolve (lhs,name) -> Function - return args.eval(e,new Continuation() { - public Next receive(Env _, Object args) { - return f.invoke((List)args,k); + public Next receive(Env _, Object _args) { + List args = (List) _args; + + Object v; + try { + v = callSite.call(lhs, args.toArray(new Object[args.size()])); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + + if (v instanceof Function) { + // if this is a workflow function, it'd return a Function object instead + // of actually executing the function, so execute it in the CPS + return ((Function)v).invoke(args,k); + } else { + // if this was a normal function, the method had just executed synchronously + return k.receive(e,v); + } } }); } @@ -156,6 +167,25 @@ public Next receive(Env _, Object args) { }; } + /** + * name(...) + */ + public Expression functionCall(final String name, Expression... argExps) { + final Expression args = evalArgs(argExps); + return new Expression() { + public Next eval(final Env e, final Continuation k) { + // TODO: does this happen before or after the arguments are evaluated? + final Function f = e.resolveFunction(name); + + return args.eval(e,new Continuation() { + public Next receive(Env _, Object args) { + return f.invoke((List)args,k); + } + }); + } + }; + } + /** * Returns an expression that evaluates all the arguments and return it as a {@link List}. */ @@ -182,5 +212,9 @@ public Next receive(Env e, Object o) { }; } - + /*TODO: specify the proper owner value (to the script that includes the call site) */ + private static CallSite fakeCallSite(String method) { + CallSiteArray csa = new CallSiteArray(Builder.class, new String[]{method}); + return csa.array[0]; + } } diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java index 0ff4a947a..da6d372b9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -18,7 +18,7 @@ public Function(Expression body, List parameters) { this.parameters = ImmutableList.copyOf(parameters); } - public Next invoke(List args, Continuation k) { + public Next invoke(List args, Continuation k) { return new Next(body, new EnvImpl(null,args), k); } @@ -30,7 +30,7 @@ class EnvImpl implements Env { // TODO: delegate? final Map locals = new HashMap(); - EnvImpl(Object _this, List args) { + EnvImpl(Object _this, List args) { this._this = _this; assert args.size()==parameters.size(); // TODO: varargs From b7eccccea2b0a34b940a2f63f7f3957f862a94c5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Jan 2014 14:47:26 -0500 Subject: [PATCH 008/932] First functioning test! --- .../com/cloudbees/groovy/cps/Builder.java | 10 +++-- .../com/cloudbees/groovy/cps/EnvImpl.java | 34 +++++++++++++++ .../com/cloudbees/groovy/cps/Function.java | 42 +++---------------- .../com/cloudbees/groovy/cps/TestProgram.java | 24 ++++++++--- src/test/java/foo.groovy | 37 ++++++++++++++++ 5 files changed, 103 insertions(+), 44 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/EnvImpl.java create mode 100644 src/test/java/foo.groovy diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 019ed882d..6dea0e71d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -129,6 +129,10 @@ private boolean asBoolean(Object o) { } } + public Expression staticCall(Class lhs, String name, Expression... argExps) { + return functionCall(constant(lhs),name,argExps); + } + /** * LHS.name(...) */ @@ -169,16 +173,16 @@ public Next receive(Env _, Object _args) { /** * name(...) + * + * TODO: is this the same as this.name(...) ? -> NO, not in closure */ public Expression functionCall(final String name, Expression... argExps) { final Expression args = evalArgs(argExps); return new Expression() { public Next eval(final Env e, final Continuation k) { - // TODO: does this happen before or after the arguments are evaluated? - final Function f = e.resolveFunction(name); - return args.eval(e,new Continuation() { public Next receive(Env _, Object args) { + final Function f = e.resolveFunction(name); return f.invoke((List)args,k); } }); diff --git a/src/main/java/com/cloudbees/groovy/cps/EnvImpl.java b/src/main/java/com/cloudbees/groovy/cps/EnvImpl.java new file mode 100644 index 000000000..49a5fec4a --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/EnvImpl.java @@ -0,0 +1,34 @@ +package com.cloudbees.groovy.cps; + +import java.util.HashMap; +import java.util.Map; + +/** + * New stack frame created when calling a function. + */ +class EnvImpl implements Env { + // TODO: delegate? + final Map locals = new HashMap(); + + EnvImpl(Object _this) { + locals.put("this",_this); + } + + public Function resolveFunction(String name) { + // TODO: + return null; + } + + public Object get(String name) { + return locals.get(name); + } + + public void set(String name, Object value) { + locals.put(name,value); + } + + public Env newBlockScope() { + // TODO + return this; + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java index da6d372b9..97c0c6fe0 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -2,9 +2,7 @@ import com.google.common.collect.ImmutableList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author Kohsuke Kawaguchi @@ -19,42 +17,14 @@ public Function(Expression body, List parameters) { } public Next invoke(List args, Continuation k) { - return new Next(body, new EnvImpl(null,args), k); - } - - /** - * New stack frame created when calling a function. - */ - class EnvImpl implements Env { - final Object _this; - // TODO: delegate? - final Map locals = new HashMap(); - - EnvImpl(Object _this, List args) { - this._this = _this; - assert args.size()==parameters.size(); // TODO: varargs - - for (int i=0; i Date: Mon, 27 Jan 2014 15:02:37 -0500 Subject: [PATCH 009/932] added a bunch of test for basic pieces --- .../com/cloudbees/groovy/cps/Builder.java | 15 +++++ .../com/cloudbees/groovy/cps/TestProgram.java | 56 +++++++++++++++---- 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 6dea0e71d..64ee40f18 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -68,6 +68,13 @@ public Next receive(Env _, Object o) { }; } + /** + * Assignment operator to a local variable, such as "x += 3" + */ + public Expression localVariableAssignOp(String name, String operator, Expression rhs) { + return setLocalVariable(name, functionCall(getLocalVariable(name),operator,rhs)); + } + /** * if (...) { ... } else { ... } */ @@ -133,6 +140,14 @@ public Expression staticCall(Class lhs, String name, Expression... argExps) { return functionCall(constant(lhs),name,argExps); } + public Expression plus(Expression lhs, Expression rhs) { + return functionCall(lhs,"plus",rhs); + } + + public Expression lessThan(Expression lhs, Expression rhs) { + return staticCall(ScriptBytecodeAdapter.class,"compareLessThan",lhs,rhs); + } + /** * LHS.name(...) */ diff --git a/src/test/java/com/cloudbees/groovy/cps/TestProgram.java b/src/test/java/com/cloudbees/groovy/cps/TestProgram.java index 502e85d5f..42d0dd2c1 100644 --- a/src/test/java/com/cloudbees/groovy/cps/TestProgram.java +++ b/src/test/java/com/cloudbees/groovy/cps/TestProgram.java @@ -10,24 +10,58 @@ public class TestProgram extends Assert { Builder b = new Builder(); + // useful fragment of expressions + Expression $x = b.getLocalVariable("x"); + Expression $y = b.getLocalVariable("y"); + + + @Test + public void constant() { + // constant 3 should evaluate to '3' + assertEquals(3, run(b.constant(3))); + } - /** - * - */ @Test - public void test1() { - Expression e = b.staticCall(ScriptBytecodeAdapter.class, "compareEqual", - b.constant(1), - b.constant(1)); - assertEquals(true,run(e)); + public void onePlusOne() { + // 1==1, aka ScriptBytecodeAdapter.compareEqual(1,1) + assertEquals(true, run( + b.staticCall(ScriptBytecodeAdapter.class, "compareEqual", + b.constant(1), + b.constant(1)))); + } + @Test + public void variable() { + // x=1; y=2; x+y => 3 + assertEquals(3, run( + b.setLocalVariable("x", b.constant(1)), + b.setLocalVariable("y", b.constant(2)), + b.plus($x, $y) + )); + } + + @Test + public void forLoop() { /* sum = 0; for (x=0; x<10; x++) { sum += x; } - println sum; + sum => 55; */ + assertEquals(45, run( + b.setLocalVariable("sum", b.constant(0)), + b._for( + b.setLocalVariable("x",b.constant(0)), + b.lessThan($x,b.constant(10)), + b.localVariableAssignOp("x", "plus", b.constant(1)), + + b.sequence(// for loop body + b.localVariableAssignOp("sum", "plus", $x) + )), + b.getLocalVariable("sum") + )); + // b.sequence( // b.setLocalVariable("sum", b.constant(0)), // b._for( b.setLocalVariable("x",b.constant(1)), null, ) @@ -35,8 +69,8 @@ public void test1() { } - private Object run(Expression e) { - Next p = new Next(e, new EnvImpl(null), Continuation.HALT); + private Object run(Expression... bodies) { + Next p = new Next(b.sequence(bodies), new EnvImpl(null), Continuation.HALT); return p.resume().yield; } } From c048a5f14fc3d321d3f90cd217fdca236aca5c20 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Jan 2014 15:07:14 -0500 Subject: [PATCH 010/932] removing Env parameter from Continuation. It's unclear what this environment is referring to. Concrete subtypes of Continuation normally has a specific environment in which the rest of the computation happens, so it shouldn't need it either. --- .../com/cloudbees/groovy/cps/Builder.java | 34 +++++++++---------- .../cloudbees/groovy/cps/Continuation.java | 7 ++-- .../com/cloudbees/groovy/cps/Expression.java | 2 +- .../cloudbees/groovy/cps/impl/Constant.java | 2 +- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 64ee40f18..8fb4c49b4 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -33,9 +33,9 @@ public Expression sequence(Expression... bodies) { public Expression sequence(final Expression exp1, final Expression exp2) { return new Expression() { - public Next eval(Env e, final Continuation k) { + public Next eval(final Env e, final Continuation k) { return new Next(exp1,e,new Continuation() { - public Next receive(Env e, Object _) { + public Next receive(Object __) { return new Next(exp2,e,k); } }); @@ -50,7 +50,7 @@ public Next receive(Env e, Object _) { public Expression getLocalVariable(final String name) { return new Expression() { public Next eval(Env e, Continuation k) { - return k.receive(e, e.get(name)); + return k.receive(e.get(name)); } }; } @@ -59,9 +59,9 @@ public Expression setLocalVariable(final String name, final Expression rhs) { return new Expression() { public Next eval(final Env e, final Continuation k) { return rhs.eval(e,new Continuation() { - public Next receive(Env _, Object o) { + public Next receive(Object o) { e.set(name,o); - return k.receive(_,o); + return k.receive(o); } }); } @@ -82,7 +82,7 @@ public Expression _if(final Expression cond, final Expression then, final Expres return new Expression() { public Next eval(final Env e, final Continuation k) { return cond.eval(e,new Continuation() { - public Next receive(Env _, Object o) { + public Next receive(Object o) { return (asBoolean(o) ? then : els).eval(e,k); } }); @@ -101,19 +101,19 @@ public Next eval(Env _e, final Continuation loopEnd) { final Continuation loopHead = new Continuation() { final Continuation _loopHead = this; // because 'loopHead' cannot be referenced from within the definition - public Next receive(Env _, Object __) { + public Next receive(Object __) { return new Next(e2,e,new Continuation() {// evaluate e2 - public Next receive(Env _, Object v2) { + public Next receive(Object v2) { if (asBoolean(v2)) { // loop return new Next(body,e,new Continuation() { - public Next receive(Env _, Object o) { + public Next receive(Object o) { return new Next(e3,e,_loopHead); } }); } else { // exit loop - return loopEnd.receive(_,null); + return loopEnd.receive(null); } } }); @@ -158,9 +158,9 @@ public Expression functionCall(final Expression lhs, final String name, Expressi return new Expression() { public Next eval(final Env e, final Continuation k) { return new Next(lhs,e, new Continuation() {// evaluate lhs - public Next receive(Env _, final Object lhs) { + public Next receive(final Object lhs) { return args.eval(e,new Continuation() { - public Next receive(Env _, Object _args) { + public Next receive(Object _args) { List args = (List) _args; Object v; @@ -176,7 +176,7 @@ public Next receive(Env _, Object _args) { return ((Function)v).invoke(args,k); } else { // if this was a normal function, the method had just executed synchronously - return k.receive(e,v); + return k.receive(v); } } }); @@ -196,7 +196,7 @@ public Expression functionCall(final String name, Expression... argExps) { return new Expression() { public Next eval(final Env e, final Continuation k) { return args.eval(e,new Continuation() { - public Next receive(Env _, Object args) { + public Next receive(Object args) { final Function f = e.resolveFunction(name); return f.invoke((List)args,k); } @@ -210,19 +210,19 @@ public Next receive(Env _, Object args) { */ private Expression evalArgs(final Expression... argExps) { return new Expression() { - public Next eval(Env e, final Continuation k) { + public Next eval(final Env e, final Continuation k) { final List args = new ArrayList(argExps.length); // this is where we build up actual arguments Next n = null; for (int i = argExps.length - 1; i >= 0; i--) { final Next nn = n; n = new Next(argExps[i], e, new Continuation() { - public Next receive(Env e, Object o) { + public Next receive(Object o) { args.add(o); if (nn != null) return nn; else - return k.receive(e,args); + return k.receive(args); } }); } diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 87f05708a..527d13143 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -7,15 +7,14 @@ */ public interface Continuation { // this method cannot evaluate any expression on its own - // TODO: does 'env' makes sense here? - Next receive(Env e, Object o); + Next receive(Object o); /** * Indicates the end of a program. */ final static Continuation HALT = new Continuation() { - public Next receive(Env e, Object o) { - Next next = new Next(NOOP, e, HALT); + public Next receive(Object o) { + Next next = new Next(NOOP, null, HALT); next.yield = o; return next; } diff --git a/src/main/java/com/cloudbees/groovy/cps/Expression.java b/src/main/java/com/cloudbees/groovy/cps/Expression.java index 34604178c..70ecf4fab 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Expression.java +++ b/src/main/java/com/cloudbees/groovy/cps/Expression.java @@ -11,7 +11,7 @@ public interface Expression { */ final static Expression NOOP = new Expression() { public Next eval(Env e, Continuation k) { - return k.receive(e,null); + return k.receive(null); } }; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java b/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java index 8d733e86c..50a91ff9e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java @@ -18,6 +18,6 @@ public Constant(Object value) { } public Next eval(Env e, Continuation k) { - return k.receive(e,value); + return k.receive(value); } } From 6a568ad7c18e546a63dd8dcb87716fd21ab12712 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Jan 2014 15:09:55 -0500 Subject: [PATCH 011/932] clean up --- .../com/cloudbees/groovy/cps/Builder.java | 2 +- .../com/cloudbees/groovy/cps/TestProgram.java | 34 ++++++++----------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 8fb4c49b4..1f8865ca0 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -93,7 +93,7 @@ public Next receive(Object o) { /** * for (e1; e2; e3) { ... } */ - public Expression _for(final Expression e1, final Expression e2, final Expression e3, final Expression body) { + public Expression forLoop(final Expression e1, final Expression e2, final Expression e3, final Expression body) { return new Expression() { public Next eval(Env _e, final Continuation loopEnd) { final Env e = _e.newBlockScope(); // a for-loop creates a new scope for variables declared in e1,e2, & e3 diff --git a/src/test/java/com/cloudbees/groovy/cps/TestProgram.java b/src/test/java/com/cloudbees/groovy/cps/TestProgram.java index 42d0dd2c1..c07476faf 100644 --- a/src/test/java/com/cloudbees/groovy/cps/TestProgram.java +++ b/src/test/java/com/cloudbees/groovy/cps/TestProgram.java @@ -15,24 +15,24 @@ public class TestProgram extends Assert { Expression $y = b.getLocalVariable("y"); + // 3 => 3 @Test public void constant() { - // constant 3 should evaluate to '3' assertEquals(3, run(b.constant(3))); } + // 1==1, aka ScriptBytecodeAdapter.compareEqual(1,1) => true @Test public void onePlusOne() { - // 1==1, aka ScriptBytecodeAdapter.compareEqual(1,1) assertEquals(true, run( b.staticCall(ScriptBytecodeAdapter.class, "compareEqual", b.constant(1), b.constant(1)))); } + // x=1; y=2; x+y => 3 @Test public void variable() { - // x=1; y=2; x+y => 3 assertEquals(3, run( b.setLocalVariable("x", b.constant(1)), b.setLocalVariable("y", b.constant(2)), @@ -40,33 +40,27 @@ public void variable() { )); } + /* + sum = 0; + for (x=0; x<10; x++) { + sum += x; + } + sum => 45; + */ @Test public void forLoop() { - /* - sum = 0; - for (x=0; x<10; x++) { - sum += x; - } - sum => 55; - */ assertEquals(45, run( b.setLocalVariable("sum", b.constant(0)), - b._for( - b.setLocalVariable("x",b.constant(0)), - b.lessThan($x,b.constant(10)), + b.forLoop( + b.setLocalVariable("x", b.constant(0)), + b.lessThan($x, b.constant(10)), b.localVariableAssignOp("x", "plus", b.constant(1)), b.sequence(// for loop body - b.localVariableAssignOp("sum", "plus", $x) + b.localVariableAssignOp("sum", "plus", $x) )), b.getLocalVariable("sum") )); - -// b.sequence( -// b.setLocalVariable("sum", b.constant(0)), -// b._for( b.setLocalVariable("x",b.constant(1)), null, ) -// - } private Object run(Expression... bodies) { From 14321ee499d7a83d9efed1f02cd3b313afca93d2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Jan 2014 15:11:13 -0500 Subject: [PATCH 012/932] next set of TODOs --- TODO.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TODO.txt b/TODO.txt index 6469d7d5e..4811e83fd 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,4 +1,4 @@ -- Continuation shouldn't probably take Env -- function call needs to correctly identify the receiver, - and if the receiver is synchronous, it needs to call it like one - maybe by rewriting an asynchronous function to a synchronous function that returns a 'Function' object \ No newline at end of file +- exception handling +- block creates a new scope +- variables are resolved lexically +- workflow functions calling each other From bba153a66352a588c737b7ba35d7531cdb5ac1aa Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Jan 2014 15:24:20 -0500 Subject: [PATCH 013/932] Turned Env back into a concrete class --- .../com/cloudbees/groovy/cps/Builder.java | 47 ++++++++++++------- .../java/com/cloudbees/groovy/cps/Env.java | 33 ++++++++++--- .../com/cloudbees/groovy/cps/EnvImpl.java | 34 -------------- .../com/cloudbees/groovy/cps/Function.java | 6 ++- .../cps/{TestProgram.java => BasicTest.java} | 27 ++++++++++- 5 files changed, 84 insertions(+), 63 deletions(-) delete mode 100644 src/main/java/com/cloudbees/groovy/cps/EnvImpl.java rename src/test/java/com/cloudbees/groovy/cps/{TestProgram.java => BasicTest.java} (64%) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 1f8865ca0..2253c8634 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -186,24 +186,24 @@ public Next receive(Object _args) { }; } - /** - * name(...) - * - * TODO: is this the same as this.name(...) ? -> NO, not in closure - */ - public Expression functionCall(final String name, Expression... argExps) { - final Expression args = evalArgs(argExps); - return new Expression() { - public Next eval(final Env e, final Continuation k) { - return args.eval(e,new Continuation() { - public Next receive(Object args) { - final Function f = e.resolveFunction(name); - return f.invoke((List)args,k); - } - }); - } - }; - } +// /** +// * name(...) +// * +// * TODO: is this the same as this.name(...) ? -> NO, not in closure +// */ +// public Expression functionCall(final String name, Expression... argExps) { +// final Expression args = evalArgs(argExps); +// return new Expression() { +// public Next eval(final Env e, final Continuation k) { +// return args.eval(e,new Continuation() { +// public Next receive(Object args) { +// final Function f = e.resolveFunction(name); +// return f.invoke((List)args,k); +// } +// }); +// } +// }; +// } /** * Returns an expression that evaluates all the arguments and return it as a {@link List}. @@ -231,6 +231,17 @@ public Next receive(Object o) { }; } + /** + * return exp; + */ + public Expression _return(final Expression exp) { + return new Expression() { + public Next eval(Env e, Continuation k) { + return new Next(exp,e, e.returnAddress); + } + }; + } + /*TODO: specify the proper owner value (to the script that includes the call site) */ private static CallSite fakeCallSite(String method) { CallSiteArray csa = new CallSiteArray(Builder.class, new String[]{method}); diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index 14c4ca00f..55a29a9a8 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -1,23 +1,42 @@ package com.cloudbees.groovy.cps; +import java.util.HashMap; +import java.util.Map; + /** * For variable lookup. This is local variables. * * @author Kohsuke Kawaguchi */ -public interface Env { +public class Env { + // TODO: How do we correctly assign local variables to its scope? + + // TODO: delegate? + final Map locals = new HashMap(); + /** - * Resolves functions visible at the current scope. + * If this environment is created for a function call, this field retains the return address. */ - Function resolveFunction(String name); + protected Continuation returnAddress; - Object get(String name); - void set(String name, Object value); + Env(Object _this) { + locals.put("this",_this); + } + + public Object get(String name) { + return locals.get(name); + } + + public void set(String name, Object value) { + locals.put(name,value); + } /** * Creates a new block scope, which doesn't hide current variables, but newly declared variables * will be local to the new environment. */ - Env newBlockScope(); - // TODO: How do we correctly assign local variables to its scope? + public Env newBlockScope() { + // TODO + return this; + } } diff --git a/src/main/java/com/cloudbees/groovy/cps/EnvImpl.java b/src/main/java/com/cloudbees/groovy/cps/EnvImpl.java deleted file mode 100644 index 49a5fec4a..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/EnvImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cloudbees.groovy.cps; - -import java.util.HashMap; -import java.util.Map; - -/** - * New stack frame created when calling a function. - */ -class EnvImpl implements Env { - // TODO: delegate? - final Map locals = new HashMap(); - - EnvImpl(Object _this) { - locals.put("this",_this); - } - - public Function resolveFunction(String name) { - // TODO: - return null; - } - - public Object get(String name) { - return locals.get(name); - } - - public void set(String name, Object value) { - locals.put(name,value); - } - - public Env newBlockScope() { - // TODO - return this; - } -} diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java index 97c0c6fe0..ca595af36 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -11,19 +11,21 @@ public class Function { final Expression body; final ImmutableList parameters; - public Function(Expression body, List parameters) { + public Function(List parameters, Expression body) { this.body = body; this.parameters = ImmutableList.copyOf(parameters); } public Next invoke(List args, Continuation k) { - EnvImpl e = new EnvImpl(null); + Env e = new Env(null); assert args.size()== parameters.size(); // TODO: varargs for (int i=0; i< parameters.size(); i++) { e.set(parameters.get(i), args.get(i)); } + e.returnAddress = k; + return new Next(body, e, k); } diff --git a/src/test/java/com/cloudbees/groovy/cps/TestProgram.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java similarity index 64% rename from src/test/java/com/cloudbees/groovy/cps/TestProgram.java rename to src/test/java/com/cloudbees/groovy/cps/BasicTest.java index c07476faf..df733fac6 100644 --- a/src/test/java/com/cloudbees/groovy/cps/TestProgram.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -4,15 +4,18 @@ import org.junit.Assert; import org.junit.Test; +import static java.util.Arrays.*; + /** * @author Kohsuke Kawaguchi */ -public class TestProgram extends Assert { +public class BasicTest extends Assert { Builder b = new Builder(); // useful fragment of expressions Expression $x = b.getLocalVariable("x"); Expression $y = b.getLocalVariable("y"); + Expression $z = b.getLocalVariable("z"); // 3 => 3 @@ -63,8 +66,28 @@ public void forLoop() { )); } + @Test + public void asyncCallingAsync() { + class Op { + public Function add(int x, int y) { + return new Function(asList("x", "y"), + b.sequence( + b.setLocalVariable("z",b.functionCall($x,"plus",$y)), + b._return($z) + )); + } + } + + // z=5; new Op().add(1,2)+z => 8 + assertEquals(3, run( + b.setLocalVariable("z", b.constant(0)), // part of the test is to ensure this 'z' is separated from 'z' in the add function + b.plus( + b.functionCall(b.constant(new Op()), "add", b.constant(1), b.constant(2)), + $z))); + } + private Object run(Expression... bodies) { - Next p = new Next(b.sequence(bodies), new EnvImpl(null), Continuation.HALT); + Next p = new Next(b.sequence(bodies), new Env(null), Continuation.HALT); return p.resume().yield; } } From 9099adfb2bf7a8883757ee17692064d0ec83b603 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Jan 2014 15:26:26 -0500 Subject: [PATCH 014/932] testing the return method separately --- .../com/cloudbees/groovy/cps/BasicTest.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index df733fac6..7f87ef41c 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -66,6 +66,21 @@ public void forLoop() { )); } + /** + * Makes sure the return statement prevents the rest of the code from executing. + * + * x=0; return x; x+=1; => 0 + */ + @Test + public void returnStatement() { + assertEquals(0, run( + b.setLocalVariable("x", b.constant(0)), + b._return($x), + b.localVariableAssignOp("x", "plus", b.constant(1)), + b.plus($x, $y) + )); + } + @Test public void asyncCallingAsync() { class Op { @@ -87,7 +102,9 @@ public Function add(int x, int y) { } private Object run(Expression... bodies) { - Next p = new Next(b.sequence(bodies), new Env(null), Continuation.HALT); + Env e = new Env(null); + e.returnAddress = Continuation.HALT; + Next p = new Next(b.sequence(bodies), e, Continuation.HALT); return p.resume().yield; } } From 99524565b081f3cc9b6fe5873e3b42e86d66088b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Jan 2014 15:30:14 -0500 Subject: [PATCH 015/932] testing the if statement --- .../com/cloudbees/groovy/cps/Builder.java | 4 +-- .../com/cloudbees/groovy/cps/BasicTest.java | 29 +++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 2253c8634..daa03a440 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -78,7 +78,7 @@ public Expression localVariableAssignOp(String name, String operator, Expression /** * if (...) { ... } else { ... } */ - public Expression _if(final Expression cond, final Expression then, final Expression els) { + public Expression if_(final Expression cond, final Expression then, final Expression els) { return new Expression() { public Next eval(final Env e, final Continuation k) { return cond.eval(e,new Continuation() { @@ -234,7 +234,7 @@ public Next receive(Object o) { /** * return exp; */ - public Expression _return(final Expression exp) { + public Expression return_(final Expression exp) { return new Expression() { public Next eval(Env e, Continuation k) { return new Next(exp,e, e.returnAddress); diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 7f87ef41c..0879da969 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -75,12 +75,37 @@ public void forLoop() { public void returnStatement() { assertEquals(0, run( b.setLocalVariable("x", b.constant(0)), - b._return($x), + b.return_($x), b.localVariableAssignOp("x", "plus", b.constant(1)), b.plus($x, $y) )); } + /** + * x = 0; + * if (true) { + * x = 1; + * } else { + * x = 2; + * } + * x => 1 + */ + @Test + public void ifTrue() { + if_(true, 1); + if_(false, 2); + } + + private void if_(boolean cond, int expected) { + assertEquals(expected, run( + b.setLocalVariable("x", b.constant(0)), + b.if_( b.constant(cond), + b.setLocalVariable("x",b.constant(1)), + b.setLocalVariable("x",b.constant(2))), + $x + )); + } + @Test public void asyncCallingAsync() { class Op { @@ -88,7 +113,7 @@ public Function add(int x, int y) { return new Function(asList("x", "y"), b.sequence( b.setLocalVariable("z",b.functionCall($x,"plus",$y)), - b._return($z) + b.return_($z) )); } } From 329abf7cd33fd9a3b797fccbb1bc86b987bc3b63 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Jan 2014 16:31:28 -0500 Subject: [PATCH 016/932] added constructor call --- TODO.txt | 8 +++++- .../com/cloudbees/groovy/cps/Builder.java | 28 +++++++++++++++++++ .../com/cloudbees/groovy/cps/BasicTest.java | 25 +++++++++++++++-- 3 files changed, 58 insertions(+), 3 deletions(-) diff --git a/TODO.txt b/TODO.txt index 4811e83fd..3134bc6ad 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,4 +1,10 @@ - exception handling + - both throwing and catching - block creates a new scope - variables are resolved lexically -- workflow functions calling each other +- async functions calling each other + + +Tests to be written: + - verify a proper method overload resolution + - trying to make constructor a workflow should be detected and rejected \ No newline at end of file diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index daa03a440..a434ac2e3 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -205,6 +205,34 @@ public Next receive(Object _args) { // }; // } + /** + * Object instantiation. + */ + public Expression new_(final Class type, Expression... argExps) { + final CallSite callSite = fakeCallSite(""); + final Expression args = evalArgs(argExps); + + return new Expression() { + public Next eval(final Env e, final Continuation k) { + return args.eval(e,new Continuation() { + public Next receive(Object _args) { + List args = (List) _args; + + Object v; + try { + v = callSite.callConstructor(type, args.toArray(new Object[args.size()])); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + + // constructor cannot be an asynchronous function + return k.receive(v); + } + }); + } + }; + } + /** * Returns an expression that evaluates all the arguments and return it as a {@link List}. */ diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 0879da969..afa286758 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -126,10 +126,31 @@ public Function add(int x, int y) { $z))); } - private Object run(Expression... bodies) { + public static class InstantiationTest { + int v; + public InstantiationTest(int x, int y) { + v = x+y; + } + public InstantiationTest(int x) { + v = x; + } + } + + @Test + public void newInstance() { + InstantiationTest v; + + v = run(b.new_(InstantiationTest.class, b.constant(3))); + assertEquals(3, v.v); + + v = run(b.new_(InstantiationTest.class, b.constant(3), b.constant(4))); + assertEquals(7, v.v); + } + + private T run(Expression... bodies) { Env e = new Env(null); e.returnAddress = Continuation.HALT; Next p = new Next(b.sequence(bodies), e, Continuation.HALT); - return p.resume().yield; + return (T)p.resume().yield; } } From 2428fdd72dc4b088f3139e05c5a7c7d44b8f6acd Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Jan 2014 19:13:12 -0500 Subject: [PATCH 017/932] reintroduced 'Env' interface for chaining This is a prep work for exception handling --- TODO.txt | 3 +- .../cloudbees/groovy/cps/BlockScopeEnv.java | 35 ++++++++++++++++++ .../com/cloudbees/groovy/cps/Builder.java | 9 ++--- .../com/cloudbees/groovy/cps/Constant.java | 18 +++++++++ .../java/com/cloudbees/groovy/cps/Env.java | 34 +++-------------- .../com/cloudbees/groovy/cps/Function.java | 6 +-- .../cloudbees/groovy/cps/FunctionCallEnv.java | 37 +++++++++++++++++++ .../com/cloudbees/groovy/cps/ProxyEnv.java | 28 ++++++++++++++ .../cloudbees/groovy/cps/impl/Constant.java | 23 ------------ .../com/cloudbees/groovy/cps/BasicTest.java | 3 +- 10 files changed, 133 insertions(+), 63 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/BlockScopeEnv.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/Constant.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java delete mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/Constant.java diff --git a/TODO.txt b/TODO.txt index 3134bc6ad..16756063e 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,10 +1,11 @@ - exception handling - both throwing and catching + - I can make it a part of Env -> requires an interface and chaining + - or I can make it a separate parameter - block creates a new scope - variables are resolved lexically - async functions calling each other - Tests to be written: - verify a proper method overload resolution - trying to make constructor a workflow should be detected and rejected \ No newline at end of file diff --git a/src/main/java/com/cloudbees/groovy/cps/BlockScopeEnv.java b/src/main/java/com/cloudbees/groovy/cps/BlockScopeEnv.java new file mode 100644 index 000000000..707457c4e --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/BlockScopeEnv.java @@ -0,0 +1,35 @@ +package com.cloudbees.groovy.cps; + +import java.util.HashMap; +import java.util.Map; + +/** + * {@link Env} for a new block. + * + * @author Kohsuke Kawaguchi + */ +class BlockScopeEnv extends ProxyEnv { + private final Map locals = new HashMap(); + + public BlockScopeEnv(Env parent) { + super(parent); + } + + public void declareVariable(String name) { + locals.put(name,null); + } + + public Object getLocalVariable(String name) { + if (locals.containsKey(name)) + return locals.get(name); + else + return parent.getLocalVariable(name); + } + + public void setLocalVariable(String name, Object value) { + if (locals.containsKey(name)) + locals.put(name, value); + else + parent.setLocalVariable(name, value); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index a434ac2e3..3b911c0ea 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -1,6 +1,5 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.Constant; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; @@ -50,7 +49,7 @@ public Next receive(Object __) { public Expression getLocalVariable(final String name) { return new Expression() { public Next eval(Env e, Continuation k) { - return k.receive(e.get(name)); + return k.receive(e.getLocalVariable(name)); } }; } @@ -60,7 +59,7 @@ public Expression setLocalVariable(final String name, final Expression rhs) { public Next eval(final Env e, final Continuation k) { return rhs.eval(e,new Continuation() { public Next receive(Object o) { - e.set(name,o); + e.setLocalVariable(name, o); return k.receive(o); } }); @@ -96,7 +95,7 @@ public Next receive(Object o) { public Expression forLoop(final Expression e1, final Expression e2, final Expression e3, final Expression body) { return new Expression() { public Next eval(Env _e, final Continuation loopEnd) { - final Env e = _e.newBlockScope(); // a for-loop creates a new scope for variables declared in e1,e2, & e3 + final Env e = new BlockScopeEnv(_e); // a for-loop creates a new scope for variables declared in e1,e2, & e3 final Continuation loopHead = new Continuation() { final Continuation _loopHead = this; // because 'loopHead' cannot be referenced from within the definition @@ -265,7 +264,7 @@ public Next receive(Object o) { public Expression return_(final Expression exp) { return new Expression() { public Next eval(Env e, Continuation k) { - return new Next(exp,e, e.returnAddress); + return new Next(exp,e, e.getReturnAddress()); } }; } diff --git a/src/main/java/com/cloudbees/groovy/cps/Constant.java b/src/main/java/com/cloudbees/groovy/cps/Constant.java new file mode 100644 index 000000000..cc8406036 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Constant.java @@ -0,0 +1,18 @@ +package com.cloudbees.groovy.cps; + +/** + * + * + * @author Kohsuke Kawaguchi + */ +class Constant implements Expression { + private final Object value; + + public Constant(Object value) { + this.value = value; + } + + public Next eval(Env e, Continuation k) { + return k.receive(value); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index 55a29a9a8..e7ffe6f04 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -1,42 +1,20 @@ package com.cloudbees.groovy.cps; -import java.util.HashMap; -import java.util.Map; - /** * For variable lookup. This is local variables. * * @author Kohsuke Kawaguchi */ -public class Env { +public interface Env { // TODO: How do we correctly assign local variables to its scope? - // TODO: delegate? - final Map locals = new HashMap(); - - /** - * If this environment is created for a function call, this field retains the return address. - */ - protected Continuation returnAddress; - - Env(Object _this) { - locals.put("this",_this); - } - - public Object get(String name) { - return locals.get(name); - } + void declareVariable(String name); - public void set(String name, Object value) { - locals.put(name,value); - } + Object getLocalVariable(String name); + void setLocalVariable(String name, Object value); /** - * Creates a new block scope, which doesn't hide current variables, but newly declared variables - * will be local to the new environment. + * Where should the return statement return to? */ - public Env newBlockScope() { - // TODO - return this; - } + Continuation getReturnAddress(); } diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java index ca595af36..50269c0c5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -17,15 +17,13 @@ public Function(List parameters, Expression body) { } public Next invoke(List args, Continuation k) { - Env e = new Env(null); + Env e = new FunctionCallEnv(null,k); assert args.size()== parameters.size(); // TODO: varargs for (int i=0; i< parameters.size(); i++) { - e.set(parameters.get(i), args.get(i)); + e.setLocalVariable(parameters.get(i), args.get(i)); } - e.returnAddress = k; - return new Next(body, e, k); } diff --git a/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java b/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java new file mode 100644 index 000000000..944428914 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java @@ -0,0 +1,37 @@ +package com.cloudbees.groovy.cps; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author Kohsuke Kawaguchi + */ +class FunctionCallEnv implements Env { + // TODO: How do we correctly assign local variables to its scope? + + // TODO: delegate? + final Map locals = new HashMap(); + + private final Continuation returnAddress; + + FunctionCallEnv(Object _this, Continuation returnAddress) { + locals.put("this",_this); + this.returnAddress = returnAddress; + } + + public void declareVariable(String name) { + // no-op + } + + public Object getLocalVariable(String name) { + return locals.get(name); + } + + public void setLocalVariable(String name, Object value) { + locals.put(name,value); + } + + public Continuation getReturnAddress() { + return returnAddress; + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java b/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java new file mode 100644 index 000000000..7dc1863e6 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java @@ -0,0 +1,28 @@ +package com.cloudbees.groovy.cps; + +/** + * @author Kohsuke Kawaguchi + */ +abstract class ProxyEnv implements Env { + protected final Env parent; + + protected ProxyEnv(Env parent) { + this.parent = parent; + } + + public void declareVariable(String name) { + parent.declareVariable(name); + } + + public Object getLocalVariable(String name) { + return parent.getLocalVariable(name); + } + + public void setLocalVariable(String name, Object value) { + parent.setLocalVariable(name, value); + } + + public Continuation getReturnAddress() { + return parent.getReturnAddress(); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java b/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java deleted file mode 100644 index 50a91ff9e..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cloudbees.groovy.cps.impl; - -import com.cloudbees.groovy.cps.Continuation; -import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.Expression; -import com.cloudbees.groovy.cps.Next; - -/** - * - * - * @author Kohsuke Kawaguchi - */ -public class Constant implements Expression { - private final Object value; - - public Constant(Object value) { - this.value = value; - } - - public Next eval(Env e, Continuation k) { - return k.receive(value); - } -} diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index afa286758..3539179a1 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -148,8 +148,7 @@ public void newInstance() { } private T run(Expression... bodies) { - Env e = new Env(null); - e.returnAddress = Continuation.HALT; + Env e = new FunctionCallEnv(null,Continuation.HALT); Next p = new Next(b.sequence(bodies), e, Continuation.HALT); return (T)p.resume().yield; } From 3c8ed89e069272a618a0c6c47396cf20b534e315 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 27 Jan 2014 19:21:29 -0500 Subject: [PATCH 018/932] paving the way for exception handling --- .../com/cloudbees/groovy/cps/Builder.java | 2 +- .../java/com/cloudbees/groovy/cps/Env.java | 5 ++++ .../com/cloudbees/groovy/cps/Function.java | 4 +-- .../cloudbees/groovy/cps/FunctionCallEnv.java | 27 +++++++++++++++++-- .../com/cloudbees/groovy/cps/ProxyEnv.java | 4 +++ .../com/cloudbees/groovy/cps/BasicTest.java | 2 +- 6 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 3b911c0ea..83529568d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -172,7 +172,7 @@ public Next receive(Object _args) { if (v instanceof Function) { // if this is a workflow function, it'd return a Function object instead // of actually executing the function, so execute it in the CPS - return ((Function)v).invoke(args,k); + return ((Function)v).invoke(e,args,k); } else { // if this was a normal function, the method had just executed synchronously return k.receive(v); diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index e7ffe6f04..1b45de08b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -17,4 +17,9 @@ public interface Env { * Where should the return statement return to? */ Continuation getReturnAddress(); + + /** + * Finds the exception handler that catches a {@link Throwable} instance of this type. + */ + Continuation getExceptionHandler(Class type); } diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java index 50269c0c5..1e2abbbdc 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -16,8 +16,8 @@ public Function(List parameters, Expression body) { this.parameters = ImmutableList.copyOf(parameters); } - public Next invoke(List args, Continuation k) { - Env e = new FunctionCallEnv(null,k); + public Next invoke(Env caller, List args, Continuation k) { + Env e = new FunctionCallEnv(caller, null,k); assert args.size()== parameters.size(); // TODO: varargs for (int i=0; i< parameters.size(); i++) { diff --git a/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java b/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java index 944428914..547c45777 100644 --- a/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java @@ -14,9 +14,21 @@ class FunctionCallEnv implements Env { private final Continuation returnAddress; - FunctionCallEnv(Object _this, Continuation returnAddress) { - locals.put("this",_this); + /** + * Caller environment, used for throwing an excception. + * + * Can be null if there's no caller. + */ + private final Env caller; + + /** + * @param caller + * The environment of the call site. Can be null but only if the caller is outside CPS execution. + */ + FunctionCallEnv(Env caller, Object _this, Continuation returnAddress) { + this.caller = caller; this.returnAddress = returnAddress; + locals.put("this",_this); } public void declareVariable(String name) { @@ -34,4 +46,15 @@ public void setLocalVariable(String name, Object value) { public Continuation getReturnAddress() { return returnAddress; } + + public Continuation getExceptionHandler(Class type) { + if (caller==null) { + // TODO: maybe define a mechanism so that the resume() or start() kinda method will return + // by having this exception thrown? + return Continuation.HALT; + } else { + // propagate the exception to the caller + return caller.getExceptionHandler(type); + } + } } diff --git a/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java b/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java index 7dc1863e6..ac4c78502 100644 --- a/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java @@ -25,4 +25,8 @@ public void setLocalVariable(String name, Object value) { public Continuation getReturnAddress() { return parent.getReturnAddress(); } + + public Continuation getExceptionHandler(Class type) { + return parent.getExceptionHandler(type); + } } diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 3539179a1..57fdcb35b 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -148,7 +148,7 @@ public void newInstance() { } private T run(Expression... bodies) { - Env e = new FunctionCallEnv(null,Continuation.HALT); + Env e = new FunctionCallEnv(null,null,Continuation.HALT); Next p = new Next(b.sequence(bodies), e, Continuation.HALT); return (T)p.resume().yield; } From 68cd6f29282006748299486bac6f8bf04853c4c6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 28 Jan 2014 08:02:46 -0500 Subject: [PATCH 019/932] Very simple exception handling is now working. --- TODO.txt | 1 + .../com/cloudbees/groovy/cps/Builder.java | 72 +++++++++++++++++-- .../cloudbees/groovy/cps/CatchExpression.java | 32 +++++++++ .../java/com/cloudbees/groovy/cps/Env.java | 4 ++ .../com/cloudbees/groovy/cps/TryBlockEnv.java | 33 +++++++++ .../com/cloudbees/groovy/cps/BasicTest.java | 28 ++++++++ 6 files changed, 166 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/CatchExpression.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/TryBlockEnv.java diff --git a/TODO.txt b/TODO.txt index 16756063e..1716c5381 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,3 +1,4 @@ +- property access - exception handling - both throwing and catching - I can make it a part of Env -> requires an interface and chaining diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 83529568d..0cdc1582c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -5,16 +5,19 @@ import org.codehaus.groovy.runtime.callsite.CallSiteArray; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import static java.util.Arrays.*; + /** * @author Kohsuke Kawaguchi */ public class Builder { - private static final Expression NOOP = new Constant(null); + private static final Expression NULL = new Constant(null); - public Expression noop() { - return NOOP; + public Expression null_() { + return NULL; } public Expression constant(Object o) { @@ -22,7 +25,7 @@ public Expression constant(Object o) { } public Expression sequence(Expression... bodies) { - if (bodies.length==0) return NOOP; + if (bodies.length==0) return NULL; Expression e = bodies[0]; for (int i=1; i catches) { + return new Expression() { + public Next eval(final Env e, final Continuation k) { + final TryBlockEnv f = new TryBlockEnv(e); + for (final CatchExpression c : catches) { + f.addHandler(c.type, new Continuation() { + public Next receive(Object t) { + BlockScopeEnv b = new BlockScopeEnv(e); + b.declareVariable(c.name); + b.setLocalVariable(c.name, t); + + return new Next(c.handler, b, k); + } + }); + } + + // evaluate the body with the new environment + return new Next(body,f,k); + } + }; + } + + /** + * throw exp; + */ + public Expression throw_(final Expression exp) { + return new Expression() { + public Next eval(final Env e, Continuation k) { + return new Next(exp,e,new Continuation() { + public Next receive(Object t) { + if (t==null) { + t = new NullPointerException(); + } + // TODO: fake the stack trace information + // TODO: what if 't' is not Throwable? + + Continuation v = e.getExceptionHandler(Throwable.class.cast(t).getClass()); + return v.receive(t); + } + }); + } + }; + } + + private boolean asBoolean(Object o) { try { return (Boolean)ScriptBytecodeAdapter.asType(o,Boolean.class); @@ -236,6 +297,9 @@ public Next receive(Object _args) { * Returns an expression that evaluates all the arguments and return it as a {@link List}. */ private Expression evalArgs(final Expression... argExps) { + if (argExps.length==0) // no arguments to evaluate + return new Constant(Collections.emptyList()); + return new Expression() { public Next eval(final Env e, final Continuation k) { final List args = new ArrayList(argExps.length); // this is where we build up actual arguments diff --git a/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java b/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java new file mode 100644 index 000000000..87e01910a --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java @@ -0,0 +1,32 @@ +package com.cloudbees.groovy.cps; + +import java.util.List; + +/** + * Catch block in a try/catch statement. + * + * @author Kohsuke Kawaguchi + * @see Builder#tryCatch(Expression, List) + */ +public class CatchExpression { + /** + * Type of the exception to catch. + */ + public final Class type; + + /** + * Name of the variable that receives the exception. + */ + public final String name; + + /** + * Code that executes up on receiving an exception. + */ + public final Expression handler; + + public CatchExpression(Class type, String name, Expression handler) { + this.name = name; + this.handler = handler; + this.type = type; + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index 1b45de08b..12986124a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -20,6 +20,10 @@ public interface Env { /** * Finds the exception handler that catches a {@link Throwable} instance of this type. + * + * @return + * never null. Even if there's no user-specified exception handler, the default 'unhandled exception handler' + * must be returned. */ Continuation getExceptionHandler(Class type); } diff --git a/src/main/java/com/cloudbees/groovy/cps/TryBlockEnv.java b/src/main/java/com/cloudbees/groovy/cps/TryBlockEnv.java new file mode 100644 index 000000000..030aa3afa --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/TryBlockEnv.java @@ -0,0 +1,33 @@ +package com.cloudbees.groovy.cps; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Map.Entry; + +/** + * @author Kohsuke Kawaguchi + */ +class TryBlockEnv extends ProxyEnv { + private final Map handlers = new LinkedHashMap(); + + TryBlockEnv(Env parent) { + super(parent); + } + + /** + * Handlers can be only added immediately after instantiation. + */ + void addHandler(Class type, Continuation k) { + handlers.put(type,k); + } + + @Override + public Continuation getExceptionHandler(Class type) { + for (Entry e : handlers.entrySet()) { + if (e.getKey().isAssignableFrom(type)) + return e.getValue(); + } + + return super.getExceptionHandler(type); + } +} diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 57fdcb35b..4541009ab 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -136,6 +136,10 @@ public InstantiationTest(int x) { } } + /** + * new InstantiationTest(3) => ... + * new InstantiationTest(3,4) => ... + */ @Test public void newInstance() { InstantiationTest v; @@ -147,6 +151,30 @@ public void newInstance() { assertEquals(7, v.v); } + /** + * try { + * throw new RuntimeException("foo"); + * return null; + * } catch (Exception e) { + * return e.getMessage(); + * } + */ + @Test + public void localExceptionHandling() { + assertEquals("foo",run( + b.tryCatch( + b.sequence( + b.throw_(b.new_(RuntimeException.class, b.constant("foo"))), + b.return_(b.null_()) + ), + + new CatchExpression(Exception.class, "e", b.sequence( + b.return_(b.functionCall(b.getLocalVariable("e"),"getMessage")) + )) + ) + )); + } + private T run(Expression... bodies) { Env e = new FunctionCallEnv(null,null,Continuation.HALT); Next p = new Next(b.sequence(bodies), e, Continuation.HALT); From b552e6014c4000f9af2207792ff4e03ada739e93 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 28 Jan 2014 09:28:05 -0500 Subject: [PATCH 020/932] added a property getter support --- .../com/cloudbees/groovy/cps/Builder.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 0cdc1582c..bb5935293 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -265,6 +265,36 @@ public Next receive(Object _args) { // }; // } + public Expression getProperty(Expression lhs, String property) { + return getProperty(lhs,constant(property)); + } + + public Expression getProperty(final Expression lhs, final Expression property) { + return new Expression() { + public Next eval(final Env e, final Continuation k) { + return lhs.eval(e,new Continuation() { + public Next receive(final Object lhs) { + return new Next(property,e,new Continuation() { + public Next receive(Object property) { + Object p; + try { + // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String + p = ScriptBytecodeAdapter.getProperty(null/*Groovy doesn't use this parameter*/, + lhs, (String) property); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + + // TODO: the above doesn't handle the case correctly if the get method is an async method + return k.receive(p); + } + }); + } + }); + } + }; + } + /** * Object instantiation. */ From 60f5fe596a90dca1e302e40508ecb695f804e0c1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 28 Jan 2014 09:30:10 -0500 Subject: [PATCH 021/932] support getter method that's workflow function --- .../java/com/cloudbees/groovy/cps/Builder.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index bb5935293..c92fb968a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -9,6 +9,7 @@ import java.util.List; import static java.util.Arrays.*; +import static java.util.Collections.emptyList; /** * @author Kohsuke Kawaguchi @@ -276,17 +277,23 @@ public Next eval(final Env e, final Continuation k) { public Next receive(final Object lhs) { return new Next(property,e,new Continuation() { public Next receive(Object property) { - Object p; + Object v; try { // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String - p = ScriptBytecodeAdapter.getProperty(null/*Groovy doesn't use this parameter*/, + v = ScriptBytecodeAdapter.getProperty(null/*Groovy doesn't use this parameter*/, lhs, (String) property); } catch (Throwable t) { throw new UnsupportedOperationException(t); // TODO: exception handling } - // TODO: the above doesn't handle the case correctly if the get method is an async method - return k.receive(p); + if (v instanceof Function) { + // if this is a workflow function, it'd return a Function object instead + // of actually executing the function, so execute it in the CPS + return ((Function)v).invoke(e, emptyList(),k); + } else { + // if this was a normal property, we get the value as-is. + return k.receive(v); + } } }); } @@ -328,7 +335,7 @@ public Next receive(Object _args) { */ private Expression evalArgs(final Expression... argExps) { if (argExps.length==0) // no arguments to evaluate - return new Constant(Collections.emptyList()); + return new Constant(emptyList()); return new Expression() { public Next eval(final Env e, final Continuation k) { From 40e7f306f4cb831ec0c6d1000bbd6b4efb86b241 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 29 Jan 2014 18:02:53 -0500 Subject: [PATCH 022/932] Added a test case for property access --- src/main/java/com/cloudbees/groovy/cps/Builder.java | 3 +-- .../java/com/cloudbees/groovy/cps/BasicTest.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index c92fb968a..4658ae462 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -5,11 +5,10 @@ import org.codehaus.groovy.runtime.callsite.CallSiteArray; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import static java.util.Arrays.*; -import static java.util.Collections.emptyList; +import static java.util.Collections.*; /** * @author Kohsuke Kawaguchi diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 4541009ab..945985cb2 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -175,6 +175,18 @@ public void localExceptionHandling() { )); } + /** + * x = new Exception("foo"); + * new String(x.message.bytes) => "foo" + */ + @Test + public void propertyAccess() { + assertEquals("foo",run( + b.setLocalVariable("x", b.new_(Exception.class, b.constant("foo"))), + b.new_(String.class, b.getProperty(b.getProperty($x,"message"),"bytes")) + )); + } + private T run(Expression... bodies) { Env e = new FunctionCallEnv(null,null,Continuation.HALT); Next p = new Next(b.sequence(bodies), e, Continuation.HALT); From a2456be158ee51ea160d2bfb541b8e255a53cbff Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Feb 2014 16:52:30 +0000 Subject: [PATCH 023/932] addded property setter --- .../com/cloudbees/groovy/cps/Builder.java | 32 +++++++++++++++++ .../cloudbees/groovy/cps/Continuation.java | 2 +- .../java/com/cloudbees/groovy/cps/Next.java | 17 ++++++++- .../com/cloudbees/groovy/cps/BasicTest.java | 35 +++++++++++++++++-- 4 files changed, 82 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 4658ae462..4f30f6488 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -301,6 +301,38 @@ public Next receive(Object property) { }; } + public Expression setProperty(Expression lhs, String property, Expression rhs) { + return setProperty(lhs, constant(property), rhs); + } + + public Expression setProperty(final Expression lhs, final Expression property, final Expression rhs) { + return new Expression() { + public Next eval(final Env e, final Continuation k) { + return lhs.eval(e,new Continuation() { + public Next receive(final Object lhs) { + return new Next(property,e,new Continuation() { + public Next receive(final Object property) { + return new Next(rhs,e,new Continuation() { + public Next receive(Object rhs) { + try { + // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String + ScriptBytecodeAdapter.setProperty(rhs, + null/*Groovy doesn't use this parameter*/, + lhs, (String) property); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + return k.receive(null); + } + }); + } + }); + } + }); + } + }; + } + /** * Object instantiation. */ diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 527d13143..3f2a33305 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -15,7 +15,7 @@ public interface Continuation { final static Continuation HALT = new Continuation() { public Next receive(Object o) { Next next = new Next(NOOP, null, HALT); - next.yield = o; + next.yield(o); return next; } }; diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index c184cb0f0..7419daf86 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -13,8 +13,10 @@ public class Next { /** * If the program getting executed wants to yield a value and suspend its execution, * this value is set to non-null. + * + * {@link #NULL} is used to yield null. */ - Object yield; + private Object yield; public Next(Expression f, Env e, Continuation k) { this.f = f; @@ -32,4 +34,17 @@ public Next resume() { } while(n.yield==null); return n; } + + /*package*/ void yield(Object v) { + if (v==null) v = NULL; + this.yield = v; + } + + /*package*/ Object yieldedValue() { + if (yield==NULL) return null; + return yield; + } + + private static final class Null {} + private static final Null NULL = new Null(); } diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 945985cb2..bb851ad6c 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -180,16 +180,47 @@ public void localExceptionHandling() { * new String(x.message.bytes) => "foo" */ @Test - public void propertyAccess() { + public void propertyGetAccess() { assertEquals("foo",run( b.setLocalVariable("x", b.new_(Exception.class, b.constant("foo"))), b.new_(String.class, b.getProperty(b.getProperty($x,"message"),"bytes")) )); } + public static class PropertyTest { + private int x=0; + + public int getX() { + return x; + } + + public void setX(int x) { + this.x = x; + } + + public int y=0; + } + + /** + * x = new PropertyTest(); + * x.x = 1; + * x.y = 2; + */ + @Test + public void propertySetAccess() { + PropertyTest p = new PropertyTest(); + run( + b.setLocalVariable("x", b.constant(p)), + b.setProperty($x,"x", b.constant(1)), + b.setProperty($x,"y", b.constant(2)) + ); + assertEquals(p.x,1); + assertEquals(p.y,2); + } + private T run(Expression... bodies) { Env e = new FunctionCallEnv(null,null,Continuation.HALT); Next p = new Next(b.sequence(bodies), e, Continuation.HALT); - return (T)p.resume().yield; + return (T)p.resume().yieldedValue(); } } From 112bbe0ab5fa2cd3c81ad1bfd9c7d4038c369278 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Feb 2014 16:53:57 +0000 Subject: [PATCH 024/932] yielding null value --- src/test/java/com/cloudbees/groovy/cps/BasicTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index bb851ad6c..d3c209e0b 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -218,6 +218,14 @@ public void propertySetAccess() { assertEquals(p.y,2); } + /** + * return null; + */ + @Test + public void yieldNull() { + assertNull(run(b.return_(b.null_()))); + } + private T run(Expression... bodies) { Env e = new FunctionCallEnv(null,null,Continuation.HALT); Next p = new Next(b.sequence(bodies), e, Continuation.HALT); From aad068ebfdd8241be9922e609d30af7b7f02e693 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Feb 2014 17:06:49 +0000 Subject: [PATCH 025/932] added a test for stack unwinding behavior of try/catch block --- .../com/cloudbees/groovy/cps/Builder.java | 8 +++ .../com/cloudbees/groovy/cps/BasicTest.java | 51 +++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 4f30f6488..68c39a568 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -70,6 +70,10 @@ public Next receive(Object o) { }; } + public Expression this_() { + return getLocalVariable("this"); + } + /** * Assignment operator to a local variable, such as "x += 3" */ @@ -204,6 +208,10 @@ public Expression plus(Expression lhs, Expression rhs) { return functionCall(lhs,"plus",rhs); } + public Expression minus(Expression lhs, Expression rhs) { + return functionCall(lhs,"minus",rhs); + } + public Expression lessThan(Expression lhs, Expression rhs) { return staticCall(ScriptBytecodeAdapter.class,"compareLessThan",lhs,rhs); } diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index d3c209e0b..c0b8f17cc 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import org.codehaus.groovy.classgen.asm.OptimizingStatementWriter.ClassNodeSkip; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.junit.Assert; import org.junit.Test; @@ -106,6 +107,9 @@ private void if_(boolean cond, int expected) { )); } + /** + * A CPS function calling another CPS function. + */ @Test public void asyncCallingAsync() { class Op { @@ -175,6 +179,53 @@ public void localExceptionHandling() { )); } + /** + * An exception thrown in a function caught by another function + */ + @Test + public void exceptionStackUnwinding() { + class Op { + /** + * if (0 "foo" From 5a02d150591e590157dbeb7e67167f231f6be243 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Feb 2014 17:07:53 +0000 Subject: [PATCH 026/932] fixed a bug where a function call wasn't passing 'this' --- src/main/java/com/cloudbees/groovy/cps/Builder.java | 4 ++-- src/main/java/com/cloudbees/groovy/cps/Function.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 68c39a568..6e0686134 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -241,7 +241,7 @@ public Next receive(Object _args) { if (v instanceof Function) { // if this is a workflow function, it'd return a Function object instead // of actually executing the function, so execute it in the CPS - return ((Function)v).invoke(e,args,k); + return ((Function)v).invoke(e,lhs,args,k); } else { // if this was a normal function, the method had just executed synchronously return k.receive(v); @@ -296,7 +296,7 @@ public Next receive(Object property) { if (v instanceof Function) { // if this is a workflow function, it'd return a Function object instead // of actually executing the function, so execute it in the CPS - return ((Function)v).invoke(e, emptyList(),k); + return ((Function)v).invoke(e, lhs, emptyList(),k); } else { // if this was a normal property, we get the value as-is. return k.receive(v); diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java index 1e2abbbdc..7fdf21d3c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -16,8 +16,8 @@ public Function(List parameters, Expression body) { this.parameters = ImmutableList.copyOf(parameters); } - public Next invoke(Env caller, List args, Continuation k) { - Env e = new FunctionCallEnv(caller, null,k); + public Next invoke(Env caller, Object receiver, List args, Continuation k) { + Env e = new FunctionCallEnv(caller, receiver, k); assert args.size()== parameters.size(); // TODO: varargs for (int i=0; i< parameters.size(); i++) { From 78977db8882cb14d02544881a2801d280bdef15a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Feb 2014 17:10:11 +0000 Subject: [PATCH 027/932] Let's also check that the environment is correctly restored. --- src/test/java/com/cloudbees/groovy/cps/BasicTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index c0b8f17cc..4c6cb6bb1 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -211,10 +211,10 @@ public Function throw_(int depth, String message) { new Op().throw_(3,"hello") x = 2; // make sure this line gets skipped } catch (Exception e) { - return e.message; + return e.message + x; } */ - assertEquals("hello", run( + assertEquals("hello1", run( b.setLocalVariable("x", b.constant(0)), // part of the test is to ensure this 'z' is separated from 'z' in the add function b.tryCatch( b.sequence( @@ -222,7 +222,10 @@ public Function throw_(int depth, String message) { b.functionCall(b.constant(new Op()), "throw_", b.constant(3), b.constant("hello")), b.setLocalVariable("x", b.constant(2)) ), - new CatchExpression(Exception.class, "e", b.return_(b.getProperty(b.getLocalVariable("e"), "message"))) + new CatchExpression(Exception.class, "e", + b.return_(b.plus( + b.getProperty(b.getLocalVariable("e"), "message"), + b.getLocalVariable("x")))) ))); } From b1d6150017aac17c26330faad2a1ea96c4a64480 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Feb 2014 17:10:45 +0000 Subject: [PATCH 028/932] basic excception handling appears to be working at this point. --- TODO.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/TODO.txt b/TODO.txt index 1716c5381..0290a8339 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,8 +1,4 @@ - property access -- exception handling - - both throwing and catching - - I can make it a part of Env -> requires an interface and chaining - - or I can make it a separate parameter - block creates a new scope - variables are resolved lexically - async functions calling each other From 081d65836c6533de5423a337fd7b84d6f7715774 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Feb 2014 17:11:02 +0000 Subject: [PATCH 029/932] property access is implemented now --- TODO.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TODO.txt b/TODO.txt index 0290a8339..804953c57 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,4 +1,4 @@ -- property access +- array access (trivial, so can be done later) - block creates a new scope - variables are resolved lexically - async functions calling each other From 0805dbfe9dbddb82da56492bb3414a33983cf89f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Feb 2014 17:11:30 +0000 Subject: [PATCH 030/932] function call appears to be working OK --- TODO.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/TODO.txt b/TODO.txt index 804953c57..4a3a59399 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,7 +1,6 @@ - array access (trivial, so can be done later) - block creates a new scope - variables are resolved lexically -- async functions calling each other Tests to be written: - verify a proper method overload resolution From 51dc566cdaa3722686ba2ac8422471ad951c7bc7 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Feb 2014 17:14:48 +0000 Subject: [PATCH 031/932] added convenience methods. --- .../com/cloudbees/groovy/cps/Builder.java | 12 ++++++ .../com/cloudbees/groovy/cps/BasicTest.java | 42 +++++++++---------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 6e0686134..47a9d5252 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -24,6 +24,18 @@ public Expression constant(Object o) { return new Constant(o); } + public Expression zero() { + return constant(0); + } + + public Expression one() { + return constant(1); + } + + public Expression two() { + return constant(2); + } + public Expression sequence(Expression... bodies) { if (bodies.length==0) return NULL; diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 4c6cb6bb1..c16ff12b9 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -30,16 +30,16 @@ public void constant() { public void onePlusOne() { assertEquals(true, run( b.staticCall(ScriptBytecodeAdapter.class, "compareEqual", - b.constant(1), - b.constant(1)))); + b.one(), + b.one()))); } // x=1; y=2; x+y => 3 @Test public void variable() { assertEquals(3, run( - b.setLocalVariable("x", b.constant(1)), - b.setLocalVariable("y", b.constant(2)), + b.setLocalVariable("x", b.one()), + b.setLocalVariable("y", b.two()), b.plus($x, $y) )); } @@ -54,11 +54,11 @@ public void variable() { @Test public void forLoop() { assertEquals(45, run( - b.setLocalVariable("sum", b.constant(0)), + b.setLocalVariable("sum", b.zero()), b.forLoop( - b.setLocalVariable("x", b.constant(0)), + b.setLocalVariable("x", b.zero()), b.lessThan($x, b.constant(10)), - b.localVariableAssignOp("x", "plus", b.constant(1)), + b.localVariableAssignOp("x", "plus", b.one()), b.sequence(// for loop body b.localVariableAssignOp("sum", "plus", $x) @@ -75,9 +75,9 @@ public void forLoop() { @Test public void returnStatement() { assertEquals(0, run( - b.setLocalVariable("x", b.constant(0)), + b.setLocalVariable("x", b.zero()), b.return_($x), - b.localVariableAssignOp("x", "plus", b.constant(1)), + b.localVariableAssignOp("x", "plus", b.one()), b.plus($x, $y) )); } @@ -99,10 +99,10 @@ public void ifTrue() { private void if_(boolean cond, int expected) { assertEquals(expected, run( - b.setLocalVariable("x", b.constant(0)), + b.setLocalVariable("x", b.zero()), b.if_( b.constant(cond), - b.setLocalVariable("x",b.constant(1)), - b.setLocalVariable("x",b.constant(2))), + b.setLocalVariable("x",b.one()), + b.setLocalVariable("x",b.two())), $x )); } @@ -124,9 +124,9 @@ public Function add(int x, int y) { // z=5; new Op().add(1,2)+z => 8 assertEquals(3, run( - b.setLocalVariable("z", b.constant(0)), // part of the test is to ensure this 'z' is separated from 'z' in the add function + b.setLocalVariable("z", b.zero()), // part of the test is to ensure this 'z' is separated from 'z' in the add function b.plus( - b.functionCall(b.constant(new Op()), "add", b.constant(1), b.constant(2)), + b.functionCall(b.constant(new Op()), "add", b.one(), b.two()), $z))); } @@ -195,8 +195,8 @@ public Function throw_(int depth, String message) { Expression $depth = b.getLocalVariable("depth"); return new Function(asList("depth", "message"), b.sequence( - b.if_(b.lessThan(b.constant(0), $depth), - b.functionCall(b.this_(), "throw_", b.minus($depth,b.constant(1)), b.getLocalVariable("message")), + b.if_(b.lessThan(b.zero(), $depth), + b.functionCall(b.this_(), "throw_", b.minus($depth,b.one()), b.getLocalVariable("message")), // else b.throw_(b.new_(IllegalArgumentException.class, b.getLocalVariable("message"))) ) @@ -215,12 +215,12 @@ public Function throw_(int depth, String message) { } */ assertEquals("hello1", run( - b.setLocalVariable("x", b.constant(0)), // part of the test is to ensure this 'z' is separated from 'z' in the add function + b.setLocalVariable("x", b.zero()), // part of the test is to ensure this 'z' is separated from 'z' in the add function b.tryCatch( b.sequence( - b.setLocalVariable("x", b.constant(1)), + b.setLocalVariable("x", b.one()), b.functionCall(b.constant(new Op()), "throw_", b.constant(3), b.constant("hello")), - b.setLocalVariable("x", b.constant(2)) + b.setLocalVariable("x", b.two()) ), new CatchExpression(Exception.class, "e", b.return_(b.plus( @@ -265,8 +265,8 @@ public void propertySetAccess() { PropertyTest p = new PropertyTest(); run( b.setLocalVariable("x", b.constant(p)), - b.setProperty($x,"x", b.constant(1)), - b.setProperty($x,"y", b.constant(2)) + b.setProperty($x,"x", b.one()), + b.setProperty($x,"y", b.two()) ); assertEquals(p.x,1); assertEquals(p.y,2); From b99ca856de01a482fe8494b5ea98c7500cdd6b50 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Feb 2014 17:15:01 +0000 Subject: [PATCH 032/932] adding more TODOs --- TODO.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO.txt b/TODO.txt index 4a3a59399..b8c98414b 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,6 +1,8 @@ - array access (trivial, so can be done later) - block creates a new scope - variables are resolved lexically +- closure +- how to avoid anonymous classes? Tests to be written: - verify a proper method overload resolution From 4aa2da6846ef41b093391a8b2238b58a074717f6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Feb 2014 20:34:14 +0000 Subject: [PATCH 033/932] adding initial sketch of CpsTransformer --- .../groovy/cps/CpsTransformer.groovy | 351 ++++++++++++++++++ .../com/cloudbees/groovy/cps/Builder.java | 39 +- .../cloudbees/groovy/cps/WorkflowMethod.java | 15 + .../com/cloudbees/groovy/cps/BasicTest.java | 21 +- test.groovy | 2 + 5 files changed, 426 insertions(+), 2 deletions(-) create mode 100644 src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy create mode 100644 src/main/java/com/cloudbees/groovy/cps/WorkflowMethod.java create mode 100644 test.groovy diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy new file mode 100644 index 000000000..073e02bd0 --- /dev/null +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -0,0 +1,351 @@ +package com.cloudbees.groovy.cps + +import org.codehaus.groovy.ast.* +import org.codehaus.groovy.ast.expr.ArgumentListExpression +import org.codehaus.groovy.ast.expr.ArrayExpression +import org.codehaus.groovy.ast.expr.AttributeExpression +import org.codehaus.groovy.ast.expr.BinaryExpression +import org.codehaus.groovy.ast.expr.BitwiseNegationExpression +import org.codehaus.groovy.ast.expr.BooleanExpression +import org.codehaus.groovy.ast.expr.CastExpression +import org.codehaus.groovy.ast.expr.ClassExpression +import org.codehaus.groovy.ast.expr.ClosureExpression +import org.codehaus.groovy.ast.expr.ClosureListExpression +import org.codehaus.groovy.ast.expr.ConstantExpression +import org.codehaus.groovy.ast.expr.ConstructorCallExpression +import org.codehaus.groovy.ast.expr.DeclarationExpression +import org.codehaus.groovy.ast.expr.ElvisOperatorExpression +import org.codehaus.groovy.ast.expr.FieldExpression +import org.codehaus.groovy.ast.expr.GStringExpression +import org.codehaus.groovy.ast.expr.ListExpression +import org.codehaus.groovy.ast.expr.MapEntryExpression +import org.codehaus.groovy.ast.expr.MapExpression +import org.codehaus.groovy.ast.expr.MethodCallExpression +import org.codehaus.groovy.ast.expr.MethodPointerExpression +import org.codehaus.groovy.ast.expr.NotExpression +import org.codehaus.groovy.ast.expr.PostfixExpression +import org.codehaus.groovy.ast.expr.PrefixExpression +import org.codehaus.groovy.ast.expr.PropertyExpression +import org.codehaus.groovy.ast.expr.RangeExpression +import org.codehaus.groovy.ast.expr.SpreadExpression +import org.codehaus.groovy.ast.expr.SpreadMapExpression +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression +import org.codehaus.groovy.ast.expr.TernaryExpression +import org.codehaus.groovy.ast.expr.TupleExpression +import org.codehaus.groovy.ast.expr.UnaryMinusExpression +import org.codehaus.groovy.ast.expr.UnaryPlusExpression +import org.codehaus.groovy.ast.expr.VariableExpression +import org.codehaus.groovy.ast.stmt.AssertStatement +import org.codehaus.groovy.ast.stmt.BlockStatement +import org.codehaus.groovy.ast.stmt.BreakStatement +import org.codehaus.groovy.ast.stmt.CaseStatement +import org.codehaus.groovy.ast.stmt.CatchStatement +import org.codehaus.groovy.ast.stmt.ContinueStatement +import org.codehaus.groovy.ast.stmt.DoWhileStatement +import org.codehaus.groovy.ast.stmt.ExpressionStatement +import org.codehaus.groovy.ast.stmt.ForStatement +import org.codehaus.groovy.ast.stmt.IfStatement +import org.codehaus.groovy.ast.stmt.ReturnStatement +import org.codehaus.groovy.ast.stmt.SwitchStatement +import org.codehaus.groovy.ast.stmt.SynchronizedStatement +import org.codehaus.groovy.ast.stmt.ThrowStatement +import org.codehaus.groovy.ast.stmt.TryCatchStatement +import org.codehaus.groovy.ast.stmt.WhileStatement +import org.codehaus.groovy.classgen.BytecodeExpression +import org.codehaus.groovy.classgen.GeneratorContext +import org.codehaus.groovy.control.CompilePhase +import org.codehaus.groovy.control.SourceUnit +import org.codehaus.groovy.control.customizers.CompilationCustomizer + +/** + * + * + * @author Kohsuke Kawaguchi + */ +class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor { + CpsTransformer() { + super(CompilePhase.CANONICALIZATION) + } + + @Override + void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { + def ast = source.getAST(); + + ast.methods?.each { visitMethod(it) } + classNode?.declaredConstructors?.each { visitMethod(it) } + classNode?.methods?.each { visitMethod(it) } +// classNode?.objectInitializerStatements?.each { it.visit(visitor) } +// classNode?.fields?.each { visitor.visitField(it) } + } + + /** + * Should this method be transformed? + */ + private boolean shouldBeTransformed(MethodNode node) { + return node.annotations.find { it.classNode.name==WorkflowMethod.class.name } != null; + } + + public void visitMethod(MethodNode node) { + if (!shouldBeTransformed(node)) + return; + + // function shall now return the Function object + node.returnType = FUNCTION_TYPE; + + node.code.visit(this) + } + + /** + * As we visit expressions in the method body, we convert them to the {@link Builder} invocations + * and pass them back to this closure. + */ + private Closure parent; + + private void visit(ASTNode e) { + e.visit(this); + } + + private void visit(Collection col) { + for (def e : col) { + e.visit(this); + } + } + + /** + * Makes an AST fragment that calls {@link Builder} with specific method. + * + * @param args + * Can be closure for building argument nodes, Expression, or List of Expressions. + */ + private MethodCallExpression makeNode(String methodName, Object args) { + if (args instanceof Closure) { + def argExps = [] + def old = parent; + try { + parent = { a -> argExps.addExpression(a) } + + args(); // evaluate arguments + args = argExps; + } finally { + parent = old + } + } + + parent(new MethodCallExpression(BUILDER, methodName, new TupleExpression(args))); + } + + void visitMethodCallExpression(MethodCallExpression call) { + makeNode("functionCall") { + visit(call.objectExpression); + // TODO: spread & safe + visit(call.method); + visit(((TupleExpression)call.arguments).expressions) + } + } + + void visitBlockStatement(BlockStatement statement) { + throw new UnsupportedOperationException(); + } + + void visitForLoop(ForStatement forLoop) { + throw new UnsupportedOperationException(); + } + + void visitWhileLoop(WhileStatement loop) { + throw new UnsupportedOperationException(); + } + + void visitDoWhileLoop(DoWhileStatement loop) { + throw new UnsupportedOperationException(); + } + + void visitIfElse(IfStatement ifElse) { + throw new UnsupportedOperationException(); + } + + void visitExpressionStatement(ExpressionStatement statement) { + throw new UnsupportedOperationException(); + } + + void visitReturnStatement(ReturnStatement statement) { + makeNode("return_") { + visit(statement.expression); + } + } + + void visitAssertStatement(AssertStatement statement) { + throw new UnsupportedOperationException(); + } + + void visitTryCatchFinally(TryCatchStatement finally1) { + throw new UnsupportedOperationException(); + } + + void visitSwitch(SwitchStatement statement) { + throw new UnsupportedOperationException(); + } + + void visitCaseStatement(CaseStatement statement) { + throw new UnsupportedOperationException(); + } + + void visitBreakStatement(BreakStatement statement) { + throw new UnsupportedOperationException(); + } + + void visitContinueStatement(ContinueStatement statement) { + throw new UnsupportedOperationException(); + } + + void visitThrowStatement(ThrowStatement statement) { + throw new UnsupportedOperationException(); + } + + void visitSynchronizedStatement(SynchronizedStatement statement) { + throw new UnsupportedOperationException(); + } + + void visitCatchStatement(CatchStatement statement) { + throw new UnsupportedOperationException(); + } + + void visitStaticMethodCallExpression(StaticMethodCallExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitConstructorCallExpression(ConstructorCallExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitTernaryExpression(TernaryExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitShortTernaryExpression(ElvisOperatorExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitBinaryExpression(BinaryExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitPrefixExpression(PrefixExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitPostfixExpression(PostfixExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitBooleanExpression(BooleanExpression expression) { + visit(expression); + } + + void visitClosureExpression(ClosureExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitTupleExpression(TupleExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitMapExpression(MapExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitMapEntryExpression(MapEntryExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitListExpression(ListExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitRangeExpression(RangeExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitPropertyExpression(PropertyExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitAttributeExpression(AttributeExpression attributeExpression) { + throw new UnsupportedOperationException(); + } + + void visitFieldExpression(FieldExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitMethodPointerExpression(MethodPointerExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitConstantExpression(ConstantExpression expression) { + makeNode("constant", expression) + } + + void visitClassExpression(ClassExpression expression) { + makeNode("constant", expression) + } + + void visitVariableExpression(VariableExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitDeclarationExpression(DeclarationExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitGStringExpression(GStringExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitArrayExpression(ArrayExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitSpreadExpression(SpreadExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitSpreadMapExpression(SpreadMapExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitNotExpression(NotExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitUnaryMinusExpression(UnaryMinusExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitUnaryPlusExpression(UnaryPlusExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitBitwiseNegationExpression(BitwiseNegationExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitCastExpression(CastExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitArgumentlistExpression(ArgumentListExpression expression) { + throw new UnsupportedOperationException(); + } + + void visitClosureListExpression(ClosureListExpression closureListExpression) { + throw new UnsupportedOperationException(); + } + + void visitBytecodeExpression(BytecodeExpression expression) { + throw new UnsupportedOperationException(); + } + + private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(Function.class); + private static final ClassNode BUILDER_TYPE = ClassHelper.makeCached(Builder.class); + private static final PropertyExpression BUILDER = new PropertyExpression(new ClassExpression(BUILDER_TYPE), "INSTANCE") +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 47a9d5252..89fe0ed53 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.List; +import static com.cloudbees.groovy.cps.Expression.NOOP; import static java.util.Arrays.*; import static java.util.Collections.*; @@ -36,13 +37,35 @@ public Expression two() { return constant(2); } + public Expression true_() { + return constant(true); + } + + public Expression false_() { + return constant(false); + } + public Expression sequence(Expression... bodies) { if (bodies.length==0) return NULL; Expression e = bodies[0]; for (int i=1; i T run(Expression... bodies) { Env e = new FunctionCallEnv(null,null,Continuation.HALT); Next p = new Next(b.sequence(bodies), e, Continuation.HALT); diff --git a/test.groovy b/test.groovy new file mode 100644 index 000000000..51d473e07 --- /dev/null +++ b/test.groovy @@ -0,0 +1,2 @@ +int x; +println x; From a246f75ce520259e4151cf0a1dbafa6c0928bdd3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 11:35:48 +0000 Subject: [PATCH 034/932] initialize to the VM default value --- .../com/cloudbees/groovy/cps/BlockScopeEnv.java | 2 +- .../java/com/cloudbees/groovy/cps/Builder.java | 17 ++++++++++++++--- src/main/java/com/cloudbees/groovy/cps/Env.java | 2 +- .../cloudbees/groovy/cps/FunctionCallEnv.java | 2 +- .../java/com/cloudbees/groovy/cps/ProxyEnv.java | 4 ++-- .../com/cloudbees/groovy/cps/BasicTest.java | 4 ++-- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/BlockScopeEnv.java b/src/main/java/com/cloudbees/groovy/cps/BlockScopeEnv.java index 707457c4e..74fd5542d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/BlockScopeEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/BlockScopeEnv.java @@ -15,7 +15,7 @@ public BlockScopeEnv(Env parent) { super(parent); } - public void declareVariable(String name) { + public void declareVariable(Class type, String name) { locals.put(name,null); } diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 89fe0ed53..f32236a91 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -5,7 +5,9 @@ import org.codehaus.groovy.runtime.callsite.CallSiteArray; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import static com.cloudbees.groovy.cps.Expression.NOOP; import static java.util.Arrays.*; @@ -105,10 +107,11 @@ public Next receive(Object o) { }; } - public Expression declareVariable(final String name) { + public Expression declareVariable(final Class type, final String name) { return new Expression() { public Next eval(final Env e, final Continuation k) { - e.declareVariable(name); + e.declareVariable(type,name); + e.setLocalVariable(name,defaultPrimitiveValue.get(type)); return k.receive(null); } }; @@ -202,7 +205,7 @@ public Next eval(final Env e, final Continuation k) { f.addHandler(c.type, new Continuation() { public Next receive(Object t) { BlockScopeEnv b = new BlockScopeEnv(e); - b.declareVariable(c.name); + b.declareVariable(c.type, c.name); b.setLocalVariable(c.name, t); return new Next(c.handler, b, k); @@ -463,4 +466,12 @@ private static CallSite fakeCallSite(String method) { CallSiteArray csa = new CallSiteArray(Builder.class, new String[]{method}); return csa.array[0]; } + + private static final Map defaultPrimitiveValue = new HashMap(); + static { + defaultPrimitiveValue.put(boolean.class,false); + defaultPrimitiveValue.put(int.class,0); + defaultPrimitiveValue.put(long.class,0L); + // TODO: complete the rest + } } diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index 12986124a..bef2f227b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -8,7 +8,7 @@ public interface Env { // TODO: How do we correctly assign local variables to its scope? - void declareVariable(String name); + void declareVariable(Class type, String name); Object getLocalVariable(String name); void setLocalVariable(String name, Object value); diff --git a/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java b/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java index 547c45777..93a6b2b96 100644 --- a/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java @@ -31,7 +31,7 @@ class FunctionCallEnv implements Env { locals.put("this",_this); } - public void declareVariable(String name) { + public void declareVariable(Class type, String name) { // no-op } diff --git a/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java b/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java index ac4c78502..eb0882448 100644 --- a/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java @@ -10,8 +10,8 @@ protected ProxyEnv(Env parent) { this.parent = parent; } - public void declareVariable(String name) { - parent.declareVariable(name); + public void declareVariable(Class type, String name) { + parent.declareVariable(type, name); } public Object getLocalVariable(String name) { diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 3f445b366..c181d0cb7 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -290,10 +290,10 @@ public void yieldNull() { public void blockScopedVariable() { assertEquals(0,run( b.if_(b.true_(), b.sequence( - b.declareVariable("x"), + b.declareVariable(int.class,"x"), b.setLocalVariable("x", b.one()) )), - b.declareVariable("x"), + b.declareVariable(int.class,"x"), b.return_($x) )); // TODO: variable has to have a type for initialization From f2ad3f121b128b82d71bd2a509c81957fa40ff6d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 12:13:17 +0000 Subject: [PATCH 035/932] adding a first test case for CpsTransformer, using it as a driver to fix issues --- .../groovy/cps/CpsTransformer.groovy | 55 ++++++++++++++++--- .../com/cloudbees/groovy/cps/Builder.java | 5 ++ .../groovy/cps/CpsTransformerTest.groovy | 38 +++++++++++++ 3 files changed, 89 insertions(+), 9 deletions(-) create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 073e02bd0..bf0ff38a7 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -82,17 +82,52 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * Should this method be transformed? */ private boolean shouldBeTransformed(MethodNode node) { + if (node.name=="run" && node.returnType.name==Object.class.name && extendsFromScript(node.declaringClass)) + return true; // default body of the script return node.annotations.find { it.classNode.name==WorkflowMethod.class.name } != null; } - public void visitMethod(MethodNode node) { - if (!shouldBeTransformed(node)) + private boolean extendsFromScript(ClassNode c) { + while (c!=null) { + if (c.name==Script.class.name) + return true; + c = c.superClass + } + return false; + } + + /** + * Transforms asynchronous workflow method. + * + * From: + * + * ReturnT foo( T1 arg1, T2 arg2, ...) { + * ... body ... + * } + * + * To: + * + * Function foo( T1 arg1, T2 arg2, ...) { + * return new Function(['arg1','arg2','arg3',...], CPS-transformed-method-body) + * } + */ + public void visitMethod(MethodNode m) { + if (!shouldBeTransformed(m)) return; // function shall now return the Function object - node.returnType = FUNCTION_TYPE; + m.returnType = FUNCTION_TYPE; + + def body; + + // transform the body + parent = { e -> body=e } + m.code.visit(this) + + def params = new ListExpression(); + m.parameters.each { params.addExpression(new ConstantExpression(it.name))} - node.code.visit(this) + m.code = new ReturnStatement(new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params,body))); } /** @@ -117,12 +152,12 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * @param args * Can be closure for building argument nodes, Expression, or List of Expressions. */ - private MethodCallExpression makeNode(String methodName, Object args) { + private void makeNode(String methodName, Object args) { if (args instanceof Closure) { def argExps = [] def old = parent; try { - parent = { a -> argExps.addExpression(a) } + parent = { a -> argExps.add(a) } args(); // evaluate arguments args = argExps; @@ -143,8 +178,10 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitBlockStatement(BlockStatement statement) { - throw new UnsupportedOperationException(); + void visitBlockStatement(BlockStatement b) { + makeNode("sequence") { + visit(b.statements) + } } void visitForLoop(ForStatement forLoop) { @@ -164,7 +201,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitExpressionStatement(ExpressionStatement statement) { - throw new UnsupportedOperationException(); + visit(statement.expression) } void visitReturnStatement(ReturnStatement statement) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index f32236a91..c872486cb 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -467,6 +467,11 @@ private static CallSite fakeCallSite(String method) { return csa.array[0]; } + /** + * Used for building AST from transformed code. + */ + public static Builder INSTANCE = new Builder(); + private static final Map defaultPrimitiveValue = new HashMap(); static { defaultPrimitiveValue.put(boolean.class,false); diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy new file mode 100644 index 000000000..ad05163f9 --- /dev/null +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -0,0 +1,38 @@ +package com.cloudbees.groovy.cps + +import org.codehaus.groovy.control.CompilerConfiguration +import org.codehaus.groovy.control.customizers.ImportCustomizer +import org.junit.Before +import org.junit.Test + +import java.awt.Point + +/** + * + * + * @author Kohsuke Kawaguchi + */ +class CpsTransformerTest { + GroovyShell sh; + def binding = new Binding() + + @Before + void setUp() { + binding.foo = "FOO" + binding.bar = "BAR" + binding.zot = 5 + binding.point = new Point(1,2) + binding.points = [new Point(1,2),new Point(3,4)] + binding.intArray = [0,1,2,3,4] as int[] + + def cc = new CompilerConfiguration() + cc.addCompilationCustomizers(new ImportCustomizer().addImports(CpsTransformerTest.class.name)) + cc.addCompilationCustomizers(new CpsTransformer()) + sh = new GroovyShell(binding,cc); + } + + @Test + void helloWorld() { + sh.evaluate("'hello world'.length()") + } +} From 6112ff06c2008403c51ad60dc9621a48a683b46a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 04:22:18 -0800 Subject: [PATCH 036/932] This test case now passes --- .../com/cloudbees/groovy/cps/Builder.java | 48 ++++++++++++++++++- .../com/cloudbees/groovy/cps/Constant.java | 2 +- .../groovy/cps/CpsTransformerTest.groovy | 14 ++---- 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index c872486cb..15c0c44ce 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -272,7 +272,7 @@ public Expression lessThan(Expression lhs, Expression rhs) { * LHS.name(...) */ public Expression functionCall(final Expression lhs, final String name, Expression... argExps) { - final CallSite callSite = fakeCallSite(name); + final CallSite callSite = fakeCallSite(name); // name is statically determined final Expression args = evalArgs(argExps); return new Expression() { @@ -306,6 +306,52 @@ public Next receive(Object _args) { }; } + public Expression functionCall(final Expression lhs, final Expression name, Expression... argExps) { + if (name instanceof Constant) { + // method name statically known. this common path enables a bit of optimization + return functionCall(lhs,((Constant)name).value.toString(),argExps); + } + + final Expression args = evalArgs(argExps); + + // TODO: what is the correct evaluation order? + + return new Expression() { + public Next eval(final Env e, final Continuation k) { + return new Next(lhs,e, new Continuation() {// evaluate lhs + public Next receive(final Object lhs) { + return new Next(name, e, new Continuation() { + public Next receive(final Object name) { + return args.eval(e,new Continuation() { + public Next receive(Object _args) { + List args = (List) _args; + + Object v; + try { + CallSite callSite = fakeCallSite(name.toString()); + v = callSite.call(lhs, args.toArray(new Object[args.size()])); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + + if (v instanceof Function) { + // if this is a workflow function, it'd return a Function object instead + // of actually executing the function, so execute it in the CPS + return ((Function)v).invoke(e,lhs,args,k); + } else { + // if this was a normal function, the method had just executed synchronously + return k.receive(v); + } + } + }); + } + }); + } + }); + } + }; + } + // /** // * name(...) // * diff --git a/src/main/java/com/cloudbees/groovy/cps/Constant.java b/src/main/java/com/cloudbees/groovy/cps/Constant.java index cc8406036..2c2857e5b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Constant.java +++ b/src/main/java/com/cloudbees/groovy/cps/Constant.java @@ -6,7 +6,7 @@ * @author Kohsuke Kawaguchi */ class Constant implements Expression { - private final Object value; + public final Object value; public Constant(Object value) { this.value = value; diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index ad05163f9..c04c82c70 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -5,8 +5,6 @@ import org.codehaus.groovy.control.customizers.ImportCustomizer import org.junit.Before import org.junit.Test -import java.awt.Point - /** * * @@ -18,13 +16,6 @@ class CpsTransformerTest { @Before void setUp() { - binding.foo = "FOO" - binding.bar = "BAR" - binding.zot = 5 - binding.point = new Point(1,2) - binding.points = [new Point(1,2),new Point(3,4)] - binding.intArray = [0,1,2,3,4] as int[] - def cc = new CompilerConfiguration() cc.addCompilationCustomizers(new ImportCustomizer().addImports(CpsTransformerTest.class.name)) cc.addCompilationCustomizers(new CpsTransformer()) @@ -33,6 +24,9 @@ class CpsTransformerTest { @Test void helloWorld() { - sh.evaluate("'hello world'.length()") + Function f = sh.evaluate("'hello world'.length()") + def p = f.invoke(null, null, [], Continuation.HALT) + + assert p.resume().yieldedValue()==11; } } From 0ba2db5f7cfea4390539a169682f7ba18f76a583 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 06:07:17 -0800 Subject: [PATCH 037/932] add regular shell on the side --- .../groovy/cps/CpsTransformerTest.groovy | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index c04c82c70..5574b91fd 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -11,22 +11,40 @@ import org.junit.Test * @author Kohsuke Kawaguchi */ class CpsTransformerTest { + /** + * CPS-transforming shelll + */ + GroovyShell csh; + + /** + * Default groovy shell + */ GroovyShell sh; + def binding = new Binding() @Before void setUp() { + def imports = new ImportCustomizer().addImports(CpsTransformerTest.class.name) + def cc = new CompilerConfiguration() - cc.addCompilationCustomizers(new ImportCustomizer().addImports(CpsTransformerTest.class.name)) + cc.addCompilationCustomizers(imports) cc.addCompilationCustomizers(new CpsTransformer()) + csh = new GroovyShell(binding,cc); + + cc = new CompilerConfiguration() + cc.addCompilationCustomizers(imports) sh = new GroovyShell(binding,cc); } @Test void helloWorld() { - Function f = sh.evaluate("'hello world'.length()") - def p = f.invoke(null, null, [], Continuation.HALT) + Script s = csh.parse("'hello world'.length()") + Function f = s.run(); + def p = f.invoke(null, s, [], Continuation.HALT) assert p.resume().yieldedValue()==11; + + assert sh.evaluate("'hello world'.length()")==11; } } From 2388f1962e154e225ad357f7022ed6c00233b3ae Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 06:28:16 -0800 Subject: [PATCH 038/932] added for(x in ...) loop --- .../groovy/cps/CpsTransformer.groovy | 18 +++++++- .../com/cloudbees/groovy/cps/Builder.java | 43 +++++++++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 20 ++++++--- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index bf0ff38a7..ac3b88bd1 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -169,6 +169,17 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor parent(new MethodCallExpression(BUILDER, methodName, new TupleExpression(args))); } + /** + * Used in the closure block of {@link #makeNode(String, Object)} to create a literal string argument. + */ + private void literal(String s) { + parent(new ConstantExpression(s)) + } + + private void literal(ClassNode c) { + parent(new ClassExpression(s)) + } + void visitMethodCallExpression(MethodCallExpression call) { makeNode("functionCall") { visit(call.objectExpression); @@ -185,7 +196,12 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitForLoop(ForStatement forLoop) { - throw new UnsupportedOperationException(); + makeNode("forInLoop") { + literal(forLoop.variableType) + literal(forLoop.variable.name) + visit(forLoop.collectionExpression) + visit(forLoop.loopBlock) + } } void visitWhileLoop(WhileStatement loop) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 15c0c44ce..4c81254ec 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -183,6 +184,48 @@ public Next receive(Object o) { }; } + /** + * for (x in col) { ... } + */ + public Expression forInLoop(final Class type, final String variable, final Expression collection, final Expression body) { + return new Expression() { + public Next eval(Env _e, final Continuation loopEnd) { + final Env e = new BlockScopeEnv(_e); // for the loop variable + e.declareVariable(type,variable); + + return collection.eval(e,new Continuation() { + public Next receive(Object col) { + final Iterator itr; + try { + itr = (Iterator) ScriptBytecodeAdapter.invokeMethod0(null/*unused*/, col, "iterator"); + } catch (Throwable e) { + // TODO: exception handling + e.printStackTrace(); + return loopEnd.receive(null); + } + + final Continuation loopHead = new Continuation() { + final Continuation _loopHead = this; // because 'loopHead' cannot be referenced from within the definition + + public Next receive(Object __) { + if (itr.hasNext()) { + // one more iteration + e.setLocalVariable(variable,itr.next()); + return body.eval(e,_loopHead); + } else { + // exit loop + return loopEnd.receive(null); + } + } + }; + + return loopHead.receive(null); + } + }); + } + }; + } + public Expression tryCatch(Expression body, CatchExpression... catches) { return tryCatch(body, asList(catches)); diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 5574b91fd..6c3a61eb8 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -37,14 +37,24 @@ class CpsTransformerTest { sh = new GroovyShell(binding,cc); } - @Test - void helloWorld() { - Script s = csh.parse("'hello world'.length()") + Object evalCPS(String script) { + Script s = csh.parse(script) Function f = s.run(); def p = f.invoke(null, s, [], Continuation.HALT) - assert p.resume().yieldedValue()==11; + def v = p.resume().yieldedValue() - assert sh.evaluate("'hello world'.length()")==11; + assert v==sh.evaluate(script); + return v; + } + + @Test + void helloWorld() { + assert evalCPS("'hello world'.length()")==11 + } + + @Test + void forInLoop() { + assert evalCPS("x=0; for (i in [1,2,3,4,5]) x+=i; return x;")==15; } } From b8c1e4fdff64a512660efd514553c3552e6f3452 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 06:50:04 -0800 Subject: [PATCH 039/932] implemented comparison operators --- .../groovy/cps/CpsTransformer.groovy | 228 ++++++++++++++---- .../com/cloudbees/groovy/cps/Builder.java | 25 ++ .../groovy/cps/CpsTransformerTest.groovy | 12 + 3 files changed, 213 insertions(+), 52 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index ac3b88bd1..6b1ffcdaf 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -1,62 +1,16 @@ package com.cloudbees.groovy.cps import org.codehaus.groovy.ast.* -import org.codehaus.groovy.ast.expr.ArgumentListExpression -import org.codehaus.groovy.ast.expr.ArrayExpression -import org.codehaus.groovy.ast.expr.AttributeExpression -import org.codehaus.groovy.ast.expr.BinaryExpression -import org.codehaus.groovy.ast.expr.BitwiseNegationExpression -import org.codehaus.groovy.ast.expr.BooleanExpression -import org.codehaus.groovy.ast.expr.CastExpression -import org.codehaus.groovy.ast.expr.ClassExpression -import org.codehaus.groovy.ast.expr.ClosureExpression -import org.codehaus.groovy.ast.expr.ClosureListExpression -import org.codehaus.groovy.ast.expr.ConstantExpression -import org.codehaus.groovy.ast.expr.ConstructorCallExpression -import org.codehaus.groovy.ast.expr.DeclarationExpression -import org.codehaus.groovy.ast.expr.ElvisOperatorExpression -import org.codehaus.groovy.ast.expr.FieldExpression -import org.codehaus.groovy.ast.expr.GStringExpression -import org.codehaus.groovy.ast.expr.ListExpression -import org.codehaus.groovy.ast.expr.MapEntryExpression -import org.codehaus.groovy.ast.expr.MapExpression -import org.codehaus.groovy.ast.expr.MethodCallExpression -import org.codehaus.groovy.ast.expr.MethodPointerExpression -import org.codehaus.groovy.ast.expr.NotExpression -import org.codehaus.groovy.ast.expr.PostfixExpression -import org.codehaus.groovy.ast.expr.PrefixExpression -import org.codehaus.groovy.ast.expr.PropertyExpression -import org.codehaus.groovy.ast.expr.RangeExpression -import org.codehaus.groovy.ast.expr.SpreadExpression -import org.codehaus.groovy.ast.expr.SpreadMapExpression -import org.codehaus.groovy.ast.expr.StaticMethodCallExpression -import org.codehaus.groovy.ast.expr.TernaryExpression -import org.codehaus.groovy.ast.expr.TupleExpression -import org.codehaus.groovy.ast.expr.UnaryMinusExpression -import org.codehaus.groovy.ast.expr.UnaryPlusExpression -import org.codehaus.groovy.ast.expr.VariableExpression -import org.codehaus.groovy.ast.stmt.AssertStatement -import org.codehaus.groovy.ast.stmt.BlockStatement -import org.codehaus.groovy.ast.stmt.BreakStatement -import org.codehaus.groovy.ast.stmt.CaseStatement -import org.codehaus.groovy.ast.stmt.CatchStatement -import org.codehaus.groovy.ast.stmt.ContinueStatement -import org.codehaus.groovy.ast.stmt.DoWhileStatement -import org.codehaus.groovy.ast.stmt.ExpressionStatement -import org.codehaus.groovy.ast.stmt.ForStatement -import org.codehaus.groovy.ast.stmt.IfStatement -import org.codehaus.groovy.ast.stmt.ReturnStatement -import org.codehaus.groovy.ast.stmt.SwitchStatement -import org.codehaus.groovy.ast.stmt.SynchronizedStatement -import org.codehaus.groovy.ast.stmt.ThrowStatement -import org.codehaus.groovy.ast.stmt.TryCatchStatement -import org.codehaus.groovy.ast.stmt.WhileStatement +import org.codehaus.groovy.ast.expr.* +import org.codehaus.groovy.ast.stmt.* import org.codehaus.groovy.classgen.BytecodeExpression import org.codehaus.groovy.classgen.GeneratorContext import org.codehaus.groovy.control.CompilePhase import org.codehaus.groovy.control.SourceUnit import org.codehaus.groovy.control.customizers.CompilationCustomizer +import static org.codehaus.groovy.syntax.Types.* + /** * * @@ -278,8 +232,178 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - void visitBinaryExpression(BinaryExpression expression) { - throw new UnsupportedOperationException(); + private static Map BINARY_OP_TO_BUILDER_METHOD = [ + (COMPARE_EQUAL) :"compareEqual", + (COMPARE_NOT_EQUAL) :"compareNotEqual", + (COMPARE_TO) :"compareTo", + (COMPARE_GREATER_THAN) :"greaterThan", + (COMPARE_GREATER_THAN_EQUAL) :"greaterThanEqual", + (COMPARE_LESS_THAN) :"lessThan", + (COMPARE_LESS_THAN_EQUAL) :"lessThanEqual", + ] + + /** + * @see org.codehaus.groovy.classgen.asm.BinaryExpressionHelper#eval(BinaryExpression) + */ + void visitBinaryExpression(BinaryExpression exp) { + def body = {// for building CPS tree for two expressions + visit(exp.leftExpression) + visit(exp.rightExpression) + } + + def name = BINARY_OP_TO_BUILDER_METHOD[exp.operation.type] + if (name!=null) { + makeNode(name,body) + return; + } + +/* TODO: + // other unique cases + switch (exp.operation.type) { + case EQUAL: // = assignment + throw new UnsupportedOperationException(); + break; + + case LOGICAL_AND: + evaluateLogicalAndExpression(exp); + break; + + case LOGICAL_OR: + evaluateLogicalOrExpression(exp); + break; + + case BITWISE_AND: + evaluateBinaryExpression("and", exp); + break; + + case BITWISE_AND_EQUAL: + evaluateBinaryExpressionWithAssignment("and", exp); + break; + + case BITWISE_OR: + evaluateBinaryExpression("or", exp); + break; + + case BITWISE_OR_EQUAL: + evaluateBinaryExpressionWithAssignment("or", exp); + break; + + case BITWISE_XOR: + evaluateBinaryExpression("xor", exp); + break; + + case BITWISE_XOR_EQUAL: + evaluateBinaryExpressionWithAssignment("xor", exp); + break; + + case PLUS: + evaluateBinaryExpression("plus", exp); + break; + + case PLUS_EQUAL: + evaluateBinaryExpressionWithAssignment("plus", exp); + break; + + case MINUS: + evaluateBinaryExpression("minus", exp); + break; + + case MINUS_EQUAL: + evaluateBinaryExpressionWithAssignment("minus", exp); + break; + + case MULTIPLY: + evaluateBinaryExpression("multiply", exp); + break; + + case MULTIPLY_EQUAL: + evaluateBinaryExpressionWithAssignment("multiply", exp); + break; + + case DIVIDE: + evaluateBinaryExpression("div", exp); + break; + + case DIVIDE_EQUAL: + //SPG don't use divide since BigInteger implements directly + //and we want to dispatch through DefaultGroovyMethods to get a BigDecimal result + evaluateBinaryExpressionWithAssignment("div", exp); + break; + + case INTDIV: + evaluateBinaryExpression("intdiv", exp); + break; + + case INTDIV_EQUAL: + evaluateBinaryExpressionWithAssignment("intdiv", exp); + break; + + case MOD: + evaluateBinaryExpression("mod", exp); + break; + + case MOD_EQUAL: + evaluateBinaryExpressionWithAssignment("mod", exp); + break; + + case POWER: + evaluateBinaryExpression("power", exp); + break; + + case POWER_EQUAL: + evaluateBinaryExpressionWithAssignment("power", exp); + break; + + case LEFT_SHIFT: + evaluateBinaryExpression("leftShift", exp); + break; + + case LEFT_SHIFT_EQUAL: + evaluateBinaryExpressionWithAssignment("leftShift", exp); + break; + + case RIGHT_SHIFT: + evaluateBinaryExpression("rightShift", exp); + break; + + case RIGHT_SHIFT_EQUAL: + evaluateBinaryExpressionWithAssignment("rightShift", exp); + break; + + case RIGHT_SHIFT_UNSIGNED: + evaluateBinaryExpression("rightShiftUnsigned", exp); + break; + + case RIGHT_SHIFT_UNSIGNED_EQUAL: + evaluateBinaryExpressionWithAssignment("rightShiftUnsigned", exp); + break; + + case KEYWORD_INSTANCEOF: + evaluateInstanceof(exp); + break; + + case FIND_REGEX: + evaluateCompareExpression(findRegexMethod, exp); + break; + + case MATCH_REGEX: + evaluateCompareExpression(matchRegexMethod, exp); + break; + + case LEFT_SQUARE_BRACKET: + if (controller.getCompileStack().isLHS()) { + evaluateEqual(exp, false); + } else { + evaluateBinaryExpression("getAt", exp); + } + break; + + case KEYWORD_IN: + evaluateCompareExpression(isCaseMethod, exp); + break; +*/ + + throw new UnsupportedOperationException("Operation: " + exp.operation + " not supported"); } void visitPrefixExpression(PrefixExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 4c81254ec..27496fb39 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import org.codehaus.groovy.classgen.asm.MethodCaller; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; @@ -307,10 +308,34 @@ public Expression minus(Expression lhs, Expression rhs) { return functionCall(lhs,"minus",rhs); } + public Expression compareEqual(Expression lhs, Expression rhs) { + return staticCall(ScriptBytecodeAdapter.class,"compareEqual",lhs,rhs); + } + + public Expression compareNotEqual(Expression lhs, Expression rhs) { + return staticCall(ScriptBytecodeAdapter.class,"compareNotEqual",lhs,rhs); + } + + public Expression compareTo(Expression lhs, Expression rhs) { + return staticCall(ScriptBytecodeAdapter.class,"compareTo",lhs,rhs); + } + public Expression lessThan(Expression lhs, Expression rhs) { return staticCall(ScriptBytecodeAdapter.class,"compareLessThan",lhs,rhs); } + public Expression lessThanEqual(Expression lhs, Expression rhs) { + return staticCall(ScriptBytecodeAdapter.class,"compareLessThanEqual",lhs,rhs); + } + + public Expression greaterThan(Expression lhs, Expression rhs) { + return staticCall(ScriptBytecodeAdapter.class,"compareGreaterThan",lhs,rhs); + } + + public Expression greaterThanEqual(Expression lhs, Expression rhs) { + return staticCall(ScriptBytecodeAdapter.class,"compareGreaterThanEqual",lhs,rhs); + } + /** * LHS.name(...) */ diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 6c3a61eb8..cf744ee7c 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -53,6 +53,18 @@ class CpsTransformerTest { assert evalCPS("'hello world'.length()")==11 } + @Test + void comparison() { + for(int i in [1,2,3]) { + for (int j in [1,2,3]) { + assert evalCPS("${i} < ${j}") == (i ${j}") == (i>j); + assert evalCPS("${i} >= ${j}")== (i>=j); + } + } + } + @Test void forInLoop() { assert evalCPS("x=0; for (i in [1,2,3,4,5]) x+=i; return x;")==15; From a10243c4685b10f4c47b8ad52f09b79e8379ab25 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 13:59:29 -0800 Subject: [PATCH 040/932] Started working on a pattern that doesn't rely on anonymous continuation classes --- .../com/cloudbees/groovy/cps/Builder.java | 58 +++++++++---------- .../cloudbees/groovy/cps/Continuation.java | 7 +++ .../groovy/cps/ContinuationGroup.java | 28 +++++++++ .../cloudbees/groovy/cps/ContinuationPtr.java | 53 +++++++++++++++++ .../cloudbees/groovy/cps/ForLoopBlock.java | 54 +++++++++++++++++ 5 files changed, 168 insertions(+), 32 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/ContinuationPtr.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 27496fb39..889367795 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -1,6 +1,5 @@ package com.cloudbees.groovy.cps; -import org.codehaus.groovy.classgen.asm.MethodCaller; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; @@ -11,7 +10,7 @@ import java.util.List; import java.util.Map; -import static com.cloudbees.groovy.cps.Expression.NOOP; +import static com.cloudbees.groovy.cps.Expression.*; import static java.util.Arrays.*; import static java.util.Collections.*; @@ -153,36 +152,8 @@ public Expression if_(Expression cond, Expression then) { /** * for (e1; e2; e3) { ... } */ - public Expression forLoop(final Expression e1, final Expression e2, final Expression e3, final Expression body) { - return new Expression() { - public Next eval(Env _e, final Continuation loopEnd) { - final Env e = new BlockScopeEnv(_e); // a for-loop creates a new scope for variables declared in e1,e2, & e3 - - final Continuation loopHead = new Continuation() { - final Continuation _loopHead = this; // because 'loopHead' cannot be referenced from within the definition - - public Next receive(Object __) { - return new Next(e2,e,new Continuation() {// evaluate e2 - public Next receive(Object v2) { - if (asBoolean(v2)) { - // loop - return new Next(body,e,new Continuation() { - public Next receive(Object o) { - return new Next(e3,e,_loopHead); - } - }); - } else { - // exit loop - return loopEnd.receive(null); - } - } - }); - } - }; - - return e1.eval(e,loopHead); - } - }; + public Expression forLoop(Expression e1, Expression e2, Expression e3, Expression body) { + return new ForLoopBlock(e1,e2,e3,body); } /** @@ -336,6 +307,29 @@ public Expression greaterThanEqual(Expression lhs, Expression rhs) { return staticCall(ScriptBytecodeAdapter.class,"compareGreaterThanEqual",lhs,rhs); } + /** + * lhs && rhs + */ + public Expression logicalAnd(final Expression lhs, final Expression rhs) { + return new Expression() { + public Next eval(final Env e, final Continuation k) { + return new Next(lhs, e, new Continuation() { + public Next receive(Object lhs) { + Boolean o; + try { + o = (Boolean) ScriptBytecodeAdapter.castToType(lhs, boolean.class); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + if (!o) return k.receive(false); + + return new Next(rhs, e, k); + } + }); + } + }; + } + /** * LHS.name(...) */ diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 3f2a33305..3dce63dca 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -3,6 +3,13 @@ import static com.cloudbees.groovy.cps.Expression.*; /** + * Represents the remaining computation that receives the result of {@link Expression}. + * + *

+ * To maintain backward compatibility with serialized {@link Continuation} objects, it is preferable + * to avoid anonymous single-method classes that implement {@link Continuation}. See {@link ContinuationGroup} + * for how to do this. + * * @author Kohsuke Kawaguchi */ public interface Continuation { diff --git a/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java new file mode 100644 index 000000000..418b0baaa --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java @@ -0,0 +1,28 @@ +package com.cloudbees.groovy.cps; + +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; + +/** + * Base class for defining a series of {@link Continuation} methods that share the same set of contextual values. + * + * Subtypes are expected to define a number of methods that have the same signature as {@link Continuation#receive(Object)}. + * These methods can be wrapped into a {@link Continuation} instance via {@link #then(Expression, Env, ContinuationPtr)} method. + * + * @see ContinuationPtr + * @author Kohsuke Kawaguchi + */ +abstract class ContinuationGroup { + public Next then(Expression exp, Env e, ContinuationPtr ptr) { + return new Next(exp,e,ptr.bind(this)); + } + + protected final boolean asBoolean(Object o) { + try { + return (Boolean) ScriptBytecodeAdapter.asType(o, Boolean.class); + } catch (Throwable e) { + // TODO: exception handling + e.printStackTrace(); + return false; + } + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/ContinuationPtr.java b/src/main/java/com/cloudbees/groovy/cps/ContinuationPtr.java new file mode 100644 index 000000000..2994c5711 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/ContinuationPtr.java @@ -0,0 +1,53 @@ +package com.cloudbees.groovy.cps; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +/** + * Used to bind an instance method to a {@link Continuation} object. + * + *

+ * To wrap an instance method to a {@link Continuation}, we need three parameters: + * the class on which the method is defined, the name of the method, and the receiver instance. + * + *

+ * For a performance reason, the first two parameters are specified via the constructor, and the last + * parameter is given to the {@link #bind(Object)} method. This allows {@link ContinuationPtr}s to be + * created as static singletons. + * + * @see ContinuationGroup#then(Expression, Env, ContinuationPtr) + * @author Kohsuke Kawaguchi + */ +class ContinuationPtr { + private final Method m; + + ContinuationPtr(Class type, String methodName) { + try { + m = type.getMethod(methodName,Object.class); + } catch (NoSuchMethodException e) { + throw new AssertionError(e); + } + } + + /** + * Binds the pointer to a continuation method to a specific receiver instance. + */ + Continuation bind(final Object target) { + return new Continuation() { + public Next receive(Object o) { + try { + return (Next)m.invoke(target,o); + } catch (IllegalAccessException e) { + throw (IllegalAccessError)new IllegalAccessError().initCause(e); + } catch (InvocationTargetException e) { + Throwable t = e.getTargetException(); + if (t instanceof Error) + throw (Error) t; + if (t instanceof RuntimeException) + throw (RuntimeException) t; + throw new Error(e); + } + } + }; + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java new file mode 100644 index 000000000..3c1c6ec83 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java @@ -0,0 +1,54 @@ +package com.cloudbees.groovy.cps; + +/** + * for (e1; e2; e3) { ... body ... } + * + * @author Kohsuke Kawaguchi + */ +public class ForLoopBlock implements Expression { + final Expression e1, e2, e3, body; + + public ForLoopBlock(Expression e1, Expression e2, Expression e3, Expression body) { + this.e1 = e1; + this.e2 = e2; + this.e3 = e3; + this.body = body; + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).then(e1,e,loopHead); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation loopEnd; + final Env e; + + ContinuationImpl(Env e, Continuation loopEnd) { + this.e = new BlockScopeEnv(e); + this.loopEnd = loopEnd; + } + + public Next loopHead(Object _) { + return then(e2, e, loopCond); + } + + public Next loopCond(Object cond) { + if (asBoolean(cond)) { + // loop + return then(body,e,increment); + } else { + // exit loop + return loopEnd.receive(null); + } + } + + public Next increment(Object _) { + return then(e3,e,loopHead); + } + } + + static final ContinuationPtr loopHead = new ContinuationPtr(ContinuationImpl.class,"loopHead"); + static final ContinuationPtr loopCond = new ContinuationPtr(ContinuationImpl.class,"loopCond"); + static final ContinuationPtr increment = new ContinuationPtr(ContinuationImpl.class,"increment"); + +} From 5e1c7bdc1ecc8481b8ed101ac985ff684ac895ac Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 14:07:38 -0800 Subject: [PATCH 041/932] converted the if statement to the new style --- .../com/cloudbees/groovy/cps/Builder.java | 23 +----------- .../groovy/cps/ContinuationGroup.java | 7 ++++ .../cloudbees/groovy/cps/ForLoopBlock.java | 3 +- .../com/cloudbees/groovy/cps/IfBlock.java | 37 +++++++++++++++++++ 4 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/IfBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 889367795..d90a20fc9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -133,16 +133,8 @@ public Expression localVariableAssignOp(String name, String operator, Expression /** * if (...) { ... } else { ... } */ - public Expression if_(final Expression cond, final Expression then, final Expression els) { - return new Expression() { - public Next eval(final Env e, final Continuation k) { - return cond.eval(e,new Continuation() { - public Next receive(Object o) { - return (asBoolean(o) ? then : els).eval(e,k); - } - }); - } - }; + public Expression if_(Expression cond, Expression then, Expression els) { + return new IfBlock(cond,then,els); } public Expression if_(Expression cond, Expression then) { @@ -256,17 +248,6 @@ public Next receive(Object t) { }; } - - private boolean asBoolean(Object o) { - try { - return (Boolean)ScriptBytecodeAdapter.asType(o,Boolean.class); - } catch (Throwable e) { - // TODO: exception handling - e.printStackTrace(); - return false; - } - } - public Expression staticCall(Class lhs, String name, Expression... argExps) { return functionCall(constant(lhs),name,argExps); } diff --git a/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java index 418b0baaa..6e00ff21c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java @@ -16,6 +16,13 @@ public Next then(Expression exp, Env e, ContinuationPtr ptr) { return new Next(exp,e,ptr.bind(this)); } + public Next then(Expression exp, Env e, Continuation k) { + return new Next(exp,e,k); + } + + /** + * Casts the value to boolean by following the Groovy semantics. + */ protected final boolean asBoolean(Object o) { try { return (Boolean) ScriptBytecodeAdapter.asType(o, Boolean.class); diff --git a/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java index 3c1c6ec83..b54952a45 100644 --- a/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java @@ -16,7 +16,8 @@ public ForLoopBlock(Expression e1, Expression e2, Expression e3, Expression body } public Next eval(Env e, Continuation k) { - return new ContinuationImpl(e,k).then(e1,e,loopHead); + ContinuationImpl c = new ContinuationImpl(e, k); + return c.then(e1, c.e, loopHead); } class ContinuationImpl extends ContinuationGroup { diff --git a/src/main/java/com/cloudbees/groovy/cps/IfBlock.java b/src/main/java/com/cloudbees/groovy/cps/IfBlock.java new file mode 100644 index 000000000..a1bb5510c --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/IfBlock.java @@ -0,0 +1,37 @@ +package com.cloudbees.groovy.cps; + +/** + * if (...) { ... } else { ... } + * + * @author Kohsuke Kawaguchi + */ +public class IfBlock implements Expression { + final Expression cond, then, els; + + public IfBlock(Expression cond, Expression then, Expression els) { + this.cond = cond; + this.then = then; + this.els = els; + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).then(cond,e,jump); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next jump(Object cond) { + return then(asBoolean(cond) ? then : els,e,k); + } + } + + static final ContinuationPtr jump = new ContinuationPtr(ContinuationImpl.class,"jump"); + +} From f836cec5ef6773ec3f3136fcaa050910b9acaa18 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 14:08:58 -0800 Subject: [PATCH 042/932] to avoid name conflict with Groovy's AST Expression interface, renaming our 'Expression' to something else --- .../groovy/cps/CpsTransformer.groovy | 2 +- .../cps/{Expression.java => Block.java} | 4 +- .../com/cloudbees/groovy/cps/Builder.java | 136 +++++++++--------- .../cloudbees/groovy/cps/CatchExpression.java | 6 +- .../com/cloudbees/groovy/cps/Constant.java | 2 +- .../cloudbees/groovy/cps/Continuation.java | 4 +- .../groovy/cps/ContinuationGroup.java | 6 +- .../cloudbees/groovy/cps/ContinuationPtr.java | 2 +- .../cloudbees/groovy/cps/ForLoopBlock.java | 6 +- .../com/cloudbees/groovy/cps/Function.java | 4 +- .../com/cloudbees/groovy/cps/IfBlock.java | 6 +- .../java/com/cloudbees/groovy/cps/Next.java | 4 +- .../com/cloudbees/groovy/cps/BasicTest.java | 10 +- 13 files changed, 96 insertions(+), 96 deletions(-) rename src/main/java/com/cloudbees/groovy/cps/{Expression.java => Block.java} (76%) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 6b1ffcdaf..b54edb6e1 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -104,7 +104,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * Makes an AST fragment that calls {@link Builder} with specific method. * * @param args - * Can be closure for building argument nodes, Expression, or List of Expressions. + * Can be closure for building argument nodes, Block, or List of Expressions. */ private void makeNode(String methodName, Object args) { if (args instanceof Closure) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Expression.java b/src/main/java/com/cloudbees/groovy/cps/Block.java similarity index 76% rename from src/main/java/com/cloudbees/groovy/cps/Expression.java rename to src/main/java/com/cloudbees/groovy/cps/Block.java index 70ecf4fab..01ef55997 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Expression.java +++ b/src/main/java/com/cloudbees/groovy/cps/Block.java @@ -3,13 +3,13 @@ /** * @author Kohsuke Kawaguchi */ -public interface Expression { +public interface Block { Next eval(Env e, Continuation k); /** * A function that does nothing. */ - final static Expression NOOP = new Expression() { + final static Block NOOP = new Block() { public Next eval(Env e, Continuation k) { return k.receive(null); } diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index d90a20fc9..c1a684f6e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; -import static com.cloudbees.groovy.cps.Expression.*; +import static com.cloudbees.groovy.cps.Block.*; import static java.util.Arrays.*; import static java.util.Collections.*; @@ -18,40 +18,40 @@ * @author Kohsuke Kawaguchi */ public class Builder { - private static final Expression NULL = new Constant(null); + private static final Block NULL = new Constant(null); - public Expression null_() { + public Block null_() { return NULL; } - public Expression constant(Object o) { + public Block constant(Object o) { return new Constant(o); } - public Expression zero() { + public Block zero() { return constant(0); } - public Expression one() { + public Block one() { return constant(1); } - public Expression two() { + public Block two() { return constant(2); } - public Expression true_() { + public Block true_() { return constant(true); } - public Expression false_() { + public Block false_() { return constant(false); } - public Expression sequence(Expression... bodies) { + public Block sequence(Block... bodies) { if (bodies.length==0) return NULL; - Expression e = bodies[0]; + Block e = bodies[0]; for (int i=1; i catches) { - return new Expression() { + public Block tryCatch(final Block body, final List catches) { + return new Block() { public Next eval(final Env e, final Continuation k) { final TryBlockEnv f = new TryBlockEnv(e); for (final CatchExpression c : catches) { @@ -229,8 +229,8 @@ public Next receive(Object t) { /** * throw exp; */ - public Expression throw_(final Expression exp) { - return new Expression() { + public Block throw_(final Block exp) { + return new Block() { public Next eval(final Env e, Continuation k) { return new Next(exp,e,new Continuation() { public Next receive(Object t) { @@ -248,51 +248,51 @@ public Next receive(Object t) { }; } - public Expression staticCall(Class lhs, String name, Expression... argExps) { + public Block staticCall(Class lhs, String name, Block... argExps) { return functionCall(constant(lhs),name,argExps); } - public Expression plus(Expression lhs, Expression rhs) { + public Block plus(Block lhs, Block rhs) { return functionCall(lhs,"plus",rhs); } - public Expression minus(Expression lhs, Expression rhs) { + public Block minus(Block lhs, Block rhs) { return functionCall(lhs,"minus",rhs); } - public Expression compareEqual(Expression lhs, Expression rhs) { + public Block compareEqual(Block lhs, Block rhs) { return staticCall(ScriptBytecodeAdapter.class,"compareEqual",lhs,rhs); } - public Expression compareNotEqual(Expression lhs, Expression rhs) { + public Block compareNotEqual(Block lhs, Block rhs) { return staticCall(ScriptBytecodeAdapter.class,"compareNotEqual",lhs,rhs); } - public Expression compareTo(Expression lhs, Expression rhs) { + public Block compareTo(Block lhs, Block rhs) { return staticCall(ScriptBytecodeAdapter.class,"compareTo",lhs,rhs); } - public Expression lessThan(Expression lhs, Expression rhs) { + public Block lessThan(Block lhs, Block rhs) { return staticCall(ScriptBytecodeAdapter.class,"compareLessThan",lhs,rhs); } - public Expression lessThanEqual(Expression lhs, Expression rhs) { + public Block lessThanEqual(Block lhs, Block rhs) { return staticCall(ScriptBytecodeAdapter.class,"compareLessThanEqual",lhs,rhs); } - public Expression greaterThan(Expression lhs, Expression rhs) { + public Block greaterThan(Block lhs, Block rhs) { return staticCall(ScriptBytecodeAdapter.class,"compareGreaterThan",lhs,rhs); } - public Expression greaterThanEqual(Expression lhs, Expression rhs) { + public Block greaterThanEqual(Block lhs, Block rhs) { return staticCall(ScriptBytecodeAdapter.class,"compareGreaterThanEqual",lhs,rhs); } /** * lhs && rhs */ - public Expression logicalAnd(final Expression lhs, final Expression rhs) { - return new Expression() { + public Block logicalAnd(final Block lhs, final Block rhs) { + return new Block() { public Next eval(final Env e, final Continuation k) { return new Next(lhs, e, new Continuation() { public Next receive(Object lhs) { @@ -314,11 +314,11 @@ public Next receive(Object lhs) { /** * LHS.name(...) */ - public Expression functionCall(final Expression lhs, final String name, Expression... argExps) { + public Block functionCall(final Block lhs, final String name, Block... argExps) { final CallSite callSite = fakeCallSite(name); // name is statically determined - final Expression args = evalArgs(argExps); + final Block args = evalArgs(argExps); - return new Expression() { + return new Block() { public Next eval(final Env e, final Continuation k) { return new Next(lhs,e, new Continuation() {// evaluate lhs public Next receive(final Object lhs) { @@ -349,17 +349,17 @@ public Next receive(Object _args) { }; } - public Expression functionCall(final Expression lhs, final Expression name, Expression... argExps) { + public Block functionCall(final Block lhs, final Block name, Block... argExps) { if (name instanceof Constant) { // method name statically known. this common path enables a bit of optimization return functionCall(lhs,((Constant)name).value.toString(),argExps); } - final Expression args = evalArgs(argExps); + final Block args = evalArgs(argExps); // TODO: what is the correct evaluation order? - return new Expression() { + return new Block() { public Next eval(final Env e, final Continuation k) { return new Next(lhs,e, new Continuation() {// evaluate lhs public Next receive(final Object lhs) { @@ -400,9 +400,9 @@ public Next receive(Object _args) { // * // * TODO: is this the same as this.name(...) ? -> NO, not in closure // */ -// public Expression functionCall(final String name, Expression... argExps) { -// final Expression args = evalArgs(argExps); -// return new Expression() { +// public Block functionCall(final String name, Block... argExps) { +// final Block args = evalArgs(argExps); +// return new Block() { // public Next eval(final Env e, final Continuation k) { // return args.eval(e,new Continuation() { // public Next receive(Object args) { @@ -414,12 +414,12 @@ public Next receive(Object _args) { // }; // } - public Expression getProperty(Expression lhs, String property) { + public Block getProperty(Block lhs, String property) { return getProperty(lhs,constant(property)); } - public Expression getProperty(final Expression lhs, final Expression property) { - return new Expression() { + public Block getProperty(final Block lhs, final Block property) { + return new Block() { public Next eval(final Env e, final Continuation k) { return lhs.eval(e,new Continuation() { public Next receive(final Object lhs) { @@ -450,12 +450,12 @@ public Next receive(Object property) { }; } - public Expression setProperty(Expression lhs, String property, Expression rhs) { + public Block setProperty(Block lhs, String property, Block rhs) { return setProperty(lhs, constant(property), rhs); } - public Expression setProperty(final Expression lhs, final Expression property, final Expression rhs) { - return new Expression() { + public Block setProperty(final Block lhs, final Block property, final Block rhs) { + return new Block() { public Next eval(final Env e, final Continuation k) { return lhs.eval(e,new Continuation() { public Next receive(final Object lhs) { @@ -485,11 +485,11 @@ public Next receive(Object rhs) { /** * Object instantiation. */ - public Expression new_(final Class type, Expression... argExps) { + public Block new_(final Class type, Block... argExps) { final CallSite callSite = fakeCallSite(""); - final Expression args = evalArgs(argExps); + final Block args = evalArgs(argExps); - return new Expression() { + return new Block() { public Next eval(final Env e, final Continuation k) { return args.eval(e,new Continuation() { public Next receive(Object _args) { @@ -513,11 +513,11 @@ public Next receive(Object _args) { /** * Returns an expression that evaluates all the arguments and return it as a {@link List}. */ - private Expression evalArgs(final Expression... argExps) { + private Block evalArgs(final Block... argExps) { if (argExps.length==0) // no arguments to evaluate return new Constant(emptyList()); - return new Expression() { + return new Block() { public Next eval(final Env e, final Continuation k) { final List args = new ArrayList(argExps.length); // this is where we build up actual arguments @@ -542,8 +542,8 @@ public Next receive(Object o) { /** * return exp; */ - public Expression return_(final Expression exp) { - return new Expression() { + public Block return_(final Block exp) { + return new Block() { public Next eval(Env e, Continuation k) { return new Next(exp,e, e.getReturnAddress()); } diff --git a/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java b/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java index 87e01910a..32baec019 100644 --- a/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java +++ b/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java @@ -6,7 +6,7 @@ * Catch block in a try/catch statement. * * @author Kohsuke Kawaguchi - * @see Builder#tryCatch(Expression, List) + * @see Builder#tryCatch(Block, List) */ public class CatchExpression { /** @@ -22,9 +22,9 @@ public class CatchExpression { /** * Code that executes up on receiving an exception. */ - public final Expression handler; + public final Block handler; - public CatchExpression(Class type, String name, Expression handler) { + public CatchExpression(Class type, String name, Block handler) { this.name = name; this.handler = handler; this.type = type; diff --git a/src/main/java/com/cloudbees/groovy/cps/Constant.java b/src/main/java/com/cloudbees/groovy/cps/Constant.java index 2c2857e5b..687075bba 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Constant.java +++ b/src/main/java/com/cloudbees/groovy/cps/Constant.java @@ -5,7 +5,7 @@ * * @author Kohsuke Kawaguchi */ -class Constant implements Expression { +class Constant implements Block { public final Object value; public Constant(Object value) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 3dce63dca..a71f1a00c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -1,9 +1,9 @@ package com.cloudbees.groovy.cps; -import static com.cloudbees.groovy.cps.Expression.*; +import static com.cloudbees.groovy.cps.Block.*; /** - * Represents the remaining computation that receives the result of {@link Expression}. + * Represents the remaining computation that receives the result of {@link Block}. * *

* To maintain backward compatibility with serialized {@link Continuation} objects, it is preferable diff --git a/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java index 6e00ff21c..3a5e512c5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java @@ -6,17 +6,17 @@ * Base class for defining a series of {@link Continuation} methods that share the same set of contextual values. * * Subtypes are expected to define a number of methods that have the same signature as {@link Continuation#receive(Object)}. - * These methods can be wrapped into a {@link Continuation} instance via {@link #then(Expression, Env, ContinuationPtr)} method. + * These methods can be wrapped into a {@link Continuation} instance via {@link #then(Block, Env, ContinuationPtr)} method. * * @see ContinuationPtr * @author Kohsuke Kawaguchi */ abstract class ContinuationGroup { - public Next then(Expression exp, Env e, ContinuationPtr ptr) { + public Next then(Block exp, Env e, ContinuationPtr ptr) { return new Next(exp,e,ptr.bind(this)); } - public Next then(Expression exp, Env e, Continuation k) { + public Next then(Block exp, Env e, Continuation k) { return new Next(exp,e,k); } diff --git a/src/main/java/com/cloudbees/groovy/cps/ContinuationPtr.java b/src/main/java/com/cloudbees/groovy/cps/ContinuationPtr.java index 2994c5711..88464fee5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/ContinuationPtr.java +++ b/src/main/java/com/cloudbees/groovy/cps/ContinuationPtr.java @@ -15,7 +15,7 @@ * parameter is given to the {@link #bind(Object)} method. This allows {@link ContinuationPtr}s to be * created as static singletons. * - * @see ContinuationGroup#then(Expression, Env, ContinuationPtr) + * @see ContinuationGroup#then(Block, Env, ContinuationPtr) * @author Kohsuke Kawaguchi */ class ContinuationPtr { diff --git a/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java index b54952a45..76056d183 100644 --- a/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java @@ -5,10 +5,10 @@ * * @author Kohsuke Kawaguchi */ -public class ForLoopBlock implements Expression { - final Expression e1, e2, e3, body; +public class ForLoopBlock implements Block { + final Block e1, e2, e3, body; - public ForLoopBlock(Expression e1, Expression e2, Expression e3, Expression body) { + public ForLoopBlock(Block e1, Block e2, Block e3, Block body) { this.e1 = e1; this.e2 = e2; this.e3 = e3; diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java index 7fdf21d3c..a7943be89 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -8,10 +8,10 @@ * @author Kohsuke Kawaguchi */ public class Function { - final Expression body; + final Block body; final ImmutableList parameters; - public Function(List parameters, Expression body) { + public Function(List parameters, Block body) { this.body = body; this.parameters = ImmutableList.copyOf(parameters); } diff --git a/src/main/java/com/cloudbees/groovy/cps/IfBlock.java b/src/main/java/com/cloudbees/groovy/cps/IfBlock.java index a1bb5510c..7023817fd 100644 --- a/src/main/java/com/cloudbees/groovy/cps/IfBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/IfBlock.java @@ -5,10 +5,10 @@ * * @author Kohsuke Kawaguchi */ -public class IfBlock implements Expression { - final Expression cond, then, els; +public class IfBlock implements Block { + final Block cond, then, els; - public IfBlock(Expression cond, Expression then, Expression els) { + public IfBlock(Block cond, Block then, Block els) { this.cond = cond; this.then = then; this.els = els; diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 7419daf86..b605fbab6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -6,7 +6,7 @@ * @author Kohsuke Kawaguchi */ public class Next { - Expression f; + Block f; Env e; Continuation k; @@ -18,7 +18,7 @@ public class Next { */ private Object yield; - public Next(Expression f, Env e, Continuation k) { + public Next(Block f, Env e, Continuation k) { this.f = f; this.e = e; this.k = k; diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index c181d0cb7..b8bd4a7e3 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -13,9 +13,9 @@ public class BasicTest extends Assert { Builder b = new Builder(); // useful fragment of expressions - Expression $x = b.getLocalVariable("x"); - Expression $y = b.getLocalVariable("y"); - Expression $z = b.getLocalVariable("z"); + Block $x = b.getLocalVariable("x"); + Block $y = b.getLocalVariable("y"); + Block $z = b.getLocalVariable("z"); // 3 => 3 @@ -191,7 +191,7 @@ class Op { * throw new IllegalArgumentException(message) */ public Function throw_(int depth, String message) { - Expression $depth = b.getLocalVariable("depth"); + Block $depth = b.getLocalVariable("depth"); return new Function(asList("depth", "message"), b.sequence( b.if_(b.lessThan(b.zero(), $depth), @@ -299,7 +299,7 @@ public void blockScopedVariable() { // TODO: variable has to have a type for initialization } - private T run(Expression... bodies) { + private T run(Block... bodies) { Env e = new FunctionCallEnv(null,null,Continuation.HALT); Next p = new Next(b.sequence(bodies), e, Continuation.HALT); return (T)p.resume().yieldedValue(); From 74d1b877a9cdc31456e6941e92ec7f5d4ebbdfe8 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 14:12:50 -0800 Subject: [PATCH 043/932] Moved implementations to another package to show abstractions clearly --- .../com/cloudbees/groovy/cps/Builder.java | 5 ++++ .../com/cloudbees/groovy/cps/Constant.java | 18 --------------- .../cloudbees/groovy/cps/Continuation.java | 2 +- .../com/cloudbees/groovy/cps/Function.java | 1 + .../groovy/cps/{ => impl}/BlockScopeEnv.java | 7 ++++-- .../cloudbees/groovy/cps/impl/Constant.java | 23 +++++++++++++++++++ .../cps/{ => impl}/ContinuationGroup.java | 6 ++++- .../cps/{ => impl}/ContinuationPtr.java | 7 +++++- .../groovy/cps/{ => impl}/ForLoopBlock.java | 7 +++++- .../cps/{ => impl}/FunctionCallEnv.java | 10 +++++--- .../groovy/cps/{ => impl}/IfBlock.java | 7 +++++- .../groovy/cps/{ => impl}/ProxyEnv.java | 5 +++- .../groovy/cps/{ => impl}/TryBlockEnv.java | 12 ++++++---- .../com/cloudbees/groovy/cps/BasicTest.java | 1 + 14 files changed, 78 insertions(+), 33 deletions(-) delete mode 100644 src/main/java/com/cloudbees/groovy/cps/Constant.java rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/BlockScopeEnv.java (79%) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/Constant.java rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/ContinuationGroup.java (84%) rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/ContinuationPtr.java (90%) rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/ForLoopBlock.java (88%) rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/FunctionCallEnv.java (82%) rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/IfBlock.java (80%) rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/ProxyEnv.java (85%) rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/TryBlockEnv.java (65%) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index c1a684f6e..211294d87 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -1,5 +1,10 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.BlockScopeEnv; +import com.cloudbees.groovy.cps.impl.Constant; +import com.cloudbees.groovy.cps.impl.ForLoopBlock; +import com.cloudbees.groovy.cps.impl.IfBlock; +import com.cloudbees.groovy.cps.impl.TryBlockEnv; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; diff --git a/src/main/java/com/cloudbees/groovy/cps/Constant.java b/src/main/java/com/cloudbees/groovy/cps/Constant.java deleted file mode 100644 index 687075bba..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/Constant.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cloudbees.groovy.cps; - -/** - * - * - * @author Kohsuke Kawaguchi - */ -class Constant implements Block { - public final Object value; - - public Constant(Object value) { - this.value = value; - } - - public Next eval(Env e, Continuation k) { - return k.receive(value); - } -} diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index a71f1a00c..2ca44b5ad 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -7,7 +7,7 @@ * *

* To maintain backward compatibility with serialized {@link Continuation} objects, it is preferable - * to avoid anonymous single-method classes that implement {@link Continuation}. See {@link ContinuationGroup} + * to avoid anonymous single-method classes that implement {@link Continuation}. See {@link com.cloudbees.groovy.cps.impl.ContinuationGroup} * for how to do this. * * @author Kohsuke Kawaguchi diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/Function.java index a7943be89..fb1dcdf4a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ b/src/main/java/com/cloudbees/groovy/cps/Function.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import com.google.common.collect.ImmutableList; import java.util.List; diff --git a/src/main/java/com/cloudbees/groovy/cps/BlockScopeEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java similarity index 79% rename from src/main/java/com/cloudbees/groovy/cps/BlockScopeEnv.java rename to src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java index 74fd5542d..6d4d53c7d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/BlockScopeEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java @@ -1,4 +1,6 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Env; import java.util.HashMap; import java.util.Map; @@ -8,7 +10,8 @@ * * @author Kohsuke Kawaguchi */ -class BlockScopeEnv extends ProxyEnv { +// TODO: should be package local once all the impls move into this class +public class BlockScopeEnv extends ProxyEnv { private final Map locals = new HashMap(); public BlockScopeEnv(Env parent) { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java b/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java new file mode 100644 index 000000000..3df285fbe --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java @@ -0,0 +1,23 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** + * + * + * @author Kohsuke Kawaguchi + */ +public class Constant implements Block { + public final Object value; + + public Constant(Object value) { + this.value = value; + } + + public Next eval(Env e, Continuation k) { + return k.receive(value); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java similarity index 84% rename from src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java rename to src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 3a5e512c5..e98a3a0f7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -1,5 +1,9 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; /** diff --git a/src/main/java/com/cloudbees/groovy/cps/ContinuationPtr.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java similarity index 90% rename from src/main/java/com/cloudbees/groovy/cps/ContinuationPtr.java rename to src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java index 88464fee5..c56a891c5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/ContinuationPtr.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java @@ -1,4 +1,9 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java similarity index 88% rename from src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java rename to src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java index 76056d183..daeba72e4 100644 --- a/src/main/java/com/cloudbees/groovy/cps/ForLoopBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java @@ -1,4 +1,9 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; /** * for (e1; e2; e3) { ... body ... } diff --git a/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java similarity index 82% rename from src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java rename to src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index 93a6b2b96..f1d31f0b8 100644 --- a/src/main/java/com/cloudbees/groovy/cps/FunctionCallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -1,4 +1,7 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; import java.util.HashMap; import java.util.Map; @@ -6,7 +9,8 @@ /** * @author Kohsuke Kawaguchi */ -class FunctionCallEnv implements Env { +// TODO: should be package local once all the impls move into this class +public class FunctionCallEnv implements Env { // TODO: How do we correctly assign local variables to its scope? // TODO: delegate? @@ -25,7 +29,7 @@ class FunctionCallEnv implements Env { * @param caller * The environment of the call site. Can be null but only if the caller is outside CPS execution. */ - FunctionCallEnv(Env caller, Object _this, Continuation returnAddress) { + public FunctionCallEnv(Env caller, Object _this, Continuation returnAddress) { this.caller = caller; this.returnAddress = returnAddress; locals.put("this",_this); diff --git a/src/main/java/com/cloudbees/groovy/cps/IfBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java similarity index 80% rename from src/main/java/com/cloudbees/groovy/cps/IfBlock.java rename to src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java index 7023817fd..482383780 100644 --- a/src/main/java/com/cloudbees/groovy/cps/IfBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java @@ -1,4 +1,9 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; /** * if (...) { ... } else { ... } diff --git a/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java similarity index 85% rename from src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java rename to src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java index eb0882448..1eb0d1713 100644 --- a/src/main/java/com/cloudbees/groovy/cps/ProxyEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java @@ -1,4 +1,7 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; /** * @author Kohsuke Kawaguchi diff --git a/src/main/java/com/cloudbees/groovy/cps/TryBlockEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java similarity index 65% rename from src/main/java/com/cloudbees/groovy/cps/TryBlockEnv.java rename to src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java index 030aa3afa..e3a3fb0cb 100644 --- a/src/main/java/com/cloudbees/groovy/cps/TryBlockEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java @@ -1,4 +1,7 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; import java.util.LinkedHashMap; import java.util.Map; @@ -7,17 +10,18 @@ /** * @author Kohsuke Kawaguchi */ -class TryBlockEnv extends ProxyEnv { +// TODO: should be package local once all the impls move into this class +public class TryBlockEnv extends ProxyEnv { private final Map handlers = new LinkedHashMap(); - TryBlockEnv(Env parent) { + public TryBlockEnv(Env parent) { super(parent); } /** * Handlers can be only added immediately after instantiation. */ - void addHandler(Class type, Continuation k) { + public void addHandler(Class type, Continuation k) { handlers.put(type,k); } diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index b8bd4a7e3..37f6eb914 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.junit.Assert; import org.junit.Test; From b7bbfb545e7de135f3ebd0905afa53bd2d2e7b84 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 14:20:20 -0800 Subject: [PATCH 044/932] Refactored for(x in y) { ... } loop --- .../com/cloudbees/groovy/cps/Builder.java | 42 +---------- .../groovy/cps/impl/ForInLoopBlock.java | 72 +++++++++++++++++++ 2 files changed, 75 insertions(+), 39 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 211294d87..866520e33 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.impl.BlockScopeEnv; import com.cloudbees.groovy.cps.impl.Constant; +import com.cloudbees.groovy.cps.impl.ForInLoopBlock; import com.cloudbees.groovy.cps.impl.ForLoopBlock; import com.cloudbees.groovy.cps.impl.IfBlock; import com.cloudbees.groovy.cps.impl.TryBlockEnv; @@ -11,7 +12,6 @@ import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -156,46 +156,10 @@ public Block forLoop(Block e1, Block e2, Block e3, Block body) { /** * for (x in col) { ... } */ - public Block forInLoop(final Class type, final String variable, final Block collection, final Block body) { - return new Block() { - public Next eval(Env _e, final Continuation loopEnd) { - final Env e = new BlockScopeEnv(_e); // for the loop variable - e.declareVariable(type,variable); - - return collection.eval(e,new Continuation() { - public Next receive(Object col) { - final Iterator itr; - try { - itr = (Iterator) ScriptBytecodeAdapter.invokeMethod0(null/*unused*/, col, "iterator"); - } catch (Throwable e) { - // TODO: exception handling - e.printStackTrace(); - return loopEnd.receive(null); - } - - final Continuation loopHead = new Continuation() { - final Continuation _loopHead = this; // because 'loopHead' cannot be referenced from within the definition - - public Next receive(Object __) { - if (itr.hasNext()) { - // one more iteration - e.setLocalVariable(variable,itr.next()); - return body.eval(e,_loopHead); - } else { - // exit loop - return loopEnd.receive(null); - } - } - }; - - return loopHead.receive(null); - } - }); - } - }; + public Block forInLoop(Class type, String variable, Block collection, Block body) { + return new ForInLoopBlock(type,variable,collection,body); } - public Block tryCatch(Block body, CatchExpression... catches) { return tryCatch(body, asList(catches)); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java new file mode 100644 index 000000000..25a6e54aa --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java @@ -0,0 +1,72 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; + +import java.util.Iterator; + +/** + * for (Type var in col) { ... } + * + * @author Kohsuke Kawaguchi + */ +public class ForInLoopBlock implements Block { + final Class type; + final String variable; + final Block collection; + final Block body; + + public ForInLoopBlock(Class type, String variable, Block collection, Block body) { + this.type = type; + this.variable = variable; + this.collection = collection; + this.body = body; + } + + public Next eval(Env e, Continuation k) { + ContinuationImpl c = new ContinuationImpl(e, k); + return c.then(collection, e, loopHead); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation loopEnd; + final Env e; + + Iterator itr; + + ContinuationImpl(Env _e, Continuation loopEnd) { + this.e = new BlockScopeEnv(_e); + this.e.declareVariable(type,variable); + this.loopEnd = loopEnd; + } + + public Next loopHead(Object col) { + try { + itr = (Iterator) ScriptBytecodeAdapter.invokeMethod0(null/*unused*/, col, "iterator"); + } catch (Throwable e) { + // TODO: exception handling + e.printStackTrace(); + return loopEnd.receive(null); + } + + return increment(null); + } + + public Next increment(Object _) { + if (itr.hasNext()) { + // one more iteration + e.setLocalVariable(variable,itr.next()); + return then(body,e,increment); + } else { + // exit loop + return loopEnd.receive(null); + } + } + } + + static final ContinuationPtr loopHead = new ContinuationPtr(ContinuationImpl.class,"loopHead"); + static final ContinuationPtr increment = new ContinuationPtr(ContinuationImpl.class,"increment"); +} From d261b6280afdee69c7103c89e9af2de05db118b8 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 14:28:15 -0800 Subject: [PATCH 045/932] Implemented && and || --- .../groovy/cps/CpsTransformer.groovy | 10 +--- .../com/cloudbees/groovy/cps/Builder.java | 24 +++------ .../cloudbees/groovy/cps/impl/Constant.java | 2 +- .../groovy/cps/impl/LogicalOpBlock.java | 49 +++++++++++++++++++ 4 files changed, 60 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index b54edb6e1..471581e41 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -240,6 +240,8 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor (COMPARE_GREATER_THAN_EQUAL) :"greaterThanEqual", (COMPARE_LESS_THAN) :"lessThan", (COMPARE_LESS_THAN_EQUAL) :"lessThanEqual", + (LOGICAL_AND) :"logicanAnd", + (LOGICAL_OR) :"logicanOr", ] /** @@ -264,14 +266,6 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); break; - case LOGICAL_AND: - evaluateLogicalAndExpression(exp); - break; - - case LOGICAL_OR: - evaluateLogicalOrExpression(exp); - break; - case BITWISE_AND: evaluateBinaryExpression("and", exp); break; diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 866520e33..c167219eb 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -5,6 +5,7 @@ import com.cloudbees.groovy.cps.impl.ForInLoopBlock; import com.cloudbees.groovy.cps.impl.ForLoopBlock; import com.cloudbees.groovy.cps.impl.IfBlock; +import com.cloudbees.groovy.cps.impl.LogicalOpBlock; import com.cloudbees.groovy.cps.impl.TryBlockEnv; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; @@ -261,23 +262,14 @@ public Block greaterThanEqual(Block lhs, Block rhs) { * lhs && rhs */ public Block logicalAnd(final Block lhs, final Block rhs) { - return new Block() { - public Next eval(final Env e, final Continuation k) { - return new Next(lhs, e, new Continuation() { - public Next receive(Object lhs) { - Boolean o; - try { - o = (Boolean) ScriptBytecodeAdapter.castToType(lhs, boolean.class); - } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling - } - if (!o) return k.receive(false); + return new LogicalOpBlock(lhs,rhs,true); + } - return new Next(rhs, e, k); - } - }); - } - }; + /** + * lhs || rhs + */ + public Block logicalOr(final Block lhs, final Block rhs) { + return new LogicalOpBlock(lhs,rhs,false); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java b/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java index 3df285fbe..2cfeea53b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java @@ -6,7 +6,7 @@ import com.cloudbees.groovy.cps.Next; /** - * + * Constant value. * * @author Kohsuke Kawaguchi */ diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java new file mode 100644 index 000000000..f2df41fb6 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java @@ -0,0 +1,49 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** + * Logical operator (&& and ||) + * + * @author Kohsuke Kawaguchi + */ +public class LogicalOpBlock implements Block { + private final Block lhs, rhs; + private final boolean and; + + public LogicalOpBlock(Block lhs, Block rhs, boolean and) { + this.lhs = lhs; + this.rhs = rhs; + this.and = and; + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).then(lhs,e,decide); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next decide(Object lhs) { + boolean v = asBoolean(lhs); + if (and) { + if (!v) return k.receive(false); // false && ... + else return then(rhs,e,k); + } else { + if (v) return k.receive(true); // true || ... + else return then(rhs,e,k); + } + } + } + + static final ContinuationPtr decide = new ContinuationPtr(ContinuationImpl.class,"decide"); +} From 9e3c5cf9bbe203b90d70667d57c6f8668b22d4ca Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 9 Feb 2014 14:37:12 -0800 Subject: [PATCH 046/932] adding a bunch more operators --- .../groovy/cps/CpsTransformer.groovy | 52 ++++--------------- .../com/cloudbees/groovy/cps/Builder.java | 36 ++++++++++++- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 471581e41..7e3699d5f 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -242,6 +242,16 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor (COMPARE_LESS_THAN_EQUAL) :"lessThanEqual", (LOGICAL_AND) :"logicanAnd", (LOGICAL_OR) :"logicanOr", + (BITWISE_AND) :"bitwiseAnd", + (BITWISE_OR) :"bitwiseOr", + (BITWISE_XOR) :"bitwiseXor", + (PLUS) :"plus", + (MINUS) :"minus", + (MULTIPLY) :"multiply", + (DIVIDE) :"div", + (INTDIV) :"intdiv", + (MOD) :"mod", + (POWER) :"power", ] /** @@ -259,91 +269,51 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor return; } -/* TODO: +/* TODO: from BinaryExpressionHelper // other unique cases switch (exp.operation.type) { case EQUAL: // = assignment throw new UnsupportedOperationException(); break; - case BITWISE_AND: - evaluateBinaryExpression("and", exp); - break; - case BITWISE_AND_EQUAL: evaluateBinaryExpressionWithAssignment("and", exp); break; - case BITWISE_OR: - evaluateBinaryExpression("or", exp); - break; - case BITWISE_OR_EQUAL: evaluateBinaryExpressionWithAssignment("or", exp); break; - case BITWISE_XOR: - evaluateBinaryExpression("xor", exp); - break; - case BITWISE_XOR_EQUAL: evaluateBinaryExpressionWithAssignment("xor", exp); break; - case PLUS: - evaluateBinaryExpression("plus", exp); - break; - case PLUS_EQUAL: evaluateBinaryExpressionWithAssignment("plus", exp); break; - case MINUS: - evaluateBinaryExpression("minus", exp); - break; - case MINUS_EQUAL: evaluateBinaryExpressionWithAssignment("minus", exp); break; - case MULTIPLY: - evaluateBinaryExpression("multiply", exp); - break; - case MULTIPLY_EQUAL: evaluateBinaryExpressionWithAssignment("multiply", exp); break; - case DIVIDE: - evaluateBinaryExpression("div", exp); - break; - case DIVIDE_EQUAL: //SPG don't use divide since BigInteger implements directly //and we want to dispatch through DefaultGroovyMethods to get a BigDecimal result evaluateBinaryExpressionWithAssignment("div", exp); break; - case INTDIV: - evaluateBinaryExpression("intdiv", exp); - break; - case INTDIV_EQUAL: evaluateBinaryExpressionWithAssignment("intdiv", exp); break; - case MOD: - evaluateBinaryExpression("mod", exp); - break; - case MOD_EQUAL: evaluateBinaryExpressionWithAssignment("mod", exp); break; - case POWER: - evaluateBinaryExpression("power", exp); - break; - case POWER_EQUAL: evaluateBinaryExpressionWithAssignment("power", exp); break; diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index c167219eb..44cf975d2 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -230,6 +230,26 @@ public Block minus(Block lhs, Block rhs) { return functionCall(lhs,"minus",rhs); } + public Block multiply(Block lhs, Block rhs) { + return functionCall(lhs,"multiply",rhs); + } + + public Block div(Block lhs, Block rhs) { + return functionCall(lhs,"div",rhs); + } + + public Block intdiv(Block lhs, Block rhs) { + return functionCall(lhs,"intdiv",rhs); + } + + public Block mod(Block lhs, Block rhs) { + return functionCall(lhs,"mod",rhs); + } + + public Block power(Block lhs, Block rhs) { + return functionCall(lhs,"power",rhs); + } + public Block compareEqual(Block lhs, Block rhs) { return staticCall(ScriptBytecodeAdapter.class,"compareEqual",lhs,rhs); } @@ -261,17 +281,29 @@ public Block greaterThanEqual(Block lhs, Block rhs) { /** * lhs && rhs */ - public Block logicalAnd(final Block lhs, final Block rhs) { + public Block logicalAnd(Block lhs, Block rhs) { return new LogicalOpBlock(lhs,rhs,true); } /** * lhs || rhs */ - public Block logicalOr(final Block lhs, final Block rhs) { + public Block logicalOr(Block lhs, Block rhs) { return new LogicalOpBlock(lhs,rhs,false); } + public Block bitwiseAnd(Block lhs, Block rhs) { + return functionCall(lhs,"and",rhs); + } + + public Block bitwiseOr(Block lhs, Block rhs) { + return functionCall(lhs,"or",rhs); + } + + public Block bitwiseXor(Block lhs, Block rhs) { + return functionCall(lhs,"xor",rhs); + } + /** * LHS.name(...) */ From f5fbcc0646b8d4aa2279c158ca8f51208a7799bf Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 04:36:32 -0800 Subject: [PATCH 047/932] fixed up the handling of l-value --- .../com/cloudbees/groovy/cps/Builder.java | 85 +++--------------- .../java/com/cloudbees/groovy/cps/LValue.java | 20 +++++ .../com/cloudbees/groovy/cps/LValueBlock.java | 56 ++++++++++++ .../groovy/cps/impl/AssignmentBlock.java | 50 +++++++++++ .../cloudbees/groovy/cps/impl/IfBlock.java | 1 - .../groovy/cps/impl/PropertyAccessBlock.java | 88 +++++++++++++++++++ test.groovy | 20 ++++- 7 files changed, 242 insertions(+), 78 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/LValue.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/LValueBlock.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 44cf975d2..b814e5037 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -1,11 +1,13 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.AssignmentBlock; import com.cloudbees.groovy.cps.impl.BlockScopeEnv; import com.cloudbees.groovy.cps.impl.Constant; import com.cloudbees.groovy.cps.impl.ForInLoopBlock; import com.cloudbees.groovy.cps.impl.ForLoopBlock; import com.cloudbees.groovy.cps.impl.IfBlock; import com.cloudbees.groovy.cps.impl.LogicalOpBlock; +import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; import com.cloudbees.groovy.cps.impl.TryBlockEnv; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; @@ -133,7 +135,7 @@ public Block this_() { * Assignment operator to a local variable, such as "x += 3" */ public Block localVariableAssignOp(String name, String operator, Block rhs) { - return setLocalVariable(name, functionCall(getLocalVariable(name),operator,rhs)); + return setLocalVariable(name, functionCall(getLocalVariable(name), operator, rhs)); } /** @@ -388,91 +390,24 @@ public Next receive(Object _args) { }; } -// /** -// * name(...) -// * -// * TODO: is this the same as this.name(...) ? -> NO, not in closure -// */ -// public Block functionCall(final String name, Block... argExps) { -// final Block args = evalArgs(argExps); -// return new Block() { -// public Next eval(final Env e, final Continuation k) { -// return args.eval(e,new Continuation() { -// public Next receive(Object args) { -// final Function f = e.resolveFunction(name); -// return f.invoke((List)args,k); -// } -// }); -// } -// }; -// } + public Block assign(LValueBlock lhs, Block rhs) { + return new AssignmentBlock(lhs,rhs); + } public Block getProperty(Block lhs, String property) { return getProperty(lhs,constant(property)); } - public Block getProperty(final Block lhs, final Block property) { - return new Block() { - public Next eval(final Env e, final Continuation k) { - return lhs.eval(e,new Continuation() { - public Next receive(final Object lhs) { - return new Next(property,e,new Continuation() { - public Next receive(Object property) { - Object v; - try { - // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String - v = ScriptBytecodeAdapter.getProperty(null/*Groovy doesn't use this parameter*/, - lhs, (String) property); - } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling - } - - if (v instanceof Function) { - // if this is a workflow function, it'd return a Function object instead - // of actually executing the function, so execute it in the CPS - return ((Function)v).invoke(e, lhs, emptyList(),k); - } else { - // if this was a normal property, we get the value as-is. - return k.receive(v); - } - } - }); - } - }); - } - }; + public Block getProperty(Block lhs, Block property) { + return new PropertyAccessBlock(lhs,property); } public Block setProperty(Block lhs, String property, Block rhs) { return setProperty(lhs, constant(property), rhs); } - public Block setProperty(final Block lhs, final Block property, final Block rhs) { - return new Block() { - public Next eval(final Env e, final Continuation k) { - return lhs.eval(e,new Continuation() { - public Next receive(final Object lhs) { - return new Next(property,e,new Continuation() { - public Next receive(final Object property) { - return new Next(rhs,e,new Continuation() { - public Next receive(Object rhs) { - try { - // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String - ScriptBytecodeAdapter.setProperty(rhs, - null/*Groovy doesn't use this parameter*/, - lhs, (String) property); - } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling - } - return k.receive(null); - } - }); - } - }); - } - }); - } - }; + public Block setProperty(Block lhs, Block property, Block rhs) { + return assign(new PropertyAccessBlock(lhs,property),rhs); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/LValue.java b/src/main/java/com/cloudbees/groovy/cps/LValue.java new file mode 100644 index 000000000..ca7e015f3 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/LValue.java @@ -0,0 +1,20 @@ +package com.cloudbees.groovy.cps; + +/** + * Represents a variable that's assignable, which is produced + * by evaluating {@link LValueBlock}, such as "x[y]" + * + * + * @author Kohsuke Kawaguchi + */ +public interface LValue { + /** + * Computes the value, and passes it to the given continuation when done. + */ + Next get(Continuation k); + + /** + * Sets the given value to this variable, and passes {@code null} to the given continuation when done. + */ + Next set(Object v, Continuation k); +} diff --git a/src/main/java/com/cloudbees/groovy/cps/LValueBlock.java b/src/main/java/com/cloudbees/groovy/cps/LValueBlock.java new file mode 100644 index 000000000..d297c1199 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/LValueBlock.java @@ -0,0 +1,56 @@ +package com.cloudbees.groovy.cps; + +/** + * Base class for {@link Block} that can come to the left hand side of an assignement, aka "l-value" + * + * Subtypes implement {@link #evalLValue(Env, Continuation)} that computes {@link LValue} object, + * which provides read/write access. + * + * @author Kohsuke Kawaguchi + */ +public abstract class LValueBlock implements Block { + /** + * Evaluates to the value. Getter. + */ + public final Next eval(Env e, Continuation k) { + return asLValue().eval(e, new GetAdapter(k)); + } + + /** + * Passes the {@link LValue#get(Continuation)} to the wrapped continuation + */ + private static class GetAdapter implements Continuation { + private final Continuation k; + + public GetAdapter(Continuation k) { + this.k = k; + } + + public Next receive(Object l) { + return ((LValue)l).get(k); + } + } + + /** + * Evaluate the block as {@link LValue} and pass it to {@link Continuation} when done. + * + *

+ * {@link LValue} can then be used to set the value. + */ + protected abstract Next evalLValue(Env e, Continuation k); + + /** + * Obtains an {@link Block} that's equivalent to this block except it "returns" + * an {@link LValue}. + */ + public final Block asLValue() { + return new BlockImpl(); + } + + + private class BlockImpl implements Block { + public Next eval(Env e, Continuation k) { + return evalLValue(e,k); + } + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java new file mode 100644 index 000000000..d140c1982 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java @@ -0,0 +1,50 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.LValue; +import com.cloudbees.groovy.cps.LValueBlock; +import com.cloudbees.groovy.cps.Next; + +/** + * Assignment operator {@code exp=rhs} + * + * @author Kohsuke Kawaguchi + */ +public class AssignmentBlock implements Block { + private final Block lhsExp,rhsExp; + + public AssignmentBlock(LValueBlock lhsExp, Block rhsExp) { + this.lhsExp = lhsExp.asLValue(); + this.rhsExp = rhsExp; + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).then(lhsExp,e,fixLhs); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + LValue lhs; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next fixLhs(Object lhs) { + this.lhs = (LValue)lhs; + return then(rhsExp,e,fixRhs); + } + + public Next fixRhs(Object rhs) { + return lhs.set(rhs,k); + } + } + + static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); + static final ContinuationPtr fixRhs = new ContinuationPtr(ContinuationImpl.class,"fixRhs"); +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java index 482383780..0d20fc636 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java @@ -38,5 +38,4 @@ public Next jump(Object cond) { } static final ContinuationPtr jump = new ContinuationPtr(ContinuationImpl.class,"jump"); - } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java new file mode 100644 index 000000000..637a670bb --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -0,0 +1,88 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Function; +import com.cloudbees.groovy.cps.LValue; +import com.cloudbees.groovy.cps.LValueBlock; +import com.cloudbees.groovy.cps.Next; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; + +import static java.util.Collections.*; + +/** + * Property access expression like {@code foo.bar}, which is an l-value. + * + * @author Kohsuke Kawaguchi + */ +public class PropertyAccessBlock extends LValueBlock { + private final Block lhs, property; + + public PropertyAccessBlock(Block lhs, Block property) { + this.lhs = lhs; + this.property = property; + } + + public Next evalLValue(final Env e, final Continuation k) { + return new ContinuationImpl(e,k).then(lhs,e,fixLhs); + } + + class ContinuationImpl extends ContinuationGroup implements LValue { + final Continuation k; + final Env e; + + Object lhs; + String name; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next fixLhs(Object lhs) { + this.lhs = lhs; + return then(property,e,fixName); + } + + public Next fixName(Object name) { + // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String + this.name = name.toString(); + + return k.receive(this); + } + + public Next get(Continuation k) { + Object v; + try { + v = ScriptBytecodeAdapter.getProperty(null/*Groovy doesn't use this parameter*/, lhs, name); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + + if (v instanceof Function) { + // if this is a workflow function, it'd return a Function object instead + // of actually executing the function, so execute it in the CPS + return ((Function)v).invoke(e, lhs, emptyList(),k); + } else { + // if this was a normal property, we get the value as-is. + return k.receive(v); + } + } + + public Next set(Object v, Continuation k) { + // TODO: how to handle the case when a setter is a workflow method? + + try { + ScriptBytecodeAdapter.setProperty(v, null/*Groovy doesn't use this parameter*/, lhs, name); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + + return k.receive(null); + } + } + + static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); + static final ContinuationPtr fixName = new ContinuationPtr(ContinuationImpl.class,"fixName"); +} diff --git a/test.groovy b/test.groovy index 51d473e07..4ebd95bff 100644 --- a/test.groovy +++ b/test.groovy @@ -1,2 +1,18 @@ -int x; -println x; + +def x() { + println "eval x" + return new int[1] +} + +def y() { + println "eval y" + return 0; +} + +def z() { + println "eval z" + return 1 +} + +x()[y()] = z() + From 6e62cd1ee249d8002ddfff6d498d5aab760cfd11 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 04:38:59 -0800 Subject: [PATCH 048/932] remaining future expansions --- .../java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java index d140c1982..fc01221cc 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java @@ -10,6 +10,9 @@ /** * Assignment operator {@code exp=rhs} * + * TODO: tuple assignment + * TODO: assignment operators like x+=y + * * @author Kohsuke Kawaguchi */ public class AssignmentBlock implements Block { From 024d1ec91944a8194499d5aff1587932246182a4 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 04:39:14 -0800 Subject: [PATCH 049/932] consistent naming --- src/main/java/com/cloudbees/groovy/cps/Builder.java | 12 ++++++------ .../cps/impl/{Constant.java => ConstantBlock.java} | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/com/cloudbees/groovy/cps/impl/{Constant.java => ConstantBlock.java} (82%) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index b814e5037..a37961bca 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -2,7 +2,7 @@ import com.cloudbees.groovy.cps.impl.AssignmentBlock; import com.cloudbees.groovy.cps.impl.BlockScopeEnv; -import com.cloudbees.groovy.cps.impl.Constant; +import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.ForInLoopBlock; import com.cloudbees.groovy.cps.impl.ForLoopBlock; import com.cloudbees.groovy.cps.impl.IfBlock; @@ -26,14 +26,14 @@ * @author Kohsuke Kawaguchi */ public class Builder { - private static final Block NULL = new Constant(null); + private static final Block NULL = new ConstantBlock(null); public Block null_() { return NULL; } public Block constant(Object o) { - return new Constant(o); + return new ConstantBlock(o); } public Block zero() { @@ -345,9 +345,9 @@ public Next receive(Object _args) { } public Block functionCall(final Block lhs, final Block name, Block... argExps) { - if (name instanceof Constant) { + if (name instanceof ConstantBlock) { // method name statically known. this common path enables a bit of optimization - return functionCall(lhs,((Constant)name).value.toString(),argExps); + return functionCall(lhs,((ConstantBlock)name).value.toString(),argExps); } final Block args = evalArgs(argExps); @@ -443,7 +443,7 @@ public Next receive(Object _args) { */ private Block evalArgs(final Block... argExps) { if (argExps.length==0) // no arguments to evaluate - return new Constant(emptyList()); + return new ConstantBlock(emptyList()); return new Block() { public Next eval(final Env e, final Continuation k) { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java b/src/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java similarity index 82% rename from src/main/java/com/cloudbees/groovy/cps/impl/Constant.java rename to src/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java index 2cfeea53b..174016467 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/Constant.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java @@ -10,10 +10,10 @@ * * @author Kohsuke Kawaguchi */ -public class Constant implements Block { +public class ConstantBlock implements Block { public final Object value; - public Constant(Object value) { + public ConstantBlock(Object value) { this.value = value; } From 7486198098aad9411838a31638a6930bba60c908 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 04:40:18 -0800 Subject: [PATCH 050/932] added assignment operator handling --- .../groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 7e3699d5f..723d67cc8 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -252,6 +252,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor (INTDIV) :"intdiv", (MOD) :"mod", (POWER) :"power", + (EQUAL) :"assign", ] /** @@ -272,9 +273,6 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor /* TODO: from BinaryExpressionHelper // other unique cases switch (exp.operation.type) { - case EQUAL: // = assignment - throw new UnsupportedOperationException(); - break; case BITWISE_AND_EQUAL: evaluateBinaryExpressionWithAssignment("and", exp); From 0a24a06ac990baeb716f09ebcb04140983f4e4aa Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 05:02:03 -0800 Subject: [PATCH 051/932] supported compound assignment operators --- .../groovy/cps/CpsTransformer.groovy | 5 +- .../com/cloudbees/groovy/cps/Builder.java | 6 +- .../groovy/cps/impl/AssignmentBlock.java | 60 ++++++++++++++++++- .../groovy/cps/impl/ContinuationGroup.java | 9 +++ 4 files changed, 73 insertions(+), 7 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 723d67cc8..8356931bd 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -246,6 +246,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor (BITWISE_OR) :"bitwiseOr", (BITWISE_XOR) :"bitwiseXor", (PLUS) :"plus", + (PLUS_EQUAL) :"plusEqual", (MINUS) :"minus", (MULTIPLY) :"multiply", (DIVIDE) :"div", @@ -286,10 +287,6 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor evaluateBinaryExpressionWithAssignment("xor", exp); break; - case PLUS_EQUAL: - evaluateBinaryExpressionWithAssignment("plus", exp); - break; - case MINUS_EQUAL: evaluateBinaryExpressionWithAssignment("minus", exp); break; diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index a37961bca..9d8223133 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -228,6 +228,10 @@ public Block plus(Block lhs, Block rhs) { return functionCall(lhs,"plus",rhs); } + public Block plusEqual(LValueBlock lhs, Block rhs) { + return new AssignmentBlock(lhs,rhs, "plus"); + } + public Block minus(Block lhs, Block rhs) { return functionCall(lhs,"minus",rhs); } @@ -391,7 +395,7 @@ public Next receive(Object _args) { } public Block assign(LValueBlock lhs, Block rhs) { - return new AssignmentBlock(lhs,rhs); + return new AssignmentBlock(lhs,rhs, null); } public Block getProperty(Block lhs, String property) { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java index fc01221cc..fa444f672 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java @@ -3,9 +3,13 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Function; import com.cloudbees.groovy.cps.LValue; import com.cloudbees.groovy.cps.LValueBlock; import com.cloudbees.groovy.cps.Next; +import org.codehaus.groovy.runtime.callsite.CallSite; + +import java.util.Collections; /** * Assignment operator {@code exp=rhs} @@ -18,7 +22,13 @@ public class AssignmentBlock implements Block { private final Block lhsExp,rhsExp; - public AssignmentBlock(LValueBlock lhsExp, Block rhsExp) { + /** + * For compound assignment operator (such as ^=), set the operator method here. + */ + private final String compoundOp; + + public AssignmentBlock(LValueBlock lhsExp, Block rhsExp, String compoundOp) { + this.compoundOp = compoundOp; this.lhsExp = lhsExp.asLValue(); this.rhsExp = rhsExp; } @@ -32,22 +42,68 @@ class ContinuationImpl extends ContinuationGroup { final Env e; LValue lhs; + Object rhs,cur; ContinuationImpl(Env e, Continuation k) { this.e = e; this.k = k; } + /** + * Computes {@link LValue} + */ public Next fixLhs(Object lhs) { this.lhs = (LValue)lhs; + + if (compoundOp==null) + return then(rhsExp,e,assignAndDone); + else + return ((LValue) lhs).get(fixCur.bind(this)); + } + + /** + * Just straight assignment from RHS to LHS, then done + */ + public Next assignAndDone(Object rhs) { + return lhs.set(rhs,k); // just straight assignment + } + + /** + * Computed the current value of {@link LValue} for compound assignment. + * Evaluate rhs. + */ + public Next fixCur(Object cur) { + this.cur = cur; return then(rhsExp,e,fixRhs); } + /** + * Evaluated rhs. + * Invoke the operator + */ public Next fixRhs(Object rhs) { - return lhs.set(rhs,k); + + Object v; + try { + CallSite callSite = fakeCallSite(compoundOp); + v = callSite.call(this.cur, rhs); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + + if (v instanceof Function) { + // if this is a workflow function, it'd return a Function object instead + // of actually executing the function, so execute it in the CPS + return ((Function)v).invoke(e,cur, Collections.singletonList(rhs), assignAndDone.bind(this)); + } else { + // if this was a normal function, the method had just executed synchronously + return assignAndDone(v); + } } } static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); + static final ContinuationPtr assignAndDone = new ContinuationPtr(ContinuationImpl.class,"assignAndDone"); + static final ContinuationPtr fixCur = new ContinuationPtr(ContinuationImpl.class,"fixCur"); static final ContinuationPtr fixRhs = new ContinuationPtr(ContinuationImpl.class,"fixRhs"); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index e98a3a0f7..8203966ab 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -5,6 +5,8 @@ import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +import org.codehaus.groovy.runtime.callsite.CallSite; +import org.codehaus.groovy.runtime.callsite.CallSiteArray; /** * Base class for defining a series of {@link Continuation} methods that share the same set of contextual values. @@ -36,4 +38,11 @@ protected final boolean asBoolean(Object o) { return false; } } + + /*TODO: specify the proper owner value (to the script that includes the call site) */ + protected static CallSite fakeCallSite(String method) { + CallSiteArray csa = new CallSiteArray(ContinuationGroup.class, new String[]{method}); + return csa.array[0]; + } + } From 4df2648778a8b53defd81b30329dadacec693799 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 05:39:32 -0800 Subject: [PATCH 052/932] refactored local variable handling and added it to CpsTransformer --- .../groovy/cps/CpsTransformer.groovy | 28 +++++++++++++-- .../com/cloudbees/groovy/cps/Builder.java | 36 ++++++------------- .../groovy/cps/impl/LocalVariableBlock.java | 33 +++++++++++++++++ .../com/cloudbees/groovy/cps/BasicTest.java | 22 ++++++------ src/test/java/foo.groovy | 2 +- test.groovy | 21 ++--------- 6 files changed, 83 insertions(+), 59 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 8356931bd..345bf3650 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -103,6 +103,8 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor /** * Makes an AST fragment that calls {@link Builder} with specific method. * + * @param methodName + * Method on {@link Builder} to call. * @param args * Can be closure for building argument nodes, Block, or List of Expressions. */ @@ -120,7 +122,12 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - parent(new MethodCallExpression(BUILDER, methodName, new TupleExpression(args))); + def tuple = args==null ? new TupleExpression() : new TupleExpression(args) + parent(new MethodCallExpression(BUILDER, methodName, tuple)); + } + + private void makeNode(String methodName) { + makeNode(methodName,null) } /** @@ -425,8 +432,23 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor makeNode("constant", expression) } - void visitVariableExpression(VariableExpression expression) { - throw new UnsupportedOperationException(); + void visitVariableExpression(VariableExpression exp) { + def ref = exp.accessedVariable + if (ref instanceof VariableExpression /* local variable */ + || ref instanceof Parameter) { + makeNode("localVariable") { + literal(exp.name) + } + } else + if (ref instanceof DynamicVariable + || ref instanceof PropertyNode + || ref instanceof FieldNode) { + makeNode("property") { + makeNode("this_") + literal(exp.name) + } + } else + throw new UnsupportedOperationException("Unexpected variable type: ${ref.class}"); } void visitDeclarationExpression(DeclarationExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 9d8223133..d4b3cebc9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -6,6 +6,7 @@ import com.cloudbees.groovy.cps.impl.ForInLoopBlock; import com.cloudbees.groovy.cps.impl.ForLoopBlock; import com.cloudbees.groovy.cps.impl.IfBlock; +import com.cloudbees.groovy.cps.impl.LocalVariableBlock; import com.cloudbees.groovy.cps.impl.LogicalOpBlock; import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; import com.cloudbees.groovy.cps.impl.TryBlockEnv; @@ -91,29 +92,12 @@ public Next receive(Object __) { }; } -// public Block compareLessThan(final Block lhs, final Block rhs) { -// -// } - - public Block getLocalVariable(final String name) { - return new Block() { - public Next eval(Env e, Continuation k) { - return k.receive(e.getLocalVariable(name)); - } - }; + public LValueBlock localVariable(String name) { + return new LocalVariableBlock(name); } public Block setLocalVariable(final String name, final Block rhs) { - return new Block() { - public Next eval(final Env e, final Continuation k) { - return rhs.eval(e,new Continuation() { - public Next receive(Object o) { - e.setLocalVariable(name, o); - return k.receive(o); - } - }); - } - }; + return assign(localVariable(name),rhs); } public Block declareVariable(final Class type, final String name) { @@ -128,14 +112,14 @@ public Next eval(final Env e, final Continuation k) { public Block this_() { - return getLocalVariable("this"); + return localVariable("this"); } /** * Assignment operator to a local variable, such as "x += 3" */ public Block localVariableAssignOp(String name, String operator, Block rhs) { - return setLocalVariable(name, functionCall(getLocalVariable(name), operator, rhs)); + return setLocalVariable(name, functionCall(localVariable(name), operator, rhs)); } /** @@ -398,11 +382,11 @@ public Block assign(LValueBlock lhs, Block rhs) { return new AssignmentBlock(lhs,rhs, null); } - public Block getProperty(Block lhs, String property) { - return getProperty(lhs,constant(property)); + public LValueBlock property(Block lhs, String property) { + return property(lhs, constant(property)); } - public Block getProperty(Block lhs, Block property) { + public LValueBlock property(Block lhs, Block property) { return new PropertyAccessBlock(lhs,property); } @@ -411,7 +395,7 @@ public Block setProperty(Block lhs, String property, Block rhs) { } public Block setProperty(Block lhs, Block property, Block rhs) { - return assign(new PropertyAccessBlock(lhs,property),rhs); + return assign(property(lhs,property),rhs); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java new file mode 100644 index 000000000..bf2e95bd4 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java @@ -0,0 +1,33 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.LValue; +import com.cloudbees.groovy.cps.LValueBlock; +import com.cloudbees.groovy.cps.Next; + +/** + * Access to local variables and method parameters. + * + * @author Kohsuke Kawaguchi + */ +public class LocalVariableBlock extends LValueBlock { + private final String name; + + public LocalVariableBlock(String name) { + this.name = name; + } + + public Next evalLValue(final Env e, Continuation k) { + return k.receive(new LValue() { + public Next get(Continuation k) { + return k.receive(e.getLocalVariable(name)); + } + + public Next set(Object v, Continuation k) { + e.setLocalVariable(name,v); + return k.receive(null); + } + }); + } +} diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 37f6eb914..a744788dc 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -14,9 +14,9 @@ public class BasicTest extends Assert { Builder b = new Builder(); // useful fragment of expressions - Block $x = b.getLocalVariable("x"); - Block $y = b.getLocalVariable("y"); - Block $z = b.getLocalVariable("z"); + Block $x = b.localVariable("x"); + Block $y = b.localVariable("y"); + Block $z = b.localVariable("z"); // 3 => 3 @@ -63,7 +63,7 @@ public void forLoop() { b.sequence(// for loop body b.localVariableAssignOp("sum", "plus", $x) )), - b.getLocalVariable("sum") + b.localVariable("sum") )); } @@ -173,7 +173,7 @@ public void localExceptionHandling() { ), new CatchExpression(Exception.class, "e", b.sequence( - b.return_(b.functionCall(b.getLocalVariable("e"),"getMessage")) + b.return_(b.functionCall(b.localVariable("e"),"getMessage")) )) ) )); @@ -192,13 +192,13 @@ class Op { * throw new IllegalArgumentException(message) */ public Function throw_(int depth, String message) { - Block $depth = b.getLocalVariable("depth"); + Block $depth = b.localVariable("depth"); return new Function(asList("depth", "message"), b.sequence( b.if_(b.lessThan(b.zero(), $depth), - b.functionCall(b.this_(), "throw_", b.minus($depth,b.one()), b.getLocalVariable("message")), + b.functionCall(b.this_(), "throw_", b.minus($depth,b.one()), b.localVariable("message")), // else - b.throw_(b.new_(IllegalArgumentException.class, b.getLocalVariable("message"))) + b.throw_(b.new_(IllegalArgumentException.class, b.localVariable("message"))) ) )); } @@ -224,8 +224,8 @@ public Function throw_(int depth, String message) { ), new CatchExpression(Exception.class, "e", b.return_(b.plus( - b.getProperty(b.getLocalVariable("e"), "message"), - b.getLocalVariable("x")))) + b.property(b.localVariable("e"), "message"), + b.localVariable("x")))) ))); } @@ -237,7 +237,7 @@ public Function throw_(int depth, String message) { public void propertyGetAccess() { assertEquals("foo",run( b.setLocalVariable("x", b.new_(Exception.class, b.constant("foo"))), - b.new_(String.class, b.getProperty(b.getProperty($x,"message"),"bytes")) + b.new_(String.class, b.property(b.property($x, "message"), "bytes")) )); } diff --git a/src/test/java/foo.groovy b/src/test/java/foo.groovy index b65384b6d..1f814e553 100644 --- a/src/test/java/foo.groovy +++ b/src/test/java/foo.groovy @@ -10,7 +10,7 @@ class foo { println y(); println prop; - println this; // inside the closure 'this' gets resolved as getProperty('this') so it doesn't point to the closure object itself + println this; // inside the closure 'this' gets resolved as property('this') so it doesn't point to the closure object itself println this.y(); println this.prop; } diff --git a/test.groovy b/test.groovy index 4ebd95bff..95ceeb08d 100644 --- a/test.groovy +++ b/test.groovy @@ -1,18 +1,3 @@ - -def x() { - println "eval x" - return new int[1] -} - -def y() { - println "eval y" - return 0; -} - -def z() { - println "eval z" - return 1 -} - -x()[y()] = z() - +def y; +y=0; +x=0; for (i in [1,2,3,4,5]) x+=i; return x; From 46652a14746e6d6245a9f238e2fb1b93fbc913d3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 05:40:58 -0800 Subject: [PATCH 053/932] C&P error --- src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 345bf3650..6f6d276e5 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -138,7 +138,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } private void literal(ClassNode c) { - parent(new ClassExpression(s)) + parent(new ClassExpression(c)) } void visitMethodCallExpression(MethodCallExpression call) { From d52993c6a32a35b0b886301729050db5f6a9c2d8 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 05:41:54 -0800 Subject: [PATCH 054/932] adding a bit easier test --- .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index cf744ee7c..8652da90e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -69,4 +69,9 @@ class CpsTransformerTest { void forInLoop() { assert evalCPS("x=0; for (i in [1,2,3,4,5]) x+=i; return x;")==15; } + + @Test + void variableAssignment() { + assert evalCPS("x=3; x+=2; return x;")==5; + } } From 00d7801d853d71663f0275d78e35bb3287106c99 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 06:07:55 -0800 Subject: [PATCH 055/932] handling local variable declaration --- .../groovy/cps/CpsTransformer.groovy | 28 ++++++++++++++++-- .../com/cloudbees/groovy/cps/Builder.java | 29 ++++++++++++++++++- .../groovy/cps/CpsTransformerTest.groovy | 5 ++++ .../com/cloudbees/groovy/cps/BasicTest.java | 22 +++++++------- test.groovy | 2 ++ 5 files changed, 71 insertions(+), 15 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 6f6d276e5..2bbbd4576 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -151,7 +151,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitBlockStatement(BlockStatement b) { - makeNode("sequence") { + makeNode("block") { visit(b.statements) } } @@ -451,8 +451,30 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException("Unexpected variable type: ${ref.class}"); } - void visitDeclarationExpression(DeclarationExpression expression) { - throw new UnsupportedOperationException(); + void visitDeclarationExpression(DeclarationExpression exp) { + if (exp.isMultipleAssignmentDeclaration()) { + // def (a,b)=list + makeNode("sequence") { + for (VariableExpression v in exp.tupleExpression.expressions) { + makeNode("declareVariable") { + literal(v.type) + literal(v.name) + } + } + makeNode("assign") { + visit(exp.leftExpression) + visit(exp.rightExpression) + } + } + } else { + // def x=v; + makeNode("declareVariable") { + def v = exp.variableExpression + literal(v.type) + literal(v.name) + visit(exp.rightExpression) // this will not produce anything if this is EmptyExpression + } + } } void visitGStringExpression(GStringExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index d4b3cebc9..4e0c9cfdc 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -57,7 +57,10 @@ public Block false_() { return constant(false); } - public Block sequence(Block... bodies) { + /** + * { ... } + */ + public Block block(Block... bodies) { if (bodies.length==0) return NULL; Block e = bodies[0]; @@ -80,6 +83,20 @@ public Next eval(Env _e, final Continuation k) { }; } + /** + * Like {@link #block(Block...)} but it doesn't create a new scope. + * + */ + public Block sequence(Block... bodies) { + if (bodies.length==0) return NULL; + + Block e = bodies[0]; + for (int i=1; i T run(Block... bodies) { Env e = new FunctionCallEnv(null,null,Continuation.HALT); - Next p = new Next(b.sequence(bodies), e, Continuation.HALT); + Next p = new Next(b.block(bodies), e, Continuation.HALT); return (T)p.resume().yieldedValue(); } } diff --git a/test.groovy b/test.groovy index 95ceeb08d..b4e1c1672 100644 --- a/test.groovy +++ b/test.groovy @@ -1,3 +1,5 @@ +//def (a,b); +def (c,d)=[1,2]; def y; y=0; x=0; for (i in [1,2,3,4,5]) x+=i; return x; From 50e5df3916d347833ab01110c10e25a5d48365b5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 06:09:00 -0800 Subject: [PATCH 056/932] updating remaining TODOs --- TODO.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/TODO.txt b/TODO.txt index b8c98414b..7bf474565 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,8 +1,6 @@ - array access (trivial, so can be done later) -- block creates a new scope -- variables are resolved lexically - closure -- how to avoid anonymous classes? +- continue and break Tests to be written: - verify a proper method overload resolution From 13014bcfd41870d2b30eae755727caed5b49279a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 09:05:17 -0800 Subject: [PATCH 057/932] The declareVariable method solves this problem. --- src/main/java/com/cloudbees/groovy/cps/Env.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index bef2f227b..3b3333ea7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -6,8 +6,6 @@ * @author Kohsuke Kawaguchi */ public interface Env { - // TODO: How do we correctly assign local variables to its scope? - void declareVariable(Class type, String name); Object getLocalVariable(String name); From bf997464e5797c5524e0955f52ccfcabf48968c7 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 09:33:14 -0800 Subject: [PATCH 058/932] implemented break & continue --- .../groovy/cps/CpsTransformer.groovy | 28 ++++++++++---- .../java/com/cloudbees/groovy/cps/Block.java | 10 +++++ .../com/cloudbees/groovy/cps/Builder.java | 20 ++++++++-- .../java/com/cloudbees/groovy/cps/Env.java | 16 ++++++++ .../java/com/cloudbees/groovy/cps/Next.java | 9 ++++- .../cloudbees/groovy/cps/impl/BreakBlock.java | 25 +++++++++++++ .../groovy/cps/impl/ContinueBlock.java | 25 +++++++++++++ .../groovy/cps/impl/ForInLoopBlock.java | 6 ++- .../groovy/cps/impl/ForLoopBlock.java | 6 ++- .../groovy/cps/impl/FunctionCallEnv.java | 8 ++++ .../groovy/cps/impl/LoopBlockScopeEnv.java | 37 +++++++++++++++++++ .../cloudbees/groovy/cps/impl/ProxyEnv.java | 8 ++++ .../groovy/cps/CpsTransformerTest.groovy | 13 +++++++ .../com/cloudbees/groovy/cps/BasicTest.java | 2 +- test.groovy | 8 +++- 15 files changed, 203 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 2bbbd4576..f969d43ff 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -157,11 +157,25 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitForLoop(ForStatement forLoop) { - makeNode("forInLoop") { - literal(forLoop.variableType) - literal(forLoop.variable.name) - visit(forLoop.collectionExpression) - visit(forLoop.loopBlock) + if (forLoop.variable==ForStatement.FOR_LOOP_DUMMY) { + // for ( e1; e2; e3 ) { ... } + ClosureListExpression loop = forLoop.collectionExpression + assert loop.expressions.size()==3; + + makeNode("forLoop") { + literal(forLoop.statementLabel) + visit(loop.expressions) + visit(forLoop.loopBlock) + } + } else { + // for (x in col) { ... } + makeNode("forInLoop") { + literal(forLoop.statementLabel) + literal(forLoop.variableType) + literal(forLoop.variable.name) + visit(forLoop.collectionExpression) + visit(forLoop.loopBlock) + } } } @@ -204,11 +218,11 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitBreakStatement(BreakStatement statement) { - throw new UnsupportedOperationException(); + makeNode("break_"); } void visitContinueStatement(ContinueStatement statement) { - throw new UnsupportedOperationException(); + makeNode("continue_"); } void visitThrowStatement(ThrowStatement statement) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Block.java b/src/main/java/com/cloudbees/groovy/cps/Block.java index 01ef55997..1e481d5bf 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Block.java +++ b/src/main/java/com/cloudbees/groovy/cps/Block.java @@ -1,9 +1,19 @@ package com.cloudbees.groovy.cps; /** + * AST Node of Groovy for CPS execution. + * * @author Kohsuke Kawaguchi */ public interface Block { + /** + * Executes this expression, then pass the result to the given continuation when it's available. + * + *

+ * To be more precise, this method does not evaluate the expression by itself synchronously. + * Instead, the evaluation is done by the caller by repeatedly {@linkplain Next#step() step executing} + * the resulting {@link Next} object. + */ Next eval(Env e, Continuation k); /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 4e0c9cfdc..fc3aace79 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -2,7 +2,9 @@ import com.cloudbees.groovy.cps.impl.AssignmentBlock; import com.cloudbees.groovy.cps.impl.BlockScopeEnv; +import com.cloudbees.groovy.cps.impl.BreakBlock; import com.cloudbees.groovy.cps.impl.ConstantBlock; +import com.cloudbees.groovy.cps.impl.ContinueBlock; import com.cloudbees.groovy.cps.impl.ForInLoopBlock; import com.cloudbees.groovy.cps.impl.ForLoopBlock; import com.cloudbees.groovy.cps.impl.IfBlock; @@ -163,15 +165,25 @@ public Block if_(Block cond, Block then) { /** * for (e1; e2; e3) { ... } */ - public Block forLoop(Block e1, Block e2, Block e3, Block body) { - return new ForLoopBlock(e1,e2,e3,body); + public Block forLoop(String label, Block e1, Block e2, Block e3, Block body) { + return new ForLoopBlock(label, e1,e2,e3,body); } /** * for (x in col) { ... } */ - public Block forInLoop(Class type, String variable, Block collection, Block body) { - return new ForInLoopBlock(type,variable,collection,body); + public Block forInLoop(String label, Class type, String variable, Block collection, Block body) { + return new ForInLoopBlock(label,type,variable,collection,body); + } + + public Block break_(String label) { + if (label==null) return BreakBlock.INSTANCE; + return new BreakBlock(label); + } + + public Block continue_(String label) { + if (label==null) return ContinueBlock.INSTANCE; + return new ContinueBlock(label); } public Block tryCatch(Block body, CatchExpression... catches) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index 3b3333ea7..4647ba3f9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -16,6 +16,22 @@ public interface Env { */ Continuation getReturnAddress(); + /** + * If we see a break statement, where should we go? + * + * @param label + * Specifies the loop to break from. null for nearest loop. + */ + Continuation getBreakAddress(String label); + + /** + * If we see a continue statement, where should we go? + * + * @param label + * Specifies the loop to repeat. null for nearest loop. + */ + Continuation getContinueAddress(String label); + /** * Finds the exception handler that catches a {@link Throwable} instance of this type. * diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index b605fbab6..008da914e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -30,11 +30,18 @@ public Next(Block f, Env e, Continuation k) { public Next resume() { Next n = this; do { - n = n.f.eval(n.e, n.k); + n = n.step(); } while(n.yield==null); return n; } + /** + * Executes one step + */ + public Next step() { + return f.eval(e,k); + } + /*package*/ void yield(Object v) { if (v==null) v = NULL; this.yield = v; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java new file mode 100644 index 000000000..27fda4768 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java @@ -0,0 +1,25 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** + * "break" statement to exit a loop. + * + * @author Kohsuke Kawaguchi + */ +public class BreakBlock implements Block { + private final String label; + + public BreakBlock(String label) { + this.label = label; + } + + public Next eval(Env e, Continuation k) { + return e.getBreakAddress(label).receive(null); + } + + public static final BreakBlock INSTANCE = new BreakBlock(null); +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java new file mode 100644 index 000000000..15a261ebf --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java @@ -0,0 +1,25 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** + * "continue" statement to repeat a loop. + * + * @author Kohsuke Kawaguchi + */ +public class ContinueBlock implements Block { + private final String label; + + public ContinueBlock(String label) { + this.label = label; + } + + public Next eval(Env e, Continuation k) { + return e.getContinueAddress(label).receive(null); + } + + public static final ContinueBlock INSTANCE = new ContinueBlock(null); +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java index 25a6e54aa..8d5654357 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java @@ -14,12 +14,14 @@ * @author Kohsuke Kawaguchi */ public class ForInLoopBlock implements Block { + final String label; final Class type; final String variable; final Block collection; final Block body; - public ForInLoopBlock(Class type, String variable, Block collection, Block body) { + public ForInLoopBlock(String label, Class type, String variable, Block collection, Block body) { + this.label = label; this.type = type; this.variable = variable; this.collection = collection; @@ -38,7 +40,7 @@ class ContinuationImpl extends ContinuationGroup { Iterator itr; ContinuationImpl(Env _e, Continuation loopEnd) { - this.e = new BlockScopeEnv(_e); + this.e = new LoopBlockScopeEnv(_e,label,loopEnd,increment.bind(this)); this.e.declareVariable(type,variable); this.loopEnd = loopEnd; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java index daeba72e4..75344f6d5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java @@ -12,8 +12,10 @@ */ public class ForLoopBlock implements Block { final Block e1, e2, e3, body; + final String label; - public ForLoopBlock(Block e1, Block e2, Block e3, Block body) { + public ForLoopBlock(String label, Block e1, Block e2, Block e3, Block body) { + this.label = label; this.e1 = e1; this.e2 = e2; this.e3 = e3; @@ -30,7 +32,7 @@ class ContinuationImpl extends ContinuationGroup { final Env e; ContinuationImpl(Env e, Continuation loopEnd) { - this.e = new BlockScopeEnv(e); + this.e = new LoopBlockScopeEnv(e, label, loopEnd, increment.bind(this)); this.loopEnd = loopEnd; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index f1d31f0b8..615e0947a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -51,6 +51,14 @@ public Continuation getReturnAddress() { return returnAddress; } + public Continuation getBreakAddress(String label) { + throw new IllegalStateException("unexpected break statement"); + } + + public Continuation getContinueAddress(String label) { + throw new IllegalStateException("unexpected continue statement"); + } + public Continuation getExceptionHandler(Class type) { if (caller==null) { // TODO: maybe define a mechanism so that the resume() or start() kinda method will return diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java new file mode 100644 index 000000000..a8f1ad7ad --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java @@ -0,0 +1,37 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; + +/** + * Block scope for a loop, which affects the target of break/continue. + * + * @author Kohsuke Kawaguchi + */ +class LoopBlockScopeEnv extends BlockScopeEnv { + private final String label; + private final Continuation break_, continue_; + + LoopBlockScopeEnv(Env parent, String label, Continuation break_, Continuation continue_) { + super(parent); + this.label = label; + this.break_ = break_; + this.continue_ = continue_; + } + + @Override + public Continuation getBreakAddress(String label) { + if (labelMatch(label)) return break_; + else return null; + } + + @Override + public Continuation getContinueAddress(String label) { + if (labelMatch(label)) return continue_; + else return null; + } + + private boolean labelMatch(String given) { + return given==null || given.equals(label); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java index 1eb0d1713..0e1839c9b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java @@ -29,6 +29,14 @@ public Continuation getReturnAddress() { return parent.getReturnAddress(); } + public Continuation getBreakAddress(String label) { + return parent.getBreakAddress(label); + } + + public Continuation getContinueAddress(String label) { + return parent.getContinueAddress(label); + } + public Continuation getExceptionHandler(Class type) { return parent.getExceptionHandler(type); } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 78c0135eb..4bd883e21 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -79,4 +79,17 @@ class CpsTransformerTest { void localVariable() { assert evalCPS("int x=3; x+=2; return x;")==5; } + + @Test + void break_() { + assert evalCPS(""" + x=0; + int i=0; + for (i=0; i<5; i+=1) { + break; + x+=1; + } + return i+x; + """)==0; + } } diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index a3872bf73..b2a8eb7a4 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -55,7 +55,7 @@ public void variable() { public void forLoop() { assertEquals(45, run( b.setLocalVariable("sum", b.zero()), - b.forLoop( + b.forLoop(null, b.setLocalVariable("x", b.zero()), b.lessThan($x, b.constant(10)), b.localVariableAssignOp("x", "plus", b.one()), diff --git a/test.groovy b/test.groovy index b4e1c1672..60b9fd8e9 100644 --- a/test.groovy +++ b/test.groovy @@ -1,5 +1,11 @@ -//def (a,b); def (c,d)=[1,2]; def y; y=0; x=0; for (i in [1,2,3,4,5]) x+=i; return x; + +out: +for (i in [1,2,3]) { + println ""; + break out; +} + From 9f1e65abe0ff88653af47ceec37edd8e46cca089 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 09:40:57 -0800 Subject: [PATCH 059/932] correctly implemented labeled break statement --- .../groovy/cps/CpsTransformer.groovy | 6 ++-- .../java/com/cloudbees/groovy/cps/Env.java | 6 ++++ .../groovy/cps/impl/LoopBlockScopeEnv.java | 4 +-- .../groovy/cps/CpsTransformerTest.groovy | 30 +++++++++++++++++-- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index f969d43ff..ad1883b83 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -106,7 +106,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * @param methodName * Method on {@link Builder} to call. * @param args - * Can be closure for building argument nodes, Block, or List of Expressions. + * Can be closure for building argument nodes, Expression, or List of Expressions. */ private void makeNode(String methodName, Object args) { if (args instanceof Closure) { @@ -218,11 +218,11 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitBreakStatement(BreakStatement statement) { - makeNode("break_"); + makeNode("break_", new ConstantExpression(statement.label)); } void visitContinueStatement(ContinueStatement statement) { - makeNode("continue_"); + makeNode("continue_", new ConstantExpression(statement.label)); } void visitThrowStatement(ThrowStatement statement) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index 4647ba3f9..035e7d2b0 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -21,6 +21,9 @@ public interface Env { * * @param label * Specifies the loop to break from. null for nearest loop. + * @return + * For semantically correct Groovy code, the return value is never null, because not having the matching label + * is a compile-time error. */ Continuation getBreakAddress(String label); @@ -29,6 +32,9 @@ public interface Env { * * @param label * Specifies the loop to repeat. null for nearest loop. + * @return + * For semantically correct Groovy code, the return value is never null, because not having the matching label + * is a compile-time error. */ Continuation getContinueAddress(String label); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java index a8f1ad7ad..0b28b5abe 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java @@ -22,13 +22,13 @@ class LoopBlockScopeEnv extends BlockScopeEnv { @Override public Continuation getBreakAddress(String label) { if (labelMatch(label)) return break_; - else return null; + else return super.getBreakAddress(label); } @Override public Continuation getContinueAddress(String label) { if (labelMatch(label)) return continue_; - else return null; + else return super.getContinueAddress(label); } private boolean labelMatch(String given) { diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 4bd883e21..98058ba05 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -38,14 +38,18 @@ class CpsTransformerTest { } Object evalCPS(String script) { + Object v = evalCPSonly(script) + assert v==sh.evaluate(script); // make sure that regular non-CPS execution reports the same result + return v; + } + + Object evalCPSonly(String script) { Script s = csh.parse(script) Function f = s.run(); def p = f.invoke(null, s, [], Continuation.HALT) def v = p.resume().yieldedValue() - - assert v==sh.evaluate(script); - return v; + v } @Test @@ -92,4 +96,24 @@ class CpsTransformerTest { return i+x; """)==0; } + + @Test + void globalBreak_() { + assert evalCPS(""" + x=0; + int i=0; + int j=0; + + I: + for (i=0; i<5; i+=1) { + J: + for (j=0; j<5; j+=1) { + break I; + x+=1; + } + x+=1; + } + return i+"."+j+"."+x; + """)=="0.0.0"; + } } From 6c1f79409cab8f0f6baadd99e01f1b489f0df1d7 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 10:01:41 -0800 Subject: [PATCH 060/932] compound assignment operator is now handled --- src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java index fa444f672..b4a07b7df 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java @@ -15,7 +15,6 @@ * Assignment operator {@code exp=rhs} * * TODO: tuple assignment - * TODO: assignment operators like x+=y * * @author Kohsuke Kawaguchi */ From d20344c33545bb92e0017e9f4bdcb908c1e54044 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 10:20:26 -0800 Subject: [PATCH 061/932] factored out a common utility --- .../com/cloudbees/groovy/cps/impl/AssignmentBlock.java | 8 +------- .../com/cloudbees/groovy/cps/impl/ContinuationGroup.java | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java index b4a07b7df..e3f46efe5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java @@ -82,13 +82,7 @@ public Next fixCur(Object cur) { */ public Next fixRhs(Object rhs) { - Object v; - try { - CallSite callSite = fakeCallSite(compoundOp); - v = callSite.call(this.cur, rhs); - } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling - } + Object v = methodCall(this.cur, compoundOp, rhs); if (v instanceof Function) { // if this is a workflow function, it'd return a Function object instead diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 8203966ab..cd08d137a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -45,4 +45,12 @@ protected static CallSite fakeCallSite(String method) { return csa.array[0]; } + protected Object methodCall(Object receiver, String methodName, Object arg1) { + try { + CallSite callSite = fakeCallSite(methodName); + return callSite.call(receiver, arg1); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + } } From af85df192bec3ea137d13075a45e05cc1dd272ad Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 10:20:53 -0800 Subject: [PATCH 062/932] added another overload with no arguments --- .../com/cloudbees/groovy/cps/impl/ContinuationGroup.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index cd08d137a..54294410a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -45,6 +45,15 @@ protected static CallSite fakeCallSite(String method) { return csa.array[0]; } + protected Object methodCall(Object receiver, String methodName) { + try { + CallSite callSite = fakeCallSite(methodName); + return callSite.call(receiver); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + } + protected Object methodCall(Object receiver, String methodName, Object arg1) { try { CallSite callSite = fakeCallSite(methodName); From 32fb6b0794bfe62d86def79fca6e83f761ef5bc9 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 10:25:58 -0800 Subject: [PATCH 063/932] Handled async function. Since the code is kind of long, performance improvement is not worth the cost of maintaining multiple overloaded versions --- .../groovy/cps/impl/AssignmentBlock.java | 16 +----------- .../groovy/cps/impl/ContinuationGroup.java | 26 ++++++++++++------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java index e3f46efe5..b1d71d78b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java @@ -3,13 +3,9 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.Function; import com.cloudbees.groovy.cps.LValue; import com.cloudbees.groovy.cps.LValueBlock; import com.cloudbees.groovy.cps.Next; -import org.codehaus.groovy.runtime.callsite.CallSite; - -import java.util.Collections; /** * Assignment operator {@code exp=rhs} @@ -81,17 +77,7 @@ public Next fixCur(Object cur) { * Invoke the operator */ public Next fixRhs(Object rhs) { - - Object v = methodCall(this.cur, compoundOp, rhs); - - if (v instanceof Function) { - // if this is a workflow function, it'd return a Function object instead - // of actually executing the function, so execute it in the CPS - return ((Function)v).invoke(e,cur, Collections.singletonList(rhs), assignAndDone.bind(this)); - } else { - // if this was a normal function, the method had just executed synchronously - return assignAndDone(v); - } + return methodCall(e, assignAndDone, this.cur, compoundOp, rhs); } } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 54294410a..0509838cb 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -3,11 +3,14 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Function; import com.cloudbees.groovy.cps.Next; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; +import java.util.Arrays; + /** * Base class for defining a series of {@link Continuation} methods that share the same set of contextual values. * @@ -45,21 +48,26 @@ protected static CallSite fakeCallSite(String method) { return csa.array[0]; } - protected Object methodCall(Object receiver, String methodName) { + /** + * Evaluates a function (possibly a workflow function), then pass the result to the continuation + * represented by {@link ContinuationPtr} on this instance. + */ + protected Next methodCall(Env e, ContinuationPtr k, Object receiver, String methodName, Object... args) { + Object v; try { CallSite callSite = fakeCallSite(methodName); - return callSite.call(receiver); + v = callSite.call(receiver,args); } catch (Throwable t) { throw new UnsupportedOperationException(t); // TODO: exception handling } - } - protected Object methodCall(Object receiver, String methodName, Object arg1) { - try { - CallSite callSite = fakeCallSite(methodName); - return callSite.call(receiver, arg1); - } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling + if (v instanceof Function) { + // if this is a workflow function, it'd return a Function object instead + // of actually executing the function, so execute it in the CPS + return ((Function)v).invoke(e, receiver, Arrays.asList(args), k.bind(this)); + } else { + // if this was a normal function, the method had just executed synchronously + return k.bind(this).receive(v); } } } From 3b7f55f9d56d03e146d8bdba8f95925c633924bf Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 10:26:51 -0800 Subject: [PATCH 064/932] doc improvement --- src/main/java/com/cloudbees/groovy/cps/LValue.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/LValue.java b/src/main/java/com/cloudbees/groovy/cps/LValue.java index ca7e015f3..1cc9644eb 100644 --- a/src/main/java/com/cloudbees/groovy/cps/LValue.java +++ b/src/main/java/com/cloudbees/groovy/cps/LValue.java @@ -10,11 +10,21 @@ public interface LValue { /** * Computes the value, and passes it to the given continuation when done. + * + *

+ * Just like {@link Block#eval(Env, Continuation)}, the actual evaluation is done + * by the caller by repeatedly {@linkplain Next#step() step executing} + * the resulting {@link Next} object. */ Next get(Continuation k); /** * Sets the given value to this variable, and passes {@code null} to the given continuation when done. + * + *

+ * Just like {@link Block#eval(Env, Continuation)}, the actual evaluation is done + * by the caller by repeatedly {@linkplain Next#step() step executing} + * the resulting {@link Next} object. */ Next set(Object v, Continuation k); } From 9fbcc6078f8c754df048443c6aca9ee78670f4ad Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 10:28:54 -0800 Subject: [PATCH 065/932] added x++, x--, etc --- .../groovy/cps/CpsTransformer.groovy | 22 ++++- .../com/cloudbees/groovy/cps/Builder.java | 29 ++++++ .../cps/impl/ExcrementOperatorBlock.java | 93 +++++++++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 20 ++++ 4 files changed, 160 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index ad1883b83..fcc0e8a29 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -8,6 +8,7 @@ import org.codehaus.groovy.classgen.GeneratorContext import org.codehaus.groovy.control.CompilePhase import org.codehaus.groovy.control.SourceUnit import org.codehaus.groovy.control.customizers.CompilationCustomizer +import org.codehaus.groovy.syntax.Types import static org.codehaus.groovy.syntax.Types.* @@ -386,12 +387,25 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException("Operation: " + exp.operation + " not supported"); } - void visitPrefixExpression(PrefixExpression expression) { - throw new UnsupportedOperationException(); + void visitPrefixExpression(PrefixExpression exp) { + makeNode("prefix"+ prepostfixOperatorSuffix(exp)) { + visit(exp.expression) + } } - void visitPostfixExpression(PostfixExpression expression) { - throw new UnsupportedOperationException(); + void visitPostfixExpression(PostfixExpression exp) { + makeNode("postfix"+ prepostfixOperatorSuffix(exp)) { + visit(exp.expression) + } + } + + private String prepostfixOperatorSuffix(Expression exp) { + switch (exp.operation.type) { + case PLUS_PLUS: return "Inc"; + case MINUS_MINUS: return "Dec"; + default: + throw new UnsupportedOperationException("Unknown operator:" + exp.operation.text) + } } void visitBooleanExpression(BooleanExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index fc3aace79..7e401e3c3 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -5,6 +5,7 @@ import com.cloudbees.groovy.cps.impl.BreakBlock; import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.ContinueBlock; +import com.cloudbees.groovy.cps.impl.ExcrementOperatorBlock; import com.cloudbees.groovy.cps.impl.ForInLoopBlock; import com.cloudbees.groovy.cps.impl.ForLoopBlock; import com.cloudbees.groovy.cps.impl.IfBlock; @@ -333,6 +334,34 @@ public Block bitwiseXor(Block lhs, Block rhs) { return functionCall(lhs,"xor",rhs); } + /** + * ++x + */ + public Block prefixInc(LValueBlock body) { + return new ExcrementOperatorBlock("next",true,body); + } + + /** + * --x + */ + public Block prefixDec(LValueBlock body) { + return new ExcrementOperatorBlock("previous",true,body); + } + + /** + * x++ + */ + public Block postfixInc(LValueBlock body) { + return new ExcrementOperatorBlock("next",false,body); + } + + /** + * x-- + */ + public Block postfixDec(LValueBlock body) { + return new ExcrementOperatorBlock("previous",false,body); + } + /** * LHS.name(...) */ diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java new file mode 100644 index 000000000..9dac773a8 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java @@ -0,0 +1,93 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.LValue; +import com.cloudbees.groovy.cps.LValueBlock; +import com.cloudbees.groovy.cps.Next; + +/** + * "++x", "--x", "x++", or "x--" operator. + * + * This class is so named by Jesse Glick. When asked if my dictionary look up on the word "excrement" is accurate, + * he said: "given the number of stupid bugs caused by misuse of this syntax, yes!" + * So there we go. + * + * @author Kohsuke Kawaguchi + */ +public class ExcrementOperatorBlock implements Block { + /** + * "previous" for decrement and "next" for increment. + */ + private final String operatorMethod; + + /** + * True if this is a prefix operator, false if it's a postfix. + */ + private final boolean prefix; + private final Block body; + + public ExcrementOperatorBlock(String operatorMethod, boolean prefix, LValueBlock body) { + this.operatorMethod = operatorMethod; + this.prefix = prefix; + this.body = body.asLValue(); + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).then(body,e,fixLhs); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + LValue lhs; + Object before, after; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + /** + * LValue evaluated, then get the current value + */ + public Next fixLhs(Object lhs) { + this.lhs = (LValue)lhs; + return this.lhs.get(fixCur.bind(this)); + } + + /** + * Computed the current value of {@link LValue}. + * Next, evaluate the operator and capture the result + */ + public Next fixCur(Object v) { + this.before = v; + return methodCall(e, calc, v, operatorMethod); + } + + /** + * Result of the operator application obtained. + * Next, update the value. + */ + public Next calc(Object v) { + this.after = v; + + // update the value. + return this.lhs.set(after,done.bind(this)); + } + + /** + * The result of the evaluation of the entire result depends on whether this is prefix or postfix + */ + public Next done(Object _) { + return k.receive(prefix?after:before); + } + } + + static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); + static final ContinuationPtr fixCur = new ContinuationPtr(ContinuationImpl.class,"fixCur"); + static final ContinuationPtr calc = new ContinuationPtr(ContinuationImpl.class,"calc"); + static final ContinuationPtr done = new ContinuationPtr(ContinuationImpl.class,"done"); +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 98058ba05..029d290e9 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -84,6 +84,26 @@ class CpsTransformerTest { assert evalCPS("int x=3; x+=2; return x;")==5; } + @Test + void increment() { + assert evalCPS(""" + x=0; + y = x++; + z = ++x; + return x+"."+y+"."+z; + """)=="2.0.2"; + } + + @Test + void decrement() { + assert evalCPS(""" + x=5; + y = x--; + z = --x; + return x+"."+y+"."+z; + """)=="3.5.3"; + } + @Test void break_() { assert evalCPS(""" From 74cdc7df72f33129cdc249b99fffa25b11d9d217 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 10:39:47 -0800 Subject: [PATCH 066/932] doc improvement --- src/main/java/com/cloudbees/groovy/cps/WorkflowMethod.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/WorkflowMethod.java b/src/main/java/com/cloudbees/groovy/cps/WorkflowMethod.java index e39d482a8..f5d3e96c2 100644 --- a/src/main/java/com/cloudbees/groovy/cps/WorkflowMethod.java +++ b/src/main/java/com/cloudbees/groovy/cps/WorkflowMethod.java @@ -7,6 +7,8 @@ import static java.lang.annotation.RetentionPolicy.*; /** + * Designates a method that shall be CPS-transformed. + * * @author Kohsuke Kawaguchi */ @Target(METHOD) From b6a62eacdc6ffc34364104c8c3a94235620f2d91 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 10:42:03 -0800 Subject: [PATCH 067/932] redone the function call in a modern style --- .../com/cloudbees/groovy/cps/Builder.java | 88 ++----------------- .../groovy/cps/impl/ContinuationGroup.java | 13 +-- .../groovy/cps/impl/FunctionCallBlock.java | 80 +++++++++++++++++ 3 files changed, 96 insertions(+), 85 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 7e401e3c3..9229f0ce5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -8,6 +8,7 @@ import com.cloudbees.groovy.cps.impl.ExcrementOperatorBlock; import com.cloudbees.groovy.cps.impl.ForInLoopBlock; import com.cloudbees.groovy.cps.impl.ForLoopBlock; +import com.cloudbees.groovy.cps.impl.FunctionCallBlock; import com.cloudbees.groovy.cps.impl.IfBlock; import com.cloudbees.groovy.cps.impl.LocalVariableBlock; import com.cloudbees.groovy.cps.impl.LogicalOpBlock; @@ -160,7 +161,7 @@ public Block if_(Block cond, Block then, Block els) { } public Block if_(Block cond, Block then) { - return if_(cond,then, NOOP); + return if_(cond, then, NOOP); } /** @@ -281,11 +282,11 @@ public Block power(Block lhs, Block rhs) { } public Block compareEqual(Block lhs, Block rhs) { - return staticCall(ScriptBytecodeAdapter.class,"compareEqual",lhs,rhs); + return staticCall(ScriptBytecodeAdapter.class, "compareEqual", lhs, rhs); } public Block compareNotEqual(Block lhs, Block rhs) { - return staticCall(ScriptBytecodeAdapter.class,"compareNotEqual",lhs,rhs); + return staticCall(ScriptBytecodeAdapter.class, "compareNotEqual", lhs, rhs); } public Block compareTo(Block lhs, Block rhs) { @@ -365,85 +366,12 @@ public Block postfixDec(LValueBlock body) { /** * LHS.name(...) */ - public Block functionCall(final Block lhs, final String name, Block... argExps) { - final CallSite callSite = fakeCallSite(name); // name is statically determined - final Block args = evalArgs(argExps); - - return new Block() { - public Next eval(final Env e, final Continuation k) { - return new Next(lhs,e, new Continuation() {// evaluate lhs - public Next receive(final Object lhs) { - return args.eval(e,new Continuation() { - public Next receive(Object _args) { - List args = (List) _args; - - Object v; - try { - v = callSite.call(lhs, args.toArray(new Object[args.size()])); - } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling - } - - if (v instanceof Function) { - // if this is a workflow function, it'd return a Function object instead - // of actually executing the function, so execute it in the CPS - return ((Function)v).invoke(e,lhs,args,k); - } else { - // if this was a normal function, the method had just executed synchronously - return k.receive(v); - } - } - }); - } - }); - } - }; + public Block functionCall(Block lhs, String name, Block... argExps) { + return new FunctionCallBlock(lhs,constant(name),argExps); } - public Block functionCall(final Block lhs, final Block name, Block... argExps) { - if (name instanceof ConstantBlock) { - // method name statically known. this common path enables a bit of optimization - return functionCall(lhs,((ConstantBlock)name).value.toString(),argExps); - } - - final Block args = evalArgs(argExps); - - // TODO: what is the correct evaluation order? - - return new Block() { - public Next eval(final Env e, final Continuation k) { - return new Next(lhs,e, new Continuation() {// evaluate lhs - public Next receive(final Object lhs) { - return new Next(name, e, new Continuation() { - public Next receive(final Object name) { - return args.eval(e,new Continuation() { - public Next receive(Object _args) { - List args = (List) _args; - - Object v; - try { - CallSite callSite = fakeCallSite(name.toString()); - v = callSite.call(lhs, args.toArray(new Object[args.size()])); - } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling - } - - if (v instanceof Function) { - // if this is a workflow function, it'd return a Function object instead - // of actually executing the function, so execute it in the CPS - return ((Function)v).invoke(e,lhs,args,k); - } else { - // if this was a normal function, the method had just executed synchronously - return k.receive(v); - } - } - }); - } - }); - } - }); - } - }; + public Block functionCall(Block lhs, Block name, Block... argExps) { + return new FunctionCallBlock(lhs,name,argExps); } public Block assign(LValueBlock lhs, Block rhs) { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 0509838cb..05252a6ab 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -48,11 +48,14 @@ protected static CallSite fakeCallSite(String method) { return csa.array[0]; } + protected Next methodCall(Env e, ContinuationPtr k, Object receiver, String methodName, Object... args) { + return methodCall(e,k.bind(this),receiver,methodName,args); + } + /** - * Evaluates a function (possibly a workflow function), then pass the result to the continuation - * represented by {@link ContinuationPtr} on this instance. + * Evaluates a function (possibly a workflow function), then pass the result to the given continuation. */ - protected Next methodCall(Env e, ContinuationPtr k, Object receiver, String methodName, Object... args) { + protected Next methodCall(Env e, Continuation k, Object receiver, String methodName, Object... args) { Object v; try { CallSite callSite = fakeCallSite(methodName); @@ -64,10 +67,10 @@ protected Next methodCall(Env e, ContinuationPtr k, Object receiver, String meth if (v instanceof Function) { // if this is a workflow function, it'd return a Function object instead // of actually executing the function, so execute it in the CPS - return ((Function)v).invoke(e, receiver, Arrays.asList(args), k.bind(this)); + return ((Function)v).invoke(e, receiver, Arrays.asList(args), k); } else { // if this was a normal function, the method had just executed synchronously - return k.bind(this).receive(v); + return k.receive(v); } } } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java new file mode 100644 index 000000000..c54addef1 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -0,0 +1,80 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** + * @author Kohsuke Kawaguchi + */ +public class FunctionCallBlock implements Block { + /** + * Receiver of the call + */ + private final Block lhsExp; + + /** + * Method name + */ + private final Block nameExp; + + /** + * Arguments to the call. + */ + private final Block[] argExps; + + public FunctionCallBlock(Block lhsExp, Block nameExp, Block[] argExps) { + this.lhsExp = lhsExp; + this.nameExp = nameExp; + this.argExps = argExps; + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).then(lhsExp,e,fixLhs); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + Object lhs; + String name; + Object[] args = new Object[argExps.length]; + int idx; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next fixLhs(Object lhs) { + this.lhs = lhs; + return then(nameExp,e,fixName); + } + + public Next fixName(Object name) { + this.name = name.toString(); // TODO: verify the semantics if the value resolves to something other than String + return dispatchOrArg(); + } + + public Next fixArg(Object v) { + args[idx++] = v; + return dispatchOrArg(); + } + + /** + * If there are more arguments to evaluate, do so. Otherwise evaluate the function. + */ + private Next dispatchOrArg() { + if (args.length>idx) + return then(argExps[idx],e,fixArg); + else + return methodCall(e,k,lhs,name,args); + } + } + + static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); + static final ContinuationPtr fixName = new ContinuationPtr(ContinuationImpl.class,"fixName"); + static final ContinuationPtr fixArg = new ContinuationPtr(ContinuationImpl.class,"fixArg"); +} From df7430a44d4453edad73edd47b2eba03b9a08fbb Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 10:46:40 -0800 Subject: [PATCH 068/932] unified constructor call to the new function call scheme --- .../com/cloudbees/groovy/cps/Builder.java | 58 ++----------------- .../groovy/cps/impl/FunctionCallBlock.java | 20 ++++++- 2 files changed, 22 insertions(+), 56 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 9229f0ce5..7afe1badc 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -18,14 +18,12 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import static com.cloudbees.groovy.cps.Block.*; import static java.util.Arrays.*; -import static java.util.Collections.*; /** * @author Kohsuke Kawaguchi @@ -391,64 +389,18 @@ public Block setProperty(Block lhs, String property, Block rhs) { } public Block setProperty(Block lhs, Block property, Block rhs) { - return assign(property(lhs,property),rhs); + return assign(property(lhs, property), rhs); } /** * Object instantiation. */ - public Block new_(final Class type, Block... argExps) { - final CallSite callSite = fakeCallSite(""); - final Block args = evalArgs(argExps); - - return new Block() { - public Next eval(final Env e, final Continuation k) { - return args.eval(e,new Continuation() { - public Next receive(Object _args) { - List args = (List) _args; - - Object v; - try { - v = callSite.callConstructor(type, args.toArray(new Object[args.size()])); - } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling - } - - // constructor cannot be an asynchronous function - return k.receive(v); - } - }); - } - }; + public Block new_(Class type, Block... argExps) { + return new_(constant(type),argExps); } - /** - * Returns an expression that evaluates all the arguments and return it as a {@link List}. - */ - private Block evalArgs(final Block... argExps) { - if (argExps.length==0) // no arguments to evaluate - return new ConstantBlock(emptyList()); - - return new Block() { - public Next eval(final Env e, final Continuation k) { - final List args = new ArrayList(argExps.length); // this is where we build up actual arguments - - Next n = null; - for (int i = argExps.length - 1; i >= 0; i--) { - final Next nn = n; - n = new Next(argExps[i], e, new Continuation() { - public Next receive(Object o) { - args.add(o); - if (nn != null) - return nn; - else - return k.receive(args); - } - }); - } - return n; - } - }; + public Block new_(Block type, Block... argExps) { + return new FunctionCallBlock(type,constant(""),argExps); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index c54addef1..7fc119aa2 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -15,7 +15,8 @@ public class FunctionCallBlock implements Block { private final Block lhsExp; /** - * Method name + * Method name. + * "<init>" to call constructor */ private final Block nameExp; @@ -69,8 +70,21 @@ public Next fixArg(Object v) { private Next dispatchOrArg() { if (args.length>idx) return then(argExps[idx],e,fixArg); - else - return methodCall(e,k,lhs,name,args); + else { + if (name.equals("")) { + // constructor call + Object v; + try { + v = fakeCallSite("").callConstructor(lhs,args); + } catch (Throwable t) { + throw new UnsupportedOperationException(t); // TODO: exception handling + } + return k.receive(v); + } else { + // regular method call + return methodCall(e,k,lhs,name,args); + } + } } } From 88a8e48de3ff7447700a49f49618f5bed428264a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 10:50:26 -0800 Subject: [PATCH 069/932] supported constructor call --- .../groovy/cps/CpsTransformer.groovy | 7 ++++-- .../groovy/cps/CpsTransformerTest.groovy | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index fcc0e8a29..880f10b9c 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -242,8 +242,11 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - void visitConstructorCallExpression(ConstructorCallExpression expression) { - throw new UnsupportedOperationException(); + void visitConstructorCallExpression(ConstructorCallExpression call) { + makeNode("new_") { + literal(call.type) + visit(((TupleExpression)call.arguments).expressions) + } } void visitTernaryExpression(TernaryExpression expression) { diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 029d290e9..63f935d51 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -136,4 +136,26 @@ class CpsTransformerTest { return i+"."+j+"."+x; """)=="0.0.0"; } + + @Test + void functionCall() { + assert evalCPS(""" + int i=1; + i.plus(2) + """)==3; + } + + @Test + void constructorCall() { + assert evalCPS(""" + new String("abc"+"def") + """)=="abcdef"; + } + + @Test + void constructorCall0arg() { + assert evalCPS(""" + new String() + """)==""; + } } From 1021b58937a1709ff40a542dfe5aa5567dc6bb19 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 10:53:34 -0800 Subject: [PATCH 070/932] a test case for a function call that takes no arguments --- .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 63f935d51..4eb5e78a8 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -145,6 +145,13 @@ class CpsTransformerTest { """)==3; } + @Test + void functionCall0arg() { + assert evalCPS(""" + 123.toString() + """)=="123"; + } + @Test void constructorCall() { assert evalCPS(""" From 50bd12f6bc45b239d9de01c06602eb4b3c599c47 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 11:01:01 -0800 Subject: [PATCH 071/932] a test case for a workflow method calling another workflow method --- .../com/cloudbees/groovy/cps/CpsTransformer.groovy | 13 ++++++++++++- src/main/java/com/cloudbees/groovy/cps/Builder.java | 3 ++- .../cloudbees/groovy/cps/CpsTransformerTest.groovy | 13 +++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 880f10b9c..a8e7f6788 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -479,7 +479,18 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor literal(exp.name) } } else - throw new UnsupportedOperationException("Unexpected variable type: ${ref.class}"); + if (exp.name=="this") { + /* Kohsuke: TODO: I don't really understand the 'true' block of the code, so I'm missing something + if (controller.isStaticMethod() || (!controller.getCompileStack().isImplicitThis() && controller.isStaticContext())) { + if (controller.isInClosure()) classNode = controller.getOutermostClass(); + visitClassExpression(new ClassExpression(classNode)); + } else { + loadThis(); + } + */ + makeNode("this_") + } else + throw new UnsupportedOperationException("Unexpected variable type: ${ref}"); } void visitDeclarationExpression(DeclarationExpression exp) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 7afe1badc..07422cae6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -30,6 +30,7 @@ */ public class Builder { private static final Block NULL = new ConstantBlock(null); + private static final LValueBlock THIS = new LocalVariableBlock("this"); public Block null_() { return NULL; @@ -141,7 +142,7 @@ public Block declareVariable(Class type, String name, Block init) { public Block this_() { - return localVariable("this"); + return THIS; } /** diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 4eb5e78a8..6288a7d4e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -165,4 +165,17 @@ class CpsTransformerTest { new String() """)==""; } + + @Test + void workflowCallingWorkflow() { + assert evalCPS(""" + def fib(int x) { + if (x==0) return 0; + if (x==1) return 1; + x = fib(x-1)+fib(x-2); // assignment to make sure x is treated as local variable + return x; + } + fib(10); + """)==55 + } } From ec468f4750a7c23cd98b726e3977c06fb7a4ec13 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 13:46:51 -0800 Subject: [PATCH 072/932] doc improvements --- .../groovy/cps/CpsTransformer.groovy | 41 ++++++++++++++++++- .../com/cloudbees/groovy/cps/Builder.java | 4 ++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index a8e7f6788..1c3a565c4 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -8,12 +8,51 @@ import org.codehaus.groovy.classgen.GeneratorContext import org.codehaus.groovy.control.CompilePhase import org.codehaus.groovy.control.SourceUnit import org.codehaus.groovy.control.customizers.CompilationCustomizer -import org.codehaus.groovy.syntax.Types import static org.codehaus.groovy.syntax.Types.* /** + * Performs CPS transformation of Groovy methods. * + *

+ * Every method annotated with {@link WorkflowMethod} gets rewritten. The general strategy of CPS transformation is + * as follows: + * + *

+ * Before: + * 

+ * Object foo(int x, int y) {
+ *   return x+y;
+ * }
+ *
+ * + *

+ * After: + * 

+ * Function foo(int x, int y) {
+ *   return foo$workflow;
+ * }
+ * static Function foo$workflow = new Function(["x","y"], B.plus(B.localVariable("x"), B.localVariable("y"));
+ *
+ * ("B" refers to {@link Builder#INSTANCE} for brevity) + * + *

+ * That is, we transform a Groovy AST of the method body into a tree of {@link Block}s by using {@link Builder#INSTANCE}, + * then the method just returns this function object and expect the caller to evaluate it, instead of executing the method + * synchronously before it returns. + * + *

+ * This class achieves this transformation by implementing {@link GroovyCodeVisitor} and traverse Groovy AST tree + * in the in-order. As we traverse this tree, we produce another Groovy AST tree that invokes {@link Builder}. + * Note that we aren't calling Builder directly here; that's supposed to happen when the Groovy code under transformation + * actually runs. + * + *

+ * Groovy AST that calls {@link Builder} is a tree of function call, so we build {@link MethodCallExpression}s + * in the top-down manner. We do this by {@link #makeNode(String)}, which creates a call to {@code Builder.xxx(...)}, + * then supply the closure that fills in the arguments to this call by walking down the original Groovy AST tree. + * This walk-down is done by calling {@link #visit(ASTNode)} (to recursively visit ASTs), or by calling {@link #literal(Object)} + * methods, which generate string/class/etc literals, as sometimes {@link Builder} methods need them as well. * * @author Kohsuke Kawaguchi */ diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 07422cae6..14c978a03 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -26,6 +26,10 @@ import static java.util.Arrays.*; /** + * Builder pattern for constructing {@link Block}s into a tree. + * + * For example, to build a {@link Block} that represents "1+1", you'd call {@code plus(one(),one())} + * * @author Kohsuke Kawaguchi */ public class Builder { From 5356b5721f5cd256eb10c8a8f68e3899fb39b987 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 10 Feb 2014 13:56:36 -0800 Subject: [PATCH 073/932] added list expression support --- .../groovy/cps/CpsTransformer.groovy | 6 +- .../com/cloudbees/groovy/cps/Builder.java | 9 ++- .../cloudbees/groovy/cps/impl/ListBlock.java | 60 +++++++++++++++++++ 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 1c3a565c4..58c35ae71 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -470,8 +470,10 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - void visitListExpression(ListExpression expression) { - throw new UnsupportedOperationException(); + void visitListExpression(ListExpression exp) { + makeNode("list") { + visit(exp.expressions) + } } void visitRangeExpression(RangeExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 14c978a03..b4fec7fb4 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -10,6 +10,7 @@ import com.cloudbees.groovy.cps.impl.ForLoopBlock; import com.cloudbees.groovy.cps.impl.FunctionCallBlock; import com.cloudbees.groovy.cps.impl.IfBlock; +import com.cloudbees.groovy.cps.impl.ListBlock; import com.cloudbees.groovy.cps.impl.LocalVariableBlock; import com.cloudbees.groovy.cps.impl.LogicalOpBlock; import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; @@ -144,7 +145,6 @@ public Block declareVariable(Class type, String name, Block init) { setLocalVariable(name, init)); } - public Block this_() { return THIS; } @@ -419,6 +419,13 @@ public Next eval(Env e, Continuation k) { }; } + /** + * [a,b,c,d] that creates a List. + */ + public Block list(Block... args) { + return new ListBlock(args); + } + /*TODO: specify the proper owner value (to the script that includes the call site) */ private static CallSite fakeCallSite(String method) { CallSiteArray csa = new CallSiteArray(Builder.class, new String[]{method}); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java new file mode 100644 index 000000000..b92745731 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java @@ -0,0 +1,60 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +import java.util.ArrayList; +import java.util.List; + +/** + * [a,b,c,d] kind of block. + * + * @author Kohsuke Kawaguchi + */ +public class ListBlock implements Block { + /** + * Arguments to the list. + */ + private final Block[] argExps; + + public ListBlock(Block... args) { + this.argExps = args; + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).dispatch(); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + List list = new ArrayList(); + int idx; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next item(Object v) { + list.add(v); + return dispatch(); + } + + /** + * If there are more arguments to evaluate, do so. Otherwise return the list. + */ + private Next dispatch() { + if (argExps.length>idx) + return then(argExps[idx++],e,item); + else { + return k.receive(list); + } + } + } + + static final ContinuationPtr item = new ContinuationPtr(ContinuationImpl.class,"item"); +} From 1b45747f44deacce06cac6349e16f7f35cebc725 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 05:19:30 -0800 Subject: [PATCH 074/932] updating TODOs --- TODO.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TODO.txt b/TODO.txt index 7bf474565..9e8914913 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,6 +1,7 @@ - array access (trivial, so can be done later) - closure -- continue and break +- debug information and stack trace fixup +- handle exceptions thrown from Block impls properly Tests to be written: - verify a proper method overload resolution From c80d12c07371443390cc11e50e8010f752c2c7bb Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 05:23:20 -0800 Subject: [PATCH 075/932] format fix --- .../java/com/cloudbees/groovy/cps/BasicTest.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index b2a8eb7a4..8383babbe 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -18,6 +18,15 @@ public class BasicTest extends Assert { Block $y = b.localVariable("y"); Block $z = b.localVariable("z"); + /** + * Evaluates the given body and return the yielded value. + */ + private T run(Block... bodies) { + Env e = new FunctionCallEnv(null,null,Continuation.HALT); + Next p = new Next(b.block(bodies), e, Continuation.HALT); + return (T)p.resume().yieldedValue(); + } + // 3 => 3 @Test @@ -300,9 +309,4 @@ public void blockScopedVariable() { // TODO: variable has to have a type for initialization } - private T run(Block... bodies) { - Env e = new FunctionCallEnv(null,null,Continuation.HALT); - Next p = new Next(b.block(bodies), e, Continuation.HALT); - return (T)p.resume().yieldedValue(); - } } From 63de799da3c33cb1cbaabd756acd1d20caeeb0e7 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 05:36:22 -0800 Subject: [PATCH 076/932] wired up try { ... } catch { ... } --- .../groovy/cps/CpsTransformer.groovy | 47 +++++++++++++++---- .../groovy/cps/CpsTransformerTest.groovy | 19 ++++++++ 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 58c35ae71..6429d476d 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -149,6 +149,25 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * Can be closure for building argument nodes, Expression, or List of Expressions. */ private void makeNode(String methodName, Object args) { + parent(new MethodCallExpression(BUILDER, methodName, makeChildren(args))); + } + + /** + * Makes an AST fragment that instantiates a new instance of the given type. + * + * @param args + * Can be closure for building argument nodes, Expression, or List of Expressions. + */ + private void makeNode(ClassNode type, Object args) { + parent(new ConstructorCallExpression(type, makeChildren(args))); + } + + /** + * Given closure, {@link Expression} or a list of them, package them up into + * {@link TupleExpression} + */ + private TupleExpression makeChildren(args) { + if (args==null) return new TupleExpression(); if (args instanceof Closure) { def argExps = [] def old = parent; @@ -162,8 +181,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - def tuple = args==null ? new TupleExpression() : new TupleExpression(args) - parent(new MethodCallExpression(BUILDER, methodName, tuple)); + return new TupleExpression(args); } private void makeNode(String methodName) { @@ -245,8 +263,12 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - void visitTryCatchFinally(TryCatchStatement finally1) { - throw new UnsupportedOperationException(); + void visitTryCatchFinally(TryCatchStatement stmt) { + // TODO: finally block + makeNode("tryCatch") { + visit(stmt.tryStatement) + visit(stmt.catchStatements) + } } void visitSwitch(SwitchStatement statement) { @@ -273,8 +295,12 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - void visitCatchStatement(CatchStatement statement) { - throw new UnsupportedOperationException(); + void visitCatchStatement(CatchStatement stmt) { + makeNode(CATCH_EXPRESSION_TYPE) { + literal(stmt.exceptionType) + literal(stmt.variable.name) + visit(stmt.code) + } } void visitStaticMethodCallExpression(StaticMethodCallExpression expression) { @@ -480,8 +506,12 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - void visitPropertyExpression(PropertyExpression expression) { - throw new UnsupportedOperationException(); + void visitPropertyExpression(PropertyExpression exp) { + // TODO: spread and safe + makeNode("property") { + visit(exp.objectExpression) + visit(exp.property) + } } void visitAttributeExpression(AttributeExpression attributeExpression) { @@ -609,6 +639,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(Function.class); + private static final ClassNode CATCH_EXPRESSION_TYPE = ClassHelper.makeCached(CatchExpression.class); private static final ClassNode BUILDER_TYPE = ClassHelper.makeCached(Builder.class); private static final PropertyExpression BUILDER = new PropertyExpression(new ClassExpression(BUILDER_TYPE), "INSTANCE") } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 6288a7d4e..132682a7c 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -178,4 +178,23 @@ class CpsTransformerTest { fib(10); """)==55 } + + /** + * + */ + @Test + void exceptionFromNonCpsCodeShouldBeCaughtByCatchBlockInCpsCode() { + assert evalCPS(""" + def foo() { + "abc".substring(5); // will caught exception + return "fail"; + } + + try { + return foo(); + } catch(StringIndexOutOfBoundsException e) { + return e.message; + } + """)=="String index out of range: -2" + } } From 5f887de91e80f1c239739b3c20f726c398006690 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 05:36:52 -0800 Subject: [PATCH 077/932] implementing exception handling at the boundary between normal and CPS --- .../java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 05252a6ab..0502c650d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -61,7 +61,7 @@ protected Next methodCall(Env e, Continuation k, Object receiver, String methodN CallSite callSite = fakeCallSite(methodName); v = callSite.call(receiver,args); } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling + return e.getExceptionHandler(t.getClass()).receive(t); } if (v instanceof Function) { From 71e28bb198ec925aa6084478a7554bf3ff3c1a94 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 05:37:30 -0800 Subject: [PATCH 078/932] more TODOs --- TODO.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO.txt b/TODO.txt index 9e8914913..bbd3d6b62 100644 --- a/TODO.txt +++ b/TODO.txt @@ -2,6 +2,8 @@ - closure - debug information and stack trace fixup - handle exceptions thrown from Block impls properly +- "synchronized" block +- finally block Tests to be written: - verify a proper method overload resolution From 98b37db1bf6ebe5f732186e5c6ec3376e9e985f1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 05:57:57 -0800 Subject: [PATCH 079/932] declareVariable handles that --- src/test/java/com/cloudbees/groovy/cps/BasicTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 8383babbe..a13ff498b 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -306,7 +306,6 @@ public void blockScopedVariable() { b.declareVariable(int.class,"x"), b.return_($x) )); - // TODO: variable has to have a type for initialization } } From bc3f66838ce885590167d5237096e2df0f6262ff Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 05:58:21 -0800 Subject: [PATCH 080/932] implemented proper exception rethrowing into CPS --- .../groovy/cps/impl/ContinuationGroup.java | 13 ++++++++++++- .../cloudbees/groovy/cps/impl/ForInLoopBlock.java | 6 ++---- .../groovy/cps/impl/FunctionCallBlock.java | 2 +- .../groovy/cps/impl/PropertyAccessBlock.java | 4 ++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 0502c650d..ce42a26b7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -61,7 +61,7 @@ protected Next methodCall(Env e, Continuation k, Object receiver, String methodN CallSite callSite = fakeCallSite(methodName); v = callSite.call(receiver,args); } catch (Throwable t) { - return e.getExceptionHandler(t.getClass()).receive(t); + return throwException(e, t); } if (v instanceof Function) { @@ -73,4 +73,15 @@ protected Next methodCall(Env e, Continuation k, Object receiver, String methodN return k.receive(v); } } + + /** + * Throws an exception into the CPS code by finding a suitable exception handler + * and resuming the execution from that point. + * + * We use this method to receive an exception thrown from the normal code and "rethrow" + * into the CPS code. + */ + protected Next throwException(Env e, Throwable t) { + return e.getExceptionHandler(t.getClass()).receive(t); + } } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java index 8d5654357..fd197f61a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java @@ -48,10 +48,8 @@ class ContinuationImpl extends ContinuationGroup { public Next loopHead(Object col) { try { itr = (Iterator) ScriptBytecodeAdapter.invokeMethod0(null/*unused*/, col, "iterator"); - } catch (Throwable e) { - // TODO: exception handling - e.printStackTrace(); - return loopEnd.receive(null); + } catch (Throwable t) { + return throwException(e, t); } return increment(null); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index 7fc119aa2..8f899477a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -77,7 +77,7 @@ private Next dispatchOrArg() { try { v = fakeCallSite("").callConstructor(lhs,args); } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling + return throwException(e, t); } return k.receive(v); } else { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index 637a670bb..74812969a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -57,7 +57,7 @@ public Next get(Continuation k) { try { v = ScriptBytecodeAdapter.getProperty(null/*Groovy doesn't use this parameter*/, lhs, name); } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling + return throwException(e, t); } if (v instanceof Function) { @@ -76,7 +76,7 @@ public Next set(Object v, Continuation k) { try { ScriptBytecodeAdapter.setProperty(v, null/*Groovy doesn't use this parameter*/, lhs, name); } catch (Throwable t) { - throw new UnsupportedOperationException(t); // TODO: exception handling + return throwException(e, t); } return k.receive(null); From 9abd6da5e94ce14fd96d61b0a87c82510f419d01 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 05:58:38 -0800 Subject: [PATCH 081/932] unused code --- src/main/java/com/cloudbees/groovy/cps/Builder.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index b4fec7fb4..ff038a7d2 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -16,8 +16,6 @@ import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; import com.cloudbees.groovy.cps.impl.TryBlockEnv; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; -import org.codehaus.groovy.runtime.callsite.CallSite; -import org.codehaus.groovy.runtime.callsite.CallSiteArray; import java.util.HashMap; import java.util.List; @@ -281,7 +279,7 @@ public Block mod(Block lhs, Block rhs) { } public Block power(Block lhs, Block rhs) { - return functionCall(lhs,"power",rhs); + return functionCall(lhs, "power", rhs); } public Block compareEqual(Block lhs, Block rhs) { @@ -426,12 +424,6 @@ public Block list(Block... args) { return new ListBlock(args); } - /*TODO: specify the proper owner value (to the script that includes the call site) */ - private static CallSite fakeCallSite(String method) { - CallSiteArray csa = new CallSiteArray(Builder.class, new String[]{method}); - return csa.array[0]; - } - /** * Used for building AST from transformed code. */ From f39a767fc2b7f48744b2e586d45199780a6848f9 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 07:20:39 -0800 Subject: [PATCH 082/932] implemented the if method translation --- TODO.txt | 1 + .../groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/TODO.txt b/TODO.txt index bbd3d6b62..cc77d80a2 100644 --- a/TODO.txt +++ b/TODO.txt @@ -4,6 +4,7 @@ - handle exceptions thrown from Block impls properly - "synchronized" block - finally block +- how do we handle multi-threading? Tests to be written: - verify a proper method overload resolution diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 6429d476d..f5755ff45 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -245,8 +245,12 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - void visitIfElse(IfStatement ifElse) { - throw new UnsupportedOperationException(); + void visitIfElse(IfStatement stmt) { + makeNode("if_") { + visit(stmt.booleanExpression) + visit(stmt.ifBlock) + visit(stmt.elseBlock) + } } void visitExpressionStatement(ExpressionStatement statement) { From 94e3cb6c6f636f9ae9584249228470d006d17535 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 13:35:01 -0800 Subject: [PATCH 083/932] exception handling is done --- TODO.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TODO.txt b/TODO.txt index cc77d80a2..d41f18b1c 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,10 +1,11 @@ - array access (trivial, so can be done later) - closure - debug information and stack trace fixup -- handle exceptions thrown from Block impls properly - "synchronized" block - finally block - how do we handle multi-threading? +- instead of return Function, throw it, and report the arguments and so on to check direct/indirect +- serialization Tests to be written: - verify a proper method overload resolution From ca35790fc856d57ffb966f7e43e9e43ea487085d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 13:39:54 -0800 Subject: [PATCH 084/932] marking stuff as serializable --- src/main/java/com/cloudbees/groovy/cps/Block.java | 4 +++- src/main/java/com/cloudbees/groovy/cps/Continuation.java | 4 +++- src/main/java/com/cloudbees/groovy/cps/Env.java | 4 +++- src/main/java/com/cloudbees/groovy/cps/LValueBlock.java | 6 ++++++ .../java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java | 2 ++ src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/ConstantBlock.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/ContinueBlock.java | 2 ++ .../cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java | 1 + .../com/cloudbees/groovy/cps/impl/FunctionCallBlock.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java | 2 ++ src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java | 2 ++ src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java | 2 ++ .../com/cloudbees/groovy/cps/impl/LocalVariableBlock.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java | 2 ++ .../com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java | 2 ++ .../com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java | 2 ++ src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java | 2 ++ 22 files changed, 50 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Block.java b/src/main/java/com/cloudbees/groovy/cps/Block.java index 1e481d5bf..f9399a922 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Block.java +++ b/src/main/java/com/cloudbees/groovy/cps/Block.java @@ -1,11 +1,13 @@ package com.cloudbees.groovy.cps; +import java.io.Serializable; + /** * AST Node of Groovy for CPS execution. * * @author Kohsuke Kawaguchi */ -public interface Block { +public interface Block extends Serializable { /** * Executes this expression, then pass the result to the given continuation when it's available. * diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 2ca44b5ad..e11278c90 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -1,5 +1,7 @@ package com.cloudbees.groovy.cps; +import java.io.Serializable; + import static com.cloudbees.groovy.cps.Block.*; /** @@ -12,7 +14,7 @@ * * @author Kohsuke Kawaguchi */ -public interface Continuation { +public interface Continuation extends Serializable { // this method cannot evaluate any expression on its own Next receive(Object o); diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index 035e7d2b0..b660c78b6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -1,11 +1,13 @@ package com.cloudbees.groovy.cps; +import java.io.Serializable; + /** * For variable lookup. This is local variables. * * @author Kohsuke Kawaguchi */ -public interface Env { +public interface Env extends Serializable { void declareVariable(Class type, String name); Object getLocalVariable(String name); diff --git a/src/main/java/com/cloudbees/groovy/cps/LValueBlock.java b/src/main/java/com/cloudbees/groovy/cps/LValueBlock.java index d297c1199..cc98a1d5c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/LValueBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/LValueBlock.java @@ -29,6 +29,8 @@ public GetAdapter(Continuation k) { public Next receive(Object l) { return ((LValue)l).get(k); } + + private static final long serialVersionUID = 1L; } /** @@ -52,5 +54,9 @@ private class BlockImpl implements Block { public Next eval(Env e, Continuation k) { return evalLValue(e,k); } + + private static final long serialVersionUID = 1L; } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java index b1d71d78b..0e06b0f9d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java @@ -85,4 +85,6 @@ public Next fixRhs(Object rhs) { static final ContinuationPtr assignAndDone = new ContinuationPtr(ContinuationImpl.class,"assignAndDone"); static final ContinuationPtr fixCur = new ContinuationPtr(ContinuationImpl.class,"fixCur"); static final ContinuationPtr fixRhs = new ContinuationPtr(ContinuationImpl.class,"fixRhs"); + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java index 6d4d53c7d..59bc06188 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java @@ -35,4 +35,6 @@ public void setLocalVariable(String name, Object value) { else parent.setLocalVariable(name, value); } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java index 27fda4768..96a7dfde8 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java @@ -22,4 +22,6 @@ public Next eval(Env e, Continuation k) { } public static final BreakBlock INSTANCE = new BreakBlock(null); + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java index 174016467..0f91c5e45 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java @@ -20,4 +20,6 @@ public ConstantBlock(Object value) { public Next eval(Env e, Continuation k) { return k.receive(value); } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java index 15a261ebf..e1cafc780 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java @@ -22,4 +22,6 @@ public Next eval(Env e, Continuation k) { } public static final ContinueBlock INSTANCE = new ContinueBlock(null); + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java index 9dac773a8..2588e58fd 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java @@ -90,4 +90,6 @@ public Next done(Object _) { static final ContinuationPtr fixCur = new ContinuationPtr(ContinuationImpl.class,"fixCur"); static final ContinuationPtr calc = new ContinuationPtr(ContinuationImpl.class,"calc"); static final ContinuationPtr done = new ContinuationPtr(ContinuationImpl.class,"done"); + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java index fd197f61a..daede3a66 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java @@ -69,4 +69,6 @@ public Next increment(Object _) { static final ContinuationPtr loopHead = new ContinuationPtr(ContinuationImpl.class,"loopHead"); static final ContinuationPtr increment = new ContinuationPtr(ContinuationImpl.class,"increment"); + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java index 75344f6d5..ef9c79d0a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java @@ -59,4 +59,5 @@ public Next increment(Object _) { static final ContinuationPtr loopCond = new ContinuationPtr(ContinuationImpl.class,"loopCond"); static final ContinuationPtr increment = new ContinuationPtr(ContinuationImpl.class,"increment"); + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index 8f899477a..befe69fcb 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -91,4 +91,6 @@ private Next dispatchOrArg() { static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); static final ContinuationPtr fixName = new ContinuationPtr(ContinuationImpl.class,"fixName"); static final ContinuationPtr fixArg = new ContinuationPtr(ContinuationImpl.class,"fixArg"); + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index 615e0947a..f4c2fe816 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -69,4 +69,6 @@ public Continuation getExceptionHandler(Class type) { return caller.getExceptionHandler(type); } } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java index 0d20fc636..b731a94ec 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java @@ -38,4 +38,6 @@ public Next jump(Object cond) { } static final ContinuationPtr jump = new ContinuationPtr(ContinuationImpl.class,"jump"); + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java index b92745731..46f9d6bc8 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java @@ -57,4 +57,6 @@ private Next dispatch() { } static final ContinuationPtr item = new ContinuationPtr(ContinuationImpl.class,"item"); + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java index bf2e95bd4..ca5a2c191 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java @@ -30,4 +30,6 @@ public Next set(Object v, Continuation k) { } }); } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java index f2df41fb6..76e2b57d7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java @@ -46,4 +46,6 @@ public Next decide(Object lhs) { } static final ContinuationPtr decide = new ContinuationPtr(ContinuationImpl.class,"decide"); + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java index 0b28b5abe..f6dc52d3f 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java @@ -34,4 +34,6 @@ public Continuation getContinueAddress(String label) { private boolean labelMatch(String given) { return given==null || given.equals(label); } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index 74812969a..05e023d36 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -85,4 +85,6 @@ public Next set(Object v, Continuation k) { static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); static final ContinuationPtr fixName = new ContinuationPtr(ContinuationImpl.class,"fixName"); + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java index 0e1839c9b..f53e3b340 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java @@ -40,4 +40,6 @@ public Continuation getContinueAddress(String label) { public Continuation getExceptionHandler(Class type) { return parent.getExceptionHandler(type); } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java index e3a3fb0cb..3a4444ca6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java @@ -34,4 +34,6 @@ public Continuation getExceptionHandler(Class type) { return super.getExceptionHandler(type); } + + private static final long serialVersionUID = 1L; } From b4e2d5ba5b8421a0a53aec57b50abcafc77dabe5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 11 Feb 2014 14:34:36 -0800 Subject: [PATCH 085/932] Implemented the while(...) { ... } loop --- .../groovy/cps/CpsTransformer.groovy | 10 +++- .../com/cloudbees/groovy/cps/Builder.java | 5 ++ .../cloudbees/groovy/cps/impl/WhileBlock.java | 56 +++++++++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 34 ++++++++++- 4 files changed, 101 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index f5755ff45..9b61e9032 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -238,7 +238,11 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitWhileLoop(WhileStatement loop) { - throw new UnsupportedOperationException(); + makeNode("while_") { + literal(loop.statementLabel) + visit(loop.booleanExpression) + visit(loop.loopBlock) + } } void visitDoWhileLoop(DoWhileStatement loop) { @@ -480,8 +484,8 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitBooleanExpression(BooleanExpression expression) { - visit(expression); + void visitBooleanExpression(BooleanExpression exp) { + visit(exp.expression); } void visitClosureExpression(ClosureExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index ff038a7d2..c2db450ce 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -15,6 +15,7 @@ import com.cloudbees.groovy.cps.impl.LogicalOpBlock; import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; import com.cloudbees.groovy.cps.impl.TryBlockEnv; +import com.cloudbees.groovy.cps.impl.WhileBlock; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import java.util.HashMap; @@ -189,6 +190,10 @@ public Block continue_(String label) { return new ContinueBlock(label); } + public Block while_(String label, Block cond, Block body) { + return new WhileBlock(label,cond,body); + } + public Block tryCatch(Block body, CatchExpression... catches) { return tryCatch(body, asList(catches)); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java new file mode 100644 index 000000000..387b901d9 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java @@ -0,0 +1,56 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** + * while(...) { ... } + * + * @author Kohsuke Kawaguchi + */ +public class WhileBlock implements Block { + final Block cond, body; + final String label; + + public WhileBlock(String label, Block cond, Block body) { + this.label = label; + this.cond = cond; + this.body = body; + } + + public Next eval(Env e, Continuation k) { + ContinuationImpl c = new ContinuationImpl(e, k); + return c.loopHead(null); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation loopEnd; + final Env e; + + ContinuationImpl(Env e, Continuation loopEnd) { + this.e = new LoopBlockScopeEnv(e, label, loopEnd, loopHead.bind(this)); + this.loopEnd = loopEnd; + } + + public Next loopHead(Object _) { + return then(cond, e, loopCond); + } + + public Next loopCond(Object cond) { + if (asBoolean(cond)) { + // loop + return then(body,e,loopHead); + } else { + // exit loop + return loopEnd.receive(null); + } + } + } + + static final ContinuationPtr loopHead = new ContinuationPtr(ContinuationImpl.class,"loopHead"); + static final ContinuationPtr loopCond = new ContinuationPtr(ContinuationImpl.class,"loopCond"); + + private static final long serialVersionUID = 1L; +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 132682a7c..586087027 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -25,7 +25,9 @@ class CpsTransformerTest { @Before void setUp() { - def imports = new ImportCustomizer().addImports(CpsTransformerTest.class.name) + def imports = new ImportCustomizer() + .addImports(CpsTransformerTest.class.name) + .addImports(WorkflowMethod.class.name) def cc = new CompilerConfiguration() cc.addCompilationCustomizers(imports) @@ -169,6 +171,7 @@ class CpsTransformerTest { @Test void workflowCallingWorkflow() { assert evalCPS(""" + @WorkflowMethod def fib(int x) { if (x==0) return 0; if (x==1) return 1; @@ -185,6 +188,7 @@ class CpsTransformerTest { @Test void exceptionFromNonCpsCodeShouldBeCaughtByCatchBlockInCpsCode() { assert evalCPS(""" + @WorkflowMethod def foo() { "abc".substring(5); // will caught exception return "fail"; @@ -197,4 +201,32 @@ class CpsTransformerTest { } """)=="String index out of range: -2" } + + /** + * while loop that evaluates to false and doesn't go through the body + */ + @Test + void whileLoop() { + assert evalCPS(""" + int x=1; + while (false) { + x++; + } + return x; + """)==1 + } + + /** + * while loop that goes through several iterations. + */ + @Test + void whileLoop5() { + assert evalCPS(""" + int x=1; + while (x<5) { + x++; + } + return x; + """)==5 + } } From e7e14273517f044e6161ecf520f079d8e6c7f15e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 04:35:09 -0800 Subject: [PATCH 086/932] added do/while support --- .../groovy/cps/CpsTransformer.groovy | 6 +- .../com/cloudbees/groovy/cps/Builder.java | 5 ++ .../groovy/cps/impl/DoWhileBlock.java | 60 +++++++++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 29 +++++++++ 4 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 9b61e9032..4e3030c29 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -246,7 +246,11 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitDoWhileLoop(DoWhileStatement loop) { - throw new UnsupportedOperationException(); + makeNode("doWhile") { + literal(loop.statementLabel) + visit(loop.booleanExpression) + visit(loop.loopBlock) + } } void visitIfElse(IfStatement stmt) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index c2db450ce..84fb4b4d4 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -5,6 +5,7 @@ import com.cloudbees.groovy.cps.impl.BreakBlock; import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.ContinueBlock; +import com.cloudbees.groovy.cps.impl.DoWhileBlock; import com.cloudbees.groovy.cps.impl.ExcrementOperatorBlock; import com.cloudbees.groovy.cps.impl.ForInLoopBlock; import com.cloudbees.groovy.cps.impl.ForLoopBlock; @@ -194,6 +195,10 @@ public Block while_(String label, Block cond, Block body) { return new WhileBlock(label,cond,body); } + public Block doWhile(String label, Block body, Block cond) { + return new DoWhileBlock(label,body,cond); + } + public Block tryCatch(Block body, CatchExpression... catches) { return tryCatch(body, asList(catches)); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java new file mode 100644 index 000000000..16b3c464e --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java @@ -0,0 +1,60 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** + * do { ... } while ( ... ); + * + * @author Kohsuke Kawaguchi + */ +public class DoWhileBlock implements Block { + final Block cond, body; + final String label; + + public DoWhileBlock(String label, Block body, Block cond) { + this.label = label; + this.body = body; + this.cond = cond; + } + + public Next eval(Env e, Continuation k) { + ContinuationImpl c = new ContinuationImpl(e, k); + return c.top(); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation loopEnd; + final Env e; + + ContinuationImpl(Env e, Continuation loopEnd) { + this.e = new LoopBlockScopeEnv(e, label, loopEnd, loopHead.bind(this)); + this.loopEnd = loopEnd; + } + + public Next top() { + return then(body,e,loopHead); + } + + public Next loopHead(Object _) { + return then(cond, e, loopCond); + } + + public Next loopCond(Object cond) { + if (asBoolean(cond)) { + // loop + return top(); + } else { + // exit loop + return loopEnd.receive(null); + } + } + } + + static final ContinuationPtr loopHead = new ContinuationPtr(ContinuationImpl.class,"loopHead"); + static final ContinuationPtr loopCond = new ContinuationPtr(ContinuationImpl.class,"loopCond"); + + private static final long serialVersionUID = 1L; +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 586087027..b52c5654b 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -3,6 +3,7 @@ package com.cloudbees.groovy.cps import org.codehaus.groovy.control.CompilerConfiguration import org.codehaus.groovy.control.customizers.ImportCustomizer import org.junit.Before +import org.junit.Ignore import org.junit.Test /** @@ -229,4 +230,32 @@ class CpsTransformerTest { return x; """)==5 } + + /** + * do-while loop that evaluates to false immediately + */ + @Test + void doWhileLoop() { + assert evalCPS(""" + int x=1; + do { + x++; + } while (false); + return x; + """)==2 + } + + /** + * do/while loop that goes through several iterations. + */ + @Test + void dowhileLoop5() { + assert evalCPS(""" + int x=1; + do { + x++; + } while (x<5); + return x; + """)==5 + } } From 381e129271a6bdb394e994ec20d5d449a454fa26 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 04:37:24 -0800 Subject: [PATCH 087/932] Turns out Groovy parser doesn't support do/while loop. So much for Java superset --- .../groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index b52c5654b..4381724b5 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -235,6 +235,7 @@ class CpsTransformerTest { * do-while loop that evaluates to false immediately */ @Test + @Ignore void doWhileLoop() { assert evalCPS(""" int x=1; @@ -249,6 +250,7 @@ class CpsTransformerTest { * do/while loop that goes through several iterations. */ @Test + @Ignore void dowhileLoop5() { assert evalCPS(""" int x=1; From b4b51b3aed61fbfc59d8f641d09f6b1f7a835088 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 04:44:53 -0800 Subject: [PATCH 088/932] looks like this was resulting in double-translation of the method --- .../groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 4e3030c29..486df2467 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -63,9 +63,8 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor @Override void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { - def ast = source.getAST(); - - ast.methods?.each { visitMethod(it) } +// def ast = source.getAST(); +// ast.methods?.each { visitMethod(it) } classNode?.declaredConstructors?.each { visitMethod(it) } classNode?.methods?.each { visitMethod(it) } // classNode?.objectInitializerStatements?.each { it.visit(visitor) } From fe460613630f80e28ba99854b2b02742b01d30a4 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 04:50:05 -0800 Subject: [PATCH 089/932] since I don't know exactly how source.ast and classNode.methods differ, better to rely on another way to detect double-translation --- .../groovy/cps/CpsTransformer.groovy | 13 +++++++++--- .../groovy/cps/WorkflowTransformed.java | 20 +++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/WorkflowTransformed.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 486df2467..b2ca25b60 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -9,6 +9,8 @@ import org.codehaus.groovy.control.CompilePhase import org.codehaus.groovy.control.SourceUnit import org.codehaus.groovy.control.customizers.CompilationCustomizer +import java.lang.annotation.Annotation + import static org.codehaus.groovy.syntax.Types.* /** @@ -63,8 +65,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor @Override void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { -// def ast = source.getAST(); -// ast.methods?.each { visitMethod(it) } + source.ast.methods?.each { visitMethod(it) } classNode?.declaredConstructors?.each { visitMethod(it) } classNode?.methods?.each { visitMethod(it) } // classNode?.objectInitializerStatements?.each { it.visit(visitor) } @@ -77,7 +78,11 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor private boolean shouldBeTransformed(MethodNode node) { if (node.name=="run" && node.returnType.name==Object.class.name && extendsFromScript(node.declaringClass)) return true; // default body of the script - return node.annotations.find { it.classNode.name==WorkflowMethod.class.name } != null; + return hasAnnotation(node, WorkflowMethod.class) && !hasAnnotation(node, WorkflowTransformed.class); + } + + private boolean hasAnnotation(MethodNode node, Class a) { + node.annotations.find { it.classNode.name == a.name } != null } private boolean extendsFromScript(ClassNode c) { @@ -121,6 +126,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor m.parameters.each { params.addExpression(new ConstantExpression(it.name))} m.code = new ReturnStatement(new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params,body))); + m.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)); } /** @@ -652,5 +658,6 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(Function.class); private static final ClassNode CATCH_EXPRESSION_TYPE = ClassHelper.makeCached(CatchExpression.class); private static final ClassNode BUILDER_TYPE = ClassHelper.makeCached(Builder.class); + private static final ClassNode WORKFLOW_TRANSFORMED_TYPE = ClassHelper.makeCached(WorkflowTransformed.class); private static final PropertyExpression BUILDER = new PropertyExpression(new ClassExpression(BUILDER_TYPE), "INSTANCE") } diff --git a/src/main/java/com/cloudbees/groovy/cps/WorkflowTransformed.java b/src/main/java/com/cloudbees/groovy/cps/WorkflowTransformed.java new file mode 100644 index 000000000..e0d7cd6b6 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/WorkflowTransformed.java @@ -0,0 +1,20 @@ +package com.cloudbees.groovy.cps; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Used internally to designate methods that were actually CPS-transformed. + * + * This helps us detect irregular situations like failing to transform a method + * or attempt to double-transform methods. + * + * @author Kohsuke Kawaguchi + */ +@Target(METHOD) +@Retention(RUNTIME) +public @interface WorkflowTransformed { +} From 08fec89b256729565fa8021a2258c76c64295640 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 04:53:22 -0800 Subject: [PATCH 090/932] renamed in anticipation of 'CpsClosure' --- .../com/cloudbees/groovy/cps/CpsTransformer.groovy | 12 ++++++------ .../groovy/cps/{Function.java => CpsFunction.java} | 6 ++++-- .../cloudbees/groovy/cps/impl/ContinuationGroup.java | 8 ++++---- .../groovy/cps/impl/PropertyAccessBlock.java | 8 ++++---- .../cloudbees/groovy/cps/CpsTransformerTest.groovy | 2 +- .../java/com/cloudbees/groovy/cps/BasicTest.java | 8 ++++---- 6 files changed, 23 insertions(+), 21 deletions(-) rename src/main/java/com/cloudbees/groovy/cps/{Function.java => CpsFunction.java} (84%) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index b2ca25b60..c06abcf97 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -31,10 +31,10 @@ import static org.codehaus.groovy.syntax.Types.* *

* After: * 

- * Function foo(int x, int y) {
+ * CpsFunction foo(int x, int y) {
  *   return foo$workflow;
  * }
- * static Function foo$workflow = new Function(["x","y"], B.plus(B.localVariable("x"), B.localVariable("y"));
+ * static CpsFunction foo$workflow = new CpsFunction(["x","y"], B.plus(B.localVariable("x"), B.localVariable("y"));
  *
* ("B" refers to {@link Builder#INSTANCE} for brevity) * @@ -105,15 +105,15 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * * To: * - * Function foo( T1 arg1, T2 arg2, ...) { - * return new Function(['arg1','arg2','arg3',...], CPS-transformed-method-body) + * CpsFunction foo( T1 arg1, T2 arg2, ...) { + * return new CpsFunction(['arg1','arg2','arg3',...], CPS-transformed-method-body) * } */ public void visitMethod(MethodNode m) { if (!shouldBeTransformed(m)) return; - // function shall now return the Function object + // function shall now return the CpsFunction object m.returnType = FUNCTION_TYPE; def body; @@ -655,7 +655,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(Function.class); + private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(CpsFunction.class); private static final ClassNode CATCH_EXPRESSION_TYPE = ClassHelper.makeCached(CatchExpression.class); private static final ClassNode BUILDER_TYPE = ClassHelper.makeCached(Builder.class); private static final ClassNode WORKFLOW_TRANSFORMED_TYPE = ClassHelper.makeCached(WorkflowTransformed.class); diff --git a/src/main/java/com/cloudbees/groovy/cps/Function.java b/src/main/java/com/cloudbees/groovy/cps/CpsFunction.java similarity index 84% rename from src/main/java/com/cloudbees/groovy/cps/Function.java rename to src/main/java/com/cloudbees/groovy/cps/CpsFunction.java index fb1dcdf4a..23eae14ee 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Function.java +++ b/src/main/java/com/cloudbees/groovy/cps/CpsFunction.java @@ -6,13 +6,15 @@ import java.util.List; /** + * Represents a CPS-transformed function. + * * @author Kohsuke Kawaguchi */ -public class Function { +public class CpsFunction { final Block body; final ImmutableList parameters; - public Function(List parameters, Block body) { + public CpsFunction(List parameters, Block body) { this.body = body; this.parameters = ImmutableList.copyOf(parameters); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index ce42a26b7..d25ac5a43 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -3,7 +3,7 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.Function; +import com.cloudbees.groovy.cps.CpsFunction; import com.cloudbees.groovy.cps.Next; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; @@ -64,10 +64,10 @@ protected Next methodCall(Env e, Continuation k, Object receiver, String methodN return throwException(e, t); } - if (v instanceof Function) { - // if this is a workflow function, it'd return a Function object instead + if (v instanceof CpsFunction) { + // if this is a workflow function, it'd return a CpsFunction object instead // of actually executing the function, so execute it in the CPS - return ((Function)v).invoke(e, receiver, Arrays.asList(args), k); + return ((CpsFunction)v).invoke(e, receiver, Arrays.asList(args), k); } else { // if this was a normal function, the method had just executed synchronously return k.receive(v); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index 05e023d36..7c0665e76 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -3,7 +3,7 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.Function; +import com.cloudbees.groovy.cps.CpsFunction; import com.cloudbees.groovy.cps.LValue; import com.cloudbees.groovy.cps.LValueBlock; import com.cloudbees.groovy.cps.Next; @@ -60,10 +60,10 @@ public Next get(Continuation k) { return throwException(e, t); } - if (v instanceof Function) { - // if this is a workflow function, it'd return a Function object instead + if (v instanceof CpsFunction) { + // if this is a workflow function, it'd return a CpsFunction object instead // of actually executing the function, so execute it in the CPS - return ((Function)v).invoke(e, lhs, emptyList(),k); + return ((CpsFunction)v).invoke(e, lhs, emptyList(),k); } else { // if this was a normal property, we get the value as-is. return k.receive(v); diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 4381724b5..f57ed9bb6 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -48,7 +48,7 @@ class CpsTransformerTest { Object evalCPSonly(String script) { Script s = csh.parse(script) - Function f = s.run(); + CpsFunction f = s.run(); def p = f.invoke(null, s, [], Continuation.HALT) def v = p.resume().yieldedValue() diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index a13ff498b..3c318d94d 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -122,8 +122,8 @@ private void if_(boolean cond, int expected) { @Test public void asyncCallingAsync() { class Op { - public Function add(int x, int y) { - return new Function(asList("x", "y"), + public CpsFunction add(int x, int y) { + return new CpsFunction(asList("x", "y"), b.sequence( b.setLocalVariable("z",b.functionCall($x,"plus",$y)), b.return_($z) @@ -200,9 +200,9 @@ class Op { * else * throw new IllegalArgumentException(message) */ - public Function throw_(int depth, String message) { + public CpsFunction throw_(int depth, String message) { Block $depth = b.localVariable("depth"); - return new Function(asList("depth", "message"), + return new CpsFunction(asList("depth", "message"), b.block( b.if_(b.lessThan(b.zero(), $depth), b.functionCall(b.this_(), "throw_", b.minus($depth, b.one()), b.localVariable("message")), From f54a89b35f83902d6cc074362221c83523fb91e1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 05:12:44 -0800 Subject: [PATCH 091/932] going through several iterations to nail closure definitions --- .../com/cloudbees/groovy/cps/CpsCallable.java | 37 +++++++++++++++++++ .../com/cloudbees/groovy/cps/CpsClosure.java | 32 ++++++++++++++++ .../cloudbees/groovy/cps/CpsClosureDef.java | 26 +++++++++++++ .../com/cloudbees/groovy/cps/CpsFunction.java | 9 +---- 4 files changed, 97 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/CpsCallable.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/CpsClosure.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/CpsClosureDef.java diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsCallable.java b/src/main/java/com/cloudbees/groovy/cps/CpsCallable.java new file mode 100644 index 000000000..38ff2c259 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/CpsCallable.java @@ -0,0 +1,37 @@ +package com.cloudbees.groovy.cps; + +import com.google.common.collect.ImmutableList; +import groovy.lang.Closure; + +import java.util.List; + +/** + * Common part of {@link CpsFunction} and {@link CpsClosureDef}, which represents something that's invokable. + * + * @author Kohsuke Kawaguchi + */ +abstract class CpsCallable { + final Block body; + final ImmutableList parameters; + + /*package*/ CpsCallable(List parameters, Block body) { + this.body = body; + this.parameters = ImmutableList.copyOf(parameters); + } + + /** + * Invokes this callable something. + * + * @param caller + * Environment of the caller. For example, if this invokable object throws an exception, + * we might have to use this environment to find where to dispatch that exception. + * @param receiver + * For functions, this is the left hand side of the expression that becomes 'this' object. + * For closures, this is the {@link Closure} object itself. + * @param args + * Arguments to the call that match up with {@link #parameters}. + * @param k + * The result of the function/closure call will be eventually passed to this continuation. + */ + abstract Next invoke(Env caller, Object receiver, List args, Continuation k); +} diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsClosure.java b/src/main/java/com/cloudbees/groovy/cps/CpsClosure.java new file mode 100644 index 000000000..e4874e7a8 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/CpsClosure.java @@ -0,0 +1,32 @@ +package com.cloudbees.groovy.cps; + +import groovy.lang.Closure; + +/** + * + * + * @author Kohsuke Kawaguchi + */ +public class CpsClosure extends Closure { + private final CpsClosureDef def; + + public CpsClosure(Object owner, Object thisObject, CpsClosureDef def) { + super(owner, thisObject); + this.def = def; + } + + @Override + public Object call() { + return def; + } + + @Override + public Object call(Object... args) { + return def; + } + + @Override + public Object call(Object arguments) { + return def; + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsClosureDef.java b/src/main/java/com/cloudbees/groovy/cps/CpsClosureDef.java new file mode 100644 index 000000000..c8b5b18b8 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/CpsClosureDef.java @@ -0,0 +1,26 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.FunctionCallEnv; + +import java.util.List; + +/** + * @author Kohsuke Kawaguchi + */ +public class CpsClosureDef extends CpsCallable { + public CpsClosureDef(List parameters, Block body) { + super(parameters, body); + } + + @Override + Next invoke(Env caller, Object receiver, List args, Continuation k) { + Env e = new FunctionCallEnv(caller, receiver, k); + assert args.size()== parameters.size(); // TODO: varargs + + for (int i=0; i< parameters.size(); i++) { + e.setLocalVariable(parameters.get(i), args.get(i)); + } + + return new Next(body, e, k); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsFunction.java b/src/main/java/com/cloudbees/groovy/cps/CpsFunction.java index 23eae14ee..3194d090e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/CpsFunction.java +++ b/src/main/java/com/cloudbees/groovy/cps/CpsFunction.java @@ -10,13 +10,9 @@ * * @author Kohsuke Kawaguchi */ -public class CpsFunction { - final Block body; - final ImmutableList parameters; - +public class CpsFunction extends CpsCallable { public CpsFunction(List parameters, Block body) { - this.body = body; - this.parameters = ImmutableList.copyOf(parameters); + super(parameters, body); } public Next invoke(Env caller, Object receiver, List args, Continuation k) { @@ -29,5 +25,4 @@ public Next invoke(Env caller, Object receiver, List args, Continuation k) { return new Next(body, e, k); } - } From 5ee160244e3825d16995ba33ed7e575ded30648f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 05:40:31 -0800 Subject: [PATCH 092/932] initial cut of the closure support --- .../groovy/cps/CpsTransformer.groovy | 1 + .../com/cloudbees/groovy/cps/Builder.java | 5 ++ .../cloudbees/groovy/cps/CpsClosureDef.java | 26 --------- .../java/com/cloudbees/groovy/cps/Env.java | 10 ++++ .../cloudbees/groovy/cps/impl/CallEnv.java | 54 +++++++++++++++++++ .../groovy/cps/impl/ClosureBlock.java | 30 +++++++++++ .../groovy/cps/impl/ClosureCallEnv.java | 53 ++++++++++++++++++ .../groovy/cps/impl/ContinuationGroup.java | 9 ++-- .../groovy/cps/{ => impl}/CpsCallable.java | 13 ++++- .../groovy/cps/{ => impl}/CpsClosure.java | 6 ++- .../groovy/cps/impl/CpsClosureDef.java | 34 ++++++++++++ .../groovy/cps/{ => impl}/CpsFunction.java | 15 +++--- .../groovy/cps/impl/FunctionCallEnv.java | 39 ++------------ .../groovy/cps/impl/PropertyAccessBlock.java | 1 - .../cloudbees/groovy/cps/impl/ProxyEnv.java | 4 ++ .../groovy/cps/CpsTransformerTest.groovy | 1 + .../com/cloudbees/groovy/cps/BasicTest.java | 1 + 17 files changed, 223 insertions(+), 79 deletions(-) delete mode 100644 src/main/java/com/cloudbees/groovy/cps/CpsClosureDef.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/CpsCallable.java (73%) rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/CpsClosure.java (67%) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/CpsFunction.java (57%) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index c06abcf97..051b7679a 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps +import com.cloudbees.groovy.cps.impl.CpsFunction import org.codehaus.groovy.ast.* import org.codehaus.groovy.ast.expr.* import org.codehaus.groovy.ast.stmt.* diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 84fb4b4d4..1bd0c49ad 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -3,6 +3,7 @@ import com.cloudbees.groovy.cps.impl.AssignmentBlock; import com.cloudbees.groovy.cps.impl.BlockScopeEnv; import com.cloudbees.groovy.cps.impl.BreakBlock; +import com.cloudbees.groovy.cps.impl.ClosureBlock; import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.ContinueBlock; import com.cloudbees.groovy.cps.impl.DoWhileBlock; @@ -121,6 +122,10 @@ public Block sequence(Block b) { return b; } + public Block closure(List parameters, Block body) { + return new ClosureBlock(parameters,body); + } + public LValueBlock localVariable(String name) { return new LocalVariableBlock(name); } diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsClosureDef.java b/src/main/java/com/cloudbees/groovy/cps/CpsClosureDef.java deleted file mode 100644 index c8b5b18b8..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/CpsClosureDef.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cloudbees.groovy.cps; - -import com.cloudbees.groovy.cps.impl.FunctionCallEnv; - -import java.util.List; - -/** - * @author Kohsuke Kawaguchi - */ -public class CpsClosureDef extends CpsCallable { - public CpsClosureDef(List parameters, Block body) { - super(parameters, body); - } - - @Override - Next invoke(Env caller, Object receiver, List args, Continuation k) { - Env e = new FunctionCallEnv(caller, receiver, k); - assert args.size()== parameters.size(); // TODO: varargs - - for (int i=0; i< parameters.size(); i++) { - e.setLocalVariable(parameters.get(i), args.get(i)); - } - - return new Next(body, e, k); - } -} diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index b660c78b6..fcb020af8 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -1,5 +1,7 @@ package com.cloudbees.groovy.cps; +import groovy.lang.Closure; + import java.io.Serializable; /** @@ -13,6 +15,14 @@ public interface Env extends Serializable { Object getLocalVariable(String name); void setLocalVariable(String name, Object value); + /** + * Closure or 'this' object that surrounds the currently executing code. + * If a new closure instantiation is encountered, this is th object that becomes + * {@linkplain Closure#getOwner() the owner} of that closure. + */ + Object closureOwner(); + + /** * Where should the return statement return to? */ diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java new file mode 100644 index 000000000..255ed2fb4 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -0,0 +1,54 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; + +/** + * Common part between {@link FunctionCallEnv} and {@link ClosureCallEnv}. + * + * @author Kohsuke Kawaguchi + */ +/*package*/ abstract class CallEnv implements Env { + private final Continuation returnAddress; + + /** + * Caller environment, used for throwing an exception. + * + * Can be null if there's no caller. + */ + private final Env caller; + + /** + * @param caller + * The environment of the call site. Can be null but only if the caller is outside CPS execution. + */ + public CallEnv(Env caller, Continuation returnAddress) { + this.caller = caller; + this.returnAddress = returnAddress; + } + + public final Continuation getReturnAddress() { + return returnAddress; + } + + public final Continuation getBreakAddress(String label) { + throw new IllegalStateException("unexpected break statement"); + } + + public final Continuation getContinueAddress(String label) { + throw new IllegalStateException("unexpected continue statement"); + } + + public final Continuation getExceptionHandler(Class type) { + if (caller==null) { + // TODO: maybe define a mechanism so that the resume() or start() kinda method will return + // by having this exception thrown? + return Continuation.HALT; + } else { + // propagate the exception to the caller + return caller.getExceptionHandler(type); + } + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java new file mode 100644 index 000000000..09f9f74cf --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java @@ -0,0 +1,30 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +import java.util.List; + +/** + * Closure instantiation: { ... } + * + * @author Kohsuke Kawaguchi + */ +public class ClosureBlock implements Block { + private final List parameters; + private final Block body; + + public ClosureBlock(List parameters, Block body) { + this.parameters = parameters; + this.body = body; + } + + public Next eval(Env e, Continuation k) { + return k.receive(new CpsClosure(e.closureOwner(), e.getLocalVariable("this"), + new CpsClosureDef(parameters,body,e))); + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java new file mode 100644 index 000000000..0ea632ab3 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java @@ -0,0 +1,53 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; + +import java.util.HashMap; +import java.util.Map; + +/** + * {@link Env} for evaluating the body of a closure. + * + * @author Kohsuke Kawaguchi + */ +class ClosureCallEnv extends CallEnv { + final Map locals = new HashMap(); + + final CpsClosure closure; + + /** + * Environment captured at the closure instantiation. + */ + final Env captured; + + public ClosureCallEnv(Env caller, Continuation returnAddress, Env captured, CpsClosure closure) { + super(caller,returnAddress); + this.closure = closure; + this.captured = captured; + } + + public void declareVariable(Class type, String name) { + locals.put(name,null); + } + + public Object getLocalVariable(String name) { + if (locals.containsKey(name)) + return locals.get(name); + else + return captured.getLocalVariable(name); + } + + public void setLocalVariable(String name, Object value) { + if (locals.containsKey(name)) + locals.put(name, value); + else + captured.setLocalVariable(name, value); + } + + public Object closureOwner() { + return closure; + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index d25ac5a43..b2aea155a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -3,7 +3,6 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.CpsFunction; import com.cloudbees.groovy.cps.Next; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; @@ -64,10 +63,10 @@ protected Next methodCall(Env e, Continuation k, Object receiver, String methodN return throwException(e, t); } - if (v instanceof CpsFunction) { - // if this is a workflow function, it'd return a CpsFunction object instead - // of actually executing the function, so execute it in the CPS - return ((CpsFunction)v).invoke(e, receiver, Arrays.asList(args), k); + if (v instanceof CpsCallable) { + // if this is a workflow function or a closure, it'd return a CpsCallable object instead + // of actually executing the code, so execute it in the CPS + return ((CpsCallable)v).invoke(e, receiver, Arrays.asList(args), k); } else { // if this was a normal function, the method had just executed synchronously return k.receive(v); diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsCallable.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java similarity index 73% rename from src/main/java/com/cloudbees/groovy/cps/CpsCallable.java rename to src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java index 38ff2c259..bf6d44d3a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/CpsCallable.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java @@ -1,5 +1,9 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; import com.google.common.collect.ImmutableList; import groovy.lang.Closure; @@ -34,4 +38,11 @@ abstract class CpsCallable { * The result of the function/closure call will be eventually passed to this continuation. */ abstract Next invoke(Env caller, Object receiver, List args, Continuation k); + + protected final void assignArguments(List args, Env e) { + assert args.size()== parameters.size(); // TODO: varargs + for (int i=0; i< parameters.size(); i++) { + e.setLocalVariable(parameters.get(i), args.get(i)); + } + } } diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsClosure.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java similarity index 67% rename from src/main/java/com/cloudbees/groovy/cps/CpsClosure.java rename to src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java index e4874e7a8..f909e3320 100644 --- a/src/main/java/com/cloudbees/groovy/cps/CpsClosure.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java @@ -1,9 +1,9 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; import groovy.lang.Closure; /** - * + * {@link Closure} whose code is CPS-transformed. * * @author Kohsuke Kawaguchi */ @@ -13,8 +13,10 @@ public class CpsClosure extends Closure { public CpsClosure(Object owner, Object thisObject, CpsClosureDef def) { super(owner, thisObject); this.def = def; + // TODO: parameterTypes and maximumNumberOfParameters } + // returning CpsCallable lets the caller know that it needs to do CPS evaluation of this closure. @Override public Object call() { return def; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java new file mode 100644 index 000000000..0d7f8ae54 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java @@ -0,0 +1,34 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +import java.util.List; + +/** + * @author Kohsuke Kawaguchi + */ +class CpsClosureDef extends CpsCallable { + /** + * Environment that was captured as of closure instantiation. + */ + private final Env capture; + + public CpsClosureDef(List parameters, Block body, Env capture) { + super(parameters, body); + this.capture = capture; + } + + @Override + Next invoke(Env caller, Object receiver, List args, Continuation k) { + Env e = new ClosureCallEnv(caller, k, capture, (CpsClosure)receiver); + + assignArguments(args, e); + + // TODO: who handles 'it' ? + + return new Next(body, e, k); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsFunction.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java similarity index 57% rename from src/main/java/com/cloudbees/groovy/cps/CpsFunction.java rename to src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java index 3194d090e..1ca48608d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/CpsFunction.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java @@ -1,7 +1,9 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; -import com.cloudbees.groovy.cps.impl.FunctionCallEnv; -import com.google.common.collect.ImmutableList; +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; import java.util.List; @@ -17,12 +19,7 @@ public CpsFunction(List parameters, Block body) { public Next invoke(Env caller, Object receiver, List args, Continuation k) { Env e = new FunctionCallEnv(caller, receiver, k); - assert args.size()== parameters.size(); // TODO: varargs - - for (int i=0; i< parameters.size(); i++) { - e.setLocalVariable(parameters.get(i), args.get(i)); - } - + assignArguments(args,e); return new Next(body, e, k); } } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index f4c2fe816..4ea2e6ff5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -10,28 +10,16 @@ * @author Kohsuke Kawaguchi */ // TODO: should be package local once all the impls move into this class -public class FunctionCallEnv implements Env { - // TODO: How do we correctly assign local variables to its scope? - +public class FunctionCallEnv extends CallEnv { // TODO: delegate? final Map locals = new HashMap(); - private final Continuation returnAddress; - - /** - * Caller environment, used for throwing an excception. - * - * Can be null if there's no caller. - */ - private final Env caller; - /** * @param caller * The environment of the call site. Can be null but only if the caller is outside CPS execution. */ public FunctionCallEnv(Env caller, Object _this, Continuation returnAddress) { - this.caller = caller; - this.returnAddress = returnAddress; + super(caller,returnAddress); locals.put("this",_this); } @@ -47,27 +35,8 @@ public void setLocalVariable(String name, Object value) { locals.put(name,value); } - public Continuation getReturnAddress() { - return returnAddress; - } - - public Continuation getBreakAddress(String label) { - throw new IllegalStateException("unexpected break statement"); - } - - public Continuation getContinueAddress(String label) { - throw new IllegalStateException("unexpected continue statement"); - } - - public Continuation getExceptionHandler(Class type) { - if (caller==null) { - // TODO: maybe define a mechanism so that the resume() or start() kinda method will return - // by having this exception thrown? - return Continuation.HALT; - } else { - // propagate the exception to the caller - return caller.getExceptionHandler(type); - } + public Object closureOwner() { + return getLocalVariable("this"); } private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index 7c0665e76..ce53a12a5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -3,7 +3,6 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.CpsFunction; import com.cloudbees.groovy.cps.LValue; import com.cloudbees.groovy.cps.LValueBlock; import com.cloudbees.groovy.cps.Next; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java index f53e3b340..e71c3389b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java @@ -25,6 +25,10 @@ public void setLocalVariable(String name, Object value) { parent.setLocalVariable(name, value); } + public Object closureOwner() { + return parent.closureOwner(); + } + public Continuation getReturnAddress() { return parent.getReturnAddress(); } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index f57ed9bb6..3af0a31f0 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps +import com.cloudbees.groovy.cps.impl.CpsFunction import org.codehaus.groovy.control.CompilerConfiguration import org.codehaus.groovy.control.customizers.ImportCustomizer import org.junit.Before diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 3c318d94d..5f3969b78 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.CpsFunction; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.junit.Assert; From 54fa95afb24ae3a4c762fa7cfb69c10c71248e33 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 05:58:56 -0800 Subject: [PATCH 093/932] a very simple closure is now working --- .../groovy/cps/CpsTransformer.groovy | 24 +++++++++++++++++-- .../groovy/cps/impl/ClosureBlock.java | 3 +-- .../groovy/cps/impl/CpsCallable.java | 2 +- .../cloudbees/groovy/cps/impl/CpsClosure.java | 8 +++++-- .../groovy/cps/impl/CpsClosureDef.java | 7 ++++-- .../groovy/cps/CpsTransformerTest.groovy | 8 +++++++ 6 files changed, 43 insertions(+), 9 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 051b7679a..a57c941ee 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -498,8 +498,23 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor visit(exp.expression); } - void visitClosureExpression(ClosureExpression expression) { - throw new UnsupportedOperationException(); + void visitClosureExpression(ClosureExpression exp) { + makeNode("closure") { + def params = new ListExpression(); + + // the interpretation of the 'parameters' is messed up. According to ClosureWriter, + // when the user explicitly defines no parameter "{ -> foo() }" then this is null, + // when the user doesn't define any parameter explicitly { foo() }, then this is empty, + if (exp.parameters==null) { + } else + if (exp.parameters.length==0) { + params.addExpression(new ConstantExpression("it")); + } else { + exp.parameters.each { params.addExpression(new ConstantExpression(it.name)) } + } + parent(params) + visit(exp.code) + } } void visitTupleExpression(TupleExpression expression) { @@ -661,4 +676,9 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor private static final ClassNode BUILDER_TYPE = ClassHelper.makeCached(Builder.class); private static final ClassNode WORKFLOW_TRANSFORMED_TYPE = ClassHelper.makeCached(WorkflowTransformed.class); private static final PropertyExpression BUILDER = new PropertyExpression(new ClassExpression(BUILDER_TYPE), "INSTANCE") + + /** + * Closure's default "it" parameter. + */ + private static final Parameter IT = new Parameter(ClassHelper.OBJECT_TYPE, "it", ConstantExpression.NULL); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java index 09f9f74cf..9cd998e7f 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java @@ -22,8 +22,7 @@ public ClosureBlock(List parameters, Block body) { } public Next eval(Env e, Continuation k) { - return k.receive(new CpsClosure(e.closureOwner(), e.getLocalVariable("this"), - new CpsClosureDef(parameters,body,e))); + return k.receive(new CpsClosure(e.closureOwner(), e.getLocalVariable("this"), parameters,body,e)); } private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java index bf6d44d3a..7d52d59c3 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java @@ -31,7 +31,7 @@ abstract class CpsCallable { * we might have to use this environment to find where to dispatch that exception. * @param receiver * For functions, this is the left hand side of the expression that becomes 'this' object. - * For closures, this is the {@link Closure} object itself. + * This parameter is meaningless for closures because it's not invoked with a LHS object. * @param args * Arguments to the call that match up with {@link #parameters}. * @param k diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java index f909e3320..912df953d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java @@ -1,7 +1,11 @@ package com.cloudbees.groovy.cps.impl; +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Env; import groovy.lang.Closure; +import java.util.List; + /** * {@link Closure} whose code is CPS-transformed. * @@ -10,9 +14,9 @@ public class CpsClosure extends Closure { private final CpsClosureDef def; - public CpsClosure(Object owner, Object thisObject, CpsClosureDef def) { + public CpsClosure(Object owner, Object thisObject, List parameters, Block body, Env capture) { super(owner, thisObject); - this.def = def; + this.def = new CpsClosureDef(parameters,body,capture,this); // TODO: parameterTypes and maximumNumberOfParameters } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java index 0d7f8ae54..28643fa23 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java @@ -16,14 +16,17 @@ class CpsClosureDef extends CpsCallable { */ private final Env capture; - public CpsClosureDef(List parameters, Block body, Env capture) { + private final CpsClosure self; + + CpsClosureDef(List parameters, Block body, Env capture, CpsClosure self) { super(parameters, body); this.capture = capture; + this.self = self; } @Override Next invoke(Env caller, Object receiver, List args, Continuation k) { - Env e = new ClosureCallEnv(caller, k, capture, (CpsClosure)receiver); + Env e = new ClosureCallEnv(caller, k, capture, self); assignArguments(args, e); diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 3af0a31f0..d29e32fe6 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -261,4 +261,12 @@ class CpsTransformerTest { return x; """)==5 } + + @Test + void helloClosure() { + assert evalCPS(""" + x = { -> 5 } + return x(); + """)==5 + } } From e06deefffbcaabbb35ecc2256b4016d2ba18482a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 06:05:35 -0800 Subject: [PATCH 094/932] closure allows invocation with smaller number of arguments --- src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java index 7d52d59c3..2d05ff238 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java @@ -40,8 +40,8 @@ abstract class CpsCallable { abstract Next invoke(Env caller, Object receiver, List args, Continuation k); protected final void assignArguments(List args, Env e) { - assert args.size()== parameters.size(); // TODO: varargs - for (int i=0; i< parameters.size(); i++) { + // TODO: var args + for (int i=0; i< Math.min(args.size(),parameters.size()); i++) { e.setLocalVariable(parameters.get(i), args.get(i)); } } From 8754eeec823d114650d1edf95f6704840387deeb Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 06:06:57 -0800 Subject: [PATCH 095/932] variable capture --- .../groovy/cps/CpsTransformerTest.groovy | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index d29e32fe6..a96f01a2f 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -269,4 +269,25 @@ class CpsTransformerTest { return x(); """)==5 } + + @Test + void closureShouldCaptureLiveVariables() { + assert evalCPS(""" + def c1,c2; + + { -> + def x = 0; + c1 = { return x; } + c2 = { v -> x=v; } + }(); + + r = ""+c1(); + c2(3); + r += "."+c1(); + c2(5); + r += "."+c1(); + + return r; + """)=="0.3.5" + } } From fb7c616c1daccea35074ad59ff9f0c3c99593bd9 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 06:08:15 -0800 Subject: [PATCH 096/932] There should be implicit "it" variable if none is defined --- .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index a96f01a2f..7e435df40 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -290,4 +290,13 @@ class CpsTransformerTest { return r; """)=="0.3.5" } + + @Test + void closureHasImplicitItVariable() { + assert evalCPS(""" + c = { it+1 } + + c(3); + """)==4 + } } From c363ce461e8b5f0586d8defe308de852c0bde293 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 12 Feb 2014 06:08:48 -0800 Subject: [PATCH 097/932] I think this covers enough of the basic closure to prove feasibility --- TODO.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/TODO.txt b/TODO.txt index d41f18b1c..b4dd048f6 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,5 +1,4 @@ - array access (trivial, so can be done later) -- closure - debug information and stack trace fixup - "synchronized" block - finally block From a7f95da72d8b023ed0ba7b6b88d74fcacaaeacf4 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 16 Feb 2014 07:32:04 -0800 Subject: [PATCH 098/932] adding the user-visible API --- .../com/cloudbees/groovy/cps/Continuable.java | 63 +++++++++++++++++++ .../java/com/cloudbees/groovy/cps/Next.java | 23 +++++++ .../java/com/cloudbees/groovy/cps/Yield.java | 11 ++++ 3 files changed, 97 insertions(+) create mode 100644 src/main/java/com/cloudbees/groovy/cps/Continuable.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/Yield.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java new file mode 100644 index 000000000..3b37e7dfa --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -0,0 +1,63 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.CpsFunction; +import com.cloudbees.groovy.cps.impl.FunctionCallEnv; + +import java.io.Serializable; +import java.util.Arrays; + +/** + * Mutable representation of the program. + * + * @author Kohsuke Kawaguchi + */ +public class Continuable implements Serializable { + private Continuation program; + + public Continuable(Continuation program) { + this.program = program; + } + + /** + * Creates a {@link Continuable} that executes the block of code. + */ + public Continuable(Block block) { + this(new Next(block, + new FunctionCallEnv(null,null,Continuation.HALT), + Continuation.HALT).asContinuation()); + } + + public Continuable clone() { + return new Continuable(program); + } + + /** + * Runs this program until it suspends the next time. + */ + public Object run(Object arg) { + Next n = program.receive(arg).resume(); + program = n.asContinuation(); + return n.yieldedValue(); + } + + public boolean isResumable() { + return program!=Continuation.HALT; + } + + /** + * Called from within CPS transformed program to suspends the execution, + * then have the caller of {@link Next#resume()} return with the object given to this method. + * When the execution is resumed, + */ + public static Object suspend(final Object v) { + return new CpsFunction(Arrays.asList("v"),new Block() { + public Next eval(Env e, Continuation k) { + Next next = new Next(NOOP, null, k); + next.yield(v); + return next; + } + }); + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 008da914e..d6b9123d2 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -52,6 +52,29 @@ public Next step() { return yield; } + /** + * Returns this object as a {@link Continuation} that ignores the argument. + */ + public Continuation asContinuation() { + if (isEnd()) return Continuation.HALT; // so that the caller can tell when it has terminated. + else return new ConstContinuation(); + } + + /** + * Does this represent the end of the program? + */ + public boolean isEnd() { + return k==Continuation.HALT && e==Block.NOOP; + } + private static final class Null {} private static final Null NULL = new Null(); + + private class ConstContinuation implements Continuation { + public Next receive(Object o) { + return Next.this; + } + + private static final long serialVersionUID = 1L; + } } diff --git a/src/main/java/com/cloudbees/groovy/cps/Yield.java b/src/main/java/com/cloudbees/groovy/cps/Yield.java new file mode 100644 index 000000000..e00baf50a --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Yield.java @@ -0,0 +1,11 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.CpsFunction; + +import java.util.Arrays; + +/** + * @author Kohsuke Kawaguchi + */ +public class Yield { +} From 7558635228fbf243d60bbcd2ffe026b322864d34 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 16 Feb 2014 07:33:43 -0800 Subject: [PATCH 099/932] making singleton serialization safe --- .../com/cloudbees/groovy/cps/Continuation.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index e11278c90..b13a9d5ac 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -21,11 +21,23 @@ public interface Continuation extends Serializable { /** * Indicates the end of a program. */ - final static Continuation HALT = new Continuation() { + final static Continuation HALT = new Halt(); + + /** + * Singleton implementation that maintains the singleton-ness across serialization + */ + final class Halt implements Continuation { + private Halt() { + } + public Next receive(Object o) { Next next = new Next(NOOP, null, HALT); next.yield(o); return next; } - }; + + public Object readResolve() { + return HALT; + } + } } From 84ab2beb211e1a675409f11e6f50d518c33f6b6a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 16 Feb 2014 07:36:47 -0800 Subject: [PATCH 100/932] making singleton serialization safe --- src/main/java/com/cloudbees/groovy/cps/Block.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Block.java b/src/main/java/com/cloudbees/groovy/cps/Block.java index f9399a922..0ed9bcd27 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Block.java +++ b/src/main/java/com/cloudbees/groovy/cps/Block.java @@ -21,9 +21,17 @@ public interface Block extends Serializable { /** * A function that does nothing. */ - final static Block NOOP = new Block() { + final static Block NOOP = new Noop(); + + final class Noop implements Block { + private Noop() {} + public Next eval(Env e, Continuation k) { return k.receive(null); } - }; + + public Object readResolve() { + return NOOP; + } + } } From d183742e2d6f30b8b657e13ac0e82007399484d2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 19 Feb 2014 13:17:16 -0800 Subject: [PATCH 101/932] testing serializability --- .../com/cloudbees/groovy/cps/Continuable.java | 4 ++++ .../java/com/cloudbees/groovy/cps/Next.java | 6 +++++- .../groovy/cps/SerializableScript.java | 20 +++++++++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 20 +++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/SerializableScript.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 3b37e7dfa..57493e41f 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -18,6 +18,10 @@ public Continuable(Continuation program) { this.program = program; } + public Continuable(Next program) { + this(program.asContinuation()); + } + /** * Creates a {@link Continuable} that executes the block of code. */ diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index d6b9123d2..a8fbdb5ac 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,11 +1,13 @@ package com.cloudbees.groovy.cps; +import java.io.Serializable; + /** * Remaining computation to execute. To work around the lack of tail-call optimization * * @author Kohsuke Kawaguchi */ -public class Next { +public class Next implements Serializable { Block f; Env e; Continuation k; @@ -77,4 +79,6 @@ public Next receive(Object o) { private static final long serialVersionUID = 1L; } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/SerializableScript.java b/src/main/java/com/cloudbees/groovy/cps/SerializableScript.java new file mode 100644 index 000000000..059613c8f --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/SerializableScript.java @@ -0,0 +1,20 @@ +package com.cloudbees.groovy.cps; + +import groovy.lang.Binding; +import groovy.lang.Script; + +import java.io.Serializable; + +/** + * @author Kohsuke Kawaguchi + */ +public abstract class SerializableScript extends Script implements Serializable { + public SerializableScript() { + } + + public SerializableScript(Binding binding) { + super(binding); + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 7e435df40..b4cb1e959 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -34,6 +34,7 @@ class CpsTransformerTest { def cc = new CompilerConfiguration() cc.addCompilationCustomizers(imports) cc.addCompilationCustomizers(new CpsTransformer()) + cc.scriptBaseClass = SerializableScript.class.name csh = new GroovyShell(binding,cc); cc = new CompilerConfiguration() @@ -299,4 +300,23 @@ class CpsTransformerTest { c(3); """)==4 } + + @Test + void serialization() { + Script s = csh.parse(""" + @WorkflowMethod + def plus3(int x) { + return x+3; + } + + 1+plus3(3*2) + """) + CpsFunction f = s.run(); + + def baos = new ByteArrayOutputStream() + new ObjectOutputStream(baos).writeObject(new Continuable(f.invoke(null,s,[],Continuation.HALT))); + + Continuable cx = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray())).readObject() + assert 10==cx.run(null) + } } From 1edee34d6db8b93f4fbf4fc9a914f4832da48c69 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 19 Feb 2014 13:23:12 -0800 Subject: [PATCH 102/932] changed more anonymous classes to named classes --- .../com/cloudbees/groovy/cps/Builder.java | 76 +++---------------- .../groovy/cps/impl/BlockScopedBlock.java | 25 ++++++ .../groovy/cps/impl/ReturnBlock.java | 23 ++++++ .../cloudbees/groovy/cps/impl/ThrowBlock.java | 34 +++++++++ .../groovy/cps/impl/TryCatchBlock.java | 42 ++++++++++ .../groovy/cps/impl/VariableDeclBlock.java | 39 ++++++++++ 6 files changed, 173 insertions(+), 66 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/BlockScopedBlock.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ReturnBlock.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 1bd0c49ad..52a8f2bdc 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -1,7 +1,7 @@ package com.cloudbees.groovy.cps; import com.cloudbees.groovy.cps.impl.AssignmentBlock; -import com.cloudbees.groovy.cps.impl.BlockScopeEnv; +import com.cloudbees.groovy.cps.impl.BlockScopedBlock; import com.cloudbees.groovy.cps.impl.BreakBlock; import com.cloudbees.groovy.cps.impl.ClosureBlock; import com.cloudbees.groovy.cps.impl.ConstantBlock; @@ -16,13 +16,14 @@ import com.cloudbees.groovy.cps.impl.LocalVariableBlock; import com.cloudbees.groovy.cps.impl.LogicalOpBlock; import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; -import com.cloudbees.groovy.cps.impl.TryBlockEnv; +import com.cloudbees.groovy.cps.impl.ReturnBlock; +import com.cloudbees.groovy.cps.impl.ThrowBlock; +import com.cloudbees.groovy.cps.impl.TryCatchBlock; +import com.cloudbees.groovy.cps.impl.VariableDeclBlock; import com.cloudbees.groovy.cps.impl.WhileBlock; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; -import java.util.HashMap; import java.util.List; -import java.util.Map; import static com.cloudbees.groovy.cps.Block.*; import static java.util.Arrays.*; @@ -83,13 +84,7 @@ public Block block(Block... bodies) { * Creates a block scope of variables around the given expression */ private Block blockScoped(final Block exp) { - return new Block() { - public Next eval(Env _e, final Continuation k) { - final Env e = new BlockScopeEnv(_e); // block statement creates a new scope - - return new Next(exp,e,k); - } - }; + return new BlockScopedBlock(exp); } /** @@ -135,13 +130,7 @@ public Block setLocalVariable(final String name, final Block rhs) { } public Block declareVariable(final Class type, final String name) { - return new Block() { - public Next eval(final Env e, final Continuation k) { - e.declareVariable(type,name); - e.setLocalVariable(name,defaultPrimitiveValue.get(type)); - return k.receive(null); - } - }; + return new VariableDeclBlock(type, name); } public Block declareVariable(Class type, String name, Block init) { @@ -218,47 +207,14 @@ public Block tryCatch(Block body, CatchExpression... catches) { * } */ public Block tryCatch(final Block body, final List catches) { - return new Block() { - public Next eval(final Env e, final Continuation k) { - final TryBlockEnv f = new TryBlockEnv(e); - for (final CatchExpression c : catches) { - f.addHandler(c.type, new Continuation() { - public Next receive(Object t) { - BlockScopeEnv b = new BlockScopeEnv(e); - b.declareVariable(c.type, c.name); - b.setLocalVariable(c.name, t); - - return new Next(c.handler, b, k); - } - }); - } - - // evaluate the body with the new environment - return new Next(body,f,k); - } - }; + return new TryCatchBlock(catches, body); } /** * throw exp; */ public Block throw_(final Block exp) { - return new Block() { - public Next eval(final Env e, Continuation k) { - return new Next(exp,e,new Continuation() { - public Next receive(Object t) { - if (t==null) { - t = new NullPointerException(); - } - // TODO: fake the stack trace information - // TODO: what if 't' is not Throwable? - - Continuation v = e.getExceptionHandler(Throwable.class.cast(t).getClass()); - return v.receive(t); - } - }); - } - }; + return new ThrowBlock(exp); } public Block staticCall(Class lhs, String name, Block... argExps) { @@ -425,11 +381,7 @@ public Block new_(Block type, Block... argExps) { * return exp; */ public Block return_(final Block exp) { - return new Block() { - public Next eval(Env e, Continuation k) { - return new Next(exp,e, e.getReturnAddress()); - } - }; + return new ReturnBlock(exp); } /** @@ -443,12 +395,4 @@ public Block list(Block... args) { * Used for building AST from transformed code. */ public static Builder INSTANCE = new Builder(); - - private static final Map defaultPrimitiveValue = new HashMap(); - static { - defaultPrimitiveValue.put(boolean.class,false); - defaultPrimitiveValue.put(int.class,0); - defaultPrimitiveValue.put(long.class,0L); - // TODO: complete the rest - } } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopedBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopedBlock.java new file mode 100644 index 000000000..84eb757fd --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopedBlock.java @@ -0,0 +1,25 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** +* @author Kohsuke Kawaguchi +*/ +public class BlockScopedBlock implements Block { + private final Block exp; + + public BlockScopedBlock(Block exp) { + this.exp = exp; + } + + public Next eval(Env _e, final Continuation k) { + final Env e = new BlockScopeEnv(_e); // block statement creates a new scope + + return new Next(exp,e,k); + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ReturnBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ReturnBlock.java new file mode 100644 index 000000000..6b5db78a1 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ReturnBlock.java @@ -0,0 +1,23 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** +* @author Kohsuke Kawaguchi +*/ +public class ReturnBlock implements Block { + private final Block exp; + + public ReturnBlock(Block exp) { + this.exp = exp; + } + + public Next eval(Env e, Continuation k) { + return new Next(exp,e, e.getReturnAddress()); + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java new file mode 100644 index 000000000..a6be1e59c --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java @@ -0,0 +1,34 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** +* @author Kohsuke Kawaguchi +*/ +public class ThrowBlock implements Block { + private final Block exp; + + public ThrowBlock(Block exp) { + this.exp = exp; + } + + public Next eval(final Env e, Continuation k) { + return new Next(exp,e,new Continuation() { + public Next receive(Object t) { + if (t==null) { + t = new NullPointerException(); + } + // TODO: fake the stack trace information + // TODO: what if 't' is not Throwable? + + Continuation v = e.getExceptionHandler(Throwable.class.cast(t).getClass()); + return v.receive(t); + } + }); + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java new file mode 100644 index 000000000..501fa0f87 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java @@ -0,0 +1,42 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.CatchExpression; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +import java.util.List; + +/** +* @author Kohsuke Kawaguchi +*/ +public class TryCatchBlock implements Block { + private final List catches; + private final Block body; + + public TryCatchBlock(List catches, Block body) { + this.catches = catches; + this.body = body; + } + + public Next eval(final Env e, final Continuation k) { + final TryBlockEnv f = new TryBlockEnv(e); + for (final CatchExpression c : catches) { + f.addHandler(c.type, new Continuation() { + public Next receive(Object t) { + BlockScopeEnv b = new BlockScopeEnv(e); + b.declareVariable(c.type, c.name); + b.setLocalVariable(c.name, t); + + return new Next(c.handler, b, k); + } + }); + } + + // evaluate the body with the new environment + return new Next(body,f,k); + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java new file mode 100644 index 000000000..15f167318 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java @@ -0,0 +1,39 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Builder; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +import java.util.HashMap; +import java.util.Map; + +/** +* @author Kohsuke Kawaguchi +*/ +public class VariableDeclBlock implements Block { + private final Class type; + private final String name; + + public VariableDeclBlock(Class type, String name) { + this.type = type; + this.name = name; + } + + public Next eval(final Env e, final Continuation k) { + e.declareVariable(type, name); + e.setLocalVariable(name, defaultPrimitiveValue.get(type)); + return k.receive(null); + } + + private static final long serialVersionUID = 1L; + + private static final Map defaultPrimitiveValue = new HashMap(); + static { + defaultPrimitiveValue.put(boolean.class,false); + defaultPrimitiveValue.put(int.class,0); + defaultPrimitiveValue.put(long.class,0L); + // TODO: complete the rest + } +} From 896b057095fb18cfc872ab9d0dba8b9f415fbcc3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 19 Feb 2014 17:04:38 -0800 Subject: [PATCH 103/932] converting anonymous class to named class --- .../com/cloudbees/groovy/cps/Builder.java | 11 ++----- .../groovy/cps/impl/SequenceBlock.java | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 52a8f2bdc..eae81c3e6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -102,15 +102,7 @@ public Block sequence(Block... bodies) { } public Block sequence(final Block exp1, final Block exp2) { - return new Block() { - public Next eval(final Env e, final Continuation k) { - return new Next(exp1,e,new Continuation() { - public Next receive(Object __) { - return new Next(exp2,e,k); - } - }); - } - }; + return new SequenceBlock(exp1, exp2); } public Block sequence(Block b) { @@ -395,4 +387,5 @@ public Block list(Block... args) { * Used for building AST from transformed code. */ public static Builder INSTANCE = new Builder(); + } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java new file mode 100644 index 000000000..606824b6a --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java @@ -0,0 +1,29 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** + * exp1; exp2 + * + * @author Kohsuke Kawaguchi + */ +class SequenceBlock implements Block { + private final Block exp1; + private final Block exp2; + + public SequenceBlock(Block exp1, Block exp2) { + this.exp1 = exp1; + this.exp2 = exp2; + } + + public Next eval(final Env e, final Continuation k) { + return new Next(exp1,e,new Continuation() { + public Next receive(Object __) { + return new Next(exp2,e,k); + } + }); + } +} From 7fba096d16df1d1fe6c255a46d59241457d7c5d0 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 19 Feb 2014 17:11:21 -0800 Subject: [PATCH 104/932] for persistence support we need ObjectInputStream that can load from custom classloader --- .../cps/ObjectInputStreamWithLoader.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/main/java/com/cloudbees/groovy/cps/ObjectInputStreamWithLoader.java diff --git a/src/main/java/com/cloudbees/groovy/cps/ObjectInputStreamWithLoader.java b/src/main/java/com/cloudbees/groovy/cps/ObjectInputStreamWithLoader.java new file mode 100644 index 000000000..48c93e2a3 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/ObjectInputStreamWithLoader.java @@ -0,0 +1,29 @@ +package com.cloudbees.groovy.cps; + +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectStreamClass; + +/** + * {@link ObjectInputStream} with a custom {@link ClassLoader}. + * + * @author Kohsuke Kawaguchi + */ +public class ObjectInputStreamWithLoader extends ObjectInputStream { + private final ClassLoader cl; + + public ObjectInputStreamWithLoader(InputStream in, ClassLoader cl) throws IOException { + super(in); + this.cl = cl; + } + + @Override + protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { + try { + return cl.loadClass(desc.getName()); + } catch (ClassNotFoundException e) { + return super.resolveClass(desc); + } + } +} From 19059498e6feee7bd2f19d0225be0103d846cf30 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 19 Feb 2014 17:11:34 -0800 Subject: [PATCH 105/932] this class needs to be public --- src/main/java/com/cloudbees/groovy/cps/Builder.java | 1 + src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index eae81c3e6..2e5999f06 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -17,6 +17,7 @@ import com.cloudbees.groovy.cps.impl.LogicalOpBlock; import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; import com.cloudbees.groovy.cps.impl.ReturnBlock; +import com.cloudbees.groovy.cps.impl.SequenceBlock; import com.cloudbees.groovy.cps.impl.ThrowBlock; import com.cloudbees.groovy.cps.impl.TryCatchBlock; import com.cloudbees.groovy.cps.impl.VariableDeclBlock; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java index 606824b6a..65c801e5f 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java @@ -10,7 +10,7 @@ * * @author Kohsuke Kawaguchi */ -class SequenceBlock implements Block { +public class SequenceBlock implements Block { private final Block exp1; private final Block exp2; From 48b01c220b1b2ebf43d2d432cc03004f89ffe026 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 19 Feb 2014 17:12:10 -0800 Subject: [PATCH 106/932] a test case for serialization --- .../groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index b4cb1e959..03196aa54 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -316,7 +316,7 @@ class CpsTransformerTest { def baos = new ByteArrayOutputStream() new ObjectOutputStream(baos).writeObject(new Continuable(f.invoke(null,s,[],Continuation.HALT))); - Continuable cx = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray())).readObject() + Continuable cx = new ObjectInputStreamWithLoader(new ByteArrayInputStream(baos.toByteArray()),s.class.classLoader).readObject() assert 10==cx.run(null) } } From 5aa5c9e41618844660818b2d30ac06ce06e00c0c Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 19 Feb 2014 17:25:05 -0800 Subject: [PATCH 107/932] making the test case more complicated --- .../groovy/cps/CpsTransformer.groovy | 21 +++++++++++++++++-- .../com/cloudbees/groovy/cps/Builder.java | 4 ++++ .../cloudbees/groovy/cps/CatchExpression.java | 5 ++++- .../groovy/cps/CpsTransformerTest.groovy | 8 +++++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index a57c941ee..e001ad60f 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -137,12 +137,21 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor private Closure parent; private void visit(ASTNode e) { - e.visit(this); + if (e instanceof EmptyExpression) { + // working around a bug in EmptyExpression.visit() that doesn't call any method + visitEmptyExpression(e); + } else + if (e instanceof EmptyStatement) { + // working around a bug in EmptyStatement.visit() that doesn't call any method + visitEmptyStatement(e); + } else { + e.visit(this); + } } private void visit(Collection col) { for (def e : col) { - e.visit(this); + visit(e); } } @@ -205,6 +214,14 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor parent(new ClassExpression(c)) } + void visitEmptyExpression(EmptyExpression e) { + makeNode("noop") + } + + void visitEmptyStatement(EmptyStatement e) { + makeNode("noop") + } + void visitMethodCallExpression(MethodCallExpression call) { makeNode("functionCall") { visit(call.objectExpression); diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 2e5999f06..b77512d8b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -44,6 +44,10 @@ public Block null_() { return NULL; } + public Block noop() { + return NOOP; + } + public Block constant(Object o) { return new ConstantBlock(o); } diff --git a/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java b/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java index 32baec019..b46329315 100644 --- a/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java +++ b/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import java.io.Serializable; import java.util.List; /** @@ -8,7 +9,7 @@ * @author Kohsuke Kawaguchi * @see Builder#tryCatch(Block, List) */ -public class CatchExpression { +public class CatchExpression implements Serializable { /** * Type of the exception to catch. */ @@ -29,4 +30,6 @@ public CatchExpression(Class type, String name, Block handl this.handler = handler; this.type = type; } + + private static final long serialVersionUID = 1L; } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 03196aa54..dc8e6eb15 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -309,6 +309,14 @@ class CpsTransformerTest { return x+3; } + for (int x=0; x<10; x++) {// meaningless code to cram as much coding construct as possible + try { + while (false) + ; + } catch(Exception e) { + ; + } + } 1+plus3(3*2) """) CpsFunction f = s.run(); From c09bd2bfaefb739401ff1ca47b6a1787d8e3f06d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 19 Feb 2014 17:37:32 -0800 Subject: [PATCH 108/932] refactored for reuse in other test classes --- .../groovy/cps/AbstractGroovyCpsTest.groovy | 58 +++++++++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 46 +-------------- 2 files changed, 59 insertions(+), 45 deletions(-) create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy new file mode 100644 index 000000000..b9943622f --- /dev/null +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -0,0 +1,58 @@ +package com.cloudbees.groovy.cps + +import com.cloudbees.groovy.cps.impl.CpsFunction +import org.codehaus.groovy.control.CompilerConfiguration +import org.codehaus.groovy.control.customizers.ImportCustomizer +import org.junit.Before + +/** + * + * + * @author Kohsuke Kawaguchi + */ +abstract class AbstractGroovyCpsTest { + /** + * CPS-transforming shelll + */ + GroovyShell csh; + + /** + * Default groovy shell + */ + GroovyShell sh; + + def binding = new Binding() + + @Before + void setUp() { + def imports = new ImportCustomizer() + .addImports(CpsTransformerTest.class.name) + .addImports(WorkflowMethod.class.name) + + def cc = new CompilerConfiguration() + cc.addCompilationCustomizers(imports) + cc.addCompilationCustomizers(new CpsTransformer()) + cc.scriptBaseClass = SerializableScript.class.name + csh = new GroovyShell(binding,cc); + + cc = new CompilerConfiguration() + cc.addCompilationCustomizers(imports) + sh = new GroovyShell(binding,cc); + } + + Object evalCPS(String script) { + Object v = evalCPSonly(script) + assert v==sh.evaluate(script); // make sure that regular non-CPS execution reports the same result + return v; + } + + Object evalCPSonly(String script) { + Script s = csh.parse(script) + CpsFunction f = s.run(); + def p = f.invoke(null, s, [], Continuation.HALT) + + def v = p.resume().yieldedValue() + v + } + +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index dc8e6eb15..6fc424372 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -12,51 +12,7 @@ import org.junit.Test * * @author Kohsuke Kawaguchi */ -class CpsTransformerTest { - /** - * CPS-transforming shelll - */ - GroovyShell csh; - - /** - * Default groovy shell - */ - GroovyShell sh; - - def binding = new Binding() - - @Before - void setUp() { - def imports = new ImportCustomizer() - .addImports(CpsTransformerTest.class.name) - .addImports(WorkflowMethod.class.name) - - def cc = new CompilerConfiguration() - cc.addCompilationCustomizers(imports) - cc.addCompilationCustomizers(new CpsTransformer()) - cc.scriptBaseClass = SerializableScript.class.name - csh = new GroovyShell(binding,cc); - - cc = new CompilerConfiguration() - cc.addCompilationCustomizers(imports) - sh = new GroovyShell(binding,cc); - } - - Object evalCPS(String script) { - Object v = evalCPSonly(script) - assert v==sh.evaluate(script); // make sure that regular non-CPS execution reports the same result - return v; - } - - Object evalCPSonly(String script) { - Script s = csh.parse(script) - CpsFunction f = s.run(); - def p = f.invoke(null, s, [], Continuation.HALT) - - def v = p.resume().yieldedValue() - v - } - +class CpsTransformerTest extends AbstractGroovyCpsTest { @Test void helloWorld() { assert evalCPS("'hello world'.length()")==11 From e9ae73f8d43872a15c65b0d3388948fb3c20178d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 19 Feb 2014 17:45:04 -0800 Subject: [PATCH 109/932] constructor needs to be executed synchronously, so we cannot transform them --- src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index e001ad60f..e813c82eb 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -67,7 +67,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor @Override void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { source.ast.methods?.each { visitMethod(it) } - classNode?.declaredConstructors?.each { visitMethod(it) } +// classNode?.declaredConstructors?.each { visitMethod(it) } // can't transform constructor classNode?.methods?.each { visitMethod(it) } // classNode?.objectInitializerStatements?.each { it.visit(visitor) } // classNode?.fields?.each { visitor.visitField(it) } From 84a7e2129d49a30e31bfc8f91a85600e23495f2f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 19 Feb 2014 18:10:40 -0800 Subject: [PATCH 110/932] switched to use exception for transformation to preserve method signatures --- .../groovy/cps/CpsTransformer.groovy | 23 +++++++++---- .../com/cloudbees/groovy/cps/Continuable.java | 1 + .../groovy/cps/impl/ContinuationGroup.java | 16 +++------- .../cps/impl/CpsCallableInvocation.java | 32 +++++++++++++++++++ .../cloudbees/groovy/cps/impl/CpsClosure.java | 6 ++-- .../groovy/cps/AbstractGroovyCpsTest.groovy | 20 ++++++++---- .../groovy/cps/ContinuableTest.groovy | 28 ++++++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 14 ++++---- 8 files changed, 105 insertions(+), 35 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index e813c82eb..6aab8ff9f 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation import com.cloudbees.groovy.cps.impl.CpsFunction import org.codehaus.groovy.ast.* import org.codehaus.groovy.ast.expr.* @@ -11,6 +12,7 @@ import org.codehaus.groovy.control.SourceUnit import org.codehaus.groovy.control.customizers.CompilationCustomizer import java.lang.annotation.Annotation +import java.lang.reflect.Modifier import static org.codehaus.groovy.syntax.Types.* @@ -60,6 +62,8 @@ import static org.codehaus.groovy.syntax.Types.* * @author Kohsuke Kawaguchi */ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor { + private int iota=0; + CpsTransformer() { super(CompilePhase.CANONICALIZATION) } @@ -106,17 +110,15 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * * To: * - * CpsFunction foo( T1 arg1, T2 arg2, ...) { - * return new CpsFunction(['arg1','arg2','arg3',...], CPS-transformed-method-body) + * private static CpsFunction ___cps___N = new CpsFunction(['arg1','arg2','arg3',...], CPS-transformed-method-body) + * ReturnT foo( T1 arg1, T2 arg2, ...) { + * throw new CpsCallableInvocation(___cps___N, this, arg1, arg2, ...) * } */ public void visitMethod(MethodNode m) { if (!shouldBeTransformed(m)) return; - // function shall now return the CpsFunction object - m.returnType = FUNCTION_TYPE; - def body; // transform the body @@ -126,7 +128,14 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor def params = new ListExpression(); m.parameters.each { params.addExpression(new ConstantExpression(it.name))} - m.code = new ReturnStatement(new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params,body))); + def f = m.declaringClass.addField("___cps___${iota++}", Modifier.STATIC, FUNCTION_TYPE, + new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body))); + + def args = new TupleExpression(new VariableExpression(f), THIS); + m.parameters.each { args.addExpression(new VariableExpression(it)) } + + m.code = new ThrowStatement(new ConstructorCallExpression(CPSCALLINVK_TYPE,args)); + m.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)); } @@ -691,8 +700,10 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(CpsFunction.class); private static final ClassNode CATCH_EXPRESSION_TYPE = ClassHelper.makeCached(CatchExpression.class); private static final ClassNode BUILDER_TYPE = ClassHelper.makeCached(Builder.class); + private static final ClassNode CPSCALLINVK_TYPE = ClassHelper.makeCached(CpsCallableInvocation.class); private static final ClassNode WORKFLOW_TRANSFORMED_TYPE = ClassHelper.makeCached(WorkflowTransformed.class); private static final PropertyExpression BUILDER = new PropertyExpression(new ClassExpression(BUILDER_TYPE), "INSTANCE") + private static final VariableExpression THIS = new VariableExpression("this"); /** * Closure's default "it" parameter. diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 57493e41f..7f0517f09 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.CpsFunction; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index b2aea155a..74a674f3a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -55,21 +55,15 @@ protected Next methodCall(Env e, ContinuationPtr k, Object receiver, String meth * Evaluates a function (possibly a workflow function), then pass the result to the given continuation. */ protected Next methodCall(Env e, Continuation k, Object receiver, String methodName, Object... args) { - Object v; try { CallSite callSite = fakeCallSite(methodName); - v = callSite.call(receiver,args); - } catch (Throwable t) { - return throwException(e, t); - } - - if (v instanceof CpsCallable) { - // if this is a workflow function or a closure, it'd return a CpsCallable object instead - // of actually executing the code, so execute it in the CPS - return ((CpsCallable)v).invoke(e, receiver, Arrays.asList(args), k); - } else { + Object v = callSite.call(receiver,args); // if this was a normal function, the method had just executed synchronously return k.receive(v); + } catch (CpsCallableInvocation inv) { + return inv.invoke(e,k); + } catch (Throwable t) { + return throwException(e, t); } } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java new file mode 100644 index 000000000..3681ecd62 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -0,0 +1,32 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +import java.util.List; + +import static java.util.Arrays.*; + +/** + * Invocation of {@link CpsCallable}. + * + * When we invoke CPS-transformed closure or function, this throwable gets thrown. + * + * @author Kohsuke Kawaguchi + */ +public class CpsCallableInvocation extends Error/*not really an error but we want something that doesn't change signature*/ { + public final CpsCallable call; + public final Object receiver; + public final List arguments; + + public CpsCallableInvocation(CpsCallable call, Object receiver, Object... arguments) { + this.call = call; + this.receiver = receiver; + this.arguments = asList(arguments); + } + + public Next invoke(Env caller, Continuation k) { + return call.invoke(caller,receiver,arguments,k); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java index 912df953d..e05498e8b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java @@ -23,16 +23,16 @@ public CpsClosure(Object owner, Object thisObject, List parameters, Bloc // returning CpsCallable lets the caller know that it needs to do CPS evaluation of this closure. @Override public Object call() { - return def; + throw new CpsCallableInvocation(def,this); } @Override public Object call(Object... args) { - return def; + throw new CpsCallableInvocation(def,this,args); } @Override public Object call(Object arguments) { - return def; + throw new CpsCallableInvocation(def,this,arguments); } } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index b9943622f..fdb5ee66b 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -1,8 +1,9 @@ package com.cloudbees.groovy.cps -import com.cloudbees.groovy.cps.impl.CpsFunction +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation import org.codehaus.groovy.control.CompilerConfiguration import org.codehaus.groovy.control.customizers.ImportCustomizer +import org.junit.Assert import org.junit.Before /** @@ -10,7 +11,7 @@ import org.junit.Before * * @author Kohsuke Kawaguchi */ -abstract class AbstractGroovyCpsTest { +abstract class AbstractGroovyCpsTest extends Assert { /** * CPS-transforming shelll */ @@ -47,12 +48,17 @@ abstract class AbstractGroovyCpsTest { } Object evalCPSonly(String script) { - Script s = csh.parse(script) - CpsFunction f = s.run(); - def p = f.invoke(null, s, [], Continuation.HALT) + return parseCps(script).invoke(null, Continuation.HALT).resume().yieldedValue() + } - def v = p.resume().yieldedValue() - v + CpsCallableInvocation parseCps(String script) { + Script s = csh.parse(script) + try { + s.run(); + fail "Expecting CPS transformation" + } catch (CpsCallableInvocation inv) { + return inv; + } } } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy new file mode 100644 index 000000000..e6879d8bc --- /dev/null +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -0,0 +1,28 @@ +package com.cloudbees.groovy.cps + +import com.cloudbees.groovy.cps.impl.CpsFunction +import org.junit.Test + +/** + * + * + * @author Kohsuke Kawaguchi + */ +class ContinuableTest extends AbstractGroovyCpsTest { + @Test + void resumeAndSuspend() { + Script s = csh.parse(""" + int x = 1; + x = Continuable.suspend(x) + return x; + """) + CpsFunction f = s.run(); + new Continuable(f.invoke(null,s,[],Continuation.HALT)) + + def baos = new ByteArrayOutputStream() + new ObjectOutputStream(baos).writeObject(); + + Continuable cx = new ObjectInputStreamWithLoader(new ByteArrayInputStream(baos.toByteArray()),s.class.classLoader).readObject() + assert 10==cx.run(null) + } +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 6fc424372..74bfbaab1 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -1,9 +1,6 @@ package com.cloudbees.groovy.cps -import com.cloudbees.groovy.cps.impl.CpsFunction -import org.codehaus.groovy.control.CompilerConfiguration -import org.codehaus.groovy.control.customizers.ImportCustomizer -import org.junit.Before +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation import org.junit.Ignore import org.junit.Test @@ -259,7 +256,7 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { @Test void serialization() { - Script s = csh.parse(""" + CpsCallableInvocation s = parseCps(""" @WorkflowMethod def plus3(int x) { return x+3; @@ -275,12 +272,13 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { } 1+plus3(3*2) """) - CpsFunction f = s.run(); def baos = new ByteArrayOutputStream() - new ObjectOutputStream(baos).writeObject(new Continuable(f.invoke(null,s,[],Continuation.HALT))); + new ObjectOutputStream(baos).writeObject(new Continuable(s.invoke(null,Continuation.HALT))); - Continuable cx = new ObjectInputStreamWithLoader(new ByteArrayInputStream(baos.toByteArray()),s.class.classLoader).readObject() + Continuable cx = new ObjectInputStreamWithLoader( + new ByteArrayInputStream(baos.toByteArray()), + s.receiver.class.classLoader).readObject() assert 10==cx.run(null) } } From 7566912e35ce7b0fcdb40c02f5b581e128560082 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 20 Feb 2014 05:56:23 -0800 Subject: [PATCH 111/932] refactored yield to another block subtype --- .../com/cloudbees/groovy/cps/Continuable.java | 10 ++----- .../java/com/cloudbees/groovy/cps/Next.java | 2 +- .../cloudbees/groovy/cps/impl/YieldBlock.java | 29 +++++++++++++++++++ 3 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 7f0517f09..fb27965f7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -1,8 +1,8 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.CpsFunction; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; +import com.cloudbees.groovy.cps.impl.YieldBlock; import java.io.Serializable; import java.util.Arrays; @@ -55,13 +55,7 @@ public boolean isResumable() { * When the execution is resumed, */ public static Object suspend(final Object v) { - return new CpsFunction(Arrays.asList("v"),new Block() { - public Next eval(Env e, Continuation k) { - Next next = new Next(NOOP, null, k); - next.yield(v); - return next; - } - }); + return new CpsFunction(Arrays.asList("v"), new YieldBlock(v)); } private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index a8fbdb5ac..30d469982 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -44,7 +44,7 @@ public Next step() { return f.eval(e,k); } - /*package*/ void yield(Object v) { + public void yield(Object v) { if (v==null) v = NULL; this.yield = v; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java new file mode 100644 index 000000000..6a367cce0 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java @@ -0,0 +1,29 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuable; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** + * Yield a value and suspend the execution of the program. + * + * @author Kohsuke Kawaguchi + * @see Continuable#suspend(Object) + */ +public class YieldBlock implements Block { + private final Object v; + + public YieldBlock(Object v) { + this.v = v; + } + + public Next eval(Env e, Continuation k) { + Next next = new Next(NOOP, null, k); + next.yield(v); + return next; + } + + private static final long serialVersionUID = 1L; +} From b93be371b9ed1448951d4fde6fd1e3314b19dbd2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 20 Feb 2014 06:03:38 -0800 Subject: [PATCH 112/932] import more classes --- .../com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index fdb5ee66b..639ed3bea 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -27,8 +27,7 @@ abstract class AbstractGroovyCpsTest extends Assert { @Before void setUp() { def imports = new ImportCustomizer() - .addImports(CpsTransformerTest.class.name) - .addImports(WorkflowMethod.class.name) + .addImports(CpsTransformerTest.class.name, Continuable.class.name, WorkflowMethod.class.name) def cc = new CompilerConfiguration() cc.addCompilationCustomizers(imports) From 188cd94c29cd35f20f8637b4458e6c1cc248803d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 20 Feb 2014 06:16:23 -0800 Subject: [PATCH 113/932] revisiting the way suspension is represented in Next --- .../java/com/cloudbees/groovy/cps/Continuable.java | 7 +++++-- .../java/com/cloudbees/groovy/cps/Continuation.java | 4 +--- src/main/java/com/cloudbees/groovy/cps/Next.java | 13 +++++++++++-- .../com/cloudbees/groovy/cps/impl/YieldBlock.java | 4 +--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index fb27965f7..512b38cee 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.CpsFunction; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import com.cloudbees.groovy.cps.impl.YieldBlock; @@ -41,7 +42,9 @@ public Continuable clone() { */ public Object run(Object arg) { Next n = program.receive(arg).resume(); - program = n.asContinuation(); + // when yielding, we resume from the continuation so that we can pass in the value. + // see Next#yield + program = n.k; return n.yieldedValue(); } @@ -55,7 +58,7 @@ public boolean isResumable() { * When the execution is resumed, */ public static Object suspend(final Object v) { - return new CpsFunction(Arrays.asList("v"), new YieldBlock(v)); + throw new CpsCallableInvocation(new CpsFunction(Arrays.asList("v"), new YieldBlock(v)),null,v); } private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index b13a9d5ac..daf5c3a36 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -31,9 +31,7 @@ private Halt() { } public Next receive(Object o) { - Next next = new Next(NOOP, null, HALT); - next.yield(o); - return next; + return Next.yield(o,HALT); } public Object readResolve() { diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 30d469982..f760d8038 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -44,9 +44,18 @@ public Next step() { return f.eval(e,k); } - public void yield(Object v) { + /** + * Creates a {@link Next} object that + * causes the interpreter loop to exit with the specified value, then optionally allow the interpreter + * to resume with the specified {@link Continuation}. + */ + public static Next yield(Object v, Continuation k) { + Next n = new Next(null,null,k); + if (v==null) v = NULL; - this.yield = v; + n.yield = v; + + return n; } /*package*/ Object yieldedValue() { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java index 6a367cce0..8b8ed5f6d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java @@ -20,9 +20,7 @@ public YieldBlock(Object v) { } public Next eval(Env e, Continuation k) { - Next next = new Next(NOOP, null, k); - next.yield(v); - return next; + return Next.yield(v,k); } private static final long serialVersionUID = 1L; From cb80771d16dc663451d316be2b3e538855a35cc3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 20 Feb 2014 06:16:56 -0800 Subject: [PATCH 114/932] a passing test case for suspend/resume --- .../groovy/cps/ContinuableTest.groovy | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index e6879d8bc..e4f793ffc 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -1,6 +1,5 @@ package com.cloudbees.groovy.cps -import com.cloudbees.groovy.cps.impl.CpsFunction import org.junit.Test /** @@ -11,18 +10,21 @@ import org.junit.Test class ContinuableTest extends AbstractGroovyCpsTest { @Test void resumeAndSuspend() { - Script s = csh.parse(""" + def inv = parseCps(""" int x = 1; - x = Continuable.suspend(x) - return x; + x = Continuable.suspend(x+1) + return x+1; """) - CpsFunction f = s.run(); - new Continuable(f.invoke(null,s,[],Continuation.HALT)) - def baos = new ByteArrayOutputStream() - new ObjectOutputStream(baos).writeObject(); + def c = new Continuable(inv.invoke(null,Continuation.HALT)); + assert c.isResumable() - Continuable cx = new ObjectInputStreamWithLoader(new ByteArrayInputStream(baos.toByteArray()),s.class.classLoader).readObject() - assert 10==cx.run(null) + def v = c.run(null); + assert v==2 : "Continuable.suspend(x+1) returns the control back to us"; + + assert c.isResumable() : "Continuable is resumable because it has 'return x+1' to execute." + assert c.run(3)==4 : "We resume continuable, then the control comes back from the return statement" + + assert !c.isResumable() : "We've run the program till the end, so it's no longer resumable" } } From 1c8450df2dc16e04633bea6a9465a140a15068de Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 20 Feb 2014 06:24:10 -0800 Subject: [PATCH 115/932] doc improvement --- .../com/cloudbees/groovy/cps/Continuable.java | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 512b38cee..d0aa97108 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -9,11 +9,14 @@ import java.util.Arrays; /** - * Mutable representation of the program. + * Mutable representation of the program. This is the primary API of the groovy-cps library to the outside. * * @author Kohsuke Kawaguchi */ public class Continuable implements Serializable { + /** + * Represents the remainder of the program to execute. + */ private Continuation program; public Continuable(Continuation program) { @@ -33,7 +36,12 @@ public Continuable(Block block) { Continuation.HALT).asContinuation()); } - public Continuable clone() { + /** + * Creates a shallow copy of {@link Continuable}. The copy shares + * all the local variables of the original {@link Continuable}, and + * point to the exact same point of the program. + */ + public Continuable fork() { return new Continuable(program); } @@ -48,14 +56,26 @@ public Object run(Object arg) { return n.yieldedValue(); } + /** + * Checks if this {@link Continuable} is pointing at the end of the program which cannot + * be resumed. + * + * If this method returns false, it is illegal to call {@link #run(Object)} + */ public boolean isResumable() { return program!=Continuation.HALT; } /** - * Called from within CPS transformed program to suspends the execution, - * then have the caller of {@link Next#resume()} return with the object given to this method. - * When the execution is resumed, + * Called from within CPS transformed program to suspends the execution. + * + *

+ * When this method is called, the control goes back to + * the caller of {@link #run(Object)}, which returns with the argument given to this method. + * + *

+ * When the continuable is resumed via {@link #run(Object)} later, the argument to the run method + * will become the return value from this method to the CPS-transformed program. */ public static Object suspend(final Object v) { throw new CpsCallableInvocation(new CpsFunction(Arrays.asList("v"), new YieldBlock(v)),null,v); From bc65ea2478f3cb5ea49b7132f6522fd5a915041d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 20 Feb 2014 06:29:31 -0800 Subject: [PATCH 116/932] refactored out an utility method --- .../cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy | 11 +++++++++++ .../cloudbees/groovy/cps/CpsTransformerTest.groovy | 9 ++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index 639ed3bea..b60b8482f 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -60,4 +60,15 @@ abstract class AbstractGroovyCpsTest extends Assert { } } + public T roundtripSerialization(T cx) { + def baos = new ByteArrayOutputStream() + + new ObjectOutputStream(baos).writeObject(cx); + + def ois = new ObjectInputStreamWithLoader( + new ByteArrayInputStream(baos.toByteArray()), + csh.classLoader) + + return ois.readObject() + } } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 74bfbaab1..00e1db3c6 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -272,13 +272,8 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { } 1+plus3(3*2) """) - - def baos = new ByteArrayOutputStream() - new ObjectOutputStream(baos).writeObject(new Continuable(s.invoke(null,Continuation.HALT))); - - Continuable cx = new ObjectInputStreamWithLoader( - new ByteArrayInputStream(baos.toByteArray()), - s.receiver.class.classLoader).readObject() + def cx = new Continuable(s.invoke(null, Continuation.HALT)) + cx = roundtripSerialization(cx) assert 10==cx.run(null) } } From 95bc61b067efe1e8740bb225905d1a20ae8a4c71 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 20 Feb 2014 06:30:43 -0800 Subject: [PATCH 117/932] for consistency with Continuable, naming this run() --- src/main/java/com/cloudbees/groovy/cps/Continuable.java | 2 +- src/main/java/com/cloudbees/groovy/cps/Next.java | 2 +- src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java | 2 +- .../com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy | 2 +- src/test/java/com/cloudbees/groovy/cps/BasicTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index d0aa97108..63cbe6dc0 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -49,7 +49,7 @@ public Continuable fork() { * Runs this program until it suspends the next time. */ public Object run(Object arg) { - Next n = program.receive(arg).resume(); + Next n = program.receive(arg).run(); // when yielding, we resume from the continuation so that we can pass in the value. // see Next#yield program = n.k; diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index f760d8038..2ff9a4a3c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -29,7 +29,7 @@ public Next(Block f, Env e, Continuation k) { /** * Resumes the execution of this program state, until it yields a value or finishes computation. */ - public Next resume() { + public Next run() { Next n = this; do { n = n.step(); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 255ed2fb4..d934fb5df 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -41,7 +41,7 @@ public final Continuation getContinueAddress(String label) { public final Continuation getExceptionHandler(Class type) { if (caller==null) { - // TODO: maybe define a mechanism so that the resume() or start() kinda method will return + // TODO: maybe define a mechanism so that the run() or start() kinda method will return // by having this exception thrown? return Continuation.HALT; } else { diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index b60b8482f..792a64b0f 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -47,7 +47,7 @@ abstract class AbstractGroovyCpsTest extends Assert { } Object evalCPSonly(String script) { - return parseCps(script).invoke(null, Continuation.HALT).resume().yieldedValue() + return parseCps(script).invoke(null, Continuation.HALT).run().yieldedValue() } CpsCallableInvocation parseCps(String script) { diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 5f3969b78..fdd44d8b8 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -25,7 +25,7 @@ public class BasicTest extends Assert { private T run(Block... bodies) { Env e = new FunctionCallEnv(null,null,Continuation.HALT); Next p = new Next(b.block(bodies), e, Continuation.HALT); - return (T)p.resume().yieldedValue(); + return (T)p.run().yieldedValue(); } From 1ac51027883c84b8c4ed1427715c5abd7b5854c6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 20 Feb 2014 06:42:21 -0800 Subject: [PATCH 118/932] made properly serializable --- .../groovy/cps/impl/ContinuationPtr.java | 62 ++++++++++++++----- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java index c56a891c5..d0a005f71 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java @@ -5,6 +5,9 @@ import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -24,9 +27,13 @@ * @author Kohsuke Kawaguchi */ class ContinuationPtr { - private final Method m; + private transient /*final except serialization*/ Method m; ContinuationPtr(Class type, String methodName) { + resolveMethod(type, methodName); + } + + private void resolveMethod(Class type, String methodName) { try { m = type.getMethod(methodName,Object.class); } catch (NoSuchMethodException e) { @@ -38,21 +45,44 @@ class ContinuationPtr { * Binds the pointer to a continuation method to a specific receiver instance. */ Continuation bind(final Object target) { - return new Continuation() { - public Next receive(Object o) { - try { - return (Next)m.invoke(target,o); - } catch (IllegalAccessException e) { - throw (IllegalAccessError)new IllegalAccessError().initCause(e); - } catch (InvocationTargetException e) { - Throwable t = e.getTargetException(); - if (t instanceof Error) - throw (Error) t; - if (t instanceof RuntimeException) - throw (RuntimeException) t; - throw new Error(e); - } + return new ContinuationImpl(target); + } + + private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException { + Class c = (Class)ois.readObject(); + String methodName = ois.readUTF(); + resolveMethod(c,methodName); + } + + private void writeObject(ObjectOutputStream oos) throws IOException { + oos.writeObject(m.getDeclaringClass()); + oos.writeUTF(m.getName()); + } + + private class ContinuationImpl implements Continuation { + private final Object target; + + public ContinuationImpl(Object target) { + this.target = target; + } + + public Next receive(Object o) { + try { + return (Next)m.invoke(target,o); + } catch (IllegalAccessException e) { + throw (IllegalAccessError)new IllegalAccessError().initCause(e); + } catch (InvocationTargetException e) { + Throwable t = e.getTargetException(); + if (t instanceof Error) + throw (Error) t; + if (t instanceof RuntimeException) + throw (RuntimeException) t; + throw new Error(e); } - }; + } + + private static final long serialVersionUID = 1L; } + + private static final long serialVersionUID = 1L; } From 08a8a3390fef38b96de2557e42986ff0d7c28026 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 20 Feb 2014 06:44:22 -0800 Subject: [PATCH 119/932] added a test case to serialize Continuable --- .../groovy/cps/impl/AssignmentBlock.java | 2 + .../groovy/cps/impl/ContinuationGroup.java | 5 ++- .../groovy/cps/impl/ContinuationPtr.java | 3 +- .../groovy/cps/impl/DoWhileBlock.java | 2 + .../groovy/cps/impl/ForInLoopBlock.java | 2 + .../groovy/cps/impl/ForLoopBlock.java | 2 + .../groovy/cps/impl/FunctionCallBlock.java | 2 + .../cloudbees/groovy/cps/impl/IfBlock.java | 2 + .../cloudbees/groovy/cps/impl/ListBlock.java | 2 + .../groovy/cps/impl/LogicalOpBlock.java | 2 + .../groovy/cps/impl/PropertyAccessBlock.java | 2 + .../cloudbees/groovy/cps/impl/WhileBlock.java | 2 + .../groovy/cps/ContinuableTest.groovy | 45 +++++++++++++++++-- 13 files changed, 68 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java index 0e06b0f9d..77cc2295c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java @@ -79,6 +79,8 @@ public Next fixCur(Object cur) { public Next fixRhs(Object rhs) { return methodCall(e, assignAndDone, this.cur, compoundOp, rhs); } + + private static final long serialVersionUID = 1L; } static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 74a674f3a..b92502b51 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -8,6 +8,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; +import java.io.Serializable; import java.util.Arrays; /** @@ -19,7 +20,7 @@ * @see ContinuationPtr * @author Kohsuke Kawaguchi */ -abstract class ContinuationGroup { +abstract class ContinuationGroup implements Serializable { public Next then(Block exp, Env e, ContinuationPtr ptr) { return new Next(exp,e,ptr.bind(this)); } @@ -77,4 +78,6 @@ protected Next methodCall(Env e, Continuation k, Object receiver, String methodN protected Next throwException(Env e, Throwable t) { return e.getExceptionHandler(t.getClass()).receive(t); } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java index d0a005f71..178d697bc 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -26,7 +27,7 @@ * @see ContinuationGroup#then(Block, Env, ContinuationPtr) * @author Kohsuke Kawaguchi */ -class ContinuationPtr { +class ContinuationPtr implements Serializable { private transient /*final except serialization*/ Method m; ContinuationPtr(Class type, String methodName) { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java index 16b3c464e..ccc64754f 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java @@ -51,6 +51,8 @@ public Next loopCond(Object cond) { return loopEnd.receive(null); } } + + private static final long serialVersionUID = 1L; } static final ContinuationPtr loopHead = new ContinuationPtr(ContinuationImpl.class,"loopHead"); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java index daede3a66..595f5c9e2 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java @@ -65,6 +65,8 @@ public Next increment(Object _) { return loopEnd.receive(null); } } + + private static final long serialVersionUID = 1L; } static final ContinuationPtr loopHead = new ContinuationPtr(ContinuationImpl.class,"loopHead"); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java index ef9c79d0a..5284ccda6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java @@ -53,6 +53,8 @@ public Next loopCond(Object cond) { public Next increment(Object _) { return then(e3,e,loopHead); } + + private static final long serialVersionUID = 1L; } static final ContinuationPtr loopHead = new ContinuationPtr(ContinuationImpl.class,"loopHead"); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index befe69fcb..c968548e8 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -86,6 +86,8 @@ private Next dispatchOrArg() { } } } + + private static final long serialVersionUID = 1L; } static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java index b731a94ec..34b49415c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java @@ -35,6 +35,8 @@ class ContinuationImpl extends ContinuationGroup { public Next jump(Object cond) { return then(asBoolean(cond) ? then : els,e,k); } + + private static final long serialVersionUID = 1L; } static final ContinuationPtr jump = new ContinuationPtr(ContinuationImpl.class,"jump"); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java index 46f9d6bc8..c849344f5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java @@ -54,6 +54,8 @@ private Next dispatch() { return k.receive(list); } } + + private static final long serialVersionUID = 1L; } static final ContinuationPtr item = new ContinuationPtr(ContinuationImpl.class,"item"); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java index 76e2b57d7..9c983cd1c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java @@ -43,6 +43,8 @@ public Next decide(Object lhs) { else return then(rhs,e,k); } } + + private static final long serialVersionUID = 1L; } static final ContinuationPtr decide = new ContinuationPtr(ContinuationImpl.class,"decide"); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index ce53a12a5..4590cf91a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -80,6 +80,8 @@ public Next set(Object v, Continuation k) { return k.receive(null); } + + private static final long serialVersionUID = 1L; } static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java index 387b901d9..c04cccf71 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java @@ -47,6 +47,8 @@ public Next loopCond(Object cond) { return loopEnd.receive(null); } } + + private static final long serialVersionUID = 1L; } static final ContinuationPtr loopHead = new ContinuationPtr(ContinuationImpl.class,"loopHead"); diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index e4f793ffc..4f6d7e904 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -22,9 +22,48 @@ class ContinuableTest extends AbstractGroovyCpsTest { def v = c.run(null); assert v==2 : "Continuable.suspend(x+1) returns the control back to us"; - assert c.isResumable() : "Continuable is resumable because it has 'return x+1' to execute." - assert c.run(3)==4 : "We resume continuable, then the control comes back from the return statement" + def c2 = c.fork() - assert !c.isResumable() : "We've run the program till the end, so it's no longer resumable" + for (d in [c,c2]) { + assert d.isResumable() : "Continuable is resumable because it has 'return x+1' to execute." + assert d.run(3)==4 : "We resume continuable, then the control comes back from the return statement" + + assert !d.isResumable() : "We've run the program till the end, so it's no longer resumable" + } + } + + @Test + void serializeComplexContinuable() { + def inv = parseCps(""" + @WorkflowMethod + def foo(int x) { + return Continuable.suspend(x); + } + + @WorkflowMethod + def plus3(int x) { + return x+3; + } + + try { + for (int x=0; x<1; x++) { + while (true) { + y = plus3(foo(5)) + break; + } + } + } catch (ClassCastException e) { + y = e; + } + return y; + """) + + def c = new Continuable(inv.invoke(null,Continuation.HALT)); + assert c.run(null)==5 : "suspension within a subroutine"; + + c = roundtripSerialization(c); // at this point there's a fairly non-trivial Continuation, so try to serialize it + + assert c.isResumable() + assert c.run(6)==9; } } From 482758275bfeedd20b9c0ae67be79cfe797b4d31 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 20 Feb 2014 06:45:09 -0800 Subject: [PATCH 120/932] Completed those TODOs --- TODO.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/TODO.txt b/TODO.txt index b4dd048f6..da07ab0b2 100644 --- a/TODO.txt +++ b/TODO.txt @@ -3,8 +3,6 @@ - "synchronized" block - finally block - how do we handle multi-threading? -- instead of return Function, throw it, and report the arguments and so on to check direct/indirect -- serialization Tests to be written: - verify a proper method overload resolution From 4db4bbab99830d8d5749413326ad21366c2c5421 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 4 Mar 2014 10:54:07 -0800 Subject: [PATCH 121/932] test regression when we switched to CpsCallableInvocation --- src/test/java/com/cloudbees/groovy/cps/BasicTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index fdd44d8b8..14ddec44e 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.CpsFunction; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; @@ -123,12 +124,13 @@ private void if_(boolean cond, int expected) { @Test public void asyncCallingAsync() { class Op { - public CpsFunction add(int x, int y) { - return new CpsFunction(asList("x", "y"), + public int add(int x, int y) { + CpsFunction f = new CpsFunction(asList("x", "y"), b.sequence( - b.setLocalVariable("z",b.functionCall($x,"plus",$y)), - b.return_($z) + b.setLocalVariable("z", b.functionCall($x, "plus", $y)), + b.return_($z) )); + throw new CpsCallableInvocation(f,this,x,y); } } From fe4181c5625b1dfbb3e1a9c6e2eb29e672205aaa Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 4 Mar 2014 10:54:58 -0800 Subject: [PATCH 122/932] test regression when we switched to CpsCallableInvocation --- src/test/java/com/cloudbees/groovy/cps/BasicTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 14ddec44e..9eba4006b 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -203,9 +203,9 @@ class Op { * else * throw new IllegalArgumentException(message) */ - public CpsFunction throw_(int depth, String message) { + public void throw_(int depth, String message) { Block $depth = b.localVariable("depth"); - return new CpsFunction(asList("depth", "message"), + CpsFunction f = new CpsFunction(asList("depth", "message"), b.block( b.if_(b.lessThan(b.zero(), $depth), b.functionCall(b.this_(), "throw_", b.minus($depth, b.one()), b.localVariable("message")), @@ -213,6 +213,7 @@ public CpsFunction throw_(int depth, String message) { b.throw_(b.new_(IllegalArgumentException.class, b.localVariable("message"))) ) )); + throw new CpsCallableInvocation(f,this,depth,message); } } From 452b89691ebcfeb55522a5010006f000b0a05d3b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 4 Mar 2014 11:30:22 -0800 Subject: [PATCH 123/932] Adding one more convenient constructor --- .../com/cloudbees/groovy/cps/Continuable.java | 25 +++++++++++++++++++ .../groovy/cps/ContinuableTest.groovy | 8 +++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 63cbe6dc0..6cf06d091 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -4,8 +4,11 @@ import com.cloudbees.groovy.cps.impl.CpsFunction; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import com.cloudbees.groovy.cps.impl.YieldBlock; +import groovy.lang.GroovyShell; +import groovy.lang.Script; import java.io.Serializable; +import java.lang.reflect.Method; import java.util.Arrays; /** @@ -36,6 +39,28 @@ public Continuable(Block block) { Continuation.HALT).asContinuation()); } + /** + * Takes a {@link Script} compiled from CPS-transforming {@link GroovyShell} and + * wraps that into a {@link Continuable}. + */ + public Continuable(Script cpsTransformedScript) { + this(wrap(cpsTransformedScript)); + } + + private static Next wrap(Script s) { + try { + Method m = s.getClass().getMethod("run"); + if (!m.isAnnotationPresent(WorkflowTransformed.class)) + throw new IllegalArgumentException(s+" is not CPS-transformed"); + s.run(); + throw new AssertionError("I'm confused if Script is CPS-transformed or not!"); + } catch (CpsCallableInvocation e) { + return e.invoke(null, Continuation.HALT); + } catch (NoSuchMethodException e) { + throw new AssertionError(e); + } + } + /** * Creates a shallow copy of {@link Continuable}. The copy shares * all the local variables of the original {@link Continuable}, and diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 4f6d7e904..037d461e2 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -10,13 +10,13 @@ import org.junit.Test class ContinuableTest extends AbstractGroovyCpsTest { @Test void resumeAndSuspend() { - def inv = parseCps(""" + def s = csh.parse(""" int x = 1; x = Continuable.suspend(x+1) return x+1; """) - def c = new Continuable(inv.invoke(null,Continuation.HALT)); + def c = new Continuable(s); assert c.isResumable() def v = c.run(null); @@ -34,7 +34,7 @@ class ContinuableTest extends AbstractGroovyCpsTest { @Test void serializeComplexContinuable() { - def inv = parseCps(""" + def s = csh.parse(""" @WorkflowMethod def foo(int x) { return Continuable.suspend(x); @@ -58,7 +58,7 @@ class ContinuableTest extends AbstractGroovyCpsTest { return y; """) - def c = new Continuable(inv.invoke(null,Continuation.HALT)); + def c = new Continuable(s); assert c.run(null)==5 : "suspension within a subroutine"; c = roundtripSerialization(c); // at this point there's a fairly non-trivial Continuation, so try to serialize it From b66e5f6be9c33459515c6e1ca351ba1d7d56b4d3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 5 Mar 2014 15:00:10 -0800 Subject: [PATCH 124/932] Script.bindings need to be persisted --- pom.xml | 5 +++++ .../cloudbees/groovy/cps/SerializableScript.java | 15 +++++++++++++++ .../cloudbees/groovy/cps/ContinuableTest.groovy | 16 ++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/pom.xml b/pom.xml index 1eeac8d4e..816707c42 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,11 @@ org.codehaus.groovy groovy 1.8.5 + + provided com.google.guava diff --git a/src/main/java/com/cloudbees/groovy/cps/SerializableScript.java b/src/main/java/com/cloudbees/groovy/cps/SerializableScript.java index 059613c8f..d0084817a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/SerializableScript.java +++ b/src/main/java/com/cloudbees/groovy/cps/SerializableScript.java @@ -3,7 +3,11 @@ import groovy.lang.Binding; import groovy.lang.Script; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.io.Serializable; +import java.util.Map; /** * @author Kohsuke Kawaguchi @@ -16,5 +20,16 @@ public SerializableScript(Binding binding) { super(binding); } + private void writeObject(ObjectOutputStream oos) throws IOException { + // binding is defined in non-serializable Script class, + // so we need to persist that here + oos.writeObject(getBinding().getVariables()); + } + + private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException { + Map m = (Map)ois.readObject(); + getBinding().getVariables().putAll(m); + } + private static final long serialVersionUID = 1L; } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 037d461e2..5dfeba2c4 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -66,4 +66,20 @@ class ContinuableTest extends AbstractGroovyCpsTest { assert c.isResumable() assert c.run(6)==9; } + + @Test + void howComeBindingIsSerializable() { + def s = csh.parse(""" + Continuable.suspend(42); + return value; +"""); + s.setProperty("value",15); + def c = new Continuable(s); + assert c.run(null)==42; + + c = roundtripSerialization(c); + + assert c.isResumable() + assert c.run(null)==15; + } } From 79f14f48f77809e92479e15f68e2321b5a95a83e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 5 Mar 2014 15:38:14 -0800 Subject: [PATCH 125/932] we also need a way to resume execution by throwing an exception --- src/main/java/com/cloudbees/groovy/cps/Continuable.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 6cf06d091..7efd505f2 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -72,6 +72,8 @@ public Continuable fork() { /** * Runs this program until it suspends the next time. + * + * TODO: we also need a way to resume execution by throwing an exception */ public Object run(Object arg) { Next n = program.receive(arg).run(); From 6a86be85e6452ee10b27a726a656431e402d455a Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 6 Mar 2014 21:25:59 -0800 Subject: [PATCH 126/932] Ignores. --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..a6f89c2da --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target/ \ No newline at end of file From 04355841aba325a49e225278db99af155f65f40d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 7 Mar 2014 14:02:51 -0800 Subject: [PATCH 127/932] need not be publicly visible --- src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 6aab8ff9f..4f33638a4 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -128,7 +128,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor def params = new ListExpression(); m.parameters.each { params.addExpression(new ConstantExpression(it.name))} - def f = m.declaringClass.addField("___cps___${iota++}", Modifier.STATIC, FUNCTION_TYPE, + def f = m.declaringClass.addField("___cps___${iota++}", Modifier.STATIC|Modifier.STATIC, FUNCTION_TYPE, new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body))); def args = new TupleExpression(new VariableExpression(f), THIS); From a4200fccca59e7f863d27ef730455bec6bbaa622 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 7 Mar 2014 14:08:07 -0800 Subject: [PATCH 128/932] avoid anonymous classes for better future compatibility --- .../groovy/cps/impl/SequenceBlock.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java index 65c801e5f..893558105 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java @@ -20,10 +20,24 @@ public SequenceBlock(Block exp1, Block exp2) { } public Next eval(final Env e, final Continuation k) { - return new Next(exp1,e,new Continuation() { - public Next receive(Object __) { - return new Next(exp2,e,k); - } - }); + return new Next(exp1,e, new ContinuationImpl(e, k, exp2)); + } + + private static class ContinuationImpl implements Continuation { + private final Env e; + private final Continuation k; + private final Block exp2; + + public ContinuationImpl(Env e, Continuation k, Block exp2) { + this.e = e; + this.k = k; + this.exp2 = exp2; + } + + public Next receive(Object _) { + return new Next(exp2, e, k); + } + + private static final long serialVersionUID = 1L; } } From b78d50f94da1bd4e6951d07528a0e7bc5031a8b4 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 7 Mar 2014 14:08:53 -0800 Subject: [PATCH 129/932] Groovy puts the timestamp of compilation into fields, like the following: public static long Script1.__timeStamp public static long Script1.__timeStamp__239_neverHappen1394228841044 This affects the serialVersionUID computation, so we prevent Groovy from adding such a field. --- .../com/cloudbees/groovy/cps/CpsTransformer.groovy | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 4f33638a4..2d86fbaeb 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -7,6 +7,7 @@ import org.codehaus.groovy.ast.expr.* import org.codehaus.groovy.ast.stmt.* import org.codehaus.groovy.classgen.BytecodeExpression import org.codehaus.groovy.classgen.GeneratorContext +import org.codehaus.groovy.classgen.Verifier import org.codehaus.groovy.control.CompilePhase import org.codehaus.groovy.control.SourceUnit import org.codehaus.groovy.control.customizers.CompilationCustomizer @@ -75,6 +76,16 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor classNode?.methods?.each { visitMethod(it) } // classNode?.objectInitializerStatements?.each { it.visit(visitor) } // classNode?.fields?.each { visitor.visitField(it) } + + + // groovy puts timestamp of compilation into a class file, causing serialVersionUID to change. + // this tends to be undesirable for CPS involving persistence. + // set the timestamp to some bogus value will prevent Verifier from adding a field that encodes + // timestamp in the field name + // see http://stackoverflow.com/questions/15310136/neverhappen-variable-in-compiled-classes + if (classNode.getField(Verifier.__TIMESTAMP)==null) + classNode.addField(Verifier.__TIMESTAMP,Modifier.STATIC|Modifier.PRIVATE, ClassHelper.long_TYPE, + new ConstantExpression(0L)); } /** From b477ccf0f8fd2a8e961902563b8e21d1357d5de3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 7 Mar 2014 20:02:22 -0800 Subject: [PATCH 130/932] Bug fix --- .../cloudbees/groovy/cps/impl/YieldBlock.java | 27 ++++++++++++++++++- .../groovy/cps/ContinuableTest.groovy | 12 +++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java index 8b8ed5f6d..cc12ac502 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java @@ -20,8 +20,33 @@ public YieldBlock(Object v) { } public Next eval(Env e, Continuation k) { - return Next.yield(v,k); + return Next.yield(v, new YieldContinuation(k)); } private static final long serialVersionUID = 1L; + + /** + * {@link Continuable#isResumable()} uses {@link #HALT} to determine + * the end of the program, and it gets confused if the end of the program + * follows immediately after the yield statement (or more likely {@link Continuable#suspend(Object)} + * since yield is not a language-reserved statement.) + * + *

+ * So we don't want to just use 'k' in {@link YieldBlock#eval(Env, Continuation)} as the continuation. + * We want to insert one extra step to make sure that the {@link Continuable} executes the 2nd half + * of the yield block. + */ + private static class YieldContinuation implements Continuation { + private final Continuation k; + + public YieldContinuation(Continuation k) { + this.k = k; + } + + public Next receive(Object o) { + return new Next(new ConstantBlock(o),null, k); + } + + private static final long serialVersionUID = 1L; + } } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 5dfeba2c4..3d38b2a83 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -82,4 +82,16 @@ class ContinuableTest extends AbstractGroovyCpsTest { assert c.isResumable() assert c.run(null)==15; } + + @Test + void suspend_at_the_end_should_still_count_as_resumable() { + def s = csh.parse(""" + Continuable.suspend(5); + """); + def c = new Continuable(s); + assert c.run(null)==5; + assert c.isResumable() + c.run(null) + assert !c.isResumable() + } } From eeaf196528829411d1c2bbce93647a750a7fc50a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 7 Mar 2014 20:19:21 -0800 Subject: [PATCH 131/932] Implemented Map literal support --- .../groovy/cps/CpsTransformer.groovy | 9 ++- .../com/cloudbees/groovy/cps/Builder.java | 15 +++++ .../cps/impl/CollectionLiteralBlock.java | 65 +++++++++++++++++++ .../cloudbees/groovy/cps/impl/ListBlock.java | 56 ++-------------- .../cloudbees/groovy/cps/impl/MapBlock.java | 22 +++++++ .../groovy/cps/impl/MapBlockTest.groovy | 24 +++++++ 6 files changed, 140 insertions(+), 51 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/CollectionLiteralBlock.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/MapBlock.java create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 2d86fbaeb..a36c809b7 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -558,8 +558,13 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - void visitMapExpression(MapExpression expression) { - throw new UnsupportedOperationException(); + void visitMapExpression(MapExpression exp) { + makeNode("map") { + exp.mapEntryExpressions.each { e -> + visit(e.keyExpression) + visit(e.valueExpression) + } + } } void visitMapEntryExpression(MapEntryExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index b77512d8b..1e06b9f0a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -15,6 +15,7 @@ import com.cloudbees.groovy.cps.impl.ListBlock; import com.cloudbees.groovy.cps.impl.LocalVariableBlock; import com.cloudbees.groovy.cps.impl.LogicalOpBlock; +import com.cloudbees.groovy.cps.impl.MapBlock; import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; import com.cloudbees.groovy.cps.impl.ReturnBlock; import com.cloudbees.groovy.cps.impl.SequenceBlock; @@ -24,6 +25,7 @@ import com.cloudbees.groovy.cps.impl.WhileBlock; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +import java.util.Arrays; import java.util.List; import static com.cloudbees.groovy.cps.Block.*; @@ -214,6 +216,19 @@ public Block throw_(final Block exp) { return new ThrowBlock(exp); } + /** + * Map literal: [ a:b, c:d, e:f ] ... + * + * We expect arguments to be multiple of two. + */ + public Block map(Block... blocks) { + return new MapBlock(blocks); + } + + public Block map(List blocks) { + return map(blocks.toArray(new Block[blocks.size()])); + } + public Block staticCall(Class lhs, String name, Block... argExps) { return functionCall(constant(lhs),name,argExps); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CollectionLiteralBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/CollectionLiteralBlock.java new file mode 100644 index 000000000..0aa481047 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CollectionLiteralBlock.java @@ -0,0 +1,65 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** + * Turns a list of {@link Block} into a collection object. + * + * Common part of {@link ListBlock} and {@link MapBlock} + * + * @author Kohsuke Kawaguchi + */ +public abstract class CollectionLiteralBlock implements Block { + /** + * Arguments to evaluate. + */ + private final Block[] argExps; + + public CollectionLiteralBlock(Block... args) { + this.argExps = args; + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).dispatch(); + } + + protected abstract Object toCollection(Object[] result); + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + Object[] list = new Object[argExps.length]; + int idx; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next item(Object v) { + list[idx++] = v; + return dispatch(); + } + + /** + * If there are more arguments to evaluate, do so. Otherwise return the list. + */ + private Next dispatch() { + if (argExps.length>idx) + return then(argExps[idx],e,item); + else { + return k.receive(toCollection(list)); + } + } + + private static final long serialVersionUID = 1L; + } + + static final ContinuationPtr item = new ContinuationPtr(ContinuationImpl.class,"item"); + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java index c849344f5..9ddb2d3ee 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java @@ -1,64 +1,22 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.Continuation; -import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.Next; - -import java.util.ArrayList; -import java.util.List; +import org.codehaus.groovy.runtime.InvokerHelper; /** - * [a,b,c,d] kind of block. + * [a,b,c,d] to list. * * @author Kohsuke Kawaguchi */ -public class ListBlock implements Block { - /** - * Arguments to the list. - */ - private final Block[] argExps; - +public class ListBlock extends CollectionLiteralBlock { public ListBlock(Block... args) { - this.argExps = args; + super(args); } - public Next eval(Env e, Continuation k) { - return new ContinuationImpl(e,k).dispatch(); - } - - class ContinuationImpl extends ContinuationGroup { - final Continuation k; - final Env e; - - List list = new ArrayList(); - int idx; - - ContinuationImpl(Env e, Continuation k) { - this.e = e; - this.k = k; - } - - public Next item(Object v) { - list.add(v); - return dispatch(); - } - - /** - * If there are more arguments to evaluate, do so. Otherwise return the list. - */ - private Next dispatch() { - if (argExps.length>idx) - return then(argExps[idx++],e,item); - else { - return k.receive(list); - } - } - - private static final long serialVersionUID = 1L; + @Override + protected Object toCollection(Object[] result) { + return InvokerHelper.createList(result); } - static final ContinuationPtr item = new ContinuationPtr(ContinuationImpl.class,"item"); - private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/MapBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/MapBlock.java new file mode 100644 index 000000000..4c7900742 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/MapBlock.java @@ -0,0 +1,22 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import org.codehaus.groovy.runtime.InvokerHelper; + +/** + * [a:b, c:d, e:f, ...] + * + * @author Kohsuke Kawaguchi + */ +public class MapBlock extends CollectionLiteralBlock { + public MapBlock(Block... args) { + super(args); + } + + @Override + protected Object toCollection(Object[] result) { + return InvokerHelper.createMap(result); + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy new file mode 100644 index 000000000..b76aec360 --- /dev/null +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy @@ -0,0 +1,24 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; +import org.junit.Test; + +/** + * @author Kohsuke Kawaguchi + */ +public class MapBlockTest extends AbstractGroovyCpsTest { + @Test + void mapLiteral() { + assert evalCPS(""" + def x=[foo:"hello", bar:2+2+2, zot:null]; + return x; + """)==[foo:"hello",bar:6,zot:null]; + } + + @Test + void empty() { + assert evalCPS(""" + return [:] + """)==[:] + } +} From 0af687d011d79f85a1e2731d355d5e89cc9bb340 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 08:02:43 -0800 Subject: [PATCH 132/932] Continuable.run() should report an exception as exception --- .../com/cloudbees/groovy/cps/Continuable.java | 8 ++-- .../cloudbees/groovy/cps/Continuation.java | 4 +- .../java/com/cloudbees/groovy/cps/Next.java | 29 ++++++++------- .../java/com/cloudbees/groovy/cps/Yield.java | 11 ------ .../cloudbees/groovy/cps/impl/CallEnv.java | 7 +++- .../cloudbees/groovy/cps/impl/Conclusion.java | 37 +++++++++++++++++++ .../cloudbees/groovy/cps/impl/YieldBlock.java | 2 +- .../groovy/cps/AbstractGroovyCpsTest.groovy | 2 +- .../com/cloudbees/groovy/cps/BasicTest.java | 12 ++++-- 9 files changed, 77 insertions(+), 35 deletions(-) delete mode 100644 src/main/java/com/cloudbees/groovy/cps/Yield.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 7efd505f2..9c1f07b23 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -8,6 +8,7 @@ import groovy.lang.Script; import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays; @@ -73,14 +74,15 @@ public Continuable fork() { /** * Runs this program until it suspends the next time. * - * TODO: we also need a way to resume execution by throwing an exception + * @throws InvocationTargetException + * if the program threw an exception that it didn't handle by itself. */ - public Object run(Object arg) { + public Object run(Object arg) throws InvocationTargetException { Next n = program.receive(arg).run(); // when yielding, we resume from the continuation so that we can pass in the value. // see Next#yield program = n.k; - return n.yieldedValue(); + return n.yield.eval(); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index daf5c3a36..4ab5db418 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -1,5 +1,7 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.Conclusion; + import java.io.Serializable; import static com.cloudbees.groovy.cps.Block.*; @@ -31,7 +33,7 @@ private Halt() { } public Next receive(Object o) { - return Next.yield(o,HALT); + return Next.yield(new Conclusion(o,null), HALT); } public Object readResolve() { diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 2ff9a4a3c..176a9a28e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,7 +1,11 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.Conclusion; + import java.io.Serializable; +import static com.cloudbees.groovy.cps.Continuation.*; + /** * Remaining computation to execute. To work around the lack of tail-call optimization * @@ -15,10 +19,8 @@ public class Next implements Serializable { /** * If the program getting executed wants to yield a value and suspend its execution, * this value is set to non-null. - * - * {@link #NULL} is used to yield null. */ - private Object yield; + /*package*/ Conclusion yield; public Next(Block f, Env e, Continuation k) { this.f = f; @@ -49,25 +51,27 @@ public Next step() { * causes the interpreter loop to exit with the specified value, then optionally allow the interpreter * to resume with the specified {@link Continuation}. */ - public static Next yield(Object v, Continuation k) { - Next n = new Next(null,null,k); + public static Next yield(Conclusion v, Continuation k) { + if (v==null) throw new IllegalStateException("trying to yield null"); - if (v==null) v = NULL; + Next n = new Next(null,null,k); n.yield = v; return n; } - /*package*/ Object yieldedValue() { - if (yield==NULL) return null; - return yield; + /** + * Creates a {@link Next} object that terminates the computation and either returns a value or throw an exception. + */ + public static Next terminate(Conclusion v) { + return yield(v, HALT); } /** * Returns this object as a {@link Continuation} that ignores the argument. */ public Continuation asContinuation() { - if (isEnd()) return Continuation.HALT; // so that the caller can tell when it has terminated. + if (isEnd()) return HALT; // so that the caller can tell when it has terminated. else return new ConstContinuation(); } @@ -75,12 +79,9 @@ public Continuation asContinuation() { * Does this represent the end of the program? */ public boolean isEnd() { - return k==Continuation.HALT && e==Block.NOOP; + return k== HALT && e==Block.NOOP; } - private static final class Null {} - private static final Null NULL = new Null(); - private class ConstContinuation implements Continuation { public Next receive(Object o) { return Next.this; diff --git a/src/main/java/com/cloudbees/groovy/cps/Yield.java b/src/main/java/com/cloudbees/groovy/cps/Yield.java deleted file mode 100644 index e00baf50a..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/Yield.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.cloudbees.groovy.cps; - -import com.cloudbees.groovy.cps.impl.CpsFunction; - -import java.util.Arrays; - -/** - * @author Kohsuke Kawaguchi - */ -public class Yield { -} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index d934fb5df..f533af9cb 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; /** * Common part between {@link FunctionCallEnv} and {@link ClosureCallEnv}. @@ -43,7 +44,11 @@ public final Continuation getExceptionHandler(Class type) { if (caller==null) { // TODO: maybe define a mechanism so that the run() or start() kinda method will return // by having this exception thrown? - return Continuation.HALT; + return new Continuation() { + public Next receive(Object o) { + return Next.terminate(new Conclusion(null,(Throwable)o)); + } + }; } else { // propagate the exception to the caller return caller.getExceptionHandler(type); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java b/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java new file mode 100644 index 000000000..46335267a --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java @@ -0,0 +1,37 @@ +package com.cloudbees.groovy.cps.impl; + +import java.lang.reflect.InvocationTargetException; + +/** + * Result of the evaluation. + * + * Either represents a value in case of a normal return, or a throwable object in case of abnormal return. + * Note that both fields can be null, in which case it means a normal return of the value 'null'. + * + * @author Kohsuke Kawaguchi + */ +public final class Conclusion { + private final Object normal; + private final Throwable abnormal; + + public Conclusion(Object normal, Throwable abnormal) { + assert normal==null || abnormal==null; + this.normal = normal; + this.abnormal = abnormal; + } + + public Object eval() throws InvocationTargetException { + if (abnormal!=null) + throw new InvocationTargetException(abnormal); + else + return normal; + } + + public Object getNormal() { + return normal; + } + + public Throwable getAbnormal() { + return abnormal; + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java index cc12ac502..a3b090a53 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java @@ -20,7 +20,7 @@ public YieldBlock(Object v) { } public Next eval(Env e, Continuation k) { - return Next.yield(v, new YieldContinuation(k)); + return Next.yield(new Conclusion(v,null), new YieldContinuation(k)); } private static final long serialVersionUID = 1L; diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index 792a64b0f..ba3733f5e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -47,7 +47,7 @@ abstract class AbstractGroovyCpsTest extends Assert { } Object evalCPSonly(String script) { - return parseCps(script).invoke(null, Continuation.HALT).run().yieldedValue() + return parseCps(script).invoke(null, Continuation.HALT).run().yield.eval() } CpsCallableInvocation parseCps(String script) { diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 9eba4006b..1a4bca90b 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -7,6 +7,8 @@ import org.junit.Assert; import org.junit.Test; +import java.lang.reflect.InvocationTargetException; + import static java.util.Arrays.*; /** @@ -24,9 +26,13 @@ public class BasicTest extends Assert { * Evaluates the given body and return the yielded value. */ private T run(Block... bodies) { - Env e = new FunctionCallEnv(null,null,Continuation.HALT); - Next p = new Next(b.block(bodies), e, Continuation.HALT); - return (T)p.run().yieldedValue(); + try { + Env e = new FunctionCallEnv(null,null,Continuation.HALT); + Next p = new Next(b.block(bodies), e, Continuation.HALT); + return (T) p.run().yield.eval(); + } catch (InvocationTargetException x) { + throw new AssertionError(x); + } } From 891129d302a099d19a6b8561e1d8abb9c9cca2a0 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 08:03:16 -0800 Subject: [PATCH 133/932] Should be package internal because there's no need to expose this --- .../java/com/cloudbees/groovy/cps/{impl => }/Conclusion.java | 4 ++-- src/main/java/com/cloudbees/groovy/cps/Continuation.java | 4 ---- src/main/java/com/cloudbees/groovy/cps/Next.java | 2 -- src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java | 1 + src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java | 1 + 5 files changed, 4 insertions(+), 8 deletions(-) rename src/main/java/com/cloudbees/groovy/cps/{impl => }/Conclusion.java (92%) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java b/src/main/java/com/cloudbees/groovy/cps/Conclusion.java similarity index 92% rename from src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java rename to src/main/java/com/cloudbees/groovy/cps/Conclusion.java index 46335267a..83523cb88 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java +++ b/src/main/java/com/cloudbees/groovy/cps/Conclusion.java @@ -1,4 +1,4 @@ -package com.cloudbees.groovy.cps.impl; +package com.cloudbees.groovy.cps; import java.lang.reflect.InvocationTargetException; @@ -10,7 +10,7 @@ * * @author Kohsuke Kawaguchi */ -public final class Conclusion { +final class Conclusion { private final Object normal; private final Throwable abnormal; diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 4ab5db418..8ac2dcbfe 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -1,11 +1,7 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.Conclusion; - import java.io.Serializable; -import static com.cloudbees.groovy.cps.Block.*; - /** * Represents the remaining computation that receives the result of {@link Block}. * diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 176a9a28e..864e33750 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,7 +1,5 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.Conclusion; - import java.io.Serializable; import static com.cloudbees.groovy.cps.Continuation.*; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index f533af9cb..22a9c9310 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps.impl; +import com.cloudbees.groovy.cps.Conclusion; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java index a3b090a53..47a3e02a2 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Conclusion; import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; From c134caf6be27ccbd28e903cbc1742a9c9cad6d4b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 08:11:28 -0800 Subject: [PATCH 134/932] Testing the behaviour of unhandled exception --- .../groovy/cps/CpsTransformer.groovy | 6 ++++-- .../cloudbees/groovy/cps/Continuation.java | 2 ++ .../java/com/cloudbees/groovy/cps/Next.java | 2 ++ .../cloudbees/groovy/cps/impl/CallEnv.java | 1 - .../groovy/cps/{ => impl}/Conclusion.java | 4 ++-- .../cloudbees/groovy/cps/impl/YieldBlock.java | 1 - .../groovy/cps/ContinuableTest.groovy | 21 +++++++++++++++++++ 7 files changed, 31 insertions(+), 6 deletions(-) rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/Conclusion.java (92%) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index a36c809b7..85e3b357f 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -342,8 +342,10 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor makeNode("continue_", new ConstantExpression(statement.label)); } - void visitThrowStatement(ThrowStatement statement) { - throw new UnsupportedOperationException(); + void visitThrowStatement(ThrowStatement st) { + makeNode("throw_") { + visit(st.expression) + } } void visitSynchronizedStatement(SynchronizedStatement statement) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 8ac2dcbfe..3a8f0e872 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -1,5 +1,7 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.Conclusion; + import java.io.Serializable; /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 864e33750..176a9a28e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,5 +1,7 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.Conclusion; + import java.io.Serializable; import static com.cloudbees.groovy.cps.Continuation.*; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 22a9c9310..f533af9cb 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -1,6 +1,5 @@ package com.cloudbees.groovy.cps.impl; -import com.cloudbees.groovy.cps.Conclusion; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; diff --git a/src/main/java/com/cloudbees/groovy/cps/Conclusion.java b/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java similarity index 92% rename from src/main/java/com/cloudbees/groovy/cps/Conclusion.java rename to src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java index 83523cb88..46335267a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Conclusion.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java @@ -1,4 +1,4 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; import java.lang.reflect.InvocationTargetException; @@ -10,7 +10,7 @@ * * @author Kohsuke Kawaguchi */ -final class Conclusion { +public final class Conclusion { private final Object normal; private final Throwable abnormal; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java index 47a3e02a2..a3b090a53 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java @@ -1,7 +1,6 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.Conclusion; import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 3d38b2a83..64231eca4 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -2,6 +2,8 @@ package com.cloudbees.groovy.cps import org.junit.Test +import java.lang.reflect.InvocationTargetException + /** * * @@ -94,4 +96,23 @@ class ContinuableTest extends AbstractGroovyCpsTest { c.run(null) assert !c.isResumable() } + + /** + * Exception not handled in script will be thrown from Continuable.run + */ + @Test + void unhandled_exception() { + def s = csh.parse(""" + throw new ${ContinuableTest.class.name}.HelloException() + """) + def c = new Continuable(s) + try { + c.run(null) + fail("should have thrown exception") + } catch (InvocationTargetException e) { + assert e.cause instanceof HelloException + } + } + + public static class HelloException extends Exception {} } From fd1dcd0b1209be385645f3473be43e54134fcdce Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 08:13:27 -0800 Subject: [PATCH 135/932] unhandled exception is not resumable --- src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 64231eca4..974c94a37 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -110,6 +110,7 @@ class ContinuableTest extends AbstractGroovyCpsTest { c.run(null) fail("should have thrown exception") } catch (InvocationTargetException e) { + assert !c.isResumable() assert e.cause instanceof HelloException } } From 7e444747f09f0456672419c0359bc735199fd701 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 08:39:19 -0800 Subject: [PATCH 136/932] Allowing Continuable to resume by throwing exception. As a generalization, this also lets us start a brand-new program by throwing an exception, which results in an immediate abnormal termination of the program without running anything. --- .../com/cloudbees/groovy/cps/Continuable.java | 23 ++++++---- .../cloudbees/groovy/cps/Continuation.java | 2 +- .../java/com/cloudbees/groovy/cps/Next.java | 15 ++++--- .../com/cloudbees/groovy/cps/Resumable.java | 15 +++++++ .../cloudbees/groovy/cps/impl/YieldBlock.java | 26 +----------- .../groovy/cps/impl/YieldContinuation.java | 42 +++++++++++++++++++ 6 files changed, 84 insertions(+), 39 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/Resumable.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/YieldContinuation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 9c1f07b23..2eb2532e8 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.Conclusion; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.CpsFunction; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; @@ -21,14 +22,14 @@ public class Continuable implements Serializable { /** * Represents the remainder of the program to execute. */ - private Continuation program; + private Resumable program; - public Continuable(Continuation program) { + public Continuable(Resumable program) { this.program = program; } public Continuable(Next program) { - this(program.asContinuation()); + this(program.asResumable()); } /** @@ -37,7 +38,7 @@ public Continuable(Next program) { public Continuable(Block block) { this(new Next(block, new FunctionCallEnv(null,null,Continuation.HALT), - Continuation.HALT).asContinuation()); + Continuation.HALT)); } /** @@ -72,16 +73,24 @@ public Continuable fork() { } /** - * Runs this program until it suspends the next time. + * Starts/resumes this program until it suspends the next time. * * @throws InvocationTargetException * if the program threw an exception that it didn't handle by itself. */ public Object run(Object arg) throws InvocationTargetException { + return run0(new Conclusion(arg,null)); + } + + public Object runByThrow(Throwable arg) throws InvocationTargetException { + return run0(new Conclusion(null,arg)); + } + + private Object run0(Conclusion arg) throws InvocationTargetException { Next n = program.receive(arg).run(); // when yielding, we resume from the continuation so that we can pass in the value. // see Next#yield - program = n.k; + program = n.resumable; return n.yield.eval(); } @@ -92,7 +101,7 @@ public Object run(Object arg) throws InvocationTargetException { * If this method returns false, it is illegal to call {@link #run(Object)} */ public boolean isResumable() { - return program!=Continuation.HALT; + return program!=null; } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 3a8f0e872..b1c11d2a3 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -31,7 +31,7 @@ private Halt() { } public Next receive(Object o) { - return Next.yield(new Conclusion(o,null), HALT); + return Next.yield(new Conclusion(o,null), null); } public Object readResolve() { diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 176a9a28e..4b5ec54f5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps; import com.cloudbees.groovy.cps.impl.Conclusion; +import com.cloudbees.groovy.cps.impl.YieldContinuation; import java.io.Serializable; @@ -21,6 +22,7 @@ public class Next implements Serializable { * this value is set to non-null. */ /*package*/ Conclusion yield; + /*package*/ Resumable resumable; public Next(Block f, Env e, Continuation k) { this.f = f; @@ -51,11 +53,12 @@ public Next step() { * causes the interpreter loop to exit with the specified value, then optionally allow the interpreter * to resume with the specified {@link Continuation}. */ - public static Next yield(Conclusion v, Continuation k) { + public static Next yield(Conclusion v, Resumable r) { if (v==null) throw new IllegalStateException("trying to yield null"); - Next n = new Next(null,null,k); + Next n = new Next(null,null,null); n.yield = v; + n.resumable = r; return n; } @@ -64,15 +67,15 @@ public static Next yield(Conclusion v, Continuation k) { * Creates a {@link Next} object that terminates the computation and either returns a value or throw an exception. */ public static Next terminate(Conclusion v) { - return yield(v, HALT); + return yield(v, null); } /** * Returns this object as a {@link Continuation} that ignores the argument. */ - public Continuation asContinuation() { - if (isEnd()) return HALT; // so that the caller can tell when it has terminated. - else return new ConstContinuation(); + public Resumable asResumable() { + if (isEnd()) return null; // so that the caller can tell when it has terminated. + else return new YieldContinuation(e,new ConstContinuation()); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Resumable.java b/src/main/java/com/cloudbees/groovy/cps/Resumable.java new file mode 100644 index 000000000..a87fa8428 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Resumable.java @@ -0,0 +1,15 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.Conclusion; + +import java.io.Serializable; + +/** + * Variant of {@link Continuation} that can either receive a normal value + * or receive an exception to be thrown within. + * + * @author Kohsuke Kawaguchi + */ +public interface Resumable extends Serializable { + Next receive(Conclusion o); +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java index a3b090a53..206220980 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java @@ -20,33 +20,9 @@ public YieldBlock(Object v) { } public Next eval(Env e, Continuation k) { - return Next.yield(new Conclusion(v,null), new YieldContinuation(k)); + return Next.yield(new Conclusion(v,null), new YieldContinuation(e,k)); } private static final long serialVersionUID = 1L; - /** - * {@link Continuable#isResumable()} uses {@link #HALT} to determine - * the end of the program, and it gets confused if the end of the program - * follows immediately after the yield statement (or more likely {@link Continuable#suspend(Object)} - * since yield is not a language-reserved statement.) - * - *

- * So we don't want to just use 'k' in {@link YieldBlock#eval(Env, Continuation)} as the continuation. - * We want to insert one extra step to make sure that the {@link Continuable} executes the 2nd half - * of the yield block. - */ - private static class YieldContinuation implements Continuation { - private final Continuation k; - - public YieldContinuation(Continuation k) { - this.k = k; - } - - public Next receive(Object o) { - return new Next(new ConstantBlock(o),null, k); - } - - private static final long serialVersionUID = 1L; - } } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldContinuation.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldContinuation.java new file mode 100644 index 000000000..8e22ef636 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldContinuation.java @@ -0,0 +1,42 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuable; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; +import com.cloudbees.groovy.cps.Resumable; + +/** + * {@link Continuable#isResumable()} uses {@link #HALT} to determine + * the end of the program, and it gets confused if the end of the program + * follows immediately after the yield statement (or more likely {@link Continuable#suspend(Object)} + * since yield is not a language-reserved statement.) + * + *

+ * So we don't want to just use 'k' in {@link YieldBlock#eval(Env, Continuation)} as the continuation. + * We want to insert one extra step to make sure that the {@link Continuable} executes the 2nd half + * of the yield block. + */ +public class YieldContinuation implements Resumable { + private final Env e; + private final Continuation k; + + public YieldContinuation(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + /** + * When {@link Continuable#run(Object)} is called, the argument comes here. + */ + public Next receive(Conclusion o) { + Conclusion cn = (Conclusion) o; + Throwable t = cn.getAbnormal(); + if (t!=null) + return new Next(new ThrowBlock(new ConstantBlock(t)),e,k); + else + return new Next(new ConstantBlock(cn.getNormal()),e, k); + } + + private static final long serialVersionUID = 1L; +} From a2e6387cf1c1b391d682a951c9e999ab3014e450 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 09:21:51 -0800 Subject: [PATCH 137/932] signify that we are not using this parameter --- src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java index a6be1e59c..01f77218b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java @@ -15,7 +15,7 @@ public ThrowBlock(Block exp) { this.exp = exp; } - public Next eval(final Env e, Continuation k) { + public Next eval(final Env e, Continuation _) { return new Next(exp,e,new Continuation() { public Next receive(Object t) { if (t==null) { From 5662a6372e900ff8b0e67df29d255e647eff4cb2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 09:25:43 -0800 Subject: [PATCH 138/932] Subsuming YieldContinuation functionality into Continuable --- .../com/cloudbees/groovy/cps/Continuable.java | 47 ++++++++++++++----- .../cloudbees/groovy/cps/Continuation.java | 2 +- .../java/com/cloudbees/groovy/cps/Next.java | 15 +++--- .../com/cloudbees/groovy/cps/Resumable.java | 15 ------ .../cloudbees/groovy/cps/impl/Conclusion.java | 2 +- .../cloudbees/groovy/cps/impl/YieldBlock.java | 8 +++- .../groovy/cps/impl/YieldContinuation.java | 42 ----------------- .../groovy/cps/AbstractGroovyCpsTest.groovy | 2 +- .../com/cloudbees/groovy/cps/BasicTest.java | 2 +- 9 files changed, 51 insertions(+), 84 deletions(-) delete mode 100644 src/main/java/com/cloudbees/groovy/cps/Resumable.java delete mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/YieldContinuation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 2eb2532e8..651bba14d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -1,9 +1,11 @@ package com.cloudbees.groovy.cps; import com.cloudbees.groovy.cps.impl.Conclusion; +import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.CpsFunction; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; +import com.cloudbees.groovy.cps.impl.ThrowBlock; import com.cloudbees.groovy.cps.impl.YieldBlock; import groovy.lang.GroovyShell; import groovy.lang.Script; @@ -19,17 +21,25 @@ * @author Kohsuke Kawaguchi */ public class Continuable implements Serializable { + /** + * When the program resumes with a value (in particular an exception thrown), what environment + * do we evaluate that in? + */ + private Env e; + /** * Represents the remainder of the program to execute. */ - private Resumable program; + private Continuation k; - public Continuable(Resumable program) { - this.program = program; + public Continuable(Continuable src) { + this.e = src.e; + this.k = src.k; } - public Continuable(Next program) { - this(program.asResumable()); + public Continuable(Next n) { + this.e = n.e; + this.k = n.asContinuation(); } /** @@ -69,7 +79,7 @@ private static Next wrap(Script s) { * point to the exact same point of the program. */ public Continuable fork() { - return new Continuable(program); + return new Continuable(this); } /** @@ -86,12 +96,23 @@ public Object runByThrow(Throwable arg) throws InvocationTargetException { return run0(new Conclusion(null,arg)); } - private Object run0(Conclusion arg) throws InvocationTargetException { - Next n = program.receive(arg).run(); - // when yielding, we resume from the continuation so that we can pass in the value. - // see Next#yield - program = n.resumable; - return n.yield.eval(); + private Object run0(Conclusion cn) throws InvocationTargetException { + Next n; + Throwable t = cn.getAbnormal(); + if (t!=null) { + // resume program by throwing this exception + n = new Next(new ThrowBlock(new ConstantBlock(t)),e,null); + } else { + // resume program by passing the value + n = k.receive(cn.getNormal()); + } + + n = n.run(); + + e = n.e; + k = n.k; + + return n.yield.replay(); } /** @@ -101,7 +122,7 @@ private Object run0(Conclusion arg) throws InvocationTargetException { * If this method returns false, it is illegal to call {@link #run(Object)} */ public boolean isResumable() { - return program!=null; + return k!=Continuation.HALT; } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index b1c11d2a3..5fd314f8d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -31,7 +31,7 @@ private Halt() { } public Next receive(Object o) { - return Next.yield(new Conclusion(o,null), null); + return Next.terminate(new Conclusion(o,null)); } public Object readResolve() { diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 4b5ec54f5..20ab1b216 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,7 +1,6 @@ package com.cloudbees.groovy.cps; import com.cloudbees.groovy.cps.impl.Conclusion; -import com.cloudbees.groovy.cps.impl.YieldContinuation; import java.io.Serializable; @@ -20,9 +19,10 @@ public class Next implements Serializable { /** * If the program getting executed wants to yield a value and suspend its execution, * this value is set to non-null. + * + * This field and {@link #f} is mutually exclusive. */ /*package*/ Conclusion yield; - /*package*/ Resumable resumable; public Next(Block f, Env e, Continuation k) { this.f = f; @@ -53,12 +53,11 @@ public Next step() { * causes the interpreter loop to exit with the specified value, then optionally allow the interpreter * to resume with the specified {@link Continuation}. */ - public static Next yield(Conclusion v, Resumable r) { + public static Next yield(Conclusion v, Env e, Continuation k) { if (v==null) throw new IllegalStateException("trying to yield null"); - Next n = new Next(null,null,null); + Next n = new Next(null,e,k); n.yield = v; - n.resumable = r; return n; } @@ -67,15 +66,15 @@ public static Next yield(Conclusion v, Resumable r) { * Creates a {@link Next} object that terminates the computation and either returns a value or throw an exception. */ public static Next terminate(Conclusion v) { - return yield(v, null); + return yield(v, null, HALT); } /** * Returns this object as a {@link Continuation} that ignores the argument. */ - public Resumable asResumable() { + public Continuation asContinuation() { if (isEnd()) return null; // so that the caller can tell when it has terminated. - else return new YieldContinuation(e,new ConstContinuation()); + else return new ConstContinuation(); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Resumable.java b/src/main/java/com/cloudbees/groovy/cps/Resumable.java deleted file mode 100644 index a87fa8428..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/Resumable.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cloudbees.groovy.cps; - -import com.cloudbees.groovy.cps.impl.Conclusion; - -import java.io.Serializable; - -/** - * Variant of {@link Continuation} that can either receive a normal value - * or receive an exception to be thrown within. - * - * @author Kohsuke Kawaguchi - */ -public interface Resumable extends Serializable { - Next receive(Conclusion o); -} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java b/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java index 46335267a..4d4c7be2d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java @@ -20,7 +20,7 @@ public Conclusion(Object normal, Throwable abnormal) { this.abnormal = abnormal; } - public Object eval() throws InvocationTargetException { + public Object replay() throws InvocationTargetException { if (abnormal!=null) throw new InvocationTargetException(abnormal); else diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java index 206220980..8881c7023 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java @@ -19,8 +19,12 @@ public YieldBlock(Object v) { this.v = v; } - public Next eval(Env e, Continuation k) { - return Next.yield(new Conclusion(v,null), new YieldContinuation(e,k)); + public Next eval(Env e, final Continuation k) { + return Next.yield(new Conclusion(v,null),e,new Continuation() { + public Next receive(Object o) { + return k.receive(o); + } + }); } private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldContinuation.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldContinuation.java deleted file mode 100644 index 8e22ef636..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/impl/YieldContinuation.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.cloudbees.groovy.cps.impl; - -import com.cloudbees.groovy.cps.Continuable; -import com.cloudbees.groovy.cps.Continuation; -import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.Next; -import com.cloudbees.groovy.cps.Resumable; - -/** - * {@link Continuable#isResumable()} uses {@link #HALT} to determine - * the end of the program, and it gets confused if the end of the program - * follows immediately after the yield statement (or more likely {@link Continuable#suspend(Object)} - * since yield is not a language-reserved statement.) - * - *

- * So we don't want to just use 'k' in {@link YieldBlock#eval(Env, Continuation)} as the continuation. - * We want to insert one extra step to make sure that the {@link Continuable} executes the 2nd half - * of the yield block. - */ -public class YieldContinuation implements Resumable { - private final Env e; - private final Continuation k; - - public YieldContinuation(Env e, Continuation k) { - this.e = e; - this.k = k; - } - - /** - * When {@link Continuable#run(Object)} is called, the argument comes here. - */ - public Next receive(Conclusion o) { - Conclusion cn = (Conclusion) o; - Throwable t = cn.getAbnormal(); - if (t!=null) - return new Next(new ThrowBlock(new ConstantBlock(t)),e,k); - else - return new Next(new ConstantBlock(cn.getNormal()),e, k); - } - - private static final long serialVersionUID = 1L; -} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index ba3733f5e..692ab8975 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -47,7 +47,7 @@ abstract class AbstractGroovyCpsTest extends Assert { } Object evalCPSonly(String script) { - return parseCps(script).invoke(null, Continuation.HALT).run().yield.eval() + return parseCps(script).invoke(null, Continuation.HALT).run().yield.replay() } CpsCallableInvocation parseCps(String script) { diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 1a4bca90b..35b3199aa 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -29,7 +29,7 @@ private T run(Block... bodies) { try { Env e = new FunctionCallEnv(null,null,Continuation.HALT); Next p = new Next(b.block(bodies), e, Continuation.HALT); - return (T) p.run().yield.eval(); + return (T) p.run().yield.replay(); } catch (InvocationTargetException x) { throw new AssertionError(x); } From 0594cd1f4b81942554691b0920359220defdb60c Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 09:35:52 -0800 Subject: [PATCH 139/932] HALT should set environment to null. --- .../com/cloudbees/groovy/cps/Continuable.java | 6 ++-- .../java/com/cloudbees/groovy/cps/Next.java | 30 ++++--------------- .../cloudbees/groovy/cps/impl/YieldBlock.java | 6 +--- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 651bba14d..02f56ca8b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -39,7 +39,7 @@ public Continuable(Continuable src) { public Continuable(Next n) { this.e = n.e; - this.k = n.asContinuation(); + this.k = n; } /** @@ -118,11 +118,9 @@ private Object run0(Conclusion cn) throws InvocationTargetException { /** * Checks if this {@link Continuable} is pointing at the end of the program which cannot * be resumed. - * - * If this method returns false, it is illegal to call {@link #run(Object)} */ public boolean isResumable() { - return k!=Continuation.HALT; + return k!=Continuation.HALT || e!=null; } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 20ab1b216..c8dd21faf 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -4,14 +4,12 @@ import java.io.Serializable; -import static com.cloudbees.groovy.cps.Continuation.*; - /** * Remaining computation to execute. To work around the lack of tail-call optimization * * @author Kohsuke Kawaguchi */ -public class Next implements Serializable { +public class Next implements Serializable, Continuation { Block f; Env e; Continuation k; @@ -35,9 +33,9 @@ public Next(Block f, Env e, Continuation k) { */ public Next run() { Next n = this; - do { + while(n.yield==null) { n = n.step(); - } while(n.yield==null); + } return n; } @@ -70,26 +68,10 @@ public static Next terminate(Conclusion v) { } /** - * Returns this object as a {@link Continuation} that ignores the argument. - */ - public Continuation asContinuation() { - if (isEnd()) return null; // so that the caller can tell when it has terminated. - else return new ConstContinuation(); - } - - /** - * Does this represent the end of the program? + * As a {@link Continuation}, just ignore the argument. */ - public boolean isEnd() { - return k== HALT && e==Block.NOOP; - } - - private class ConstContinuation implements Continuation { - public Next receive(Object o) { - return Next.this; - } - - private static final long serialVersionUID = 1L; + public Next receive(Object _) { + return this; } private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java index 8881c7023..38254999c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java @@ -20,11 +20,7 @@ public YieldBlock(Object v) { } public Next eval(Env e, final Continuation k) { - return Next.yield(new Conclusion(v,null),e,new Continuation() { - public Next receive(Object o) { - return k.receive(o); - } - }); + return Next.yield(new Conclusion(v,null),e,k); } private static final long serialVersionUID = 1L; From 0a1c9a109e13085fab61f133347ce5886ac5e3c2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 09:36:22 -0800 Subject: [PATCH 140/932] Having all of Continuation, Conclusion, and Continuable is just too confusing --- .../java/com/cloudbees/groovy/cps/Continuable.java | 8 ++++---- .../java/com/cloudbees/groovy/cps/Continuation.java | 4 ++-- src/main/java/com/cloudbees/groovy/cps/Next.java | 10 +++++----- .../java/com/cloudbees/groovy/cps/impl/CallEnv.java | 2 +- .../groovy/cps/impl/{Conclusion.java => Outcome.java} | 4 ++-- .../java/com/cloudbees/groovy/cps/impl/YieldBlock.java | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) rename src/main/java/com/cloudbees/groovy/cps/impl/{Conclusion.java => Outcome.java} (90%) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 02f56ca8b..e8041469e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -1,6 +1,6 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.Conclusion; +import com.cloudbees.groovy.cps.impl.Outcome; import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.CpsFunction; @@ -89,14 +89,14 @@ public Continuable fork() { * if the program threw an exception that it didn't handle by itself. */ public Object run(Object arg) throws InvocationTargetException { - return run0(new Conclusion(arg,null)); + return run0(new Outcome(arg,null)); } public Object runByThrow(Throwable arg) throws InvocationTargetException { - return run0(new Conclusion(null,arg)); + return run0(new Outcome(null,arg)); } - private Object run0(Conclusion cn) throws InvocationTargetException { + private Object run0(Outcome cn) throws InvocationTargetException { Next n; Throwable t = cn.getAbnormal(); if (t!=null) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 5fd314f8d..f316dcaec 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -1,6 +1,6 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.Conclusion; +import com.cloudbees.groovy.cps.impl.Outcome; import java.io.Serializable; @@ -31,7 +31,7 @@ private Halt() { } public Next receive(Object o) { - return Next.terminate(new Conclusion(o,null)); + return Next.terminate(new Outcome(o, null)); } public Object readResolve() { diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index c8dd21faf..07b84466d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,6 +1,6 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.Conclusion; +import com.cloudbees.groovy.cps.impl.Outcome; import java.io.Serializable; @@ -20,7 +20,7 @@ public class Next implements Serializable, Continuation { * * This field and {@link #f} is mutually exclusive. */ - /*package*/ Conclusion yield; + /*package*/ Outcome yield; public Next(Block f, Env e, Continuation k) { this.f = f; @@ -43,7 +43,7 @@ public Next run() { * Executes one step */ public Next step() { - return f.eval(e,k); + return f.eval(e, k); } /** @@ -51,7 +51,7 @@ public Next step() { * causes the interpreter loop to exit with the specified value, then optionally allow the interpreter * to resume with the specified {@link Continuation}. */ - public static Next yield(Conclusion v, Env e, Continuation k) { + public static Next yield(Outcome v, Env e, Continuation k) { if (v==null) throw new IllegalStateException("trying to yield null"); Next n = new Next(null,e,k); @@ -63,7 +63,7 @@ public static Next yield(Conclusion v, Env e, Continuation k) { /** * Creates a {@link Next} object that terminates the computation and either returns a value or throw an exception. */ - public static Next terminate(Conclusion v) { + public static Next terminate(Outcome v) { return yield(v, null, HALT); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index f533af9cb..13670212b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -46,7 +46,7 @@ public final Continuation getExceptionHandler(Class type) { // by having this exception thrown? return new Continuation() { public Next receive(Object o) { - return Next.terminate(new Conclusion(null,(Throwable)o)); + return Next.terminate(new Outcome(null,(Throwable)o)); } }; } else { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java b/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java similarity index 90% rename from src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java rename to src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java index 4d4c7be2d..0989cb7e9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/Conclusion.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java @@ -10,11 +10,11 @@ * * @author Kohsuke Kawaguchi */ -public final class Conclusion { +public final class Outcome { private final Object normal; private final Throwable abnormal; - public Conclusion(Object normal, Throwable abnormal) { + public Outcome(Object normal, Throwable abnormal) { assert normal==null || abnormal==null; this.normal = normal; this.abnormal = abnormal; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java index 38254999c..f6c2a03d6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java @@ -20,7 +20,7 @@ public YieldBlock(Object v) { } public Next eval(Env e, final Continuation k) { - return Next.yield(new Conclusion(v,null),e,k); + return Next.yield(new Outcome(v,null),e,k); } private static final long serialVersionUID = 1L; From 9e9788dc4be49dc4eb71f83114df41aac5754193 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 09:43:24 -0800 Subject: [PATCH 141/932] Moving Outcome to mark it package private --- .../com/cloudbees/groovy/cps/Continuable.java | 15 ++++++++++----- .../com/cloudbees/groovy/cps/Continuation.java | 2 -- src/main/java/com/cloudbees/groovy/cps/Next.java | 16 +++++++++++----- .../cloudbees/groovy/cps/{impl => }/Outcome.java | 12 ++++++------ .../com/cloudbees/groovy/cps/impl/CallEnv.java | 2 +- .../cloudbees/groovy/cps/impl/YieldBlock.java | 2 +- 6 files changed, 29 insertions(+), 20 deletions(-) rename src/main/java/com/cloudbees/groovy/cps/{impl => }/Outcome.java (73%) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index e8041469e..14de18887 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -1,6 +1,5 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.Outcome; import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.CpsFunction; @@ -43,12 +42,18 @@ public Continuable(Next n) { } /** - * Creates a {@link Continuable} that executes the block of code. + * Creates a {@link Continuable} that executes the block of code in a fresh empty environment. */ public Continuable(Block block) { - this(new Next(block, - new FunctionCallEnv(null,null,Continuation.HALT), - Continuation.HALT)); + this(block, new FunctionCallEnv(null,null,Continuation.HALT)); + } + + /** + * Creates a {link Continuable} that executes the block in the specified environment. + */ + public Continuable(Block block, Env e) { + this.e = e; + this.k = new Next(block,e,Continuation.HALT); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index f316dcaec..078a0ef80 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -1,7 +1,5 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.Outcome; - import java.io.Serializable; /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 07b84466d..06f562931 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,7 +1,5 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.Outcome; - import java.io.Serializable; /** @@ -51,7 +49,11 @@ public Next step() { * causes the interpreter loop to exit with the specified value, then optionally allow the interpreter * to resume with the specified {@link Continuation}. */ - public static Next yield(Outcome v, Env e, Continuation k) { + public static Next yield(Object v, Env e, Continuation k) { + return yield0(new Outcome(v,null),e,k); + } + + private static Next yield0(Outcome v, Env e, Continuation k) { if (v==null) throw new IllegalStateException("trying to yield null"); Next n = new Next(null,e,k); @@ -63,10 +65,14 @@ public static Next yield(Outcome v, Env e, Continuation k) { /** * Creates a {@link Next} object that terminates the computation and either returns a value or throw an exception. */ - public static Next terminate(Outcome v) { - return yield(v, null, HALT); + public static Next terminate(Object v) { + return yield0(new Outcome(v, null), null, HALT); } + public static Next unhandledException(Throwable t) { + return yield0(new Outcome(null, t), null, HALT); + } + /** * As a {@link Continuation}, just ignore the argument. */ diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java b/src/main/java/com/cloudbees/groovy/cps/Outcome.java similarity index 73% rename from src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java rename to src/main/java/com/cloudbees/groovy/cps/Outcome.java index 0989cb7e9..aa982bed7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java +++ b/src/main/java/com/cloudbees/groovy/cps/Outcome.java @@ -1,4 +1,4 @@ -package com.cloudbees.groovy.cps.impl; +package com.cloudbees.groovy.cps; import java.lang.reflect.InvocationTargetException; @@ -10,28 +10,28 @@ * * @author Kohsuke Kawaguchi */ -public final class Outcome { +final class Outcome { private final Object normal; private final Throwable abnormal; - public Outcome(Object normal, Throwable abnormal) { + Outcome(Object normal, Throwable abnormal) { assert normal==null || abnormal==null; this.normal = normal; this.abnormal = abnormal; } - public Object replay() throws InvocationTargetException { + Object replay() throws InvocationTargetException { if (abnormal!=null) throw new InvocationTargetException(abnormal); else return normal; } - public Object getNormal() { + Object getNormal() { return normal; } - public Throwable getAbnormal() { + Throwable getAbnormal() { return abnormal; } } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 13670212b..6dd714d8d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -46,7 +46,7 @@ public final Continuation getExceptionHandler(Class type) { // by having this exception thrown? return new Continuation() { public Next receive(Object o) { - return Next.terminate(new Outcome(null,(Throwable)o)); + return Next.unhandledException((Throwable)o); } }; } else { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java index f6c2a03d6..fe4c563e9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java @@ -20,7 +20,7 @@ public YieldBlock(Object v) { } public Next eval(Env e, final Continuation k) { - return Next.yield(new Outcome(v,null),e,k); + return Next.yield(v,e,k); } private static final long serialVersionUID = 1L; From a618633e494404d30f92ee344c0ba20dd7593107 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 09:46:32 -0800 Subject: [PATCH 142/932] Incorrect use of Outcome here --- src/main/java/com/cloudbees/groovy/cps/Continuation.java | 2 +- .../com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 078a0ef80..06c053f8b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -29,7 +29,7 @@ private Halt() { } public Next receive(Object o) { - return Next.terminate(new Outcome(o, null)); + return Next.terminate(o); } public Object readResolve() { diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index 692ab8975..37b571c1e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -47,7 +47,7 @@ abstract class AbstractGroovyCpsTest extends Assert { } Object evalCPSonly(String script) { - return parseCps(script).invoke(null, Continuation.HALT).run().yield.replay() + return parseCps(script).invoke(null, Continuation.HALT).run().yield.replay() } CpsCallableInvocation parseCps(String script) { From 065da1e6905dcb3cc2654171072c01cbe7ab5dbb Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 12:31:29 -0800 Subject: [PATCH 143/932] Green thread support initial cut --- .../cloudbees/groovy/cps/GreenDispatcher.java | 91 +++++++++++++++++++ .../com/cloudbees/groovy/cps/GreenThread.java | 52 +++++++++++ .../groovy/cps/GreenThreadCreation.java | 17 ++++ .../com/cloudbees/groovy/cps/GreenWorld.java | 40 ++++++++ .../java/com/cloudbees/groovy/cps/Next.java | 18 ++-- .../groovy/cps/impl/CpsCallable.java | 2 +- .../cps/impl/CpsCallableInvocation.java | 12 +++ .../cloudbees/groovy/cps/impl/ProxyEnv.java | 4 +- 8 files changed, 226 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/GreenDispatcher.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/GreenThread.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/GreenThreadCreation.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/GreenWorld.java diff --git a/src/main/java/com/cloudbees/groovy/cps/GreenDispatcher.java b/src/main/java/com/cloudbees/groovy/cps/GreenDispatcher.java new file mode 100644 index 000000000..6fb1fdc50 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/GreenDispatcher.java @@ -0,0 +1,91 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.ProxyEnv; + +/** + * + * The whole thing has to be immutable because cloning {@link Continuable} is just shallow-copying its variables. + * + * @author Kohsuke Kawaguchi + */ +class GreenDispatcher { + private final GreenThread[] t; + private final int cur; + private final Env e; + + public GreenDispatcher(int cur, GreenThread... t) { + this.t = t; + this.cur = cur; + this.e = new ProxyEnv(currentThread().n.e); + } + + GreenThread currentThread() { + return t[cur]; + } + + Next update(GreenThread g) { + GreenThread[] a; + Outcome y = g.n.yield; + + if (y.getNormal() instanceof GreenThreadCreation) { + GreenThreadCreation c = (GreenThreadCreation) y.getNormal(); + + // create a new thread + a = new GreenThread[t.length+1]; + System.arraycopy(t,0,a,0,cur); + GreenThread nt = new GreenThread(c.block); + a[t.length] = nt; + + // let the creator thread receive the newly created thread + GreenDispatcher d = new GreenDispatcher(cur,a); + return d.k.receive(nt); + } + + if (g.isDead()) {// the thread has died + if (t.length==1) { + // if all the thread has terminated, we are done. + return Next.terminate(y); + } + + // remove this thread + a = new GreenThread[t.length-1]; + System.arraycopy(t,0,a,0,cur); + System.arraycopy(t,cur+1,a,cur,t.length-cur); + y = null; // green thread exiting will not yield a value + } else { + // replace the current slot + a = new GreenThread[t.length]; + System.arraycopy(t,0,a,0,t.length); + a[cur] = g; + } + + // pick the next thread to run. + // if the current thread has yielded a value, we want to suspend with that and when the response comes back + // we want to deliver that to the same thread, so we need to pick the current thread + // otherwise schedule the next one + GreenDispatcher d = new GreenDispatcher((y!=null ? cur + 1 : cur) % a.length, a); + Next n = d.asNext(); + n.yield = y; + return n; + } + + private final Continuation k = new Continuation() { + public Next receive(Object o) { + Next n = currentThread().n.k.receive(o); + return update(new GreenThread(n)); + } + }; + + private final Block b = new Block() { + public Next eval(Env e, Continuation k) { + assert e==GreenDispatcher.this.e; + assert k==GreenDispatcher.this.k; + GreenThread t = currentThread(); + return t.n.f.eval(t.n.e, k); + } + }; + + Next asNext() { + return new Next(b,e,k); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/GreenThread.java new file mode 100644 index 000000000..6ba3cbb96 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/GreenThread.java @@ -0,0 +1,52 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.FunctionCallEnv; + +import static com.cloudbees.groovy.cps.Continuation.*; + +/** + * Current state of a green thread. + * + *

+ * When we fork {@link Continuable}, we want to fork all threads, so this object is immutable, + * and every time a thread moves forward, a new object gets created. + * + * @author Kohsuke Kawaguchi + */ +public class GreenThread { + /** + * Remaining computation to execute on this thread. + * The equivalent of a program counter. + */ + final Next n; + + public GreenThread(Next n) { + this.n = n; + } + + /** + * Creates a brand-new thread that evaluates 'b'. + */ + public GreenThread(Block b) { + // TODO: allow the caller to pass a value + this(new Next(b, new FunctionCallEnv(null, null, HALT), HALT)); + } + + /** + * Creates a {@link GreenThread} that's already dead. + */ + public GreenThread(Outcome v) { + this(new Next(null,null,HALT)); + assert v!=null; + n.yield = v; + } + + /** + * Does this thread still have something to execute? + * If it is dead, n.yield contains the outcome of the thread. + */ + public boolean isDead() { + return n.k==Continuation.HALT && n.e==null; + } + +} diff --git a/src/main/java/com/cloudbees/groovy/cps/GreenThreadCreation.java b/src/main/java/com/cloudbees/groovy/cps/GreenThreadCreation.java new file mode 100644 index 000000000..04a1d7bf0 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/GreenThreadCreation.java @@ -0,0 +1,17 @@ +package com.cloudbees.groovy.cps; + +/** + * Pass in this value in {@link Continuable#suspend(Object)} to create a new green thread. + * + * A new thread will be created, and {@link Continuable#suspend(Object)} will return with + * the {@link GreenThread} object. TODO: but GreenThread object is not useful because it's immutable + * + * @author Kohsuke Kawaguchi + */ +public class GreenThreadCreation { + final Block block; + + public GreenThreadCreation(Block block) { + this.block = block; + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/GreenWorld.java b/src/main/java/com/cloudbees/groovy/cps/GreenWorld.java new file mode 100644 index 000000000..9570d2654 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/GreenWorld.java @@ -0,0 +1,40 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; +import com.cloudbees.groovy.cps.impl.CpsClosure; +import groovy.lang.Closure; + +/** + * @author Kohsuke Kawaguchi + */ +public class GreenWorld { + /** + * Creates a new {@link Continuable} that supports green threads inside the code to be evaluated. + */ + public static Continuable create(Block b) { + GreenDispatcher d = new GreenDispatcher(0, new GreenThread(b)); + return new Continuable(d.asNext()); + } + + /** + * Creates a new green thread that executes the given closure. + */ + public static GreenThread startThread(Closure c) { + try { + Object r = c.call(); + + // closure had run synchronously + return new GreenThread(new Outcome(r,null)); + } catch (CpsCallableInvocation inv) { + // this will create a thread, and resume with the newly created thread + Continuable.suspend(new GreenThreadCreation(inv.asBlock())); + + // thus the code will neve reach here + throw new AssertionError(); + } catch (Throwable t) { + // closure had run synchronously and failed + return new GreenThread(new Outcome(null,t)); + } + } + +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 06f562931..fbc442b82 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -7,10 +7,10 @@ * * @author Kohsuke Kawaguchi */ -public class Next implements Serializable, Continuation { - Block f; - Env e; - Continuation k; +public final class Next implements Serializable, Continuation { + final Block f; + final Env e; + final Continuation k; /** * If the program getting executed wants to yield a value and suspend its execution, @@ -50,7 +50,7 @@ public Next step() { * to resume with the specified {@link Continuation}. */ public static Next yield(Object v, Env e, Continuation k) { - return yield0(new Outcome(v,null),e,k); + return yield0(new Outcome(v, null), e, k); } private static Next yield0(Outcome v, Env e, Continuation k) { @@ -66,11 +66,15 @@ private static Next yield0(Outcome v, Env e, Continuation k) { * Creates a {@link Next} object that terminates the computation and either returns a value or throw an exception. */ public static Next terminate(Object v) { - return yield0(new Outcome(v, null), null, HALT); + return terminate(new Outcome(v, null)); } + static Next terminate(Outcome v) { + return yield0(v,null,HALT); + } + public static Next unhandledException(Throwable t) { - return yield0(new Outcome(null, t), null, HALT); + return terminate(new Outcome(null, t)); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java index 2d05ff238..69be29980 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java @@ -14,7 +14,7 @@ * * @author Kohsuke Kawaguchi */ -abstract class CpsCallable { +public abstract class CpsCallable { final Block body; final ImmutableList parameters; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 3681ecd62..0b1a72821 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps.impl; +import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; @@ -29,4 +30,15 @@ public CpsCallableInvocation(CpsCallable call, Object receiver, Object... argume public Next invoke(Env caller, Continuation k) { return call.invoke(caller,receiver,arguments,k); } + + /** + * Creates a {@link Block} that performs this invocation and pass the result to the given {@link Continuation}. + */ + public Block asBlock() { + return new Block() { + public Next eval(Env e, Continuation k) { + return invoke(e,k); + } + }; + } } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java index e71c3389b..6edab7ac3 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java @@ -6,10 +6,10 @@ /** * @author Kohsuke Kawaguchi */ -abstract class ProxyEnv implements Env { +public class ProxyEnv implements Env { protected final Env parent; - protected ProxyEnv(Env parent) { + public ProxyEnv(Env parent) { this.parent = parent; } From 509b35c7172c89628a460c3cbd83136f4932c623 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 12:38:02 -0800 Subject: [PATCH 144/932] Moving them to a new package for clarity --- .../com/cloudbees/groovy/cps/Continuable.java | 1 + .../java/com/cloudbees/groovy/cps/Next.java | 24 ++++++++++++------- .../cps/{ => green}/GreenDispatcher.java | 17 ++++++++----- .../groovy/cps/{ => green}/GreenThread.java | 13 ++++++---- .../cps/{ => green}/GreenThreadCreation.java | 5 +++- .../groovy/cps/{ => green}/GreenWorld.java | 8 ++++--- .../groovy/cps/green/package-info.java | 6 +++++ .../groovy/cps/{ => impl}/Outcome.java | 12 +++++----- 8 files changed, 57 insertions(+), 29 deletions(-) rename src/main/java/com/cloudbees/groovy/cps/{ => green}/GreenDispatcher.java (85%) rename src/main/java/com/cloudbees/groovy/cps/{ => green}/GreenThread.java (76%) rename src/main/java/com/cloudbees/groovy/cps/{ => green}/GreenThreadCreation.java (78%) rename src/main/java/com/cloudbees/groovy/cps/{ => green}/GreenWorld.java (83%) create mode 100644 src/main/java/com/cloudbees/groovy/cps/green/package-info.java rename src/main/java/com/cloudbees/groovy/cps/{ => impl}/Outcome.java (73%) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 14de18887..ada02e066 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -4,6 +4,7 @@ import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.CpsFunction; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; +import com.cloudbees.groovy.cps.impl.Outcome; import com.cloudbees.groovy.cps.impl.ThrowBlock; import com.cloudbees.groovy.cps.impl.YieldBlock; import groovy.lang.GroovyShell; diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index fbc442b82..30ef1eea3 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,5 +1,7 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.Outcome; + import java.io.Serializable; /** @@ -8,9 +10,9 @@ * @author Kohsuke Kawaguchi */ public final class Next implements Serializable, Continuation { - final Block f; - final Env e; - final Continuation k; + public final Block f; + public final Env e; + public final Continuation k; /** * If the program getting executed wants to yield a value and suspend its execution, @@ -18,12 +20,21 @@ public final class Next implements Serializable, Continuation { * * This field and {@link #f} is mutually exclusive. */ - /*package*/ Outcome yield; + public final Outcome yield; public Next(Block f, Env e, Continuation k) { this.f = f; this.e = e; this.k = k; + this.yield = null; + } + + public Next(Env e, Continuation k, Outcome yield) { + this.f = null; + this.e = e; + this.k = k; + this.yield = yield; + assert yield!=null; } /** @@ -56,10 +67,7 @@ public static Next yield(Object v, Env e, Continuation k) { private static Next yield0(Outcome v, Env e, Continuation k) { if (v==null) throw new IllegalStateException("trying to yield null"); - Next n = new Next(null,e,k); - n.yield = v; - - return n; + return new Next(e,k,v); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/GreenDispatcher.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java similarity index 85% rename from src/main/java/com/cloudbees/groovy/cps/GreenDispatcher.java rename to src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java index 6fb1fdc50..351bf97e3 100644 --- a/src/main/java/com/cloudbees/groovy/cps/GreenDispatcher.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java @@ -1,5 +1,11 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.green; +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuable; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; +import com.cloudbees.groovy.cps.impl.Outcome; import com.cloudbees.groovy.cps.impl.ProxyEnv; /** @@ -64,9 +70,7 @@ Next update(GreenThread g) { // we want to deliver that to the same thread, so we need to pick the current thread // otherwise schedule the next one GreenDispatcher d = new GreenDispatcher((y!=null ? cur + 1 : cur) % a.length, a); - Next n = d.asNext(); - n.yield = y; - return n; + return d.asNext(y); } private final Continuation k = new Continuation() { @@ -85,7 +89,8 @@ public Next eval(Env e, Continuation k) { } }; - Next asNext() { - return new Next(b,e,k); + Next asNext(Outcome y) { + if (y==null) return new Next(b,e,k); + else return new Next(e,k,y); } } diff --git a/src/main/java/com/cloudbees/groovy/cps/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java similarity index 76% rename from src/main/java/com/cloudbees/groovy/cps/GreenThread.java rename to src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java index 6ba3cbb96..ef500796d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/GreenThread.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java @@ -1,5 +1,10 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.green; +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuable; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Next; +import com.cloudbees.groovy.cps.impl.Outcome; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import static com.cloudbees.groovy.cps.Continuation.*; @@ -36,9 +41,7 @@ public GreenThread(Block b) { * Creates a {@link GreenThread} that's already dead. */ public GreenThread(Outcome v) { - this(new Next(null,null,HALT)); - assert v!=null; - n.yield = v; + this(new Next(null,HALT,v)); } /** @@ -46,7 +49,7 @@ public GreenThread(Outcome v) { * If it is dead, n.yield contains the outcome of the thread. */ public boolean isDead() { - return n.k==Continuation.HALT && n.e==null; + return n.k== Continuation.HALT && n.e==null; } } diff --git a/src/main/java/com/cloudbees/groovy/cps/GreenThreadCreation.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java similarity index 78% rename from src/main/java/com/cloudbees/groovy/cps/GreenThreadCreation.java rename to src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java index 04a1d7bf0..e41403ddf 100644 --- a/src/main/java/com/cloudbees/groovy/cps/GreenThreadCreation.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java @@ -1,4 +1,7 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.green; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuable; /** * Pass in this value in {@link Continuable#suspend(Object)} to create a new green thread. diff --git a/src/main/java/com/cloudbees/groovy/cps/GreenWorld.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java similarity index 83% rename from src/main/java/com/cloudbees/groovy/cps/GreenWorld.java rename to src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java index 9570d2654..d7f848d20 100644 --- a/src/main/java/com/cloudbees/groovy/cps/GreenWorld.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java @@ -1,7 +1,9 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.green; +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuable; +import com.cloudbees.groovy.cps.impl.Outcome; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; -import com.cloudbees.groovy.cps.impl.CpsClosure; import groovy.lang.Closure; /** @@ -13,7 +15,7 @@ public class GreenWorld { */ public static Continuable create(Block b) { GreenDispatcher d = new GreenDispatcher(0, new GreenThread(b)); - return new Continuable(d.asNext()); + return new Continuable(d.asNext(null)); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/green/package-info.java b/src/main/java/com/cloudbees/groovy/cps/green/package-info.java new file mode 100644 index 000000000..40b50497b --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/green/package-info.java @@ -0,0 +1,6 @@ +/** + * Green thread support. + * + * Threads will cooperatively context switch among themselves. + */ +package com.cloudbees.groovy.cps.green; diff --git a/src/main/java/com/cloudbees/groovy/cps/Outcome.java b/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java similarity index 73% rename from src/main/java/com/cloudbees/groovy/cps/Outcome.java rename to src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java index aa982bed7..0989cb7e9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Outcome.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java @@ -1,4 +1,4 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps.impl; import java.lang.reflect.InvocationTargetException; @@ -10,28 +10,28 @@ * * @author Kohsuke Kawaguchi */ -final class Outcome { +public final class Outcome { private final Object normal; private final Throwable abnormal; - Outcome(Object normal, Throwable abnormal) { + public Outcome(Object normal, Throwable abnormal) { assert normal==null || abnormal==null; this.normal = normal; this.abnormal = abnormal; } - Object replay() throws InvocationTargetException { + public Object replay() throws InvocationTargetException { if (abnormal!=null) throw new InvocationTargetException(abnormal); else return normal; } - Object getNormal() { + public Object getNormal() { return normal; } - Throwable getAbnormal() { + public Throwable getAbnormal() { return abnormal; } } From 4cbab5c2735817596cbe6cf097bc21dbc1b84f63 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 12:48:41 -0800 Subject: [PATCH 145/932] Bug fix --- .../groovy/cps/green/GreenDispatcher.java | 27 +++++++++++------- .../groovy/cps/green/GreenThread.java | 28 +++++++++++++++---- 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java index 351bf97e3..1cf91b07b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java @@ -18,8 +18,13 @@ class GreenDispatcher { private final GreenThread[] t; private final int cur; private final Env e; + /** + * Used to generate new thread ID. + */ + private final int iota; - public GreenDispatcher(int cur, GreenThread... t) { + public GreenDispatcher(int iota, int cur, GreenThread... t) { + this.iota = iota; this.t = t; this.cur = cur; this.e = new ProxyEnv(currentThread().n.e); @@ -29,9 +34,15 @@ GreenThread currentThread() { return t[cur]; } + /** + * Called when we execute something in one of the member thread. + * + * We'll build an updated {@link GreenDispatcher} then return it. + */ Next update(GreenThread g) { GreenThread[] a; Outcome y = g.n.yield; + int iota = this.iota; if (y.getNormal() instanceof GreenThreadCreation) { GreenThreadCreation c = (GreenThreadCreation) y.getNormal(); @@ -39,11 +50,11 @@ Next update(GreenThread g) { // create a new thread a = new GreenThread[t.length+1]; System.arraycopy(t,0,a,0,cur); - GreenThread nt = new GreenThread(c.block); + GreenThread nt = new GreenThread(iota++,c.block); a[t.length] = nt; // let the creator thread receive the newly created thread - GreenDispatcher d = new GreenDispatcher(cur,a); + GreenDispatcher d = new GreenDispatcher(iota,cur,a); return d.k.receive(nt); } @@ -69,23 +80,19 @@ Next update(GreenThread g) { // if the current thread has yielded a value, we want to suspend with that and when the response comes back // we want to deliver that to the same thread, so we need to pick the current thread // otherwise schedule the next one - GreenDispatcher d = new GreenDispatcher((y!=null ? cur + 1 : cur) % a.length, a); + GreenDispatcher d = new GreenDispatcher(iota,(y!=null ? cur + 1 : cur) % a.length, a); return d.asNext(y); } private final Continuation k = new Continuation() { public Next receive(Object o) { - Next n = currentThread().n.k.receive(o); - return update(new GreenThread(n)); + return update(currentThread().tick(o)); } }; private final Block b = new Block() { public Next eval(Env e, Continuation k) { - assert e==GreenDispatcher.this.e; - assert k==GreenDispatcher.this.k; - GreenThread t = currentThread(); - return t.n.f.eval(t.n.e, k); + return update(currentThread().step()); } }; diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java index ef500796d..4414f5758 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java @@ -25,23 +25,29 @@ public class GreenThread { */ final Next n; - public GreenThread(Next n) { + /** + * Unique ID among other {@link GreenThread}s in {@link GreenDispatcher} + */ + final int id; + + GreenThread(int id, Next n) { + this.id = id; this.n = n; } /** * Creates a brand-new thread that evaluates 'b'. */ - public GreenThread(Block b) { + GreenThread(int id, Block b) { // TODO: allow the caller to pass a value - this(new Next(b, new FunctionCallEnv(null, null, HALT), HALT)); + this(id,new Next(b, new FunctionCallEnv(null, null, HALT), HALT)); } /** * Creates a {@link GreenThread} that's already dead. */ - public GreenThread(Outcome v) { - this(new Next(null,HALT,v)); + GreenThread(int id, Outcome v) { + this(id,new Next(null,HALT,v)); } /** @@ -52,4 +58,16 @@ public boolean isDead() { return n.k== Continuation.HALT && n.e==null; } + /** + * Runs one step in this thread and returns a new state. + */ + /*package*/ GreenThread tick(Object o) { + Next n = this.n.k.receive(o); + return new GreenThread(id, n); + } + + /*package*/ GreenThread step() { + Next n = this.n.step(); + return new GreenThread(id, n); + } } From 20a8a82fe46d558b583129747aacfb8c1985aa4c Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 12:51:13 -0800 Subject: [PATCH 146/932] first thread is #0 --- src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java index d7f848d20..99fdfdd50 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java @@ -14,7 +14,7 @@ public class GreenWorld { * Creates a new {@link Continuable} that supports green threads inside the code to be evaluated. */ public static Continuable create(Block b) { - GreenDispatcher d = new GreenDispatcher(0, new GreenThread(b)); + GreenDispatcher d = new GreenDispatcher(1, 0, new GreenThread(0,b)); return new Continuable(d.asNext(null)); } From 880f052bcbf9e64ee2700adb72d34aae907b5844 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 13:35:19 -0800 Subject: [PATCH 147/932] Evolving green thread support --- .../com/cloudbees/groovy/cps/Continuable.java | 12 +-- .../groovy/cps/green/GreenDispatcher.java | 41 ++++++--- .../groovy/cps/green/GreenThread.java | 85 +++++++++---------- .../groovy/cps/green/GreenThreadCreation.java | 5 +- .../groovy/cps/green/GreenThreadState.java | 80 +++++++++++++++++ .../groovy/cps/green/GreenWorld.java | 23 +++-- .../groovy/cps/green/ThreadTask.java | 8 ++ .../cloudbees/groovy/cps/impl/Outcome.java | 37 +++++++- .../com/cloudbees/groovy/cps/BasicTest.java | 2 +- 9 files changed, 215 insertions(+), 78 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index ada02e066..87c75a8b8 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -103,22 +103,14 @@ public Object runByThrow(Throwable arg) throws InvocationTargetException { } private Object run0(Outcome cn) throws InvocationTargetException { - Next n; - Throwable t = cn.getAbnormal(); - if (t!=null) { - // resume program by throwing this exception - n = new Next(new ThrowBlock(new ConstantBlock(t)),e,null); - } else { - // resume program by passing the value - n = k.receive(cn.getNormal()); - } + Next n = cn.resumeFrom(e,k); n = n.run(); e = n.e; k = n.k; - return n.yield.replay(); + return n.yield.wrapReplay(); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java index 1cf91b07b..f5b8b7ab4 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java @@ -15,7 +15,7 @@ * @author Kohsuke Kawaguchi */ class GreenDispatcher { - private final GreenThread[] t; + private final GreenThreadState[] t; private final int cur; private final Env e; /** @@ -23,14 +23,14 @@ class GreenDispatcher { */ private final int iota; - public GreenDispatcher(int iota, int cur, GreenThread... t) { + public GreenDispatcher(int iota, int cur, GreenThreadState... t) { this.iota = iota; this.t = t; this.cur = cur; this.e = new ProxyEnv(currentThread().n.e); } - GreenThread currentThread() { + GreenThreadState currentThread() { return t[cur]; } @@ -39,18 +39,32 @@ GreenThread currentThread() { * * We'll build an updated {@link GreenDispatcher} then return it. */ - Next update(GreenThread g) { - GreenThread[] a; + Next update(GreenThreadState g) { + GreenThreadState[] a; Outcome y = g.n.yield; int iota = this.iota; + if (y.getNormal() instanceof ThreadTask) { + // execute the task and get it right back to the thread + ThreadTask task = (ThreadTask)y.getNormal(); + + try { + y = new Outcome(task.eval(this),null); + } catch (Throwable t) { + y = new Outcome(null,t); + } + + // get back to the calling thread right away with the result + return update(g.resumeFrom(y)); + } + if (y.getNormal() instanceof GreenThreadCreation) { GreenThreadCreation c = (GreenThreadCreation) y.getNormal(); // create a new thread - a = new GreenThread[t.length+1]; - System.arraycopy(t,0,a,0,cur); - GreenThread nt = new GreenThread(iota++,c.block); + a = new GreenThreadState[t.length+1]; + System.arraycopy(t,0,a,0,t.length); + GreenThreadState nt = new GreenThreadState(new GreenThread(iota++),c.block); a[t.length] = nt; // let the creator thread receive the newly created thread @@ -65,13 +79,13 @@ Next update(GreenThread g) { } // remove this thread - a = new GreenThread[t.length-1]; + a = new GreenThreadState[t.length-1]; System.arraycopy(t,0,a,0,cur); System.arraycopy(t,cur+1,a,cur,t.length-cur); y = null; // green thread exiting will not yield a value } else { // replace the current slot - a = new GreenThread[t.length]; + a = new GreenThreadState[t.length]; System.arraycopy(t,0,a,0,t.length); a[cur] = g; } @@ -100,4 +114,11 @@ Next asNext(Outcome y) { if (y==null) return new Next(b,e,k); else return new Next(e,k,y); } + + public GreenThreadState resolveThreadState(int id) { + for (GreenThreadState g : t) + if (g.g.id==id) + return g; + throw new IllegalStateException("Invalid green thread ID: "+id); + } } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java index 4414f5758..9391dc87a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java @@ -1,73 +1,68 @@ package com.cloudbees.groovy.cps.green; -import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuable; -import com.cloudbees.groovy.cps.Continuation; -import com.cloudbees.groovy.cps.Next; -import com.cloudbees.groovy.cps.impl.Outcome; -import com.cloudbees.groovy.cps.impl.FunctionCallEnv; - -import static com.cloudbees.groovy.cps.Continuation.*; /** - * Current state of a green thread. - * - *

- * When we fork {@link Continuable}, we want to fork all threads, so this object is immutable, - * and every time a thread moves forward, a new object gets created. + * Represents a green thread. * * @author Kohsuke Kawaguchi */ public class GreenThread { /** - * Remaining computation to execute on this thread. - * The equivalent of a program counter. - */ - final Next n; - - /** - * Unique ID among other {@link GreenThread}s in {@link GreenDispatcher} + * Thread ID. */ final int id; - GreenThread(int id, Next n) { + GreenThread(int id) { this.id = id; - this.n = n; } /** - * Creates a brand-new thread that evaluates 'b'. + * Executes the task and make its result available back to the caller. + * + * The type parameter and bogus return type helps us ensure that the resume value from the suspension + * and the return type of the method matches. */ - GreenThread(int id, Block b) { - // TODO: allow the caller to pass a value - this(id,new Next(b, new FunctionCallEnv(null, null, HALT), HALT)); + private static T invoke(ThreadTask task) { + Continuable.suspend(task); + + // the code will never reach here + throw new AssertionError(); } - /** - * Creates a {@link GreenThread} that's already dead. - */ - GreenThread(int id, Outcome v) { - this(id,new Next(null,HALT,v)); + public boolean isAlive() { + return invoke(new ThreadTask() { + public Boolean eval(GreenDispatcher d) { + return !d.resolveThreadState(id).isDead(); + } + }); } - /** - * Does this thread still have something to execute? - * If it is dead, n.yield contains the outcome of the thread. - */ public boolean isDead() { - return n.k== Continuation.HALT && n.e==null; + return invoke(new ThreadTask() { + public Boolean eval(GreenDispatcher d) { + return d.resolveThreadState(id).isDead(); + } + }); } - /** - * Runs one step in this thread and returns a new state. - */ - /*package*/ GreenThread tick(Object o) { - Next n = this.n.k.receive(o); - return new GreenThread(id, n); - } +// // TODO: this is not very useful because it doesn't block for the completion +// public Object getResult() throws InvocationTargetException { +// Continuable.suspend(new ThreadTask() { +// public Object eval(GreenDispatcher d) throws Throwable { +// return d.resolveThreadState(id).getResult().replay(); +// } +// }); +// +// // the code will never reach here +// throw new AssertionError(); +// } - /*package*/ GreenThread step() { - Next n = this.n.step(); - return new GreenThread(id, n); + public static GreenThread currentThread() { + return invoke(new ThreadTask() { + public GreenThread eval(GreenDispatcher d) throws Throwable { + return d.currentThread().g; + } + }); } } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java index e41403ddf..038359d6b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java @@ -2,16 +2,17 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuable; +import com.cloudbees.groovy.cps.impl.Outcome; /** * Pass in this value in {@link Continuable#suspend(Object)} to create a new green thread. * * A new thread will be created, and {@link Continuable#suspend(Object)} will return with - * the {@link GreenThread} object. TODO: but GreenThread object is not useful because it's immutable + * the {@link GreenThreadState} object. TODO: but GreenThreadState object is not useful because it's immutable * * @author Kohsuke Kawaguchi */ -public class GreenThreadCreation { +class GreenThreadCreation { final Block block; public GreenThreadCreation(Block block) { diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java new file mode 100644 index 000000000..76ea57136 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java @@ -0,0 +1,80 @@ +package com.cloudbees.groovy.cps.green; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuable; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Next; +import com.cloudbees.groovy.cps.impl.FunctionCallEnv; +import com.cloudbees.groovy.cps.impl.Outcome; + +import static com.cloudbees.groovy.cps.Continuation.*; + +/** + * Current state of a green thread. + * + *

+ * When we fork {@link Continuable}, we want to fork all threads, so this object is immutable, + * and every time a thread moves forward, a new object gets created. + * + * @author Kohsuke Kawaguchi + */ +public class GreenThreadState { + /** + * Remaining computation to execute on this thread. + * The equivalent of a program counter. + */ + final Next n; + + /** + * Unique ID among other {@link GreenThreadState}s in {@link GreenDispatcher} + */ + final GreenThread g; + + GreenThreadState(GreenThread g, Next n) { + this.g = g; + this.n = n; + } + + /** + * Creates a brand-new thread that evaluates 'b'. + */ + GreenThreadState(GreenThread g, Block b) { + // TODO: allow the caller to pass a value + this(g,new Next(b, new FunctionCallEnv(null, null, HALT), HALT)); + } + + /** + * Creates a {@link GreenThreadState} that's already dead. + */ + GreenThreadState(GreenThread g, Outcome v) { + this(g,new Next(null,HALT,v)); + } + + /** + * Does this thread still have something to execute? + * If it is dead, n.yield contains the outcome of the thread. + */ + public boolean isDead() { + return n.k== Continuation.HALT && n.e==null; + } + + public Outcome getResult() { + if (isDead()) return n.yield; + else throw new IllegalStateException("Green thread is still running"); + } + + /** + * Runs one step in this thread and returns a new state. + */ + /*package*/ GreenThreadState tick(Object o) { + return resumeFrom(new Outcome(o,null)); + } + + /*package*/ GreenThreadState resumeFrom(Outcome o) { + return new GreenThreadState(this.g, o.resumeFrom(n.e, n.k)); + } + + /*package*/ GreenThreadState step() { + return new GreenThreadState(this.g, n.step()); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java index 99fdfdd50..ef17e263e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java @@ -2,8 +2,9 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuable; -import com.cloudbees.groovy.cps.impl.Outcome; +import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; +import com.cloudbees.groovy.cps.impl.ThrowBlock; import groovy.lang.Closure; /** @@ -14,29 +15,33 @@ public class GreenWorld { * Creates a new {@link Continuable} that supports green threads inside the code to be evaluated. */ public static Continuable create(Block b) { - GreenDispatcher d = new GreenDispatcher(1, 0, new GreenThread(0,b)); + GreenDispatcher d = new GreenDispatcher(1, 0, new GreenThreadState(new GreenThread(0), b)); return new Continuable(d.asNext(null)); } /** * Creates a new green thread that executes the given closure. */ - public static GreenThread startThread(Closure c) { + public static GreenThreadState startThread(Closure c) { + Block b; try { Object r = c.call(); - // closure had run synchronously - return new GreenThread(new Outcome(r,null)); + // closure had run synchronously. Just create a sim + b = new ConstantBlock(r); } catch (CpsCallableInvocation inv) { // this will create a thread, and resume with the newly created thread - Continuable.suspend(new GreenThreadCreation(inv.asBlock())); + b = inv.asBlock(); - // thus the code will neve reach here - throw new AssertionError(); } catch (Throwable t) { // closure had run synchronously and failed - return new GreenThread(new Outcome(null,t)); + b = new ThrowBlock(new ConstantBlock(t)); } + + Continuable.suspend(new GreenThreadCreation(b)); + + // thus the code will neve reach here + throw new AssertionError(); } } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java b/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java new file mode 100644 index 000000000..2589cbb8c --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java @@ -0,0 +1,8 @@ +package com.cloudbees.groovy.cps.green; + +/** + * @author Kohsuke Kawaguchi + */ +abstract interface ThreadTask { + T eval(GreenDispatcher d) throws Throwable; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java b/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java index 0989cb7e9..2b5b6b67e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java @@ -1,5 +1,10 @@ package com.cloudbees.groovy.cps.impl; +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + import java.lang.reflect.InvocationTargetException; /** @@ -20,13 +25,23 @@ public Outcome(Object normal, Throwable abnormal) { this.abnormal = abnormal; } - public Object replay() throws InvocationTargetException { + /** + * Like {@link #replay()} but wraps the throwable into {@link InvocationTargetException}. + */ + public Object wrapReplay() throws InvocationTargetException { if (abnormal!=null) throw new InvocationTargetException(abnormal); else return normal; } + public Object replay() throws Throwable { + if (abnormal!=null) + throw abnormal; + else + return normal; + } + public Object getNormal() { return normal; } @@ -34,4 +49,24 @@ public Object getNormal() { public Throwable getAbnormal() { return abnormal; } + + public Next resumeFrom(Env e, Continuation k) { + if (abnormal!=null) { + // resume program by throwing this exception + return new Next(new ThrowBlock(new ConstantBlock(abnormal)),e,null/*unused*/); + } else { + // resume program by passing the value + return k.receive(normal); + } + } + +// public Block asBlock() { +// if (abnormal!=null) { +// // resume program by throwing this exception +// return new ThrowBlock(new ConstantBlock(abnormal)); +// } else { +// // resume program by passing the value +// return new ConstantBlock(normal); +// } +// } } diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 35b3199aa..c2f1ad954 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -29,7 +29,7 @@ private T run(Block... bodies) { try { Env e = new FunctionCallEnv(null,null,Continuation.HALT); Next p = new Next(b.block(bodies), e, Continuation.HALT); - return (T) p.run().yield.replay(); + return (T) p.run().yield.wrapReplay(); } catch (InvocationTargetException x) { throw new AssertionError(x); } From 21eb0340c1f7ebc51f21e5b404fbc24c48d14b8b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 13:38:17 -0800 Subject: [PATCH 148/932] ID is not needed. Object identity of GreenThread object is sufficient --- .../groovy/cps/green/GreenDispatcher.java | 24 +++++++------------ .../groovy/cps/green/GreenThread.java | 16 ++++++------- .../groovy/cps/green/GreenWorld.java | 2 +- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java index f5b8b7ab4..38ec20746 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java @@ -18,13 +18,8 @@ class GreenDispatcher { private final GreenThreadState[] t; private final int cur; private final Env e; - /** - * Used to generate new thread ID. - */ - private final int iota; - public GreenDispatcher(int iota, int cur, GreenThreadState... t) { - this.iota = iota; + public GreenDispatcher(int cur, GreenThreadState... t) { this.t = t; this.cur = cur; this.e = new ProxyEnv(currentThread().n.e); @@ -42,7 +37,6 @@ GreenThreadState currentThread() { Next update(GreenThreadState g) { GreenThreadState[] a; Outcome y = g.n.yield; - int iota = this.iota; if (y.getNormal() instanceof ThreadTask) { // execute the task and get it right back to the thread @@ -64,11 +58,11 @@ Next update(GreenThreadState g) { // create a new thread a = new GreenThreadState[t.length+1]; System.arraycopy(t,0,a,0,t.length); - GreenThreadState nt = new GreenThreadState(new GreenThread(iota++),c.block); + GreenThreadState nt = new GreenThreadState(new GreenThread(),c.block); a[t.length] = nt; // let the creator thread receive the newly created thread - GreenDispatcher d = new GreenDispatcher(iota,cur,a); + GreenDispatcher d = new GreenDispatcher(cur,a); return d.k.receive(nt); } @@ -94,7 +88,7 @@ Next update(GreenThreadState g) { // if the current thread has yielded a value, we want to suspend with that and when the response comes back // we want to deliver that to the same thread, so we need to pick the current thread // otherwise schedule the next one - GreenDispatcher d = new GreenDispatcher(iota,(y!=null ? cur + 1 : cur) % a.length, a); + GreenDispatcher d = new GreenDispatcher((y!=null ? cur + 1 : cur) % a.length, a); return d.asNext(y); } @@ -115,10 +109,10 @@ Next asNext(Outcome y) { else return new Next(e,k,y); } - public GreenThreadState resolveThreadState(int id) { - for (GreenThreadState g : t) - if (g.g.id==id) - return g; - throw new IllegalStateException("Invalid green thread ID: "+id); + public GreenThreadState resolveThreadState(GreenThread g) { + for (GreenThreadState ts : t) + if (ts.g==g) + return ts; + throw new IllegalStateException("Invalid green thread: "+g); } } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java index 9391dc87a..f52de9e4a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java @@ -8,13 +8,7 @@ * @author Kohsuke Kawaguchi */ public class GreenThread { - /** - * Thread ID. - */ - final int id; - - GreenThread(int id) { - this.id = id; + GreenThread() { } /** @@ -30,10 +24,14 @@ private static T invoke(ThreadTask task) { throw new AssertionError(); } + private GreenThreadState stateAt(GreenDispatcher d) { + return d.resolveThreadState(this); + } + public boolean isAlive() { return invoke(new ThreadTask() { public Boolean eval(GreenDispatcher d) { - return !d.resolveThreadState(id).isDead(); + return !stateAt(d).isDead(); } }); } @@ -41,7 +39,7 @@ public Boolean eval(GreenDispatcher d) { public boolean isDead() { return invoke(new ThreadTask() { public Boolean eval(GreenDispatcher d) { - return d.resolveThreadState(id).isDead(); + return stateAt(d).isDead(); } }); } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java index ef17e263e..a427fc010 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java @@ -15,7 +15,7 @@ public class GreenWorld { * Creates a new {@link Continuable} that supports green threads inside the code to be evaluated. */ public static Continuable create(Block b) { - GreenDispatcher d = new GreenDispatcher(1, 0, new GreenThreadState(new GreenThread(0), b)); + GreenDispatcher d = new GreenDispatcher(0, new GreenThreadState(new GreenThread(), b)); return new Continuable(d.asNext(null)); } From 665eef1a5e2b5ff8311db46dd30871e8b54d56ab Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 13:40:19 -0800 Subject: [PATCH 149/932] Return GreenThread object, not GreenThreadState --- .../java/com/cloudbees/groovy/cps/green/GreenDispatcher.java | 2 +- .../com/cloudbees/groovy/cps/green/GreenThreadCreation.java | 2 +- src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java index 38ec20746..ca41685db 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java @@ -63,7 +63,7 @@ Next update(GreenThreadState g) { // let the creator thread receive the newly created thread GreenDispatcher d = new GreenDispatcher(cur,a); - return d.k.receive(nt); + return d.k.receive(nt.g); } if (g.isDead()) {// the thread has died diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java index 038359d6b..59c8a88b4 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java @@ -8,7 +8,7 @@ * Pass in this value in {@link Continuable#suspend(Object)} to create a new green thread. * * A new thread will be created, and {@link Continuable#suspend(Object)} will return with - * the {@link GreenThreadState} object. TODO: but GreenThreadState object is not useful because it's immutable + * the {@link GreenThreadState} object. * * @author Kohsuke Kawaguchi */ diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java index a427fc010..7e4cdc55d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java @@ -22,7 +22,7 @@ public static Continuable create(Block b) { /** * Creates a new green thread that executes the given closure. */ - public static GreenThreadState startThread(Closure c) { + public static GreenThread startThread(Closure c) { Block b; try { Object r = c.call(); From 8e30c09d927b6faa00512c5869f50de980ae79a9 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 13:47:15 -0800 Subject: [PATCH 150/932] need not be public --- .../java/com/cloudbees/groovy/cps/green/GreenThreadState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java index 76ea57136..dd4e63712 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java @@ -18,7 +18,7 @@ * * @author Kohsuke Kawaguchi */ -public class GreenThreadState { +class GreenThreadState { /** * Remaining computation to execute on this thread. * The equivalent of a program counter. From 483757d2b42d24dd7d63485ba39bc6b09f062bb5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 13:50:25 -0800 Subject: [PATCH 151/932] make more package liberally available --- .../com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index 37b571c1e..b28d4c2ba 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps +import com.cloudbees.groovy.cps.green.GreenThread import com.cloudbees.groovy.cps.impl.CpsCallableInvocation import org.codehaus.groovy.control.CompilerConfiguration import org.codehaus.groovy.control.customizers.ImportCustomizer @@ -27,7 +28,7 @@ abstract class AbstractGroovyCpsTest extends Assert { @Before void setUp() { def imports = new ImportCustomizer() - .addImports(CpsTransformerTest.class.name, Continuable.class.name, WorkflowMethod.class.name) + .addStarImports(CpsTransformerTest.class.package.name, GreenThread.class.package.name) def cc = new CompilerConfiguration() cc.addCompilationCustomizers(imports) From 3bbb373fe6bfd409bb7d65d926f69fcfd4816cf6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 14:33:43 -0800 Subject: [PATCH 152/932] expore more packages liberally --- .../com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index b28d4c2ba..8bff23b5e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -28,7 +28,7 @@ abstract class AbstractGroovyCpsTest extends Assert { @Before void setUp() { def imports = new ImportCustomizer() - .addStarImports(CpsTransformerTest.class.package.name, GreenThread.class.package.name) + .addStarImports([CpsTransformerTest.class, GreenThread.class]*.package*.name as String[]) def cc = new CompilerConfiguration() cc.addCompilationCustomizers(imports) From a4a2e106d6f03edb1589a4239f002d79a0ec4721 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 14:33:51 -0800 Subject: [PATCH 153/932] noting TODO --- src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java index 7e4cdc55d..cb10b2135 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java @@ -8,6 +8,7 @@ import groovy.lang.Closure; /** + * TODO: subsume this all into {@link GreenThread} like how {@link Thread} works. * @author Kohsuke Kawaguchi */ public class GreenWorld { From 5a6d799c0e1d594d78ae60b0983226dcfb544a6b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 14:34:40 -0800 Subject: [PATCH 154/932] Marking as serializable --- .../com/cloudbees/groovy/cps/green/GreenDispatcher.java | 6 +++++- .../com/cloudbees/groovy/cps/green/GreenThreadState.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java index ca41685db..bfc90afe1 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java @@ -8,13 +8,15 @@ import com.cloudbees.groovy.cps.impl.Outcome; import com.cloudbees.groovy.cps.impl.ProxyEnv; +import java.io.Serializable; + /** * * The whole thing has to be immutable because cloning {@link Continuable} is just shallow-copying its variables. * * @author Kohsuke Kawaguchi */ -class GreenDispatcher { +class GreenDispatcher implements Serializable { private final GreenThreadState[] t; private final int cur; private final Env e; @@ -115,4 +117,6 @@ public GreenThreadState resolveThreadState(GreenThread g) { return ts; throw new IllegalStateException("Invalid green thread: "+g); } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java index dd4e63712..b6c875459 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java @@ -7,6 +7,8 @@ import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import com.cloudbees.groovy.cps.impl.Outcome; +import java.io.Serializable; + import static com.cloudbees.groovy.cps.Continuation.*; /** @@ -18,7 +20,7 @@ * * @author Kohsuke Kawaguchi */ -class GreenThreadState { +class GreenThreadState implements Serializable { /** * Remaining computation to execute on this thread. * The equivalent of a program counter. @@ -77,4 +79,6 @@ public Outcome getResult() { /*package*/ GreenThreadState step() { return new GreenThreadState(this.g, n.step()); } + + private static final long serialVersionUID = 1L; } From 24ee2729a131046f26c69105a265b26657bd5c76 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 15:18:46 -0800 Subject: [PATCH 155/932] Generalizing Task --- .../groovy/cps/green/GreenDispatcher.java | 112 ++++++++++-------- .../groovy/cps/green/GreenThread.java | 44 ++++--- .../groovy/cps/green/GreenThreadCreation.java | 10 +- .../groovy/cps/green/GreenThreadState.java | 56 ++++++++- .../cloudbees/groovy/cps/green/Monitor.java | 24 ++++ .../groovy/cps/green/ThreadTask.java | 29 ++++- .../groovy/cps/green/GreenThreadTest.groovy | 24 ++++ 7 files changed, 223 insertions(+), 76 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/green/Monitor.java create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java index bfc90afe1..f82368b40 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java @@ -17,18 +17,58 @@ * @author Kohsuke Kawaguchi */ class GreenDispatcher implements Serializable { - private final GreenThreadState[] t; + private final GreenThreadState[] threads; private final int cur; private final Env e; - public GreenDispatcher(int cur, GreenThreadState... t) { - this.t = t; + public GreenDispatcher(int cur, GreenThreadState... threads) { + this.threads = threads; this.cur = cur; this.e = new ProxyEnv(currentThread().n.e); } GreenThreadState currentThread() { - return t[cur]; + return threads[cur]; + } + + GreenDispatcher withNewThread(GreenThreadState s) { + GreenThreadState[] a = new GreenThreadState[threads.length+1]; + System.arraycopy(threads,0,a,0, threads.length); + a[threads.length] = s; + return new GreenDispatcher(cur,a); + } + + /** + * Creates a new state by updating or removing the thread. + */ + GreenDispatcher with(GreenThreadState s) { + int idx = -1; + for (int i = 0; i < threads.length; i++) { + if (threads[i].g==s.g) { + threads[i] = s; + idx = i; + break; + } + } + if (idx==-1) + throw new IllegalStateException("No such thread: "+s.g); + + if (s.isDead()) { + GreenThreadState[] a = new GreenThreadState[threads.length-1]; + System.arraycopy(threads,0,a,0,idx); + System.arraycopy(threads,idx+1,a,cur, threads.length-idx); + + return new GreenDispatcher(idx T invoke(ThreadTask task) { + private static void invoke(ThreadTask task) { Continuable.suspend(task); // the code will never reach here @@ -29,20 +29,21 @@ private GreenThreadState stateAt(GreenDispatcher d) { } public boolean isAlive() { - return invoke(new ThreadTask() { - public Boolean eval(GreenDispatcher d) { - return !stateAt(d).isDead(); + invoke(new ThreadTask() { + public Result eval(GreenDispatcher d) { + return new Result(d, new Outcome(!stateAt(d).isDead(),null), false); } }); + throw new AssertionError(); } - public boolean isDead() { - return invoke(new ThreadTask() { - public Boolean eval(GreenDispatcher d) { - return stateAt(d).isDead(); - } - }); - } +// public boolean isDead() { +// return invoke(new ThreadTask() { +// public Boolean eval(GreenDispatcher d) { +// return stateAt(d).isDead(); +// } +// }); +// } // // TODO: this is not very useful because it doesn't block for the completion // public Object getResult() throws InvocationTargetException { @@ -56,10 +57,19 @@ public Boolean eval(GreenDispatcher d) { // throw new AssertionError(); // } - public static GreenThread currentThread() { - return invoke(new ThreadTask() { - public GreenThread eval(GreenDispatcher d) throws Throwable { - return d.currentThread().g; +// public static GreenThread currentThread() { +// return invoke(new ThreadTask() { +// public GreenThread eval(GreenDispatcher d) throws Throwable { +// return d.currentThread().g; +// } +// }); +// } + + public static void monitorEnter(final Object o) { + invoke(new ThreadTask() { + public Void eval(GreenDispatcher d) throws Throwable { + d.monitorEnter(o); + return null; } }); } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java index 59c8a88b4..58bcf514e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java @@ -12,10 +12,18 @@ * * @author Kohsuke Kawaguchi */ -class GreenThreadCreation { +class GreenThreadCreation implements ThreadTask { final Block block; public GreenThreadCreation(Block block) { this.block = block; } + + public Result eval(GreenDispatcher d) { + + GreenThread g = new GreenThread(); + d = d.withNewThread(new GreenThreadState(g,block)); + + return new Result(d, new Outcome(g,null), false); + } } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java index b6c875459..5478daf32 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java @@ -20,7 +20,7 @@ * * @author Kohsuke Kawaguchi */ -class GreenThreadState implements Serializable { +final class GreenThreadState implements Serializable { /** * Remaining computation to execute on this thread. * The equivalent of a program counter. @@ -32,9 +32,28 @@ class GreenThreadState implements Serializable { */ final GreenThread g; - GreenThreadState(GreenThread g, Next n) { + final Monitor monitor; + + /** + * If true, this thread is waiting until the green lock of this object is acquired. + */ + final Object monitorEnter; + + /** + * If true, this thread is waiting for a notification to be sent on this object. + */ + final Object wait; + + private GreenThreadState(GreenThread g, Next n, Monitor monitor, Object monitorEnter, Object wait) { this.g = g; this.n = n; + this.monitor = monitor; + this.monitorEnter = monitorEnter; + this.wait = wait; + } + + private GreenThreadState(GreenThread g, Next n) { + this(g,n,null,null,null); } /** @@ -52,6 +71,25 @@ class GreenThreadState implements Serializable { this(g,new Next(null,HALT,v)); } +// methods for changing one state at a time + GreenThreadState with(Next n) { + return new GreenThreadState(g,n,monitor, monitorEnter, wait); + } + + GreenThreadState with(Monitor monitor) { + return new GreenThreadState(g,n,monitor, monitorEnter, wait); + } + + GreenThreadState withMonitorEnter(Object monitorEnter) { + assert (monitorEnter==null) != (this.monitorEnter ==null); + return new GreenThreadState(g,n,monitor,monitorEnter,wait); + } + + GreenThreadState withWait(Object wait) { + return new GreenThreadState(g,n,monitor,monitorEnter,wait); + } + + /** * Does this thread still have something to execute? * If it is dead, n.yield contains the outcome of the thread. @@ -73,11 +111,21 @@ public Outcome getResult() { } /*package*/ GreenThreadState resumeFrom(Outcome o) { - return new GreenThreadState(this.g, o.resumeFrom(n.e, n.k)); + return with(o.resumeFrom(n.e, n.k)); } /*package*/ GreenThreadState step() { - return new GreenThreadState(this.g, n.step()); + return with(n.step()); + } + + /** + * Does this thread already have a lock on 'o'? + */ + boolean hasLock(Object o) { + for (Monitor m = monitor; m!=null; m=m.next) + if (m.o==o) + return true; + return false; } private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cloudbees/groovy/cps/green/Monitor.java b/src/main/java/com/cloudbees/groovy/cps/green/Monitor.java new file mode 100644 index 000000000..62cdbb2d8 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/green/Monitor.java @@ -0,0 +1,24 @@ +package com.cloudbees.groovy.cps.green; + +import java.io.Serializable; + +/** + * + * + * @author Kohsuke Kawaguchi + */ +final class Monitor implements Serializable { + /** + * Link to form a stack of monitor. + */ + final Monitor next; + /** + * Object that is locked + */ + final Object o; + + Monitor(Monitor next, Object o) { + this.next = next; + this.o = o; + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java b/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java index 2589cbb8c..895b2c73a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java @@ -1,8 +1,33 @@ package com.cloudbees.groovy.cps.green; +import com.cloudbees.groovy.cps.Continuable; +import com.cloudbees.groovy.cps.impl.Outcome; + /** * @author Kohsuke Kawaguchi */ -abstract interface ThreadTask { - T eval(GreenDispatcher d) throws Throwable; +interface ThreadTask { + Result eval(GreenDispatcher d); +} + +class Result { + /** + * Next state of the world + */ + final GreenDispatcher d; + /** + * value to be yielded or returned from suspension. + */ + final Outcome value; + /** + * Should {@link #value} be yielded to the caller of {@link Continuable#run(Object)} (true) + * or should we immediately return from {@link Continuable#suspend(Object)}? (false) + */ + final boolean suspend; + + Result(GreenDispatcher d, Outcome value, boolean suspend) { + this.d = d; + this.value = value; + this.suspend = suspend; + } } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy new file mode 100644 index 000000000..728ff1008 --- /dev/null +++ b/src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy @@ -0,0 +1,24 @@ +package com.cloudbees.groovy.cps.green + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest +import org.junit.Ignore +import org.junit.Test + +/** + * + * + * @author Kohsuke Kawaguchi + */ +class GreenThreadTest extends AbstractGroovyCpsTest { + @Test @Ignore/*TODO: still a work in progress*/ + void thread() { + assert evalCPS(""" + GreenWorld.startThread { + int x=0; + for (int i=0; i<100; i++) + x+=i; + return x; + } + """)==[foo:"hello",bar:6,zot:null]; + } +} From 4c92148e6ade8837a9bf33a21b1c885d99cec2d5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 15:58:06 -0800 Subject: [PATCH 156/932] Implementing monitor and synchronization among green threads. --- .../groovy/cps/green/GreenDispatcher.java | 36 ++++-- .../groovy/cps/green/GreenThread.java | 116 +++++++++++++++++- .../groovy/cps/green/GreenThreadCreation.java | 7 +- .../groovy/cps/green/GreenThreadState.java | 31 ++++- .../groovy/cps/green/GreenWorld.java | 48 -------- 5 files changed, 171 insertions(+), 67 deletions(-) delete mode 100644 src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java index f82368b40..f8978c039 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java @@ -17,7 +17,7 @@ * @author Kohsuke Kawaguchi */ class GreenDispatcher implements Serializable { - private final GreenThreadState[] threads; + final GreenThreadState[] threads; private final int cur; private final Env e; @@ -39,7 +39,7 @@ GreenDispatcher withNewThread(GreenThreadState s) { } /** - * Creates a new state by updating or removing the thread. + * Updates the thread state. If the thread is dead, it'll be removed. */ GreenDispatcher with(GreenThreadState s) { int idx = -1; @@ -53,22 +53,44 @@ GreenDispatcher with(GreenThreadState s) { if (idx==-1) throw new IllegalStateException("No such thread: "+s.g); + GreenDispatcher d; if (s.isDead()) { GreenThreadState[] a = new GreenThreadState[threads.length-1]; System.arraycopy(threads,0,a,0,idx); System.arraycopy(threads,idx+1,a,cur, threads.length-idx); - return new GreenDispatcher(idx() { - public Void eval(GreenDispatcher d) throws Throwable { - d.monitorEnter(o); - return null; + invoke(new ThreadTask() { + public Result eval(GreenDispatcher d) { + return new Result(trans(d),null,false); + } + public GreenDispatcher trans(GreenDispatcher d) { + GreenThreadState cur = d.currentThread(); + for (GreenThreadState t : d.threads) { + if (t!=cur && t.hasLock(o)) { + // someone else has lock, so we need to wait + return d.with(cur.withMonitorEnter(o)); + } + } + // no one else has a lock, so we acquire the lock and move on + return d.with(cur.pushMonitor(o)); + } + + }); + throw new AssertionError(); + } + + public static void monitorLeave() { + invoke(new ThreadTask() { + public Result eval(GreenDispatcher d) { + GreenThreadState cur = d.currentThread(); + final Object o = cur.monitor.o; + + // the current thread will release the monitor. + d = d.with(cur.popMonitor()); + + // if another thread is waiting for this monitor, he gets one right away + for (GreenThreadState t : d.threads) { + if (t.monitorEnter==o) { + // give the lock to this thread + d = d.with(t.withMonitorEnter(null).pushMonitor(o)); + break; + } + } + + return new Result(d,null,false); } }); + throw new AssertionError(); + } + + public static void wait(final Object o) { + invoke(new ThreadTask() { + public Result eval(GreenDispatcher d) { + GreenThreadState cur = d.currentThread(); + + if (!cur.hasLock(o)) + throw new IllegalStateException("Thread doesn't have a lock of "+o); + + // wait for the notification to arrive + d = d.with(cur.withWait(o)); + + return new Result(d,null,false); + } + }); + throw new AssertionError(); + } + + public static void notify(final Object o, final boolean all) { + invoke(new ThreadTask() { + public Result eval(GreenDispatcher d) { + GreenThreadState cur = d.currentThread(); + + if (!cur.hasLock(o)) + throw new IllegalStateException("Thread doesn't have a lock of "+o); + + // let other waiting threads come back to life + for (GreenThreadState t : d.threads) { + if (t.wait==o) { + d = d.with(t.withoutWait()); + if (!all) + break; + } + } + + return new Result(d,null,false); + } + }); + throw new AssertionError(); } } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java index 58bcf514e..bc67d1bc5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java @@ -13,17 +13,16 @@ * @author Kohsuke Kawaguchi */ class GreenThreadCreation implements ThreadTask { + final GreenThread g; final Block block; - public GreenThreadCreation(Block block) { + public GreenThreadCreation(GreenThread g, Block block) { + this.g = g; this.block = block; } public Result eval(GreenDispatcher d) { - - GreenThread g = new GreenThread(); d = d.withNewThread(new GreenThreadState(g,block)); - return new Result(d, new Outcome(g,null), false); } } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java index 5478daf32..d937d4b59 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java @@ -35,15 +35,20 @@ final class GreenThreadState implements Serializable { final Monitor monitor; /** - * If true, this thread is waiting until the green lock of this object is acquired. + * If non-null, this thread is waiting until the green lock of this object is acquired. */ final Object monitorEnter; /** - * If true, this thread is waiting for a notification to be sent on this object. + * If non-null, this thread is waiting for a notification to be sent on this object. */ final Object wait; + /** + * If non-null, this thread was notified after {@link #wait} and waiting for the lock to reappear. + */ + final Object nofified; + private GreenThreadState(GreenThread g, Next n, Monitor monitor, Object monitorEnter, Object wait) { this.g = g; this.n = n; @@ -89,6 +94,28 @@ GreenThreadState withWait(Object wait) { return new GreenThreadState(g,n,monitor,monitorEnter,wait); } + GreenThreadState withNotification() { + assert wait!=null; + return new GreenThreadState(g,n,monitor,monitorEnter,null,); + } + + GreenThreadState pushMonitor(Object o) { + return with(new Monitor(monitor,o)); + } + + GreenThreadState popMonitor() { + return with(monitor.next); + } + + + /** + * Can this thread be scheduled for execution, or does it need to sleep (relative to other green threads)? + * + * Note that if a whole {@link Continuable} is suspended, the thread is considered still runnable. + */ + boolean isRunnable() { + return wait==null && monitorEnter==null; + } /** * Does this thread still have something to execute? diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java deleted file mode 100644 index cb10b2135..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.cloudbees.groovy.cps.green; - -import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.Continuable; -import com.cloudbees.groovy.cps.impl.ConstantBlock; -import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; -import com.cloudbees.groovy.cps.impl.ThrowBlock; -import groovy.lang.Closure; - -/** - * TODO: subsume this all into {@link GreenThread} like how {@link Thread} works. - * @author Kohsuke Kawaguchi - */ -public class GreenWorld { - /** - * Creates a new {@link Continuable} that supports green threads inside the code to be evaluated. - */ - public static Continuable create(Block b) { - GreenDispatcher d = new GreenDispatcher(0, new GreenThreadState(new GreenThread(), b)); - return new Continuable(d.asNext(null)); - } - - /** - * Creates a new green thread that executes the given closure. - */ - public static GreenThread startThread(Closure c) { - Block b; - try { - Object r = c.call(); - - // closure had run synchronously. Just create a sim - b = new ConstantBlock(r); - } catch (CpsCallableInvocation inv) { - // this will create a thread, and resume with the newly created thread - b = inv.asBlock(); - - } catch (Throwable t) { - // closure had run synchronously and failed - b = new ThrowBlock(new ConstantBlock(t)); - } - - Continuable.suspend(new GreenThreadCreation(b)); - - // thus the code will neve reach here - throw new AssertionError(); - } - -} From 90c8bc4e9de7eebfbf9183f71d992016260bed6b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 16:09:18 -0800 Subject: [PATCH 157/932] Implemented all the synchronized primitives --- .../com/cloudbees/groovy/cps/green/Cond.java | 27 +++++++++++ .../groovy/cps/green/GreenThread.java | 21 +++++---- .../groovy/cps/green/GreenThreadState.java | 47 ++++++++----------- 3 files changed, 60 insertions(+), 35 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/green/Cond.java diff --git a/src/main/java/com/cloudbees/groovy/cps/green/Cond.java b/src/main/java/com/cloudbees/groovy/cps/green/Cond.java new file mode 100644 index 000000000..cd1cec6a9 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/green/Cond.java @@ -0,0 +1,27 @@ +package com.cloudbees.groovy.cps.green; + +/** + * Condition that blocks {@link GreenThreadState} from running. + * + * The target object of the monitor is kept in {@link GreenThreadState#wait} + * + * @author Kohsuke Kawaguchi + */ +enum Cond { + /** + * Trying to acquire a monitor. + * Equivalent of monitor_enter JVM bytecode. + */ + MONITOR_ENTER, + /** + * Temporarily released a monitor and waiting to be notified. + * Equivalent of {@link Object#wait()} + */ + WAIT, + /** + * The thread was notified after waiting, and trying to reacquire a monitor. + * + * Unlike {@link #MONITOR_ENTER}, when a lock is acquired this will not add a new {@link Monitor}. + */ + NOTIFIED +} diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java index e7a9bded7..f03444b51 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java @@ -101,9 +101,9 @@ public Result eval(GreenDispatcher d) { public GreenDispatcher trans(GreenDispatcher d) { GreenThreadState cur = d.currentThread(); for (GreenThreadState t : d.threads) { - if (t!=cur && t.hasLock(o)) { + if (t!=cur && t.hasMonitor(o)) { // someone else has lock, so we need to wait - return d.with(cur.withMonitorEnter(o)); + return d.with(cur.withCond(Cond.MONITOR_ENTER, o)); } } // no one else has a lock, so we acquire the lock and move on @@ -125,9 +125,14 @@ public Result eval(GreenDispatcher d) { // if another thread is waiting for this monitor, he gets one right away for (GreenThreadState t : d.threads) { - if (t.monitorEnter==o) { + if (t.cond==Cond.MONITOR_ENTER && t.wait==o) { // give the lock to this thread - d = d.with(t.withMonitorEnter(null).pushMonitor(o)); + d = d.with(t.withCond(null,null).pushMonitor(o)); + break; + } + if (t.cond==Cond.NOTIFIED && t.wait==o) { + // give the lock to this thread (but without new monitor) + d = d.with(t.withCond(null,null)); break; } } @@ -143,11 +148,11 @@ public static void wait(final Object o) { public Result eval(GreenDispatcher d) { GreenThreadState cur = d.currentThread(); - if (!cur.hasLock(o)) + if (!cur.hasMonitor(o)) throw new IllegalStateException("Thread doesn't have a lock of "+o); // wait for the notification to arrive - d = d.with(cur.withWait(o)); + d = d.with(cur.withCond(Cond.WAIT, o)); return new Result(d,null,false); } @@ -160,13 +165,13 @@ public static void notify(final Object o, final boolean all) { public Result eval(GreenDispatcher d) { GreenThreadState cur = d.currentThread(); - if (!cur.hasLock(o)) + if (!cur.hasMonitor(o)) throw new IllegalStateException("Thread doesn't have a lock of "+o); // let other waiting threads come back to life for (GreenThreadState t : d.threads) { if (t.wait==o) { - d = d.with(t.withoutWait()); + d = d.with(t.withCond(Cond.NOTIFIED,o)); if (!all) break; } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java index d937d4b59..f84c95821 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java @@ -35,26 +35,24 @@ final class GreenThreadState implements Serializable { final Monitor monitor; /** - * If non-null, this thread is waiting until the green lock of this object is acquired. + * Meaning of the {@link #wait} field. */ - final Object monitorEnter; + final Cond cond; /** - * If non-null, this thread is waiting for a notification to be sent on this object. + * Monitor that's causing us to block. */ final Object wait; - /** - * If non-null, this thread was notified after {@link #wait} and waiting for the lock to reappear. - */ - final Object nofified; - - private GreenThreadState(GreenThread g, Next n, Monitor monitor, Object monitorEnter, Object wait) { + private GreenThreadState(GreenThread g, Next n, Monitor monitor, Cond cond, Object wait) { this.g = g; this.n = n; this.monitor = monitor; - this.monitorEnter = monitorEnter; + this.cond = cond; this.wait = wait; + + // either both must be null or both must be non-null + assert (cond==null) == (wait==null); } private GreenThreadState(GreenThread g, Next n) { @@ -78,25 +76,15 @@ private GreenThreadState(GreenThread g, Next n) { // methods for changing one state at a time GreenThreadState with(Next n) { - return new GreenThreadState(g,n,monitor, monitorEnter, wait); + return new GreenThreadState(g,n,monitor,cond,wait); } GreenThreadState with(Monitor monitor) { - return new GreenThreadState(g,n,monitor, monitorEnter, wait); + return new GreenThreadState(g,n,monitor,cond,wait); } - GreenThreadState withMonitorEnter(Object monitorEnter) { - assert (monitorEnter==null) != (this.monitorEnter ==null); - return new GreenThreadState(g,n,monitor,monitorEnter,wait); - } - - GreenThreadState withWait(Object wait) { - return new GreenThreadState(g,n,monitor,monitorEnter,wait); - } - - GreenThreadState withNotification() { - assert wait!=null; - return new GreenThreadState(g,n,monitor,monitorEnter,null,); + GreenThreadState withCond(Cond cond, Object o) { + return new GreenThreadState(g,n,monitor,cond,o); } GreenThreadState pushMonitor(Object o) { @@ -114,7 +102,7 @@ GreenThreadState popMonitor() { * Note that if a whole {@link Continuable} is suspended, the thread is considered still runnable. */ boolean isRunnable() { - return wait==null && monitorEnter==null; + return cond==null; } /** @@ -146,9 +134,14 @@ public Outcome getResult() { } /** - * Does this thread already have a lock on 'o'? + * Does this thread already own the monitor of 'o'? */ - boolean hasLock(Object o) { + boolean hasMonitor(Object o) { + if (wait==o && (cond==Cond.WAIT || cond==Cond.NOTIFIED)) { + // this thread owns the monitor but it is released temporarily + return false; + } + for (Monitor m = monitor; m!=null; m=m.next) if (m.o==o) return true; From a1c88d8ddc5fc54e926700376ddd4b0cef0c585e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 16:11:08 -0800 Subject: [PATCH 158/932] This class is better named as GreenWorld --- .../groovy/cps/green/GreenThread.java | 22 ++++++++-------- .../groovy/cps/green/GreenThreadCreation.java | 2 +- .../groovy/cps/green/GreenThreadState.java | 2 +- .../{GreenDispatcher.java => GreenWorld.java} | 25 ++++++++++--------- .../groovy/cps/green/ThreadTask.java | 6 ++--- 5 files changed, 29 insertions(+), 28 deletions(-) rename src/main/java/com/cloudbees/groovy/cps/green/{GreenDispatcher.java => GreenWorld.java} (87%) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java index f03444b51..35414b268 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java @@ -52,13 +52,13 @@ private static void invoke(ThreadTask task) { throw new AssertionError(); } - private GreenThreadState stateAt(GreenDispatcher d) { + private GreenThreadState stateAt(GreenWorld d) { return d.resolveThreadState(this); } public boolean isAlive() { invoke(new ThreadTask() { - public Result eval(GreenDispatcher d) { + public Result eval(GreenWorld d) { return new Result(d, new Outcome(!stateAt(d).isDead(),null), false); } }); @@ -67,7 +67,7 @@ public Result eval(GreenDispatcher d) { // public boolean isDead() { // return invoke(new ThreadTask() { -// public Boolean eval(GreenDispatcher d) { +// public Boolean eval(GreenWorld d) { // return stateAt(d).isDead(); // } // }); @@ -76,7 +76,7 @@ public Result eval(GreenDispatcher d) { // // TODO: this is not very useful because it doesn't block for the completion // public Object getResult() throws InvocationTargetException { // Continuable.suspend(new ThreadTask() { -// public Object eval(GreenDispatcher d) throws Throwable { +// public Object eval(GreenWorld d) throws Throwable { // return d.resolveThreadState(id).getResult().replay(); // } // }); @@ -87,7 +87,7 @@ public Result eval(GreenDispatcher d) { // public static GreenThread currentThread() { // return invoke(new ThreadTask() { -// public GreenThread eval(GreenDispatcher d) throws Throwable { +// public GreenThread eval(GreenWorld d) throws Throwable { // return d.currentThread().g; // } // }); @@ -95,10 +95,10 @@ public Result eval(GreenDispatcher d) { public static void monitorEnter(final Object o) { invoke(new ThreadTask() { - public Result eval(GreenDispatcher d) { + public Result eval(GreenWorld d) { return new Result(trans(d),null,false); } - public GreenDispatcher trans(GreenDispatcher d) { + public GreenWorld trans(GreenWorld d) { GreenThreadState cur = d.currentThread(); for (GreenThreadState t : d.threads) { if (t!=cur && t.hasMonitor(o)) { @@ -116,7 +116,7 @@ public GreenDispatcher trans(GreenDispatcher d) { public static void monitorLeave() { invoke(new ThreadTask() { - public Result eval(GreenDispatcher d) { + public Result eval(GreenWorld d) { GreenThreadState cur = d.currentThread(); final Object o = cur.monitor.o; @@ -145,7 +145,7 @@ public Result eval(GreenDispatcher d) { public static void wait(final Object o) { invoke(new ThreadTask() { - public Result eval(GreenDispatcher d) { + public Result eval(GreenWorld d) { GreenThreadState cur = d.currentThread(); if (!cur.hasMonitor(o)) @@ -162,7 +162,7 @@ public Result eval(GreenDispatcher d) { public static void notify(final Object o, final boolean all) { invoke(new ThreadTask() { - public Result eval(GreenDispatcher d) { + public Result eval(GreenWorld d) { GreenThreadState cur = d.currentThread(); if (!cur.hasMonitor(o)) @@ -171,7 +171,7 @@ public Result eval(GreenDispatcher d) { // let other waiting threads come back to life for (GreenThreadState t : d.threads) { if (t.wait==o) { - d = d.with(t.withCond(Cond.NOTIFIED,o)); + d = d.with(t.withCond(Cond.NOTIFIED, o)); if (!all) break; } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java index bc67d1bc5..711aee8d7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java @@ -21,7 +21,7 @@ public GreenThreadCreation(GreenThread g, Block block) { this.block = block; } - public Result eval(GreenDispatcher d) { + public Result eval(GreenWorld d) { d = d.withNewThread(new GreenThreadState(g,block)); return new Result(d, new Outcome(g,null), false); } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java index f84c95821..02ffc6f1b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java @@ -28,7 +28,7 @@ final class GreenThreadState implements Serializable { final Next n; /** - * Unique ID among other {@link GreenThreadState}s in {@link GreenDispatcher} + * Unique ID among other {@link GreenThreadState}s in {@link GreenWorld} */ final GreenThread g; diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java similarity index 87% rename from src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java rename to src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java index f8978c039..f0cc00994 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenDispatcher.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java @@ -11,17 +11,18 @@ import java.io.Serializable; /** + * Immutable representation of the combined states of all {@link GreenThreadState}s. * * The whole thing has to be immutable because cloning {@link Continuable} is just shallow-copying its variables. * * @author Kohsuke Kawaguchi */ -class GreenDispatcher implements Serializable { +class GreenWorld implements Serializable { final GreenThreadState[] threads; private final int cur; private final Env e; - public GreenDispatcher(int cur, GreenThreadState... threads) { + public GreenWorld(int cur, GreenThreadState... threads) { this.threads = threads; this.cur = cur; this.e = new ProxyEnv(currentThread().n.e); @@ -31,17 +32,17 @@ GreenThreadState currentThread() { return threads[cur]; } - GreenDispatcher withNewThread(GreenThreadState s) { + GreenWorld withNewThread(GreenThreadState s) { GreenThreadState[] a = new GreenThreadState[threads.length+1]; System.arraycopy(threads,0,a,0, threads.length); a[threads.length] = s; - return new GreenDispatcher(cur,a); + return new GreenWorld(cur,a); } /** * Updates the thread state. If the thread is dead, it'll be removed. */ - GreenDispatcher with(GreenThreadState s) { + GreenWorld with(GreenThreadState s) { int idx = -1; for (int i = 0; i < threads.length; i++) { if (threads[i].g==s.g) { @@ -53,13 +54,13 @@ GreenDispatcher with(GreenThreadState s) { if (idx==-1) throw new IllegalStateException("No such thread: "+s.g); - GreenDispatcher d; + GreenWorld d; if (s.isDead()) { GreenThreadState[] a = new GreenThreadState[threads.length-1]; System.arraycopy(threads,0,a,0,idx); System.arraycopy(threads,idx+1,a,cur, threads.length-idx); - d = new GreenDispatcher(idx { /** * Next state of the world */ - final GreenDispatcher d; + final GreenWorld d; /** * value to be yielded or returned from suspension. */ @@ -25,7 +25,7 @@ class Result { */ final boolean suspend; - Result(GreenDispatcher d, Outcome value, boolean suspend) { + Result(GreenWorld d, Outcome value, boolean suspend) { this.d = d; this.value = value; this.suspend = suspend; From 690ad01b300530ce84eea49b642079a1e52369f5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 16:11:56 -0800 Subject: [PATCH 159/932] doc improvement --- src/main/java/com/cloudbees/groovy/cps/green/Monitor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/Monitor.java b/src/main/java/com/cloudbees/groovy/cps/green/Monitor.java index 62cdbb2d8..a3b6c7d56 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/Monitor.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/Monitor.java @@ -3,9 +3,10 @@ import java.io.Serializable; /** - * + * Stack of monitors that a thread currently owns. * * @author Kohsuke Kawaguchi + * @see GreenThreadState#monitor */ final class Monitor implements Serializable { /** From ac186a482d7a3963c0983078cea6ec6f9a0c8c9b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 16:15:40 -0800 Subject: [PATCH 160/932] pulling all of them into anonymous class --- .../groovy/cps/green/GreenThread.java | 26 ++++++++++------- .../groovy/cps/green/GreenThreadCreation.java | 28 ------------------- 2 files changed, 16 insertions(+), 38 deletions(-) delete mode 100644 src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java index 35414b268..efe6dbd17 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java @@ -34,9 +34,15 @@ public void start() { b = new ThrowBlock(new ConstantBlock(t)); } - Continuable.suspend(new GreenThreadCreation(this,b)); + final Block bb = b; + invoke(new ThreadTask() { + public Result eval(GreenWorld d) { + d = d.withNewThread(new GreenThreadState(GreenThread.this,bb)); + return new Result(d, new Outcome(GreenThread.this,null), false); + } + }); - // thus the code will neve reach here + // thus the code will never reach here throw new AssertionError(); } @@ -85,13 +91,14 @@ public Result eval(GreenWorld d) { // throw new AssertionError(); // } -// public static GreenThread currentThread() { -// return invoke(new ThreadTask() { -// public GreenThread eval(GreenWorld d) throws Throwable { -// return d.currentThread().g; -// } -// }); -// } + public static GreenThread currentThread() { + invoke(new ThreadTask() { + public Result eval(GreenWorld d) { + return new Result(d, new Outcome(d.currentThread().g,null), false); + } + }); + throw new AssertionError(); + } public static void monitorEnter(final Object o) { invoke(new ThreadTask() { @@ -109,7 +116,6 @@ public GreenWorld trans(GreenWorld d) { // no one else has a lock, so we acquire the lock and move on return d.with(cur.pushMonitor(o)); } - }); throw new AssertionError(); } diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java deleted file mode 100644 index 711aee8d7..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadCreation.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cloudbees.groovy.cps.green; - -import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.Continuable; -import com.cloudbees.groovy.cps.impl.Outcome; - -/** - * Pass in this value in {@link Continuable#suspend(Object)} to create a new green thread. - * - * A new thread will be created, and {@link Continuable#suspend(Object)} will return with - * the {@link GreenThreadState} object. - * - * @author Kohsuke Kawaguchi - */ -class GreenThreadCreation implements ThreadTask { - final GreenThread g; - final Block block; - - public GreenThreadCreation(GreenThread g, Block block) { - this.g = g; - this.block = block; - } - - public Result eval(GreenWorld d) { - d = d.withNewThread(new GreenThreadState(g,block)); - return new Result(d, new Outcome(g,null), false); - } -} From 392f67c8848e26eadc031766fa42e86d758a04c5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 16:16:07 -0800 Subject: [PATCH 161/932] Renaming to match with the new class name --- .../groovy/cps/green/GreenThread.java | 50 +++++++++---------- .../groovy/cps/green/ThreadTask.java | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java index efe6dbd17..c17283cad 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java @@ -36,9 +36,9 @@ public void start() { final Block bb = b; invoke(new ThreadTask() { - public Result eval(GreenWorld d) { - d = d.withNewThread(new GreenThreadState(GreenThread.this,bb)); - return new Result(d, new Outcome(GreenThread.this,null), false); + public Result eval(GreenWorld w) { + w = w.withNewThread(new GreenThreadState(GreenThread.this,bb)); + return new Result(w, new Outcome(GreenThread.this,null), false); } }); @@ -64,8 +64,8 @@ private GreenThreadState stateAt(GreenWorld d) { public boolean isAlive() { invoke(new ThreadTask() { - public Result eval(GreenWorld d) { - return new Result(d, new Outcome(!stateAt(d).isDead(),null), false); + public Result eval(GreenWorld w) { + return new Result(w, new Outcome(!stateAt(w).isDead(),null), false); } }); throw new AssertionError(); @@ -93,8 +93,8 @@ public Result eval(GreenWorld d) { public static GreenThread currentThread() { invoke(new ThreadTask() { - public Result eval(GreenWorld d) { - return new Result(d, new Outcome(d.currentThread().g,null), false); + public Result eval(GreenWorld w) { + return new Result(w, new Outcome(w.currentThread().g,null), false); } }); throw new AssertionError(); @@ -102,8 +102,8 @@ public Result eval(GreenWorld d) { public static void monitorEnter(final Object o) { invoke(new ThreadTask() { - public Result eval(GreenWorld d) { - return new Result(trans(d),null,false); + public Result eval(GreenWorld w) { + return new Result(trans(w),null,false); } public GreenWorld trans(GreenWorld d) { GreenThreadState cur = d.currentThread(); @@ -122,28 +122,28 @@ public GreenWorld trans(GreenWorld d) { public static void monitorLeave() { invoke(new ThreadTask() { - public Result eval(GreenWorld d) { - GreenThreadState cur = d.currentThread(); + public Result eval(GreenWorld w) { + GreenThreadState cur = w.currentThread(); final Object o = cur.monitor.o; // the current thread will release the monitor. - d = d.with(cur.popMonitor()); + w = w.with(cur.popMonitor()); // if another thread is waiting for this monitor, he gets one right away - for (GreenThreadState t : d.threads) { + for (GreenThreadState t : w.threads) { if (t.cond==Cond.MONITOR_ENTER && t.wait==o) { // give the lock to this thread - d = d.with(t.withCond(null,null).pushMonitor(o)); + w = w.with(t.withCond(null,null).pushMonitor(o)); break; } if (t.cond==Cond.NOTIFIED && t.wait==o) { // give the lock to this thread (but without new monitor) - d = d.with(t.withCond(null,null)); + w = w.with(t.withCond(null,null)); break; } } - return new Result(d,null,false); + return new Result(w,null,false); } }); throw new AssertionError(); @@ -151,16 +151,16 @@ public Result eval(GreenWorld d) { public static void wait(final Object o) { invoke(new ThreadTask() { - public Result eval(GreenWorld d) { - GreenThreadState cur = d.currentThread(); + public Result eval(GreenWorld w) { + GreenThreadState cur = w.currentThread(); if (!cur.hasMonitor(o)) throw new IllegalStateException("Thread doesn't have a lock of "+o); // wait for the notification to arrive - d = d.with(cur.withCond(Cond.WAIT, o)); + w = w.with(cur.withCond(Cond.WAIT, o)); - return new Result(d,null,false); + return new Result(w,null,false); } }); throw new AssertionError(); @@ -168,22 +168,22 @@ public Result eval(GreenWorld d) { public static void notify(final Object o, final boolean all) { invoke(new ThreadTask() { - public Result eval(GreenWorld d) { - GreenThreadState cur = d.currentThread(); + public Result eval(GreenWorld w) { + GreenThreadState cur = w.currentThread(); if (!cur.hasMonitor(o)) throw new IllegalStateException("Thread doesn't have a lock of "+o); // let other waiting threads come back to life - for (GreenThreadState t : d.threads) { + for (GreenThreadState t : w.threads) { if (t.wait==o) { - d = d.with(t.withCond(Cond.NOTIFIED, o)); + w = w.with(t.withCond(Cond.NOTIFIED, o)); if (!all) break; } } - return new Result(d,null,false); + return new Result(w,null,false); } }); throw new AssertionError(); diff --git a/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java b/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java index 88b18f003..648cce52c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java @@ -7,7 +7,7 @@ * @author Kohsuke Kawaguchi */ interface ThreadTask { - Result eval(GreenWorld d); + Result eval(GreenWorld w); } class Result { From 6ebb1d1eef2bd2cc2746114a51b66011fba8ee20 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 16:16:33 -0800 Subject: [PATCH 162/932] Renaming to match with the new class name --- .../java/com/cloudbees/groovy/cps/green/GreenThread.java | 8 ++++---- .../java/com/cloudbees/groovy/cps/green/GreenWorld.java | 2 +- .../java/com/cloudbees/groovy/cps/green/ThreadTask.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java index c17283cad..d6ae0f945 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java @@ -73,8 +73,8 @@ public Result eval(GreenWorld w) { // public boolean isDead() { // return invoke(new ThreadTask() { -// public Boolean eval(GreenWorld d) { -// return stateAt(d).isDead(); +// public Boolean eval(GreenWorld w) { +// return stateAt(w).isDead(); // } // }); // } @@ -82,8 +82,8 @@ public Result eval(GreenWorld w) { // // TODO: this is not very useful because it doesn't block for the completion // public Object getResult() throws InvocationTargetException { // Continuable.suspend(new ThreadTask() { -// public Object eval(GreenWorld d) throws Throwable { -// return d.resolveThreadState(id).getResult().replay(); +// public Object eval(GreenWorld w) throws Throwable { +// return w.resolveThreadState(id).getResult().replay(); // } // }); // diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java index f0cc00994..02890c3fe 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java @@ -113,7 +113,7 @@ Next update(GreenThreadState g) { ThreadTask task = (ThreadTask)y.getNormal(); Result r = task.eval(d); - d = r.d; + d = r.w; if (r.suspend) // yield the value, then come back to the current thread later return d.asNext(r.value); else diff --git a/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java b/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java index 648cce52c..8fd7e320f 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java @@ -14,7 +14,7 @@ class Result { /** * Next state of the world */ - final GreenWorld d; + final GreenWorld w; /** * value to be yielded or returned from suspension. */ @@ -25,8 +25,8 @@ class Result { */ final boolean suspend; - Result(GreenWorld d, Outcome value, boolean suspend) { - this.d = d; + Result(GreenWorld w, Outcome value, boolean suspend) { + this.w = w; this.value = value; this.suspend = suspend; } From 098d437247fbdce4a2370989f2acd7828e3837eb Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 16:19:22 -0800 Subject: [PATCH 163/932] handled double lock situation correctly --- .../groovy/cps/green/GreenThread.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java index d6ae0f945..51ace4f2a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java @@ -127,19 +127,26 @@ public Result eval(GreenWorld w) { final Object o = cur.monitor.o; // the current thread will release the monitor. - w = w.with(cur.popMonitor()); - - // if another thread is waiting for this monitor, he gets one right away - for (GreenThreadState t : w.threads) { - if (t.cond==Cond.MONITOR_ENTER && t.wait==o) { - // give the lock to this thread - w = w.with(t.withCond(null,null).pushMonitor(o)); - break; - } - if (t.cond==Cond.NOTIFIED && t.wait==o) { - // give the lock to this thread (but without new monitor) - w = w.with(t.withCond(null,null)); - break; + cur=cur.popMonitor(); + w = w.with(cur); + + if (!cur.hasMonitor(o)) { + // this thread has fully released a monitor. + // if another thread is waiting for this monitor, he gets one right away + OUTER: + for (GreenThreadState t : w.threads) { + if (t.wait==o) { + switch(t.cond) { + case MONITOR_ENTER: + // acquire a new monitor + w = w.with(t.withCond(null,null).pushMonitor(o)); + break OUTER; + case NOTIFIED: + // reacquire a monitor + w = w.with(t.withCond(null,null)); + break OUTER; + } + } } } From c1458c195ec12aba165749108229fae87e0c7518 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 17 Mar 2014 10:25:37 -0400 Subject: [PATCH 164/932] Typo. --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 816707c42..1bdf3a187 100644 --- a/pom.xml +++ b/pom.xml @@ -10,8 +10,7 @@ groovy-cps 1.0-SNAPSHOT - Groovy CPS Execcution - + Groovy CPS Execution UTF-8 From 0c33725171da176702b7ae083f795145cef1df6a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 21 Apr 2014 14:41:20 -0700 Subject: [PATCH 165/932] Bug fix. Continuable included the suspend value in its call stack local variable --- .../com/cloudbees/groovy/cps/Continuable.java | 8 ++--- .../groovy/cps/impl/SuspendBlock.java | 34 +++++++++++++++++++ .../groovy/cps/ContinuableTest.groovy | 21 ++++++++++++ 3 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 87c75a8b8..4886eb89c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -1,19 +1,15 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; -import com.cloudbees.groovy.cps.impl.CpsFunction; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import com.cloudbees.groovy.cps.impl.Outcome; -import com.cloudbees.groovy.cps.impl.ThrowBlock; -import com.cloudbees.groovy.cps.impl.YieldBlock; +import com.cloudbees.groovy.cps.impl.SuspendBlock; import groovy.lang.GroovyShell; import groovy.lang.Script; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.Arrays; /** * Mutable representation of the program. This is the primary API of the groovy-cps library to the outside. @@ -133,7 +129,7 @@ public boolean isResumable() { * will become the return value from this method to the CPS-transformed program. */ public static Object suspend(final Object v) { - throw new CpsCallableInvocation(new CpsFunction(Arrays.asList("v"), new YieldBlock(v)),null,v); + throw new CpsCallableInvocation(SuspendBlock.SUSPEND,null,v); } private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java new file mode 100644 index 000000000..fcc563a17 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java @@ -0,0 +1,34 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuable; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +import java.util.Arrays; + +/** + * Gets a value from local variable and removes it. + * + * @author Kohsuke Kawaguchi + * @see Continuable#suspend(Object) + */ +public class SuspendBlock implements Block { + private SuspendBlock() { + } + + public Next eval(Env e, final Continuation k) { + Object v = e.getLocalVariable("suspendValue"); + e.setLocalVariable("suspendValue",null); + + return Next.yield(v,e,k); + } + + private static final long serialVersionUID = 1L; + + /** + * CPS Definition of the {@link Continuable#suspend(Object)} method. + */ + public static final CpsFunction SUSPEND = new CpsFunction(Arrays.asList("suspendValue"),new SuspendBlock()); +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 974c94a37..b75004262 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -116,4 +116,25 @@ class ContinuableTest extends AbstractGroovyCpsTest { } public static class HelloException extends Exception {} + + /** + * Object passed to {@link Continuable#suspend(Object)} isn't accessible when Continuable + * resumes, so it shouldn't be a part of the persisted object graph. + */ + @Test + void yieldObjectShouldNotBeInObjectGraph() { + def s = csh.parse(""" + Continuable.suspend(new ContinuableTest.ThisObjectIsNotSerializable()); + """); + def c = new Continuable(s); + def r = c.run(null) + assert r instanceof ThisObjectIsNotSerializable; + + c = roundtripSerialization(c); + + assert c.isResumable() + assert c.run(42)==42; + } + + public static class ThisObjectIsNotSerializable {} } From 20daf4a165fd0e21f10f692e3885d32d7c6dec2d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 21 Apr 2014 17:05:19 -0700 Subject: [PATCH 166/932] Implemented transformation for the assert statement --- .../groovy/cps/CpsTransformer.groovy | 14 ++++- .../com/cloudbees/groovy/cps/Builder.java | 10 +++- .../groovy/cps/impl/AssertBlock.java | 60 +++++++++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 28 +++++++++ 4 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 85e3b357f..19c24635a 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -9,8 +9,10 @@ import org.codehaus.groovy.classgen.BytecodeExpression import org.codehaus.groovy.classgen.GeneratorContext import org.codehaus.groovy.classgen.Verifier import org.codehaus.groovy.control.CompilePhase +import org.codehaus.groovy.control.Janitor import org.codehaus.groovy.control.SourceUnit import org.codehaus.groovy.control.customizers.CompilationCustomizer +import org.codehaus.groovy.runtime.powerassert.SourceText import java.lang.annotation.Annotation import java.lang.reflect.Modifier @@ -64,6 +66,7 @@ import static org.codehaus.groovy.syntax.Types.* */ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor { private int iota=0; + private SourceUnit sourceUnit; CpsTransformer() { super(CompilePhase.CANONICALIZATION) @@ -71,6 +74,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor @Override void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { + this.sourceUnit = source; source.ast.methods?.each { visitMethod(it) } // classNode?.declaredConstructors?.each { visitMethod(it) } // can't transform constructor classNode?.methods?.each { visitMethod(it) } @@ -315,7 +319,15 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitAssertStatement(AssertStatement statement) { - throw new UnsupportedOperationException(); + def j = new Janitor() + def text = new SourceText(statement, sourceUnit, j).normalizedText + j.cleanup() + + makeNode("assert_") { + visit(statement.booleanExpression) + visit(statement.messageExpression) + literal(text) + } } void visitTryCatchFinally(TryCatchStatement stmt) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 1e06b9f0a..ef9e49ea7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.AssertBlock; import com.cloudbees.groovy.cps.impl.AssignmentBlock; import com.cloudbees.groovy.cps.impl.BlockScopedBlock; import com.cloudbees.groovy.cps.impl.BreakBlock; @@ -25,7 +26,6 @@ import com.cloudbees.groovy.cps.impl.WhileBlock; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; -import java.util.Arrays; import java.util.List; import static com.cloudbees.groovy.cps.Block.*; @@ -403,6 +403,14 @@ public Block list(Block... args) { return new ListBlock(args); } + public Block assert_(Block cond, Block msg, String sourceText) { + return new AssertBlock(cond,msg,sourceText); + } + + public Block assert_(Block cond, String sourceText) { + return assert_(cond,null_(),sourceText); + } + /** * Used for building AST from transformed code. */ diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java new file mode 100644 index 000000000..ab845ff9d --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java @@ -0,0 +1,60 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; + +/** + * assert exp : msg; + * + * @author Kohsuke Kawaguchi + */ +public class AssertBlock implements Block { + final Block cond,msg; + final String sourceText; + + public AssertBlock(Block cond, Block msg, String sourceText) { + this.cond = cond; + this.msg = msg; + this.sourceText = sourceText; + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).then(cond,e,jump); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next jump(Object cond) { + if (asBoolean(cond)) + return k.receive(null); + else + return then(msg, e, fail); + } + + public Next fail(Object msg) { + try { + ScriptBytecodeAdapter.assertFailed(sourceText, msg); + throw new IllegalStateException(); // assertFailed will throw an exception + } catch (Throwable t) { + return e.getExceptionHandler(t.getClass()).receive(t); + } + } + + private static final long serialVersionUID = 1L; + } + + static final ContinuationPtr jump = new ContinuationPtr(ContinuationImpl.class,"jump"); + static final ContinuationPtr fail = new ContinuationPtr(ContinuationImpl.class,"fail"); + + private static final long serialVersionUID = 1L; +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 00e1db3c6..cd1105d41 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -276,4 +276,32 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { cx = roundtripSerialization(cx) assert 10==cx.run(null) } + + @Test + void assertion() { + // when assertion passes + assert evalCPS(""" + assert true + assert true : "message" + return 3; + """)==3 + + try { + evalCPS(""" + assert 1+2 == ((4)); + """) + fail(); + } catch (AssertionError e) { + assert e.message.contains("1+2 == ((4))") + } + + try { + evalCPS(""" + assert (1+2) == 4 : "with message"; + """) + fail(); + } catch (AssertionError e) { + assert e.message=="with message. Expression: assert (1+2) == 4 : \"with message\"" + } + } } From 074c10f3ebaa791eef0fbd139f9ab05da3a44b74 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 21 Apr 2014 17:10:00 -0700 Subject: [PATCH 167/932] avoid serializable anonymous class --- .../groovy/cps/impl/LocalVariableBlock.java | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java index ca5a2c191..4d6a07598 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java @@ -19,16 +19,26 @@ public LocalVariableBlock(String name) { } public Next evalLValue(final Env e, Continuation k) { - return k.receive(new LValue() { - public Next get(Continuation k) { - return k.receive(e.getLocalVariable(name)); - } - - public Next set(Object v, Continuation k) { - e.setLocalVariable(name,v); - return k.receive(null); - } - }); + return k.receive(new LocalVariable(e)); + } + + class LocalVariable implements LValue { + private final Env e; + + LocalVariable(Env e) { + this.e = e; + } + + public Next get(Continuation k) { + return k.receive(e.getLocalVariable(name)); + } + + public Next set(Object v, Continuation k) { + e.setLocalVariable(name,v); + return k.receive(null); + } + + private static final long serialVersionUID = 1L; } private static final long serialVersionUID = 1L; From 6ca54b65c2aa1e54e59c2e42a750eef83377a35b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 21 Apr 2014 17:10:39 -0700 Subject: [PATCH 168/932] LValue gets captured into continuation, so needs to be serializable --- src/main/java/com/cloudbees/groovy/cps/LValue.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/LValue.java b/src/main/java/com/cloudbees/groovy/cps/LValue.java index 1cc9644eb..42fbc4824 100644 --- a/src/main/java/com/cloudbees/groovy/cps/LValue.java +++ b/src/main/java/com/cloudbees/groovy/cps/LValue.java @@ -1,5 +1,7 @@ package com.cloudbees.groovy.cps; +import java.io.Serializable; + /** * Represents a variable that's assignable, which is produced * by evaluating {@link LValueBlock}, such as "x[y]" @@ -7,7 +9,7 @@ * * @author Kohsuke Kawaguchi */ -public interface LValue { +public interface LValue extends Serializable { /** * Computes the value, and passes it to the given continuation when done. * From e6ab47c8461d29207a6e0d692c520f1af4a18807 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 21 Apr 2014 17:21:26 -0700 Subject: [PATCH 169/932] Promoting this to the exposed part of the API to use it with Continuable --- .../java/com/cloudbees/groovy/cps/Continuable.java | 1 - src/main/java/com/cloudbees/groovy/cps/Next.java | 2 -- .../com/cloudbees/groovy/cps/{impl => }/Outcome.java | 10 ++++------ .../com/cloudbees/groovy/cps/green/GreenThread.java | 2 +- .../cloudbees/groovy/cps/green/GreenThreadState.java | 2 +- .../com/cloudbees/groovy/cps/green/GreenWorld.java | 2 +- .../com/cloudbees/groovy/cps/green/ThreadTask.java | 2 +- 7 files changed, 8 insertions(+), 13 deletions(-) rename src/main/java/com/cloudbees/groovy/cps/{impl => }/Outcome.java (89%) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 4886eb89c..2b855a874 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -2,7 +2,6 @@ import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; -import com.cloudbees.groovy.cps.impl.Outcome; import com.cloudbees.groovy.cps.impl.SuspendBlock; import groovy.lang.GroovyShell; import groovy.lang.Script; diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 30ef1eea3..2f5c22f42 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,7 +1,5 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.Outcome; - import java.io.Serializable; /** diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java b/src/main/java/com/cloudbees/groovy/cps/Outcome.java similarity index 89% rename from src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java rename to src/main/java/com/cloudbees/groovy/cps/Outcome.java index 2b5b6b67e..38608f7ba 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/Outcome.java +++ b/src/main/java/com/cloudbees/groovy/cps/Outcome.java @@ -1,14 +1,12 @@ -package com.cloudbees.groovy.cps.impl; +package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.Continuation; -import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.Next; +import com.cloudbees.groovy.cps.impl.ConstantBlock; +import com.cloudbees.groovy.cps.impl.ThrowBlock; import java.lang.reflect.InvocationTargetException; /** - * Result of the evaluation. + * Result of an evaluation. * * Either represents a value in case of a normal return, or a throwable object in case of abnormal return. * Note that both fields can be null, in which case it means a normal return of the value 'null'. diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java index 51ace4f2a..25eb003ee 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java @@ -4,7 +4,7 @@ import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; -import com.cloudbees.groovy.cps.impl.Outcome; +import com.cloudbees.groovy.cps.Outcome; import com.cloudbees.groovy.cps.impl.ThrowBlock; /** diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java index 02ffc6f1b..d8224de67 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java @@ -5,7 +5,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Next; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; -import com.cloudbees.groovy.cps.impl.Outcome; +import com.cloudbees.groovy.cps.Outcome; import java.io.Serializable; diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java index 02890c3fe..208cc9cf8 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java @@ -5,7 +5,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import com.cloudbees.groovy.cps.impl.Outcome; +import com.cloudbees.groovy.cps.Outcome; import com.cloudbees.groovy.cps.impl.ProxyEnv; import java.io.Serializable; diff --git a/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java b/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java index 8fd7e320f..14d59a9d7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java @@ -1,7 +1,7 @@ package com.cloudbees.groovy.cps.green; import com.cloudbees.groovy.cps.Continuable; -import com.cloudbees.groovy.cps.impl.Outcome; +import com.cloudbees.groovy.cps.Outcome; /** * @author Kohsuke Kawaguchi From a63cfa3fa0f54f41a666be9cee0eed9e92adfd99 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 21 Apr 2014 17:22:50 -0700 Subject: [PATCH 170/932] Exposing this --- src/main/java/com/cloudbees/groovy/cps/Continuable.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 2b855a874..591e0a912 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -97,7 +97,11 @@ public Object runByThrow(Throwable arg) throws InvocationTargetException { return run0(new Outcome(null,arg)); } - private Object run0(Outcome cn) throws InvocationTargetException { + /** + * Resumes this program by either returning the value from {@link Continuable#suspend(Object)} or + * throwing an exception + */ + public Object run0(Outcome cn) throws InvocationTargetException { Next n = cn.resumeFrom(e,k); n = n.run(); From 888d36d9e05a963af730b347b27754e3fc92109d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 21 Apr 2014 17:24:04 -0700 Subject: [PATCH 171/932] Added toString() for diagnosability --- src/main/java/com/cloudbees/groovy/cps/Outcome.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/Outcome.java b/src/main/java/com/cloudbees/groovy/cps/Outcome.java index 38608f7ba..c0389b978 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Outcome.java +++ b/src/main/java/com/cloudbees/groovy/cps/Outcome.java @@ -67,4 +67,10 @@ public Next resumeFrom(Env e, Continuation k) { // return new ConstantBlock(normal); // } // } + + @Override + public String toString() { + if (abnormal!=null) return "abnormal["+abnormal+']'; + else return "normal["+normal+']'; + } } From 36f8e8ef09bc4ceb03d469e3448477a5f94296e1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 21 Apr 2014 22:17:51 -0700 Subject: [PATCH 172/932] More convenience methods --- src/main/java/com/cloudbees/groovy/cps/Outcome.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/Outcome.java b/src/main/java/com/cloudbees/groovy/cps/Outcome.java index c0389b978..b935a181d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Outcome.java +++ b/src/main/java/com/cloudbees/groovy/cps/Outcome.java @@ -48,6 +48,14 @@ public Throwable getAbnormal() { return abnormal; } + public boolean isSuccess() { + return abnormal==null; + } + + public boolean isFailure() { + return abnormal!=null; + } + public Next resumeFrom(Env e, Continuation k) { if (abnormal!=null) { // resume program by throwing this exception From 35f386de67fad174d9a95cd624e4ccef3d023b03 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 21 Apr 2014 22:23:14 -0700 Subject: [PATCH 173/932] keeping run0 from Outcome to Outcome --- src/main/java/com/cloudbees/groovy/cps/Continuable.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 591e0a912..2bc859b33 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -90,18 +90,18 @@ public Continuable fork() { * if the program threw an exception that it didn't handle by itself. */ public Object run(Object arg) throws InvocationTargetException { - return run0(new Outcome(arg,null)); + return run0(new Outcome(arg,null)).wrapReplay(); } public Object runByThrow(Throwable arg) throws InvocationTargetException { - return run0(new Outcome(null,arg)); + return run0(new Outcome(null,arg)).wrapReplay(); } /** * Resumes this program by either returning the value from {@link Continuable#suspend(Object)} or * throwing an exception */ - public Object run0(Outcome cn) throws InvocationTargetException { + public Outcome run0(Outcome cn) { Next n = cn.resumeFrom(e,k); n = n.run(); @@ -109,7 +109,7 @@ public Object run0(Outcome cn) throws InvocationTargetException { e = n.e; k = n.k; - return n.yield.wrapReplay(); + return n.yield; } /** From d973cdc65ceb210403e4a2a532f5b9abf207a714 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 22 Apr 2014 13:27:55 -0700 Subject: [PATCH 174/932] Should be serializable --- src/main/java/com/cloudbees/groovy/cps/Outcome.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Outcome.java b/src/main/java/com/cloudbees/groovy/cps/Outcome.java index b935a181d..b10112a7c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Outcome.java +++ b/src/main/java/com/cloudbees/groovy/cps/Outcome.java @@ -3,6 +3,7 @@ import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.ThrowBlock; +import java.io.Serializable; import java.lang.reflect.InvocationTargetException; /** @@ -13,7 +14,7 @@ * * @author Kohsuke Kawaguchi */ -public final class Outcome { +public final class Outcome implements Serializable { private final Object normal; private final Throwable abnormal; @@ -81,4 +82,6 @@ public String toString() { if (abnormal!=null) return "abnormal["+abnormal+']'; else return "normal["+normal+']'; } + + private static final long serialVersionUID = 1L; } From 327b09abc61287e3f341c02b63b7dab248fd4529 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 22 Apr 2014 18:01:06 -0700 Subject: [PATCH 175/932] doc improvement --- src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java index 28643fa23..1e41801c4 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java @@ -8,6 +8,8 @@ import java.util.List; /** + * Represents an invokable CPS-transformed closure. + * * @author Kohsuke Kawaguchi */ class CpsClosureDef extends CpsCallable { From 5be59b47e3211986f0cf1b8406747713af173951 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 22 Apr 2014 18:02:27 -0700 Subject: [PATCH 176/932] All of these need to be serializable. ClosureCallEnv refers to CpsClosure, which in turn refers to CpsClosureDef. --- .../java/com/cloudbees/groovy/cps/impl/CpsCallable.java | 6 ++++-- src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/CpsFunction.java | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java index 69be29980..63ca314cc 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java @@ -5,8 +5,8 @@ import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; import com.google.common.collect.ImmutableList; -import groovy.lang.Closure; +import java.io.Serializable; import java.util.List; /** @@ -14,7 +14,7 @@ * * @author Kohsuke Kawaguchi */ -public abstract class CpsCallable { +public abstract class CpsCallable implements Serializable { final Block body; final ImmutableList parameters; @@ -45,4 +45,6 @@ protected final void assignArguments(List args, Env e) { e.setLocalVariable(parameters.get(i), args.get(i)); } } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java index e05498e8b..96984b2bd 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java @@ -35,4 +35,6 @@ public Object call(Object... args) { public Object call(Object arguments) { throw new CpsCallableInvocation(def,this,arguments); } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java index 1e41801c4..f19c0c1b9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java @@ -36,4 +36,6 @@ Next invoke(Env caller, Object receiver, List args, Continuation k) { return new Next(body, e, k); } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java index 1ca48608d..d7565f127 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java @@ -22,4 +22,6 @@ public Next invoke(Env caller, Object receiver, List args, Continuation k) { assignArguments(args,e); return new Next(body, e, k); } + + private static final long serialVersionUID = 1L; } From 630b2814ca8c382f7fa51d96f85c38a72f14ae56 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 8 Mar 2014 16:21:27 -0800 Subject: [PATCH 177/932] noting TODO --- TODO.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/TODO.txt b/TODO.txt index da07ab0b2..e814349ed 100644 --- a/TODO.txt +++ b/TODO.txt @@ -6,4 +6,7 @@ Tests to be written: - verify a proper method overload resolution - - trying to make constructor a workflow should be detected and rejected \ No newline at end of file + - trying to make constructor a workflow should be detected and rejected + +Multi-threading TODO +- how to suspend just one thread while letting other threads run \ No newline at end of file From cff8df8806b16754d134e7e66160316e42710891 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 28 Apr 2014 19:40:09 -0700 Subject: [PATCH 178/932] Started implementing source location tracking --- TODO.txt | 12 +- .../groovy/cps/CpsTransformer.groovy | 67 ++++++- .../com/cloudbees/groovy/cps/Builder.java | 164 ++++++++++-------- .../com/cloudbees/groovy/cps/Continuable.java | 4 +- .../java/com/cloudbees/groovy/cps/Env.java | 6 + .../cloudbees/groovy/cps/MethodLocation.java | 46 +++++ .../groovy/cps/green/GreenThreadState.java | 2 +- .../groovy/cps/impl/AssignmentBlock.java | 7 +- .../cloudbees/groovy/cps/impl/CallEnv.java | 18 +- .../groovy/cps/impl/ClosureCallEnv.java | 4 +- .../groovy/cps/impl/ContinuationGroup.java | 9 +- .../groovy/cps/impl/CpsCallable.java | 7 +- .../cps/impl/CpsCallableInvocation.java | 6 +- .../groovy/cps/impl/CpsClosureDef.java | 4 +- .../groovy/cps/impl/CpsFunction.java | 4 +- .../cps/impl/ExcrementOperatorBlock.java | 7 +- .../groovy/cps/impl/FunctionCallBlock.java | 9 +- .../groovy/cps/impl/FunctionCallEnv.java | 4 +- .../groovy/cps/impl/PropertyAccessBlock.java | 6 +- .../cloudbees/groovy/cps/impl/ProxyEnv.java | 6 + .../groovy/cps/impl/SourceLocation.java | 26 +++ .../groovy/cps/AbstractGroovyCpsTest.groovy | 2 +- .../groovy/cps/CpsTransformerTest.groovy | 2 +- .../com/cloudbees/groovy/cps/BasicTest.java | 80 ++++----- test.groovy | 4 + 25 files changed, 352 insertions(+), 154 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/MethodLocation.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java diff --git a/TODO.txt b/TODO.txt index e814349ed..5758ad1bd 100644 --- a/TODO.txt +++ b/TODO.txt @@ -9,4 +9,14 @@ Tests to be written: - trying to make constructor a workflow should be detected and rejected Multi-threading TODO -- how to suspend just one thread while letting other threads run \ No newline at end of file +- how to suspend just one thread while letting other threads run + + +----------- +How to set source location info in builder + - explicit call parameter on each method + -> becomes tedious to use for manual AST building + - set the provider to Builder + -> needs to build each tree with fresh builder + - decorate the AST after build + -> \ No newline at end of file diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 19c24635a..a6d982539 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -13,6 +13,8 @@ import org.codehaus.groovy.control.Janitor import org.codehaus.groovy.control.SourceUnit import org.codehaus.groovy.control.customizers.CompilationCustomizer import org.codehaus.groovy.runtime.powerassert.SourceText +import org.codehaus.groovy.syntax.Token +import org.codehaus.groovy.syntax.Types import java.lang.annotation.Annotation import java.lang.reflect.Modifier @@ -75,9 +77,9 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor @Override void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { this.sourceUnit = source; - source.ast.methods?.each { visitMethod(it) } + copy(source.ast.methods)?.each { visitMethod(it) } // classNode?.declaredConstructors?.each { visitMethod(it) } // can't transform constructor - classNode?.methods?.each { visitMethod(it) } + copy(classNode?.methods)?.each { visitMethod(it) } // classNode?.objectInitializerStatements?.each { it.visit(visitor) } // classNode?.fields?.each { visitor.visitField(it) } @@ -92,6 +94,11 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor new ConstantExpression(0L)); } + private List copy(List t) { + if (t==null) return t; + else return new ArrayList(t); + } + /** * Should this method be transformed? */ @@ -134,7 +141,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor if (!shouldBeTransformed(m)) return; - def body; + Expression body; // transform the body parent = { e -> body=e } @@ -143,8 +150,33 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor def params = new ListExpression(); m.parameters.each { params.addExpression(new ConstantExpression(it.name))} - def f = m.declaringClass.addField("___cps___${iota++}", Modifier.STATIC|Modifier.STATIC, FUNCTION_TYPE, - new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body))); + /* + CpsFunction ___cps___N() { + Builder b = new Builder(new MethodLocation(...)); + return new CpsFunction( << parameters >>, << body: AST tree building code >>); + } + */ + + def cpsName = "___cps___${iota++}" + + m.declaringClass.addMethod(cpsName, PRIVATE_STATIC_FINAL, FUNCTION_TYPE, new Parameter[0], new ClassNode[0], + new BlockStatement([ + new ExpressionStatement(new DeclarationExpression(BUILDER, new Token(ASSIGN, "=", -1, -1), + new ConstructorCallExpression(BUIDER_TYPE, new TupleExpression( + new ConstructorCallExpression(METHOD_LOCATION_TYPE, new TupleExpression( + new ConstantExpression(m.declaringClass.name), + new ConstantExpression(m.name), + new ConstantExpression(sourceUnit.name) + )) + )))), + new ReturnStatement(new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body))) + ], new VariableScope()) + ) + + def f = m.declaringClass.addField(cpsName, PRIVATE_STATIC_FINAL, FUNCTION_TYPE, + new StaticMethodCallExpression(m.declaringClass, cpsName, new TupleExpression())); +// new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body))); + def args = new TupleExpression(new VariableExpression(f), THIS); m.parameters.each { args.addExpression(new VariableExpression(it)) } @@ -227,6 +259,10 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor makeNode(methodName,null) } + private void loc(Expression e) { + literal(e.lineNumber); + } + /** * Used in the closure block of {@link #makeNode(String, Object)} to create a literal string argument. */ @@ -238,6 +274,10 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor parent(new ClassExpression(c)) } + private void literal(int n) { + parent(new ConstantExpression(n,true)) + } + void visitEmptyExpression(EmptyExpression e) { makeNode("noop") } @@ -248,6 +288,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor void visitMethodCallExpression(MethodCallExpression call) { makeNode("functionCall") { + loc(call) visit(call.objectExpression); // TODO: spread & safe visit(call.method); @@ -378,6 +419,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor void visitConstructorCallExpression(ConstructorCallExpression call) { makeNode("new_") { + loc(call) literal(call.type) visit(((TupleExpression)call.arguments).expressions) } @@ -420,6 +462,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor */ void visitBinaryExpression(BinaryExpression exp) { def body = {// for building CPS tree for two expressions + loc(exp) visit(exp.leftExpression) visit(exp.rightExpression) } @@ -526,12 +569,14 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor void visitPrefixExpression(PrefixExpression exp) { makeNode("prefix"+ prepostfixOperatorSuffix(exp)) { + loc(exp) visit(exp.expression) } } void visitPostfixExpression(PostfixExpression exp) { makeNode("postfix"+ prepostfixOperatorSuffix(exp)) { + loc(exp) visit(exp.expression) } } @@ -598,6 +643,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor void visitPropertyExpression(PropertyExpression exp) { // TODO: spread and safe makeNode("property") { + loc(exp) visit(exp.objectExpression) visit(exp.property) } @@ -635,6 +681,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor || ref instanceof PropertyNode || ref instanceof FieldNode) { makeNode("property") { + loc(exp) makeNode("this_") literal(exp.name) } @@ -659,11 +706,13 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor makeNode("sequence") { for (VariableExpression v in exp.tupleExpression.expressions) { makeNode("declareVariable") { + loc(exp) literal(v.type) literal(v.name) } } makeNode("assign") { + loc(exp) visit(exp.leftExpression) visit(exp.rightExpression) } @@ -672,6 +721,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor // def x=v; makeNode("declareVariable") { def v = exp.variableExpression + loc(exp) literal(v.type) literal(v.name) visit(exp.rightExpression) // this will not produce anything if this is EmptyExpression @@ -732,11 +782,16 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor private static final ClassNode BUILDER_TYPE = ClassHelper.makeCached(Builder.class); private static final ClassNode CPSCALLINVK_TYPE = ClassHelper.makeCached(CpsCallableInvocation.class); private static final ClassNode WORKFLOW_TRANSFORMED_TYPE = ClassHelper.makeCached(WorkflowTransformed.class); - private static final PropertyExpression BUILDER = new PropertyExpression(new ClassExpression(BUILDER_TYPE), "INSTANCE") + private static final ClassNode BUIDER_TYPE = ClassHelper.makeCached(Builder.class); + private static final ClassNode METHOD_LOCATION_TYPE = ClassHelper.makeCached(MethodLocation.class); + + private static final VariableExpression BUILDER = new VariableExpression("b",BUILDER_TYPE); // new PropertyExpression(new ClassExpression(BUILDER_TYPE), "INSTANCE") private static final VariableExpression THIS = new VariableExpression("this"); /** * Closure's default "it" parameter. */ private static final Parameter IT = new Parameter(ClassHelper.OBJECT_TYPE, "it", ConstantExpression.NULL); + + private static final int PRIVATE_STATIC_FINAL = Modifier.STATIC | Modifier.PRIVATE | Modifier.FINAL } diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index ef9e49ea7..ebe28c601 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -20,10 +20,12 @@ import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; import com.cloudbees.groovy.cps.impl.ReturnBlock; import com.cloudbees.groovy.cps.impl.SequenceBlock; +import com.cloudbees.groovy.cps.impl.SourceLocation; import com.cloudbees.groovy.cps.impl.ThrowBlock; import com.cloudbees.groovy.cps.impl.TryCatchBlock; import com.cloudbees.groovy.cps.impl.VariableDeclBlock; import com.cloudbees.groovy.cps.impl.WhileBlock; +import groovy.lang.Closure; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import java.util.List; @@ -39,6 +41,20 @@ * @author Kohsuke Kawaguchi */ public class Builder { + private MethodLocation loc; + + public Builder(MethodLocation loc) { + this.loc = loc; + } + + /** + * Evaluate the given closure by passing this object as an argument. + * Used to bind literal Builder to a local variable. + */ + public Object with(Closure c) { + return c.call(this); + } + private static final Block NULL = new ConstantBlock(null); private static final LValueBlock THIS = new LocalVariableBlock("this"); @@ -124,18 +140,18 @@ public LValueBlock localVariable(String name) { return new LocalVariableBlock(name); } - public Block setLocalVariable(final String name, final Block rhs) { - return assign(localVariable(name),rhs); + public Block setLocalVariable(int line, final String name, final Block rhs) { + return assign(line,localVariable(name),rhs); } public Block declareVariable(final Class type, final String name) { return new VariableDeclBlock(type, name); } - public Block declareVariable(Class type, String name, Block init) { + public Block declareVariable(int line, Class type, String name, Block init) { return sequence( declareVariable(type,name), - setLocalVariable(name, init)); + setLocalVariable(line,name, init)); } public Block this_() { @@ -145,8 +161,8 @@ public Block this_() { /** * Assignment operator to a local variable, such as "x += 3" */ - public Block localVariableAssignOp(String name, String operator, Block rhs) { - return setLocalVariable(name, functionCall(localVariable(name), operator, rhs)); + public Block localVariableAssignOp(int line, String name, String operator, Block rhs) { + return setLocalVariable(line, name, functionCall(line, localVariable(name), operator, rhs)); } /** @@ -229,68 +245,68 @@ public Block map(List blocks) { return map(blocks.toArray(new Block[blocks.size()])); } - public Block staticCall(Class lhs, String name, Block... argExps) { - return functionCall(constant(lhs),name,argExps); + public Block staticCall(int line, Class lhs, String name, Block... argExps) { + return functionCall(line,constant(lhs),name,argExps); } - public Block plus(Block lhs, Block rhs) { - return functionCall(lhs,"plus",rhs); + public Block plus(int line, Block lhs, Block rhs) { + return functionCall(line,lhs,"plus",rhs); } - public Block plusEqual(LValueBlock lhs, Block rhs) { - return new AssignmentBlock(lhs,rhs, "plus"); + public Block plusEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs,rhs, "plus"); } - public Block minus(Block lhs, Block rhs) { - return functionCall(lhs,"minus",rhs); + public Block minus(int line, Block lhs, Block rhs) { + return functionCall(line,lhs,"minus",rhs); } - public Block multiply(Block lhs, Block rhs) { - return functionCall(lhs,"multiply",rhs); + public Block multiply(int line, Block lhs, Block rhs) { + return functionCall(line,lhs,"multiply",rhs); } - public Block div(Block lhs, Block rhs) { - return functionCall(lhs,"div",rhs); + public Block div(int line, Block lhs, Block rhs) { + return functionCall(line,lhs,"div",rhs); } - public Block intdiv(Block lhs, Block rhs) { - return functionCall(lhs,"intdiv",rhs); + public Block intdiv(int line, Block lhs, Block rhs) { + return functionCall(line,lhs,"intdiv",rhs); } - public Block mod(Block lhs, Block rhs) { - return functionCall(lhs,"mod",rhs); + public Block mod(int line, Block lhs, Block rhs) { + return functionCall(line,lhs,"mod",rhs); } - public Block power(Block lhs, Block rhs) { - return functionCall(lhs, "power", rhs); + public Block power(int line, Block lhs, Block rhs) { + return functionCall(line,lhs, "power", rhs); } - public Block compareEqual(Block lhs, Block rhs) { - return staticCall(ScriptBytecodeAdapter.class, "compareEqual", lhs, rhs); + public Block compareEqual(int line, Block lhs, Block rhs) { + return staticCall(line,ScriptBytecodeAdapter.class, "compareEqual", lhs, rhs); } - public Block compareNotEqual(Block lhs, Block rhs) { - return staticCall(ScriptBytecodeAdapter.class, "compareNotEqual", lhs, rhs); + public Block compareNotEqual(int line, Block lhs, Block rhs) { + return staticCall(line,ScriptBytecodeAdapter.class, "compareNotEqual", lhs, rhs); } - public Block compareTo(Block lhs, Block rhs) { - return staticCall(ScriptBytecodeAdapter.class,"compareTo",lhs,rhs); + public Block compareTo(int line, Block lhs, Block rhs) { + return staticCall(line,ScriptBytecodeAdapter.class,"compareTo",lhs,rhs); } - public Block lessThan(Block lhs, Block rhs) { - return staticCall(ScriptBytecodeAdapter.class,"compareLessThan",lhs,rhs); + public Block lessThan(int line, Block lhs, Block rhs) { + return staticCall(line,ScriptBytecodeAdapter.class,"compareLessThan",lhs,rhs); } - public Block lessThanEqual(Block lhs, Block rhs) { - return staticCall(ScriptBytecodeAdapter.class,"compareLessThanEqual",lhs,rhs); + public Block lessThanEqual(int line, Block lhs, Block rhs) { + return staticCall(line,ScriptBytecodeAdapter.class,"compareLessThanEqual",lhs,rhs); } - public Block greaterThan(Block lhs, Block rhs) { - return staticCall(ScriptBytecodeAdapter.class,"compareGreaterThan",lhs,rhs); + public Block greaterThan(int line, Block lhs, Block rhs) { + return staticCall(line,ScriptBytecodeAdapter.class,"compareGreaterThan",lhs,rhs); } - public Block greaterThanEqual(Block lhs, Block rhs) { - return staticCall(ScriptBytecodeAdapter.class,"compareGreaterThanEqual",lhs,rhs); + public Block greaterThanEqual(int line, Block lhs, Block rhs) { + return staticCall(line,ScriptBytecodeAdapter.class,"compareGreaterThanEqual",lhs,rhs); } /** @@ -307,86 +323,86 @@ public Block logicalOr(Block lhs, Block rhs) { return new LogicalOpBlock(lhs,rhs,false); } - public Block bitwiseAnd(Block lhs, Block rhs) { - return functionCall(lhs,"and",rhs); + public Block bitwiseAnd(int line, Block lhs, Block rhs) { + return functionCall(line,lhs,"and",rhs); } - public Block bitwiseOr(Block lhs, Block rhs) { - return functionCall(lhs,"or",rhs); + public Block bitwiseOr(int line, Block lhs, Block rhs) { + return functionCall(line,lhs,"or",rhs); } - public Block bitwiseXor(Block lhs, Block rhs) { - return functionCall(lhs,"xor",rhs); + public Block bitwiseXor(int line, Block lhs, Block rhs) { + return functionCall(line,lhs,"xor",rhs); } /** * ++x */ - public Block prefixInc(LValueBlock body) { - return new ExcrementOperatorBlock("next",true,body); + public Block prefixInc(int line, LValueBlock body) { + return new ExcrementOperatorBlock(loc(line),"next",true,body); } /** * --x */ - public Block prefixDec(LValueBlock body) { - return new ExcrementOperatorBlock("previous",true,body); + public Block prefixDec(int line, LValueBlock body) { + return new ExcrementOperatorBlock(loc(line),"previous",true,body); } /** * x++ */ - public Block postfixInc(LValueBlock body) { - return new ExcrementOperatorBlock("next",false,body); + public Block postfixInc(int line, LValueBlock body) { + return new ExcrementOperatorBlock(loc(line),"next",false,body); } /** * x-- */ - public Block postfixDec(LValueBlock body) { - return new ExcrementOperatorBlock("previous",false,body); + public Block postfixDec(int line, LValueBlock body) { + return new ExcrementOperatorBlock(loc(line),"previous",false,body); } /** * LHS.name(...) */ - public Block functionCall(Block lhs, String name, Block... argExps) { - return new FunctionCallBlock(lhs,constant(name),argExps); + public Block functionCall(int line, Block lhs, String name, Block... argExps) { + return new FunctionCallBlock(loc(line),lhs,constant(name),argExps); } - public Block functionCall(Block lhs, Block name, Block... argExps) { - return new FunctionCallBlock(lhs,name,argExps); + public Block functionCall(int line, Block lhs, Block name, Block... argExps) { + return new FunctionCallBlock(loc(line),lhs,name,argExps); } - public Block assign(LValueBlock lhs, Block rhs) { - return new AssignmentBlock(lhs,rhs, null); + public Block assign(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line),lhs,rhs, null); } - public LValueBlock property(Block lhs, String property) { - return property(lhs, constant(property)); + public LValueBlock property(int line, Block lhs, String property) { + return property(line, lhs, constant(property)); } - public LValueBlock property(Block lhs, Block property) { - return new PropertyAccessBlock(lhs,property); + public LValueBlock property(int line, Block lhs, Block property) { + return new PropertyAccessBlock(loc(line),lhs,property); } - public Block setProperty(Block lhs, String property, Block rhs) { - return setProperty(lhs, constant(property), rhs); + public Block setProperty(int line, Block lhs, String property, Block rhs) { + return setProperty(line, lhs, constant(property), rhs); } - public Block setProperty(Block lhs, Block property, Block rhs) { - return assign(property(lhs, property), rhs); + public Block setProperty(int line, Block lhs, Block property, Block rhs) { + return assign(line, property(line, lhs, property), rhs); } /** * Object instantiation. */ - public Block new_(Class type, Block... argExps) { - return new_(constant(type),argExps); + public Block new_(int line, Class type, Block... argExps) { + return new_(line,constant(type),argExps); } - public Block new_(Block type, Block... argExps) { - return new FunctionCallBlock(type,constant(""),argExps); + public Block new_(int line, Block type, Block... argExps) { + return new FunctionCallBlock(loc(line),type,constant(""),argExps); } /** @@ -411,9 +427,7 @@ public Block assert_(Block cond, String sourceText) { return assert_(cond,null_(),sourceText); } - /** - * Used for building AST from transformed code. - */ - public static Builder INSTANCE = new Builder(); - + private SourceLocation loc(int line) { + return new SourceLocation(loc,line); + } } diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 2bc859b33..689c6ede9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -41,7 +41,7 @@ public Continuable(Next n) { * Creates a {@link Continuable} that executes the block of code in a fresh empty environment. */ public Continuable(Block block) { - this(block, new FunctionCallEnv(null,null,Continuation.HALT)); + this(block, new FunctionCallEnv(null,null,null,Continuation.HALT)); } /** @@ -68,7 +68,7 @@ private static Next wrap(Script s) { s.run(); throw new AssertionError("I'm confused if Script is CPS-transformed or not!"); } catch (CpsCallableInvocation e) { - return e.invoke(null, Continuation.HALT); + return e.invoke(null, null, Continuation.HALT); } catch (NoSuchMethodException e) { throw new AssertionError(e); } diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index fcb020af8..3fdb9d0ad 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -3,6 +3,7 @@ import groovy.lang.Closure; import java.io.Serializable; +import java.util.List; /** * For variable lookup. This is local variables. @@ -58,4 +59,9 @@ public interface Env extends Serializable { * must be returned. */ Continuation getExceptionHandler(Class type); + + /** + * Builds the current call stack information for {@link Throwable#getStackTrace()}. + */ + void buildStackTraceElements(List stack); } diff --git a/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java b/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java new file mode 100644 index 000000000..8729e0090 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java @@ -0,0 +1,46 @@ +package com.cloudbees.groovy.cps; + +import java.io.Serializable; + +/** + * Triplet of source file / declaring class / method name. + * + * Separated from {@link com.cloudbees.groovy.cps.impl.SourceLocation} for better reuse. + * + * @author Kohsuke Kawaguchi + * @see com.cloudbees.groovy.cps.impl.SourceLocation + */ +public final class MethodLocation implements Serializable { + private final String declaringClass; + private final String methodName; + private final String fileName; + + public MethodLocation(String declaringClass, String methodName, String fileName) { + this.declaringClass = declaringClass; + this.methodName = methodName; + this.fileName = fileName; + } + + public String getDeclaringClass() { + return declaringClass; + } + + public String getMethodName() { + return methodName; + } + + public String getFileName() { + return fileName; + } + + public StackTraceElement toStackTrace(int lineNumber) { + return new StackTraceElement(declaringClass, methodName, fileName, lineNumber); + } + + /** + * Constant in case source location information is unavailable. + */ + public static final MethodLocation UNKNOWN = new MethodLocation("Unknown", "Unknown", "Unknown"); + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java index d8224de67..3c297364b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java @@ -64,7 +64,7 @@ private GreenThreadState(GreenThread g, Next n) { */ GreenThreadState(GreenThread g, Block b) { // TODO: allow the caller to pass a value - this(g,new Next(b, new FunctionCallEnv(null, null, HALT), HALT)); + this(g,new Next(b, new FunctionCallEnv(null, null, null, HALT), HALT)); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java index 77cc2295c..3c04d2a83 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java @@ -22,7 +22,10 @@ public class AssignmentBlock implements Block { */ private final String compoundOp; - public AssignmentBlock(LValueBlock lhsExp, Block rhsExp, String compoundOp) { + private final SourceLocation loc; + + public AssignmentBlock(SourceLocation loc, LValueBlock lhsExp, Block rhsExp, String compoundOp) { + this.loc = loc; this.compoundOp = compoundOp; this.lhsExp = lhsExp.asLValue(); this.rhsExp = rhsExp; @@ -77,7 +80,7 @@ public Next fixCur(Object cur) { * Invoke the operator */ public Next fixRhs(Object rhs) { - return methodCall(e, assignAndDone, this.cur, compoundOp, rhs); + return methodCall(e, loc, assignAndDone, this.cur, compoundOp, rhs); } private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 6dd714d8d..7aba057cc 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -4,6 +4,9 @@ import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; +import javax.annotation.Nullable; +import java.util.List; + /** * Common part between {@link FunctionCallEnv} and {@link ClosureCallEnv}. * @@ -19,13 +22,20 @@ */ private final Env caller; + /** + * Source location of the call site. + */ + @Nullable + private final SourceLocation callSiteLoc; + /** * @param caller * The environment of the call site. Can be null but only if the caller is outside CPS execution. */ - public CallEnv(Env caller, Continuation returnAddress) { + public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc) { this.caller = caller; this.returnAddress = returnAddress; + this.callSiteLoc = loc; } public final Continuation getReturnAddress() { @@ -55,5 +65,11 @@ public Next receive(Object o) { } } + public void buildStackTraceElements(List stack) { + if (callSiteLoc!=null) + stack.add(callSiteLoc.toStackTrace()); + caller.buildStackTraceElements(stack); + } + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java index 0ea632ab3..6be74e265 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java @@ -21,8 +21,8 @@ class ClosureCallEnv extends CallEnv { */ final Env captured; - public ClosureCallEnv(Env caller, Continuation returnAddress, Env captured, CpsClosure closure) { - super(caller,returnAddress); + public ClosureCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Env captured, CpsClosure closure) { + super(caller,returnAddress,loc); this.closure = closure; this.captured = captured; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index b92502b51..ca7211e66 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -9,7 +9,6 @@ import org.codehaus.groovy.runtime.callsite.CallSiteArray; import java.io.Serializable; -import java.util.Arrays; /** * Base class for defining a series of {@link Continuation} methods that share the same set of contextual values. @@ -48,21 +47,21 @@ protected static CallSite fakeCallSite(String method) { return csa.array[0]; } - protected Next methodCall(Env e, ContinuationPtr k, Object receiver, String methodName, Object... args) { - return methodCall(e,k.bind(this),receiver,methodName,args); + protected Next methodCall(Env e, SourceLocation loc, ContinuationPtr k, Object receiver, String methodName, Object... args) { + return methodCall(e,loc,k.bind(this),receiver,methodName,args); } /** * Evaluates a function (possibly a workflow function), then pass the result to the given continuation. */ - protected Next methodCall(Env e, Continuation k, Object receiver, String methodName, Object... args) { + protected Next methodCall(Env e, SourceLocation loc, Continuation k, Object receiver, String methodName, Object... args) { try { CallSite callSite = fakeCallSite(methodName); Object v = callSite.call(receiver,args); // if this was a normal function, the method had just executed synchronously return k.receive(v); } catch (CpsCallableInvocation inv) { - return inv.invoke(e,k); + return inv.invoke(e, loc, k); } catch (Throwable t) { return throwException(e, t); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java index 63ca314cc..ad9a46396 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java @@ -29,15 +29,18 @@ public abstract class CpsCallable implements Serializable { * @param caller * Environment of the caller. For example, if this invokable object throws an exception, * we might have to use this environment to find where to dispatch that exception. + * @param loc + * Source location of the call site. Used to build stack trace elements. Null if the call + * happens outside the CPS transformed world (think of the call into {@link Thread#run()} + * in Java, which cannot be explained within the Java semantics.) * @param receiver * For functions, this is the left hand side of the expression that becomes 'this' object. * This parameter is meaningless for closures because it's not invoked with a LHS object. * @param args * Arguments to the call that match up with {@link #parameters}. * @param k - * The result of the function/closure call will be eventually passed to this continuation. */ - abstract Next invoke(Env caller, Object receiver, List args, Continuation k); + abstract Next invoke(Env caller, SourceLocation loc, Object receiver, List args, Continuation k); protected final void assignArguments(List args, Env e) { // TODO: var args diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 0b1a72821..792237e99 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -27,8 +27,8 @@ public CpsCallableInvocation(CpsCallable call, Object receiver, Object... argume this.arguments = asList(arguments); } - public Next invoke(Env caller, Continuation k) { - return call.invoke(caller,receiver,arguments,k); + public Next invoke(Env caller, SourceLocation loc, Continuation k) { + return call.invoke(caller, loc, receiver,arguments,k); } /** @@ -37,7 +37,7 @@ public Next invoke(Env caller, Continuation k) { public Block asBlock() { return new Block() { public Next eval(Env e, Continuation k) { - return invoke(e,k); + return invoke(e, null, k); } }; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java index f19c0c1b9..b462022ad 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java @@ -27,8 +27,8 @@ class CpsClosureDef extends CpsCallable { } @Override - Next invoke(Env caller, Object receiver, List args, Continuation k) { - Env e = new ClosureCallEnv(caller, k, capture, self); + Next invoke(Env caller, SourceLocation loc, Object receiver, List args, Continuation k) { + Env e = new ClosureCallEnv(caller, k, loc, capture, self); assignArguments(args, e); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java b/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java index d7565f127..39aa8aec5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java @@ -17,8 +17,8 @@ public CpsFunction(List parameters, Block body) { super(parameters, body); } - public Next invoke(Env caller, Object receiver, List args, Continuation k) { - Env e = new FunctionCallEnv(caller, receiver, k); + public Next invoke(Env caller, SourceLocation loc, Object receiver, List args, Continuation k) { + Env e = new FunctionCallEnv(caller, k, loc, receiver); assignArguments(args,e); return new Next(body, e, k); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java index 2588e58fd..12acb892d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java @@ -28,7 +28,10 @@ public class ExcrementOperatorBlock implements Block { private final boolean prefix; private final Block body; - public ExcrementOperatorBlock(String operatorMethod, boolean prefix, LValueBlock body) { + private final SourceLocation loc; + + public ExcrementOperatorBlock(SourceLocation loc, String operatorMethod, boolean prefix, LValueBlock body) { + this.loc = loc; this.operatorMethod = operatorMethod; this.prefix = prefix; this.body = body.asLValue(); @@ -64,7 +67,7 @@ public Next fixLhs(Object lhs) { */ public Next fixCur(Object v) { this.before = v; - return methodCall(e, calc, v, operatorMethod); + return methodCall(e, loc, calc, v, operatorMethod); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index c968548e8..aa1b45643 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -6,6 +6,8 @@ import com.cloudbees.groovy.cps.Next; /** + * lhs.name(arg,arg,...) + * * @author Kohsuke Kawaguchi */ public class FunctionCallBlock implements Block { @@ -25,7 +27,10 @@ public class FunctionCallBlock implements Block { */ private final Block[] argExps; - public FunctionCallBlock(Block lhsExp, Block nameExp, Block[] argExps) { + private final SourceLocation loc; + + public FunctionCallBlock(SourceLocation loc, Block lhsExp, Block nameExp, Block[] argExps) { + this.loc = loc; this.lhsExp = lhsExp; this.nameExp = nameExp; this.argExps = argExps; @@ -82,7 +87,7 @@ private Next dispatchOrArg() { return k.receive(v); } else { // regular method call - return methodCall(e,k,lhs,name,args); + return methodCall(e,loc,k,lhs,name,args); } } } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index 4ea2e6ff5..1d74e351e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -18,8 +18,8 @@ public class FunctionCallEnv extends CallEnv { * @param caller * The environment of the call site. Can be null but only if the caller is outside CPS execution. */ - public FunctionCallEnv(Env caller, Object _this, Continuation returnAddress) { - super(caller,returnAddress); + public FunctionCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Object _this) { + super(caller,returnAddress,loc); locals.put("this",_this); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index 4590cf91a..9fd17c7b8 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -17,8 +17,10 @@ */ public class PropertyAccessBlock extends LValueBlock { private final Block lhs, property; + private final SourceLocation loc; - public PropertyAccessBlock(Block lhs, Block property) { + public PropertyAccessBlock(SourceLocation loc, Block lhs, Block property) { + this.loc = loc; this.lhs = lhs; this.property = property; } @@ -62,7 +64,7 @@ public Next get(Continuation k) { if (v instanceof CpsFunction) { // if this is a workflow function, it'd return a CpsFunction object instead // of actually executing the function, so execute it in the CPS - return ((CpsFunction)v).invoke(e, lhs, emptyList(),k); + return ((CpsFunction)v).invoke(e, loc, lhs, emptyList(),k); } else { // if this was a normal property, we get the value as-is. return k.receive(v); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java index 6edab7ac3..2953f2e38 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java @@ -3,6 +3,8 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import java.util.List; + /** * @author Kohsuke Kawaguchi */ @@ -45,5 +47,9 @@ public Continuation getExceptionHandler(Class type) { return parent.getExceptionHandler(type); } + public void buildStackTraceElements(List stack) { + parent.buildStackTraceElements(stack); + } + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java b/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java new file mode 100644 index 000000000..5fa03896f --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java @@ -0,0 +1,26 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.MethodLocation; + +import java.io.Serializable; + +/** + * Represents a specific location of the source file. + * + * @author Kohsuke Kawaguchi + */ +public final class SourceLocation implements Serializable { + private final MethodLocation method; + private final int lineNumber; + + public SourceLocation(MethodLocation method, int lineNumber) { + this.method = method; + this.lineNumber = lineNumber; + } + + public StackTraceElement toStackTrace() { + return method.toStackTrace(lineNumber); + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index 8bff23b5e..46ea0b120 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -48,7 +48,7 @@ abstract class AbstractGroovyCpsTest extends Assert { } Object evalCPSonly(String script) { - return parseCps(script).invoke(null, Continuation.HALT).run().yield.replay() + return parseCps(script).invoke(null, null, Continuation.HALT).run().yield.replay() } CpsCallableInvocation parseCps(String script) { diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index cd1105d41..b242f07ab 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -272,7 +272,7 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { } 1+plus3(3*2) """) - def cx = new Continuable(s.invoke(null, Continuation.HALT)) + def cx = new Continuable(s.invoke(null, null, Continuation.HALT)) cx = roundtripSerialization(cx) assert 10==cx.run(null) } diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index c2f1ad954..593fb5bb5 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -15,7 +15,7 @@ * @author Kohsuke Kawaguchi */ public class BasicTest extends Assert { - Builder b = new Builder(); + Builder b = new Builder(MethodLocation.UNKNOWN); // useful fragment of expressions Block $x = b.localVariable("x"); @@ -27,7 +27,7 @@ public class BasicTest extends Assert { */ private T run(Block... bodies) { try { - Env e = new FunctionCallEnv(null,null,Continuation.HALT); + Env e = new FunctionCallEnv(null,null,null,Continuation.HALT); Next p = new Next(b.block(bodies), e, Continuation.HALT); return (T) p.run().yield.wrapReplay(); } catch (InvocationTargetException x) { @@ -46,7 +46,7 @@ public void constant() { @Test public void onePlusOne() { assertEquals(true, run( - b.staticCall(ScriptBytecodeAdapter.class, "compareEqual", + b.staticCall(0,ScriptBytecodeAdapter.class, "compareEqual", b.one(), b.one()))); } @@ -55,9 +55,9 @@ public void onePlusOne() { @Test public void variable() { assertEquals(3, run( - b.setLocalVariable("x", b.one()), - b.setLocalVariable("y", b.two()), - b.plus($x, $y) + b.setLocalVariable(0,"x", b.one()), + b.setLocalVariable(0,"y", b.two()), + b.plus(0,$x, $y) )); } @@ -71,14 +71,14 @@ public void variable() { @Test public void forLoop() { assertEquals(45, run( - b.setLocalVariable("sum", b.zero()), + b.setLocalVariable(0, "sum", b.zero()), b.forLoop(null, - b.setLocalVariable("x", b.zero()), - b.lessThan($x, b.constant(10)), - b.localVariableAssignOp("x", "plus", b.one()), + b.setLocalVariable(0, "x", b.zero()), + b.lessThan(0, $x, b.constant(10)), + b.localVariableAssignOp(0, "x", "plus", b.one()), b.block(// for loop body - b.localVariableAssignOp("sum", "plus", $x) + b.localVariableAssignOp(0, "sum", "plus", $x) )), b.localVariable("sum") )); @@ -92,10 +92,10 @@ public void forLoop() { @Test public void returnStatement() { assertEquals(0, run( - b.setLocalVariable("x", b.zero()), + b.setLocalVariable(0, "x", b.zero()), b.return_($x), - b.localVariableAssignOp("x", "plus", b.one()), - b.plus($x, $y) + b.localVariableAssignOp(0, "x", "plus", b.one()), + b.plus(0, $x, $y) )); } @@ -116,10 +116,10 @@ public void ifTrue() { private void if_(boolean cond, int expected) { assertEquals(expected, run( - b.setLocalVariable("x", b.zero()), + b.setLocalVariable(0, "x", b.zero()), b.if_( b.constant(cond), - b.setLocalVariable("x",b.one()), - b.setLocalVariable("x",b.two())), + b.setLocalVariable(0, "x",b.one()), + b.setLocalVariable(0, "x",b.two())), $x )); } @@ -133,7 +133,7 @@ class Op { public int add(int x, int y) { CpsFunction f = new CpsFunction(asList("x", "y"), b.sequence( - b.setLocalVariable("z", b.functionCall($x, "plus", $y)), + b.setLocalVariable(0, "z", b.functionCall(0, $x, "plus", $y)), b.return_($z) )); throw new CpsCallableInvocation(f,this,x,y); @@ -142,9 +142,9 @@ public int add(int x, int y) { // z=5; new Op().add(1,2)+z => 8 assertEquals(3, run( - b.setLocalVariable("z", b.zero()), // part of the test is to ensure this 'z' is separated from 'z' in the add function - b.plus( - b.functionCall(b.constant(new Op()), "add", b.one(), b.two()), + b.setLocalVariable(0, "z", b.zero()), // part of the test is to ensure this 'z' is separated from 'z' in the add function + b.plus(0, + b.functionCall(0, b.constant(new Op()), "add", b.one(), b.two()), $z))); } @@ -166,10 +166,10 @@ public InstantiationTest(int x) { public void newInstance() { InstantiationTest v; - v = run(b.new_(InstantiationTest.class, b.constant(3))); + v = run(b.new_(0, InstantiationTest.class, b.constant(3))); assertEquals(3, v.v); - v = run(b.new_(InstantiationTest.class, b.constant(3), b.constant(4))); + v = run(b.new_(0, InstantiationTest.class, b.constant(3), b.constant(4))); assertEquals(7, v.v); } @@ -186,12 +186,12 @@ public void localExceptionHandling() { assertEquals("foo",run( b.tryCatch( b.sequence( - b.throw_(b.new_(RuntimeException.class, b.constant("foo"))), + b.throw_(b.new_(0, RuntimeException.class, b.constant("foo"))), b.return_(b.null_()) ), new CatchExpression(Exception.class, "e", b.block( - b.return_(b.functionCall(b.localVariable("e"), "getMessage")) + b.return_(b.functionCall(0, b.localVariable("e"), "getMessage")) )) ) )); @@ -213,10 +213,10 @@ public void throw_(int depth, String message) { Block $depth = b.localVariable("depth"); CpsFunction f = new CpsFunction(asList("depth", "message"), b.block( - b.if_(b.lessThan(b.zero(), $depth), - b.functionCall(b.this_(), "throw_", b.minus($depth, b.one()), b.localVariable("message")), + b.if_(b.lessThan(0, b.zero(), $depth), + b.functionCall(0, b.this_(), "throw_", b.minus(0, $depth, b.one()), b.localVariable("message")), // else - b.throw_(b.new_(IllegalArgumentException.class, b.localVariable("message"))) + b.throw_(b.new_(0, IllegalArgumentException.class, b.localVariable("message"))) ) )); throw new CpsCallableInvocation(f,this,depth,message); @@ -234,16 +234,16 @@ public void throw_(int depth, String message) { } */ assertEquals("hello1", run( - b.setLocalVariable("x", b.zero()), // part of the test is to ensure this 'z' is separated from 'z' in the add function + b.setLocalVariable(0, "x", b.zero()), // part of the test is to ensure this 'z' is separated from 'z' in the add function b.tryCatch( b.block( - b.setLocalVariable("x", b.one()), - b.functionCall(b.constant(new Op()), "throw_", b.constant(3), b.constant("hello")), - b.setLocalVariable("x", b.two()) + b.setLocalVariable(0, "x", b.one()), + b.functionCall(0, b.constant(new Op()), "throw_", b.constant(3), b.constant("hello")), + b.setLocalVariable(0, "x", b.two()) ), new CatchExpression(Exception.class, "e", - b.return_(b.plus( - b.property(b.localVariable("e"), "message"), + b.return_(b.plus(0, + b.property(0, b.localVariable("e"), "message"), b.localVariable("x")))) ))); } @@ -255,8 +255,8 @@ public void throw_(int depth, String message) { @Test public void propertyGetAccess() { assertEquals("foo",run( - b.setLocalVariable("x", b.new_(Exception.class, b.constant("foo"))), - b.new_(String.class, b.property(b.property($x, "message"), "bytes")) + b.setLocalVariable(0,"x", b.new_(0,Exception.class, b.constant("foo"))), + b.new_(0,String.class, b.property(0,b.property(0, $x, "message"), "bytes")) )); } @@ -283,9 +283,9 @@ public void setX(int x) { public void propertySetAccess() { PropertyTest p = new PropertyTest(); run( - b.setLocalVariable("x", b.constant(p)), - b.setProperty($x,"x", b.one()), - b.setProperty($x,"y", b.two()) + b.setLocalVariable(0, "x", b.constant(p)), + b.setProperty(0, $x,"x", b.one()), + b.setProperty(0, $x,"y", b.two()) ); assertEquals(p.x,1); assertEquals(p.y,2); @@ -311,7 +311,7 @@ public void blockScopedVariable() { assertEquals(0,run( b.if_(b.true_(), b.sequence( b.declareVariable(int.class,"x"), - b.setLocalVariable("x", b.one()) + b.setLocalVariable(0, "x", b.one()) )), b.declareVariable(int.class,"x"), b.return_($x) diff --git a/test.groovy b/test.groovy index 60b9fd8e9..d57a5fb1c 100644 --- a/test.groovy +++ b/test.groovy @@ -1,3 +1,7 @@ +def x() { + int i=0; + return i; +} def (c,d)=[1,2]; def y; y=0; From b0fd364489430239a805abc7ab92c72c8a91b0a5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 29 Apr 2014 07:46:33 -0700 Subject: [PATCH 179/932] Fixup for the last refactoring (of adding stack trace tracking) --- src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java | 1 + src/test/java/com/cloudbees/groovy/cps/BasicTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 7aba057cc..e7aafd54d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -36,6 +36,7 @@ public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc) { this.caller = caller; this.returnAddress = returnAddress; this.callSiteLoc = loc; + assert returnAddress!=null; } public final Continuation getReturnAddress() { diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 593fb5bb5..32cb82290 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -27,7 +27,7 @@ public class BasicTest extends Assert { */ private T run(Block... bodies) { try { - Env e = new FunctionCallEnv(null,null,null,Continuation.HALT); + Env e = new FunctionCallEnv(null,Continuation.HALT,null,null); Next p = new Next(b.block(bodies), e, Continuation.HALT); return (T) p.run().yield.wrapReplay(); } catch (InvocationTargetException x) { From eeb4f8c630ad6db6ecb6fdb912c1a585fcb22596 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 29 Apr 2014 07:50:26 -0700 Subject: [PATCH 180/932] if not throwable, report the problem as an exception --- src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java index 01f77218b..f7655dcc6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java @@ -21,8 +21,10 @@ public Next receive(Object t) { if (t==null) { t = new NullPointerException(); } + if (!(t instanceof Throwable)) { + t = new ClassCastException(t.getClass()+" cannot be cast to Throwable"); + } // TODO: fake the stack trace information - // TODO: what if 't' is not Throwable? Continuation v = e.getExceptionHandler(Throwable.class.cast(t).getClass()); return v.receive(t); From 46d0bee2d5be18300086149385dec9d7c77a13a9 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 29 Apr 2014 08:17:54 -0700 Subject: [PATCH 181/932] Controlling the depth of stack trace is useful especially for obtaining the top most call --- src/main/java/com/cloudbees/groovy/cps/Env.java | 5 ++++- src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java | 5 +++-- src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index 3fdb9d0ad..0f2c9fb2e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -62,6 +62,9 @@ public interface Env extends Serializable { /** * Builds the current call stack information for {@link Throwable#getStackTrace()}. + * + * @param depth + * Maximum depth of stack trace to obtain. */ - void buildStackTraceElements(List stack); + void buildStackTraceElements(List stack, int depth); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index e7aafd54d..91df78c62 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -66,10 +66,11 @@ public Next receive(Object o) { } } - public void buildStackTraceElements(List stack) { + public void buildStackTraceElements(List stack, int depth) { if (callSiteLoc!=null) stack.add(callSiteLoc.toStackTrace()); - caller.buildStackTraceElements(stack); + if (caller!=null && depth>1) + caller.buildStackTraceElements(stack, depth-1); } private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java index 2953f2e38..1282e897b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java @@ -47,8 +47,8 @@ public Continuation getExceptionHandler(Class type) { return parent.getExceptionHandler(type); } - public void buildStackTraceElements(List stack) { - parent.buildStackTraceElements(stack); + public void buildStackTraceElements(List stack, int depth) { + parent.buildStackTraceElements(stack, depth); } private static final long serialVersionUID = 1L; From 45f2028d1d3da990abe44c2ba035898d2cf57933 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 29 Apr 2014 08:18:18 -0700 Subject: [PATCH 182/932] Defined the "unknown" constant --- src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java b/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java index 5fa03896f..15335c6cc 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java @@ -23,4 +23,6 @@ public StackTraceElement toStackTrace() { } private static final long serialVersionUID = 1L; + + public static final SourceLocation UNKNOWN = new SourceLocation(MethodLocation.UNKNOWN, -1); } From 51adbebcf48e2328719a1a4e72d540a0d140260d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 29 Apr 2014 08:26:47 -0700 Subject: [PATCH 183/932] adding the start of what should eventually become a stack trace fixup test --- .../groovy/cps/impl/ThrowBlockTest.groovy | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy new file mode 100644 index 000000000..529f1344a --- /dev/null +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy @@ -0,0 +1,30 @@ +package com.cloudbees.groovy.cps.impl + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest +import org.junit.Test + +/** + * + * + * @author Kohsuke Kawaguchi + */ +class ThrowBlockTest extends AbstractGroovyCpsTest { + @Test + void stackTraceFixup() { + def elements = evalCPSonly(""" + @WorkflowMethod + def x() { + y(); + } + @WorkflowMethod + def y() { + throw new javax.naming.NamingException(); + } + try { + x(); + } catch (Exception e) { + return e.stackTrace; + } + """) + } +} From 88283846302bd69e68d9584b04c8858880781bfe Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 29 Apr 2014 08:27:02 -0700 Subject: [PATCH 184/932] design note update --- TODO.txt | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/TODO.txt b/TODO.txt index 5758ad1bd..b493f107b 100644 --- a/TODO.txt +++ b/TODO.txt @@ -13,10 +13,22 @@ Multi-threading TODO ----------- -How to set source location info in builder - - explicit call parameter on each method - -> becomes tedious to use for manual AST building - - set the provider to Builder - -> needs to build each tree with fresh builder - - decorate the AST after build - -> \ No newline at end of file +How the fixed up stack trace element should look like + + synchronous part + inserted async part + --------- + caller of Groovy CPS + +For exception thrown from resume + + inserted async part + --------- + the original stack trace element of the exception + +When suspending, the location of where the suspend call had happened should be remembered + + SuspendBlock.eval() can get that. This should include the complete stack trace + so that resume() can do a proper fixup + +Making 'throw' statement do the stack trace rewriting prevents proper rethrow handling From 11b79df4da4dca301809b2cda7ef2a31572f5e73 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 29 Apr 2014 08:27:52 -0700 Subject: [PATCH 185/932] should work just as well for Statement --- src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index a6d982539..70768430b 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -259,7 +259,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor makeNode(methodName,null) } - private void loc(Expression e) { + private void loc(ASTNode e) { literal(e.lineNumber); } From dfd08b76492098df4b5975e0f69cb6c75999298b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 30 Apr 2014 07:53:44 -0700 Subject: [PATCH 186/932] Exposing the stack trace from Continuable and testing it. --- TODO.txt | 10 +++++ .../com/cloudbees/groovy/cps/Continuable.java | 12 ++++++ .../groovy/cps/ContinuableTest.groovy | 43 +++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/TODO.txt b/TODO.txt index b493f107b..e5aeabdb9 100644 --- a/TODO.txt +++ b/TODO.txt @@ -31,4 +31,14 @@ When suspending, the location of where the suspend call had happened should be r SuspendBlock.eval() can get that. This should include the complete stack trace so that resume() can do a proper fixup + -> this is already captured as Continuable.e + Making 'throw' statement do the stack trace rewriting prevents proper rethrow handling + +- intercept constructor call of Throwable and have it do a proper fixup + +ContinuationGroup.methodCall() + if a sync call happens and get an exception, it should rewrite the stack trace + +That leaves the exception created deep inside sync code called from async code + -> it can be then thrown & caught completely within this sync code, so generally we can't do anything about it diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 689c6ede9..8ea25dd6d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -9,6 +9,8 @@ import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; /** * Mutable representation of the program. This is the primary API of the groovy-cps library to the outside. @@ -135,5 +137,15 @@ public static Object suspend(final Object v) { throw new CpsCallableInvocation(SuspendBlock.SUSPEND,null,v); } + /** + * Returns the stack trace in the CPS-transformed code that indicates where this {@link Continuable} will resume from. + * If this object represents a yet-started program, an empty list will be returned. + */ + public List getStackTrace() { + List r = new ArrayList(); + e.buildStackTraceElements(r,Integer.MAX_VALUE); + return r; + } + private static final long serialVersionUID = 1L; } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index b75004262..56d173690 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -137,4 +137,47 @@ class ContinuableTest extends AbstractGroovyCpsTest { } public static class ThisObjectIsNotSerializable {} + + /** + * Tests {@link Continuable#getStackTrace()}. + */ + @Test + void stackTrace() { + def s = csh.parse(""" + @WorkflowMethod + def x(i,v) { + if (i>0) + y(i-1,v); // line 5 + else + Continuable.suspend(v); // line 7 + } + @WorkflowMethod + def y(i,v) { + if (i>0) + x(i-1,v); // line 12 + else + Continuable.suspend(v); // line 14 + } + + x(5,3); // line 17 + """) + + def c = new Continuable(s); + + assert c.stackTrace.isEmpty() + + def v = c.run(null); + assert v==3 + + assert c.stackTrace.join("\n")==""" +Script1.y(Script1.groovy:14) +Script1.x(Script1.groovy:5) +Script1.y(Script1.groovy:12) +Script1.x(Script1.groovy:5) +Script1.y(Script1.groovy:12) +Script1.x(Script1.groovy:5) +Script1.run(Script1.groovy:17) +""".trim() + } + } From db68c06c685bdf049877df63cbea5a6f3795f85a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 30 Apr 2014 08:06:29 -0700 Subject: [PATCH 187/932] How does this method work if Continuable has terminated? --- src/main/java/com/cloudbees/groovy/cps/Continuable.java | 3 ++- .../groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 8ea25dd6d..3c6a603d3 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -143,7 +143,8 @@ public static Object suspend(final Object v) { */ public List getStackTrace() { List r = new ArrayList(); - e.buildStackTraceElements(r,Integer.MAX_VALUE); + if (e!=null) + e.buildStackTraceElements(r,Integer.MAX_VALUE); return r; } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 56d173690..099892d2b 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -164,6 +164,7 @@ class ContinuableTest extends AbstractGroovyCpsTest { def c = new Continuable(s); + // stack trace is empty if it hasn't been started assert c.stackTrace.isEmpty() def v = c.run(null); @@ -178,6 +179,11 @@ Script1.y(Script1.groovy:12) Script1.x(Script1.groovy:5) Script1.run(Script1.groovy:17) """.trim() + + c.run(null) + + // stack trace is empty if there's nothing more to execute + assert c.stackTrace.isEmpty() } } From 865af4df15e691a3fe82cd7d0f9973c33dec2987 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 30 Apr 2014 08:07:29 -0700 Subject: [PATCH 188/932] this is done --- TODO.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/TODO.txt b/TODO.txt index e5aeabdb9..dcae4cddb 100644 --- a/TODO.txt +++ b/TODO.txt @@ -26,13 +26,6 @@ For exception thrown from resume --------- the original stack trace element of the exception -When suspending, the location of where the suspend call had happened should be remembered - - SuspendBlock.eval() can get that. This should include the complete stack trace - so that resume() can do a proper fixup - - -> this is already captured as Continuable.e - Making 'throw' statement do the stack trace rewriting prevents proper rethrow handling - intercept constructor call of Throwable and have it do a proper fixup From c5cf37829d6a3abaf537eacdfb420506889f0df0 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 30 Apr 2014 08:30:29 -0700 Subject: [PATCH 189/932] Implemented stack trace fixup for Throwables that are created inside CPS program --- .../com/cloudbees/groovy/cps/Continuable.java | 7 ++++++ .../groovy/cps/impl/FunctionCallBlock.java | 22 ++++++++++++++++++ .../groovy/cps/impl/ThrowBlockTest.groovy | 23 +++++++++++++++---- 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 3c6a603d3..998e6def3 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -149,4 +149,11 @@ public List getStackTrace() { } private static final long serialVersionUID = 1L; + + /** + * The artificial {@link StackTraceElement} that appears in the stack trace when the CPS library fixes up + * the stack trace. This separator separates the regular call stack that tracks the actual call stack + * JVM executes and the synthesized CPS call stack that CPS-transformed program is logically executing. + */ + public static final StackTraceElement SEPARATOR_STACK_ELEMENT = new StackTraceElement("___cps", "transform___", null, -2); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index aa1b45643..27eaeb938 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -1,10 +1,17 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static com.cloudbees.groovy.cps.impl.SourceLocation.UNKNOWN; + /** * lhs.name(arg,arg,...) * @@ -84,6 +91,9 @@ private Next dispatchOrArg() { } catch (Throwable t) { return throwException(e, t); } + if (v instanceof Throwable) + fillInStackTrace(e,(Throwable)v); + return k.receive(v); } else { // regular method call @@ -95,6 +105,18 @@ private Next dispatchOrArg() { private static final long serialVersionUID = 1L; } + /** + * Insert the logical CPS stack trace in front of the actual stack trace. + */ + private void fillInStackTrace(Env e, Throwable t) { + List stack = new ArrayList(); + stack.add((loc!=null ? loc : UNKNOWN).toStackTrace()); + e.buildStackTraceElements(stack,Integer.MAX_VALUE); + stack.add(Continuable.SEPARATOR_STACK_ELEMENT); + stack.addAll(Arrays.asList(t.getStackTrace())); + t.setStackTrace(stack.toArray(new StackTraceElement[stack.size()])); + } + static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); static final ContinuationPtr fixName = new ContinuationPtr(ContinuationImpl.class,"fixName"); static final ContinuationPtr fixArg = new ContinuationPtr(ContinuationImpl.class,"fixArg"); diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy index 529f1344a..1eebef73b 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps.impl import com.cloudbees.groovy.cps.AbstractGroovyCpsTest +import com.cloudbees.groovy.cps.Continuable import org.junit.Test /** @@ -11,20 +12,34 @@ import org.junit.Test class ThrowBlockTest extends AbstractGroovyCpsTest { @Test void stackTraceFixup() { - def elements = evalCPSonly(""" + List elements = evalCPSonly(""" @WorkflowMethod def x() { - y(); + y(); // line 4 } @WorkflowMethod def y() { - throw new javax.naming.NamingException(); + throw new javax.naming.NamingException(); // line 8 } try { - x(); + x(); // line 11 } catch (Exception e) { return e.stackTrace; } """) + + println elements; + + assert elements.subList(0,3).join("\n")==""" +Script1.y(Script1.groovy:8) +Script1.x(Script1.groovy:4) +Script1.run(Script1.groovy:11) + """.trim(); + + assert elements[3] == Continuable.SEPARATOR_STACK_ELEMENT + + def rest = elements.subList(4,elements.size()).join("\n"); + assert rest.contains(FunctionCallBlock.class.name) + assert rest.contains("java.lang.reflect.Constructor.newInstance") } } From f8035dcdda3d3a97f4bf1347c71ea7f2667bbe6f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 2 May 2014 08:23:32 -0700 Subject: [PATCH 190/932] import the test class' package --- .../com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index 46ea0b120..ecb752541 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -28,7 +28,7 @@ abstract class AbstractGroovyCpsTest extends Assert { @Before void setUp() { def imports = new ImportCustomizer() - .addStarImports([CpsTransformerTest.class, GreenThread.class]*.package*.name as String[]) + .addStarImports([CpsTransformerTest.class, GreenThread.class, getClass()]*.package*.name as String[]) def cc = new CompilerConfiguration() cc.addCompilationCustomizers(imports) From 6ccdb2bc58d6e76b5a0bef1d1e3c46739e7f11d8 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 2 May 2014 08:37:07 -0700 Subject: [PATCH 191/932] Fix up stack trace for exceptions thrown from synchronous code invoked from CPS code --- .../groovy/cps/impl/ContinuationGroup.java | 81 +++++++++++++++++++ .../groovy/cps/impl/ReferenceStackTrace.java | 9 +++ .../cps/impl/FunctionCallBlockTest.groovy | 57 +++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ReferenceStackTrace.java create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index ca7211e66..fd7cdd56c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; @@ -9,6 +10,11 @@ import org.codehaus.groovy.runtime.callsite.CallSiteArray; import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static com.cloudbees.groovy.cps.impl.SourceLocation.UNKNOWN; /** * Base class for defining a series of {@link Continuation} methods that share the same set of contextual values. @@ -63,10 +69,85 @@ protected Next methodCall(Env e, SourceLocation loc, Continuation k, Object rece } catch (CpsCallableInvocation inv) { return inv.invoke(e, loc, k); } catch (Throwable t) { + fixupStackTrace(t,loc,e,new ReferenceStackTrace()); return throwException(e, t); } } + /** + * Fix up the stack trace of an exception thrown from synchronous code. + * + * @param t + * Exception thrown + * @param loc + * Location of the call site in the script. null if unknown. + * @param e + * Environment that represents the call stack of the asynchronous code + * @param ref + * Reference stack trace that identifies the call site. Create this exception in the same + * function that you call into {@link CallSite}. Used to identify the section of {@coe t.getStackTrace()} + * that belong to the caller of groovy-cps and the invocation of {@link CallSite} induced by the Groovy script. + */ + protected void fixupStackTrace(Throwable t, SourceLocation loc, Env e, ReferenceStackTrace ref) { + StackTraceElement[] rs = ref.getStackTrace(); + StackTraceElement[] ts = t.getStackTrace(); + + if (!hasSameRoots(rs,ts)) { + // this exception doesn't match up with what we expected. + // maybe it was created elsewhere and thrown here? + return; + } + + /* + SYNC TRACE + CPS TRACE + REFERENECE TRACE + */ + + List orig = Arrays.asList(ts); + int pos = ts.length-rs.length; + List stack = new ArrayList(orig.subList(0,pos)); + + stack.add((loc!=null ? loc : UNKNOWN).toStackTrace()); + e.buildStackTraceElements(stack,Integer.MAX_VALUE); + stack.add(Continuable.SEPARATOR_STACK_ELEMENT); + + stack.addAll(orig.subList(pos, orig.size())); + + t.setStackTrace(stack.toArray(new StackTraceElement[stack.size()])); + } + + /** + * Returns true if 'rs' is at the bottom of 'ts'. + */ + private boolean hasSameRoots(StackTraceElement[] rs, StackTraceElement[] ts) { + int b = ts.length-rs.length; + if (b<0) return false; + + {// the top of the stack will have different line number because ReferenceStackTrace is created in a separate line + StackTraceElement lhs = ts[b]; + StackTraceElement rhs = rs[0]; + + if (!eq(lhs.getClassName(),rhs.getClassName()) + || !eq(lhs.getMethodName(),rhs.getMethodName()) + || !eq(lhs.getFileName(),rhs.getFileName())) + return false; + } + + for (int i=1; i0) + someSyncCode(i-1); + else + throw new NamingException(); + } + + @Test + void stackTraceFixup() { + List elements = evalCPSonly(""" + @WorkflowMethod + def x() { + y(); // line 4 + } + @WorkflowMethod + def y() { + FunctionCallBlockTest.someSyncCode(3); // line 8 + } + try { + x(); // line 11 + } catch (Exception e) { + return e.stackTrace; + } + """) + + println elements; + + def trace = elements.join("\n") + + // should include the transformed CPS part + assert trace.contains(""" +Script1.y(Script1.groovy:8) +Script1.x(Script1.groovy:4) +Script1.run(Script1.groovy:11) +___cps.transform___(Native Method) +com.cloudbees.groovy.cps.impl.ContinuationGroup.methodCall"""); + + // should include the call stack of some sync code + assert trace.contains("com.cloudbees.groovy.cps.impl.FunctionCallBlockTest.someSyncCode(FunctionCallBlockTest.groovy:") + } +} From fd0efec9a488e75362142778ca4ead27d813978b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 2 May 2014 08:48:03 -0700 Subject: [PATCH 192/932] Applied the stack trace fixup everywhere we handle exception and throw it into CPS code --- .../groovy/cps/CpsTransformer.groovy | 1 + .../com/cloudbees/groovy/cps/Builder.java | 4 +-- .../groovy/cps/impl/ContinuationGroup.java | 30 +++++++++---------- .../groovy/cps/impl/ForInLoopBlock.java | 6 ++-- .../groovy/cps/impl/FunctionCallBlock.java | 2 +- .../groovy/cps/impl/PropertyAccessBlock.java | 4 +-- 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 70768430b..99761c5cf 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -316,6 +316,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } else { // for (x in col) { ... } makeNode("forInLoop") { + loc(forLoop); literal(forLoop.statementLabel) literal(forLoop.variableType) literal(forLoop.variable.name) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index ebe28c601..773f29387 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -186,8 +186,8 @@ public Block forLoop(String label, Block e1, Block e2, Block e3, Block body) { /** * for (x in col) { ... } */ - public Block forInLoop(String label, Class type, String variable, Block collection, Block body) { - return new ForInLoopBlock(label,type,variable,collection,body); + public Block forInLoop(int line, String label, Class type, String variable, Block collection, Block body) { + return new ForInLoopBlock(loc(line), label,type,variable,collection,body); } public Block break_(String label) { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index fd7cdd56c..b0671de40 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -69,26 +69,14 @@ protected Next methodCall(Env e, SourceLocation loc, Continuation k, Object rece } catch (CpsCallableInvocation inv) { return inv.invoke(e, loc, k); } catch (Throwable t) { - fixupStackTrace(t,loc,e,new ReferenceStackTrace()); - return throwException(e, t); + return throwException(e, t, loc, new ReferenceStackTrace()); } } /** * Fix up the stack trace of an exception thrown from synchronous code. - * - * @param t - * Exception thrown - * @param loc - * Location of the call site in the script. null if unknown. - * @param e - * Environment that represents the call stack of the asynchronous code - * @param ref - * Reference stack trace that identifies the call site. Create this exception in the same - * function that you call into {@link CallSite}. Used to identify the section of {@coe t.getStackTrace()} - * that belong to the caller of groovy-cps and the invocation of {@link CallSite} induced by the Groovy script. */ - protected void fixupStackTrace(Throwable t, SourceLocation loc, Env e, ReferenceStackTrace ref) { + private void fixupStackTrace(Env e, Throwable t, SourceLocation loc, ReferenceStackTrace ref) { StackTraceElement[] rs = ref.getStackTrace(); StackTraceElement[] ts = t.getStackTrace(); @@ -154,8 +142,20 @@ private boolean eq(Object x, Object y) { * * We use this method to receive an exception thrown from the normal code and "rethrow" * into the CPS code. + * + * @param t + * Exception thrown + * @param loc + * Location of the call site in the script. null if unknown. + * @param e + * Environment that represents the call stack of the asynchronous code + * @param ref + * Reference stack trace that identifies the call site. Create this exception in the same + * function that you call into {@link CallSite}. Used to identify the section of {@coe t.getStackTrace()} + * that belong to the caller of groovy-cps and the invocation of {@link CallSite} induced by the Groovy script. */ - protected Next throwException(Env e, Throwable t) { + protected Next throwException(Env e, Throwable t, SourceLocation loc, ReferenceStackTrace ref) { + fixupStackTrace(e, t,loc, ref); return e.getExceptionHandler(t.getClass()).receive(t); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java index 595f5c9e2..cdb745283 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java @@ -19,8 +19,10 @@ public class ForInLoopBlock implements Block { final String variable; final Block collection; final Block body; + final SourceLocation loc; - public ForInLoopBlock(String label, Class type, String variable, Block collection, Block body) { + public ForInLoopBlock(SourceLocation loc, String label, Class type, String variable, Block collection, Block body) { + this.loc = loc; this.label = label; this.type = type; this.variable = variable; @@ -49,7 +51,7 @@ public Next loopHead(Object col) { try { itr = (Iterator) ScriptBytecodeAdapter.invokeMethod0(null/*unused*/, col, "iterator"); } catch (Throwable t) { - return throwException(e, t); + return throwException(e, t, loc, new ReferenceStackTrace()); } return increment(null); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index 27eaeb938..502263b51 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -89,7 +89,7 @@ private Next dispatchOrArg() { try { v = fakeCallSite("").callConstructor(lhs,args); } catch (Throwable t) { - return throwException(e, t); + return throwException(e, t, loc, new ReferenceStackTrace()); } if (v instanceof Throwable) fillInStackTrace(e,(Throwable)v); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index 9fd17c7b8..6ff026e26 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -58,7 +58,7 @@ public Next get(Continuation k) { try { v = ScriptBytecodeAdapter.getProperty(null/*Groovy doesn't use this parameter*/, lhs, name); } catch (Throwable t) { - return throwException(e, t); + return throwException(e, t, loc, new ReferenceStackTrace()); } if (v instanceof CpsFunction) { @@ -77,7 +77,7 @@ public Next set(Object v, Continuation k) { try { ScriptBytecodeAdapter.setProperty(v, null/*Groovy doesn't use this parameter*/, lhs, name); } catch (Throwable t) { - return throwException(e, t); + return throwException(e, t, loc, new ReferenceStackTrace()); } return k.receive(null); From 08f688766799c4ee047390a2548a5deca2e59990 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 2 May 2014 08:48:31 -0700 Subject: [PATCH 193/932] Now that tests are written, no need to clutter the output --- .../com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy | 2 +- .../groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy index b38932af7..067c06328 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy @@ -39,7 +39,7 @@ class FunctionCallBlockTest extends AbstractGroovyCpsTest { } """) - println elements; +// println elements; def trace = elements.join("\n") diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy index 1eebef73b..e38d54f55 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy @@ -28,7 +28,7 @@ class ThrowBlockTest extends AbstractGroovyCpsTest { } """) - println elements; +// println elements; assert elements.subList(0,3).join("\n")==""" Script1.y(Script1.groovy:8) From a21c3bd5712e7f8a124e6de4b7128a00ce21de80 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 4 May 2014 13:42:53 -0400 Subject: [PATCH 194/932] this is done --- TODO.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/TODO.txt b/TODO.txt index dcae4cddb..99215c71e 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,5 +1,4 @@ - array access (trivial, so can be done later) -- debug information and stack trace fixup - "synchronized" block - finally block - how do we handle multi-threading? From 5055ac33ed4bfcc5700023fef3746ee179c1cb1e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 4 May 2014 13:44:03 -0400 Subject: [PATCH 195/932] This has been implemented --- TODO.txt | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/TODO.txt b/TODO.txt index 99215c71e..65dbb310b 100644 --- a/TODO.txt +++ b/TODO.txt @@ -9,28 +9,3 @@ Tests to be written: Multi-threading TODO - how to suspend just one thread while letting other threads run - - ------------ -How the fixed up stack trace element should look like - - synchronous part - inserted async part - --------- - caller of Groovy CPS - -For exception thrown from resume - - inserted async part - --------- - the original stack trace element of the exception - -Making 'throw' statement do the stack trace rewriting prevents proper rethrow handling - -- intercept constructor call of Throwable and have it do a proper fixup - -ContinuationGroup.methodCall() - if a sync call happens and get an exception, it should rewrite the stack trace - -That leaves the exception created deep inside sync code called from async code - -> it can be then thrown & caught completely within this sync code, so generally we can't do anything about it From fbcee35733df13fbe6c5c5ee1f28d69b2c971cb2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 4 May 2014 15:33:29 -0500 Subject: [PATCH 196/932] Updated javadoc to reflect the current transformation --- .../groovy/cps/CpsTransformer.groovy | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 99761c5cf..c4dae8aaa 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -42,12 +42,17 @@ import static org.codehaus.groovy.syntax.Types.* * CpsFunction foo(int x, int y) { * return foo$workflow; * } - * static CpsFunction foo$workflow = new CpsFunction(["x","y"], B.plus(B.localVariable("x"), B.localVariable("y")); + * + * private static CpsFunction ___cps___N = ___cps___N(); + * + * private static final CpsFunction ___cps___N() { + * Builder b = new Builder(...); + * return new CpsFunction(['x','y'], b.plus(b.localVariable("x"), b.localVariable("y")) + * } * - * ("B" refers to {@link Builder#INSTANCE} for brevity) * *

- * That is, we transform a Groovy AST of the method body into a tree of {@link Block}s by using {@link Builder#INSTANCE}, + * That is, we transform a Groovy AST of the method body into a tree of {@link Block}s by using {@link Builder}, * then the method just returns this function object and expect the caller to evaluate it, instead of executing the method * synchronously before it returns. * @@ -59,9 +64,9 @@ import static org.codehaus.groovy.syntax.Types.* * *

* Groovy AST that calls {@link Builder} is a tree of function call, so we build {@link MethodCallExpression}s - * in the top-down manner. We do this by {@link #makeNode(String)}, which creates a call to {@code Builder.xxx(...)}, + * in the top-down manner. We do this by {@link CpsTransformer#makeNode(String)}, which creates a call to {@code Builder.xxx(...)}, * then supply the closure that fills in the arguments to this call by walking down the original Groovy AST tree. - * This walk-down is done by calling {@link #visit(ASTNode)} (to recursively visit ASTs), or by calling {@link #literal(Object)} + * This walk-down is done by calling {@link CpsTransformer#visit(ASTNode)} (to recursively visit ASTs), or by calling {@link CpsTransformer#literal(String)} * methods, which generate string/class/etc literals, as sometimes {@link Builder} methods need them as well. * * @author Kohsuke Kawaguchi @@ -132,7 +137,12 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * * To: * - * private static CpsFunction ___cps___N = new CpsFunction(['arg1','arg2','arg3',...], CPS-transformed-method-body) + * private static CpsFunction ___cps___N = ___cps___N(); + * + * private static final CpsFunction ___cps___N() { + * return new CpsFunction(['arg1','arg2','arg3',...], CPS-transformed-method-body) + * } + * * ReturnT foo( T1 arg1, T2 arg2, ...) { * throw new CpsCallableInvocation(___cps___N, this, arg1, arg2, ...) * } From d1580e6610d77bfeb813bd0df7613207f1e6c8d1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 4 May 2014 15:42:48 -0500 Subject: [PATCH 197/932] marking as package local --- src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java index 3a4444ca6..428f22949 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java @@ -10,8 +10,7 @@ /** * @author Kohsuke Kawaguchi */ -// TODO: should be package local once all the impls move into this class -public class TryBlockEnv extends ProxyEnv { +class TryBlockEnv extends ProxyEnv { private final Map handlers = new LinkedHashMap(); public TryBlockEnv(Env parent) { From 4bd529da385f8e0b2a981abfe9b3d2ce568d9c30 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 4 May 2014 16:02:27 -0500 Subject: [PATCH 198/932] Implemented finally statement --- .../com/cloudbees/groovy/cps/Builder.java | 6 +- .../groovy/cps/impl/TryBlockEnv.java | 57 ++++++++++++++++++- .../groovy/cps/impl/TryCatchBlock.java | 20 +++++-- .../cps/impl/ValueBoundContinuation.java | 25 ++++++++ 4 files changed, 102 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 773f29387..2dbe8bb53 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -222,7 +222,11 @@ public Block tryCatch(Block body, CatchExpression... catches) { * } */ public Block tryCatch(final Block body, final List catches) { - return new TryCatchBlock(catches, body); + return tryCatch(body, catches, null); + } + + public Block tryCatch(final Block body, final List catches, final Block finally_) { + return new TryCatchBlock(catches, body, finally_); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java index 428f22949..ed143c941 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java @@ -1,20 +1,28 @@ package com.cloudbees.groovy.cps.impl; +import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; +import javax.annotation.Nullable; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; /** + * Environment for evaluating the body of a try/catch block. + * * @author Kohsuke Kawaguchi */ class TryBlockEnv extends ProxyEnv { private final Map handlers = new LinkedHashMap(); + @Nullable + private final Block finally_; - public TryBlockEnv(Env parent) { + public TryBlockEnv(Env parent, Block finally_) { super(parent); + this.finally_ = finally_; } /** @@ -34,5 +42,52 @@ public Continuation getExceptionHandler(Class type) { return super.getExceptionHandler(type); } + /** + * If the finally block exists, return a {@link Continuation} that evaluates the finally block then + * proceed to the given continuation. + */ + Continuation withFinally(Continuation k) { + if (finally_==null) return k; + else return new Finally(k); + } + + @Override + public Continuation getReturnAddress() { + return withFinally(super.getReturnAddress()); + } + + @Override + public Continuation getBreakAddress(String label) { + return withFinally(super.getBreakAddress(label)); + } + + @Override + public Continuation getContinueAddress(String label) { + return withFinally(super.getContinueAddress(label)); + } + + /** + * Executes the finally clause, then go back to where it's supposed to be. + */ + private class Finally implements Continuation { + private final Continuation k; + + public Finally(Continuation k) { + this.k = k; + } + + public Next receive(final Object v) { + // finally block should be evaluated with 'parent', not 'TryBlockEnv.this' because + // exceptions thrown in here will not get caught by handlers we have. + + // similarly, k should receive v, not the result of the evaluation of the finally block + return new Next(finally_, parent, new ValueBoundContinuation(k, v)); + } + + private static final long serialVersionUID = 1L; + + } + private static final long serialVersionUID = 1L; + } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java index 501fa0f87..a0a07fe55 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java @@ -6,6 +6,7 @@ import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; +import java.util.Collections; import java.util.List; /** @@ -14,14 +15,19 @@ public class TryCatchBlock implements Block { private final List catches; private final Block body; + private final Block finally_; - public TryCatchBlock(List catches, Block body) { + public TryCatchBlock(List catches, Block body, Block finally_) { this.catches = catches; this.body = body; + this.finally_ = finally_; } - public Next eval(final Env e, final Continuation k) { - final TryBlockEnv f = new TryBlockEnv(e); + public Next eval(final Env e, final Continuation _k) { + final TryBlockEnv f = new TryBlockEnv(e,finally_); + // possible evaluation of the finally block, if present. + final Continuation k = f.withFinally(_k); + for (final CatchExpression c : catches) { f.addHandler(c.type, new Continuation() { public Next receive(Object t) { @@ -29,7 +35,13 @@ public Next receive(Object t) { b.declareVariable(c.type, c.name); b.setLocalVariable(c.name, t); - return new Next(c.handler, b, k); + // evaluate the body of the catch clause, with the finally block. + // that is, at the end of the catch block we want to run the finally block, + // and if any jump occurs from within (such as an exception thrown or a break statement), + // then we need to run the finally block first. + return new Next( + new TryCatchBlock(Collections.emptyList(), c.handler, finally_), + b, k); } }); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java b/src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java new file mode 100644 index 000000000..8f7175135 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java @@ -0,0 +1,25 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Next; + +/** + * {@link Continuation} that receives a preset value. + * + * @author Kohsuke Kawaguchi + */ +final class ValueBoundContinuation implements Continuation { + private final Continuation k; + private final Object v; + + ValueBoundContinuation(Continuation k, Object v) { + this.k = k; + this.v = v; + } + + public Next receive(Object _) { + return k.receive(v); + } + + private static final long serialVersionUID = 1L; +} From 8ab4a137ebf08b2e4e28f79f10e38925cffe2a33 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 5 May 2014 09:02:31 -0500 Subject: [PATCH 199/932] Adding test cases --- .../groovy/cps/CpsTransformer.groovy | 2 +- .../com/cloudbees/groovy/cps/Builder.java | 5 +- .../groovy/cps/impl/TryCatchBlock.java | 5 +- .../groovy/cps/impl/TryCatchBlockTest.groovy | 124 ++++++++++++++++++ .../com/cloudbees/groovy/cps/BasicTest.java | 3 +- 5 files changed, 132 insertions(+), 7 deletions(-) create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index c4dae8aaa..281f44227 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -383,9 +383,9 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitTryCatchFinally(TryCatchStatement stmt) { - // TODO: finally block makeNode("tryCatch") { visit(stmt.tryStatement) + visit(stmt.finallyStatement) visit(stmt.catchStatements) } } diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 2dbe8bb53..c85cc046a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -208,10 +208,11 @@ public Block doWhile(String label, Block body, Block cond) { return new DoWhileBlock(label,body,cond); } - public Block tryCatch(Block body, CatchExpression... catches) { - return tryCatch(body, asList(catches)); + public Block tryCatch(Block body, Block finally_, CatchExpression... catches) { + return tryCatch(body, asList(catches), finally_); } + /** * try { * ... diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java index a0a07fe55..06d849396 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java @@ -23,10 +23,9 @@ public TryCatchBlock(List catches, Block body, Block finally_) this.finally_ = finally_; } - public Next eval(final Env e, final Continuation _k) { + public Next eval(final Env e, final Continuation k) { final TryBlockEnv f = new TryBlockEnv(e,finally_); // possible evaluation of the finally block, if present. - final Continuation k = f.withFinally(_k); for (final CatchExpression c : catches) { f.addHandler(c.type, new Continuation() { @@ -47,7 +46,7 @@ public Next receive(Object t) { } // evaluate the body with the new environment - return new Next(body,f,k); + return new Next(body,f,f.withFinally(k)); } private static final long serialVersionUID = 1L; diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy new file mode 100644 index 000000000..5f0e54029 --- /dev/null +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy @@ -0,0 +1,124 @@ +package com.cloudbees.groovy.cps.impl + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest +import com.cloudbees.groovy.cps.Continuable +import org.junit.Test + +/** + * TODO: tests to write + * - try block breaking/continuing, running the finally block + * - exception caught in a catch block, running the finally block + * - exception rethrown in a catch block, running the finally block but not caught in other handlers + * - return statement in the finally block, masking an exception + * - return statement in the catch block, masking an exception but running the finally block + * - catch order priority + * + * @author Kohsuke Kawaguchi + */ +class TryCatchBlockTest extends AbstractGroovyCpsTest { + @Test + void stackTraceFixup() { + List elements = evalCPSonly(""" + @WorkflowMethod + def x() { + y(); // line 4 + } + @WorkflowMethod + def y() { + throw new javax.naming.NamingException(); // line 8 + } + try { + x(); // line 11 + } catch (Exception e) { + return e.stackTrace; + } + """) + +// println elements; + + assert elements.subList(0,3).join("\n")==""" +Script1.y(Script1.groovy:8) +Script1.x(Script1.groovy:4) +Script1.run(Script1.groovy:11) + """.trim(); + + assert elements[3] == Continuable.SEPARATOR_STACK_ELEMENT + + def rest = elements.subList(4,elements.size()).join("\n"); + assert rest.contains(FunctionCallBlock.class.name) + assert rest.contains("java.lang.reflect.Constructor.newInstance") + } + + /** + * Try block with finally clause completing normally. + */ + @Test + void tryAndFinally_NormalCompletion() { + def x = evalCPSonly(""" + a = ""; + try { + a += "1"; + } catch (Exception e) { + a += "2"; + } finally { + a += "3"; + } + return a; +""") + assert x=="13"; + } + + @Test + void tryWithoutFinally_NormalCompletion() { + def x = evalCPSonly(""" + a = ""; + try { + a += "1"; + } catch (Exception e) { + a += "2"; + } + return a; +""") + assert x=="1"; + } + + @Test + void tryAndFinally_AbnormalTermination() { + def x = evalCPSonly(""" + a = ""; + try { + a += "1"; + throw new Exception("foo"); + a += "2"; + } catch (Exception e) { + a += e.message + "2"; + } finally { + a += "3"; + } + return a; +""") + assert x=="1foo23"; + } + + @Test + void tryAndFinally_BreakInside() { + def x = evalCPS(""" + a = ""; + while (true) { + a += "0" + try { + a += "1"; + break; + a += "2"; + } catch (Exception e) { + a += "3"; + } finally { + a += "4"; + } + a += "5"; + } + return a; +""") + assert x=="014"; + } +} diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 32cb82290..dcc9a2acb 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -189,6 +189,7 @@ public void localExceptionHandling() { b.throw_(b.new_(0, RuntimeException.class, b.constant("foo"))), b.return_(b.null_()) ), + null, new CatchExpression(Exception.class, "e", b.block( b.return_(b.functionCall(0, b.localVariable("e"), "getMessage")) @@ -240,7 +241,7 @@ public void throw_(int depth, String message) { b.setLocalVariable(0, "x", b.one()), b.functionCall(0, b.constant(new Op()), "throw_", b.constant(3), b.constant("hello")), b.setLocalVariable(0, "x", b.two()) - ), + ), null, new CatchExpression(Exception.class, "e", b.return_(b.plus(0, b.property(0, b.localVariable("e"), "message"), From 9604bc51c15915404d0e68a345beee2941b8bd81 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 5 May 2014 09:03:52 -0500 Subject: [PATCH 200/932] more test cases --- .../groovy/cps/impl/TryCatchBlockTest.groovy | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy index 5f0e54029..5d97e780e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy @@ -6,7 +6,6 @@ import org.junit.Test /** * TODO: tests to write - * - try block breaking/continuing, running the finally block * - exception caught in a catch block, running the finally block * - exception rethrown in a catch block, running the finally block but not caught in other handlers * - return statement in the finally block, masking an exception @@ -121,4 +120,27 @@ Script1.run(Script1.groovy:11) """) assert x=="014"; } + + @Test + void tryAndFinally_ContinueInside() { + def x = evalCPS(""" + a = ""; + a += "0" + for (int i=0; i<2; i++) { + a += "1" + try { + a += "2"; + continue; + a += "3"; + } catch (Exception e) { + a += "4"; + } finally { + a += "5"; + } + a += "6"; + } + return a; +""") + assert x=="0125125"; + } } From a516d882d5a99a115a86f6c70439a16fb3f66737 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 5 May 2014 09:18:38 -0500 Subject: [PATCH 201/932] if not caught in the catch block, finally block should run --- src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java index ed143c941..e7da40eb6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java @@ -39,7 +39,7 @@ public Continuation getExceptionHandler(Class type) { return e.getValue(); } - return super.getExceptionHandler(type); + return withFinally(super.getExceptionHandler(type)); } /** From d58c9d19f544197bea825c478fd10ad9f1a31b92 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 5 May 2014 09:23:58 -0500 Subject: [PATCH 202/932] More tests --- .../groovy/cps/impl/TryCatchBlockTest.groovy | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy index 5d97e780e..51e12563e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy @@ -6,8 +6,6 @@ import org.junit.Test /** * TODO: tests to write - * - exception caught in a catch block, running the finally block - * - exception rethrown in a catch block, running the finally block but not caught in other handlers * - return statement in the finally block, masking an exception * - return statement in the catch block, masking an exception but running the finally block * - catch order priority @@ -53,7 +51,7 @@ Script1.run(Script1.groovy:11) */ @Test void tryAndFinally_NormalCompletion() { - def x = evalCPSonly(""" + def x = evalCPS(""" a = ""; try { a += "1"; @@ -69,7 +67,7 @@ Script1.run(Script1.groovy:11) @Test void tryWithoutFinally_NormalCompletion() { - def x = evalCPSonly(""" + def x = evalCPS(""" a = ""; try { a += "1"; @@ -83,7 +81,7 @@ Script1.run(Script1.groovy:11) @Test void tryAndFinally_AbnormalTermination() { - def x = evalCPSonly(""" + def x = evalCPS(""" a = ""; try { a += "1"; @@ -143,4 +141,34 @@ Script1.run(Script1.groovy:11) """) assert x=="0125125"; } + + /** + * Groovy interpreter seems to have a bug in running the finally block when an exception is thrown + * from the catch block, so not using "evalCPS". + */ + @Test + void tryAndFinally_RethrowAndFinallyBlock() { + def x = evalCPSonly(""" + a = ""; + try { + try { + a += "1"; + throw new Exception("foo"); + a += "2"; + } catch (Exception e) { + a += "3"; + throw new RuntimeException(); + a += "4"; + } catch (RuntimeException e) { + a += "6"; + } finally { + a += "5"; + } + } catch (Exception e) { + ; + } + return a; +""") + assert x=="135"; + } } From 2d381e42cfd913f697ef76947b3007ad19ed1cca Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 5 May 2014 10:33:39 -0500 Subject: [PATCH 203/932] Added another test case --- .../groovy/cps/impl/TryCatchBlockTest.groovy | 54 ++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy index 51e12563e..4565b813b 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy @@ -6,8 +6,6 @@ import org.junit.Test /** * TODO: tests to write - * - return statement in the finally block, masking an exception - * - return statement in the catch block, masking an exception but running the finally block * - catch order priority * * @author Kohsuke Kawaguchi @@ -171,4 +169,56 @@ Script1.run(Script1.groovy:11) """) assert x=="135"; } + + @Test + void tryAndFinally_returnFromFinally() { + def x = evalCPS(""" + a = ""; + try { + a += "1"; + throw new Exception("foo"); + a += "2"; + } finally { + a += "3"; + return a; + } +""") + assert x=="13"; + } + + @Test + void tryAndFinally_returnFromCatch() { + def x = evalCPS(""" + a = ""; + try { + a += "1"; + throw new Exception("foo"); + a += "2"; + } catch (Exception e) { + a += "3"; + return a; + } finally { + a += "4"; + } +""") + assert x=="13"; + } + + @Test + void tryAndFinally_returnFromCatch2() { + def x = evalCPSonly(""" + a = new StringBuilder(); + try { + a.append("1"); + throw new Exception("foo"); + a.append("2"); + } catch (Exception e) { + a.append("3"); + return a; + } finally { + a.append("4"); + } +""") + assert x.toString()=="134"; + } } From 60a273809fd0aaf84a08e48f183f76784c843583 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 5 May 2014 13:24:27 -0500 Subject: [PATCH 204/932] Added "!b" handling --- .../groovy/cps/CpsTransformer.groovy | 6 ++-- .../com/cloudbees/groovy/cps/Builder.java | 8 +++++ .../cloudbees/groovy/cps/impl/NotBlock.java | 29 +++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 281f44227..21722215b 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -756,8 +756,10 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - void visitNotExpression(NotExpression expression) { - throw new UnsupportedOperationException(); + void visitNotExpression(NotExpression exp) { + makeNode("not") { + visit(exp.expression) + } } void visitUnaryMinusExpression(UnaryMinusExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index c85cc046a..0c473ecf4 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -17,6 +17,7 @@ import com.cloudbees.groovy.cps.impl.LocalVariableBlock; import com.cloudbees.groovy.cps.impl.LogicalOpBlock; import com.cloudbees.groovy.cps.impl.MapBlock; +import com.cloudbees.groovy.cps.impl.NotBlock; import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; import com.cloudbees.groovy.cps.impl.ReturnBlock; import com.cloudbees.groovy.cps.impl.SequenceBlock; @@ -328,6 +329,13 @@ public Block logicalOr(Block lhs, Block rhs) { return new LogicalOpBlock(lhs,rhs,false); } + /** + * !b + */ + public Block not(Block b) { + return new NotBlock(b); + } + public Block bitwiseAnd(int line, Block lhs, Block rhs) { return functionCall(line,lhs,"and",rhs); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java new file mode 100644 index 000000000..fdabf98df --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java @@ -0,0 +1,29 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; + +/** + * !b + * + * @author Kohsuke Kawaguchi + */ +public class NotBlock implements Block { + private final Block b; + + public NotBlock(Block b) { + this.b = b; + } + + public Next eval(Env e, final Continuation k) { + return b.eval(e,new Continuation() { + public Next receive(Object o) { + boolean b = DefaultTypeTransformation.booleanUnbox(o); + return k.receive(!b); + } + }); + } +} From de21e0f334a2d775170de8861b4f24e6b7c78725 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 5 May 2014 13:33:08 -0500 Subject: [PATCH 205/932] expanding coverage --- .../com/cloudbees/groovy/cps/CpsTransformer.groovy | 12 ++++++++---- src/main/java/com/cloudbees/groovy/cps/Builder.java | 8 ++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 21722215b..343f09292 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -762,12 +762,16 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitUnaryMinusExpression(UnaryMinusExpression expression) { - throw new UnsupportedOperationException(); + void visitUnaryMinusExpression(UnaryMinusExpression exp) { + makeNode("unaryMinus") { + visit(exp.expression) + } } - void visitUnaryPlusExpression(UnaryPlusExpression expression) { - throw new UnsupportedOperationException(); + void visitUnaryPlusExpression(UnaryPlusExpression exp) { + makeNode("unaryPlus") { + visit(exp.expression) + } } void visitBitwiseNegationExpression(BitwiseNegationExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 0c473ecf4..870e02af5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -287,6 +287,14 @@ public Block power(int line, Block lhs, Block rhs) { return functionCall(line,lhs, "power", rhs); } + public Block unaryMinus(int line, Block lhs) { + return staticCall(line,ScriptBytecodeAdapter.class, "unaryMinus", lhs); + } + + public Block unaryPlus(int line, Block lhs) { + return staticCall(line,ScriptBytecodeAdapter.class, "unaryPlus", lhs); + } + public Block compareEqual(int line, Block lhs, Block rhs) { return staticCall(line,ScriptBytecodeAdapter.class, "compareEqual", lhs, rhs); } From 5668d73cc158c3485b177f5ba40714e37f207100 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 5 May 2014 14:36:10 -0400 Subject: [PATCH 206/932] Revert "marking as package local" This reverts commit d1580e6610d77bfeb813bd0df7613207f1e6c8d1. Some clients were still referring to this class. --- src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java index ed143c941..7e65cae99 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java @@ -15,7 +15,8 @@ * * @author Kohsuke Kawaguchi */ -class TryBlockEnv extends ProxyEnv { +// TODO: should be package local once all the impls move into this class +public class TryBlockEnv extends ProxyEnv { private final Map handlers = new LinkedHashMap(); @Nullable private final Block finally_; From 101fa9652f1ebb0362369c11d8767ee2a12e2b60 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 5 May 2014 13:49:05 -0500 Subject: [PATCH 207/932] add cast operation --- .../com/cloudbees/groovy/cps/CpsTransformer.groovy | 13 +++++++++++-- src/main/java/com/cloudbees/groovy/cps/Builder.java | 12 ++++++++++++ .../com/cloudbees/groovy/cps/impl/NotBlock.java | 2 ++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 343f09292..a5b2371f8 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -288,6 +288,10 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor parent(new ConstantExpression(n,true)) } + private void literal(boolean b) { + parent(new ConstantExpression(b,true)) + } + void visitEmptyExpression(EmptyExpression e) { makeNode("noop") } @@ -778,8 +782,13 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - void visitCastExpression(CastExpression expression) { - throw new UnsupportedOperationException(); + void visitCastExpression(CastExpression exp) { + makeNode("cast") { + loc(exp) + visit(exp.expression) + literal(exp.type) + literal(exp.isCoerce()) + } } void visitArgumentlistExpression(ArgumentListExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 870e02af5..e12497f84 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -384,6 +384,18 @@ public Block postfixDec(int line, LValueBlock body) { return new ExcrementOperatorBlock(loc(line),"previous",false,body); } + /** + * Cast to type. + * + * @param coerce + * True for "exp as type" cast. false for "(type)exp" cast. + */ + public Block cast(int line, Block block, Class type, boolean coerce) { + return staticCall(line,ScriptBytecodeAdapter.class, + coerce ? "asType" : "castToType", + block,constant(type)); + } + /** * LHS.name(...) */ diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java index fdabf98df..6606f305c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java @@ -26,4 +26,6 @@ public Next receive(Object o) { } }); } + + private static final long serialVersionUID = 1L; } From a49b44ff62ce1506b53441bdf83bb2aa56687789 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 6 May 2014 15:11:53 -0400 Subject: [PATCH 208/932] Adding tests --- .../groovy/cps/CpsTransformer.groovy | 3 +++ .../com/cloudbees/groovy/cps/Builder.java | 2 +- .../groovy/cps/CpsTransformerTest.groovy | 22 +++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index a5b2371f8..a3d125033 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -762,18 +762,21 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor void visitNotExpression(NotExpression exp) { makeNode("not") { + loc(exp) visit(exp.expression) } } void visitUnaryMinusExpression(UnaryMinusExpression exp) { makeNode("unaryMinus") { + loc(exp) visit(exp.expression) } } void visitUnaryPlusExpression(UnaryPlusExpression exp) { makeNode("unaryPlus") { + loc(exp) visit(exp.expression) } } diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index e12497f84..5d48f0ed8 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -340,7 +340,7 @@ public Block logicalOr(Block lhs, Block rhs) { /** * !b */ - public Block not(Block b) { + public Block not(int line, Block b) { return new NotBlock(b); } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index b242f07ab..38d1b45f0 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -304,4 +304,26 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert e.message=="with message. Expression: assert (1+2) == 4 : \"with message\"" } } + + @Test + void unaryOps() { + assert evalCPS(""" + def x = 5; + def y = -x; + def z = +x; + + return y+z; +""")==0; + } + + @Test + void not() { + assert evalCPS(""" + def x = true; + def y = !x; + def z = !y; + + return "y="+y+",z="+z; +""")=="y=false,z=true"; + } } From 5ee15a13aa4dcb99ece968fdbffaa69dfd1ceb0a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 6 May 2014 15:18:39 -0400 Subject: [PATCH 209/932] Implemented more operators --- .../groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 7 +++++-- src/main/java/com/cloudbees/groovy/cps/Builder.java | 4 ++++ .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 8 ++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index a3d125033..d27ca4574 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -781,8 +781,11 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitBitwiseNegationExpression(BitwiseNegationExpression expression) { - throw new UnsupportedOperationException(); + void visitBitwiseNegationExpression(BitwiseNegationExpression exp) { + makeNode("bitwiseNegation") { + loc(exp) + visit(exp.expression) + } } void visitCastExpression(CastExpression exp) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 5d48f0ed8..7231212d4 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -356,6 +356,10 @@ public Block bitwiseXor(int line, Block lhs, Block rhs) { return functionCall(line,lhs,"xor",rhs); } + public Block bitwiseNegation(int line, Block b) { + return staticCall(line,ScriptBytecodeAdapter.class,"bitwiseNegate",b); + } + /** * ++x */ diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 38d1b45f0..44b4ebca6 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -326,4 +326,12 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { return "y="+y+",z="+z; """)=="y=false,z=true"; } + + @Test + void bitwiseNegative() { + assert evalCPS(""" + int x = 32; + return ~x; +""")==-33; + } } From 00c046f8791d3e3f1dedf9441e36892b19e8ea60 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 6 May 2014 15:36:16 -0400 Subject: [PATCH 210/932] Implemented GString --- .../com/cloudbees/groovy/cps/CpsTransformer.groovy | 12 ++++++++++-- src/main/java/com/cloudbees/groovy/cps/Builder.java | 10 ++++++++++ .../cloudbees/groovy/cps/CpsTransformerTest.groovy | 8 ++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index d27ca4574..3d4ee2ca4 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -744,8 +744,16 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitGStringExpression(GStringExpression expression) { - throw new UnsupportedOperationException(); + void visitGStringExpression(GStringExpression exp) { + makeNode("gstring") { + loc(exp) + makeNode("list") { + visit(exp.values) + } + makeNode("list") { + visit(exp.strings) + } + } } void visitArrayExpression(ArrayExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 7231212d4..7f73a61e5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -27,6 +27,7 @@ import com.cloudbees.groovy.cps.impl.VariableDeclBlock; import com.cloudbees.groovy.cps.impl.WhileBlock; import groovy.lang.Closure; +import org.codehaus.groovy.runtime.GStringImpl; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import java.util.List; @@ -464,6 +465,15 @@ public Block assert_(Block cond, String sourceText) { return assert_(cond,null_(),sourceText); } + /** + * "Foo bar zot ${x}" kind of string + */ + public Block gstring(int line, Block listOfValues, Block listOfStrings) { + return new_(line, GStringImpl.class, + cast(line,listOfValues, Object[].class,true), + cast(line,listOfStrings,String[].class,true)); + } + private SourceLocation loc(int line) { return new SourceLocation(loc,line); } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 44b4ebca6..deedfbf15 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -334,4 +334,12 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { return ~x; """)==-33; } + + @Test + void gstring() { + assert evalCPS(''' + def x = "foo"; + return "hello ${1+3}=${x}"; +''')=="hello 4=foo"; + } } From 181c413bff14bb3006223c4a7b67675d9cce3b15 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 7 May 2014 13:55:11 -0400 Subject: [PATCH 211/932] Implemented the backside of the switch/case statements --- .../groovy/cps/CpsTransformer.groovy | 3 +- .../com/cloudbees/groovy/cps/Builder.java | 6 + .../cloudbees/groovy/cps/CaseExpression.java | 25 ++++ .../cloudbees/groovy/cps/impl/CaseEnv.java | 28 +++++ .../groovy/cps/impl/SwitchBlock.java | 108 ++++++++++++++++++ 5 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/CaseExpression.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/CaseEnv.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 3d4ee2ca4..dd628b4da 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -399,7 +399,8 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitCaseStatement(CaseStatement statement) { - throw new UnsupportedOperationException(); + // switch-case is handled entirely in visitSwitch + throw new AssertionError(); } void visitBreakStatement(BreakStatement statement) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 7f73a61e5..22df2526b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -22,6 +22,7 @@ import com.cloudbees.groovy.cps.impl.ReturnBlock; import com.cloudbees.groovy.cps.impl.SequenceBlock; import com.cloudbees.groovy.cps.impl.SourceLocation; +import com.cloudbees.groovy.cps.impl.SwitchBlock; import com.cloudbees.groovy.cps.impl.ThrowBlock; import com.cloudbees.groovy.cps.impl.TryCatchBlock; import com.cloudbees.groovy.cps.impl.VariableDeclBlock; @@ -30,6 +31,7 @@ import org.codehaus.groovy.runtime.GStringImpl; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +import java.util.Arrays; import java.util.List; import static com.cloudbees.groovy.cps.Block.*; @@ -474,6 +476,10 @@ public Block gstring(int line, Block listOfValues, Block listOfStrings) { cast(line,listOfStrings,String[].class,true)); } + public Block switchCase(String label, Block switchExp, Block defaultStmt, CaseExpression... caseExps) { + return new SwitchBlock(label, switchExp, defaultStmt, Arrays.asList(caseExps)); + } + private SourceLocation loc(int line) { return new SourceLocation(loc,line); } diff --git a/src/main/java/com/cloudbees/groovy/cps/CaseExpression.java b/src/main/java/com/cloudbees/groovy/cps/CaseExpression.java new file mode 100644 index 000000000..6de56017b --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/CaseExpression.java @@ -0,0 +1,25 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.SourceLocation; + +import java.io.Serializable; + +/** + * @author Kohsuke Kawaguchi + */ +public class CaseExpression implements Serializable { + /** + * Expression in the case that decides the match. + */ + public final Block matcher; + public final Block body; + public final SourceLocation loc; + + public CaseExpression(SourceLocation loc, Block matcher, Block body) { + this.loc = loc; + this.matcher = matcher; + this.body = body; + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CaseEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CaseEnv.java new file mode 100644 index 000000000..06a7369f6 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CaseEnv.java @@ -0,0 +1,28 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; + +/** + * @author Kohsuke Kawaguchi + */ +public class CaseEnv extends ProxyEnv { + final String label; + final Continuation break_; + + public CaseEnv(Env parent, String label, Continuation break_) { + super(parent); + this.label = label; + this.break_ = break_; + } + + @Override + public Continuation getBreakAddress(String label) { + if (labelMatch(label)) return break_; + else return super.getBreakAddress(label); + } + + private boolean labelMatch(String given) { + return given==null || given.equals(label); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java new file mode 100644 index 000000000..81e922b76 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java @@ -0,0 +1,108 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.CaseExpression; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; + +import java.util.List; + +/** + * switch/case statement. + * + * @author Kohsuke Kawaguchi + */ +public class SwitchBlock implements Block { + final String label; + final Block exp; + final List cases; + + /** + * Statement to run in case there's no match. Can be null. + */ + final Block default_; + + public SwitchBlock(String label, Block exp, Block default_, List cases) { + this.label = label; + this.exp = exp; + this.cases = cases; + this.default_ = default_; + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).then(exp, e, test); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + /** + * {@link Env} to evaluate case statements in, that changes the target of the "break" statement. + */ + final CaseEnv caseEnv; + + /** + * Result of evaluating {@link #exp} + */ + Object switchValue; + + /** + * {@link CaseExpression} in {@link #cases} that we are testing. + */ + int index; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + this.caseEnv = new CaseEnv(e,label,k); + } + + public Next test(Object value) { + this.switchValue = value; + return matcher(); + } + + private Next matcher() { + if (index Date: Wed, 7 May 2014 14:00:37 -0400 Subject: [PATCH 212/932] Tied switch/case to CPS transformation. --- .../groovy/cps/CpsTransformer.groovy | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index dd628b4da..8bea90071 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -14,7 +14,6 @@ import org.codehaus.groovy.control.SourceUnit import org.codehaus.groovy.control.customizers.CompilationCustomizer import org.codehaus.groovy.runtime.powerassert.SourceText import org.codehaus.groovy.syntax.Token -import org.codehaus.groovy.syntax.Types import java.lang.annotation.Annotation import java.lang.reflect.Modifier @@ -394,13 +393,21 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitSwitch(SwitchStatement statement) { - throw new UnsupportedOperationException(); + void visitSwitch(SwitchStatement stmt) { + makeNode("switchCase") { + literal(stmt.statementLabel) + visit(stmt.expression) + visit(stmt.defaultStatement) + visit(stmt.caseStatements) + } } - void visitCaseStatement(CaseStatement statement) { - // switch-case is handled entirely in visitSwitch - throw new AssertionError(); + void visitCaseStatement(CaseStatement stmt) { + makeNode(CASE_EXPRESSION_TYPE) { + loc(stmt) + visit(stmt.expression) + visit(stmt.code) + } } void visitBreakStatement(BreakStatement statement) { @@ -819,6 +826,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(CpsFunction.class); + private static final ClassNode CASE_EXPRESSION_TYPE = ClassHelper.makeCached(CaseExpression.class); private static final ClassNode CATCH_EXPRESSION_TYPE = ClassHelper.makeCached(CatchExpression.class); private static final ClassNode BUILDER_TYPE = ClassHelper.makeCached(Builder.class); private static final ClassNode CPSCALLINVK_TYPE = ClassHelper.makeCached(CpsCallableInvocation.class); From 7f4c8beb95c968e0068de8352eb3fd8ee4333987 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 7 May 2014 15:12:51 -0400 Subject: [PATCH 213/932] I wasn't handling the fall through correctly --- .../groovy/cps/impl/SwitchBlock.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java index 81e922b76..67a4f57e9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java @@ -86,14 +86,29 @@ private Next matcher(Object caseValue) { return throwException(e, t, getCase().loc, new ReferenceStackTrace()); } - if (b) - return then(getCase().body, caseEnv, k); - else { + if (b) { + // started executing the body + return body(null); + } else { index++; return matcher(); } } + /** + * Executes the body and falls through to the next body. + */ + private Next body(Object _) { + if (index==cases.size()) { + // that was the last block + return k.receive(null); + } else { + Next n = then(getCase().body, caseEnv, body); + index++; + return n; + } + } + private CaseExpression getCase() { return cases.get(index); } @@ -103,6 +118,7 @@ private CaseExpression getCase() { static final ContinuationPtr test = new ContinuationPtr(ContinuationImpl.class,"test"); static final ContinuationPtr matcher = new ContinuationPtr(ContinuationImpl.class,"matcher"); + static final ContinuationPtr body = new ContinuationPtr(ContinuationImpl.class,"body"); private static final long serialVersionUID = 1L; } From 86df38d09ed3affc512499d4fd908fd11f8e3194 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 7 May 2014 15:20:15 -0400 Subject: [PATCH 214/932] The first test for switch/case and bug fixes discovered by it --- .../groovy/cps/CpsTransformer.groovy | 5 +-- .../com/cloudbees/groovy/cps/Builder.java | 9 +++- .../groovy/cps/impl/SwitchBlock.java | 4 +- .../groovy/cps/impl/SwitchBlockTest.groovy | 44 +++++++++++++++++++ 4 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 8bea90071..274efa13e 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -394,7 +394,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitSwitch(SwitchStatement stmt) { - makeNode("switchCase") { + makeNode("switch_") { literal(stmt.statementLabel) visit(stmt.expression) visit(stmt.defaultStatement) @@ -403,7 +403,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } void visitCaseStatement(CaseStatement stmt) { - makeNode(CASE_EXPRESSION_TYPE) { + makeNode("case_") { loc(stmt) visit(stmt.expression) visit(stmt.code) @@ -826,7 +826,6 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(CpsFunction.class); - private static final ClassNode CASE_EXPRESSION_TYPE = ClassHelper.makeCached(CaseExpression.class); private static final ClassNode CATCH_EXPRESSION_TYPE = ClassHelper.makeCached(CatchExpression.class); private static final ClassNode BUILDER_TYPE = ClassHelper.makeCached(Builder.class); private static final ClassNode CPSCALLINVK_TYPE = ClassHelper.makeCached(CpsCallableInvocation.class); diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 22df2526b..12c6e935c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -476,10 +476,17 @@ public Block gstring(int line, Block listOfValues, Block listOfStrings) { cast(line,listOfStrings,String[].class,true)); } - public Block switchCase(String label, Block switchExp, Block defaultStmt, CaseExpression... caseExps) { + /** + * @see #case_(int, Block, Block) + */ + public Block switch_(String label, Block switchExp, Block defaultStmt, CaseExpression... caseExps) { return new SwitchBlock(label, switchExp, defaultStmt, Arrays.asList(caseExps)); } + public CaseExpression case_(int line, Block matcher, Block body) { + return new CaseExpression(loc(line), matcher, body); + } + private SourceLocation loc(int line) { return new SourceLocation(loc,line); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java index 67a4f57e9..906b478e9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java @@ -78,7 +78,7 @@ private Next matcher() { /** * Called after the case expression is evaluated to decide if we are going to run the statement. */ - private Next matcher(Object caseValue) { + public Next matcher(Object caseValue) { boolean b; try { b = ScriptBytecodeAdapter.isCase(switchValue, caseValue); @@ -98,7 +98,7 @@ private Next matcher(Object caseValue) { /** * Executes the body and falls through to the next body. */ - private Next body(Object _) { + public Next body(Object _) { if (index==cases.size()) { // that was the last block return k.receive(null); diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy new file mode 100644 index 000000000..40da8c2ed --- /dev/null +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy @@ -0,0 +1,44 @@ +package com.cloudbees.groovy.cps.impl + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest +import org.junit.Test + +/** + * Tests + * + * - exception in switch exp / case exp + * - testing case statement that has isCase method (like regexp) + * - break from within the switch statement + * - two case matching + * - no case matching with default + * - no case matching without default + * - fall through + * + * @author Kohsuke Kawaguchi + */ +class SwitchBlockTest extends AbstractGroovyCpsTest { + @Test + void basic() { + assert evalCPS(""" + def x = 2; + def y; + switch (x) { + case 1: + y = "one"; + break; + case 2: + y = "two"; + break; + case 3: + y = "three"; + break; + } + return y; + """)=="two"; + } + + @Test + void exceptionInSwithExp() { + + } +} From c31c2319d87e18c171e610b258f7e3a474de9aef Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 7 May 2014 15:22:52 -0400 Subject: [PATCH 215/932] More test cases --- .../groovy/cps/impl/SwitchBlockTest.groovy | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy index 40da8c2ed..967f95812 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy @@ -37,8 +37,49 @@ class SwitchBlockTest extends AbstractGroovyCpsTest { """)=="two"; } + /** + * Null in the switch expression. + */ @Test - void exceptionInSwithExp() { + void nullSwitchExp() { + assert evalCPS(""" + def x = null; + def y = 'zero'; + switch (x) { + case 1: + y = "one"; + break; + case 2: + y = "two"; + break; + case 3: + y = "three"; + break; + } + return y; + """)=="zero"; + } + /** + * Null in the case expression. + */ + @Test + void nullInCaseExp() { + assert evalCPS(""" + def x = null; + def y = 'zero'; + switch (x) { + case 1: + y = "one"; + break; + case null: + y = "null!"; + break; + case 3: + y = "three"; + break; + } + return y; + """)=="null!"; } } From da0dace6cf374e4ad5fbca7839ff8876d4b63221 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 7 May 2014 15:30:04 -0400 Subject: [PATCH 216/932] More tests --- .../groovy/cps/impl/SwitchBlockTest.groovy | 60 ++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy index 967f95812..afb183d39 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy @@ -3,10 +3,11 @@ package com.cloudbees.groovy.cps.impl import com.cloudbees.groovy.cps.AbstractGroovyCpsTest import org.junit.Test +import javax.naming.NamingException + /** * Tests * - * - exception in switch exp / case exp * - testing case statement that has isCase method (like regexp) * - break from within the switch statement * - two case matching @@ -82,4 +83,61 @@ class SwitchBlockTest extends AbstractGroovyCpsTest { return y; """)=="null!"; } + + /** + * Exception in the switch expression. + */ + @Test + void exceptionInSwitchExp() { + assert evalCPS(""" + @WorkflowMethod + def foo() { + throw new javax.naming.NamingException(); + } + + try { + switch (foo()) { + case 1: + y = "one"; + break; + case 2: + y = "two!"; + break; + } + return null; + } catch (e) { + return e.class; + } + """)==NamingException.class; + } + + /** + * Exception in the case expression. + */ + @Test + void exceptionInCaseExp() { + assert evalCPS(""" + @WorkflowMethod + def foo() { + throw new javax.naming.NamingException(); + } + + try { + switch (5) { + case 1: + y = "one"; + break; + case foo(): + y = "two"; + break; + case 3: + y = "three"; + break; + } + return null; + } catch (e) { + return e.class; + } + """)==NamingException.class; + } } From 76625571c5f4e13ea48e0190a95468124007d21e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 7 May 2014 15:36:45 -0400 Subject: [PATCH 217/932] Testing the isCase method --- .../groovy/cps/impl/SwitchBlockTest.groovy | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy index afb183d39..7d400bc2f 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy @@ -8,7 +8,6 @@ import javax.naming.NamingException /** * Tests * - * - testing case statement that has isCase method (like regexp) * - break from within the switch statement * - two case matching * - no case matching with default @@ -140,4 +139,23 @@ class SwitchBlockTest extends AbstractGroovyCpsTest { } """)==NamingException.class; } + + @Test + void isCase() { + assert evalCPS(""" + def x = 5; + switch (x) { + case 1: + y = "one"; + break; + case [2,4,6,8]: + y = "even"; + break; + case [3,5,7,9]: + y = "odd"; + break; + } + return y; + """)=="odd"; + } } From 134b9af699095f354da0972d385939f8baa92e18 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 7 May 2014 15:37:06 -0400 Subject: [PATCH 218/932] 'break' is already tested heavily --- .../groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy index 7d400bc2f..cdb9a4182 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy @@ -8,7 +8,6 @@ import javax.naming.NamingException /** * Tests * - * - break from within the switch statement * - two case matching * - no case matching with default * - no case matching without default From 35744cfc3a5a36d7ffa9dc652d055745203f8eb6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 8 May 2014 17:02:49 -0400 Subject: [PATCH 219/932] More tests for switch/case --- .../groovy/cps/impl/SwitchBlockTest.groovy | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy index cdb9a4182..0acc7938e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy @@ -8,7 +8,6 @@ import javax.naming.NamingException /** * Tests * - * - two case matching * - no case matching with default * - no case matching without default * - fall through @@ -157,4 +156,31 @@ class SwitchBlockTest extends AbstractGroovyCpsTest { return y; """)=="odd"; } + + /** + * Two matching case statements. + */ + @Test + void twoMatchingCases() { + assert evalCPS(""" + def x = 2; + def y; + switch (x) { + case 1: + y = "one"; + break; + case 2: + y = "two"; + break; + case 2: + y = "TWO"; + break; + case 3: + y = "three"; + break; + } + return y; + """)=="two"; + } + } From f990e2319de3a1bf36a9266b11ec1d34d84a9a5a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 8 May 2014 17:05:31 -0400 Subject: [PATCH 220/932] More tests for switch/case --- .../groovy/cps/impl/SwitchBlockTest.groovy | 52 +++++++++++++++++-- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy index 0acc7938e..810d193ec 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy @@ -6,10 +6,8 @@ import org.junit.Test import javax.naming.NamingException /** - * Tests + * Tests for switch/case * - * - no case matching with default - * - no case matching without default * - fall through * * @author Kohsuke Kawaguchi @@ -183,4 +181,52 @@ class SwitchBlockTest extends AbstractGroovyCpsTest { """)=="two"; } + /** + * Matches to the default clause + */ + @Test + void defaultClause() { + assert evalCPS(""" + def x = 5; + def y; + switch (x) { + case 1: + y = "one"; + break; + default: + y = "other"; + break; + case 2: + y = "two"; + break; + case 3: + y = "three"; + break; + } + return y; + """)=="other"; + } + + /** + * Matches to nothing + */ + @Test + void noMatch() { + assert evalCPS(""" + def x = 5; + def y = "initial"; + switch (x) { + case 1: + y = "one"; + break; + case 2: + y = "two"; + break; + case 3: + y = "three"; + break; + } + return y; + """)=="initial"; + } } From ff403ba48a36c9986d1f0fc0c0ef7f3a7cc00bc2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 8 May 2014 17:11:32 -0400 Subject: [PATCH 221/932] Groovy itself doesn't handle this correctly. --- .../groovy/cps/impl/SwitchBlockTest.groovy | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy index 810d193ec..bc4c5c2c0 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps.impl import com.cloudbees.groovy.cps.AbstractGroovyCpsTest +import org.junit.Ignore import org.junit.Test import javax.naming.NamingException @@ -229,4 +230,54 @@ class SwitchBlockTest extends AbstractGroovyCpsTest { return y; """)=="initial"; } + + /** + * Case match and fall through the rest. + */ + @Test + void fallthrough() { + assert evalCPS(""" + def x = 1; + def y = ""; + switch (x) { + case 1: + y += "one"; + // fall through + case 2: + y += "two"; + // fall through + case 3: + y += "three"; + // fall through + } + return y; + """)=="onetwothree"; + } + + /** + * Default match and fall through + */ + @Test + @Ignore("Groovy doesn't handle this correctly") + void fallthroughWithDefault() { + assert evalCPS(""" + def x = 9; + def y = ""; + switch (x) { + default: + y += "other"; + // fall through + case 1: + y += "one"; + // fall through + case 2: + y += "two"; + // fall through + case 3: + y += "three"; + // fall through + } + return y; + """)=="otheronetwothree"; + } } From 8a406c60bab0f41d92426248abbd40666b6eeab3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 8 May 2014 17:11:43 -0400 Subject: [PATCH 222/932] These test cases are complete --- .../groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy index bc4c5c2c0..c1a2922f8 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy @@ -9,8 +9,6 @@ import javax.naming.NamingException /** * Tests for switch/case * - * - fall through - * * @author Kohsuke Kawaguchi */ class SwitchBlockTest extends AbstractGroovyCpsTest { From 6323446a587c709df2a6e58c70d53811bf998934 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 8 May 2014 17:37:16 -0400 Subject: [PATCH 223/932] Implemented support for static method call expression According to the usage search, this AST node gets created only in very limited situations --- .../groovy/cps/CpsTransformer.groovy | 9 ++++- .../groovy/cps/ContinuableTest.groovy | 38 +++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 274efa13e..5f3568c2d 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -436,8 +436,13 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitStaticMethodCallExpression(StaticMethodCallExpression expression) { - throw new UnsupportedOperationException(); + void visitStaticMethodCallExpression(StaticMethodCallExpression exp) { + makeNode("staticCall") { + loc(exp) + literal(exp.ownerType) + literal(exp.method) + visit(((TupleExpression)exp.arguments).expressions) + } } void visitConstructorCallExpression(ConstructorCallExpression call) { diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 099892d2b..7afba0153 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -186,4 +186,42 @@ Script1.run(Script1.groovy:17) assert c.stackTrace.isEmpty() } + /** + * Triggers the use of {@link org.codehaus.groovy.ast.expr.StaticMethodCallExpression} + */ + @Test + public void staticMethod1() { + def s = csh.parse("import static java.lang.Class.forName; forName('java.lang.Integer')") + def c = new Continuable(s); + def r = c.run(null) + assert r==Integer.class + } + + /** + * Static method call expression with two arguments + */ + @Test + public void staticMethod2() { + def s = csh.parse("import static java.lang.Integer.toString; toString(31,16)") + def c = new Continuable(s); + def r = c.run(null) + assert r=="1f" + } + + /** + * Static method call expression with no arguments + */ + @Test + public void staticMethod0() { + def s = csh.parse("import static com.cloudbees.groovy.cps.ContinuableTest.StaticMethodHost.methodWithNoArgs; methodWithNoArgs()") + def c = new Continuable(s); + def r = c.run(null) + assert r=="hello" + } + + public static class StaticMethodHost { + public static String methodWithNoArgs() { + return "hello"; + } + } } From ea04a3143889ceab11c150c6b4ded59b0138a4a3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 8 May 2014 21:57:53 -0400 Subject: [PATCH 224/932] Implemented "exp ? exp : exp" --- .../groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 8 ++++++-- src/main/java/com/cloudbees/groovy/cps/Builder.java | 4 ++++ .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 7 +++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 5f3568c2d..1571dce8e 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -453,8 +453,12 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitTernaryExpression(TernaryExpression expression) { - throw new UnsupportedOperationException(); + void visitTernaryExpression(TernaryExpression exp) { + makeNode("ternaryOp") { + visit(exp.booleanExpression) + visit(exp.trueExpression) + visit(exp.falseExpression) + } } void visitShortTernaryExpression(ElvisOperatorExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 12c6e935c..8675d7432 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -298,6 +298,10 @@ public Block unaryPlus(int line, Block lhs) { return staticCall(line,ScriptBytecodeAdapter.class, "unaryPlus", lhs); } + public Block ternaryOp(Block cond, Block trueExp, Block falseExp) { + return if_(cond,trueExp,falseExp); + } + public Block compareEqual(int line, Block lhs, Block rhs) { return staticCall(line,ScriptBytecodeAdapter.class, "compareEqual", lhs, rhs); } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index deedfbf15..f65097b8e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -342,4 +342,11 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { return "hello ${1+3}=${x}"; ''')=="hello 4=foo"; } + + @Test + void ternaryOp() { + assert evalCPS(''' + return true ? 5 : null.makeCall(); +''')==5; + } } From f8c8b76e732efd80f7fdf7839ca06d4afb4779db Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 8 May 2014 22:04:28 -0400 Subject: [PATCH 225/932] added another test for a ternary operator --- .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index f65097b8e..aa46f939f 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -349,4 +349,9 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { return true ? 5 : null.makeCall(); ''')==5; } + + @Test + void ternaryOp2() { + assert evalCPS("false ? bogus.noSuchCall() : 'zot'")=='zot'; + } } From 246901072ec664ca40f34b03ded32c09a7c143ac Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 8 May 2014 22:06:10 -0400 Subject: [PATCH 226/932] Implemented elvis operator --- .../groovy/cps/CpsTransformer.groovy | 7 ++- .../com/cloudbees/groovy/cps/Builder.java | 8 +++ .../cloudbees/groovy/cps/impl/ElvisBlock.java | 49 +++++++++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 6 +++ 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 1571dce8e..5cb7443fc 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -461,8 +461,11 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitShortTernaryExpression(ElvisOperatorExpression expression) { - throw new UnsupportedOperationException(); + void visitShortTernaryExpression(ElvisOperatorExpression exp) { + makeNode("elvisOp") { + visit(exp.booleanExpression) + visit(exp.falseExpression) + } } private static Map BINARY_OP_TO_BUILDER_METHOD = [ diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 8675d7432..357b01d05 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -8,6 +8,7 @@ import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.ContinueBlock; import com.cloudbees.groovy.cps.impl.DoWhileBlock; +import com.cloudbees.groovy.cps.impl.ElvisBlock; import com.cloudbees.groovy.cps.impl.ExcrementOperatorBlock; import com.cloudbees.groovy.cps.impl.ForInLoopBlock; import com.cloudbees.groovy.cps.impl.ForLoopBlock; @@ -302,6 +303,13 @@ public Block ternaryOp(Block cond, Block trueExp, Block falseExp) { return if_(cond,trueExp,falseExp); } + /** + * x ?: y + */ + public Block elvisOp(Block cond, Block falseExp) { + return new ElvisBlock(cond,falseExp); + } + public Block compareEqual(int line, Block lhs, Block rhs) { return staticCall(line,ScriptBytecodeAdapter.class, "compareEqual", lhs, rhs); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java new file mode 100644 index 000000000..2652294c9 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java @@ -0,0 +1,49 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; + +/** + * x ?: y + * + * @author Kohsuke Kawaguchi + */ +public class ElvisBlock implements Block { + final Block cond, falseExp; + + + public ElvisBlock(Block cond, Block falseExp) { + this.cond = cond; + this.falseExp = falseExp; + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).then(cond,e,jump); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next jump(Object cond) { + if (asBoolean(cond)) { + return k.receive(cond); + } else { + return then(falseExp, e, k); + } + } + + private static final long serialVersionUID = 1L; + } + + static final ContinuationPtr jump = new ContinuationPtr(ContinuationImpl.class,"jump"); + + private static final long serialVersionUID = 1L; +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index aa46f939f..030e28317 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -354,4 +354,10 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { void ternaryOp2() { assert evalCPS("false ? bogus.noSuchCall() : 'zot'")=='zot'; } + + @Test + void elvisOp() { + assert evalCPS("def x=0; return ++x ?: -1")==1; + assert evalCPS("def x=0; return x++ ?: -1")==-1; + } } From 2a3431de2e492556648b5cb2dceabcbf1fafb980 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 8 May 2014 22:33:51 -0400 Subject: [PATCH 227/932] Implemented FieldExpression support, but compiler doesn't appear to produce this. --- .../groovy/cps/CpsTransformer.groovy | 17 +++- .../com/cloudbees/groovy/cps/Builder.java | 23 ++++-- .../groovy/cps/impl/ContinuationGroup.java | 2 + .../groovy/cps/impl/StaticFieldBlock.java | 82 +++++++++++++++++++ 4 files changed, 113 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/StaticFieldBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 5cb7443fc..ed3eb39bb 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -688,8 +688,21 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor throw new UnsupportedOperationException(); } - void visitFieldExpression(FieldExpression expression) { - throw new UnsupportedOperationException(); + void visitFieldExpression(FieldExpression exp) { + def f = exp.field + if (f.isStatic()) { + makeNode("staticField") { + loc(exp) + literal(f.type) + literal(exp.fieldName) + } + } else { + makeNode("property") { + loc(exp) + makeNode("this_") + literal(exp.fieldName) + } + } } void visitMethodPointerExpression(MethodPointerExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 357b01d05..0b39717df 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -23,6 +23,7 @@ import com.cloudbees.groovy.cps.impl.ReturnBlock; import com.cloudbees.groovy.cps.impl.SequenceBlock; import com.cloudbees.groovy.cps.impl.SourceLocation; +import com.cloudbees.groovy.cps.impl.StaticFieldBlock; import com.cloudbees.groovy.cps.impl.SwitchBlock; import com.cloudbees.groovy.cps.impl.ThrowBlock; import com.cloudbees.groovy.cps.impl.TryCatchBlock; @@ -268,7 +269,7 @@ public Block plusEqual(int line, LValueBlock lhs, Block rhs) { } public Block minus(int line, Block lhs, Block rhs) { - return functionCall(line,lhs,"minus",rhs); + return functionCall(line, lhs, "minus", rhs); } public Block multiply(int line, Block lhs, Block rhs) { @@ -284,7 +285,7 @@ public Block intdiv(int line, Block lhs, Block rhs) { } public Block mod(int line, Block lhs, Block rhs) { - return functionCall(line,lhs,"mod",rhs); + return functionCall(line, lhs, "mod", rhs); } public Block power(int line, Block lhs, Block rhs) { @@ -292,7 +293,7 @@ public Block power(int line, Block lhs, Block rhs) { } public Block unaryMinus(int line, Block lhs) { - return staticCall(line,ScriptBytecodeAdapter.class, "unaryMinus", lhs); + return staticCall(line, ScriptBytecodeAdapter.class, "unaryMinus", lhs); } public Block unaryPlus(int line, Block lhs) { @@ -300,7 +301,7 @@ public Block unaryPlus(int line, Block lhs) { } public Block ternaryOp(Block cond, Block trueExp, Block falseExp) { - return if_(cond,trueExp,falseExp); + return if_(cond, trueExp, falseExp); } /** @@ -311,19 +312,19 @@ public Block elvisOp(Block cond, Block falseExp) { } public Block compareEqual(int line, Block lhs, Block rhs) { - return staticCall(line,ScriptBytecodeAdapter.class, "compareEqual", lhs, rhs); + return staticCall(line, ScriptBytecodeAdapter.class, "compareEqual", lhs, rhs); } public Block compareNotEqual(int line, Block lhs, Block rhs) { - return staticCall(line,ScriptBytecodeAdapter.class, "compareNotEqual", lhs, rhs); + return staticCall(line, ScriptBytecodeAdapter.class, "compareNotEqual", lhs, rhs); } public Block compareTo(int line, Block lhs, Block rhs) { - return staticCall(line,ScriptBytecodeAdapter.class,"compareTo",lhs,rhs); + return staticCall(line, ScriptBytecodeAdapter.class, "compareTo", lhs, rhs); } public Block lessThan(int line, Block lhs, Block rhs) { - return staticCall(line,ScriptBytecodeAdapter.class,"compareLessThan",lhs,rhs); + return staticCall(line, ScriptBytecodeAdapter.class, "compareLessThan", lhs, rhs); } public Block lessThanEqual(int line, Block lhs, Block rhs) { @@ -335,7 +336,7 @@ public Block greaterThan(int line, Block lhs, Block rhs) { } public Block greaterThanEqual(int line, Block lhs, Block rhs) { - return staticCall(line,ScriptBytecodeAdapter.class,"compareGreaterThanEqual",lhs,rhs); + return staticCall(line, ScriptBytecodeAdapter.class, "compareGreaterThanEqual", lhs, rhs); } /** @@ -438,6 +439,10 @@ public LValueBlock property(int line, Block lhs, Block property) { return new PropertyAccessBlock(loc(line),lhs,property); } + public LValueBlock staticField(int line, Class type, String name) { + return new StaticFieldBlock(loc(line),type,name); + } + public Block setProperty(int line, Block lhs, String property, Block rhs) { return setProperty(line, lhs, constant(property), rhs); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index b0671de40..e5da704e5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -9,6 +9,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; +import javax.annotation.CheckReturnValue; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -154,6 +155,7 @@ private boolean eq(Object x, Object y) { * function that you call into {@link CallSite}. Used to identify the section of {@coe t.getStackTrace()} * that belong to the caller of groovy-cps and the invocation of {@link CallSite} induced by the Groovy script. */ + @CheckReturnValue protected Next throwException(Env e, Throwable t, SourceLocation loc, ReferenceStackTrace ref) { fixupStackTrace(e, t,loc, ref); return e.getExceptionHandler(t.getClass()).receive(t); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/StaticFieldBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/StaticFieldBlock.java new file mode 100644 index 000000000..f6f24f689 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/StaticFieldBlock.java @@ -0,0 +1,82 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.LValue; +import com.cloudbees.groovy.cps.LValueBlock; +import com.cloudbees.groovy.cps.Next; + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; + +/** + * @author Kohsuke Kawaguchi + */ +public class StaticFieldBlock extends LValueBlock { + private final Class lhs; + private final String name; + private final SourceLocation loc; + + public StaticFieldBlock(SourceLocation loc, Class lhs, String name) { + this.lhs = lhs; + this.name = name; + this.loc = loc; + } + + public Next evalLValue(final Env e, final Continuation k) { + return k.receive(new LValueImpl(e)); + } + + class LValueImpl extends ContinuationGroup implements LValue { + private final Env e; + + public LValueImpl(Env e) { + this.e = e; + } + + private Field resolve() { + try { + Field f = lhs.getField(name); + if (Modifier.isStatic(f.getModifiers())) { + f.setAccessible(true); + return f; + } + } catch (NoSuchFieldException t) { + // fall through + } + return null; + } + + private Next throwNoSuchFieldError() { + return throwException(e,new NoSuchFieldError(lhs.getName()+"."+name), + loc,new ReferenceStackTrace()); + } + + public Next get(Continuation k) { + try { + Field r = resolve(); + if (r==null) + return throwNoSuchFieldError(); + return k.receive(r.get(null)); + } catch (IllegalAccessException t) { + return throwException(e,t,loc,new ReferenceStackTrace()); + } + } + + public Next set(Object v, Continuation k) { + try { + Field r = resolve(); + if (r==null) + return throwNoSuchFieldError(); + r.set(null, v); + return k.receive(null); + } catch (IllegalAccessException t) { + return throwException(e,t,loc,new ReferenceStackTrace()); + } + } + + private static final long serialVersionUID = 1L; + } + + private static final long serialVersionUID = 1L; +} From 0ae62f364e7a77c8f7df899d0f5ef8437646905c Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 9 May 2014 19:04:51 -0700 Subject: [PATCH 228/932] Adding the license --- LICENSE.txt | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 26 ++++---- 2 files changed, 190 insertions(+), 13 deletions(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 000000000..f433b1a53 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff --git a/pom.xml b/pom.xml index 1bdf3a187..798d663b6 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,9 @@ 4.0.0 - org.kohsuke - pom - 6 + com.cloudbees + cloudbees-oss-parent + 4 groovy-cps @@ -89,18 +89,10 @@ - scm:git:git@github.com/kohsuke/${project.artifactId}.git - scm:git:ssh://git@github.com/kohsuke/${project.artifactId}.git - http://${project.artifactId}.kohsuke.org/ + scm:git:git@github.com/cloudbees/${project.artifactId}.git + scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - - - github-pages - gitsite:git@github.com/kohsuke/${project.artifactId}.git - - - @@ -108,4 +100,12 @@ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + From ae32a935032dc9042d8b0ba1078799166bf99e92 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 9 May 2014 19:05:18 -0700 Subject: [PATCH 229/932] Not really 1.0 quality yet --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 798d663b6..5e56ccd7c 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 1.0-SNAPSHOT + 0.1-SNAPSHOT Groovy CPS Execution From 08837188f4583e1e63648fe3144b26cb886a5cce Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 9 May 2014 19:05:49 -0700 Subject: [PATCH 230/932] [maven-release-plugin] prepare release groovy-cps-0.1 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e56ccd7c..616d61f02 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.1-SNAPSHOT + 0.1 Groovy CPS Execution @@ -91,6 +91,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git + groovy-cps-0.1 From 55b57de9c7fdf506be026ca98fa44238c4feaee0 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 9 May 2014 19:05:53 -0700 Subject: [PATCH 231/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 616d61f02..cd7239f72 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.1 + 0.2-SNAPSHOT Groovy CPS Execution @@ -91,7 +91,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - groovy-cps-0.1 + HEAD From 8c8473a704daf5c90dab3fc00d050486299ec336 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 29 May 2014 13:11:10 -0700 Subject: [PATCH 232/932] implemented instanceOf --- .../groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 2 ++ src/main/java/com/cloudbees/groovy/cps/Builder.java | 4 ++++ .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index ed3eb39bb..a6fa2c0d2 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -468,6 +468,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } + // Constants from Token.type to a method on Builder private static Map BINARY_OP_TO_BUILDER_METHOD = [ (COMPARE_EQUAL) :"compareEqual", (COMPARE_NOT_EQUAL) :"compareNotEqual", @@ -490,6 +491,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor (MOD) :"mod", (POWER) :"power", (EQUAL) :"assign", + (KEYWORD_INSTANCEOF) :"instanceOf", ] /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 0b39717df..02df8ce78 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -416,6 +416,10 @@ public Block cast(int line, Block block, Class type, boolean coerce) { block,constant(type)); } + public Block instanceOf(int line, Block value, Block type) { + return functionCall(line,type,"isInstance",value); + } + /** * LHS.name(...) */ diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 030e28317..f48d81266 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -360,4 +360,12 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS("def x=0; return ++x ?: -1")==1; assert evalCPS("def x=0; return x++ ?: -1")==-1; } + + @Test + void instanceOf() { + assert evalCPS("null instanceof String")==false; + assert evalCPS("3 instanceof Integer")==true; + assert evalCPS("new RuntimeException() instanceof Exception")==true; + assert evalCPS("'12345' instanceof String")==true; + } } From 8a93e076ab087993f85e3970823ec4d264c2bb5f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 29 May 2014 13:22:20 -0700 Subject: [PATCH 233/932] Implemented more compound assignment operators --- .../groovy/cps/CpsTransformer.groovy | 51 ++++--------------- .../com/cloudbees/groovy/cps/Builder.java | 38 +++++++++++++- .../groovy/cps/CpsTransformerTest.groovy | 11 ++++ 3 files changed, 57 insertions(+), 43 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index a6fa2c0d2..c2a0702c8 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -480,16 +480,25 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor (LOGICAL_AND) :"logicanAnd", (LOGICAL_OR) :"logicanOr", (BITWISE_AND) :"bitwiseAnd", + (BITWISE_AND_EQUAL) :"bitwiseAndEqual", (BITWISE_OR) :"bitwiseOr", + (BITWISE_OR_EQUAL) :"bitwiseOrEqual", (BITWISE_XOR) :"bitwiseXor", + (BITWISE_XOR_EQUAL) :"bitwiseXorEqual", (PLUS) :"plus", (PLUS_EQUAL) :"plusEqual", (MINUS) :"minus", + (MINUS_EQUAL) :"minusEqual", (MULTIPLY) :"multiply", + (MULTIPLY_EQUAL) :"multiplyEqual", (DIVIDE) :"div", + (DIVIDE_EQUAL) :"divEqual", (INTDIV) :"intdiv", + (INTDIV_EQUAL) :"intdivEqual", (MOD) :"mod", + (MOD_EQUAL) :"modEqual", (POWER) :"power", + (POWER_EQUAL) :"powerEqual", (EQUAL) :"assign", (KEYWORD_INSTANCEOF) :"instanceOf", ] @@ -514,44 +523,6 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor // other unique cases switch (exp.operation.type) { - case BITWISE_AND_EQUAL: - evaluateBinaryExpressionWithAssignment("and", exp); - break; - - case BITWISE_OR_EQUAL: - evaluateBinaryExpressionWithAssignment("or", exp); - break; - - case BITWISE_XOR_EQUAL: - evaluateBinaryExpressionWithAssignment("xor", exp); - break; - - case MINUS_EQUAL: - evaluateBinaryExpressionWithAssignment("minus", exp); - break; - - case MULTIPLY_EQUAL: - evaluateBinaryExpressionWithAssignment("multiply", exp); - break; - - case DIVIDE_EQUAL: - //SPG don't use divide since BigInteger implements directly - //and we want to dispatch through DefaultGroovyMethods to get a BigDecimal result - evaluateBinaryExpressionWithAssignment("div", exp); - break; - - case INTDIV_EQUAL: - evaluateBinaryExpressionWithAssignment("intdiv", exp); - break; - - case MOD_EQUAL: - evaluateBinaryExpressionWithAssignment("mod", exp); - break; - - case POWER_EQUAL: - evaluateBinaryExpressionWithAssignment("power", exp); - break; - case LEFT_SHIFT: evaluateBinaryExpression("leftShift", exp); break; @@ -576,10 +547,6 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor evaluateBinaryExpressionWithAssignment("rightShiftUnsigned", exp); break; - case KEYWORD_INSTANCEOF: - evaluateInstanceof(exp); - break; - case FIND_REGEX: evaluateCompareExpression(findRegexMethod, exp); break; diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 02df8ce78..a69e8d7a9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -265,33 +265,57 @@ public Block plus(int line, Block lhs, Block rhs) { } public Block plusEqual(int line, LValueBlock lhs, Block rhs) { - return new AssignmentBlock(loc(line), lhs,rhs, "plus"); + return new AssignmentBlock(loc(line), lhs, rhs, "plus"); } public Block minus(int line, Block lhs, Block rhs) { return functionCall(line, lhs, "minus", rhs); } + public Block minusEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "minus"); + } + public Block multiply(int line, Block lhs, Block rhs) { return functionCall(line,lhs,"multiply",rhs); } + public Block multiplyEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "multiply"); + } + public Block div(int line, Block lhs, Block rhs) { return functionCall(line,lhs,"div",rhs); } + public Block divEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "div"); + } + public Block intdiv(int line, Block lhs, Block rhs) { return functionCall(line,lhs,"intdiv",rhs); } + public Block intdivEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "intdiv"); + } + public Block mod(int line, Block lhs, Block rhs) { return functionCall(line, lhs, "mod", rhs); } + public Block modEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "mod"); + } + public Block power(int line, Block lhs, Block rhs) { return functionCall(line,lhs, "power", rhs); } + public Block powerEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "power"); + } + public Block unaryMinus(int line, Block lhs) { return staticCall(line, ScriptBytecodeAdapter.class, "unaryMinus", lhs); } @@ -364,14 +388,26 @@ public Block bitwiseAnd(int line, Block lhs, Block rhs) { return functionCall(line,lhs,"and",rhs); } + public Block bitwiseAndEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "and"); + } + public Block bitwiseOr(int line, Block lhs, Block rhs) { return functionCall(line,lhs,"or",rhs); } + public Block bitwiseOrEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "or"); + } + public Block bitwiseXor(int line, Block lhs, Block rhs) { return functionCall(line,lhs,"xor",rhs); } + public Block bitwiseXorEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "xor"); + } + public Block bitwiseNegation(int line, Block b) { return staticCall(line,ScriptBytecodeAdapter.class,"bitwiseNegate",b); } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index f48d81266..c46b48194 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -368,4 +368,15 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS("new RuntimeException() instanceof Exception")==true; assert evalCPS("'12345' instanceof String")==true; } + + @Test + void compoundBitwiseAssignment() { + [0,1,2,3,4].each { x-> + [0,1,2,3,4].each { y -> + assert evalCPS("def x=${x}; x&=${y}; return x;")== (x&y); + assert evalCPS("def x=${x}; x|=${y}; return x;")== (x|y); + assert evalCPS("def x=${x}; x^=${y}; return x;")== (x^y); + } + } + } } From a97cdc26893eb8b09ce56fe1bcf25e683270d0aa Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 29 May 2014 13:32:28 -0700 Subject: [PATCH 234/932] [maven-release-plugin] prepare release groovy-cps-0.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cd7239f72..84f598006 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.2-SNAPSHOT + 0.2 Groovy CPS Execution @@ -91,7 +91,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - HEAD + groovy-cps-0.2 From 971c49476577b0bc7842d647b76480709266543b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 29 May 2014 13:32:33 -0700 Subject: [PATCH 235/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 84f598006..6ff3412db 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.2 + 0.3-SNAPSHOT Groovy CPS Execution @@ -91,7 +91,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - groovy-cps-0.2 + HEAD From 87d0eb7e0420e5e36295abf79e6c44437ea35c25 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 12 Jun 2014 20:00:46 -0700 Subject: [PATCH 236/932] Allow this logic to be modified by subtypes --- src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index c2a0702c8..8d68514a5 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -106,7 +106,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor /** * Should this method be transformed? */ - private boolean shouldBeTransformed(MethodNode node) { + protected boolean shouldBeTransformed(MethodNode node) { if (node.name=="run" && node.returnType.name==Object.class.name && extendsFromScript(node.declaringClass)) return true; // default body of the script return hasAnnotation(node, WorkflowMethod.class) && !hasAnnotation(node, WorkflowTransformed.class); From 9a3075b435d368ff84c3b9b72b92e6c48a0c6ddc Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 12 Jun 2014 20:26:44 -0700 Subject: [PATCH 237/932] Making CPS transformation opt-out, instead of opt-in. More common use case is where CPS script is compiled separately from the rest of the library code. --- .../groovy/cps/CpsTransformer.groovy | 9 ++++----- .../java/com/cloudbees/groovy/cps/NonCPS.java | 20 +++++++++++++++++++ .../cloudbees/groovy/cps/WorkflowMethod.java | 17 ---------------- .../groovy/cps/ContinuableTest.groovy | 6 ++---- .../groovy/cps/CpsTransformerTest.groovy | 3 --- .../cps/impl/FunctionCallBlockTest.groovy | 4 ++-- .../groovy/cps/impl/SwitchBlockTest.groovy | 2 -- .../groovy/cps/impl/ThrowBlockTest.groovy | 4 ++-- .../groovy/cps/impl/TryCatchBlockTest.groovy | 4 ++-- 9 files changed, 32 insertions(+), 37 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/NonCPS.java delete mode 100644 src/main/java/com/cloudbees/groovy/cps/WorkflowMethod.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 8d68514a5..e0154dae9 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -24,7 +24,7 @@ import static org.codehaus.groovy.syntax.Types.* * Performs CPS transformation of Groovy methods. * *

- * Every method annotated with {@link WorkflowMethod} gets rewritten. The general strategy of CPS transformation is + * Every method not annotated with {@link NonCPS} gets rewritten. The general strategy of CPS transformation is * as follows: * *

@@ -107,9 +107,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * Should this method be transformed? */ protected boolean shouldBeTransformed(MethodNode node) { - if (node.name=="run" && node.returnType.name==Object.class.name && extendsFromScript(node.declaringClass)) - return true; // default body of the script - return hasAnnotation(node, WorkflowMethod.class) && !hasAnnotation(node, WorkflowTransformed.class); + return !node.isSynthetic() && !hasAnnotation(node, NonCPS.class) && !hasAnnotation(node, WorkflowTransformed.class); } private boolean hasAnnotation(MethodNode node, Class a) { @@ -168,7 +166,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor def cpsName = "___cps___${iota++}" - m.declaringClass.addMethod(cpsName, PRIVATE_STATIC_FINAL, FUNCTION_TYPE, new Parameter[0], new ClassNode[0], + def builderMethod = m.declaringClass.addMethod(cpsName, PRIVATE_STATIC_FINAL, FUNCTION_TYPE, new Parameter[0], new ClassNode[0], new BlockStatement([ new ExpressionStatement(new DeclarationExpression(BUILDER, new Token(ASSIGN, "=", -1, -1), new ConstructorCallExpression(BUIDER_TYPE, new TupleExpression( @@ -181,6 +179,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor new ReturnStatement(new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body))) ], new VariableScope()) ) + builderMethod.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)) def f = m.declaringClass.addField(cpsName, PRIVATE_STATIC_FINAL, FUNCTION_TYPE, new StaticMethodCallExpression(m.declaringClass, cpsName, new TupleExpression())); diff --git a/src/main/java/com/cloudbees/groovy/cps/NonCPS.java b/src/main/java/com/cloudbees/groovy/cps/NonCPS.java new file mode 100644 index 000000000..31b30add9 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/NonCPS.java @@ -0,0 +1,20 @@ +package com.cloudbees.groovy.cps; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Exclude a marked method from CPS transformation. + * + * Useful for performance sensitive code or where you need to call into libraries and pass in closures + * that cannot be CPS-transformed. + * + * @author Kohsuke Kawaguchi + */ +@Target(METHOD) +@Retention(RUNTIME) +public @interface NonCPS { +} diff --git a/src/main/java/com/cloudbees/groovy/cps/WorkflowMethod.java b/src/main/java/com/cloudbees/groovy/cps/WorkflowMethod.java deleted file mode 100644 index f5d3e96c2..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/WorkflowMethod.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cloudbees.groovy.cps; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; - -/** - * Designates a method that shall be CPS-transformed. - * - * @author Kohsuke Kawaguchi - */ -@Target(METHOD) -@Retention(RUNTIME) -public @interface WorkflowMethod { -} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 7afba0153..8fd123c23 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -37,12 +37,10 @@ class ContinuableTest extends AbstractGroovyCpsTest { @Test void serializeComplexContinuable() { def s = csh.parse(""" - @WorkflowMethod def foo(int x) { return Continuable.suspend(x); } - @WorkflowMethod def plus3(int x) { return x+3; } @@ -144,14 +142,14 @@ class ContinuableTest extends AbstractGroovyCpsTest { @Test void stackTrace() { def s = csh.parse(""" - @WorkflowMethod + def x(i,v) { if (i>0) y(i-1,v); // line 5 else Continuable.suspend(v); // line 7 } - @WorkflowMethod + def y(i,v) { if (i>0) x(i-1,v); // line 12 diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index c46b48194..f1ce633ba 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -127,7 +127,6 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { @Test void workflowCallingWorkflow() { assert evalCPS(""" - @WorkflowMethod def fib(int x) { if (x==0) return 0; if (x==1) return 1; @@ -144,7 +143,6 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { @Test void exceptionFromNonCpsCodeShouldBeCaughtByCatchBlockInCpsCode() { assert evalCPS(""" - @WorkflowMethod def foo() { "abc".substring(5); // will caught exception return "fail"; @@ -257,7 +255,6 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { @Test void serialization() { CpsCallableInvocation s = parseCps(""" - @WorkflowMethod def plus3(int x) { return x+3; } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy index 067c06328..4317f2167 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy @@ -24,11 +24,11 @@ class FunctionCallBlockTest extends AbstractGroovyCpsTest { @Test void stackTraceFixup() { List elements = evalCPSonly(""" - @WorkflowMethod + def x() { y(); // line 4 } - @WorkflowMethod + def y() { FunctionCallBlockTest.someSyncCode(3); // line 8 } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy index c1a2922f8..0f492180e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy @@ -84,7 +84,6 @@ class SwitchBlockTest extends AbstractGroovyCpsTest { @Test void exceptionInSwitchExp() { assert evalCPS(""" - @WorkflowMethod def foo() { throw new javax.naming.NamingException(); } @@ -111,7 +110,6 @@ class SwitchBlockTest extends AbstractGroovyCpsTest { @Test void exceptionInCaseExp() { assert evalCPS(""" - @WorkflowMethod def foo() { throw new javax.naming.NamingException(); } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy index e38d54f55..1a2cc7144 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy @@ -13,11 +13,11 @@ class ThrowBlockTest extends AbstractGroovyCpsTest { @Test void stackTraceFixup() { List elements = evalCPSonly(""" - @WorkflowMethod + def x() { y(); // line 4 } - @WorkflowMethod + def y() { throw new javax.naming.NamingException(); // line 8 } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy index 4565b813b..2f29c9a56 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy @@ -14,11 +14,11 @@ class TryCatchBlockTest extends AbstractGroovyCpsTest { @Test void stackTraceFixup() { List elements = evalCPSonly(""" - @WorkflowMethod + def x() { y(); // line 4 } - @WorkflowMethod + def y() { throw new javax.naming.NamingException(); // line 8 } From 87f451e8da5aec7dd0e3efd1854d4e5f6864301d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 12 Jun 2014 20:38:15 -0700 Subject: [PATCH 238/932] [maven-release-plugin] prepare release groovy-cps-0.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6ff3412db..041ec7c47 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.3-SNAPSHOT + 0.3 Groovy CPS Execution @@ -91,7 +91,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - HEAD + groovy-cps-0.3 From 2b5293c92cdb6baf35f0a79a77fe4eb478e765d8 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 12 Jun 2014 20:38:19 -0700 Subject: [PATCH 239/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 041ec7c47..9a693dcd2 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.3 + 0.4-SNAPSHOT Groovy CPS Execution @@ -91,7 +91,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - groovy-cps-0.3 + HEAD From 6a13e3bc607faba4f8a537b2f1412032c0730ef2 Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Sun, 15 Jun 2014 19:51:19 -0300 Subject: [PATCH 240/932] Add default variable assignment values for float and double, plus tests --- .../groovy/cps/impl/VariableDeclBlock.java | 3 +- .../groovy/cps/TestVariableDeclaration.java | 55 +++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/cloudbees/groovy/cps/TestVariableDeclaration.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java index 15f167318..de4d7aec6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java @@ -1,7 +1,6 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.Builder; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; @@ -34,6 +33,8 @@ public Next eval(final Env e, final Continuation k) { defaultPrimitiveValue.put(boolean.class,false); defaultPrimitiveValue.put(int.class,0); defaultPrimitiveValue.put(long.class,0L); + defaultPrimitiveValue.put(float.class,0.0f); + defaultPrimitiveValue.put(double.class,0.0d); // TODO: complete the rest } } diff --git a/src/test/java/com/cloudbees/groovy/cps/TestVariableDeclaration.java b/src/test/java/com/cloudbees/groovy/cps/TestVariableDeclaration.java new file mode 100644 index 000000000..95abbafaf --- /dev/null +++ b/src/test/java/com/cloudbees/groovy/cps/TestVariableDeclaration.java @@ -0,0 +1,55 @@ +package com.cloudbees.groovy.cps; + +import static org.junit.Assert.assertEquals; + +import java.lang.reflect.InvocationTargetException; + +import org.junit.Test; + +import com.cloudbees.groovy.cps.impl.FunctionCallEnv; + +/** + * Tests variable declaration using the groovy-cps Builder. + */ +public class TestVariableDeclaration { + + Builder b = new Builder(MethodLocation.UNKNOWN); + + Block $x = b.localVariable("x"); + + @SuppressWarnings("unchecked") + private T createVariable(Class clazz) { + try { + FunctionCallEnv env = new FunctionCallEnv(null, Continuation.HALT, null, null); + Next p = new Next(b.block( + b.declareVariable(clazz, "x"), + b.return_($x) + ), env, Continuation.HALT); + return (T) p.run().yield.wrapReplay(); + } catch (InvocationTargetException x) { + throw new AssertionError(x); + } + } + + /** + * Tests the default value of variables (e.g. 0 for int, 0L for long, etc). + */ + @Test + public void testDefaultValues() { + int iv = createVariable(int.class); + assertEquals(0, iv); + + long lv = createVariable(long.class); + assertEquals(0L, lv); + + Object ov = createVariable(Object.class); + assertEquals(null, ov); + + float fv = createVariable(float.class); + assertEquals(0.0f, fv, 0.0); + + double dv = createVariable(double.class); + assertEquals(0.0d, dv, 0.0); + } + +} From 3524b46137f0580a915404ec9f6d5ce08d823c3f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 26 Jun 2014 23:01:14 +0200 Subject: [PATCH 241/932] Implemented range expression --- .../com/cloudbees/groovy/cps/CpsTransformer.groovy | 9 +++++++-- src/main/java/com/cloudbees/groovy/cps/Builder.java | 7 +++++++ .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 6 ++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index ed3eb39bb..7043cd54f 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -671,8 +671,13 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitRangeExpression(RangeExpression expression) { - throw new UnsupportedOperationException(); + void visitRangeExpression(RangeExpression exp) { + makeNode("range") { + loc(exp) + visit(exp.from) + visit(exp.to) + literal(exp.inclusive) + } } void visitPropertyExpression(PropertyExpression exp) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 0b39717df..a17176e06 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -476,6 +476,13 @@ public Block list(Block... args) { return new ListBlock(args); } + /** + * x..y or x..<y to crete a range + */ + public Block range(int line, Block from, Block to, boolean inclusive) { + return staticCall(line,ScriptBytecodeAdapter.class,"createRange",from,to,constant(inclusive)); + } + public Block assert_(Block cond, Block msg, String sourceText) { return new AssertBlock(cond,msg,sourceText); } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 030e28317..f43ced90a 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -360,4 +360,10 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS("def x=0; return ++x ?: -1")==1; assert evalCPS("def x=0; return x++ ?: -1")==-1; } + + @Test + void range() { + assert evalCPS("def x=5; return (0..x)") == (0..5); + assert evalCPS("def x=5; return (0.. Date: Thu, 26 Jun 2014 23:05:09 +0200 Subject: [PATCH 242/932] Implementing more composite operators --- .../cloudbees/groovy/cps/CpsTransformer.groovy | 17 +++-------------- .../java/com/cloudbees/groovy/cps/Builder.java | 12 ++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 7043cd54f..f14b757af 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -484,8 +484,11 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor (PLUS) :"plus", (PLUS_EQUAL) :"plusEqual", (MINUS) :"minus", + (MINUS_EQUAL) :"minusEqual", (MULTIPLY) :"multiply", + (MULTIPLY_EQUAL) :"multiplyEqual", (DIVIDE) :"div", + (DIVIDE_EQUAL) :"divEqual", (INTDIV) :"intdiv", (MOD) :"mod", (POWER) :"power", @@ -524,20 +527,6 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor evaluateBinaryExpressionWithAssignment("xor", exp); break; - case MINUS_EQUAL: - evaluateBinaryExpressionWithAssignment("minus", exp); - break; - - case MULTIPLY_EQUAL: - evaluateBinaryExpressionWithAssignment("multiply", exp); - break; - - case DIVIDE_EQUAL: - //SPG don't use divide since BigInteger implements directly - //and we want to dispatch through DefaultGroovyMethods to get a BigDecimal result - evaluateBinaryExpressionWithAssignment("div", exp); - break; - case INTDIV_EQUAL: evaluateBinaryExpressionWithAssignment("intdiv", exp); break; diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index a17176e06..fa1e0f214 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -272,14 +272,26 @@ public Block minus(int line, Block lhs, Block rhs) { return functionCall(line, lhs, "minus", rhs); } + public Block minusEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs,rhs, "minus"); + } + public Block multiply(int line, Block lhs, Block rhs) { return functionCall(line,lhs,"multiply",rhs); } + public Block multiplyEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs,rhs, "multiply"); + } + public Block div(int line, Block lhs, Block rhs) { return functionCall(line,lhs,"div",rhs); } + public Block divEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs,rhs, "div"); + } + public Block intdiv(int line, Block lhs, Block rhs) { return functionCall(line,lhs,"intdiv",rhs); } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index f43ced90a..77443cf40 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -366,4 +366,19 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS("def x=5; return (0..x)") == (0..5); assert evalCPS("def x=5; return (0.. Date: Fri, 27 Jun 2014 17:39:49 +0200 Subject: [PATCH 243/932] Working toward custom CPS-aware default methods --- .../groovy/cps/CategorySupport.groovy | 19 ++++++++++++ .../groovy/cps/CpsDefaultGroovyMethods.groovy | 31 +++++++++++++++++++ .../groovy/cps/CpsTransformerAnnotation.java | 20 ++++++++++++ .../cps/CpsTransformingASTCustomizer.java | 18 +++++++++++ .../groovy/cps/impl/ContinuationGroup.java | 30 +++++++++++------- .../groovy/cps/CpsTransformerTest.groovy | 9 ++++++ 6 files changed, 116 insertions(+), 11 deletions(-) create mode 100644 src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy create mode 100644 src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy create mode 100644 src/main/groovy/com/cloudbees/groovy/cps/CpsTransformerAnnotation.java create mode 100644 src/main/groovy/com/cloudbees/groovy/cps/CpsTransformingASTCustomizer.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy new file mode 100644 index 000000000..31465d226 --- /dev/null +++ b/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy @@ -0,0 +1,19 @@ +package com.cloudbees.groovy.cps + +import org.codehaus.groovy.runtime.GroovyCategorySupport + +import java.util.concurrent.Callable + +/** + * Invokes {@link GroovyCategorySupport#use(java.lang.Class, groovy.lang.Closure)} with {@link Runnable}. + * + * @author Kohsuke Kawaguchi + */ +@CpsTransformerAnnotation +class CategorySupport { + public static T use(Class category, Callable r) { + return GroovyCategorySupport.use(category) { + return r.call(); + } + } +} diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy new file mode 100644 index 000000000..a286a295e --- /dev/null +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy @@ -0,0 +1,31 @@ +package com.cloudbees.groovy.cps; + +import groovy.lang.Closure; +import org.codehaus.groovy.runtime.DefaultGroovyMethods; +import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.transform.GroovyASTTransformation; + +import java.util.Iterator; +import java.util.Map; + +/** + * @author Kohsuke Kawaguchi + */ +@GroovyASTTransformation +public class CpsDefaultGroovyMethods { + /** + * Interception is successful. The trick is to pre-translate this method into CPS. + */ + public static T each(T self, Closure closure) { + each(InvokerHelper.asIterator(self), closure); + return self; + } + + public static Iterator each(Iterator iter, Closure closure) { + while (iter.hasNext()) { + Object arg = iter.next(); + closure.call(arg); + } + return iter; + } +} diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformerAnnotation.java b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformerAnnotation.java new file mode 100644 index 000000000..a5ffee7e4 --- /dev/null +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformerAnnotation.java @@ -0,0 +1,20 @@ +package com.cloudbees.groovy.cps; + +import org.codehaus.groovy.transform.GroovyASTTransformationClass; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @author Kohsuke Kawaguchi + */ +@Documented +@Retention(RetentionPolicy.SOURCE) +@Target({ElementType.TYPE}) +@GroovyASTTransformationClass(classes=CpsTransformingASTCustomizer.class) +public @interface CpsTransformerAnnotation { +} + diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformingASTCustomizer.java b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformingASTCustomizer.java new file mode 100644 index 000000000..bdd2547b6 --- /dev/null +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformingASTCustomizer.java @@ -0,0 +1,18 @@ +package com.cloudbees.groovy.cps; + +import org.codehaus.groovy.ast.ASTNode; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.control.CompilePhase; +import org.codehaus.groovy.control.SourceUnit; +import org.codehaus.groovy.transform.ASTTransformation; +import org.codehaus.groovy.transform.GroovyASTTransformation; + +/** + * @author Kohsuke Kawaguchi + */ +@GroovyASTTransformation(phase=CompilePhase.CANONICALIZATION) +public class CpsTransformingASTCustomizer implements ASTTransformation { + public void visit(ASTNode[] nodes, SourceUnit source) { + new CpsTransformer().call(source, null, (ClassNode) nodes[1]); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index e5da704e5..180ff880e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -1,10 +1,13 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.CategorySupport; import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.CpsDefaultGroovyMethods; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; +import org.codehaus.groovy.runtime.GroovyCategorySupport; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; @@ -14,6 +17,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.concurrent.Callable; import static com.cloudbees.groovy.cps.impl.SourceLocation.UNKNOWN; @@ -61,17 +65,21 @@ protected Next methodCall(Env e, SourceLocation loc, ContinuationPtr k, Object r /** * Evaluates a function (possibly a workflow function), then pass the result to the given continuation. */ - protected Next methodCall(Env e, SourceLocation loc, Continuation k, Object receiver, String methodName, Object... args) { - try { - CallSite callSite = fakeCallSite(methodName); - Object v = callSite.call(receiver,args); - // if this was a normal function, the method had just executed synchronously - return k.receive(v); - } catch (CpsCallableInvocation inv) { - return inv.invoke(e, loc, k); - } catch (Throwable t) { - return throwException(e, t, loc, new ReferenceStackTrace()); - } + protected Next methodCall(final Env e, final SourceLocation loc, final Continuation k, final Object receiver, final String methodName, final Object... args) { + return CategorySupport.use(CpsDefaultGroovyMethods.class,new Callable() { + public Next call() { + try { + CallSite callSite = fakeCallSite(methodName); + Object v = callSite.call(receiver,args); + // if this was a normal function, the method had just executed synchronously + return k.receive(v); + } catch (CpsCallableInvocation inv) { + return inv.invoke(e, loc, k); + } catch (Throwable t) { + return throwException(e, t, loc, new ReferenceStackTrace()); + } + } + }); } /** diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 77443cf40..f8f1d616e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -381,4 +381,13 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { void divEqual() { assert evalCPS("def x=50; x/=5; return x;") == 10; } + + @Test + void each() { + assert evalCPS(""" + def x = 0; + (0..10).each { y -> x+=y; } + return x; +""") == 55; + } } From aa91a7374fb557972c3416254c09503bbd275f7e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 27 Jun 2014 18:08:05 +0200 Subject: [PATCH 244/932] Doing a manual CPS transformation for now --- .../groovy/cps/CategorySupport.groovy | 1 - .../groovy/cps/CpsDefaultGroovyMethods.groovy | 53 +++++++++++++++---- .../groovy/cps/CpsTransformerAnnotation.java | 20 ------- .../cps/CpsTransformingASTCustomizer.java | 18 ------- .../cloudbees/groovy/cps/MethodLocation.java | 4 ++ .../groovy/cps/CpsTransformerTest.groovy | 3 ++ 6 files changed, 51 insertions(+), 48 deletions(-) delete mode 100644 src/main/groovy/com/cloudbees/groovy/cps/CpsTransformerAnnotation.java delete mode 100644 src/main/groovy/com/cloudbees/groovy/cps/CpsTransformingASTCustomizer.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy index 31465d226..52d199fad 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy @@ -9,7 +9,6 @@ import java.util.concurrent.Callable * * @author Kohsuke Kawaguchi */ -@CpsTransformerAnnotation class CategorySupport { public static T use(Class category, Callable r) { return GroovyCategorySupport.use(category) { diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy index a286a295e..fc8310f7e 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy @@ -1,31 +1,66 @@ -package com.cloudbees.groovy.cps; +package com.cloudbees.groovy.cps -import groovy.lang.Closure; -import org.codehaus.groovy.runtime.DefaultGroovyMethods; -import org.codehaus.groovy.runtime.InvokerHelper; -import org.codehaus.groovy.transform.GroovyASTTransformation; - -import java.util.Iterator; -import java.util.Map; +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation +import com.cloudbees.groovy.cps.impl.CpsFunction +import org.codehaus.groovy.runtime.InvokerHelper /** + * + * TODO: any way to apply CPS transformation? + * * @author Kohsuke Kawaguchi */ -@GroovyASTTransformation public class CpsDefaultGroovyMethods { + private static MethodLocation loc(String methodName) { + return new MethodLocation(CpsDefaultGroovyMethods.class,methodName); + } + /** * Interception is successful. The trick is to pre-translate this method into CPS. */ public static T each(T self, Closure closure) { + /* each(InvokerHelper.asIterator(self), closure); return self; + */ + + def b = new Builder(loc("each")); + def f = new CpsFunction(["self", "closure"], b.block( + b.staticCall(-1, CpsDefaultGroovyMethods.class, "each", + b.staticCall(-1, InvokerHelper.class, "asIterator", + b.localVariable("self") + ), + b.localVariable("closure") + ), + b.return_(b.localVariable("self")) + )); + + throw new CpsCallableInvocation(f,null,self,closure); } public static Iterator each(Iterator iter, Closure closure) { +/* while (iter.hasNext()) { Object arg = iter.next(); closure.call(arg); } return iter; +*/ + + + def b = new Builder(loc("each")); + def $iter = b.localVariable("iter") + + def f = new CpsFunction(["iter", "closure"], b.block( + b.while_(null, b.functionCall(1, $iter,"hasNext"), + b.block( + b.declareVariable(2,Object.class,"arg", b.functionCall(2, $iter,"next")), + b.functionCall(3, b.localVariable("closure"), "call", b.localVariable("arg")) + ) + ), + b.return_($iter) + )); + + throw new CpsCallableInvocation(f,null,iter,closure); } } diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformerAnnotation.java b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformerAnnotation.java deleted file mode 100644 index a5ffee7e4..000000000 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformerAnnotation.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cloudbees.groovy.cps; - -import org.codehaus.groovy.transform.GroovyASTTransformationClass; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * @author Kohsuke Kawaguchi - */ -@Documented -@Retention(RetentionPolicy.SOURCE) -@Target({ElementType.TYPE}) -@GroovyASTTransformationClass(classes=CpsTransformingASTCustomizer.class) -public @interface CpsTransformerAnnotation { -} - diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformingASTCustomizer.java b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformingASTCustomizer.java deleted file mode 100644 index bdd2547b6..000000000 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformingASTCustomizer.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cloudbees.groovy.cps; - -import org.codehaus.groovy.ast.ASTNode; -import org.codehaus.groovy.ast.ClassNode; -import org.codehaus.groovy.control.CompilePhase; -import org.codehaus.groovy.control.SourceUnit; -import org.codehaus.groovy.transform.ASTTransformation; -import org.codehaus.groovy.transform.GroovyASTTransformation; - -/** - * @author Kohsuke Kawaguchi - */ -@GroovyASTTransformation(phase=CompilePhase.CANONICALIZATION) -public class CpsTransformingASTCustomizer implements ASTTransformation { - public void visit(ASTNode[] nodes, SourceUnit source) { - new CpsTransformer().call(source, null, (ClassNode) nodes[1]); - } -} diff --git a/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java b/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java index 8729e0090..028982ef9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java +++ b/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java @@ -15,6 +15,10 @@ public final class MethodLocation implements Serializable { private final String methodName; private final String fileName; + public MethodLocation(Class clazz, String methodName) { + this(clazz.getName(), methodName, clazz.getSimpleName()); + } + public MethodLocation(String declaringClass, String methodName, String fileName) { this.declaringClass = declaringClass; this.methodName = methodName; diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index f8f1d616e..848a7c98c 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -382,6 +382,9 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS("def x=50; x/=5; return x;") == 10; } + /** + * Testing {@link CpsDefaultGroovyMethods}. + */ @Test void each() { assert evalCPS(""" From f556641e0f82edea51952c4deb24a11b6364f078 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 27 Jun 2014 18:13:08 +0200 Subject: [PATCH 245/932] Updating test case to reflect changes in the call stack --- .../com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy index 4317f2167..acfb2c711 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy @@ -49,7 +49,7 @@ Script1.y(Script1.groovy:8) Script1.x(Script1.groovy:4) Script1.run(Script1.groovy:11) ___cps.transform___(Native Method) -com.cloudbees.groovy.cps.impl.ContinuationGroup.methodCall"""); +com.cloudbees.groovy.cps.impl.ContinuationGroup\$1.call"""); // should include the call stack of some sync code assert trace.contains("com.cloudbees.groovy.cps.impl.FunctionCallBlockTest.someSyncCode(FunctionCallBlockTest.groovy:") From 40c76dc57f346fff11b77ad2b6194a4d3a83bb7d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 11:21:36 -0700 Subject: [PATCH 246/932] Started working on groovy-sandbox integration --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 9a693dcd2..6ab56c0d4 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,11 @@ + + org.kohsuke + groovy-sandbox + 1.7-SNAPSHOT + org.codehaus.groovy groovy From 0d34e39f6616279d13abaa0964021983e54a9407 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 11:44:37 -0700 Subject: [PATCH 247/932] Built the basic plumbing of interception. Define an interface that handles the interactions with Groovy objects (Invoker), and provide one implementation that makes the call straight away (DefaultInvoker), and another that goes through groovy-sandbox (SandboxInvoker.) Make this object accessible from Env (Env.getInvoker()) and provide a method to set it (CallEnv.setInvoker()). --- .../java/com/cloudbees/groovy/cps/Env.java | 8 +++++++ .../cloudbees/groovy/cps/impl/CallEnv.java | 15 +++++++++++++ .../groovy/cps/impl/ContinuationGroup.java | 5 ++--- .../cloudbees/groovy/cps/impl/ProxyEnv.java | 5 +++++ .../groovy/cps/sandbox/DefaultInvoker.java | 21 ++++++++++++++++++ .../cloudbees/groovy/cps/sandbox/Invoker.java | 22 +++++++++++++++++++ .../groovy/cps/sandbox/SandboxInvoker.java | 17 ++++++++++++++ 7 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/src/main/java/com/cloudbees/groovy/cps/Env.java index 0f2c9fb2e..72930fa38 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.sandbox.Invoker; import groovy.lang.Closure; import java.io.Serializable; @@ -67,4 +68,11 @@ public interface Env extends Serializable { * Maximum depth of stack trace to obtain. */ void buildStackTraceElements(List stack, int depth); + + /** + * {@link Invoker} is typically scoped at the whole execution. + * + * @return never null + */ + Invoker getInvoker(); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 91df78c62..102c28465 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -3,6 +3,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; +import com.cloudbees.groovy.cps.sandbox.Invoker; import javax.annotation.Nullable; import java.util.List; @@ -28,6 +29,8 @@ @Nullable private final SourceLocation callSiteLoc; + private Invoker invoker; + /** * @param caller * The environment of the call site. Can be null but only if the caller is outside CPS execution. @@ -36,9 +39,21 @@ public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc) { this.caller = caller; this.returnAddress = returnAddress; this.callSiteLoc = loc; + this.invoker = caller==null ? Invoker.INSTANCE : caller.getInvoker(); assert returnAddress!=null; } + /** + * Sets the {@link Invoker}, which gets inherited through the call chain. + */ + public void setInvoker(Invoker invoker) { + this.invoker = invoker; + } + + public Invoker getInvoker() { + return invoker; + } + public final Continuation getReturnAddress() { return returnAddress; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 180ff880e..327925c76 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -7,7 +7,6 @@ import com.cloudbees.groovy.cps.CpsDefaultGroovyMethods; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import org.codehaus.groovy.runtime.GroovyCategorySupport; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; @@ -69,8 +68,8 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat return CategorySupport.use(CpsDefaultGroovyMethods.class,new Callable() { public Next call() { try { - CallSite callSite = fakeCallSite(methodName); - Object v = callSite.call(receiver,args); + // TODO: spread and safe + Object v = e.getInvoker().methodCall(receiver,false,false,methodName,args); // if this was a normal function, the method had just executed synchronously return k.receive(v); } catch (CpsCallableInvocation inv) { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java index 1282e897b..9a2b87a4c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.sandbox.Invoker; import java.util.List; @@ -47,6 +48,10 @@ public Continuation getExceptionHandler(Class type) { return parent.getExceptionHandler(type); } + public Invoker getInvoker() { + return parent.getInvoker(); + } + public void buildStackTraceElements(List stack, int depth) { parent.buildStackTraceElements(stack, depth); } diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java new file mode 100644 index 000000000..2431ce4f0 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java @@ -0,0 +1,21 @@ +package com.cloudbees.groovy.cps.sandbox; + +import org.codehaus.groovy.runtime.callsite.CallSite; +import org.codehaus.groovy.runtime.callsite.CallSiteArray; + +/** + * @author Kohsuke Kawaguchi + */ +public class DefaultInvoker implements Invoker { + public Object methodCall(Object receiver, boolean safe, boolean spread, String method, Object[] args) throws Throwable { + CallSite callSite = fakeCallSite(method); + Object v = callSite.call(receiver,args); + return v; + } + + /*TODO: specify the proper owner value (to the script that includes the call site) */ + protected CallSite fakeCallSite(String method) { + CallSiteArray csa = new CallSiteArray(DefaultInvoker.class, new String[]{method}); + return csa.array[0]; + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java new file mode 100644 index 000000000..ec1c6d7f9 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java @@ -0,0 +1,22 @@ +package com.cloudbees.groovy.cps.sandbox; + +import com.cloudbees.groovy.cps.Env; + +/** + * Abstracts away interactions with Groovy objects, for example to provide an opportunity to intercept + * calls. + * + *

+ * During the execution of CPS code, {@link Invoker} is available from {@link Env#getInvoker()}. + * + * @author Kohsuke Kawaguchi + * @see Env#getInvoker() + */ +public interface Invoker { + Object methodCall(Object receiver, boolean safe, boolean spread, String method, Object[] args) throws Throwable; + + /** + * Default instance to be used. + */ + Invoker INSTANCE = new DefaultInvoker(); +} diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java new file mode 100644 index 000000000..526a07096 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java @@ -0,0 +1,17 @@ +package com.cloudbees.groovy.cps.sandbox; + +import org.kohsuke.groovy.sandbox.GroovyInterceptor; +import org.kohsuke.groovy.sandbox.impl.Checker; + +/** + * {@link Invoker} that goes through the groovy-sandbox {@link GroovyInterceptor}, + * so that interactions with Groovy objects can be inspected. + * + * @author Kohsuke Kawaguchi + */ +public class SandboxInvoker implements Invoker { + public Object methodCall(Object receiver, boolean safe, boolean spread, String method, Object[] args) throws Throwable { + return Checker.checkedCall(receiver,safe,spread,method,args); + } + +} From e5be151a75ad8a2c312e227a29aeb3a62e1ca3df Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 11:51:25 -0700 Subject: [PATCH 248/932] Intercepting property access --- .../groovy/cps/impl/PropertyAccessBlock.java | 5 ++--- .../groovy/cps/sandbox/DefaultInvoker.java | 19 +++++++++++++++++++ .../cloudbees/groovy/cps/sandbox/Invoker.java | 4 ++++ .../groovy/cps/sandbox/SandboxInvoker.java | 8 ++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index 6ff026e26..5d704e7f9 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -6,7 +6,6 @@ import com.cloudbees.groovy.cps.LValue; import com.cloudbees.groovy.cps.LValueBlock; import com.cloudbees.groovy.cps.Next; -import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import static java.util.Collections.*; @@ -56,7 +55,7 @@ public Next fixName(Object name) { public Next get(Continuation k) { Object v; try { - v = ScriptBytecodeAdapter.getProperty(null/*Groovy doesn't use this parameter*/, lhs, name); + v = e.getInvoker().getProperty(lhs,false,false,name); } catch (Throwable t) { return throwException(e, t, loc, new ReferenceStackTrace()); } @@ -75,7 +74,7 @@ public Next set(Object v, Continuation k) { // TODO: how to handle the case when a setter is a workflow method? try { - ScriptBytecodeAdapter.setProperty(v, null/*Groovy doesn't use this parameter*/, lhs, name); + e.getInvoker().setProperty(lhs,name,false,false,v); } catch (Throwable t) { return throwException(e, t, loc, new ReferenceStackTrace()); } diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java index 2431ce4f0..c27dcd7e1 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps.sandbox; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; @@ -8,11 +9,29 @@ */ public class DefaultInvoker implements Invoker { public Object methodCall(Object receiver, boolean safe, boolean spread, String method, Object[] args) throws Throwable { + assert !safe : "TODO"; + assert !spread : "TODO"; + CallSite callSite = fakeCallSite(method); Object v = callSite.call(receiver,args); return v; } + public Object getProperty(Object lhs, boolean safe, boolean spread, String name) throws Throwable { + assert !safe : "TODO"; + assert !spread : "TODO"; + + Object v = ScriptBytecodeAdapter.getProperty(null/*Groovy doesn't use this parameter*/, lhs, name); + return v; + } + + public void setProperty(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable { + assert !safe : "TODO"; + assert !spread : "TODO"; + + ScriptBytecodeAdapter.setProperty(value, null/*Groovy doesn't use this parameter*/, lhs, name); + } + /*TODO: specify the proper owner value (to the script that includes the call site) */ protected CallSite fakeCallSite(String method) { CallSiteArray csa = new CallSiteArray(DefaultInvoker.class, new String[]{method}); diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java index ec1c6d7f9..bdf2006ff 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java @@ -19,4 +19,8 @@ public interface Invoker { * Default instance to be used. */ Invoker INSTANCE = new DefaultInvoker(); + + Object getProperty(Object lhs, boolean safe, boolean spread, String name) throws Throwable; + + void setProperty(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable; } diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java index 526a07096..f44a7b7bc 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps.sandbox; +import org.codehaus.groovy.syntax.Types; import org.kohsuke.groovy.sandbox.GroovyInterceptor; import org.kohsuke.groovy.sandbox.impl.Checker; @@ -14,4 +15,11 @@ public Object methodCall(Object receiver, boolean safe, boolean spread, String m return Checker.checkedCall(receiver,safe,spread,method,args); } + public Object getProperty(Object lhs, boolean safe, boolean spread, String name) throws Throwable { + return Checker.checkedGetProperty(lhs,safe,spread,name); + } + + public void setProperty(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable { + Checker.checkedSetProperty(lhs,name,safe,spread, Types.ASSIGN,value); + } } From cdba8d651b19cf3f0117c97b985444d4f47f4bff Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 12:13:25 -0700 Subject: [PATCH 249/932] Implemented attribute access like foo.@bar --- .../groovy/cps/CpsTransformer.groovy | 9 +- .../com/cloudbees/groovy/cps/Builder.java | 6 ++ .../groovy/cps/impl/AttributeAccessBlock.java | 25 +++++ .../groovy/cps/impl/PropertyAccessBlock.java | 79 ++------------- .../groovy/cps/impl/PropertyishBlock.java | 98 +++++++++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 5 + 6 files changed, 147 insertions(+), 75 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 68affb4b2..6f43b7c8e 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -657,8 +657,13 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitAttributeExpression(AttributeExpression attributeExpression) { - throw new UnsupportedOperationException(); + void visitAttributeExpression(AttributeExpression exp) { + // TODO: spread and safe + makeNode("attribute") { + loc(exp) + visit(exp.objectExpression) + visit(exp.property) + } } void visitFieldExpression(FieldExpression exp) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index a0128f962..055e49200 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.impl.AssertBlock; import com.cloudbees.groovy.cps.impl.AssignmentBlock; +import com.cloudbees.groovy.cps.impl.AttributeAccessBlock; import com.cloudbees.groovy.cps.impl.BlockScopedBlock; import com.cloudbees.groovy.cps.impl.BreakBlock; import com.cloudbees.groovy.cps.impl.ClosureBlock; @@ -479,6 +480,11 @@ public LValueBlock property(int line, Block lhs, Block property) { return new PropertyAccessBlock(loc(line),lhs,property); } + + public LValueBlock attribute(int line, Block lhs, Block property) { + return new AttributeAccessBlock(loc(line),lhs,property); + } + public LValueBlock staticField(int line, Class type, String name) { return new StaticFieldBlock(loc(line),type,name); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java new file mode 100644 index 000000000..a53b1968f --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java @@ -0,0 +1,25 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Env; + +/** + * Attribute access expression like {@code foo.@bar}, which is an l-value. + * + * @author Kohsuke Kawaguchi + */ +public class AttributeAccessBlock extends PropertyishBlock { + public AttributeAccessBlock(SourceLocation loc, Block lhs, Block property) { + super(loc, lhs, property); + } + + protected Object rawGet(Env e, Object lhs, String name) throws Throwable { + return e.getInvoker().getProperty(lhs,false,false,name); + } + + protected void rawSet(Env e, Object lhs, String name, Object v) throws Throwable { + e.getInvoker().setProperty(lhs,name,false,false,v); + } + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index 5d704e7f9..71498e43a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -1,92 +1,25 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.LValue; -import com.cloudbees.groovy.cps.LValueBlock; -import com.cloudbees.groovy.cps.Next; - -import static java.util.Collections.*; /** * Property access expression like {@code foo.bar}, which is an l-value. * * @author Kohsuke Kawaguchi */ -public class PropertyAccessBlock extends LValueBlock { - private final Block lhs, property; - private final SourceLocation loc; - +public class PropertyAccessBlock extends PropertyishBlock { public PropertyAccessBlock(SourceLocation loc, Block lhs, Block property) { - this.loc = loc; - this.lhs = lhs; - this.property = property; + super(loc, lhs, property); } - public Next evalLValue(final Env e, final Continuation k) { - return new ContinuationImpl(e,k).then(lhs,e,fixLhs); + protected Object rawGet(Env e, Object lhs, String name) throws Throwable { + return e.getInvoker().getProperty(lhs,false,false,name); } - class ContinuationImpl extends ContinuationGroup implements LValue { - final Continuation k; - final Env e; - - Object lhs; - String name; - - ContinuationImpl(Env e, Continuation k) { - this.e = e; - this.k = k; - } - - public Next fixLhs(Object lhs) { - this.lhs = lhs; - return then(property,e,fixName); - } - - public Next fixName(Object name) { - // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String - this.name = name.toString(); - - return k.receive(this); - } - - public Next get(Continuation k) { - Object v; - try { - v = e.getInvoker().getProperty(lhs,false,false,name); - } catch (Throwable t) { - return throwException(e, t, loc, new ReferenceStackTrace()); - } - - if (v instanceof CpsFunction) { - // if this is a workflow function, it'd return a CpsFunction object instead - // of actually executing the function, so execute it in the CPS - return ((CpsFunction)v).invoke(e, loc, lhs, emptyList(),k); - } else { - // if this was a normal property, we get the value as-is. - return k.receive(v); - } - } - - public Next set(Object v, Continuation k) { - // TODO: how to handle the case when a setter is a workflow method? - - try { - e.getInvoker().setProperty(lhs,name,false,false,v); - } catch (Throwable t) { - return throwException(e, t, loc, new ReferenceStackTrace()); - } - - return k.receive(null); - } - - private static final long serialVersionUID = 1L; + protected void rawSet(Env e, Object lhs, String name, Object v) throws Throwable { + e.getInvoker().setProperty(lhs,name,false,false,v); } - static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); - static final ContinuationPtr fixName = new ContinuationPtr(ContinuationImpl.class,"fixName"); - private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java new file mode 100644 index 000000000..cdd58e85a --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java @@ -0,0 +1,98 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.LValue; +import com.cloudbees.groovy.cps.LValueBlock; +import com.cloudbees.groovy.cps.Next; + +import static java.util.Collections.emptyList; + +/** + * Common part of {@link PropertyAccessBlock} and {@link AttributeAccessBlock}. + * + * @author Kohsuke Kawaguchi + */ +abstract class PropertyishBlock extends LValueBlock { + private final Block lhs, property; + private final SourceLocation loc; + + public PropertyishBlock(SourceLocation loc, Block lhs, Block property) { + this.loc = loc; + this.lhs = lhs; + this.property = property; + } + + public Next evalLValue(final Env e, final Continuation k) { + return new ContinuationImpl(e,k).then(lhs,e,fixLhs); + } + + protected abstract Object rawGet(Env e, Object lhs, String name) throws Throwable; + protected abstract void rawSet(Env e, Object lhs, String name, Object v) throws Throwable; + + + class ContinuationImpl extends ContinuationGroup implements LValue { + final Continuation k; + final Env e; + + Object lhs; + String name; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next fixLhs(Object lhs) { + this.lhs = lhs; + return then(property,e,fixName); + } + + public Next fixName(Object name) { + // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String + this.name = name.toString(); + + return k.receive(this); + } + + public Next get(Continuation k) { + Object v; + try { + v = rawGet(e,lhs,name); + } catch (Throwable t) { + return throwException(e, t, loc, new ReferenceStackTrace()); + } + + if (v instanceof CpsFunction) { + // if this is a workflow function, it'd return a CpsFunction object instead + // of actually executing the function, so execute it in the CPS + return ((CpsFunction)v).invoke(e, loc, lhs, emptyList(),k); + } else { + // if this was a normal property, we get the value as-is. + return k.receive(v); + } + } + + + public Next set(Object v, Continuation k) { + // TODO: how to handle the case when a setter is a workflow method? + + try { + rawSet(e,lhs,name,v); + } catch (Throwable t) { + return throwException(e, t, loc, new ReferenceStackTrace()); + } + + return k.receive(null); + } + + private static final long serialVersionUID = 1L; + } + + static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); + static final ContinuationPtr fixName = new ContinuationPtr(ContinuationImpl.class,"fixName"); + + private static final long serialVersionUID = 1L; +} + diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 284e3a5fb..2ba3c9193 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -408,4 +408,9 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { } } } + + @Test + void attributeAccess() { + assert evalCPS("new java.awt.Point(1,2).@x") == 1; + } } From cd2838d75ad46ca450e67bcf9e6a376fb601f03c Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 12:19:18 -0700 Subject: [PATCH 250/932] Hooked up attribute access interception --- .../groovy/cps/impl/AttributeAccessBlock.java | 4 ++-- .../groovy/cps/sandbox/DefaultInvoker.java | 15 +++++++++++++++ .../com/cloudbees/groovy/cps/sandbox/Invoker.java | 8 ++++++-- .../groovy/cps/sandbox/SandboxInvoker.java | 8 ++++++++ 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java index a53b1968f..9631d0df4 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java @@ -14,11 +14,11 @@ public AttributeAccessBlock(SourceLocation loc, Block lhs, Block property) { } protected Object rawGet(Env e, Object lhs, String name) throws Throwable { - return e.getInvoker().getProperty(lhs,false,false,name); + return e.getInvoker().getAttribute(lhs,false,false,name); } protected void rawSet(Env e, Object lhs, String name, Object v) throws Throwable { - e.getInvoker().setProperty(lhs,name,false,false,v); + e.getInvoker().setAttribute(lhs,name,false,false,v); } private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java index c27dcd7e1..d5fdd2be1 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java @@ -32,6 +32,21 @@ public void setProperty(Object lhs, String name, boolean safe, boolean spread, O ScriptBytecodeAdapter.setProperty(value, null/*Groovy doesn't use this parameter*/, lhs, name); } + public Object getAttribute(Object lhs, boolean safe, boolean spread, String name) throws Throwable { + assert !safe : "TODO"; + assert !spread : "TODO"; + + Object v = ScriptBytecodeAdapter.getField(null/*Groovy doesn't use this parameter*/, lhs, name); + return v; + } + + public void setAttribute(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable { + assert !safe : "TODO"; + assert !spread : "TODO"; + + ScriptBytecodeAdapter.setField(value, null/*Groovy doesn't use this parameter*/, lhs, name); + } + /*TODO: specify the proper owner value (to the script that includes the call site) */ protected CallSite fakeCallSite(String method) { CallSiteArray csa = new CallSiteArray(DefaultInvoker.class, new String[]{method}); diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java index bdf2006ff..7e377f8a7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java @@ -13,14 +13,18 @@ * @see Env#getInvoker() */ public interface Invoker { - Object methodCall(Object receiver, boolean safe, boolean spread, String method, Object[] args) throws Throwable; - /** * Default instance to be used. */ Invoker INSTANCE = new DefaultInvoker(); + Object methodCall(Object receiver, boolean safe, boolean spread, String method, Object[] args) throws Throwable; + Object getProperty(Object lhs, boolean safe, boolean spread, String name) throws Throwable; void setProperty(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable; + + Object getAttribute(Object lhs, boolean safe, boolean spread, String name) throws Throwable; + + void setAttribute(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable; } diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java index f44a7b7bc..c9fae0816 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java @@ -22,4 +22,12 @@ public Object getProperty(Object lhs, boolean safe, boolean spread, String name) public void setProperty(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable { Checker.checkedSetProperty(lhs,name,safe,spread, Types.ASSIGN,value); } + + public Object getAttribute(Object lhs, boolean safe, boolean spread, String name) throws Throwable { + return Checker.checkedGetAttribute(lhs,safe,spread,name); + } + + public void setAttribute(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable { + Checker.checkedSetAttribute(lhs,name,safe,spread, Types.ASSIGN,value); + } } From 59a2cc0957893b270713a44e0c21f8d4360a3d37 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 12:22:10 -0700 Subject: [PATCH 251/932] added a test for attibute expression getter --- .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 2ba3c9193..31999718d 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -410,7 +410,12 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { } @Test - void attributeAccess() { + void attributeSet() { assert evalCPS("new java.awt.Point(1,2).@x") == 1; } + + @Test + void attributeGet() { + assert evalCPS("def p = new java.awt.Point(1,2); p.@x+=5; p.@x") == 6; + } } From a3d28c58a1a1268cd6717eaa4cf962ca87e93749 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 12:36:30 -0700 Subject: [PATCH 252/932] Implemented async execution of property getter/setter --- .../groovy/cps/impl/PropertyishBlock.java | 27 ++++------ .../cps/impl/PropertyAccessBlockTest.groovy | 51 +++++++++++++++++++ 2 files changed, 62 insertions(+), 16 deletions(-) create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java index cdd58e85a..b0399096b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java @@ -7,8 +7,6 @@ import com.cloudbees.groovy.cps.LValueBlock; import com.cloudbees.groovy.cps.Next; -import static java.util.Collections.emptyList; - /** * Common part of {@link PropertyAccessBlock} and {@link AttributeAccessBlock}. * @@ -28,6 +26,7 @@ public Next evalLValue(final Env e, final Continuation k) { return new ContinuationImpl(e,k).then(lhs,e,fixLhs); } + // invoke the underlying Groovy object. Main point of attribute/property handling difference. protected abstract Object rawGet(Env e, Object lhs, String name) throws Throwable; protected abstract void rawSet(Env e, Object lhs, String name, Object v) throws Throwable; @@ -57,34 +56,30 @@ public Next fixName(Object name) { } public Next get(Continuation k) { - Object v; try { - v = rawGet(e,lhs,name); - } catch (Throwable t) { - return throwException(e, t, loc, new ReferenceStackTrace()); - } - - if (v instanceof CpsFunction) { - // if this is a workflow function, it'd return a CpsFunction object instead - // of actually executing the function, so execute it in the CPS - return ((CpsFunction)v).invoke(e, loc, lhs, emptyList(),k); - } else { + Object v = rawGet(e,lhs,name); // if this was a normal property, we get the value as-is. return k.receive(v); + } catch (CpsCallableInvocation inv) { + // if this was a workflow function, execute it in the CPS + return inv.invoke(e, loc, k); + } catch (Throwable t) { + return throwException(e, t, loc, new ReferenceStackTrace()); } } public Next set(Object v, Continuation k) { - // TODO: how to handle the case when a setter is a workflow method? - try { rawSet(e,lhs,name,v); + return k.receive(null); + } catch (CpsCallableInvocation inv) { + // if this was a workflow function, execute it in the CPS + return inv.invoke(e, loc, k); } catch (Throwable t) { return throwException(e, t, loc, new ReferenceStackTrace()); } - return k.receive(null); } private static final long serialVersionUID = 1L; diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy new file mode 100644 index 000000000..8f9cb9147 --- /dev/null +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy @@ -0,0 +1,51 @@ +package com.cloudbees.groovy.cps.impl + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest +import com.cloudbees.groovy.cps.Continuable +import com.cloudbees.groovy.cps.Continuation +import org.junit.Test + +/** + * + * + * @author Kohsuke Kawaguchi + */ +class PropertyAccessBlockTest extends AbstractGroovyCpsTest { + @Test + void asyncExecutionOfPropertyGet() { + def inv = parseCps(""" + class Foo { + Object getAlpha() { + return Continuable.suspend('suspended'); + } + } + return new Foo().alpha; + """) + + def c = new Continuable(inv.invoke(null, null, Continuation.HALT)) + assert 'suspended'==c.run(null) // should have suspended + assert 5 == c.run(5); // when resume, the getter should return + } + + @Test + void asyncExecutionOfPropertySet() { + def inv = parseCps(""" + class Foo { + private int x = 3; + void setAlpha(int x) { + this.x = Continuable.suspend(x); + } + int getAlpha() { + return x; + } + } + def f = new Foo() + f.alpha += 7; + return f.alpha; + """) + + def c = new Continuable(inv.invoke(null, null, Continuation.HALT)) + assert 10==c.run(null) // should have suspended + assert 13 == c.run(13); // when resume, we should see that as the final value. + } +} From c35562c28db11b87212a54bc662d5e46b1ac2699 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 16:42:46 -0700 Subject: [PATCH 253/932] Hooking up array access. ... and I don't understand why this code doesn't compile! --- .../groovy/cps/impl/ArrayAccessBlock.java | 30 +++++++++++++++++++ .../groovy/cps/impl/AttributeAccessBlock.java | 8 ++++- .../groovy/cps/impl/PropertyAccessBlock.java | 8 ++++- .../groovy/cps/impl/PropertyishBlock.java | 23 ++++++++------ .../groovy/cps/sandbox/DefaultInvoker.java | 8 +++++ .../cloudbees/groovy/cps/sandbox/Invoker.java | 4 +++ .../groovy/cps/sandbox/SandboxInvoker.java | 12 ++++++-- .../groovy/cps/CpsTransformerTest.groovy | 5 ++++ 8 files changed, 85 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java new file mode 100644 index 000000000..9da440538 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java @@ -0,0 +1,30 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Env; + +/** + * Array access like {@code x[3]} or {@code x['foo']} + * + * @author Kohsuke Kawaguchi + */ +public class ArrayAccessBlock extends PropertyishBlock { + public ArrayAccessBlock(SourceLocation loc, Block lhs, Block property) { + super(loc, lhs, property); + } + + @Override + protected Object rawGet(Env e, Object lhs, Object index) throws Throwable { + return e.getInvoker().getArray(lhs, index); + } + + @Override + protected void rawSet(Env e, Object lhs, Object index, Object v) throws Throwable { + e.getInvoker().setArray(lhs, index, v); + } + + @Override + protected Object coerce(Object index) { + return index; + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java index 9631d0df4..6c9404163 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java @@ -8,7 +8,7 @@ * * @author Kohsuke Kawaguchi */ -public class AttributeAccessBlock extends PropertyishBlock { +public class AttributeAccessBlock extends PropertyishBlock { public AttributeAccessBlock(SourceLocation loc, Block lhs, Block property) { super(loc, lhs, property); } @@ -21,5 +21,11 @@ protected void rawSet(Env e, Object lhs, String name, Object v) throws Throwable e.getInvoker().setAttribute(lhs,name,false,false,v); } + @Override + protected String coerce(Object name) { + // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String + return name.toString(); + } + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index 71498e43a..d1ab93535 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -8,7 +8,7 @@ * * @author Kohsuke Kawaguchi */ -public class PropertyAccessBlock extends PropertyishBlock { +public class PropertyAccessBlock extends PropertyishBlock { public PropertyAccessBlock(SourceLocation loc, Block lhs, Block property) { super(loc, lhs, property); } @@ -21,5 +21,11 @@ protected void rawSet(Env e, Object lhs, String name, Object v) throws Throwable e.getInvoker().setProperty(lhs,name,false,false,v); } + @Override + protected String coerce(Object name) { + // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String + return name.toString(); + } + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java index b0399096b..d18d4fedf 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java @@ -10,9 +10,11 @@ /** * Common part of {@link PropertyAccessBlock} and {@link AttributeAccessBlock}. * + * @param + * type that the property expression evaluates to. String for properties/attributes and int for arrays. * @author Kohsuke Kawaguchi */ -abstract class PropertyishBlock extends LValueBlock { +abstract class PropertyishBlock extends LValueBlock { private final Block lhs, property; private final SourceLocation loc; @@ -27,16 +29,21 @@ public Next evalLValue(final Env e, final Continuation k) { } // invoke the underlying Groovy object. Main point of attribute/property handling difference. - protected abstract Object rawGet(Env e, Object lhs, String name) throws Throwable; - protected abstract void rawSet(Env e, Object lhs, String name, Object v) throws Throwable; + protected abstract Object rawGet(Env e, Object lhs, T property) throws Throwable; + protected abstract void rawSet(Env e, Object lhs, T property, Object v) throws Throwable; + /** + * Given the result of the property/attribute name or array index value evaluation, + * coerce the result into the right type. + */ + protected abstract T coerce(Object property); class ContinuationImpl extends ContinuationGroup implements LValue { final Continuation k; final Env e; Object lhs; - String name; + T name; ContinuationImpl(Env e, Continuation k) { this.e = e; @@ -49,9 +56,7 @@ public Next fixLhs(Object lhs) { } public Next fixName(Object name) { - // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String - this.name = name.toString(); - + this.name = coerce(name); return k.receive(this); } @@ -85,9 +90,9 @@ public Next set(Object v, Continuation k) { private static final long serialVersionUID = 1L; } + private static final long serialVersionUID = 1L; + static final ContinuationPtr fixLhs = new ContinuationPtr(ContinuationImpl.class,"fixLhs"); static final ContinuationPtr fixName = new ContinuationPtr(ContinuationImpl.class,"fixName"); - - private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java index d5fdd2be1..e2a772ffa 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java @@ -47,6 +47,14 @@ public void setAttribute(Object lhs, String name, boolean safe, boolean spread, ScriptBytecodeAdapter.setField(value, null/*Groovy doesn't use this parameter*/, lhs, name); } + public Object getArray(Object lhs, Object index) throws Throwable { + return fakeCallSite("getAt").call(lhs,index); + } + + public void setArray(Object lhs, Object index, Object value) throws Throwable { + fakeCallSite("putAt").call(lhs,index,value); + } + /*TODO: specify the proper owner value (to the script that includes the call site) */ protected CallSite fakeCallSite(String method) { CallSiteArray csa = new CallSiteArray(DefaultInvoker.class, new String[]{method}); diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java index 7e377f8a7..d6804e374 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java @@ -27,4 +27,8 @@ public interface Invoker { Object getAttribute(Object lhs, boolean safe, boolean spread, String name) throws Throwable; void setAttribute(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable; + + Object getArray(Object lhs, Object index) throws Throwable; + + void setArray(Object lhs, Object index, Object value) throws Throwable; } diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java index c9fae0816..c686827de 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java @@ -24,10 +24,18 @@ public void setProperty(Object lhs, String name, boolean safe, boolean spread, O } public Object getAttribute(Object lhs, boolean safe, boolean spread, String name) throws Throwable { - return Checker.checkedGetAttribute(lhs,safe,spread,name); + return Checker.checkedGetAttribute(lhs, safe, spread, name); } public void setAttribute(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable { - Checker.checkedSetAttribute(lhs,name,safe,spread, Types.ASSIGN,value); + Checker.checkedSetAttribute(lhs, name, safe, spread, Types.ASSIGN, value); + } + + public Object getArray(Object lhs, Object index) throws Throwable { + return Checker.checkedGetArray(lhs,index); + } + + public void setArray(Object lhs, Object index, Object value) throws Throwable { + Checker.checkedSetArray(lhs,index,Types.ASSIGN,value); } } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 31999718d..de2d85553 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -418,4 +418,9 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { void attributeGet() { assert evalCPS("def p = new java.awt.Point(1,2); p.@x+=5; p.@x") == 6; } + + @Test + void arrayAccess() { + assert evalCPS("def x = new int[3]; x[0]=1; x[1]=x[0]+2; x[1]+=4; return x[1]") == 7; + } } From 619bb935d7cc3fc6929a774a03d918b20f9db9e6 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 16:48:18 -0700 Subject: [PATCH 254/932] Fixed compilation error by removing generics A bug in Javac or JLS, if you ask me. --- .../groovy/cps/impl/ArrayAccessBlock.java | 7 +------ .../groovy/cps/impl/AttributeAccessBlock.java | 13 ++++++------- .../groovy/cps/impl/PropertyAccessBlock.java | 13 ++++++------- .../groovy/cps/impl/PropertyishBlock.java | 18 +++++------------- 4 files changed, 18 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java index 9da440538..cb16a9360 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java @@ -8,7 +8,7 @@ * * @author Kohsuke Kawaguchi */ -public class ArrayAccessBlock extends PropertyishBlock { +public class ArrayAccessBlock extends PropertyishBlock { public ArrayAccessBlock(SourceLocation loc, Block lhs, Block property) { super(loc, lhs, property); } @@ -22,9 +22,4 @@ protected Object rawGet(Env e, Object lhs, Object index) throws Throwable { protected void rawSet(Env e, Object lhs, Object index, Object v) throws Throwable { e.getInvoker().setArray(lhs, index, v); } - - @Override - protected Object coerce(Object index) { - return index; - } } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java index 6c9404163..03465fad1 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java @@ -8,21 +8,20 @@ * * @author Kohsuke Kawaguchi */ -public class AttributeAccessBlock extends PropertyishBlock { +public class AttributeAccessBlock extends PropertyishBlock { public AttributeAccessBlock(SourceLocation loc, Block lhs, Block property) { super(loc, lhs, property); } - protected Object rawGet(Env e, Object lhs, String name) throws Throwable { - return e.getInvoker().getAttribute(lhs,false,false,name); + protected Object rawGet(Env e, Object lhs, Object name) throws Throwable { + return e.getInvoker().getAttribute(lhs,false,false,coerce(name)); } - protected void rawSet(Env e, Object lhs, String name, Object v) throws Throwable { - e.getInvoker().setAttribute(lhs,name,false,false,v); + protected void rawSet(Env e, Object lhs, Object name, Object v) throws Throwable { + e.getInvoker().setAttribute(lhs,coerce(name),false,false,v); } - @Override - protected String coerce(Object name) { + private String coerce(Object name) { // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String return name.toString(); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index d1ab93535..2a15b58f0 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -8,21 +8,20 @@ * * @author Kohsuke Kawaguchi */ -public class PropertyAccessBlock extends PropertyishBlock { +public class PropertyAccessBlock extends PropertyishBlock { public PropertyAccessBlock(SourceLocation loc, Block lhs, Block property) { super(loc, lhs, property); } - protected Object rawGet(Env e, Object lhs, String name) throws Throwable { - return e.getInvoker().getProperty(lhs,false,false,name); + protected Object rawGet(Env e, Object lhs, Object name) throws Throwable { + return e.getInvoker().getProperty(lhs,false,false,coerce(name)); } - protected void rawSet(Env e, Object lhs, String name, Object v) throws Throwable { - e.getInvoker().setProperty(lhs,name,false,false,v); + protected void rawSet(Env e, Object lhs, Object name, Object v) throws Throwable { + e.getInvoker().setProperty(lhs,coerce(name),false,false,v); } - @Override - protected String coerce(Object name) { + private String coerce(Object name) { // TODO: verify the behaviour of Groovy if the property expression evaluates to non-String return name.toString(); } diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java index d18d4fedf..fd49c29aa 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java @@ -10,11 +10,9 @@ /** * Common part of {@link PropertyAccessBlock} and {@link AttributeAccessBlock}. * - * @param - * type that the property expression evaluates to. String for properties/attributes and int for arrays. * @author Kohsuke Kawaguchi */ -abstract class PropertyishBlock extends LValueBlock { +abstract class PropertyishBlock extends LValueBlock { private final Block lhs, property; private final SourceLocation loc; @@ -29,21 +27,15 @@ public Next evalLValue(final Env e, final Continuation k) { } // invoke the underlying Groovy object. Main point of attribute/property handling difference. - protected abstract Object rawGet(Env e, Object lhs, T property) throws Throwable; - protected abstract void rawSet(Env e, Object lhs, T property, Object v) throws Throwable; - - /** - * Given the result of the property/attribute name or array index value evaluation, - * coerce the result into the right type. - */ - protected abstract T coerce(Object property); + protected abstract Object rawGet(Env e, Object lhs, Object property) throws Throwable; + protected abstract void rawSet(Env e, Object lhs, Object property, Object v) throws Throwable; class ContinuationImpl extends ContinuationGroup implements LValue { final Continuation k; final Env e; Object lhs; - T name; + Object name; ContinuationImpl(Env e, Continuation k) { this.e = e; @@ -56,7 +48,7 @@ public Next fixLhs(Object lhs) { } public Next fixName(Object name) { - this.name = coerce(name); + this.name = name; return k.receive(this); } From fae14e5680d5a846ba06582ce32fe07edda0b72a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 17:16:03 -0700 Subject: [PATCH 255/932] CpsTransformer now transforms array instantiation --- .../groovy/cps/CpsTransformer.groovy | 13 +++- .../com/cloudbees/groovy/cps/Builder.java | 12 ++++ .../groovy/cps/impl/NewArrayBlock.java | 69 +++++++++++++++++++ 3 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 6f43b7c8e..784e2df56 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -767,8 +767,17 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - void visitArrayExpression(ArrayExpression expression) { - throw new UnsupportedOperationException(); + void visitArrayExpression(ArrayExpression exp) { + if (exp.sizeExpression!=null) { + // array instanation like new String[1][2][3] + makeNode("newArray") { + loc(exp) + literal(exp.elementType) + visit(exp.sizeExpression) + } + } else { + throw new UnsupportedOperationException(); + } } void visitSpreadExpression(SpreadExpression expression) { diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 055e49200..932e7aff6 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.ArrayAccessBlock; import com.cloudbees.groovy.cps.impl.AssertBlock; import com.cloudbees.groovy.cps.impl.AssignmentBlock; import com.cloudbees.groovy.cps.impl.AttributeAccessBlock; @@ -19,6 +20,7 @@ import com.cloudbees.groovy.cps.impl.LocalVariableBlock; import com.cloudbees.groovy.cps.impl.LogicalOpBlock; import com.cloudbees.groovy.cps.impl.MapBlock; +import com.cloudbees.groovy.cps.impl.NewArrayBlock; import com.cloudbees.groovy.cps.impl.NotBlock; import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; import com.cloudbees.groovy.cps.impl.ReturnBlock; @@ -480,6 +482,9 @@ public LValueBlock property(int line, Block lhs, Block property) { return new PropertyAccessBlock(loc(line),lhs,property); } + public LValueBlock array(int line, Block lhs, Block index) { + return new ArrayAccessBlock(loc(line),lhs,index); + } public LValueBlock attribute(int line, Block lhs, Block property) { return new AttributeAccessBlock(loc(line),lhs,property); @@ -508,6 +513,13 @@ public Block new_(int line, Block type, Block... argExps) { return new FunctionCallBlock(loc(line),type,constant(""),argExps); } + /** + * Array instantiation like {@code new String[1][5]} + */ + public Block newArray(int line, Class type, Block... argExps) { + return new NewArrayBlock(loc(line),type,argExps); + } + /** * return exp; */ diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java new file mode 100644 index 000000000..ee6a6f9e2 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java @@ -0,0 +1,69 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; + +import java.lang.reflect.Array; + +/** + * Multi-dimensional array instantiation like {@code new String[1][2][3]} + * + * @author Kohsuke Kawaguchi + */ +public class NewArrayBlock implements Block { + private final Class componentType; + private final Block[] dimensionExps; + private final SourceLocation loc; + + public NewArrayBlock(SourceLocation loc, Class componentType, Block... dimensionExps) { + this.loc = loc; + this.componentType = componentType; + this.dimensionExps = dimensionExps; + } + + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e,k).dispatchOrArg(); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + int[] dimensions = new int[dimensionExps.length]; + int idx; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next fixArg(Object v) { + try { + dimensions[idx++] = (Integer)ScriptBytecodeAdapter.castToType(v,int.class); + } catch (Throwable t) { + return throwException(e, t, loc, new ReferenceStackTrace()); + } + return dispatchOrArg(); + } + + /** + * If there are more arguments to evaluate, do so. Otherwise evaluate the function. + */ + private Next dispatchOrArg() { + if (dimensions.length>idx) + return then(dimensionExps[idx],e,fixArg); + else { + // ready to instantiate + Object v = Array.newInstance(componentType,dimensions); + return k.receive(v); + } + } + + private static final long serialVersionUID = 1L; + } + + static final ContinuationPtr fixArg = new ContinuationPtr(ContinuationImpl.class,"fixArg"); +} From bdb20981bde3f8e584c555243b5d8ddd8ee1b76d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 17:18:23 -0700 Subject: [PATCH 256/932] CpsTransformer now transforms array access --- .../com/cloudbees/groovy/cps/CpsTransformer.groovy | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 784e2df56..4b6e945d9 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -500,6 +500,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor (POWER_EQUAL) :"powerEqual", (EQUAL) :"assign", (KEYWORD_INSTANCEOF) :"instanceOf", + (LEFT_SQUARE_BRACKET) :"array", ] /** @@ -554,14 +555,6 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor evaluateCompareExpression(matchRegexMethod, exp); break; - case LEFT_SQUARE_BRACKET: - if (controller.getCompileStack().isLHS()) { - evaluateEqual(exp, false); - } else { - evaluateBinaryExpression("getAt", exp); - } - break; - case KEYWORD_IN: evaluateCompareExpression(isCaseMethod, exp); break; From f70babb401cf62c5f678003e96ce3c46144e7854 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 17:20:26 -0700 Subject: [PATCH 257/932] Added more test for array instantiation --- .../cloudbees/groovy/cps/CpsTransformerTest.groovy | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index de2d85553..701ae65d7 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -419,6 +419,17 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS("def p = new java.awt.Point(1,2); p.@x+=5; p.@x") == 6; } + @Test + void multidimensionalArrayInstantiation() { + assert evalCPS(""" + def x = new int[3][4]; + int z = 0; + for (int i=0; i Date: Mon, 14 Jul 2014 17:26:44 -0700 Subject: [PATCH 258/932] Intercept constructor call --- .../cloudbees/groovy/cps/impl/ContinuationGroup.java | 10 ++-------- .../cloudbees/groovy/cps/impl/FunctionCallBlock.java | 2 +- .../cloudbees/groovy/cps/sandbox/DefaultInvoker.java | 5 +++++ .../java/com/cloudbees/groovy/cps/sandbox/Invoker.java | 2 ++ .../cloudbees/groovy/cps/sandbox/SandboxInvoker.java | 4 ++++ 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 327925c76..484dc4da5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -9,7 +9,6 @@ import com.cloudbees.groovy.cps.Next; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; -import org.codehaus.groovy.runtime.callsite.CallSiteArray; import javax.annotation.CheckReturnValue; import java.io.Serializable; @@ -18,7 +17,7 @@ import java.util.List; import java.util.concurrent.Callable; -import static com.cloudbees.groovy.cps.impl.SourceLocation.UNKNOWN; +import static com.cloudbees.groovy.cps.impl.SourceLocation.*; /** * Base class for defining a series of {@link Continuation} methods that share the same set of contextual values. @@ -52,11 +51,6 @@ protected final boolean asBoolean(Object o) { } /*TODO: specify the proper owner value (to the script that includes the call site) */ - protected static CallSite fakeCallSite(String method) { - CallSiteArray csa = new CallSiteArray(ContinuationGroup.class, new String[]{method}); - return csa.array[0]; - } - protected Next methodCall(Env e, SourceLocation loc, ContinuationPtr k, Object receiver, String methodName, Object... args) { return methodCall(e,loc,k.bind(this),receiver,methodName,args); } @@ -69,7 +63,7 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat public Next call() { try { // TODO: spread and safe - Object v = e.getInvoker().methodCall(receiver,false,false,methodName,args); + Object v = e.getInvoker().methodCall(receiver, false, false, methodName, args); // if this was a normal function, the method had just executed synchronously return k.receive(v); } catch (CpsCallableInvocation inv) { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index 502263b51..df53b1341 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -87,7 +87,7 @@ private Next dispatchOrArg() { // constructor call Object v; try { - v = fakeCallSite("").callConstructor(lhs,args); + v = e.getInvoker().constructorCall((Class)lhs,args); } catch (Throwable t) { return throwException(e, t, loc, new ReferenceStackTrace()); } diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java index e2a772ffa..ba5ecf955 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java @@ -17,6 +17,11 @@ public Object methodCall(Object receiver, boolean safe, boolean spread, String m return v; } + public Object constructorCall(Class lhs, Object[] args) throws Throwable { + Object v = fakeCallSite("").callConstructor(lhs,args); + return v; + } + public Object getProperty(Object lhs, boolean safe, boolean spread, String name) throws Throwable { assert !safe : "TODO"; assert !spread : "TODO"; diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java index d6804e374..9943af203 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java @@ -20,6 +20,8 @@ public interface Invoker { Object methodCall(Object receiver, boolean safe, boolean spread, String method, Object[] args) throws Throwable; + Object constructorCall(Class lhs, Object[] args) throws Throwable; + Object getProperty(Object lhs, boolean safe, boolean spread, String name) throws Throwable; void setProperty(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable; diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java index c686827de..831e3efb7 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java @@ -15,6 +15,10 @@ public Object methodCall(Object receiver, boolean safe, boolean spread, String m return Checker.checkedCall(receiver,safe,spread,method,args); } + public Object constructorCall(Class lhs, Object[] args) throws Throwable { + return Checker.checkedConstructor(lhs,args); + } + public Object getProperty(Object lhs, boolean safe, boolean spread, String name) throws Throwable { return Checker.checkedGetProperty(lhs,safe,spread,name); } From bb756048cdcff4deb743d4fe41d251dde8eb52e1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 17:31:43 -0700 Subject: [PATCH 259/932] Handling spread and safe like this makes no sense. Spread in particular may require individual function calls that might run asynchronously. --- .../groovy/cps/impl/AttributeAccessBlock.java | 4 +-- .../groovy/cps/impl/ContinuationGroup.java | 2 +- .../groovy/cps/impl/PropertyAccessBlock.java | 4 +-- .../groovy/cps/sandbox/DefaultInvoker.java | 27 +++++-------------- .../cloudbees/groovy/cps/sandbox/Invoker.java | 10 +++---- .../groovy/cps/sandbox/SandboxInvoker.java | 20 +++++++------- 6 files changed, 27 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java index 03465fad1..cc31e3fac 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java @@ -14,11 +14,11 @@ public AttributeAccessBlock(SourceLocation loc, Block lhs, Block property) { } protected Object rawGet(Env e, Object lhs, Object name) throws Throwable { - return e.getInvoker().getAttribute(lhs,false,false,coerce(name)); + return e.getInvoker().getAttribute(lhs,coerce(name)); } protected void rawSet(Env e, Object lhs, Object name, Object v) throws Throwable { - e.getInvoker().setAttribute(lhs,coerce(name),false,false,v); + e.getInvoker().setAttribute(lhs,coerce(name),v); } private String coerce(Object name) { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 484dc4da5..4ce6525f4 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -63,7 +63,7 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat public Next call() { try { // TODO: spread and safe - Object v = e.getInvoker().methodCall(receiver, false, false, methodName, args); + Object v = e.getInvoker().methodCall(receiver, methodName, args); // if this was a normal function, the method had just executed synchronously return k.receive(v); } catch (CpsCallableInvocation inv) { diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java index 2a15b58f0..2c37e8810 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java @@ -14,11 +14,11 @@ public PropertyAccessBlock(SourceLocation loc, Block lhs, Block property) { } protected Object rawGet(Env e, Object lhs, Object name) throws Throwable { - return e.getInvoker().getProperty(lhs,false,false,coerce(name)); + return e.getInvoker().getProperty(lhs,coerce(name)); } protected void rawSet(Env e, Object lhs, Object name, Object v) throws Throwable { - e.getInvoker().setProperty(lhs,coerce(name),false,false,v); + e.getInvoker().setProperty(lhs,coerce(name),v); } private String coerce(Object name) { diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java index ba5ecf955..c43738dd5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java @@ -5,13 +5,12 @@ import org.codehaus.groovy.runtime.callsite.CallSiteArray; /** + * {@link Invoker} that performs the expected operation without anything extra. + * * @author Kohsuke Kawaguchi */ public class DefaultInvoker implements Invoker { - public Object methodCall(Object receiver, boolean safe, boolean spread, String method, Object[] args) throws Throwable { - assert !safe : "TODO"; - assert !spread : "TODO"; - + public Object methodCall(Object receiver, String method, Object[] args) throws Throwable { CallSite callSite = fakeCallSite(method); Object v = callSite.call(receiver,args); return v; @@ -22,33 +21,21 @@ public Object constructorCall(Class lhs, Object[] args) throws Throwable { return v; } - public Object getProperty(Object lhs, boolean safe, boolean spread, String name) throws Throwable { - assert !safe : "TODO"; - assert !spread : "TODO"; - + public Object getProperty(Object lhs, String name) throws Throwable { Object v = ScriptBytecodeAdapter.getProperty(null/*Groovy doesn't use this parameter*/, lhs, name); return v; } - public void setProperty(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable { - assert !safe : "TODO"; - assert !spread : "TODO"; - + public void setProperty(Object lhs, String name, Object value) throws Throwable { ScriptBytecodeAdapter.setProperty(value, null/*Groovy doesn't use this parameter*/, lhs, name); } - public Object getAttribute(Object lhs, boolean safe, boolean spread, String name) throws Throwable { - assert !safe : "TODO"; - assert !spread : "TODO"; - + public Object getAttribute(Object lhs, String name) throws Throwable { Object v = ScriptBytecodeAdapter.getField(null/*Groovy doesn't use this parameter*/, lhs, name); return v; } - public void setAttribute(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable { - assert !safe : "TODO"; - assert !spread : "TODO"; - + public void setAttribute(Object lhs, String name, Object value) throws Throwable { ScriptBytecodeAdapter.setField(value, null/*Groovy doesn't use this parameter*/, lhs, name); } diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java index 9943af203..2c2ee7775 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java @@ -18,17 +18,17 @@ public interface Invoker { */ Invoker INSTANCE = new DefaultInvoker(); - Object methodCall(Object receiver, boolean safe, boolean spread, String method, Object[] args) throws Throwable; + Object methodCall(Object receiver, String method, Object[] args) throws Throwable; Object constructorCall(Class lhs, Object[] args) throws Throwable; - Object getProperty(Object lhs, boolean safe, boolean spread, String name) throws Throwable; + Object getProperty(Object lhs, String name) throws Throwable; - void setProperty(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable; + void setProperty(Object lhs, String name, Object value) throws Throwable; - Object getAttribute(Object lhs, boolean safe, boolean spread, String name) throws Throwable; + Object getAttribute(Object lhs, String name) throws Throwable; - void setAttribute(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable; + void setAttribute(Object lhs, String name, Object value) throws Throwable; Object getArray(Object lhs, Object index) throws Throwable; diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java index 831e3efb7..078d7289d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java @@ -11,28 +11,28 @@ * @author Kohsuke Kawaguchi */ public class SandboxInvoker implements Invoker { - public Object methodCall(Object receiver, boolean safe, boolean spread, String method, Object[] args) throws Throwable { - return Checker.checkedCall(receiver,safe,spread,method,args); + public Object methodCall(Object receiver, String method, Object[] args) throws Throwable { + return Checker.checkedCall(receiver,false,false,method,args); } public Object constructorCall(Class lhs, Object[] args) throws Throwable { return Checker.checkedConstructor(lhs,args); } - public Object getProperty(Object lhs, boolean safe, boolean spread, String name) throws Throwable { - return Checker.checkedGetProperty(lhs,safe,spread,name); + public Object getProperty(Object lhs, String name) throws Throwable { + return Checker.checkedGetProperty(lhs,false,false,name); } - public void setProperty(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable { - Checker.checkedSetProperty(lhs,name,safe,spread, Types.ASSIGN,value); + public void setProperty(Object lhs, String name, Object value) throws Throwable { + Checker.checkedSetProperty(lhs,name,false,false, Types.ASSIGN,value); } - public Object getAttribute(Object lhs, boolean safe, boolean spread, String name) throws Throwable { - return Checker.checkedGetAttribute(lhs, safe, spread, name); + public Object getAttribute(Object lhs, String name) throws Throwable { + return Checker.checkedGetAttribute(lhs, false, false, name); } - public void setAttribute(Object lhs, String name, boolean safe, boolean spread, Object value) throws Throwable { - Checker.checkedSetAttribute(lhs, name, safe, spread, Types.ASSIGN, value); + public void setAttribute(Object lhs, String name, Object value) throws Throwable { + Checker.checkedSetAttribute(lhs, name, false, false, Types.ASSIGN, value); } public Object getArray(Object lhs, Object index) throws Throwable { From 01b2c48a86737a363ab7e8df19e717693c86e3b5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 14 Jul 2014 17:33:28 -0700 Subject: [PATCH 260/932] This is not a mandatory dependency. Necessary only when SandboxInvoker is used --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 6ab56c0d4..97ea84ee2 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,7 @@ org.kohsuke groovy-sandbox 1.7-SNAPSHOT + true org.codehaus.groovy From 66ac8a3d75770062d02c8d778cff83b7695dc38e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 11:27:02 +0300 Subject: [PATCH 261/932] First test for sandbox+cps --- pom.xml | 7 ++++ .../cps/sandbox/SandboxInvokerTest.groovy | 41 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy diff --git a/pom.xml b/pom.xml index 97ea84ee2..eefe75e00 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,13 @@ 1.7-SNAPSHOT true + + org.kohsuke + groovy-sandbox + 1.7-SNAPSHOT + tests + test + org.codehaus.groovy groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy new file mode 100644 index 000000000..703dde9ef --- /dev/null +++ b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -0,0 +1,41 @@ +package com.cloudbees.groovy.cps.sandbox; + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest +import com.cloudbees.groovy.cps.Continuation +import com.cloudbees.groovy.cps.Env +import com.cloudbees.groovy.cps.impl.FunctionCallEnv; +import org.junit.Test +import org.kohsuke.groovy.sandbox.ClassRecorder; + +/** + * @author Kohsuke Kawaguchi + */ +public class SandboxInvokerTest extends AbstractGroovyCpsTest { + def cr = new ClassRecorder() + + @Test + public void basic() { + assert 3==evalCpsSandbox("new String('abc'.bytes).length()") + + assertIntercept( + "String.bytes", + "new String(byte[])", + "String.length()") + } + + private Object evalCpsSandbox(String script) { + FunctionCallEnv e = new FunctionCallEnv(null, null, null, null); + e.invoker = new SandboxInvoker(); + + cr.register() + try { + return parseCps(script).invoke(e, null, Continuation.HALT).run().yield.replay() + } finally { + cr.unregister() + } + } + + def assertIntercept(String... expected) { + assertEquals(expected.join("\n"), cr.toString().trim()) + } +} From 9e91655c4bedd81aa7ded7b7545d3484bc8f7505 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 11:32:52 +0300 Subject: [PATCH 262/932] Changed the test case to Point to cover all the basics --- .../cps/sandbox/SandboxInvokerTest.groovy | 42 ++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index 703dde9ef..b15d90689 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -13,14 +13,44 @@ import org.kohsuke.groovy.sandbox.ClassRecorder; public class SandboxInvokerTest extends AbstractGroovyCpsTest { def cr = new ClassRecorder() + /** + * Covers all the intercepted operations. + */ @Test public void basic() { - assert 3==evalCpsSandbox("new String('abc'.bytes).length()") + evalCpsSandbox(""" + import java.awt.Point; - assertIntercept( - "String.bytes", - "new String(byte[])", - "String.length()") + def p = new Point(1,3); // constructor + assert p.equals(p) // method call + assert 4 == p.x+p.y; // property get + p.x = 5; // property set + assert 5 == p.@x; // attribute get + p.@x = 6; // attribute set + + def a = new int[3]; + a[1] = a[0]+7; // array get & set + assert a[1]==7; + """) + + assertIntercept(""" +new Point(Integer,Integer) +Point.equals(Point) +Point.x +Point.y +Double.plus(Double) +ScriptBytecodeAdapter:compareEqual(Integer,Double) +Point.x=Integer +Point.@x +ScriptBytecodeAdapter:compareEqual(Integer,Integer) +Point.@x=Integer +int[][Integer] +Integer.plus(Integer) +int[][Integer]=Integer +int[][Integer] +ScriptBytecodeAdapter:compareEqual(Integer,Integer) +""" +) } private Object evalCpsSandbox(String script) { @@ -36,6 +66,6 @@ public class SandboxInvokerTest extends AbstractGroovyCpsTest { } def assertIntercept(String... expected) { - assertEquals(expected.join("\n"), cr.toString().trim()) + assertEquals(expected.join("\n").trim(), cr.toString().trim()) } } From 1a3c57ef16fad69ff79b4681b8219f0249a8dab5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 11:53:27 +0300 Subject: [PATCH 263/932] Exposing these for subtype. When used in the context of a subtype, Groovy seems to have trouble finding these private methods. --- .../groovy/cps/CpsTransformer.groovy | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 4b6e945d9..20556af45 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -145,8 +145,10 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * } */ public void visitMethod(MethodNode m) { - if (!shouldBeTransformed(m)) + if (!shouldBeTransformed(m)) { + visitNontransformedMethod(m); return; + } Expression body; @@ -194,13 +196,20 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor m.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)); } + /** + * For methods that are not CPS-transformed. + */ + protected void visitNontransformedMethod(MethodNode m) { + } + + /** * As we visit expressions in the method body, we convert them to the {@link Builder} invocations * and pass them back to this closure. */ private Closure parent; - private void visit(ASTNode e) { + protected void visit(ASTNode e) { if (e instanceof EmptyExpression) { // working around a bug in EmptyExpression.visit() that doesn't call any method visitEmptyExpression(e); @@ -213,7 +222,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - private void visit(Collection col) { + protected void visit(Collection col) { for (def e : col) { visit(e); } @@ -267,26 +276,26 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor makeNode(methodName,null) } - private void loc(ASTNode e) { + protected void loc(ASTNode e) { literal(e.lineNumber); } /** * Used in the closure block of {@link #makeNode(String, Object)} to create a literal string argument. */ - private void literal(String s) { + protected void literal(String s) { parent(new ConstantExpression(s)) } - private void literal(ClassNode c) { + protected void literal(ClassNode c) { parent(new ClassExpression(c)) } - private void literal(int n) { + protected void literal(int n) { parent(new ConstantExpression(n,true)) } - private void literal(boolean b) { + protected void literal(boolean b) { parent(new ConstantExpression(b,true)) } From 6fb02331d45e8e1a675fc66444689d90ed5854f5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 11:54:39 +0300 Subject: [PATCH 264/932] Added CpsTransformer subtype that combines sandbox + cps. When we skip CPS transformation on methods, we still need to sandbox-transform them to be able to intercept calls from them. --- .../groovy/cps/SandboxCpsTransformer.groovy | 33 +++++++++++++++++++ .../groovy/cps/AbstractGroovyCpsTest.groovy | 6 +++- .../cps/sandbox/SandboxInvokerTest.groovy | 21 ++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy diff --git a/src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy new file mode 100644 index 000000000..50b83ccac --- /dev/null +++ b/src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy @@ -0,0 +1,33 @@ +package com.cloudbees.groovy.cps + +import org.codehaus.groovy.ast.ClassCodeExpressionTransformer +import org.codehaus.groovy.ast.ClassNode +import org.codehaus.groovy.ast.MethodNode +import org.codehaus.groovy.classgen.GeneratorContext +import org.codehaus.groovy.control.SourceUnit +import org.kohsuke.groovy.sandbox.SandboxTransformer + +/** + * {@link CpsTransformer} + {@link org.kohsuke.groovy.sandbox.SandboxTransformer} + * + * @author Kohsuke Kawaguchi + */ +class SandboxCpsTransformer extends CpsTransformer { + private final SandboxTransformer st = new SandboxTransformer() + private ClassCodeExpressionTransformer stv; + + @Override + void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { + stv = st.createVisitor(source) + super.call(source, context, classNode) + } + + /** + * If the method is not CPS transformed, we need to sandbox-transform that method to intercept calls + * that happen in these methods. + */ + @Override + protected void visitNontransformedMethod(MethodNode m) { + stv.visitMethod(m); + } +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index ecb752541..4ef504e87 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -32,7 +32,7 @@ abstract class AbstractGroovyCpsTest extends Assert { def cc = new CompilerConfiguration() cc.addCompilationCustomizers(imports) - cc.addCompilationCustomizers(new CpsTransformer()) + cc.addCompilationCustomizers(createCpsTransformer()) cc.scriptBaseClass = SerializableScript.class.name csh = new GroovyShell(binding,cc); @@ -41,6 +41,10 @@ abstract class AbstractGroovyCpsTest extends Assert { sh = new GroovyShell(binding,cc); } + protected CpsTransformer createCpsTransformer() { + return new CpsTransformer() + } + Object evalCPS(String script) { Object v = evalCPSonly(script) assert v==sh.evaluate(script); // make sure that regular non-CPS execution reports the same result diff --git a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index b15d90689..f317a3a95 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -2,7 +2,9 @@ package com.cloudbees.groovy.cps.sandbox; import com.cloudbees.groovy.cps.AbstractGroovyCpsTest import com.cloudbees.groovy.cps.Continuation +import com.cloudbees.groovy.cps.CpsTransformer import com.cloudbees.groovy.cps.Env +import com.cloudbees.groovy.cps.SandboxCpsTransformer import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import org.junit.Test import org.kohsuke.groovy.sandbox.ClassRecorder; @@ -13,6 +15,11 @@ import org.kohsuke.groovy.sandbox.ClassRecorder; public class SandboxInvokerTest extends AbstractGroovyCpsTest { def cr = new ClassRecorder() + @Override + protected CpsTransformer createCpsTransformer() { + new SandboxCpsTransformer() + } + /** * Covers all the intercepted operations. */ @@ -53,6 +60,20 @@ ScriptBytecodeAdapter:compareEqual(Integer,Integer) ) } + @Test + public void mixtureOfNonTransformation() { + assert 3==evalCpsSandbox(""" + @NonCPS + def length(x) { + return x.length(); + } + + return length("foo") +""") + println cr.toString() + } + + private Object evalCpsSandbox(String script) { FunctionCallEnv e = new FunctionCallEnv(null, null, null, null); e.invoker = new SandboxInvoker(); From 1b01c49a59e9a428a1b158c17c7aaf5e19b0688e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 11:54:59 +0300 Subject: [PATCH 265/932] This method results in double transformation --- src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 20556af45..82a8d6ae2 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -81,7 +81,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor @Override void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { this.sourceUnit = source; - copy(source.ast.methods)?.each { visitMethod(it) } +// copy(source.ast.methods)?.each { visitMethod(it) } // classNode?.declaredConstructors?.each { visitMethod(it) } // can't transform constructor copy(classNode?.methods)?.each { visitMethod(it) } // classNode?.objectInitializerStatements?.each { it.visit(visitor) } From 8b546861750f77047540f0c2faf9fa0b09fa1f0f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 11:57:00 +0300 Subject: [PATCH 266/932] Updated assertions to check proper interception --- .../com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index f317a3a95..b9a778300 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -70,7 +70,7 @@ ScriptBytecodeAdapter:compareEqual(Integer,Integer) return length("foo") """) - println cr.toString() + assertIntercept('Script1.length(String)','String.length()') } From 314744f9228cf8df70a85bda3fccd1b9275c885b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 11:57:16 +0300 Subject: [PATCH 267/932] These objects need to be serializable since they are a part of the program state. --- .../java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java | 2 ++ src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java | 4 +++- .../java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java index c43738dd5..3201fb508 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java @@ -52,4 +52,6 @@ protected CallSite fakeCallSite(String method) { CallSiteArray csa = new CallSiteArray(DefaultInvoker.class, new String[]{method}); return csa.array[0]; } + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java index 2c2ee7775..a99803c7e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java @@ -2,6 +2,8 @@ import com.cloudbees.groovy.cps.Env; +import java.io.Serializable; + /** * Abstracts away interactions with Groovy objects, for example to provide an opportunity to intercept * calls. @@ -12,7 +14,7 @@ * @author Kohsuke Kawaguchi * @see Env#getInvoker() */ -public interface Invoker { +public interface Invoker extends Serializable { /** * Default instance to be used. */ diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java index 078d7289d..ab36d0b63 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java @@ -42,4 +42,6 @@ public Object getArray(Object lhs, Object index) throws Throwable { public void setArray(Object lhs, Object index, Object value) throws Throwable { Checker.checkedSetArray(lhs,index,Types.ASSIGN,value); } + + private static final long serialVersionUID = 1L; } From 181cec23adcb9e1ddc1f20d044f0300632c1b9a4 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 11:59:33 +0300 Subject: [PATCH 268/932] Updated the test to fix assertion errors --- .../com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index b9a778300..adb158884 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -75,7 +75,7 @@ ScriptBytecodeAdapter:compareEqual(Integer,Integer) private Object evalCpsSandbox(String script) { - FunctionCallEnv e = new FunctionCallEnv(null, null, null, null); + FunctionCallEnv e = new FunctionCallEnv(null, Continuation.HALT, null, null); e.invoker = new SandboxInvoker(); cr.register() From 95c0bfc0ce25d674476b46cb11eb53d31a3c1004 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 12:05:31 +0300 Subject: [PATCH 269/932] Switch to a released version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eefe75e00..46f0d6b3c 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ org.kohsuke groovy-sandbox - 1.7-SNAPSHOT + 1.7 true From 98d6d03d58bfad19fd171f2ea7ee148347c5acc5 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 12:09:46 +0300 Subject: [PATCH 270/932] Switched to a released version (fixup) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 46f0d6b3c..5e90eb9e7 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ org.kohsuke groovy-sandbox - 1.7-SNAPSHOT + 1.7 tests test From d42cbd3439e7e9f0dbe33c76e1c17313883ee3df Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 12:10:25 +0300 Subject: [PATCH 271/932] [maven-release-plugin] prepare release groovy-cps-0.4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5e90eb9e7..c38836b4a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.4-SNAPSHOT + 0.4 Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - HEAD + groovy-cps-0.4 From d6533b9448ef9a16b1d053404c49633055432e86 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 17 Jul 2014 12:10:33 +0300 Subject: [PATCH 272/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c38836b4a..9b65a299a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.4 + 0.5-SNAPSHOT Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - groovy-cps-0.4 + HEAD From 544041bc9b274d07e0718424eab056add70d1a2a Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 23 Jul 2014 07:58:08 +0200 Subject: [PATCH 273/932] Wrong parameter ordering --- src/main/java/com/cloudbees/groovy/cps/Continuable.java | 2 +- .../java/com/cloudbees/groovy/cps/green/GreenThreadState.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 998e6def3..4d2f1209f 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -43,7 +43,7 @@ public Continuable(Next n) { * Creates a {@link Continuable} that executes the block of code in a fresh empty environment. */ public Continuable(Block block) { - this(block, new FunctionCallEnv(null,null,null,Continuation.HALT)); + this(block, new FunctionCallEnv(null,Continuation.HALT,null,null)); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java index 3c297364b..4d5fcd2fb 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java @@ -64,7 +64,7 @@ private GreenThreadState(GreenThread g, Next n) { */ GreenThreadState(GreenThread g, Block b) { // TODO: allow the caller to pass a value - this(g,new Next(b, new FunctionCallEnv(null, null, null, HALT), HALT)); + this(g,new Next(b, new FunctionCallEnv(null, HALT, null, null), HALT)); } /** From 40074b5c4162c55c7ed38d534f99351a724ad24f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 8 Aug 2014 11:35:54 -0700 Subject: [PATCH 274/932] [maven-release-plugin] prepare release groovy-cps-0.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9b65a299a..8e23db28b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.5-SNAPSHOT + 0.5 Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - HEAD + groovy-cps-0.5 From 4f814a4f9a5f58add0454d1e82807b460d621de3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 8 Aug 2014 11:35:58 -0700 Subject: [PATCH 275/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8e23db28b..c1c92e239 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.5 + 0.6-SNAPSHOT Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - groovy-cps-0.5 + HEAD From 058ce0a36b51816f5b21019c2831480b3c195339 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 13 Aug 2014 18:09:43 -0700 Subject: [PATCH 276/932] Exposing these for subtype. When used in the context of a subtype, Groovy seems to have trouble finding these private methods. --- src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 82a8d6ae2..483363ad1 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -207,7 +207,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * As we visit expressions in the method body, we convert them to the {@link Builder} invocations * and pass them back to this closure. */ - private Closure parent; + protected Closure parent; protected void visit(ASTNode e) { if (e instanceof EmptyExpression) { From dc52273f8710f5c60f718a261acd2318bd409cfd Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Oct 2014 11:03:49 -0700 Subject: [PATCH 277/932] Added a hook to customize Invoker when creating Continuable --- .../com/cloudbees/groovy/cps/Continuable.java | 18 +++++++++++++++--- .../cloudbees/groovy/cps/sandbox/Invoker.java | 3 +++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 4d2f1209f..4431aceee 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -3,6 +3,7 @@ import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import com.cloudbees.groovy.cps.impl.SuspendBlock; +import com.cloudbees.groovy.cps.sandbox.Invoker; import groovy.lang.GroovyShell; import groovy.lang.Script; @@ -59,10 +60,21 @@ public Continuable(Block block, Env e) { * wraps that into a {@link Continuable}. */ public Continuable(Script cpsTransformedScript) { - this(wrap(cpsTransformedScript)); + this(cpsTransformedScript,null); } - private static Next wrap(Script s) { + /** + * Takes a {@link Script} compiled from CPS-transforming {@link GroovyShell} and + * wraps that into a {@link Continuable}, in the context of the given {@link Env}. + * + * The added 'env' parameter can be used to control the execution flow in case + * of exceptions, and/or providing custom {@link Invoker} + */ + public Continuable(Script cpsTransformedScript, Env env) { + this(wrap(cpsTransformedScript,env)); + } + + private static Next wrap(Script s, Env env) { try { Method m = s.getClass().getMethod("run"); if (!m.isAnnotationPresent(WorkflowTransformed.class)) @@ -70,7 +82,7 @@ private static Next wrap(Script s) { s.run(); throw new AssertionError("I'm confused if Script is CPS-transformed or not!"); } catch (CpsCallableInvocation e) { - return e.invoke(null, null, Continuation.HALT); + return e.invoke(env, null, Continuation.HALT); } catch (NoSuchMethodException e) { throw new AssertionError(e); } diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java index a99803c7e..6ae81e118 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java @@ -1,6 +1,8 @@ package com.cloudbees.groovy.cps.sandbox; +import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Env; +import groovy.lang.Script; import java.io.Serializable; @@ -13,6 +15,7 @@ * * @author Kohsuke Kawaguchi * @see Env#getInvoker() + * @see Continuable#Continuable(Script, Env) */ public interface Invoker extends Serializable { /** From adc7dc1b233d9d3df03c6fcbcb05cc7de9d309e0 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Oct 2014 11:11:48 -0700 Subject: [PATCH 278/932] Added a factory method for convenient "empty" environment --- .../com/cloudbees/groovy/cps/Continuable.java | 3 +- .../java/com/cloudbees/groovy/cps/Envs.java | 30 +++++++++++++++++++ .../groovy/cps/green/GreenThreadState.java | 4 +-- .../cloudbees/groovy/cps/sandbox/Invoker.java | 2 ++ .../cps/sandbox/SandboxInvokerTest.groovy | 14 ++++----- .../com/cloudbees/groovy/cps/BasicTest.java | 3 +- 6 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/Envs.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 4431aceee..9fbd0aff1 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -1,7 +1,6 @@ package com.cloudbees.groovy.cps; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; -import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import com.cloudbees.groovy.cps.impl.SuspendBlock; import com.cloudbees.groovy.cps.sandbox.Invoker; import groovy.lang.GroovyShell; @@ -44,7 +43,7 @@ public Continuable(Next n) { * Creates a {@link Continuable} that executes the block of code in a fresh empty environment. */ public Continuable(Block block) { - this(block, new FunctionCallEnv(null,Continuation.HALT,null,null)); + this(block, Envs.empty()); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Envs.java b/src/main/java/com/cloudbees/groovy/cps/Envs.java new file mode 100644 index 000000000..460a63edc --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/Envs.java @@ -0,0 +1,30 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.FunctionCallEnv; +import com.cloudbees.groovy.cps.sandbox.Invoker; + +/** + * Utility factory methods for {@link Env}. + * + * @author Kohsuke Kawaguchi + */ +public class Envs { + /** + * The most plain vanilla environment suitable for outer-most use. + * + * Analogous to how {@link Runnable#run()} gets invoked "out of nowhere" when a new {@link Thread} starts in + * regular Java program. + */ + public static Env empty() { + return new FunctionCallEnv(null,Continuation.HALT,null,null); + } + + /** + * Works like {@link #empty()} except it allows a custom {@link Invoker}. + */ + public static Env empty(Invoker inv) { + FunctionCallEnv e = new FunctionCallEnv(null, Continuation.HALT, null, null); + e.setInvoker(inv); + return e; + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java index 4d5fcd2fb..926be4c3e 100644 --- a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java +++ b/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java @@ -3,8 +3,8 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Envs; import com.cloudbees.groovy.cps.Next; -import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import com.cloudbees.groovy.cps.Outcome; import java.io.Serializable; @@ -64,7 +64,7 @@ private GreenThreadState(GreenThread g, Next n) { */ GreenThreadState(GreenThread g, Block b) { // TODO: allow the caller to pass a value - this(g,new Next(b, new FunctionCallEnv(null, HALT, null, null), HALT)); + this(g,new Next(b, Envs.empty(), HALT)); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java index 6ae81e118..abdeb27ef 100644 --- a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java +++ b/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Envs; import groovy.lang.Script; import java.io.Serializable; @@ -16,6 +17,7 @@ * @author Kohsuke Kawaguchi * @see Env#getInvoker() * @see Continuable#Continuable(Script, Env) + * @see Envs#empty(Invoker) */ public interface Invoker extends Serializable { /** diff --git a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index adb158884..6d651ebb2 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -1,13 +1,9 @@ -package com.cloudbees.groovy.cps.sandbox; +package com.cloudbees.groovy.cps.sandbox -import com.cloudbees.groovy.cps.AbstractGroovyCpsTest -import com.cloudbees.groovy.cps.Continuation -import com.cloudbees.groovy.cps.CpsTransformer -import com.cloudbees.groovy.cps.Env -import com.cloudbees.groovy.cps.SandboxCpsTransformer -import com.cloudbees.groovy.cps.impl.FunctionCallEnv; +import com.cloudbees.groovy.cps.* +import com.cloudbees.groovy.cps.impl.FunctionCallEnv import org.junit.Test -import org.kohsuke.groovy.sandbox.ClassRecorder; +import org.kohsuke.groovy.sandbox.ClassRecorder /** * @author Kohsuke Kawaguchi @@ -75,7 +71,7 @@ ScriptBytecodeAdapter:compareEqual(Integer,Integer) private Object evalCpsSandbox(String script) { - FunctionCallEnv e = new FunctionCallEnv(null, Continuation.HALT, null, null); + FunctionCallEnv e = Envs.empty(); e.invoker = new SandboxInvoker(); cr.register() diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index dcc9a2acb..02e88481b 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -2,7 +2,6 @@ import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.CpsFunction; -import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.junit.Assert; import org.junit.Test; @@ -27,7 +26,7 @@ public class BasicTest extends Assert { */ private T run(Block... bodies) { try { - Env e = new FunctionCallEnv(null,Continuation.HALT,null,null); + Env e = Envs.empty(); Next p = new Next(b.block(bodies), e, Continuation.HALT); return (T) p.run().yield.wrapReplay(); } catch (InvocationTargetException x) { From 1b20d1a46dfa40f40720e11c43c5d53c2180dff2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Oct 2014 14:00:54 -0700 Subject: [PATCH 279/932] [maven-release-plugin] prepare release groovy-cps-0.6 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c1c92e239..7645fd3ce 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.6-SNAPSHOT + 0.6 Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - HEAD + groovy-cps-0.6 From f1e5a303320af6b7432092e5dac049bd596f5003 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 2 Oct 2014 14:00:59 -0700 Subject: [PATCH 280/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7645fd3ce..70c4fd943 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.6 + 0.7-SNAPSHOT Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - groovy-cps-0.6 + HEAD From 9f5471fa117557ed3f844ee9aa6ab52f4966197d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 3 Oct 2014 11:49:13 -0700 Subject: [PATCH 281/932] The category support for "each" and so on doesn't really work If the invoked method runs anything synchronously, and that includes a call to "each", then CpsDefaultGroovyMethods end up getting used, which is not what we want. One case where this happens is: @NonCPS void foo() { def sum = 0; [1,2,3,4].each { sum+= it; } // <- we expect this to execute synchronously return sum; } // CPS-transformed function void bar() { foo(); } Another situation where this happens is when GroovyClassLoader decides to load other groovy scripts as classes, as much of the Groovy compiler is implemented in Groovy. This change breaks the following code: // CPS-transformed function void bar() { def sum = 0; [1,2,3,4].each { sum+= it; } assert sum==10; } ... because 'sum+=it' ends up getting CpsCallableInvocation and skips the loop. So I have to come back to this fix later. --- .../groovy/cps/impl/ContinuationGroup.java | 27 +++++++------------ .../groovy/cps/CpsTransformerTest.groovy | 20 +++++++++++++- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 4ce6525f4..3ba97c25a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -1,10 +1,8 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.CategorySupport; import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Continuation; -import com.cloudbees.groovy.cps.CpsDefaultGroovyMethods; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; @@ -15,7 +13,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.concurrent.Callable; import static com.cloudbees.groovy.cps.impl.SourceLocation.*; @@ -59,20 +56,16 @@ protected Next methodCall(Env e, SourceLocation loc, ContinuationPtr k, Object r * Evaluates a function (possibly a workflow function), then pass the result to the given continuation. */ protected Next methodCall(final Env e, final SourceLocation loc, final Continuation k, final Object receiver, final String methodName, final Object... args) { - return CategorySupport.use(CpsDefaultGroovyMethods.class,new Callable() { - public Next call() { - try { - // TODO: spread and safe - Object v = e.getInvoker().methodCall(receiver, methodName, args); - // if this was a normal function, the method had just executed synchronously - return k.receive(v); - } catch (CpsCallableInvocation inv) { - return inv.invoke(e, loc, k); - } catch (Throwable t) { - return throwException(e, t, loc, new ReferenceStackTrace()); - } - } - }); + try { + // TODO: spread and safe + Object v = e.getInvoker().methodCall(receiver, methodName, args); + // if this was a normal function, the method had just executed synchronously + return k.receive(v); + } catch (CpsCallableInvocation inv) { + return inv.invoke(e, loc, k); + } catch (Throwable t) { + return throwException(e, t, loc, new ReferenceStackTrace()); + } } /** diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 701ae65d7..f1f92ff44 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -382,7 +382,7 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { /** * Testing {@link CpsDefaultGroovyMethods}. */ - @Test + @Test @Ignore void each() { assert evalCPS(""" def x = 0; @@ -391,6 +391,24 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { """) == 55; } + /** + * Testing {@link CpsDefaultGroovyMethods} to ensure it doesn't kick in incorrectly + * while processing synchronous code + */ + @Test + void syncEach() { + assert evalCPS(""" + @NonCPS + def sum() { + def x = 0; + (0..10).each { y -> x+=y; } + return x; + } + + sum() +""") == 55; + } + void instanceOf() { assert evalCPS("null instanceof String")==false; assert evalCPS("3 instanceof Integer")==true; From 889b54a5fc6f3443a6940d76c8ddc82a8d43d129 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 3 Oct 2014 16:02:27 -0700 Subject: [PATCH 282/932] Redone the CPS-aware 'each' method Category kicks in automatically for every indirect call that happens within CategorySupport.use(). This includes such things like workflow script accessing another class, which triggers GroovyClassLoader to load a script, which results in groovy compiler executing. So we need to be very careful with which 'each' method should execute synchronously vs asynchronously. This is not very easy to do, and after thinking about this, I think the best approximation is to have the CPS method call site records what method it is about to invoke, so that the method invoked can test if it was directly called from a CPS method call site. This ignores all the weird call routing that Groovy does (for example, "o.each" would work but not "o.invokeMethod('each')"), but it is sufficient to pass the test cases pass, and so an OK implementation for now. If we decide to revisit this in the future, perhaps another option is to speculatively execute the passed in closure synchronously, and if we see the magic CpsCallableInvocation exception, switch to executing the rest in async function by decorating Continuation. --- .../groovy/cps/CpsDefaultGroovyMethods.groovy | 10 +++ .../com/cloudbees/groovy/cps/impl/Caller.java | 67 +++++++++++++++++++ .../groovy/cps/impl/ContinuationGroup.java | 28 +++++--- .../groovy/cps/CpsTransformerTest.groovy | 2 +- 4 files changed, 96 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/impl/Caller.java diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy index fc8310f7e..cd5b50d6e 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy @@ -1,7 +1,9 @@ package com.cloudbees.groovy.cps +import com.cloudbees.groovy.cps.impl.Caller import com.cloudbees.groovy.cps.impl.CpsCallableInvocation import com.cloudbees.groovy.cps.impl.CpsFunction +import org.codehaus.groovy.runtime.DefaultGroovyMethods import org.codehaus.groovy.runtime.InvokerHelper /** @@ -19,6 +21,10 @@ public class CpsDefaultGroovyMethods { * Interception is successful. The trick is to pre-translate this method into CPS. */ public static T each(T self, Closure closure) { + if (!Caller.isAsynchronous(self,"each",closure) + && !Caller.isAsynchronous(CpsDefaultGroovyMethods.class,"each",self,closure)) + return DefaultGroovyMethods.each(self,closure); + /* each(InvokerHelper.asIterator(self), closure); return self; @@ -39,6 +45,10 @@ public class CpsDefaultGroovyMethods { } public static Iterator each(Iterator iter, Closure closure) { + if (!Caller.isAsynchronous(iter,"each",closure) + && !Caller.isAsynchronous(CpsDefaultGroovyMethods.class,"each",iter,closure)) + return DefaultGroovyMethods.each(iter,closure); + /* while (iter.hasNext()) { Object arg = iter.next(); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java b/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java new file mode 100644 index 000000000..3e2058eb9 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java @@ -0,0 +1,67 @@ +package com.cloudbees.groovy.cps.impl; + +/** + * As a crude way to distinguish asynchronous caller vs synchronous caller, + * remember the method call about to happen so that the callee can check + * if it is invoked by asynchronous caller or not. + * + * @author Kohsuke Kawaguchi + */ +public class Caller { + /** + * Caller information needs to be recorded per thread. + */ + private static final ThreadLocal store = new ThreadLocal() { + @Override + protected Info initialValue() { + return new Info(); + } + }; + + /** + * Checks if the method is called from asynchronous CPS transformed code. + * + *

+ * This method must be the first call in the function body. + */ + public static boolean isAsynchronous(Object receiver, String method, Object... args) { + Info i = store.get(); + return receiver==i.receiver && method.equals(i.method) && arrayShallowEquals(i.args, args); + } + + private static boolean arrayShallowEquals(Object[] a, Object[] b) { + if (a.length!=b.length) return false; + for (int i=0; i() { + public Next call() { + try { + Caller.record(receiver,methodName,args); + // TODO: spread and safe + Object v = e.getInvoker().methodCall(receiver, methodName, args); + // if this was a normal function, the method had just executed synchronously + return k.receive(v); + } catch (CpsCallableInvocation inv) { + return inv.invoke(e, loc, k); + } catch (Throwable t) { + return throwException(e, t, loc, new ReferenceStackTrace()); + } + } + }); } /** diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index f1f92ff44..c4388af93 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -382,7 +382,7 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { /** * Testing {@link CpsDefaultGroovyMethods}. */ - @Test @Ignore + @Test void each() { assert evalCPS(""" def x = 0; From fb4a3afab72f57b504de5936395c400752f96153 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 3 Oct 2014 16:13:41 -0700 Subject: [PATCH 283/932] [maven-release-plugin] prepare release groovy-cps-0.7 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 70c4fd943..015c8d623 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.7-SNAPSHOT + 0.7 Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - HEAD + groovy-cps-0.7 From 103675e4670b9b8569040d90c9ab5967a4c97b0e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 3 Oct 2014 16:13:45 -0700 Subject: [PATCH 284/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 015c8d623..bd44e8038 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.7 + 0.8-SNAPSHOT Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - groovy-cps-0.7 + HEAD From 5e1b7da786c23c83bc6e1772c39bcd9126a7fd57 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 3 Oct 2014 17:45:46 -0700 Subject: [PATCH 285/932] Working around GROOVY-6263. Using category horribly breaks the invocation of private method when 'this' points to a subtype. This problem manifested where we subtype CpsTransformer into SandboxCpsTransformer. I could have just worked around this problem on that class by making every private method protected, but this problem will happen during the entire groovy-cps execution, which means any complex workflow libraries that involve class hierarchy will be doomed. So I opted for inserting these methods like how GroovyDefaultMethods get inserted, namely through MetaMethod --- .../groovy/cps/impl/ContinuationGroup.java | 39 ++++++++++++++++++- .../cps/impl/FunctionCallBlockTest.groovy | 2 +- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 46d1d4030..e9c573f1f 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -1,21 +1,25 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.CategorySupport; import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.CpsDefaultGroovyMethods; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; +import groovy.lang.MetaMethod; +import org.codehaus.groovy.reflection.CachedClass; +import org.codehaus.groovy.reflection.CachedMethod; +import org.codehaus.groovy.reflection.ReflectionCache; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; +import org.codehaus.groovy.runtime.metaclass.NewInstanceMetaMethod; import javax.annotation.CheckReturnValue; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; -import java.util.concurrent.Callable; import static com.cloudbees.groovy.cps.impl.SourceLocation.*; @@ -59,6 +63,28 @@ protected Next methodCall(Env e, SourceLocation loc, ContinuationPtr k, Object r * Evaluates a function (possibly a workflow function), then pass the result to the given continuation. */ protected Next methodCall(final Env e, final SourceLocation loc, final Continuation k, final Object receiver, final String methodName, final Object... args) { + try { + Caller.record(receiver,methodName,args); + // TODO: spread and safe + Object v = e.getInvoker().methodCall(receiver, methodName, args); + // if this was a normal function, the method had just executed synchronously + return k.receive(v); + } catch (CpsCallableInvocation inv) { + return inv.invoke(e, loc, k); + } catch (Throwable t) { + return throwException(e, t, loc, new ReferenceStackTrace()); + } + +/* + Because of GROOVY-6263, if we use category, CpsTransformer fails wherever it calls its private method + when 'this' is SandboxCpsTransformer. A similar problem will likely happen anywhere we call Groovy code. + + So instead of using category, insert methods into MetaClass, which is what Groovy runtime does + for its builtin DefaultGroovyMethods. + + This affects every Groovy code execution in the same JVM, which is too wide, but + + return CategorySupport.use(CpsDefaultGroovyMethods.class, new Callable() { public Next call() { try { @@ -74,6 +100,15 @@ public Next call() { } } }); +*/ + } + + static { + for (CachedMethod m : ReflectionCache.getCachedClass(CpsDefaultGroovyMethods.class).getMethods()) { + CachedClass[] paramTypes = m.getParameterTypes(); + if (paramTypes.length>0) + paramTypes[0].addNewMopMethods(Collections.singletonList(new NewInstanceMetaMethod(m))); + } } /** diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy index acfb2c711..4317f2167 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy @@ -49,7 +49,7 @@ Script1.y(Script1.groovy:8) Script1.x(Script1.groovy:4) Script1.run(Script1.groovy:11) ___cps.transform___(Native Method) -com.cloudbees.groovy.cps.impl.ContinuationGroup\$1.call"""); +com.cloudbees.groovy.cps.impl.ContinuationGroup.methodCall"""); // should include the call stack of some sync code assert trace.contains("com.cloudbees.groovy.cps.impl.FunctionCallBlockTest.someSyncCode(FunctionCallBlockTest.groovy:") From c4eda0eb5a661e83e98a022d6aeb5588fac3a859 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 3 Oct 2014 17:55:53 -0700 Subject: [PATCH 286/932] [maven-release-plugin] prepare release groovy-cps-0.8 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bd44e8038..f176ccb8b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.8-SNAPSHOT + 0.8 Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - HEAD + groovy-cps-0.8 From 7ea543d7be9acb355724dde75d5dd77f4cd8f150 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 3 Oct 2014 17:55:57 -0700 Subject: [PATCH 287/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f176ccb8b..08b9694e5 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.8 + 0.9-SNAPSHOT Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - groovy-cps-0.8 + HEAD From 543fb3f713838496d29d1c643ed1fff0b9e7ef99 Mon Sep 17 00:00:00 2001 From: Nicolas De loof Date: Fri, 31 Oct 2014 12:03:35 +0100 Subject: [PATCH 288/932] [ZD-22603] fix a typo in method name --- .../groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 483363ad1..e6e12f568 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -485,8 +485,8 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor (COMPARE_GREATER_THAN_EQUAL) :"greaterThanEqual", (COMPARE_LESS_THAN) :"lessThan", (COMPARE_LESS_THAN_EQUAL) :"lessThanEqual", - (LOGICAL_AND) :"logicanAnd", - (LOGICAL_OR) :"logicanOr", + (LOGICAL_AND) :"logicalAnd", + (LOGICAL_OR) :"logicalOr", (BITWISE_AND) :"bitwiseAnd", (BITWISE_AND_EQUAL) :"bitwiseAndEqual", (BITWISE_OR) :"bitwiseOr", From 4615979ea2909d1a8f4dbb807daf0d825231a7ec Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 6 Nov 2014 11:16:18 -0500 Subject: [PATCH 289/932] Correcting 543fb3f713838496d29d1c643ed1fff0b9e7ef99 (logical AND/OR operators). --- src/main/java/com/cloudbees/groovy/cps/Builder.java | 4 ++-- .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 932e7aff6..80b00624d 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -369,14 +369,14 @@ public Block greaterThanEqual(int line, Block lhs, Block rhs) { /** * lhs && rhs */ - public Block logicalAnd(Block lhs, Block rhs) { + public Block logicalAnd(int line, Block lhs, Block rhs) { return new LogicalOpBlock(lhs,rhs,true); } /** * lhs || rhs */ - public Block logicalOr(Block lhs, Block rhs) { + public Block logicalOr(int line, Block lhs, Block rhs) { return new LogicalOpBlock(lhs,rhs,false); } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index c4388af93..3b3a6eb8c 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -358,6 +358,12 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS("def x=0; return x++ ?: -1")==-1; } + @Test void booleanOps() { + assert evalCPS("true && (false || false)") == false; + assert evalCPS("true && (true || false)") == true; + assert evalCPS("false && (true || false)") == false; + } + @Test void range() { assert evalCPS("def x=5; return (0..x)") == (0..5); From a5128ed7cffb84add09a7a6a7459ff75f9b457e4 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 6 Nov 2014 11:36:53 -0500 Subject: [PATCH 290/932] Also verifying that short-circuiting works. --- .../groovy/cps/CpsTransformerTest.groovy | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 3b3a6eb8c..96307abbe 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -358,10 +358,24 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS("def x=0; return x++ ?: -1")==-1; } - @Test void booleanOps() { + @Test void logicalOp() { assert evalCPS("true && (false || false)") == false; assert evalCPS("true && (true || false)") == true; assert evalCPS("false && (true || false)") == false; + assert evalCPS(''' + x = [0, 0, 0, 0] + def set(index) { + x[index - 1] = index + true + } + def r = [ + true && set(1), + false && set(2), + true || set(3), + false || set(4) + ] + "${r} ${x}" + ''') == "[true, false, true, true] [1, 0, 0, 4]" } @Test From 2284d03044bf3066e73c565e88e361ee5ae87ea9 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 6 Nov 2014 09:34:04 -0800 Subject: [PATCH 291/932] [maven-release-plugin] prepare release groovy-cps-0.9 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 08b9694e5..c5362a906 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.9-SNAPSHOT + 0.9 Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - HEAD + groovy-cps-0.9 From 951705449bf990319308c14580f8bfd5be67219f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 6 Nov 2014 09:34:22 -0800 Subject: [PATCH 292/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c5362a906..7e42e1f29 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.9 + 0.10-SNAPSHOT Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - groovy-cps-0.9 + HEAD From f0ee40b499fb05d10008a2b67b86dd7bb51ca842 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 7 Nov 2014 11:30:23 -0800 Subject: [PATCH 293/932] doc improvement --- src/main/java/com/cloudbees/groovy/cps/Next.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 2f5c22f42..a5e69d8bc 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -3,7 +3,12 @@ import java.io.Serializable; /** - * Remaining computation to execute. To work around the lack of tail-call optimization + * Remaining computation to execute. To work around the lack of tail-call optimization. + * + * The remaining computation is either to execute {@link #f} under {#link #e} and pass the + * result to {@link #k} immediately, or to suspend execution by yielding {@link #yield}, + * and when the execution is resumed, continue by passing the resume value to {@link #k} + * (or throw the resume value to the catch handler as specified by {@link #e}.) * * @author Kohsuke Kawaguchi */ From e86942982e218059869bbac31c5f9390667ad68f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 7 Nov 2014 16:08:34 -0800 Subject: [PATCH 294/932] Making it easy to create a Continuable that prepends another one. In an attempt to fix JENKINS-25495, I've tried to allow Continuable to run what amounts to be an "interrupt handler" --- set aside what you are doing, run something else, then come back to what was set aside, all in a single Continuable. I've ultimately fixed the problem differently, but I'm leaving the result in here as these additions seem sensible on its own. --- .../groovy/cps/ConcatenatedContinuation.java | 72 ++++++++++++++++ .../com/cloudbees/groovy/cps/Continuable.java | 86 ++++++++++++++++++- .../java/com/cloudbees/groovy/cps/Next.java | 41 +++++++-- .../com/cloudbees/groovy/cps/Outcome.java | 4 + .../groovy/cps/ContinuableTest.groovy | 48 +++++++++++ 5 files changed, 239 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java b/src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java new file mode 100644 index 000000000..f2532783a --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java @@ -0,0 +1,72 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; +import com.cloudbees.groovy.cps.impl.SourceLocation; +import com.google.common.base.Function; +import com.google.common.base.Functions; +import groovy.lang.Script; + +import java.io.Serializable; + +/** + * Combines two {@link Continuation}s into one. + * + * Essentially, take two functions 'first', and 'then', and creates a new function + * + * 

+ * concat(x) := then(first(x))
+ *
+ * + *

+ * Note that this is useful but expensive. If you control how the 'first' Continuation + * gets created, you should try to have 'then' incorporated into it during its creation, + * such as {@link Continuable#Continuable(Script, Env, Continuation)} or via + * {@link CpsCallableInvocation#invoke(Env, SourceLocation, Continuation)}. + * + * @author Kohsuke Kawaguchi + */ +public class ConcatenatedContinuation implements Continuation { + private final Continuation first; + private final Function f; + private final Continuable then; + + public ConcatenatedContinuation(Continuation first, Function mapper, Continuable then) { + this.first = first; + this.f = mapper; + this.then = then; + } + + public ConcatenatedContinuation(Continuation first, Continuable then) { + this(first, Idem.INSTANCE, then); + } + + public Next receive(Object o) { + Next n = first.receive(o); + + ConcatenatedContinuation concat = new ConcatenatedContinuation(n.k, f, then); + + if (n.yield!=null) { + if (n.k==Continuation.HALT) { + // the first part is done + Outcome out = f.apply(n.yield); + return out.resumeFrom(then); + } + return new Next(n.e, concat, n.yield); + } else return new Next(n.f, n.e, concat); + } + + private static final long serialVersionUID = 1L; + + private static final class Idem implements Function, Serializable { + public T apply(T input) { + return input; + } + + private Object readResolve() { + return INSTANCE; + } + + private static final long serialVersionUID = 1L; + private static final Idem INSTANCE = new Idem(); + } +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 9fbd0aff1..3c69c7307 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -3,6 +3,7 @@ import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.SuspendBlock; import com.cloudbees.groovy.cps.sandbox.Invoker; +import com.google.common.base.Function; import groovy.lang.GroovyShell; import groovy.lang.Script; @@ -47,7 +48,7 @@ public Continuable(Block block) { } /** - * Creates a {link Continuable} that executes the block in the specified environment. + * Creates a {@link Continuable} that executes the block in the specified environment. */ public Continuable(Block block, Env e) { this.e = e; @@ -70,10 +71,21 @@ public Continuable(Script cpsTransformedScript) { * of exceptions, and/or providing custom {@link Invoker} */ public Continuable(Script cpsTransformedScript, Env env) { - this(wrap(cpsTransformedScript,env)); + this(cpsTransformedScript,env, Continuation.HALT); } - private static Next wrap(Script s, Env env) { + /** + * Takes a {@link Script} compiled from CPS-transforming {@link GroovyShell} and + * wraps that into a {@link Continuable}. + * + * The added 'k' parameter can be used to pass the control to somewhere else + * when the script has finished executing. + */ + public Continuable(Script cpsTransformedScript, Env env, Continuation k) { + this(wrap(cpsTransformedScript,env,k)); + } + + private static Next wrap(Script s, Env env, Continuation k) { try { Method m = s.getClass().getMethod("run"); if (!m.isAnnotationPresent(WorkflowTransformed.class)) @@ -81,7 +93,7 @@ private static Next wrap(Script s, Env env) { s.run(); throw new AssertionError("I'm confused if Script is CPS-transformed or not!"); } catch (CpsCallableInvocation e) { - return e.invoke(env, null, Continuation.HALT); + return e.invoke(env, null, k); } catch (NoSuchMethodException e) { throw new AssertionError(e); } @@ -159,6 +171,72 @@ public List getStackTrace() { return r; } + /** + * Ignore whatever that we've been doing, and jumps the execution to the given continuation. + * + *

+ * Aside from the obvious use case of completely overwriting the state of {@link Continuable}, + * more interesting case is + * + * Sets aside the current continuation aside, schedule the evaluation of the given block in the given environment, + * then when done pass the result to the given {@link Continuation}. + * + * A common pattern is for that {@link Continuation} to then resume executing the current execution that was set + * aside. + * + * 

+     * Continuable c = ...;
+     *
+     * final Continuable pausePoint = new Continuable(c); // set aside what we were doing
+     * c.jump(bodyOfNewThread,env,new Continuation() {
+     *      public Next receive(Object o) {
+     *          // o is the result of evaluating bodyOfNewThread (the failure will go to the handler specified by 'env')
+     *          doSomethingWith(c);
+     *
+     *          if (...) {// maybe you want to yield this value, then resume from the pause point?
+     *              return Next.yield0(new Outcome(o,null),pausePoint);
+     *          }
+     *          if (...) {// maybe you want to keep going by immediately resuming from the pause point with 'o'
+     *              return Next.go0(new Outcome(o,null),pausePoint);
+     *          }
+     *
+     *          // maybe you want to halt the execution by returning
+     *          return Next.terminate0(new Outcome(o,null));
+     *      }
+     * });
+     *
+     * c.run(...); // this will start executing from 'bodyOfNewThread'
+     *
+     *
+ */ + public void jump(Continuable c) { + this.e = c.e; + this.k = c.k; + } + + /** + * Set aside what we are executing, and instead resume the next execution from the point + * the given 'Continuable' points to. + * + * But when that's done, instead of completing the computation, come back to executing what we set aside. + */ + public void prepend(Continuable c, Function mapper) { + // set aside where we are + Continuable here = new Continuable(this); + + // run 'c', then when it's done, come back to 'here' + this.e = c.e; + this.k = new ConcatenatedContinuation(c.k, mapper, here); + } + + /*package*/ Env getE() { + return e; + } + + /*package*/ Continuation getK() { + return k; + } + private static final long serialVersionUID = 1L; /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index a5e69d8bc..4433e693a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -67,6 +67,25 @@ public static Next yield(Object v, Env e, Continuation k) { return yield0(new Outcome(v, null), e, k); } + /** + * Creates a {@link Next} object that + * causes the interpreter loop to exit with the specified value, then optionally allow the interpreter + * to resume to the continuation represented by {@link Continuable}. + */ + public static Next yield0(Outcome v, Continuable c) { + return yield0(v, c.getE(), c.getK()); + } + + /** + * Crestes a {@link Next} object that + * causes the interpreter loop to keep evaluating the continuation represented by {@link Continuable} + * by passing the outcome (or throwing it). + */ + public static Next go0(Outcome v, Continuable c) { + return v.resumeFrom(c.getE(), c.getK()); + } + + private static Next yield0(Outcome v, Env e, Continuation k) { if (v==null) throw new IllegalStateException("trying to yield null"); @@ -74,20 +93,26 @@ private static Next yield0(Outcome v, Env e, Continuation k) { } /** - * Creates a {@link Next} object that terminates the computation and either returns a value or throw an exception. + * Creates a {@link Next} object that terminates the computation and either returns a value. */ public static Next terminate(Object v) { - return terminate(new Outcome(v, null)); + return terminate0(new Outcome(v, null)); } - static Next terminate(Outcome v) { - return yield0(v,null,HALT); - } - + /** + * Creates a {@link Next} object that terminates the computation by throwing an exception. + */ public static Next unhandledException(Throwable t) { - return terminate(new Outcome(null, t)); + return terminate0(new Outcome(null, t)); + } + + /** + * Creates a {@link Next} object that terminates the computation and either returns a value or throw an exception. + */ + public static Next terminate0(Outcome v) { + return yield0(v, null, HALT); } - + /** * As a {@link Continuation}, just ignore the argument. */ diff --git a/src/main/java/com/cloudbees/groovy/cps/Outcome.java b/src/main/java/com/cloudbees/groovy/cps/Outcome.java index b10112a7c..578351235 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Outcome.java +++ b/src/main/java/com/cloudbees/groovy/cps/Outcome.java @@ -57,6 +57,10 @@ public boolean isFailure() { return abnormal!=null; } + public Next resumeFrom(Continuable c) { + return resumeFrom(c.getE(), c.getK()); + } + public Next resumeFrom(Env e, Continuation k) { if (abnormal!=null) { // resume program by throwing this exception diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 8fd123c23..6f92f5aad 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -222,4 +222,52 @@ Script1.run(Script1.groovy:17) return "hello"; } } + + /** + * Start running one Continuable, interrupt that and run something else, then come back to it. + * + */ + @Test + public void concatenate() { + def s = csh.parse(""" + def plus2(i) { return i+2; } + + def i=1; + x = Continuable.suspend("pause1"); // this will jump to another script and then come back + return plus2(i+x); + """) + + // let the script run to the suspend point + def c = new Continuable(s); + assert c.run(null)=="pause1"; + + def s2 = csh.parse(""" + return 16+Continuable.suspend("pause2")+32; + """) + + // now create a new Continuable that evaluates s2 first, then come back to where we paused in 'c' + c = new Continuable(s2,null,new Continuation() { + final Continuable pause = c; + @Override + Next receive(Object o) { + // when s2 is done, hand off the value to pause1 to resume execution from there + return Next.go0(new Outcome(o+64,null),pause); + } + }); + + // the point of all this trouble is that once the new 'c' is created, the rest of the code + // doesn't have to know that the new Continuable is a composite of two Continuables. + + + + assert c.run(null)=="pause2"; + + // s2 evaluates, then the result goes back to pause1 after +64 adjustment above + // and the whole thing completes + def r = c.run(128); + + assert !c.isResumable(); // it should have been completed + + assert r == 1+2 +16+32 +64+128; + } } From 6b0bc33cf9dc177b9953685fc1365bb52a264f52 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 7 Nov 2014 16:43:44 -0800 Subject: [PATCH 295/932] Implemented bit shift operators --- .../groovy/cps/CpsTransformer.groovy | 31 +++---------- .../com/cloudbees/groovy/cps/Builder.java | 46 ++++++++++++++++++- .../groovy/cps/CpsTransformerTest.groovy | 12 +++++ 3 files changed, 63 insertions(+), 26 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index e6e12f568..4e7254057 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -510,6 +510,13 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor (EQUAL) :"assign", (KEYWORD_INSTANCEOF) :"instanceOf", (LEFT_SQUARE_BRACKET) :"array", + + (LEFT_SHIFT) :"leftShift", + (LEFT_SHIFT_EQUAL) :"leftShiftEqual", + (RIGHT_SHIFT) :"rightShift", + (RIGHT_SHIFT_EQUAL) :"rightShiftEqual", + (RIGHT_SHIFT_UNSIGNED) :"rightShiftUnsigned", + (RIGHT_SHIFT_UNSIGNED_EQUAL) :"rightShiftUnsignedEqual", ] /** @@ -532,30 +539,6 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor // other unique cases switch (exp.operation.type) { - case LEFT_SHIFT: - evaluateBinaryExpression("leftShift", exp); - break; - - case LEFT_SHIFT_EQUAL: - evaluateBinaryExpressionWithAssignment("leftShift", exp); - break; - - case RIGHT_SHIFT: - evaluateBinaryExpression("rightShift", exp); - break; - - case RIGHT_SHIFT_EQUAL: - evaluateBinaryExpressionWithAssignment("rightShift", exp); - break; - - case RIGHT_SHIFT_UNSIGNED: - evaluateBinaryExpression("rightShiftUnsigned", exp); - break; - - case RIGHT_SHIFT_UNSIGNED_EQUAL: - evaluateBinaryExpressionWithAssignment("rightShiftUnsigned", exp); - break; - case FIND_REGEX: evaluateCompareExpression(findRegexMethod, exp); break; diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 80b00624d..2e8e5f991 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -260,11 +260,11 @@ public Block map(List blocks) { } public Block staticCall(int line, Class lhs, String name, Block... argExps) { - return functionCall(line,constant(lhs),name,argExps); + return functionCall(line, constant(lhs), name, argExps); } public Block plus(int line, Block lhs, Block rhs) { - return functionCall(line,lhs,"plus",rhs); + return functionCall(line, lhs, "plus", rhs); } public Block plusEqual(int line, LValueBlock lhs, Block rhs) { @@ -380,6 +380,48 @@ public Block logicalOr(int line, Block lhs, Block rhs) { return new LogicalOpBlock(lhs,rhs,false); } + /** + * lhs << rhs + */ + public Block leftShift(int line, Block lhs, Block rhs) { + return functionCall(line, lhs, "leftShift", rhs); + } + + /** + * lhs <<= rhs + */ + public Block leftShiftEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "leftShift"); + } + + /** + * lhs >> rhs + */ + public Block rightShift(int line, Block lhs, Block rhs) { + return functionCall(line, lhs, "rightShift", rhs); + } + + /** + * lhs >>= rhs + */ + public Block rightShiftEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "rightShift"); + } + + /** + * lhs >>> rhs + */ + public Block rightShiftUnsigned(int line, Block lhs, Block rhs) { + return functionCall(line, lhs, "rightShiftUnsigned", rhs); + } + + /** + * lhs >>>= rhs + */ + public Block rightShiftUnsignedEqual(int line, LValueBlock lhs, Block rhs) { + return new AssignmentBlock(loc(line), lhs, rhs, "rightShiftUnsigned"); + } + /** * !b */ diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 96307abbe..1b6d2d589 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -472,4 +472,16 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { void arrayAccess() { assert evalCPS("def x = new int[3]; x[0]=1; x[1]=x[0]+2; x[1]+=4; return x[1]") == 7; } + + @Test + void bitShift() { + assert evalCPS("3<<3")==3*8; + assert evalCPS("x=3; x<<=3; x")==3*8; + assert evalCPS("5 >> 1")==5/2 as int; + assert evalCPS("x=5; x>>=1; x")==5/2 as int; + assert evalCPS("-1>>>1")==2147483647; + assert evalCPS("x=-1; x>>>=1; x")==2147483647; + + assert evalCPS("x=[]; x<<'hello'; x<<'world'; x")==["hello","world"]; + } } From c11954751300ad1f1f02c051e00f7cee23e4774c Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 7 Nov 2014 16:57:16 -0800 Subject: [PATCH 296/932] Implemented the remaining three operators --- .../groovy/cps/CpsTransformer.groovy | 21 ++++--------------- .../com/cloudbees/groovy/cps/Builder.java | 21 +++++++++++++++++++ .../groovy/cps/CpsTransformerTest.groovy | 18 ++++++++++++++++ 3 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 4e7254057..d838b0442 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -517,6 +517,10 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor (RIGHT_SHIFT_EQUAL) :"rightShiftEqual", (RIGHT_SHIFT_UNSIGNED) :"rightShiftUnsigned", (RIGHT_SHIFT_UNSIGNED_EQUAL) :"rightShiftUnsignedEqual", + + (FIND_REGEX) :"findRegex", + (MATCH_REGEX) :"matchRegex", + (KEYWORD_IN) :"isCase", ] /** @@ -535,23 +539,6 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor return; } -/* TODO: from BinaryExpressionHelper - // other unique cases - switch (exp.operation.type) { - - case FIND_REGEX: - evaluateCompareExpression(findRegexMethod, exp); - break; - - case MATCH_REGEX: - evaluateCompareExpression(matchRegexMethod, exp); - break; - - case KEYWORD_IN: - evaluateCompareExpression(isCaseMethod, exp); - break; -*/ - throw new UnsupportedOperationException("Operation: " + exp.operation + " not supported"); } diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index 2e8e5f991..dfe11e17c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -366,6 +366,27 @@ public Block greaterThanEqual(int line, Block lhs, Block rhs) { return staticCall(line, ScriptBytecodeAdapter.class, "compareGreaterThanEqual", lhs, rhs); } + /** + * lhs =~ rhs + */ + public Block findRegex(int line, Block lhs, Block rhs) { + return staticCall(line, ScriptBytecodeAdapter.class, "findRegex", lhs, rhs); + } + + /** + * lhs ==~ rhs + */ + public Block matchRegex(int line, Block lhs, Block rhs) { + return staticCall(line, ScriptBytecodeAdapter.class, "matchRegex", lhs, rhs); + } + + /** + * lhs in rhs + */ + public Block isCase(int line, Block lhs, Block rhs) { + return staticCall(line, ScriptBytecodeAdapter.class, "isCase", lhs, rhs); + } + /** * lhs && rhs */ diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 1b6d2d589..b2d60db99 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -484,4 +484,22 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS("x=[]; x<<'hello'; x<<'world'; x")==["hello","world"]; } + + @Test + void inOperator() { + assert evalCPS("3 in [1,2,3]"); + assert evalCPS("'ascii' in String.class"); + assert !evalCPS("6 in [1,2,3]"); + assert !evalCPS("'ascii' in URL.class"); + } + + @Test + void regexpOperator() { + assert evalCPS("('cheesecheese' =~ 'cheese') as boolean") + assert evalCPS("('cheesecheese' =~ /cheese/) as boolean") + assert !evalCPS("('cheese' =~ /ham/) as boolean") + + assert evalCPS("('2009' ==~ /\\d+/) as boolean") + assert !evalCPS("('holla' ==~ /\\d+/) as boolean") + } } From 50b33e75fb7a09cf168d87d1497ac2dd7d6597be Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 7 Nov 2014 16:59:38 -0800 Subject: [PATCH 297/932] [maven-release-plugin] prepare release groovy-cps-1.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7e42e1f29..4cb66ea0a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 0.10-SNAPSHOT + 1.0 Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - HEAD + groovy-cps-1.0 From 394426b3228adee04d179a750c35aefb4d7f8b7f Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 7 Nov 2014 16:59:42 -0800 Subject: [PATCH 298/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4cb66ea0a..733709f02 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 1.0 + 1.1-SNAPSHOT Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - groovy-cps-1.0 + HEAD From fd1b07e01a270761570a61308ba32f6c5fad8a3d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Fri, 14 Nov 2014 09:43:01 -0800 Subject: [PATCH 299/932] Added a "super interrupt" mechanism to interrupt running program at arbitrary point --- .../groovy/cps/CpsTransformer.groovy | 1 + .../com/cloudbees/groovy/cps/Builder.java | 4 +- .../com/cloudbees/groovy/cps/Continuable.java | 36 +++++++++++++++- .../com/cloudbees/groovy/cps/Outcome.java | 3 ++ .../groovy/cps/impl/ContinuationGroup.java | 7 +++- .../cloudbees/groovy/cps/impl/ThrowBlock.java | 42 ++++++++++++++++++- .../groovy/cps/ContinuableTest.groovy | 30 +++++++++++++ .../com/cloudbees/groovy/cps/BasicTest.java | 4 +- 8 files changed, 119 insertions(+), 8 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index d838b0442..2a8c3a3d0 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -428,6 +428,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor void visitThrowStatement(ThrowStatement st) { makeNode("throw_") { + loc(st) visit(st.expression) } } diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/src/main/java/com/cloudbees/groovy/cps/Builder.java index dfe11e17c..0b53437fb 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -242,8 +242,8 @@ public Block tryCatch(final Block body, final List catches, fin /** * throw exp; */ - public Block throw_(final Block exp) { - return new ThrowBlock(exp); + public Block throw_(int line, final Block exp) { + return new ThrowBlock(loc(line),exp,false); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 3c69c7307..2d0ae2593 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -1,7 +1,10 @@ package com.cloudbees.groovy.cps; +import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; +import com.cloudbees.groovy.cps.impl.SourceLocation; import com.cloudbees.groovy.cps.impl.SuspendBlock; +import com.cloudbees.groovy.cps.impl.ThrowBlock; import com.cloudbees.groovy.cps.sandbox.Invoker; import com.google.common.base.Function; import groovy.lang.GroovyShell; @@ -13,6 +16,8 @@ import java.util.ArrayList; import java.util.List; +import static com.cloudbees.groovy.cps.impl.SourceLocation.UNKNOWN; + /** * Mutable representation of the program. This is the primary API of the groovy-cps library to the outside. * @@ -30,6 +35,8 @@ public class Continuable implements Serializable { */ private Continuation k; + private volatile Throwable interrupt; + public Continuable(Continuable src) { this.e = src.e; this.k = src.k; @@ -129,7 +136,14 @@ public Object runByThrow(Throwable arg) throws InvocationTargetException { public Outcome run0(Outcome cn) { Next n = cn.resumeFrom(e,k); - n = n.run(); + while(n.yield==null) { + if (interrupt!=null) { + // TODO: correctly reporting a source location requires every block to have the line number + n = new Next(new ThrowBlock(UNKNOWN, new ConstantBlock(interrupt), true),n.e,n.k); + interrupt = null; + } + n = n.step(); + } e = n.e; k = n.k; @@ -137,6 +151,26 @@ public Outcome run0(Outcome cn) { return n.yield; } + /** + * Sets a super-interrupt. + * + *

+ * A super interrupt works like {@link Thread#interrupt()} that throws + * {@link InterruptedException}. It lets other threads interrupt the execution + * of {@link Continuable} by making it throw an exception. + * + *

+ * Unlike {@link InterruptedException}, which only gets thrown in specific + * known locations, such as {@link Object#wait()}, this "super interruption" + * gets thrown at any point in the execution, even during {@code while(true) ;} kind of loop. + * + *

+ * The + */ + public void superInterrupt(Throwable t) { + this.interrupt = t; + } + /** * Checks if this {@link Continuable} is pointing at the end of the program which cannot * be resumed. diff --git a/src/main/java/com/cloudbees/groovy/cps/Outcome.java b/src/main/java/com/cloudbees/groovy/cps/Outcome.java index 578351235..2feeff160 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Outcome.java +++ b/src/main/java/com/cloudbees/groovy/cps/Outcome.java @@ -1,11 +1,14 @@ package com.cloudbees.groovy.cps; import com.cloudbees.groovy.cps.impl.ConstantBlock; +import com.cloudbees.groovy.cps.impl.SourceLocation; import com.cloudbees.groovy.cps.impl.ThrowBlock; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; +import static com.cloudbees.groovy.cps.impl.SourceLocation.UNKNOWN; + /** * Result of an evaluation. * diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index e9c573f1f..105f3ada1 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -126,8 +126,13 @@ private void fixupStackTrace(Env e, Throwable t, SourceLocation loc, ReferenceSt /* SYNC TRACE + this section contains the top portion of the actual stack beyond ReferenceStackTrace that led to the + instantiation of the exception. This is the synchronous code called from CPS code that created the exception. CPS TRACE - REFERENECE TRACE + this section contains a synthesized fake stack trace that shows the logical stack trace of the CPS code + REFERENCE TRACE + this section contains the actual stack trace leading up to the point where ReferenceStackTrace is created + to show how the actual execution happened on JVM */ List orig = Arrays.asList(ts); diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java b/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java index f7655dcc6..e516366b3 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java @@ -1,18 +1,38 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static com.cloudbees.groovy.cps.impl.SourceLocation.*; +import static java.util.Arrays.asList; + /** * @author Kohsuke Kawaguchi */ public class ThrowBlock implements Block { + private final SourceLocation loc; private final Block exp; + /** + * If true, {@link Exception#fillInStackTrace()} is used at the point of throwing + * to overwrite the stack trace of the exception. + */ + private final boolean fillStackTrace; public ThrowBlock(Block exp) { + this(UNKNOWN, exp,false); + } + + public ThrowBlock(SourceLocation loc, Block exp, boolean fillStackTrace) { + this.loc = loc; this.exp = exp; + this.fillStackTrace = fillStackTrace; } public Next eval(final Env e, Continuation _) { @@ -24,9 +44,27 @@ public Next receive(Object t) { if (!(t instanceof Throwable)) { t = new ClassCastException(t.getClass()+" cannot be cast to Throwable"); } - // TODO: fake the stack trace information + Throwable throwable = Throwable.class.cast(t); + + if (fillStackTrace) { + /* + CPS TRACE + this section contains a synthesized fake stack trace that shows the logical stack trace of the CPS code + ORIGINAL TRACE + this section contains the actual stack trace where 'throwable' was created + */ + + List stack = new ArrayList(); + + stack.add((loc!=null ? loc : UNKNOWN).toStackTrace()); + e.buildStackTraceElements(stack,Integer.MAX_VALUE); + stack.add(Continuable.SEPARATOR_STACK_ELEMENT); + stack.addAll(asList(throwable.getStackTrace())); + + throwable.setStackTrace(stack.toArray(new StackTraceElement[stack.size()])); + } - Continuation v = e.getExceptionHandler(Throwable.class.cast(t).getClass()); + Continuation v = e.getExceptionHandler(throwable.getClass()); return v.receive(t); } }); diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 6f92f5aad..ae75b5397 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -270,4 +270,34 @@ Script1.run(Script1.groovy:17) assert r == 1+2 +16+32 +64+128; } + + + @Test + public void superInterrupt() { + def s = csh.parse(""" + def infiniteLoop() { + while (true) + ; // infinite loop + } + infiniteLoop(); // line 6 + """); + + def ex = new RuntimeException("Yippie!"); + + def c= new Continuable(s); + new Thread({ -> + Thread.sleep(100); + c.superInterrupt(ex); + }).start(); + + def o = c.run0(new Outcome(null,null)); + assert o.abnormal==ex; + + StringWriter sw = new StringWriter(); + o.abnormal.printStackTrace(new PrintWriter(sw)); + // TODO: right now we cannot capture the exact location of the execution that the exception was thrown from. + // see Continuable.run0 for details +// assert sw.toString().contains("Script1.infiniteLoop"); + assert sw.toString().contains("Script1.run(Script1.groovy:6)"); + } } diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 02e88481b..a48604a40 100644 --- a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -185,7 +185,7 @@ public void localExceptionHandling() { assertEquals("foo",run( b.tryCatch( b.sequence( - b.throw_(b.new_(0, RuntimeException.class, b.constant("foo"))), + b.throw_(0, b.new_(0, RuntimeException.class, b.constant("foo"))), b.return_(b.null_()) ), null, @@ -216,7 +216,7 @@ public void throw_(int depth, String message) { b.if_(b.lessThan(0, b.zero(), $depth), b.functionCall(0, b.this_(), "throw_", b.minus(0, $depth, b.one()), b.localVariable("message")), // else - b.throw_(b.new_(0, IllegalArgumentException.class, b.localVariable("message"))) + b.throw_(0, b.new_(0, IllegalArgumentException.class, b.localVariable("message"))) ) )); throw new CpsCallableInvocation(f,this,depth,message); From e6de925c06c1ecc83bb43e8640dba42bc9c889c1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 18 Nov 2014 15:18:45 -0800 Subject: [PATCH 300/932] Exposing these for subtype. When used in the context of a subtype, Groovy seems to have trouble finding these private methods. --- .../com/cloudbees/groovy/cps/CpsTransformer.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 2a8c3a3d0..493d790ac 100644 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -236,7 +236,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * @param args * Can be closure for building argument nodes, Expression, or List of Expressions. */ - private void makeNode(String methodName, Object args) { + protected void makeNode(String methodName, Object args) { parent(new MethodCallExpression(BUILDER, methodName, makeChildren(args))); } @@ -246,7 +246,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * @param args * Can be closure for building argument nodes, Expression, or List of Expressions. */ - private void makeNode(ClassNode type, Object args) { + protected void makeNode(ClassNode type, Object args) { parent(new ConstructorCallExpression(type, makeChildren(args))); } @@ -254,7 +254,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor * Given closure, {@link Expression} or a list of them, package them up into * {@link TupleExpression} */ - private TupleExpression makeChildren(args) { + protected TupleExpression makeChildren(args) { if (args==null) return new TupleExpression(); if (args instanceof Closure) { def argExps = [] @@ -272,7 +272,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor return new TupleExpression(args); } - private void makeNode(String methodName) { + protected void makeNode(String methodName) { makeNode(methodName,null) } @@ -557,7 +557,7 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor } } - private String prepostfixOperatorSuffix(Expression exp) { + protected String prepostfixOperatorSuffix(Expression exp) { switch (exp.operation.type) { case PLUS_PLUS: return "Inc"; case MINUS_MINUS: return "Dec"; From f3395c3d9459b9a286a21e26f932f73a702a17c2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 18 Nov 2014 15:19:52 -0800 Subject: [PATCH 301/932] [maven-release-plugin] prepare release groovy-cps-1.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 733709f02..a76168851 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 1.1-SNAPSHOT + 1.1 Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - HEAD + groovy-cps-1.1 From 03b8eeb1b57e1cdb36138d841db47d925dcbf508 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 18 Nov 2014 15:19:59 -0800 Subject: [PATCH 302/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a76168851..765916566 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ groovy-cps - 1.1 + 1.2-SNAPSHOT Groovy CPS Execution @@ -104,7 +104,7 @@ scm:git:git@github.com/cloudbees/${project.artifactId}.git scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - groovy-cps-1.1 + HEAD From efb0a2090dd41236ea01bbba810d2ba490c8c4ec Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 17 Feb 2015 22:26:14 -0500 Subject: [PATCH 303/932] Updated gmaven-plugin to pick up bug fixes. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 765916566..3c8b71599 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.codehaus.gmaven gmaven-plugin - 1.5 + 1.5-jenkins-3 From 4c6f76ffa0e810fd2bbb61f168494e85d61d23f3 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 17 Feb 2015 22:26:47 -0500 Subject: [PATCH 304/932] Per-thread caller information may be held only weakly. --- .../com/cloudbees/groovy/cps/impl/Caller.java | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java b/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java index 3e2058eb9..447ec241b 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java @@ -1,5 +1,8 @@ package com.cloudbees.groovy.cps.impl; +import java.lang.ref.Reference; +import java.lang.ref.WeakReference; + /** * As a crude way to distinguish asynchronous caller vs synchronous caller, * remember the method call about to happen so that the callee can check @@ -26,42 +29,46 @@ protected Info initialValue() { */ public static boolean isAsynchronous(Object receiver, String method, Object... args) { Info i = store.get(); - return receiver==i.receiver && method.equals(i.method) && arrayShallowEquals(i.args, args); + return receiver==i.receiver.get() && method.equals(i.method) && arrayShallowEquals(i.args, args); } - private static boolean arrayShallowEquals(Object[] a, Object[] b) { + private static boolean arrayShallowEquals(Reference[] a, Object[] b) { if (a.length!=b.length) return false; for (int i=0; i receiver; private String method; - private Object[] args; + private Reference[] args; } + @SuppressWarnings({"unchecked", "rawtypes"}) // generic array creation static void record(Object receiver, String method, Object[] args) { Info c = store.get(); - c.receiver = receiver; + c.receiver = new WeakReference(receiver); c.method = method; - c.args = args; + c.args = new WeakReference[args.length]; + for (int i = 0; i < args.length; i++) { + c.args[i] = new WeakReference(args[i]); + } } } From cb32edbdf98dc3ccaa5f3db1c8db1b0cf015386d Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 19 Feb 2015 17:51:11 -0500 Subject: [PATCH 305/932] Update Groovy to 1.8.9 to match Jenkins core. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 765916566..6a663331f 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ org.codehaus.groovy groovy - 1.8.5 + 1.8.9 + + @@ -81,13 +91,19 @@ org.codehaus.groovy groovy - 1.8.9 + ${groovy.version} provided + + org.codehaus.groovy + groovy-test + ${groovy.version} + test + com.google.guava guava diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy b/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy deleted file mode 100644 index cd5b50d6e..000000000 --- a/src/main/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.groovy +++ /dev/null @@ -1,76 +0,0 @@ -package com.cloudbees.groovy.cps - -import com.cloudbees.groovy.cps.impl.Caller -import com.cloudbees.groovy.cps.impl.CpsCallableInvocation -import com.cloudbees.groovy.cps.impl.CpsFunction -import org.codehaus.groovy.runtime.DefaultGroovyMethods -import org.codehaus.groovy.runtime.InvokerHelper - -/** - * - * TODO: any way to apply CPS transformation? - * - * @author Kohsuke Kawaguchi - */ -public class CpsDefaultGroovyMethods { - private static MethodLocation loc(String methodName) { - return new MethodLocation(CpsDefaultGroovyMethods.class,methodName); - } - - /** - * Interception is successful. The trick is to pre-translate this method into CPS. - */ - public static T each(T self, Closure closure) { - if (!Caller.isAsynchronous(self,"each",closure) - && !Caller.isAsynchronous(CpsDefaultGroovyMethods.class,"each",self,closure)) - return DefaultGroovyMethods.each(self,closure); - - /* - each(InvokerHelper.asIterator(self), closure); - return self; - */ - - def b = new Builder(loc("each")); - def f = new CpsFunction(["self", "closure"], b.block( - b.staticCall(-1, CpsDefaultGroovyMethods.class, "each", - b.staticCall(-1, InvokerHelper.class, "asIterator", - b.localVariable("self") - ), - b.localVariable("closure") - ), - b.return_(b.localVariable("self")) - )); - - throw new CpsCallableInvocation(f,null,self,closure); - } - - public static Iterator each(Iterator iter, Closure closure) { - if (!Caller.isAsynchronous(iter,"each",closure) - && !Caller.isAsynchronous(CpsDefaultGroovyMethods.class,"each",iter,closure)) - return DefaultGroovyMethods.each(iter,closure); - -/* - while (iter.hasNext()) { - Object arg = iter.next(); - closure.call(arg); - } - return iter; -*/ - - - def b = new Builder(loc("each")); - def $iter = b.localVariable("iter") - - def f = new CpsFunction(["iter", "closure"], b.block( - b.while_(null, b.functionCall(1, $iter,"hasNext"), - b.block( - b.declareVariable(2,Object.class,"arg", b.functionCall(2, $iter,"next")), - b.functionCall(3, b.localVariable("closure"), "call", b.localVariable("arg")) - ) - ), - b.return_($iter) - )); - - throw new CpsCallableInvocation(f,null,iter,closure); - } -} diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index a078f878e..d36bddcd5 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -2,7 +2,6 @@ import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; -import com.cloudbees.groovy.cps.impl.SourceLocation; import com.cloudbees.groovy.cps.impl.SuspendBlock; import com.cloudbees.groovy.cps.impl.ThrowBlock; import com.cloudbees.groovy.cps.sandbox.Invoker; @@ -18,6 +17,9 @@ import java.util.List; import static com.cloudbees.groovy.cps.impl.SourceLocation.UNKNOWN; +import com.google.common.collect.ImmutableList; +import groovy.lang.Closure; +import org.codehaus.groovy.runtime.GroovyCategorySupport; /** * Mutable representation of the program. This is the primary API of the groovy-cps library to the outside. @@ -25,6 +27,13 @@ * @author Kohsuke Kawaguchi */ public class Continuable implements Serializable { + + @SuppressWarnings("rawtypes") + static final List categories = ImmutableList.of( + CpsDefaultGroovyMethods.class, + CpsDefaultGroovyStaticMethods.class, + CpsProcessGroovyMethods.class); + /** * When the program resumes with a value (in particular an exception thrown), what environment * do we evaluate that in? @@ -142,22 +151,27 @@ public Object runByThrow(Throwable arg) throws InvocationTargetException { * Resumes this program by either returning the value from {@link Continuable#suspend(Object)} or * throwing an exception */ - public Outcome run0(Outcome cn) { - Next n = cn.resumeFrom(e,k); - - while(n.yield==null) { - if (interrupt!=null) { - // TODO: correctly reporting a source location requires every block to have the line number - n = new Next(new ThrowBlock(UNKNOWN, new ConstantBlock(interrupt), true),n.e,n.k); - interrupt = null; + public Outcome run0(final Outcome cn) { + return GroovyCategorySupport.use(categories, new Closure(null) { + @Override + public Outcome call() { + Next n = cn.resumeFrom(e,k); + + while(n.yield==null) { + if (interrupt!=null) { + // TODO: correctly reporting a source location requires every block to have the line number + n = new Next(new ThrowBlock(UNKNOWN, new ConstantBlock(interrupt), true),n.e,n.k); + interrupt = null; + } + n = n.step(); + } + + e = n.e; + k = n.k; + + return n.yield; } - n = n.step(); - } - - e = n.e; - k = n.k; - - return n.yield; + }); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.java b/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.java new file mode 100644 index 000000000..87248eeda --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.java @@ -0,0 +1,1582 @@ + +package com.cloudbees.groovy.cps; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.SortedSet; +import javax.annotation.Generated; +import com.cloudbees.groovy.cps.impl.Caller; +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; +import com.cloudbees.groovy.cps.impl.CpsFunction; +import groovy.lang.Closure; +import groovy.lang.DelegatingMetaClass; +import groovy.lang.ExpandoMetaClass; +import groovy.lang.GroovyObject; +import groovy.lang.GroovyRuntimeException; +import groovy.lang.GroovySystem; +import groovy.lang.ListWithDefault; +import groovy.lang.MapWithDefault; +import groovy.lang.MetaClass; +import groovy.lang.MetaClassImpl; +import groovy.lang.MetaClassRegistry; +import groovy.util.ClosureComparator; +import groovy.util.GroovyCollections; +import groovy.util.OrderBy; +import groovy.util.PermutationGenerator; +import org.codehaus.groovy.runtime.DefaultGroovyMethods; +import org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport; +import org.codehaus.groovy.runtime.GroovyCategorySupport; +import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.runtime.ReverseListIterator; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +import org.codehaus.groovy.runtime.callsite.BooleanClosureWrapper; +import org.codehaus.groovy.util.ArrayIterator; + +@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Fri May 12 13:24:26 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") +public class CpsDefaultGroovyMethods { + + + public staticObject identity(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "identity", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "identity", self, closure))) { + return DefaultGroovyMethods.identity(self, closure); + } + Builder b = new Builder(loc("identity")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.functionCall(200, b.constant(DefaultGroovyMethods.class), "with", b.localVariable("self"), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject with(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "with", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "with", self, closure))) { + return DefaultGroovyMethods.with(self, closure); + } + Builder b = new Builder(loc("with")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(238, Closure.class, "clonedClosure", b.cast(239, b.functionCall(239, b.localVariable("closure"), "clone"), Closure.class, false)), b.functionCall(240, b.localVariable("clonedClosure"), "setResolveStrategy", b.property(240, b.constant(Closure.class), "DELEGATE_FIRST")), b.functionCall(241, b.localVariable("clonedClosure"), "setDelegate", b.localVariable("self")), b.return_(b.functionCall(242, b.localVariable("clonedClosure"), "call", b.localVariable("self"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject use(Object self, Class categoryClass, Closure closure) { + if ((!Caller.isAsynchronous(self, "use", categoryClass, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "use", self, categoryClass, closure))) { + return DefaultGroovyMethods.use(self, categoryClass, closure); + } + Builder b = new Builder(loc("use")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "categoryClass", "closure"), b.block(b.return_(b.functionCall(407, b.constant(GroovyCategorySupport.class), "use", b.localVariable("categoryClass"), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, categoryClass, closure); + } + + public staticObject use(Object self, List categoryClassList, Closure closure) { + if ((!Caller.isAsynchronous(self, "use", categoryClassList, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "use", self, categoryClassList, closure))) { + return DefaultGroovyMethods.use(self, categoryClassList, closure); + } + Builder b = new Builder(loc("use")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "categoryClassList", "closure"), b.block(b.return_(b.functionCall(488, b.constant(GroovyCategorySupport.class), "use", b.localVariable("categoryClassList"), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, categoryClassList, closure); + } + + public static void addShutdownHook(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "addShutdownHook", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "addShutdownHook", self, closure))) { + DefaultGroovyMethods.addShutdownHook(self, closure); + return ; + } + Builder b = new Builder(loc("addShutdownHook")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.functionCall(499, b.functionCall(499, b.constant(Runtime.class), "getRuntime"), "addShutdownHook", b.new_(499, Thread.class, b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticIterator unique(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "unique", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, closure))) { + return DefaultGroovyMethods.unique(self, closure); + } + Builder b = new Builder(loc("unique")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.functionCall(1140, b.staticCall(1140, CpsDefaultGroovyMethods.class, "toList", b.cast(1140, b.staticCall(1140, CpsDefaultGroovyMethods.class, "unique", b.staticCall(1140, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), b.localVariable("closure")), Iterable.class, false)), "listIterator")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticCollection unique(Collection self, Closure closure) { + if ((!Caller.isAsynchronous(self, "unique", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, closure))) { + return DefaultGroovyMethods.unique(self, closure); + } + Builder b = new Builder(loc("unique")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(1164, CpsDefaultGroovyMethods.class, "unique", b.localVariable("self"), b.constant(true), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticList unique(List self, Closure closure) { + if ((!Caller.isAsynchronous(self, "unique", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, closure))) { + return DefaultGroovyMethods.unique(self, closure); + } + Builder b = new Builder(loc("unique")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1188, b.staticCall(1188, CpsDefaultGroovyMethods.class, "unique", b.cast(1188, b.localVariable("self"), Collection.class, false), b.constant(true), b.localVariable("closure")), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticCollection unique(Collection self, boolean mutate, Closure closure) { + if ((!Caller.isAsynchronous(self, "unique", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, mutate, closure))) { + return DefaultGroovyMethods.unique(self, mutate, closure); + } + Builder b = new Builder(loc("unique")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(1220, int.class, "params", b.functionCall(1220, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareEqual(1221, b.localVariable("params"), b.constant(1)), b.block(b.assign(1222, b.localVariable("self"), b.staticCall(1222, CpsDefaultGroovyMethods.class, "unique", b.localVariable("self"), b.localVariable("mutate"), b.new_(1222, OrderBy.class, b.localVariable("closure"), b.constant(true))))), b.block(b.assign(1224, b.localVariable("self"), b.staticCall(1224, CpsDefaultGroovyMethods.class, "unique", b.localVariable("self"), b.localVariable("mutate"), b.new_(1224, ClosureComparator.class, b.localVariable("closure")))))), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, mutate, closure); + } + + public staticList unique(List self, boolean mutate, Closure closure) { + if ((!Caller.isAsynchronous(self, "unique", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, mutate, closure))) { + return DefaultGroovyMethods.unique(self, mutate, closure); + } + Builder b = new Builder(loc("unique")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.return_(b.cast(1257, b.staticCall(1257, CpsDefaultGroovyMethods.class, "unique", b.cast(1257, b.localVariable("self"), Collection.class, false), b.localVariable("mutate"), b.localVariable("closure")), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, mutate, closure); + } + + public staticObject each(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { + return DefaultGroovyMethods.each(self, closure); + } + Builder b = new Builder(loc("each")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(1890, CpsDefaultGroovyMethods.class, "each", b.functionCall(1890, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")), b.localVariable("closure")), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject eachWithIndex(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { + return DefaultGroovyMethods.eachWithIndex(self, closure); + } + Builder b = new Builder(loc("eachWithIndex")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(1905, Object[].class, "args", b.newArray(1905, Object.class, b.constant(2))), b.declareVariable(1906, int.class, "counter", b.constant(0)), b.forLoop(null, b.sequence(b.declareVariable(1907, Iterator.class, "iter", b.functionCall(1907, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(1907, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.assign(1908, b.array(1908, b.localVariable("args"), b.constant(0)), b.functionCall(1908, b.localVariable("iter"), "next")), b.assign(1909, b.array(1909, b.localVariable("args"), b.constant(1)), b.postfixInc(1909, b.localVariable("counter"))), b.functionCall(1910, b.localVariable("closure"), "call", b.localVariable("args")))), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticIterable eachWithIndex(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { + return DefaultGroovyMethods.eachWithIndex(self, closure); + } + Builder b = new Builder(loc("eachWithIndex")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(1926, CpsDefaultGroovyMethods.class, "eachWithIndex", b.functionCall(1926, b.localVariable("self"), "iterator"), b.localVariable("closure")), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticIterator eachWithIndex(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { + return DefaultGroovyMethods.eachWithIndex(self, closure); + } + Builder b = new Builder(loc("eachWithIndex")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(1941, Object[].class, "args", b.newArray(1941, Object.class, b.constant(2))), b.declareVariable(1942, int.class, "counter", b.constant(0)), b.while_(null, b.functionCall(1943, b.localVariable("self"), "hasNext"), b.block(b.assign(1944, b.array(1944, b.localVariable("args"), b.constant(0)), b.functionCall(1944, b.localVariable("self"), "next")), b.assign(1945, b.array(1945, b.localVariable("args"), b.constant(1)), b.postfixInc(1945, b.localVariable("counter"))), b.functionCall(1946, b.localVariable("closure"), "call", b.localVariable("args")))), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticCollection eachWithIndex(Collection self, Closure closure) { + if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { + return DefaultGroovyMethods.eachWithIndex(self, closure); + } + Builder b = new Builder(loc("eachWithIndex")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1962, b.staticCall(1962, CpsDefaultGroovyMethods.class, "eachWithIndex", b.cast(1962, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Collection.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticList eachWithIndex(List self, Closure closure) { + if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { + return DefaultGroovyMethods.eachWithIndex(self, closure); + } + Builder b = new Builder(loc("eachWithIndex")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1976, b.staticCall(1976, CpsDefaultGroovyMethods.class, "eachWithIndex", b.cast(1976, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticSet eachWithIndex(Set self, Closure closure) { + if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { + return DefaultGroovyMethods.eachWithIndex(self, closure); + } + Builder b = new Builder(loc("eachWithIndex")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1990, b.staticCall(1990, CpsDefaultGroovyMethods.class, "eachWithIndex", b.cast(1990, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Set.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticSortedSet eachWithIndex(SortedSet self, Closure closure) { + if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { + return DefaultGroovyMethods.eachWithIndex(self, closure); + } + Builder b = new Builder(loc("eachWithIndex")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2004, b.staticCall(2004, CpsDefaultGroovyMethods.class, "eachWithIndex", b.cast(2004, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), SortedSet.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticIterable each(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { + return DefaultGroovyMethods.each(self, closure); + } + Builder b = new Builder(loc("each")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2015, CpsDefaultGroovyMethods.class, "each", b.functionCall(2015, b.localVariable("self"), "iterator"), b.localVariable("closure")), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticIterator each(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { + return DefaultGroovyMethods.each(self, closure); + } + Builder b = new Builder(loc("each")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.while_(null, b.functionCall(2028, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(2029, Object.class, "arg", b.functionCall(2029, b.localVariable("self"), "next")), b.functionCall(2030, b.localVariable("closure"), "call", b.localVariable("arg")))), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticCollection each(Collection self, Closure closure) { + if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { + return DefaultGroovyMethods.each(self, closure); + } + Builder b = new Builder(loc("each")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2044, b.staticCall(2044, CpsDefaultGroovyMethods.class, "each", b.cast(2044, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Collection.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticList each(List self, Closure closure) { + if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { + return DefaultGroovyMethods.each(self, closure); + } + Builder b = new Builder(loc("each")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2056, b.staticCall(2056, CpsDefaultGroovyMethods.class, "each", b.cast(2056, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticSet each(Set self, Closure closure) { + if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { + return DefaultGroovyMethods.each(self, closure); + } + Builder b = new Builder(loc("each")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2068, b.staticCall(2068, CpsDefaultGroovyMethods.class, "each", b.cast(2068, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Set.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticSortedSet each(SortedSet self, Closure closure) { + if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { + return DefaultGroovyMethods.each(self, closure); + } + Builder b = new Builder(loc("each")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2080, b.staticCall(2080, CpsDefaultGroovyMethods.class, "each", b.cast(2080, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), SortedSet.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap each(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { + return DefaultGroovyMethods.each(self, closure); + } + Builder b = new Builder(loc("each")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forInLoop(2106, null, java.util.Map.Entry.class, "entry", b.functionCall(2106, b.localVariable("self"), "entrySet"), b.block(b.staticCall(2107, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("closure"), b.localVariable("entry")))), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap reverseEach(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "reverseEach", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "reverseEach", self, closure))) { + return DefaultGroovyMethods.reverseEach(self, closure); + } + Builder b = new Builder(loc("reverseEach")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2127, Iterator.class, "entries", b.staticCall(2127, CpsDefaultGroovyMethods.class, "reverse", b.functionCall(2127, b.functionCall(2127, b.localVariable("self"), "entrySet"), "iterator"))), b.while_(null, b.functionCall(2128, b.localVariable("entries"), "hasNext"), b.block(b.staticCall(2129, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("closure"), b.functionCall(2129, b.localVariable("entries"), "next")))), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap eachWithIndex(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { + return DefaultGroovyMethods.eachWithIndex(self, closure); + } + Builder b = new Builder(loc("eachWithIndex")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2153, int.class, "counter", b.constant(0)), b.forInLoop(2154, null, java.util.Map.Entry.class, "entry", b.functionCall(2154, b.localVariable("self"), "entrySet"), b.block(b.staticCall(2155, CpsDefaultGroovyMethods.class, "callClosureForMapEntryAndCounter", b.localVariable("closure"), b.localVariable("entry"), b.postfixInc(2155, b.localVariable("counter"))))), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticList reverseEach(List self, Closure closure) { + if ((!Caller.isAsynchronous(self, "reverseEach", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "reverseEach", self, closure))) { + return DefaultGroovyMethods.reverseEach(self, closure); + } + Builder b = new Builder(loc("reverseEach")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2172, CpsDefaultGroovyMethods.class, "each", b.new_(2172, ReverseListIterator.class, b.localVariable("self")), b.localVariable("closure")), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject[] reverseEach(Object[] self, Closure closure) { + if ((!Caller.isAsynchronous(self, "reverseEach", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "reverseEach", self, closure))) { + return DefaultGroovyMethods.reverseEach(self, closure); + } + Builder b = new Builder(loc("reverseEach")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2185, CpsDefaultGroovyMethods.class, "each", b.new_(2185, ReverseListIterator.class, b.functionCall(2185, b.constant(Arrays.class), "asList", b.localVariable("self"))), b.localVariable("closure")), b.return_(b.localVariable("self")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static boolean every(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { + return DefaultGroovyMethods.every(self, closure); + } + Builder b = new Builder(loc("every")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2203, BooleanClosureWrapper.class, "bcw", b.new_(2203, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2204, Iterator.class, "iter", b.functionCall(2204, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(2204, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.not(2205, b.functionCall(2205, b.localVariable("bcw"), "call", b.functionCall(2205, b.localVariable("iter"), "next"))), b.block(b.return_(b.constant(false)))))), b.return_(b.constant(true)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticboolean every(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { + return DefaultGroovyMethods.every(self, closure); + } + Builder b = new Builder(loc("every")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2226, BooleanClosureWrapper.class, "bcw", b.new_(2226, BooleanClosureWrapper.class, b.localVariable("closure"))), b.while_(null, b.functionCall(2227, b.localVariable("self"), "hasNext"), b.block(b.if_(b.not(2228, b.functionCall(2228, b.localVariable("bcw"), "call", b.functionCall(2228, b.localVariable("self"), "next"))), b.block(b.return_(b.constant(false)))))), b.return_(b.constant(true)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticboolean every(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { + return DefaultGroovyMethods.every(self, closure); + } + Builder b = new Builder(loc("every")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2249, CpsDefaultGroovyMethods.class, "every", b.functionCall(2249, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticboolean every(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { + return DefaultGroovyMethods.every(self, closure); + } + Builder b = new Builder(loc("every")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2268, BooleanClosureWrapper.class, "bcw", b.new_(2268, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(2269, null, java.util.Map.Entry.class, "entry", b.functionCall(2269, b.localVariable("self"), "entrySet"), b.block(b.if_(b.not(2270, b.functionCall(2270, b.localVariable("bcw"), "callForMap", b.localVariable("entry"))), b.block(b.return_(b.constant(false)))))), b.return_(b.constant(true)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static boolean any(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { + return DefaultGroovyMethods.any(self, closure); + } + Builder b = new Builder(loc("any")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2307, BooleanClosureWrapper.class, "bcw", b.new_(2307, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2308, Iterator.class, "iter", b.functionCall(2308, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(2308, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.functionCall(2309, b.localVariable("bcw"), "call", b.functionCall(2309, b.localVariable("iter"), "next")), b.return_(b.constant(true))))), b.return_(b.constant(false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticboolean any(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { + return DefaultGroovyMethods.any(self, closure); + } + Builder b = new Builder(loc("any")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2324, BooleanClosureWrapper.class, "bcw", b.new_(2324, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2325, Iterator.class, "iter", b.localVariable("self"))), b.functionCall(2325, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.functionCall(2326, b.localVariable("bcw"), "call", b.functionCall(2326, b.localVariable("iter"), "next")), b.return_(b.constant(true))))), b.return_(b.constant(false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticboolean any(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { + return DefaultGroovyMethods.any(self, closure); + } + Builder b = new Builder(loc("any")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2341, BooleanClosureWrapper.class, "bcw", b.new_(2341, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2342, Iterator.class, "iter", b.functionCall(2342, b.localVariable("self"), "iterator"))), b.functionCall(2342, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.functionCall(2343, b.localVariable("bcw"), "call", b.functionCall(2343, b.localVariable("iter"), "next")), b.return_(b.constant(true))))), b.return_(b.constant(false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticboolean any(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { + return DefaultGroovyMethods.any(self, closure); + } + Builder b = new Builder(loc("any")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2365, BooleanClosureWrapper.class, "bcw", b.new_(2365, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(2366, null, java.util.Map.Entry.class, "entry", b.functionCall(2366, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(2367, b.localVariable("bcw"), "callForMap", b.localVariable("entry")), b.block(b.return_(b.constant(true)))))), b.return_(b.constant(false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticNumber count(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { + return DefaultGroovyMethods.count(self, closure); + } + Builder b = new Builder(loc("count")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2664, long.class, "answer", b.constant(0)), b.declareVariable(2665, BooleanClosureWrapper.class, "bcw", b.new_(2665, BooleanClosureWrapper.class, b.localVariable("closure"))), b.while_(null, b.functionCall(2666, b.localVariable("self"), "hasNext"), b.block(b.if_(b.functionCall(2667, b.localVariable("bcw"), "call", b.functionCall(2667, b.localVariable("self"), "next")), b.block(b.prefixInc(2668, b.localVariable("answer")))))), b.if_(b.lessThanEqual(2672, b.localVariable("answer"), b.property(2672, b.constant(Integer.class), "MAX_VALUE")), b.return_(b.cast(2672, b.localVariable("answer"), int.class, false))), b.return_(b.localVariable("answer")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticNumber count(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { + return DefaultGroovyMethods.count(self, closure); + } + Builder b = new Builder(loc("count")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2723, CpsDefaultGroovyMethods.class, "count", b.functionCall(2723, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticNumber count(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { + return DefaultGroovyMethods.count(self, closure); + } + Builder b = new Builder(loc("count")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2740, long.class, "answer", b.constant(0)), b.declareVariable(2741, BooleanClosureWrapper.class, "bcw", b.new_(2741, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(2742, null, Object.class, "entry", b.functionCall(2742, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(2743, b.localVariable("bcw"), "callForMap", b.cast(2743, b.localVariable("entry"), java.util.Map.Entry.class, false)), b.block(b.prefixInc(2744, b.localVariable("answer")))))), b.if_(b.lessThanEqual(2748, b.localVariable("answer"), b.property(2748, b.constant(Integer.class), "MAX_VALUE")), b.return_(b.cast(2748, b.localVariable("answer"), int.class, false))), b.return_(b.localVariable("answer")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticNumber count(Object[] self, Closure closure) { + if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { + return DefaultGroovyMethods.count(self, closure); + } + Builder b = new Builder(loc("count")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2775, CpsDefaultGroovyMethods.class, "count", b.cast(2775, b.functionCall(2775, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticList collect(Object self, Closure transform) { + if ((!Caller.isAsynchronous(self, "collect", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, transform))) { + return DefaultGroovyMethods.collect(self, transform); + } + Builder b = new Builder(loc("collect")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3095, b.staticCall(3095, CpsDefaultGroovyMethods.class, "collect", b.localVariable("self"), b.new_(3095, ArrayList.class), b.localVariable("transform")), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, transform); + } + + public staticCollection collect(Object self, Collection collector, Closure transform) { + if ((!Caller.isAsynchronous(self, "collect", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, collector, transform))) { + return DefaultGroovyMethods.collect(self, collector, transform); + } + Builder b = new Builder(loc("collect")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forLoop(null, b.sequence(b.declareVariable(3123, Iterator.class, "iter", b.functionCall(3123, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(3123, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.functionCall(3124, b.localVariable("collector"), "add", b.functionCall(3124, b.localVariable("transform"), "call", b.functionCall(3124, b.localVariable("iter"), "next"))))), b.return_(b.localVariable("collector")))); + throw new CpsCallableInvocation(f, null, self, collector, transform); + } + + public staticList collect(Collection self, Closure transform) { + if ((!Caller.isAsynchronous(self, "collect", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, transform))) { + return DefaultGroovyMethods.collect(self, transform); + } + Builder b = new Builder(loc("collect")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3140, b.staticCall(3140, CpsDefaultGroovyMethods.class, "collect", b.localVariable("self"), b.new_(3140, ArrayList.class, b.functionCall(3140, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, transform); + } + + public staticCollection collect(Collection self, Collection collector, Closure transform) { + if ((!Caller.isAsynchronous(self, "collect", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, collector, transform))) { + return DefaultGroovyMethods.collect(self, collector, transform); + } + Builder b = new Builder(loc("collect")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3169, null, Object.class, "item", b.localVariable("self"), b.block(b.functionCall(3170, b.localVariable("collector"), "add", b.functionCall(3170, b.localVariable("transform"), "call", b.localVariable("item"))), b.if_(b.compareEqual(3171, b.functionCall(3171, b.localVariable("transform"), "getDirective"), b.property(3171, b.constant(Closure.class), "DONE")), b.block(b.break_(null))))), b.return_(b.localVariable("collector")))); + throw new CpsCallableInvocation(f, null, self, collector, transform); + } + + public static List collectNested(Collection self, Closure transform) { + if ((!Caller.isAsynchronous(self, "collectNested", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectNested", self, transform))) { + return DefaultGroovyMethods.collectNested(self, transform); + } + Builder b = new Builder(loc("collectNested")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3203, b.staticCall(3203, CpsDefaultGroovyMethods.class, "collectNested", b.cast(3203, b.localVariable("self"), Iterable.class, false), b.new_(3203, ArrayList.class, b.functionCall(3203, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, transform); + } + + public static List collectNested(Iterable self, Closure transform) { + if ((!Caller.isAsynchronous(self, "collectNested", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectNested", self, transform))) { + return DefaultGroovyMethods.collectNested(self, transform); + } + Builder b = new Builder(loc("collectNested")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3220, b.staticCall(3220, CpsDefaultGroovyMethods.class, "collectNested", b.localVariable("self"), b.new_(3220, ArrayList.class), b.localVariable("transform")), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, transform); + } + + public static Collection collectNested(Iterable self, Collection collector, Closure transform) { + if ((!Caller.isAsynchronous(self, "collectNested", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectNested", self, collector, transform))) { + return DefaultGroovyMethods.collectNested(self, collector, transform); + } + Builder b = new Builder(loc("collectNested")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3261, null, Object.class, "item", b.localVariable("self"), b.block(b.if_(b.instanceOf(3262, b.localVariable("item"), b.constant(Collection.class)), b.block(b.declareVariable(3263, Collection.class, "c", b.cast(3263, b.localVariable("item"), Collection.class, false)), b.functionCall(3264, b.localVariable("collector"), "add", b.staticCall(3264, CpsDefaultGroovyMethods.class, "collectNested", b.cast(3264, b.localVariable("c"), Iterable.class, false), b.functionCall(3264, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("collector"), b.functionCall(3264, b.localVariable("c"), "size")), b.localVariable("transform")))), b.block(b.functionCall(3266, b.localVariable("collector"), "add", b.functionCall(3266, b.localVariable("transform"), "call", b.localVariable("item"))))), b.if_(b.compareEqual(3268, b.functionCall(3268, b.localVariable("transform"), "getDirective"), b.property(3268, b.constant(Closure.class), "DONE")), b.block(b.break_(null))))), b.return_(b.localVariable("collector")))); + throw new CpsCallableInvocation(f, null, self, collector, transform); + } + + public staticList collectMany(Iterable self, Closure> projection) { + if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { + return DefaultGroovyMethods.collectMany(self, projection); + } + Builder b = new Builder(loc("collectMany")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.cast(3320, b.staticCall(3320, CpsDefaultGroovyMethods.class, "collectMany", b.localVariable("self"), b.new_(3320, ArrayList.class), b.localVariable("projection")), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, projection); + } + + public staticCollection collectMany(Iterable self, Collection collector, Closure> projection) { + if ((!Caller.isAsynchronous(self, "collectMany", collector, projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, collector, projection))) { + return DefaultGroovyMethods.collectMany(self, collector, projection); + } + Builder b = new Builder(loc("collectMany")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "projection"), b.block(b.forInLoop(3344, null, Object.class, "next", b.localVariable("self"), b.block(b.functionCall(3345, b.localVariable("collector"), "addAll", b.functionCall(3345, b.localVariable("projection"), "call", b.localVariable("next"))))), b.return_(b.localVariable("collector")))); + throw new CpsCallableInvocation(f, null, self, collector, projection); + } + + public staticCollection collectMany(Map self, Collection collector, Closure> projection) { + if ((!Caller.isAsynchronous(self, "collectMany", collector, projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, collector, projection))) { + return DefaultGroovyMethods.collectMany(self, collector, projection); + } + Builder b = new Builder(loc("collectMany")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "projection"), b.block(b.forInLoop(3367, null, java.util.Map.Entry.class, "entry", b.functionCall(3367, b.localVariable("self"), "entrySet"), b.block(b.functionCall(3368, b.localVariable("collector"), "addAll", b.staticCall(3368, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("projection"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); + throw new CpsCallableInvocation(f, null, self, collector, projection); + } + + public staticCollection collectMany(Map self, Closure> projection) { + if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { + return DefaultGroovyMethods.collectMany(self, projection); + } + Builder b = new Builder(loc("collectMany")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3389, CpsDefaultGroovyMethods.class, "collectMany", b.localVariable("self"), b.new_(3389, ArrayList.class), b.localVariable("projection"))))); + throw new CpsCallableInvocation(f, null, self, projection); + } + + public staticList collectMany(Object[] self, Closure> projection) { + if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { + return DefaultGroovyMethods.collectMany(self, projection); + } + Builder b = new Builder(loc("collectMany")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3409, CpsDefaultGroovyMethods.class, "collectMany", b.cast(3409, b.staticCall(3409, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("projection"))))); + throw new CpsCallableInvocation(f, null, self, projection); + } + + public staticList collectMany(Iterator self, Closure> projection) { + if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { + return DefaultGroovyMethods.collectMany(self, projection); + } + Builder b = new Builder(loc("collectMany")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3429, CpsDefaultGroovyMethods.class, "collectMany", b.cast(3429, b.staticCall(3429, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("projection"))))); + throw new CpsCallableInvocation(f, null, self, projection); + } + + public staticCollection collect(Map self, Collection collector, Closure transform) { + if ((!Caller.isAsynchronous(self, "collect", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, collector, transform))) { + return DefaultGroovyMethods.collect(self, collector, transform); + } + Builder b = new Builder(loc("collect")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3445, null, java.util.Map.Entry.class, "entry", b.functionCall(3445, b.localVariable("self"), "entrySet"), b.block(b.functionCall(3446, b.localVariable("collector"), "add", b.staticCall(3446, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("transform"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); + throw new CpsCallableInvocation(f, null, self, collector, transform); + } + + public staticList collect(Map self, Closure transform) { + if ((!Caller.isAsynchronous(self, "collect", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, transform))) { + return DefaultGroovyMethods.collect(self, transform); + } + Builder b = new Builder(loc("collect")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3463, b.staticCall(3463, CpsDefaultGroovyMethods.class, "collect", b.localVariable("self"), b.new_(3463, ArrayList.class, b.functionCall(3463, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, transform); + } + + public staticMap collectEntries(Map self, Map collector, Closure transform) { + if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { + return DefaultGroovyMethods.collectEntries(self, collector, transform); + } + Builder b = new Builder(loc("collectEntries")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3488, null, java.util.Map.Entry.class, "entry", b.functionCall(3488, b.localVariable("self"), "entrySet"), b.block(b.staticCall(3489, CpsDefaultGroovyMethods.class, "addEntry", b.localVariable("collector"), b.staticCall(3489, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("transform"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); + throw new CpsCallableInvocation(f, null, self, collector, transform); + } + + public staticMap collectEntries(Map self, Closure transform) { + if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { + return DefaultGroovyMethods.collectEntries(self, transform); + } + Builder b = new Builder(loc("collectEntries")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3515, CpsDefaultGroovyMethods.class, "collectEntries", b.localVariable("self"), b.functionCall(3515, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarMap", b.localVariable("self")), b.localVariable("transform"))))); + throw new CpsCallableInvocation(f, null, self, transform); + } + + public staticMap collectEntries(Iterator self, Closure transform) { + if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { + return DefaultGroovyMethods.collectEntries(self, transform); + } + Builder b = new Builder(loc("collectEntries")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3539, CpsDefaultGroovyMethods.class, "collectEntries", b.localVariable("self"), b.new_(3539, LinkedHashMap.class), b.localVariable("transform"))))); + throw new CpsCallableInvocation(f, null, self, transform); + } + + public staticMap collectEntries(Iterable self, Closure transform) { + if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { + return DefaultGroovyMethods.collectEntries(self, transform); + } + Builder b = new Builder(loc("collectEntries")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3564, CpsDefaultGroovyMethods.class, "collectEntries", b.functionCall(3564, b.localVariable("self"), "iterator"), b.localVariable("transform"))))); + throw new CpsCallableInvocation(f, null, self, transform); + } + + public staticMap collectEntries(Iterator self, Map collector, Closure transform) { + if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { + return DefaultGroovyMethods.collectEntries(self, collector, transform); + } + Builder b = new Builder(loc("collectEntries")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.while_(null, b.functionCall(3630, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(3631, Object.class, "next", b.functionCall(3631, b.localVariable("self"), "next")), b.staticCall(3632, CpsDefaultGroovyMethods.class, "addEntry", b.localVariable("collector"), b.functionCall(3632, b.localVariable("transform"), "call", b.localVariable("next"))))), b.return_(b.localVariable("collector")))); + throw new CpsCallableInvocation(f, null, self, collector, transform); + } + + public staticMap collectEntries(Iterable self, Map collector, Closure transform) { + if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { + return DefaultGroovyMethods.collectEntries(self, collector, transform); + } + Builder b = new Builder(loc("collectEntries")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.return_(b.staticCall(3661, CpsDefaultGroovyMethods.class, "collectEntries", b.functionCall(3661, b.localVariable("self"), "iterator"), b.localVariable("collector"), b.localVariable("transform"))))); + throw new CpsCallableInvocation(f, null, self, collector, transform); + } + + public staticMap collectEntries(Object[] self, Map collector, Closure transform) { + if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { + return DefaultGroovyMethods.collectEntries(self, collector, transform); + } + Builder b = new Builder(loc("collectEntries")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.return_(b.staticCall(3728, CpsDefaultGroovyMethods.class, "collectEntries", b.cast(3728, b.staticCall(3728, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("collector"), b.localVariable("transform"))))); + throw new CpsCallableInvocation(f, null, self, collector, transform); + } + + public staticMap collectEntries(Object[] self, Closure transform) { + if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { + return DefaultGroovyMethods.collectEntries(self, transform); + } + Builder b = new Builder(loc("collectEntries")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3767, CpsDefaultGroovyMethods.class, "collectEntries", b.cast(3767, b.staticCall(3767, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.new_(3767, LinkedHashMap.class), b.localVariable("transform"))))); + throw new CpsCallableInvocation(f, null, self, transform); + } + + public static Object find(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "find", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, closure))) { + return DefaultGroovyMethods.find(self, closure); + } + Builder b = new Builder(loc("find")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(3808, BooleanClosureWrapper.class, "bcw", b.new_(3808, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(3809, Iterator.class, "iter", b.functionCall(3809, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(3809, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.declareVariable(3810, Object.class, "value", b.functionCall(3810, b.localVariable("iter"), "next")), b.if_(b.functionCall(3811, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.return_(b.localVariable("value")))))), b.return_(b.constant(null)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static Object findResult(Object self, Object defaultResult, Closure closure) { + if ((!Caller.isAsynchronous(self, "findResult", defaultResult, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, defaultResult, closure))) { + return DefaultGroovyMethods.findResult(self, defaultResult, closure); + } + Builder b = new Builder(loc("findResult")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(3846, Object.class, "result", b.staticCall(3846, CpsDefaultGroovyMethods.class, "findResult", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(3847, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, defaultResult, closure); + } + + public static Object findResult(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "findResult", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, closure))) { + return DefaultGroovyMethods.findResult(self, closure); + } + Builder b = new Builder(loc("findResult")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forLoop(null, b.sequence(b.declareVariable(3860, Iterator.class, "iter", b.functionCall(3860, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(3860, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.declareVariable(3861, Object.class, "value", b.functionCall(3861, b.localVariable("iter"), "next")), b.declareVariable(3862, Object.class, "result", b.functionCall(3862, b.localVariable("closure"), "call", b.localVariable("value"))), b.if_(b.compareNotEqual(3863, b.localVariable("result"), b.constant(null)), b.block(b.return_(b.localVariable("result")))))), b.return_(b.constant(null)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject find(Collection self, Closure closure) { + if ((!Caller.isAsynchronous(self, "find", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, closure))) { + return DefaultGroovyMethods.find(self, closure); + } + Builder b = new Builder(loc("find")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(3882, BooleanClosureWrapper.class, "bcw", b.new_(3882, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(3883, null, Object.class, "value", b.localVariable("self"), b.block(b.if_(b.functionCall(3884, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.return_(b.localVariable("value")))))), b.return_(b.constant(null)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject find(Object[] self, Closure condition) { + if ((!Caller.isAsynchronous(self, "find", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, condition))) { + return DefaultGroovyMethods.find(self, condition); + } + Builder b = new Builder(loc("find")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(3906, BooleanClosureWrapper.class, "bcw", b.new_(3906, BooleanClosureWrapper.class, b.localVariable("condition"))), b.forInLoop(3907, null, Object.class, "element", b.localVariable("self"), b.block(b.if_(b.functionCall(3908, b.localVariable("bcw"), "call", b.localVariable("element")), b.block(b.return_(b.localVariable("element")))))), b.return_(b.constant(null)))); + throw new CpsCallableInvocation(f, null, self, condition); + } + + public staticObject findResult(Collection self, Object defaultResult, Closure closure) { + if ((!Caller.isAsynchronous(self, "findResult", defaultResult, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, defaultResult, closure))) { + return DefaultGroovyMethods.findResult(self, defaultResult, closure); + } + Builder b = new Builder(loc("findResult")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(3951, Object.class, "result", b.staticCall(3951, CpsDefaultGroovyMethods.class, "findResult", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(3952, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, defaultResult, closure); + } + + public staticObject findResult(Collection self, Closure closure) { + if ((!Caller.isAsynchronous(self, "findResult", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, closure))) { + return DefaultGroovyMethods.findResult(self, closure); + } + Builder b = new Builder(loc("findResult")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forInLoop(3972, null, Object.class, "value", b.localVariable("self"), b.block(b.declareVariable(3973, Object.class, "result", b.functionCall(3973, b.localVariable("closure"), "call", b.localVariable("value"))), b.if_(b.compareNotEqual(3974, b.localVariable("result"), b.constant(null)), b.block(b.return_(b.localVariable("result")))))), b.return_(b.constant(null)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticCollection findResults(Iterable self, Closure filteringTransform) { + if ((!Caller.isAsynchronous(self, "findResults", filteringTransform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResults", self, filteringTransform))) { + return DefaultGroovyMethods.findResults(self, filteringTransform); + } + Builder b = new Builder(loc("findResults")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "filteringTransform"), b.block(b.declareVariable(4008, List.class, "result", b.new_(4008, ArrayList.class)), b.forInLoop(4009, null, Object.class, "value", b.localVariable("self"), b.block(b.declareVariable(4010, Object.class, "transformed", b.functionCall(4010, b.localVariable("filteringTransform"), "call", b.localVariable("value"))), b.if_(b.compareNotEqual(4011, b.localVariable("transformed"), b.constant(null)), b.block(b.functionCall(4012, b.localVariable("result"), "add", b.localVariable("transformed")))))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, filteringTransform); + } + + public staticCollection findResults(Map self, Closure filteringTransform) { + if ((!Caller.isAsynchronous(self, "findResults", filteringTransform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResults", self, filteringTransform))) { + return DefaultGroovyMethods.findResults(self, filteringTransform); + } + Builder b = new Builder(loc("findResults")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "filteringTransform"), b.block(b.declareVariable(4037, List.class, "result", b.new_(4037, ArrayList.class)), b.forInLoop(4038, null, java.util.Map.Entry.class, "entry", b.functionCall(4038, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(4039, Object.class, "transformed", b.staticCall(4039, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("filteringTransform"), b.localVariable("entry"))), b.if_(b.compareNotEqual(4040, b.localVariable("transformed"), b.constant(null)), b.block(b.functionCall(4041, b.localVariable("result"), "add", b.localVariable("transformed")))))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, filteringTransform); + } + + public staticjava.util.Map.Entry find(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "find", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, closure))) { + return DefaultGroovyMethods.find(self, closure); + } + Builder b = new Builder(loc("find")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4059, BooleanClosureWrapper.class, "bcw", b.new_(4059, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(4060, null, java.util.Map.Entry.class, "entry", b.functionCall(4060, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(4061, b.localVariable("bcw"), "callForMap", b.localVariable("entry")), b.block(b.return_(b.localVariable("entry")))))), b.return_(b.constant(null)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject findResult(Map self, Object defaultResult, Closure closure) { + if ((!Caller.isAsynchronous(self, "findResult", defaultResult, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, defaultResult, closure))) { + return DefaultGroovyMethods.findResult(self, defaultResult, closure); + } + Builder b = new Builder(loc("findResult")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(4085, Object.class, "result", b.staticCall(4085, CpsDefaultGroovyMethods.class, "findResult", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(4086, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, defaultResult, closure); + } + + public staticObject findResult(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "findResult", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, closure))) { + return DefaultGroovyMethods.findResult(self, closure); + } + Builder b = new Builder(loc("findResult")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forInLoop(4106, null, java.util.Map.Entry.class, "entry", b.functionCall(4106, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(4107, Object.class, "result", b.staticCall(4107, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("closure"), b.localVariable("entry"))), b.if_(b.compareNotEqual(4108, b.localVariable("result"), b.constant(null)), b.block(b.return_(b.localVariable("result")))))), b.return_(b.constant(null)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticSet findAll(Set self, Closure closure) { + if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { + return DefaultGroovyMethods.findAll(self, closure); + } + Builder b = new Builder(loc("findAll")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4125, b.staticCall(4125, CpsDefaultGroovyMethods.class, "findAll", b.cast(4125, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), Set.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticList findAll(List self, Closure closure) { + if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { + return DefaultGroovyMethods.findAll(self, closure); + } + Builder b = new Builder(loc("findAll")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4138, b.staticCall(4138, CpsDefaultGroovyMethods.class, "findAll", b.cast(4138, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticCollection findAll(Collection self, Closure closure) { + if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { + return DefaultGroovyMethods.findAll(self, closure); + } + Builder b = new Builder(loc("findAll")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4151, Collection.class, "answer", b.functionCall(4151, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4152, Iterator.class, "iter", b.functionCall(4152, b.localVariable("self"), "iterator")), b.return_(b.staticCall(4153, CpsDefaultGroovyMethods.class, "findAll", b.localVariable("closure"), b.localVariable("answer"), b.localVariable("iter"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticCollection findAll(Object[] self, Closure condition) { + if ((!Caller.isAsynchronous(self, "findAll", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, condition))) { + return DefaultGroovyMethods.findAll(self, condition); + } + Builder b = new Builder(loc("findAll")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(4169, Collection.class, "answer", b.new_(4169, ArrayList.class)), b.return_(b.staticCall(4170, CpsDefaultGroovyMethods.class, "findAll", b.localVariable("condition"), b.localVariable("answer"), b.new_(4170, ArrayIterator.class, b.localVariable("self")))))); + throw new CpsCallableInvocation(f, null, self, condition); + } + + public static Collection findAll(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { + return DefaultGroovyMethods.findAll(self, closure); + } + Builder b = new Builder(loc("findAll")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4254, List.class, "answer", b.new_(4254, ArrayList.class)), b.declareVariable(4255, Iterator.class, "iter", b.functionCall(4255, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.return_(b.staticCall(4256, CpsDefaultGroovyMethods.class, "findAll", b.localVariable("closure"), b.localVariable("answer"), b.localVariable("iter"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticboolean retainAll(Collection self, Closure condition) { + if ((!Caller.isAsynchronous(self, "retainAll", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "retainAll", self, condition))) { + return DefaultGroovyMethods.retainAll(self, condition); + } + Builder b = new Builder(loc("retainAll")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(4385, Iterator.class, "iter", b.functionCall(4385, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.declareVariable(4386, BooleanClosureWrapper.class, "bcw", b.new_(4386, BooleanClosureWrapper.class, b.localVariable("condition"))), b.declareVariable(4387, int.class, "result", b.constant(false)), b.while_(null, b.functionCall(4388, b.localVariable("iter"), "hasNext"), b.block(b.declareVariable(4389, Object.class, "value", b.functionCall(4389, b.localVariable("iter"), "next")), b.if_(b.not(4390, b.functionCall(4390, b.localVariable("bcw"), "call", b.localVariable("value"))), b.block(b.functionCall(4391, b.localVariable("iter"), "remove"), b.assign(4392, b.localVariable("result"), b.constant(true)))))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, condition); + } + + public staticboolean removeAll(Collection self, Closure condition) { + if ((!Caller.isAsynchronous(self, "removeAll", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "removeAll", self, condition))) { + return DefaultGroovyMethods.removeAll(self, condition); + } + Builder b = new Builder(loc("removeAll")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(4412, Iterator.class, "iter", b.functionCall(4412, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.declareVariable(4413, BooleanClosureWrapper.class, "bcw", b.new_(4413, BooleanClosureWrapper.class, b.localVariable("condition"))), b.declareVariable(4414, int.class, "result", b.constant(false)), b.while_(null, b.functionCall(4415, b.localVariable("iter"), "hasNext"), b.block(b.declareVariable(4416, Object.class, "value", b.functionCall(4416, b.localVariable("iter"), "next")), b.if_(b.functionCall(4417, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.functionCall(4418, b.localVariable("iter"), "remove"), b.assign(4419, b.localVariable("result"), b.constant(true)))))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, condition); + } + + public static Collection split(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { + return DefaultGroovyMethods.split(self, closure); + } + Builder b = new Builder(loc("split")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4478, List.class, "accept", b.new_(4478, ArrayList.class)), b.declareVariable(4479, List.class, "reject", b.new_(4479, ArrayList.class)), b.return_(b.staticCall(4480, CpsDefaultGroovyMethods.class, "split", b.localVariable("closure"), b.localVariable("accept"), b.localVariable("reject"), b.functionCall(4480, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticCollection> split(Collection self, Closure closure) { + if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { + return DefaultGroovyMethods.split(self, closure); + } + Builder b = new Builder(loc("split")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4497, Collection.class, "accept", b.functionCall(4497, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4498, Collection.class, "reject", b.functionCall(4498, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4499, Iterator.class, "iter", b.functionCall(4499, b.localVariable("self"), "iterator")), b.return_(b.staticCall(4500, CpsDefaultGroovyMethods.class, "split", b.localVariable("closure"), b.localVariable("accept"), b.localVariable("reject"), b.localVariable("iter"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticList> split(List self, Closure closure) { + if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { + return DefaultGroovyMethods.split(self, closure); + } + Builder b = new Builder(loc("split")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4534, b.cast(4534, b.staticCall(4534, CpsDefaultGroovyMethods.class, "split", b.cast(4534, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticList> split(Set self, Closure closure) { + if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { + return DefaultGroovyMethods.split(self, closure); + } + Builder b = new Builder(loc("split")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4552, b.cast(4552, b.staticCall(4552, CpsDefaultGroovyMethods.class, "split", b.cast(4552, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false), List.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static List combinations(Iterable self, Closure function) { + if ((!Caller.isAsynchronous(self, "combinations", function))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "combinations", self, function))) { + return DefaultGroovyMethods.combinations(self, function); + } + Builder b = new Builder(loc("combinations")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.return_(b.staticCall(4596, CpsDefaultGroovyMethods.class, "collect", b.functionCall(4596, b.constant(GroovyCollections.class), "combinations", b.localVariable("self")), b.localVariable("function"))))); + throw new CpsCallableInvocation(f, null, self, function); + } + + public static void eachCombination(Iterable self, Closure function) { + if ((!Caller.isAsynchronous(self, "eachCombination", function))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachCombination", self, function))) { + DefaultGroovyMethods.eachCombination(self, function); + return ; + } + Builder b = new Builder(loc("eachCombination")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.staticCall(4611, CpsDefaultGroovyMethods.class, "each", b.functionCall(4611, b.constant(GroovyCollections.class), "combinations", b.localVariable("self")), b.localVariable("function")))); + throw new CpsCallableInvocation(f, null, self, function); + } + + public staticList permutations(Iterable self, Closure function) { + if ((!Caller.isAsynchronous(self, "permutations", function))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "permutations", self, function))) { + return DefaultGroovyMethods.permutations(self, function); + } + Builder b = new Builder(loc("permutations")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.return_(b.staticCall(4673, CpsDefaultGroovyMethods.class, "collect", b.staticCall(4673, CpsDefaultGroovyMethods.class, "permutations", b.localVariable("self")), b.localVariable("function"))))); + throw new CpsCallableInvocation(f, null, self, function); + } + + public staticIterator> eachPermutation(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "eachPermutation", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachPermutation", self, closure))) { + return DefaultGroovyMethods.eachPermutation(self, closure); + } + Builder b = new Builder(loc("eachPermutation")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4710, Iterator.class, "generator", b.new_(4710, PermutationGenerator.class, b.localVariable("self"))), b.while_(null, b.functionCall(4711, b.localVariable("generator"), "hasNext"), b.block(b.functionCall(4712, b.localVariable("closure"), "call", b.functionCall(4712, b.localVariable("generator"), "next")))), b.return_(b.localVariable("generator")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap findAll(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { + return DefaultGroovyMethods.findAll(self, closure); + } + Builder b = new Builder(loc("findAll")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4762, Map.class, "answer", b.functionCall(4762, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarMap", b.localVariable("self"))), b.declareVariable(4763, BooleanClosureWrapper.class, "bcw", b.new_(4763, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(4764, null, java.util.Map.Entry.class, "entry", b.functionCall(4764, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(4765, b.localVariable("bcw"), "callForMap", b.localVariable("entry")), b.block(b.functionCall(4766, b.localVariable("answer"), "put", b.functionCall(4766, b.localVariable("entry"), "getKey"), b.functionCall(4766, b.localVariable("entry"), "getValue")))))), b.return_(b.localVariable("answer")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap> groupBy(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "groupBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupBy", self, closure))) { + return DefaultGroovyMethods.groupBy(self, closure); + } + Builder b = new Builder(loc("groupBy")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4799, Map.class, "answer", b.new_(4799, LinkedHashMap.class)), b.forInLoop(4800, null, Object.class, "element", b.localVariable("self"), b.block(b.declareVariable(4801, Object.class, "value", b.functionCall(4801, b.localVariable("closure"), "call", b.localVariable("element"))), b.staticCall(4802, CpsDefaultGroovyMethods.class, "groupAnswer", b.localVariable("answer"), b.localVariable("element"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap> groupBy(Object[] self, Closure closure) { + if ((!Caller.isAsynchronous(self, "groupBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupBy", self, closure))) { + return DefaultGroovyMethods.groupBy(self, closure); + } + Builder b = new Builder(loc("groupBy")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(4826, CpsDefaultGroovyMethods.class, "groupBy", b.cast(4826, b.functionCall(4826, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap countBy(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { + return DefaultGroovyMethods.countBy(self, closure); + } + Builder b = new Builder(loc("countBy")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(4993, CpsDefaultGroovyMethods.class, "countBy", b.functionCall(4993, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap countBy(Object[] self, Closure closure) { + if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { + return DefaultGroovyMethods.countBy(self, closure); + } + Builder b = new Builder(loc("countBy")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5013, CpsDefaultGroovyMethods.class, "countBy", b.cast(5013, b.functionCall(5013, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap countBy(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { + return DefaultGroovyMethods.countBy(self, closure); + } + Builder b = new Builder(loc("countBy")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5033, Map.class, "answer", b.new_(5033, LinkedHashMap.class)), b.while_(null, b.functionCall(5034, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(5035, Object.class, "value", b.functionCall(5035, b.localVariable("closure"), "call", b.functionCall(5035, b.localVariable("self"), "next"))), b.staticCall(5036, CpsDefaultGroovyMethods.class, "countAnswer", b.localVariable("answer"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap>> groupEntriesBy(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "groupEntriesBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupEntriesBy", self, closure))) { + return DefaultGroovyMethods.groupEntriesBy(self, closure); + } + Builder b = new Builder(loc("groupEntriesBy")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5060, Map.class, "answer", b.new_(5060, LinkedHashMap.class)), b.forInLoop(5061, null, java.util.Map.Entry.class, "entry", b.functionCall(5061, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(5062, Object.class, "value", b.staticCall(5062, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("closure"), b.localVariable("entry"))), b.staticCall(5063, CpsDefaultGroovyMethods.class, "groupAnswer", b.localVariable("answer"), b.localVariable("entry"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap> groupBy(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "groupBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupBy", self, closure))) { + return DefaultGroovyMethods.groupBy(self, closure); + } + Builder b = new Builder(loc("groupBy")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5090, Map.class, "initial", b.staticCall(5090, CpsDefaultGroovyMethods.class, "groupEntriesBy", b.localVariable("self"), b.localVariable("closure"))), b.declareVariable(5091, Map.class, "answer", b.new_(5091, LinkedHashMap.class)), b.forInLoop(5092, null, java.util.Map.Entry.class, "outer", b.functionCall(5092, b.localVariable("initial"), "entrySet"), b.block(b.declareVariable(5093, Object.class, "key", b.functionCall(5093, b.localVariable("outer"), "getKey")), b.declareVariable(5094, List.class, "entries", b.functionCall(5094, b.localVariable("outer"), "getValue")), b.declareVariable(5095, Map.class, "target", b.functionCall(5095, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarMap", b.localVariable("self"))), b.staticCall(5096, CpsDefaultGroovyMethods.class, "putAll", b.localVariable("target"), b.localVariable("entries")), b.functionCall(5097, b.localVariable("answer"), "put", b.localVariable("key"), b.localVariable("target")))), b.return_(b.localVariable("answer")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap countBy(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { + return DefaultGroovyMethods.countBy(self, closure); + } + Builder b = new Builder(loc("countBy")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5190, Map.class, "answer", b.new_(5190, LinkedHashMap.class)), b.forInLoop(5191, null, Object.class, "entry", b.functionCall(5191, b.localVariable("self"), "entrySet"), b.block(b.staticCall(5192, CpsDefaultGroovyMethods.class, "countAnswer", b.localVariable("answer"), b.staticCall(5192, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("closure"), b.cast(5192, b.localVariable("entry"), java.util.Map.Entry.class, false))))), b.return_(b.localVariable("answer")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject inject(Collection self, Closure closure) { + if ((!Caller.isAsynchronous(self, "inject", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, closure))) { + return DefaultGroovyMethods.inject(self, closure); + } + Builder b = new Builder(loc("inject")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.if_(b.functionCall(5269, b.localVariable("self"), "isEmpty"), b.block(b.throw_(5270, b.new_(5270, NoSuchElementException.class, b.constant("Cannot call inject() on an empty collection without passing an initial value."))))), b.declareVariable(5272, Iterator.class, "iter", b.functionCall(5272, b.localVariable("self"), "iterator")), b.declareVariable(5273, Object.class, "head", b.functionCall(5273, b.localVariable("iter"), "next")), b.declareVariable(5274, Collection.class, "tail", b.staticCall(5274, CpsDefaultGroovyMethods.class, "tail", b.localVariable("self"))), b.if_(b.not(5275, b.functionCall(5275, b.functionCall(5275, b.localVariable("tail"), "iterator"), "hasNext")), b.block(b.return_(b.localVariable("head")))), b.return_(b.cast(5279, b.staticCall(5279, CpsDefaultGroovyMethods.class, "inject", b.cast(5279, b.localVariable("tail"), Collection.class, false), b.localVariable("head"), b.localVariable("closure")), Object.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject inject(Collection self, Object initialValue, Closure closure) { + if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { + return DefaultGroovyMethods.inject(self, initialValue, closure); + } + Builder b = new Builder(loc("inject")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.cast(5324, b.staticCall(5324, CpsDefaultGroovyMethods.class, "inject", b.cast(5324, b.functionCall(5324, b.localVariable("self"), "iterator"), Iterator.class, false), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); + throw new CpsCallableInvocation(f, null, self, initialValue, closure); + } + + public staticObject inject(Map self, Object initialValue, Closure closure) { + if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { + return DefaultGroovyMethods.inject(self, initialValue, closure); + } + Builder b = new Builder(loc("inject")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5350, Object.class, "value", b.localVariable("initialValue")), b.forInLoop(5351, null, java.util.Map.Entry.class, "entry", b.functionCall(5351, b.localVariable("self"), "entrySet"), b.block(b.if_(b.compareEqual(5352, b.functionCall(5352, b.localVariable("closure"), "getMaximumNumberOfParameters"), b.constant(3)), b.block(b.assign(5353, b.localVariable("value"), b.functionCall(5353, b.localVariable("closure"), "call", b.localVariable("value"), b.functionCall(5353, b.localVariable("entry"), "getKey"), b.functionCall(5353, b.localVariable("entry"), "getValue")))), b.block(b.assign(5355, b.localVariable("value"), b.functionCall(5355, b.localVariable("closure"), "call", b.localVariable("value"), b.localVariable("entry"))))))), b.return_(b.localVariable("value")))); + throw new CpsCallableInvocation(f, null, self, initialValue, closure); + } + + public staticObject inject(Iterator self, Object initialValue, Closure closure) { + if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { + return DefaultGroovyMethods.inject(self, initialValue, closure); + } + Builder b = new Builder(loc("inject")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5377, Object.class, "value", b.localVariable("initialValue")), b.declareVariable(5378, Object[].class, "params", b.newArray(5378, Object.class, b.constant(2))), b.while_(null, b.functionCall(5379, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(5380, Object.class, "item", b.functionCall(5380, b.localVariable("self"), "next")), b.assign(5381, b.array(5381, b.localVariable("params"), b.constant(0)), b.localVariable("value")), b.assign(5382, b.array(5382, b.localVariable("params"), b.constant(1)), b.localVariable("item")), b.assign(5383, b.localVariable("value"), b.functionCall(5383, b.localVariable("closure"), "call", b.localVariable("params"))))), b.return_(b.localVariable("value")))); + throw new CpsCallableInvocation(f, null, self, initialValue, closure); + } + + public staticObject inject(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "inject", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, closure))) { + return DefaultGroovyMethods.inject(self, closure); + } + Builder b = new Builder(loc("inject")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5403, Iterator.class, "iter", b.functionCall(5403, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.if_(b.not(5404, b.functionCall(5404, b.localVariable("iter"), "hasNext")), b.block(b.throw_(5405, b.new_(5405, NoSuchElementException.class, b.constant("Cannot call inject() over an empty iterable without passing an initial value."))))), b.declareVariable(5407, Object.class, "initialValue", b.functionCall(5407, b.localVariable("iter"), "next")), b.return_(b.cast(5408, b.staticCall(5408, CpsDefaultGroovyMethods.class, "inject", b.localVariable("iter"), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject inject(Object self, Object initialValue, Closure closure) { + if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { + return DefaultGroovyMethods.inject(self, initialValue, closure); + } + Builder b = new Builder(loc("inject")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5426, Iterator.class, "iter", b.functionCall(5426, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.return_(b.cast(5427, b.staticCall(5427, CpsDefaultGroovyMethods.class, "inject", b.localVariable("iter"), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); + throw new CpsCallableInvocation(f, null, self, initialValue, closure); + } + + public staticObject inject(Object[] self, Closure closure) { + if ((!Caller.isAsynchronous(self, "inject", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, closure))) { + return DefaultGroovyMethods.inject(self, closure); + } + Builder b = new Builder(loc("inject")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5443, CpsDefaultGroovyMethods.class, "inject", b.cast(5443, b.localVariable("self"), Object.class, false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject inject(Object[] self, Object initialValue, Closure closure) { + if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { + return DefaultGroovyMethods.inject(self, initialValue, closure); + } + Builder b = new Builder(loc("inject")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5461, Object[].class, "params", b.newArray(5461, Object.class, b.constant(2))), b.declareVariable(5462, Object.class, "value", b.localVariable("initialValue")), b.forInLoop(5463, null, Object.class, "next", b.localVariable("self"), b.block(b.assign(5464, b.array(5464, b.localVariable("params"), b.constant(0)), b.localVariable("value")), b.assign(5465, b.array(5465, b.localVariable("params"), b.constant(1)), b.localVariable("next")), b.assign(5466, b.localVariable("value"), b.functionCall(5466, b.localVariable("closure"), "call", b.localVariable("params"))))), b.return_(b.localVariable("value")))); + throw new CpsCallableInvocation(f, null, self, initialValue, closure); + } + + public static Object sum(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "sum", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, closure))) { + return DefaultGroovyMethods.sum(self, closure); + } + Builder b = new Builder(loc("sum")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5813, CpsDefaultGroovyMethods.class, "sum", b.localVariable("self"), b.constant(null), b.localVariable("closure"), b.constant(true))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static Object sum(Object[] self, Closure closure) { + if ((!Caller.isAsynchronous(self, "sum", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, closure))) { + return DefaultGroovyMethods.sum(self, closure); + } + Builder b = new Builder(loc("sum")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5828, CpsDefaultGroovyMethods.class, "sum", b.staticCall(5828, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), b.constant(null), b.localVariable("closure"), b.constant(true))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static Object sum(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "sum", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, closure))) { + return DefaultGroovyMethods.sum(self, closure); + } + Builder b = new Builder(loc("sum")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5844, CpsDefaultGroovyMethods.class, "sum", b.staticCall(5844, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), b.constant(null), b.localVariable("closure"), b.constant(true))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static Object sum(Iterable self, Object initialValue, Closure closure) { + if ((!Caller.isAsynchronous(self, "sum", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, initialValue, closure))) { + return DefaultGroovyMethods.sum(self, initialValue, closure); + } + Builder b = new Builder(loc("sum")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5871, CpsDefaultGroovyMethods.class, "sum", b.localVariable("self"), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); + throw new CpsCallableInvocation(f, null, self, initialValue, closure); + } + + public static Object sum(Object[] self, Object initialValue, Closure closure) { + if ((!Caller.isAsynchronous(self, "sum", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, initialValue, closure))) { + return DefaultGroovyMethods.sum(self, initialValue, closure); + } + Builder b = new Builder(loc("sum")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5887, CpsDefaultGroovyMethods.class, "sum", b.staticCall(5887, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); + throw new CpsCallableInvocation(f, null, self, initialValue, closure); + } + + public static Object sum(Iterator self, Object initialValue, Closure closure) { + if ((!Caller.isAsynchronous(self, "sum", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, initialValue, closure))) { + return DefaultGroovyMethods.sum(self, initialValue, closure); + } + Builder b = new Builder(loc("sum")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5904, CpsDefaultGroovyMethods.class, "sum", b.staticCall(5904, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); + throw new CpsCallableInvocation(f, null, self, initialValue, closure); + } + + public staticObject min(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { + return DefaultGroovyMethods.min(self, closure); + } + Builder b = new Builder(loc("min")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(6370, int.class, "params", b.functionCall(6370, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareNotEqual(6371, b.localVariable("params"), b.constant(1)), b.block(b.return_(b.staticCall(6372, CpsDefaultGroovyMethods.class, "min", b.localVariable("self"), b.new_(6372, ClosureComparator.class, b.localVariable("closure")))))), b.declareVariable(6374, int.class, "first", b.constant(true)), b.declareVariable(6375, Object.class, "answer", b.constant(null)), b.declareVariable(6376, Object.class, "answerValue", b.constant(null)), b.forInLoop(6377, null, Object.class, "item", b.localVariable("self"), b.block(b.declareVariable(6378, Object.class, "value", b.functionCall(6378, b.localVariable("closure"), "call", b.localVariable("item"))), b.if_(b.localVariable("first"), b.block(b.assign(6380, b.localVariable("first"), b.constant(false)), b.assign(6381, b.localVariable("answer"), b.localVariable("item")), b.assign(6382, b.localVariable("answerValue"), b.localVariable("value"))), b.if_(b.functionCall(6383, b.constant(ScriptBytecodeAdapter.class), "compareLessThan", b.localVariable("value"), b.localVariable("answerValue")), b.block(b.assign(6384, b.localVariable("answer"), b.localVariable("item")), b.assign(6385, b.localVariable("answerValue"), b.localVariable("value"))))))), b.return_(b.localVariable("answer")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticjava.util.Map.Entry min(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { + return DefaultGroovyMethods.min(self, closure); + } + Builder b = new Builder(loc("min")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6426, CpsDefaultGroovyMethods.class, "min", b.cast(6426, b.functionCall(6426, b.localVariable("self"), "entrySet"), Iterable.class, false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticjava.util.Map.Entry max(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { + return DefaultGroovyMethods.max(self, closure); + } + Builder b = new Builder(loc("max")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6464, CpsDefaultGroovyMethods.class, "max", b.cast(6464, b.functionCall(6464, b.localVariable("self"), "entrySet"), Iterable.class, false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject min(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { + return DefaultGroovyMethods.min(self, closure); + } + Builder b = new Builder(loc("min")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6489, CpsDefaultGroovyMethods.class, "min", b.cast(6489, b.staticCall(6489, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject min(Object[] self, Closure closure) { + if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { + return DefaultGroovyMethods.min(self, closure); + } + Builder b = new Builder(loc("min")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6512, CpsDefaultGroovyMethods.class, "min", b.cast(6512, b.staticCall(6512, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject max(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { + return DefaultGroovyMethods.max(self, closure); + } + Builder b = new Builder(loc("max")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(6603, int.class, "params", b.functionCall(6603, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareNotEqual(6604, b.localVariable("params"), b.constant(1)), b.block(b.return_(b.staticCall(6605, CpsDefaultGroovyMethods.class, "max", b.localVariable("self"), b.new_(6605, ClosureComparator.class, b.localVariable("closure")))))), b.declareVariable(6607, int.class, "first", b.constant(true)), b.declareVariable(6608, Object.class, "answer", b.constant(null)), b.declareVariable(6609, Object.class, "answerValue", b.constant(null)), b.forInLoop(6610, null, Object.class, "item", b.localVariable("self"), b.block(b.declareVariable(6611, Object.class, "value", b.functionCall(6611, b.localVariable("closure"), "call", b.localVariable("item"))), b.if_(b.localVariable("first"), b.block(b.assign(6613, b.localVariable("first"), b.constant(false)), b.assign(6614, b.localVariable("answer"), b.localVariable("item")), b.assign(6615, b.localVariable("answerValue"), b.localVariable("value"))), b.if_(b.functionCall(6616, b.constant(ScriptBytecodeAdapter.class), "compareLessThan", b.localVariable("answerValue"), b.localVariable("value")), b.block(b.assign(6617, b.localVariable("answer"), b.localVariable("item")), b.assign(6618, b.localVariable("answerValue"), b.localVariable("value"))))))), b.return_(b.localVariable("answer")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject max(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { + return DefaultGroovyMethods.max(self, closure); + } + Builder b = new Builder(loc("max")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6645, CpsDefaultGroovyMethods.class, "max", b.cast(6645, b.staticCall(6645, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject max(Object[] self, Closure closure) { + if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { + return DefaultGroovyMethods.max(self, closure); + } + Builder b = new Builder(loc("max")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6668, CpsDefaultGroovyMethods.class, "max", b.cast(6668, b.staticCall(6668, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticMap withDefault(Map self, Closure init) { + if ((!Caller.isAsynchronous(self, "withDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withDefault", self, init))) { + return DefaultGroovyMethods.withDefault(self, init); + } + Builder b = new Builder(loc("withDefault")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.functionCall(7750, b.constant(MapWithDefault.class), "newInstance", b.localVariable("self"), b.localVariable("init"))))); + throw new CpsCallableInvocation(f, null, self, init); + } + + public staticList withDefault(List self, Closure init) { + if ((!Caller.isAsynchronous(self, "withDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withDefault", self, init))) { + return DefaultGroovyMethods.withDefault(self, init); + } + Builder b = new Builder(loc("withDefault")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.staticCall(7765, CpsDefaultGroovyMethods.class, "withLazyDefault", b.localVariable("self"), b.localVariable("init"))))); + throw new CpsCallableInvocation(f, null, self, init); + } + + public staticList withLazyDefault(List self, Closure init) { + if ((!Caller.isAsynchronous(self, "withLazyDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withLazyDefault", self, init))) { + return DefaultGroovyMethods.withLazyDefault(self, init); + } + Builder b = new Builder(loc("withLazyDefault")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.functionCall(7811, b.constant(ListWithDefault.class), "newInstance", b.localVariable("self"), b.constant(true), b.localVariable("init"))))); + throw new CpsCallableInvocation(f, null, self, init); + } + + public staticList withEagerDefault(List self, Closure init) { + if ((!Caller.isAsynchronous(self, "withEagerDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withEagerDefault", self, init))) { + return DefaultGroovyMethods.withEagerDefault(self, init); + } + Builder b = new Builder(loc("withEagerDefault")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.functionCall(7851, b.constant(ListWithDefault.class), "newInstance", b.localVariable("self"), b.constant(false), b.localVariable("init"))))); + throw new CpsCallableInvocation(f, null, self, init); + } + + public staticMap sort(Map self, Closure closure) { + if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { + return DefaultGroovyMethods.sort(self, closure); + } + Builder b = new Builder(loc("sort")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8129, Map.class, "result", b.new_(8129, LinkedHashMap.class)), b.declareVariable(8130, List.class, "entries", b.staticCall(8130, CpsDefaultGroovyMethods.class, "asList", b.cast(8130, b.functionCall(8130, b.localVariable("self"), "entrySet"), Iterable.class, false))), b.staticCall(8131, CpsDefaultGroovyMethods.class, "sort", b.cast(8131, b.localVariable("entries"), Iterable.class, false), b.localVariable("closure")), b.forInLoop(8132, null, java.util.Map.Entry.class, "entry", b.localVariable("entries"), b.block(b.functionCall(8133, b.localVariable("result"), "put", b.functionCall(8133, b.localVariable("entry"), "getKey"), b.functionCall(8133, b.localVariable("entry"), "getValue")))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticIterator sort(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { + return DefaultGroovyMethods.sort(self, closure); + } + Builder b = new Builder(loc("sort")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.functionCall(8338, b.staticCall(8338, CpsDefaultGroovyMethods.class, "sort", b.cast(8338, b.staticCall(8338, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure")), "listIterator")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject[] sort(Object[] self, Closure closure) { + if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { + return DefaultGroovyMethods.sort(self, closure); + } + Builder b = new Builder(loc("sort")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(8358, CpsDefaultGroovyMethods.class, "sort", b.localVariable("self"), b.constant(false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject[] sort(Object[] self, boolean mutate, Closure closure) { + if ((!Caller.isAsynchronous(self, "sort", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, mutate, closure))) { + return DefaultGroovyMethods.sort(self, mutate, closure); + } + Builder b = new Builder(loc("sort")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(8388, Object[].class, "answer", b.cast(8388, b.functionCall(8388, b.staticCall(8388, CpsDefaultGroovyMethods.class, "sort", b.cast(8388, b.staticCall(8388, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure")), "toArray"), Object[].class, false)), b.if_(b.localVariable("mutate"), b.block(b.functionCall(8390, b.constant(System.class), "arraycopy", b.localVariable("answer"), b.constant(0), b.localVariable("self"), b.constant(0), b.property(8390, b.localVariable("answer"), "length")))), b.return_(b.ternaryOp(b.localVariable("mutate"), b.localVariable("self"), b.localVariable("answer"))))); + throw new CpsCallableInvocation(f, null, self, mutate, closure); + } + + public staticList sort(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { + return DefaultGroovyMethods.sort(self, closure); + } + Builder b = new Builder(loc("sort")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(8438, CpsDefaultGroovyMethods.class, "sort", b.localVariable("self"), b.constant(true), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticList sort(Iterable self, boolean mutate, Closure closure) { + if ((!Caller.isAsynchronous(self, "sort", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, mutate, closure))) { + return DefaultGroovyMethods.sort(self, mutate, closure); + } + Builder b = new Builder(loc("sort")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(8470, List.class, "list", b.ternaryOp(b.localVariable("mutate"), b.staticCall(8470, CpsDefaultGroovyMethods.class, "asList", b.localVariable("self")), b.staticCall(8470, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")))), b.declareVariable(8472, int.class, "params", b.functionCall(8472, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareEqual(8473, b.localVariable("params"), b.constant(1)), b.block(b.functionCall(8474, b.constant(Collections.class), "sort", b.localVariable("list"), b.new_(8474, OrderBy.class, b.localVariable("closure")))), b.block(b.functionCall(8476, b.constant(Collections.class), "sort", b.localVariable("list"), b.new_(8476, ClosureComparator.class, b.localVariable("closure"))))), b.return_(b.localVariable("list")))); + throw new CpsCallableInvocation(f, null, self, mutate, closure); + } + + public staticList toSorted(Iterable self, Closure closure) { + if ((!Caller.isAsynchronous(self, "toSorted", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, closure))) { + return DefaultGroovyMethods.toSorted(self, closure); + } + Builder b = new Builder(loc("toSorted")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8568, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8568, b.functionCall(8568, b.localVariable("closure"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8568, OrderBy.class, b.localVariable("closure")), b.new_(8568, ClosureComparator.class, b.localVariable("closure")))), b.return_(b.staticCall(8569, CpsDefaultGroovyMethods.class, "toSorted", b.localVariable("self"), b.localVariable("comparator"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticIterator toSorted(Iterator self, Closure closure) { + if ((!Caller.isAsynchronous(self, "toSorted", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, closure))) { + return DefaultGroovyMethods.toSorted(self, closure); + } + Builder b = new Builder(loc("toSorted")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8620, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8620, b.functionCall(8620, b.localVariable("closure"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8620, OrderBy.class, b.localVariable("closure")), b.new_(8620, ClosureComparator.class, b.localVariable("closure")))), b.return_(b.staticCall(8621, CpsDefaultGroovyMethods.class, "toSorted", b.localVariable("self"), b.localVariable("comparator"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public staticObject[] toSorted(Object[] self, Closure condition) { + if ((!Caller.isAsynchronous(self, "toSorted", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, condition))) { + return DefaultGroovyMethods.toSorted(self, condition); + } + Builder b = new Builder(loc("toSorted")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(8674, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8674, b.functionCall(8674, b.localVariable("condition"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8674, OrderBy.class, b.localVariable("condition")), b.new_(8674, ClosureComparator.class, b.localVariable("condition")))), b.return_(b.staticCall(8675, CpsDefaultGroovyMethods.class, "toSorted", b.localVariable("self"), b.localVariable("comparator"))))); + throw new CpsCallableInvocation(f, null, self, condition); + } + + public staticMap toSorted(Map self, Closure condition) { + if ((!Caller.isAsynchronous(self, "toSorted", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, condition))) { + return DefaultGroovyMethods.toSorted(self, condition); + } + Builder b = new Builder(loc("toSorted")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(8751, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8751, b.functionCall(8751, b.localVariable("condition"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8751, OrderBy.class, b.localVariable("condition")), b.new_(8751, ClosureComparator.class, b.localVariable("condition")))), b.return_(b.staticCall(8752, CpsDefaultGroovyMethods.class, "toSorted", b.localVariable("self"), b.localVariable("comparator"))))); + throw new CpsCallableInvocation(f, null, self, condition); + } + + public staticCollection flatten(Iterable self, Closure flattenUsing) { + if ((!Caller.isAsynchronous(self, "flatten", flattenUsing))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "flatten", self, flattenUsing))) { + return DefaultGroovyMethods.flatten(self, flattenUsing); + } + Builder b = new Builder(loc("flatten")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "flattenUsing"), b.block(b.return_(b.staticCall(12163, CpsDefaultGroovyMethods.class, "flatten", b.localVariable("self"), b.functionCall(12163, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self")), b.localVariable("flattenUsing"))))); + throw new CpsCallableInvocation(f, null, self, flattenUsing); + } + + public static void times(Number self, Closure closure) { + if ((!Caller.isAsynchronous(self, "times", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "times", self, closure))) { + DefaultGroovyMethods.times(self, closure); + return ; + } + Builder b = new Builder(loc("times")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forLoop(null, b.sequence(b.declareVariable(14342, int.class, "i", b.constant(0)), b.declareVariable(14342, int.class, "size", b.functionCall(14342, b.localVariable("self"), "intValue"))), b.lessThan(14342, b.localVariable("i"), b.localVariable("size")), b.sequence(b.postfixInc(14342, b.localVariable("i"))), b.block(b.functionCall(14343, b.localVariable("closure"), "call", b.localVariable("i")), b.if_(b.compareEqual(14344, b.functionCall(14344, b.localVariable("closure"), "getDirective"), b.property(14344, b.constant(Closure.class), "DONE")), b.block(b.break_(null))))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static void upto(Number self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { + DefaultGroovyMethods.upto(self, to, closure); + return ; + } + Builder b = new Builder(loc("upto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14360, int.class, "self1", b.functionCall(14360, b.localVariable("self"), "intValue")), b.declareVariable(14361, int.class, "to1", b.functionCall(14361, b.localVariable("to"), "intValue")), b.if_(b.lessThanEqual(14362, b.localVariable("self1"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14363, int.class, "i", b.localVariable("self1"))), b.lessThanEqual(14363, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14363, b.localVariable("i"))), b.block(b.functionCall(14364, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14367, b.new_(14367, GroovyRuntimeException.class, b.plus(14367, b.plus(14367, b.plus(14367, b.plus(14367, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void upto(long self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { + DefaultGroovyMethods.upto(self, to, closure); + return ; + } + Builder b = new Builder(loc("upto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14381, long.class, "to1", b.functionCall(14381, b.localVariable("to"), "longValue")), b.if_(b.lessThanEqual(14382, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14383, long.class, "i", b.localVariable("self"))), b.lessThanEqual(14383, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14383, b.localVariable("i"))), b.block(b.functionCall(14384, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14387, b.new_(14387, GroovyRuntimeException.class, b.plus(14387, b.plus(14387, b.plus(14387, b.plus(14387, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void upto(Long self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { + DefaultGroovyMethods.upto(self, to, closure); + return ; + } + Builder b = new Builder(loc("upto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14401, long.class, "to1", b.functionCall(14401, b.localVariable("to"), "longValue")), b.if_(b.lessThanEqual(14402, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14403, long.class, "i", b.localVariable("self"))), b.lessThanEqual(14403, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14403, b.localVariable("i"))), b.block(b.functionCall(14404, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14407, b.new_(14407, GroovyRuntimeException.class, b.plus(14407, b.plus(14407, b.plus(14407, b.plus(14407, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void upto(float self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { + DefaultGroovyMethods.upto(self, to, closure); + return ; + } + Builder b = new Builder(loc("upto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14421, float.class, "to1", b.functionCall(14421, b.localVariable("to"), "floatValue")), b.if_(b.lessThanEqual(14422, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14423, float.class, "i", b.localVariable("self"))), b.lessThanEqual(14423, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14423, b.localVariable("i"))), b.block(b.functionCall(14424, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14427, b.new_(14427, GroovyRuntimeException.class, b.plus(14427, b.plus(14427, b.plus(14427, b.plus(14427, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void upto(Float self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { + DefaultGroovyMethods.upto(self, to, closure); + return ; + } + Builder b = new Builder(loc("upto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14441, float.class, "to1", b.functionCall(14441, b.localVariable("to"), "floatValue")), b.if_(b.lessThanEqual(14442, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14443, float.class, "i", b.localVariable("self"))), b.lessThanEqual(14443, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14443, b.localVariable("i"))), b.block(b.functionCall(14444, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14447, b.new_(14447, GroovyRuntimeException.class, b.plus(14447, b.plus(14447, b.plus(14447, b.plus(14447, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void upto(double self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { + DefaultGroovyMethods.upto(self, to, closure); + return ; + } + Builder b = new Builder(loc("upto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14461, double.class, "to1", b.functionCall(14461, b.localVariable("to"), "doubleValue")), b.if_(b.lessThanEqual(14462, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14463, double.class, "i", b.localVariable("self"))), b.lessThanEqual(14463, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14463, b.localVariable("i"))), b.block(b.functionCall(14464, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14467, b.new_(14467, GroovyRuntimeException.class, b.plus(14467, b.plus(14467, b.plus(14467, b.plus(14467, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void upto(Double self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { + DefaultGroovyMethods.upto(self, to, closure); + return ; + } + Builder b = new Builder(loc("upto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14481, double.class, "to1", b.functionCall(14481, b.localVariable("to"), "doubleValue")), b.if_(b.lessThanEqual(14482, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14483, double.class, "i", b.localVariable("self"))), b.lessThanEqual(14483, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14483, b.localVariable("i"))), b.block(b.functionCall(14484, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14487, b.new_(14487, GroovyRuntimeException.class, b.plus(14487, b.plus(14487, b.plus(14487, b.plus(14487, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void upto(BigInteger self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { + DefaultGroovyMethods.upto(self, to, closure); + return ; + } + Builder b = new Builder(loc("upto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.if_(b.instanceOf(14505, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14506, BigDecimal.class, "one", b.functionCall(14506, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.declareVariable(14507, BigDecimal.class, "self1", b.new_(14507, BigDecimal.class, b.localVariable("self"))), b.declareVariable(14508, BigDecimal.class, "to1", b.cast(14508, b.localVariable("to"), BigDecimal.class, false)), b.if_(b.lessThanEqual(14509, b.functionCall(14509, b.localVariable("self1"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14510, BigDecimal.class, "i", b.localVariable("self1"))), b.lessThanEqual(14510, b.functionCall(14510, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14510, b.localVariable("i"), b.functionCall(14510, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14511, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14514, b.new_(14514, GroovyRuntimeException.class, b.functionCall(14515, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to upto() cannot be less than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.if_(b.instanceOf(14518, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14519, BigInteger.class, "one", b.functionCall(14519, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14520, BigInteger.class, "to1", b.cast(14520, b.localVariable("to"), BigInteger.class, false)), b.if_(b.lessThanEqual(14521, b.functionCall(14521, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14522, BigInteger.class, "i", b.localVariable("self"))), b.lessThanEqual(14522, b.functionCall(14522, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14522, b.localVariable("i"), b.functionCall(14522, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14523, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14526, b.new_(14526, GroovyRuntimeException.class, b.functionCall(14527, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to upto() cannot be less than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.block(b.declareVariable(14530, BigInteger.class, "one", b.functionCall(14530, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14531, BigInteger.class, "to1", b.new_(14531, BigInteger.class, b.functionCall(14531, b.localVariable("to"), "toString"))), b.if_(b.lessThanEqual(14532, b.functionCall(14532, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14533, BigInteger.class, "i", b.localVariable("self"))), b.lessThanEqual(14533, b.functionCall(14533, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14533, b.localVariable("i"), b.functionCall(14533, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14534, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14537, b.new_(14537, GroovyRuntimeException.class, b.functionCall(14537, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to upto() cannot be less than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void upto(BigDecimal self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { + DefaultGroovyMethods.upto(self, to, closure); + return ; + } + Builder b = new Builder(loc("upto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14557, BigDecimal.class, "one", b.functionCall(14557, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.if_(b.instanceOf(14558, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14559, BigDecimal.class, "to1", b.cast(14559, b.localVariable("to"), BigDecimal.class, false)), b.if_(b.lessThanEqual(14560, b.functionCall(14560, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14561, BigDecimal.class, "i", b.localVariable("self"))), b.lessThanEqual(14561, b.functionCall(14561, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14561, b.localVariable("i"), b.functionCall(14561, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14562, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14565, b.new_(14565, GroovyRuntimeException.class, b.plus(14565, b.plus(14565, b.plus(14565, b.plus(14565, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.if_(b.instanceOf(14567, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14568, BigDecimal.class, "to1", b.new_(14568, BigDecimal.class, b.cast(14568, b.localVariable("to"), BigInteger.class, false))), b.if_(b.lessThanEqual(14569, b.functionCall(14569, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14570, BigDecimal.class, "i", b.localVariable("self"))), b.lessThanEqual(14570, b.functionCall(14570, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14570, b.localVariable("i"), b.functionCall(14570, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14571, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14574, b.new_(14574, GroovyRuntimeException.class, b.plus(14574, b.plus(14574, b.plus(14574, b.plus(14574, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.block(b.declareVariable(14577, BigDecimal.class, "to1", b.new_(14577, BigDecimal.class, b.functionCall(14577, b.localVariable("to"), "toString"))), b.if_(b.lessThanEqual(14578, b.functionCall(14578, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14579, BigDecimal.class, "i", b.localVariable("self"))), b.lessThanEqual(14579, b.functionCall(14579, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14579, b.localVariable("i"), b.functionCall(14579, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14580, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14583, b.new_(14583, GroovyRuntimeException.class, b.plus(14583, b.plus(14583, b.plus(14583, b.plus(14583, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void downto(Number self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { + DefaultGroovyMethods.downto(self, to, closure); + return ; + } + Builder b = new Builder(loc("downto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14598, int.class, "self1", b.functionCall(14598, b.localVariable("self"), "intValue")), b.declareVariable(14599, int.class, "to1", b.functionCall(14599, b.localVariable("to"), "intValue")), b.if_(b.greaterThanEqual(14600, b.localVariable("self1"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14601, int.class, "i", b.localVariable("self1"))), b.greaterThanEqual(14601, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14601, b.localVariable("i"))), b.block(b.functionCall(14602, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14605, b.new_(14605, GroovyRuntimeException.class, b.plus(14605, b.plus(14605, b.plus(14605, b.plus(14605, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void downto(long self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { + DefaultGroovyMethods.downto(self, to, closure); + return ; + } + Builder b = new Builder(loc("downto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14619, long.class, "to1", b.functionCall(14619, b.localVariable("to"), "longValue")), b.if_(b.greaterThanEqual(14620, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14621, long.class, "i", b.localVariable("self"))), b.greaterThanEqual(14621, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14621, b.localVariable("i"))), b.block(b.functionCall(14622, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14625, b.new_(14625, GroovyRuntimeException.class, b.plus(14625, b.plus(14625, b.plus(14625, b.plus(14625, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void downto(Long self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { + DefaultGroovyMethods.downto(self, to, closure); + return ; + } + Builder b = new Builder(loc("downto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14639, long.class, "to1", b.functionCall(14639, b.localVariable("to"), "longValue")), b.if_(b.greaterThanEqual(14640, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14641, long.class, "i", b.localVariable("self"))), b.greaterThanEqual(14641, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14641, b.localVariable("i"))), b.block(b.functionCall(14642, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14645, b.new_(14645, GroovyRuntimeException.class, b.plus(14645, b.plus(14645, b.plus(14645, b.plus(14645, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void downto(float self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { + DefaultGroovyMethods.downto(self, to, closure); + return ; + } + Builder b = new Builder(loc("downto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14659, float.class, "to1", b.functionCall(14659, b.localVariable("to"), "floatValue")), b.if_(b.greaterThanEqual(14660, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14661, float.class, "i", b.localVariable("self"))), b.greaterThanEqual(14661, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14661, b.localVariable("i"))), b.block(b.functionCall(14662, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14665, b.new_(14665, GroovyRuntimeException.class, b.plus(14665, b.plus(14665, b.plus(14665, b.plus(14665, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void downto(Float self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { + DefaultGroovyMethods.downto(self, to, closure); + return ; + } + Builder b = new Builder(loc("downto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14678, float.class, "to1", b.functionCall(14678, b.localVariable("to"), "floatValue")), b.if_(b.greaterThanEqual(14679, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14680, float.class, "i", b.localVariable("self"))), b.greaterThanEqual(14680, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14680, b.localVariable("i"))), b.block(b.functionCall(14681, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14684, b.new_(14684, GroovyRuntimeException.class, b.plus(14684, b.plus(14684, b.plus(14684, b.plus(14684, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void downto(double self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { + DefaultGroovyMethods.downto(self, to, closure); + return ; + } + Builder b = new Builder(loc("downto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14697, double.class, "to1", b.functionCall(14697, b.localVariable("to"), "doubleValue")), b.if_(b.greaterThanEqual(14698, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14699, double.class, "i", b.localVariable("self"))), b.greaterThanEqual(14699, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14699, b.localVariable("i"))), b.block(b.functionCall(14700, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14703, b.new_(14703, GroovyRuntimeException.class, b.plus(14703, b.plus(14703, b.plus(14703, b.plus(14703, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void downto(Double self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { + DefaultGroovyMethods.downto(self, to, closure); + return ; + } + Builder b = new Builder(loc("downto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14716, double.class, "to1", b.functionCall(14716, b.localVariable("to"), "doubleValue")), b.if_(b.greaterThanEqual(14717, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14718, double.class, "i", b.localVariable("self"))), b.greaterThanEqual(14718, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14718, b.localVariable("i"))), b.block(b.functionCall(14719, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14722, b.new_(14722, GroovyRuntimeException.class, b.plus(14722, b.plus(14722, b.plus(14722, b.plus(14722, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void downto(BigInteger self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { + DefaultGroovyMethods.downto(self, to, closure); + return ; + } + Builder b = new Builder(loc("downto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.if_(b.instanceOf(14735, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14736, BigDecimal.class, "one", b.functionCall(14736, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.declareVariable(14737, BigDecimal.class, "to1", b.cast(14737, b.localVariable("to"), BigDecimal.class, false)), b.declareVariable(14738, BigDecimal.class, "selfD", b.new_(14738, BigDecimal.class, b.localVariable("self"))), b.if_(b.greaterThanEqual(14739, b.functionCall(14739, b.localVariable("selfD"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14740, BigDecimal.class, "i", b.localVariable("selfD"))), b.greaterThanEqual(14740, b.functionCall(14740, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14740, b.localVariable("i"), b.functionCall(14740, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14741, b.localVariable("closure"), "call", b.functionCall(14741, b.localVariable("i"), "toBigInteger"))))), b.throw_(14744, b.new_(14744, GroovyRuntimeException.class, b.functionCall(14745, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to downto() cannot be greater than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.if_(b.instanceOf(14748, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14749, BigInteger.class, "one", b.functionCall(14749, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14750, BigInteger.class, "to1", b.cast(14750, b.localVariable("to"), BigInteger.class, false)), b.if_(b.greaterThanEqual(14751, b.functionCall(14751, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14752, BigInteger.class, "i", b.localVariable("self"))), b.greaterThanEqual(14752, b.functionCall(14752, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14752, b.localVariable("i"), b.functionCall(14752, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14753, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14756, b.new_(14756, GroovyRuntimeException.class, b.functionCall(14757, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to downto() cannot be greater than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.block(b.declareVariable(14761, BigInteger.class, "one", b.functionCall(14761, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14762, BigInteger.class, "to1", b.new_(14762, BigInteger.class, b.functionCall(14762, b.localVariable("to"), "toString"))), b.if_(b.greaterThanEqual(14763, b.functionCall(14763, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14764, BigInteger.class, "i", b.localVariable("self"))), b.greaterThanEqual(14764, b.functionCall(14764, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14764, b.localVariable("i"), b.functionCall(14764, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14765, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14768, b.new_(14768, GroovyRuntimeException.class, b.functionCall(14769, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to downto() cannot be greater than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void downto(BigDecimal self, Number to, Closure closure) { + if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { + DefaultGroovyMethods.downto(self, to, closure); + return ; + } + Builder b = new Builder(loc("downto")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14789, BigDecimal.class, "one", b.functionCall(14789, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.if_(b.instanceOf(14790, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14791, BigDecimal.class, "to1", b.cast(14791, b.localVariable("to"), BigDecimal.class, false)), b.if_(b.greaterThanEqual(14792, b.functionCall(14792, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14793, BigDecimal.class, "i", b.localVariable("self"))), b.greaterThanEqual(14793, b.functionCall(14793, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14793, b.localVariable("i"), b.functionCall(14793, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14794, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14797, b.new_(14797, GroovyRuntimeException.class, b.plus(14797, b.plus(14797, b.plus(14797, b.plus(14797, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.if_(b.instanceOf(14798, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14799, BigDecimal.class, "to1", b.new_(14799, BigDecimal.class, b.cast(14799, b.localVariable("to"), BigInteger.class, false))), b.if_(b.greaterThanEqual(14800, b.functionCall(14800, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14801, BigDecimal.class, "i", b.localVariable("self"))), b.greaterThanEqual(14801, b.functionCall(14801, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14801, b.localVariable("i"), b.functionCall(14801, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14802, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14805, b.new_(14805, GroovyRuntimeException.class, b.plus(14805, b.plus(14805, b.plus(14805, b.plus(14805, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.block(b.declareVariable(14807, BigDecimal.class, "to1", b.new_(14807, BigDecimal.class, b.functionCall(14807, b.localVariable("to"), "toString"))), b.if_(b.greaterThanEqual(14808, b.functionCall(14808, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14809, BigDecimal.class, "i", b.localVariable("self"))), b.greaterThanEqual(14809, b.functionCall(14809, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14809, b.localVariable("i"), b.functionCall(14809, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14810, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14813, b.new_(14813, GroovyRuntimeException.class, b.plus(14813, b.plus(14813, b.plus(14813, b.plus(14813, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))))))); + throw new CpsCallableInvocation(f, null, self, to, closure); + } + + public static void step(Number self, Number to, Number stepNumber, Closure closure) { + if ((!Caller.isAsynchronous(self, "step", to, stepNumber, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "step", self, to, stepNumber, closure))) { + DefaultGroovyMethods.step(self, to, stepNumber, closure); + return ; + } + Builder b = new Builder(loc("step")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "stepNumber", "closure"), b.block(b.if_(b.logicalOr(14832, b.logicalOr(14832, b.instanceOf(14832, b.localVariable("self"), b.constant(BigDecimal.class)), b.instanceOf(14832, b.localVariable("to"), b.constant(BigDecimal.class))), b.instanceOf(14832, b.localVariable("stepNumber"), b.constant(BigDecimal.class))), b.block(b.declareVariable(14833, BigDecimal.class, "zero", b.functionCall(14833, b.constant(BigDecimal.class), "valueOf", b.constant(0), b.constant(1))), b.declareVariable(14834, BigDecimal.class, "self1", b.ternaryOp(b.instanceOf(14834, b.localVariable("self"), b.constant(BigDecimal.class)), b.cast(14834, b.localVariable("self"), BigDecimal.class, false), b.new_(14834, BigDecimal.class, b.functionCall(14834, b.localVariable("self"), "toString")))), b.declareVariable(14835, BigDecimal.class, "to1", b.ternaryOp(b.instanceOf(14835, b.localVariable("to"), b.constant(BigDecimal.class)), b.cast(14835, b.localVariable("to"), BigDecimal.class, false), b.new_(14835, BigDecimal.class, b.functionCall(14835, b.localVariable("to"), "toString")))), b.declareVariable(14836, BigDecimal.class, "stepNumber1", b.ternaryOp(b.instanceOf(14836, b.localVariable("stepNumber"), b.constant(BigDecimal.class)), b.cast(14836, b.localVariable("stepNumber"), BigDecimal.class, false), b.new_(14836, BigDecimal.class, b.functionCall(14836, b.localVariable("stepNumber"), "toString")))), b.if_(b.logicalAnd(14837, b.greaterThan(14837, b.functionCall(14837, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.greaterThan(14837, b.functionCall(14837, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14838, BigDecimal.class, "i", b.localVariable("self1"))), b.lessThan(14838, b.functionCall(14838, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14838, b.localVariable("i"), b.functionCall(14838, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14839, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.logicalAnd(14841, b.lessThan(14841, b.functionCall(14841, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.lessThan(14841, b.functionCall(14841, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14842, BigDecimal.class, "i", b.localVariable("self1"))), b.greaterThan(14842, b.functionCall(14842, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14842, b.localVariable("i"), b.functionCall(14842, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14843, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.compareNotEqual(14845, b.functionCall(14845, b.localVariable("self1"), "compareTo", b.localVariable("to1")), b.constant(0)), b.throw_(14846, b.new_(14846, GroovyRuntimeException.class, b.plus(14846, b.plus(14846, b.plus(14846, b.plus(14846, b.plus(14846, b.plus(14846, b.constant("Infinite loop in "), b.localVariable("self1")), b.constant(".step(")), b.localVariable("to1")), b.constant(", ")), b.localVariable("stepNumber1")), b.constant(")")))))))), b.if_(b.logicalOr(14847, b.logicalOr(14847, b.instanceOf(14847, b.localVariable("self"), b.constant(BigInteger.class)), b.instanceOf(14847, b.localVariable("to"), b.constant(BigInteger.class))), b.instanceOf(14847, b.localVariable("stepNumber"), b.constant(BigInteger.class))), b.block(b.declareVariable(14848, BigInteger.class, "zero", b.functionCall(14848, b.constant(BigInteger.class), "valueOf", b.constant(0))), b.declareVariable(14849, BigInteger.class, "self1", b.ternaryOp(b.instanceOf(14849, b.localVariable("self"), b.constant(BigInteger.class)), b.cast(14849, b.localVariable("self"), BigInteger.class, false), b.new_(14849, BigInteger.class, b.functionCall(14849, b.localVariable("self"), "toString")))), b.declareVariable(14850, BigInteger.class, "to1", b.ternaryOp(b.instanceOf(14850, b.localVariable("to"), b.constant(BigInteger.class)), b.cast(14850, b.localVariable("to"), BigInteger.class, false), b.new_(14850, BigInteger.class, b.functionCall(14850, b.localVariable("to"), "toString")))), b.declareVariable(14851, BigInteger.class, "stepNumber1", b.ternaryOp(b.instanceOf(14851, b.localVariable("stepNumber"), b.constant(BigInteger.class)), b.cast(14851, b.localVariable("stepNumber"), BigInteger.class, false), b.new_(14851, BigInteger.class, b.functionCall(14851, b.localVariable("stepNumber"), "toString")))), b.if_(b.logicalAnd(14852, b.greaterThan(14852, b.functionCall(14852, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.greaterThan(14852, b.functionCall(14852, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14853, BigInteger.class, "i", b.localVariable("self1"))), b.lessThan(14853, b.functionCall(14853, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14853, b.localVariable("i"), b.functionCall(14853, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14854, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.logicalAnd(14856, b.lessThan(14856, b.functionCall(14856, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.lessThan(14856, b.functionCall(14856, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14857, BigInteger.class, "i", b.localVariable("self1"))), b.greaterThan(14857, b.functionCall(14857, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14857, b.localVariable("i"), b.functionCall(14857, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14858, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.compareNotEqual(14860, b.functionCall(14860, b.localVariable("self1"), "compareTo", b.localVariable("to1")), b.constant(0)), b.throw_(14861, b.new_(14861, GroovyRuntimeException.class, b.plus(14861, b.plus(14861, b.plus(14861, b.plus(14861, b.plus(14861, b.plus(14861, b.constant("Infinite loop in "), b.localVariable("self1")), b.constant(".step(")), b.localVariable("to1")), b.constant(", ")), b.localVariable("stepNumber1")), b.constant(")")))))))), b.block(b.declareVariable(14863, int.class, "self1", b.functionCall(14863, b.localVariable("self"), "intValue")), b.declareVariable(14864, int.class, "to1", b.functionCall(14864, b.localVariable("to"), "intValue")), b.declareVariable(14865, int.class, "stepNumber1", b.functionCall(14865, b.localVariable("stepNumber"), "intValue")), b.if_(b.logicalAnd(14866, b.greaterThan(14866, b.localVariable("stepNumber1"), b.constant(0)), b.greaterThan(14866, b.localVariable("to1"), b.localVariable("self1"))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14867, int.class, "i", b.localVariable("self1"))), b.lessThan(14867, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.plusEqual(14867, b.localVariable("i"), b.localVariable("stepNumber1"))), b.block(b.functionCall(14868, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.logicalAnd(14870, b.lessThan(14870, b.localVariable("stepNumber1"), b.constant(0)), b.lessThan(14870, b.localVariable("to1"), b.localVariable("self1"))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14871, int.class, "i", b.localVariable("self1"))), b.greaterThan(14871, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.plusEqual(14871, b.localVariable("i"), b.localVariable("stepNumber1"))), b.block(b.functionCall(14872, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.compareNotEqual(14874, b.localVariable("self1"), b.localVariable("to1")), b.throw_(14875, b.new_(14875, GroovyRuntimeException.class, b.plus(14875, b.plus(14875, b.plus(14875, b.plus(14875, b.plus(14875, b.plus(14875, b.constant("Infinite loop in "), b.localVariable("self1")), b.constant(".step(")), b.localVariable("to1")), b.constant(", ")), b.localVariable("stepNumber1")), b.constant(")")))))))))))); + throw new CpsCallableInvocation(f, null, self, to, stepNumber, closure); + } + + public static void eachByte(Byte[] self, Closure closure) { + if ((!Caller.isAsynchronous(self, "eachByte", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachByte", self, closure))) { + DefaultGroovyMethods.eachByte(self, closure); + return ; + } + Builder b = new Builder(loc("eachByte")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(15353, CpsDefaultGroovyMethods.class, "each", b.localVariable("self"), b.localVariable("closure")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static void eachByte(byte[] self, Closure closure) { + if ((!Caller.isAsynchronous(self, "eachByte", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachByte", self, closure))) { + DefaultGroovyMethods.eachByte(self, closure); + return ; + } + Builder b = new Builder(loc("eachByte")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(15365, CpsDefaultGroovyMethods.class, "each", b.localVariable("self"), b.localVariable("closure")))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static int findIndexOf(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "findIndexOf", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexOf", self, closure))) { + return DefaultGroovyMethods.findIndexOf(self, closure); + } + Builder b = new Builder(loc("findIndexOf")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15378, CpsDefaultGroovyMethods.class, "findIndexOf", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static int findIndexOf(Object self, int startIndex, Closure closure) { + if ((!Caller.isAsynchronous(self, "findIndexOf", startIndex, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexOf", self, startIndex, closure))) { + return DefaultGroovyMethods.findIndexOf(self, startIndex, closure); + } + Builder b = new Builder(loc("findIndexOf")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "startIndex", "closure"), b.block(b.declareVariable(15393, int.class, "result", b.constant(-1)), b.declareVariable(15394, int.class, "i", b.constant(0)), b.declareVariable(15395, BooleanClosureWrapper.class, "bcw", b.new_(15395, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(15396, Iterator.class, "iter", b.functionCall(15396, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(15396, b.localVariable("iter"), "hasNext"), b.sequence(b.postfixInc(15396, b.localVariable("i"))), b.block(b.declareVariable(15397, Object.class, "value", b.functionCall(15397, b.localVariable("iter"), "next")), b.if_(b.lessThan(15398, b.localVariable("i"), b.localVariable("startIndex")), b.block(b.continue_(null))), b.if_(b.functionCall(15401, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.assign(15402, b.localVariable("result"), b.localVariable("i")), b.break_(null))))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, startIndex, closure); + } + + public static int findLastIndexOf(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "findLastIndexOf", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findLastIndexOf", self, closure))) { + return DefaultGroovyMethods.findLastIndexOf(self, closure); + } + Builder b = new Builder(loc("findLastIndexOf")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15419, CpsDefaultGroovyMethods.class, "findLastIndexOf", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static int findLastIndexOf(Object self, int startIndex, Closure closure) { + if ((!Caller.isAsynchronous(self, "findLastIndexOf", startIndex, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findLastIndexOf", self, startIndex, closure))) { + return DefaultGroovyMethods.findLastIndexOf(self, startIndex, closure); + } + Builder b = new Builder(loc("findLastIndexOf")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "startIndex", "closure"), b.block(b.declareVariable(15434, int.class, "result", b.constant(-1)), b.declareVariable(15435, int.class, "i", b.constant(0)), b.declareVariable(15436, BooleanClosureWrapper.class, "bcw", b.new_(15436, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(15437, Iterator.class, "iter", b.functionCall(15437, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(15437, b.localVariable("iter"), "hasNext"), b.sequence(b.postfixInc(15437, b.localVariable("i"))), b.block(b.declareVariable(15438, Object.class, "value", b.functionCall(15438, b.localVariable("iter"), "next")), b.if_(b.lessThan(15439, b.localVariable("i"), b.localVariable("startIndex")), b.block(b.continue_(null))), b.if_(b.functionCall(15442, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.assign(15443, b.localVariable("result"), b.localVariable("i")))))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, startIndex, closure); + } + + public static List findIndexValues(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "findIndexValues", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexValues", self, closure))) { + return DefaultGroovyMethods.findIndexValues(self, closure); + } + Builder b = new Builder(loc("findIndexValues")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15459, CpsDefaultGroovyMethods.class, "findIndexValues", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static List findIndexValues(Object self, Number startIndex, Closure closure) { + if ((!Caller.isAsynchronous(self, "findIndexValues", startIndex, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexValues", self, startIndex, closure))) { + return DefaultGroovyMethods.findIndexValues(self, startIndex, closure); + } + Builder b = new Builder(loc("findIndexValues")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "startIndex", "closure"), b.block(b.declareVariable(15474, List.class, "result", b.new_(15474, ArrayList.class)), b.declareVariable(15475, long.class, "count", b.constant(0)), b.declareVariable(15476, long.class, "startCount", b.functionCall(15476, b.localVariable("startIndex"), "longValue")), b.declareVariable(15477, BooleanClosureWrapper.class, "bcw", b.new_(15477, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(15478, Iterator.class, "iter", b.functionCall(15478, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(15478, b.localVariable("iter"), "hasNext"), b.sequence(b.postfixInc(15478, b.localVariable("count"))), b.block(b.declareVariable(15479, Object.class, "value", b.functionCall(15479, b.localVariable("iter"), "next")), b.if_(b.lessThan(15480, b.localVariable("count"), b.localVariable("startCount")), b.block(b.continue_(null))), b.if_(b.functionCall(15483, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.functionCall(15484, b.localVariable("result"), "add", b.localVariable("count")))))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, startIndex, closure); + } + + public static MetaClass metaClass(Class self, Closure closure) { + if ((!Caller.isAsynchronous(self, "metaClass", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "metaClass", self, closure))) { + return DefaultGroovyMethods.metaClass(self, closure); + } + Builder b = new Builder(loc("metaClass")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(15769, MetaClassRegistry.class, "metaClassRegistry", b.functionCall(15769, b.constant(GroovySystem.class), "getMetaClassRegistry")), b.declareVariable(15770, MetaClass.class, "mc", b.functionCall(15770, b.localVariable("metaClassRegistry"), "getMetaClass", b.localVariable("self"))), b.if_(b.instanceOf(15772, b.localVariable("mc"), b.constant(ExpandoMetaClass.class)), b.block(b.functionCall(15773, b.cast(15773, b.localVariable("mc"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("mc"))), b.block(b.if_(b.logicalAnd(15777, b.instanceOf(15777, b.localVariable("mc"), b.constant(DelegatingMetaClass.class)), b.instanceOf(15777, b.functionCall(15777, b.cast(15777, b.localVariable("mc"), DelegatingMetaClass.class, false), "getAdaptee"), b.constant(ExpandoMetaClass.class))), b.block(b.functionCall(15778, b.cast(15778, b.functionCall(15778, b.cast(15778, b.localVariable("mc"), DelegatingMetaClass.class, false), "getAdaptee"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("mc"))), b.block(b.if_(b.logicalAnd(15782, b.instanceOf(15782, b.localVariable("mc"), b.constant(DelegatingMetaClass.class)), b.compareEqual(15782, b.functionCall(15782, b.functionCall(15782, b.cast(15782, b.localVariable("mc"), DelegatingMetaClass.class, false), "getAdaptee"), "getClass"), b.property(15782, b.constant(MetaClassImpl.class), "class"))), b.block(b.declareVariable(15783, ExpandoMetaClass.class, "emc", b.new_(15783, ExpandoMetaClass.class, b.localVariable("self"), b.constant(false), b.constant(true))), b.functionCall(15784, b.localVariable("emc"), "initialize"), b.functionCall(15785, b.localVariable("emc"), "define", b.localVariable("closure")), b.functionCall(15786, b.cast(15786, b.localVariable("mc"), DelegatingMetaClass.class, false), "setAdaptee", b.localVariable("emc")), b.return_(b.localVariable("mc"))), b.block(b.if_(b.compareEqual(15790, b.functionCall(15790, b.localVariable("mc"), "getClass"), b.property(15790, b.constant(MetaClassImpl.class), "class")), b.block(b.assign(15792, b.localVariable("mc"), b.new_(15792, ExpandoMetaClass.class, b.localVariable("self"), b.constant(false), b.constant(true))), b.functionCall(15793, b.localVariable("mc"), "initialize"), b.functionCall(15794, b.cast(15794, b.localVariable("mc"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.functionCall(15795, b.localVariable("metaClassRegistry"), "setMetaClass", b.localVariable("self"), b.localVariable("mc")), b.return_(b.localVariable("mc"))), b.block(b.throw_(15799, b.new_(15799, GroovyRuntimeException.class, b.plus(15799, b.constant("Can't add methods to custom meta class "), b.localVariable("mc")))))))))))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static MetaClass metaClass(Object self, Closure closure) { + if ((!Caller.isAsynchronous(self, "metaClass", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "metaClass", self, closure))) { + return DefaultGroovyMethods.metaClass(self, closure); + } + Builder b = new Builder(loc("metaClass")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(15816, MetaClass.class, "emc", b.staticCall(15816, CpsDefaultGroovyMethods.class, "hasPerInstanceMetaClass", b.localVariable("self"))), b.if_(b.compareEqual(15817, b.localVariable("emc"), b.constant(null)), b.block(b.declareVariable(15818, ExpandoMetaClass.class, "metaClass", b.new_(15818, ExpandoMetaClass.class, b.functionCall(15818, b.localVariable("self"), "getClass"), b.constant(false), b.constant(true))), b.functionCall(15819, b.localVariable("metaClass"), "initialize"), b.functionCall(15820, b.localVariable("metaClass"), "define", b.localVariable("closure")), b.if_(b.instanceOf(15821, b.localVariable("self"), b.constant(GroovyObject.class)), b.block(b.staticCall(15822, CpsDefaultGroovyMethods.class, "setMetaClass", b.cast(15822, b.localVariable("self"), GroovyObject.class, false), b.localVariable("metaClass"))), b.block(b.staticCall(15824, CpsDefaultGroovyMethods.class, "setMetaClass", b.localVariable("self"), b.localVariable("metaClass")))), b.return_(b.localVariable("metaClass"))), b.block(b.if_(b.instanceOf(15829, b.localVariable("emc"), b.constant(ExpandoMetaClass.class)), b.block(b.functionCall(15830, b.cast(15830, b.localVariable("emc"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("emc"))), b.block(b.if_(b.logicalAnd(15834, b.instanceOf(15834, b.localVariable("emc"), b.constant(DelegatingMetaClass.class)), b.instanceOf(15834, b.functionCall(15834, b.cast(15834, b.localVariable("emc"), DelegatingMetaClass.class, false), "getAdaptee"), b.constant(ExpandoMetaClass.class))), b.block(b.functionCall(15835, b.cast(15835, b.functionCall(15835, b.cast(15835, b.localVariable("emc"), DelegatingMetaClass.class, false), "getAdaptee"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("emc"))), b.block(b.throw_(15839, b.new_(15839, RuntimeException.class, b.plus(15839, b.constant("Can't add methods to non-ExpandoMetaClass "), b.localVariable("emc")))))))))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + private static MethodLocation loc(String methodName) { + return new MethodLocation(CpsDefaultGroovyMethods.class, methodName); + } + +} diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyStaticMethods.java b/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyStaticMethods.java new file mode 100644 index 000000000..2dfa95b61 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyStaticMethods.java @@ -0,0 +1,66 @@ + +package com.cloudbees.groovy.cps; + +import java.util.Arrays; +import javax.annotation.Generated; +import com.cloudbees.groovy.cps.impl.Caller; +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; +import com.cloudbees.groovy.cps.impl.CpsFunction; +import groovy.lang.Closure; +import org.codehaus.groovy.runtime.DefaultGroovyStaticMethods; + +@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Fri May 12 13:24:26 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") +public class CpsDefaultGroovyStaticMethods { + + + public static Thread start(Thread self, Closure closure) { + if ((!Caller.isAsynchronous(self, "start", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "start", self, closure))) { + return DefaultGroovyStaticMethods.start(self, closure); + } + Builder b = new Builder(loc("start")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(46, CpsDefaultGroovyStaticMethods.class, "createThread", b.constant(null), b.constant(false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static Thread start(Thread self, String name, Closure closure) { + if ((!Caller.isAsynchronous(self, "start", name, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "start", self, name, closure))) { + return DefaultGroovyStaticMethods.start(self, name, closure); + } + Builder b = new Builder(loc("start")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "name", "closure"), b.block(b.return_(b.staticCall(54, CpsDefaultGroovyStaticMethods.class, "createThread", b.localVariable("name"), b.constant(false), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, name, closure); + } + + public static Thread startDaemon(Thread self, Closure closure) { + if ((!Caller.isAsynchronous(self, "startDaemon", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "startDaemon", self, closure))) { + return DefaultGroovyStaticMethods.startDaemon(self, closure); + } + Builder b = new Builder(loc("startDaemon")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(69, CpsDefaultGroovyStaticMethods.class, "createThread", b.constant(null), b.constant(true), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, closure); + } + + public static Thread startDaemon(Thread self, String name, Closure closure) { + if ((!Caller.isAsynchronous(self, "startDaemon", name, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "startDaemon", self, name, closure))) { + return DefaultGroovyStaticMethods.startDaemon(self, name, closure); + } + Builder b = new Builder(loc("startDaemon")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "name", "closure"), b.block(b.return_(b.staticCall(83, CpsDefaultGroovyStaticMethods.class, "createThread", b.localVariable("name"), b.constant(true), b.localVariable("closure"))))); + throw new CpsCallableInvocation(f, null, self, name, closure); + } + + public static void sleep(Object self, long milliseconds, Closure onInterrupt) { + if ((!Caller.isAsynchronous(self, "sleep", milliseconds, onInterrupt))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "sleep", self, milliseconds, onInterrupt))) { + DefaultGroovyStaticMethods.sleep(self, milliseconds, onInterrupt); + return ; + } + Builder b = new Builder(loc("sleep")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "milliseconds", "onInterrupt"), b.block(b.staticCall(149, CpsDefaultGroovyStaticMethods.class, "sleepImpl", b.localVariable("milliseconds"), b.localVariable("onInterrupt")))); + throw new CpsCallableInvocation(f, null, self, milliseconds, onInterrupt); + } + + private static MethodLocation loc(String methodName) { + return new MethodLocation(CpsDefaultGroovyStaticMethods.class, methodName); + } + +} diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsProcessGroovyMethods.java b/src/main/java/com/cloudbees/groovy/cps/CpsProcessGroovyMethods.java new file mode 100644 index 000000000..47fbdf736 --- /dev/null +++ b/src/main/java/com/cloudbees/groovy/cps/CpsProcessGroovyMethods.java @@ -0,0 +1,14 @@ + +package com.cloudbees.groovy.cps; + +import javax.annotation.Generated; + +@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Fri May 12 13:24:26 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") +public class CpsProcessGroovyMethods { + + + private static MethodLocation loc(String methodName) { + return new MethodLocation(CpsProcessGroovyMethods.class, methodName); + } + +} diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/src/main/java/com/cloudbees/groovy/cps/Next.java index 6cc32f3c6..4ce1f3b47 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -1,8 +1,10 @@ package com.cloudbees.groovy.cps; +import groovy.lang.Closure; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import org.codehaus.groovy.runtime.GroovyCategorySupport; /** * Remaining computation to execute. To work around the lack of tail-call optimization. @@ -53,18 +55,25 @@ public Next run() { return n; } - public Outcome run(int max) { - List functions = new ArrayList(); - Next n = this; - while(n.yield==null) { - functions.add(n.f.getClass().getCanonicalName()); - if (--max == 0) { - int len = functions.size(); - throw new AssertionError("Did not terminate; ran " + len + " steps ending with: " + functions.subList(len - 20, len)); + /** for testing only */ + public Outcome run(final int max) { + return GroovyCategorySupport.use(Continuable.categories, new Closure(null) { + @Override + public Outcome call() { + int remaining = max; + List functions = new ArrayList(); + Next n = Next.this; + while(n.yield==null) { + functions.add(n.f.getClass().getCanonicalName()); + if (--remaining == 0) { + int len = functions.size(); + throw new AssertionError("Did not terminate; ran " + len + " steps ending with: " + functions.subList(len - 20, len)); + } + n = n.step(); + } + return n.yield; } - n = n.step(); - } - return n.yield; + }); } /** diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 5c48fe911..86870d5bd 100644 --- a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -63,40 +63,7 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat } catch (Throwable t) { return throwException(e, t, loc, new ReferenceStackTrace()); } - -/* - Because of GROOVY-6263, if we use category, CpsTransformer fails wherever it calls its private method - when 'this' is SandboxCpsTransformer. A similar problem will likely happen anywhere we call Groovy code. - - So instead of using category, insert methods into MetaClass, which is what Groovy runtime does - for its builtin DefaultGroovyMethods. - - This affects every Groovy code execution in the same JVM, which is too wide, but - - - return CategorySupport.use(CpsDefaultGroovyMethods.class, new Callable() { - public Next call() { - try { - Caller.record(receiver,methodName,args); - // TODO: spread and safe - Object v = e.getInvoker().methodCall(receiver, methodName, args); - // if this was a normal function, the method had just executed synchronously - return k.receive(v); - } catch (CpsCallableInvocation inv) { - return inv.invoke(e, loc, k); - } catch (Throwable t) { - return throwException(e, t, loc, new ReferenceStackTrace()); - } - } - }); -*/ - } - - /* TODO JENKINS-34064 does not yet work in Groovy 2: - static { - DGMPatcher.init(); } - */ /** * Fix up the stack trace of an exception thrown from synchronous code. diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/DGMPatcher.java b/src/main/java/com/cloudbees/groovy/cps/impl/DGMPatcher.java deleted file mode 100644 index 6e13b867b..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/impl/DGMPatcher.java +++ /dev/null @@ -1,322 +0,0 @@ -package com.cloudbees.groovy.cps.impl; - -import com.cloudbees.groovy.cps.CpsDefaultGroovyMethods; -import com.google.common.base.Objects; -import groovy.lang.GroovySystem; -import groovy.lang.MetaClass; -import groovy.lang.MetaClassImpl; -import groovy.lang.MetaClassRegistry; -import groovy.lang.MetaMethod; -import org.codehaus.groovy.reflection.CachedClass; -import org.codehaus.groovy.reflection.CachedMethod; -import org.codehaus.groovy.reflection.ClassInfo; -import org.codehaus.groovy.reflection.ClassInfo.ClassInfoSet; -import org.codehaus.groovy.reflection.GeneratedMetaMethod; -import org.codehaus.groovy.reflection.ReflectionCache; -import org.codehaus.groovy.runtime.DefaultGroovyMethods; -import org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl; -import org.codehaus.groovy.runtime.metaclass.MetaMethodIndex; -import org.codehaus.groovy.runtime.metaclass.MetaMethodIndex.Entry; -import org.codehaus.groovy.runtime.metaclass.NewInstanceMetaMethod; -import org.codehaus.groovy.util.AbstractConcurrentMapBase; -import org.codehaus.groovy.util.AbstractConcurrentMapBase.Segment; -import org.codehaus.groovy.util.FastArray; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Set; - -/** - * Patches Groovy's method dispatch table so that they point to {@link CpsDefaultGroovyMethods} instead of - * {@link DefaultGroovyMethods}. - * - *

- * To be able to correctly execute code like {@code list.each ...} in CPS, we need to tweak Groovy - * so that it dispatches methods like 'each' to {@link CpsDefaultGroovyMethods} instead of {@link DefaultGroovyMethods}. - * Groovy has some fairly involved internal data structure to determine which method to dispatch, but - * at high level, this comes down to the following: - * - *

    - *
  1. {@link ClassInfoSet} holds references to {@link ClassInfo} where one instance exists for each {@link Class} - *
  2. {@link ClassInfo} holds a reference to {@link MetaClassImpl} - *
  3. {@link MetaClassImpl} holds a whole lot of {@link MetaMethod}s for methods that belong to the class - *
  4. Some of those {@link MetaMethod}s are {@link GeneratedMetaMethod} that points to methods defined on {@link DefaultGroovyMethods} - *
- * - *

- * Many of these objects are created lazily and various caching is involved in various layers (such as - * {@link MetaClassImpl#metaMethodIndex}) presumably to make the method dispatching more efficient. - * - *

- * Our strategy here is to locate {@link GeneratedMetaMethod}s that point to {@link DefaultGroovyMethods} - * and replace them by another {@link MetaMethod} that points to {@link CpsDefaultGroovyMethods}. Given - * the elaborate data structure Groovy builds, we liberally walk the data structure and patch references - * wherever we find them, instead of being precise & surgical about what we replace. This logic - * is implemented in {@link #patch(Object)}. - * - * - *

How Groovy registers methods from {@link DefaultGroovyMethods}?

- *

- * (This is a memo I took during this investigation, in case in the future this becomes useful again) - *

- * {@link DefaultGroovyMethods} are build-time processed (where?) to a series of "dgm" classes, and this gets - * loaded into {@link MetaClass} structures in {@link GeneratedMetaMethod.DgmMethodRecord#loadDgmInfo()}. - *

- * The code above is called from {@link MetaClassRegistryImpl#MetaClassRegistryImpl(int,boolean)} , which - * uses {@link CachedClass#setNewMopMethods(List)} to install method definitions from DGM. - * {@link CachedClass#setNewMopMethods(List)} internally calls into {@link CachedClass#updateSetNewMopMethods(List)}, - * which simply updates {@link ClassInfo#newMetaMethods}. This is where the method definitions stay for a while - *

- * The only read usage of {@link ClassInfo#newMetaMethods} is in {@link CachedClass#getNewMetaMethods()}, and - * this method builds its return value from all the super types. This method is then further used by - * {@link MetaClassImpl} when it is instantiated and build its own index. - * - * @author Kohsuke Kawaguchi - */ -class DGMPatcher { - // we need to traverse various internal fields of the objects - private final Field MetaClassImpl_myNewMetaMethods = field(MetaClassImpl.class,"myNewMetaMethods"); - private final Field MetaClassImpl_newGroovyMethodsSet = field(MetaClassImpl.class,"newGroovyMethodsSet"); - private final Field MetaClassImpl_metaMethodIndex = field(MetaClassImpl.class,"metaMethodIndex"); - private final Field ClassInfo_dgmMetaMethods = field(ClassInfo.class,"dgmMetaMethods"); - private final Field ClassInfo_newMetaMethods = field(ClassInfo.class,"newMetaMethods"); - private final Field ClassInfo_globalClassSet = field(ClassInfo.class,"globalClassSet"); - private final Field ClassInfoSet_segments = field(AbstractConcurrentMapBase.class,"segments"); - private final Field Segment_table = field(Segment.class,"table"); - - /** - * Used to compare two {@link MetaMethod} by their signatures. - */ - static final class Key { - /** - * Receiver type. - */ - final Class declaringClass; - - /** - * Method name - */ - final String name; - - /** - * Method signature - */ - final Class[] nativeParamTypes; - - Key(Class declaringClass, String name, Class[] nativeParamTypes) { - this.declaringClass = declaringClass; - this.name = name; - this.nativeParamTypes = nativeParamTypes; - } - - Key(MetaMethod m) { - this(m.getDeclaringClass().getTheClass(), m.getName(), m.getNativeParameterTypes()); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Key key = (Key) o; - return Objects.equal(declaringClass, key.declaringClass) && - Objects.equal(name, key.name) && - Arrays.equals(nativeParamTypes, key.nativeParamTypes); - } - - @Override - public int hashCode() { - return Objects.hashCode(declaringClass, name, Arrays.hashCode(nativeParamTypes)); - } - - @Override - public String toString() { - return declaringClass.getName() + "." + name + Arrays.toString(nativeParamTypes); - } - } - - /** - * Methods defined in {@link CpsDefaultGroovyMethods} to override definitions in {@link DefaultGroovyMethods}. - */ - private final Map overrides = new HashMap(); - - /** - * @param methods - * List of methods to overwrite {@link DefaultGroovyMethods} - */ - DGMPatcher(List methods) { - for (MetaMethod m : methods) { - MetaMethod old = overrides.put(new Key(m),m); - if (old != null) { - throw new IllegalStateException("duplication between " + m + " and " + old); - } - } - } - - /** - * Visits Groovy data structure and install methods given in the constructor. - */ - void patch() { - MetaClassRegistry r = GroovySystem.getMetaClassRegistry(); -// this never seems to iterate anything -// Iterator itr = r.iterator(); -// while (itr.hasNext()) { -// MetaClass mc = itr.next(); -// patch(mc); -// } - patch(r); - - try { - patch(ClassInfo_globalClassSet.get(null)); - } catch (IllegalAccessException e) { - throw new AssertionError(e); - } - } - - /** - * Walks the given object recursively, patch references, and return the replacement object. - * - *

- * Key data structure we visit is {@link MetaClassImpl}, - */ - private Object patch(Object o) { - if (o instanceof MetaClassRegistryImpl) { - MetaClassRegistryImpl r = (MetaClassRegistryImpl) o; - patch(r.getInstanceMethods()); - patch(r.getStaticMethods()); - } else - if (o instanceof ClassInfoSet) { - // discover all ClassInfo in ClassInfoSet via Segment -> table -> ClassInfo - ClassInfoSet cis = (ClassInfoSet)o; - patch(cis,ClassInfoSet_segments); - } else - if (o instanceof Segment) { - Segment s = (Segment) o; - patch(s,Segment_table); - } else - if (o instanceof ClassInfo) { - ClassInfo ci = (ClassInfo) o; - patch(ci,ClassInfo_dgmMetaMethods); - patch(ci,ClassInfo_newMetaMethods); - // ClassInfo -> MetaClass - patch(ci.getStrongMetaClass()); - patch(ci.getWeakMetaClass()); -// patch(ci.getCachedClass()); - } else -// doesn't look like we need to visit this -// if (o instanceof CachedClass) { -// CachedClass cc = (CachedClass) o; -// patch(cc.classInfo); -// } else - if (o instanceof MetaClassImpl) { - MetaClassImpl mc = (MetaClassImpl) o; - patch(mc,MetaClassImpl_myNewMetaMethods); - patch(mc.getMethods()); // this directly returns mc.allMethods - patch(mc,MetaClassImpl_newGroovyMethodsSet); - patch(mc,MetaClassImpl_metaMethodIndex); - } else - if (o instanceof MetaMethodIndex) { - MetaMethodIndex mmi = (MetaMethodIndex) o; - for (Entry e : mmi.getTable()) { - if (e!=null) { - e.methods = patch(e.methods); - e.methodsForSuper = patch(e.methodsForSuper); - e.staticMethods = patch(e.staticMethods); - } - } - mmi.clearCaches(); // in case anything was actually modified - } else - if (o instanceof GeneratedMetaMethod) { - // the actual patch logic. - GeneratedMetaMethod gm = (GeneratedMetaMethod) o; - MetaMethod replace = overrides.get(new Key(gm)); - if (replace!=null) { - // we found a GeneratedMetaMethod that points to DGM that needs to be replaced! - return replace; - } - } else -// other collection structure that needs to be recursively visited - if (o instanceof Object[]) { - Object[] a = (Object[])o; - for (int i=0; i owner, String field) { - try { - Field f = owner.getDeclaredField(field); - f.setAccessible(true); - return f; - } catch (NoSuchFieldException e) { - // TODO: warn - return null; - } - } - - static { - List methods = new ArrayList(); - for (CachedMethod m : ReflectionCache.getCachedClass(CpsDefaultGroovyMethods.class).getMethods()) { - if (m.isStatic() && m.isPublic()) { - CachedClass[] paramTypes = m.getParameterTypes(); - if (paramTypes.length > 0) { - methods.add(new NewInstanceMetaMethod(m)); - } - } - } - new DGMPatcher(methods).patch(); - } - - /** - * No-op method to ensure the static initializer has run. - */ - public static void init() {} -} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index bf95db572..b54c8f552 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -2,7 +2,6 @@ package com.cloudbees.groovy.cps import com.cloudbees.groovy.cps.impl.ContinuationGroup import com.cloudbees.groovy.cps.impl.CpsCallableInvocation -import com.cloudbees.groovy.cps.impl.DGMPatcher import groovy.transform.NotYetImplemented import org.junit.Test import org.jvnet.hudson.test.Issue @@ -465,7 +464,6 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { /** * Testing {@link CpsDefaultGroovyMethods}. */ - @NotYetImplemented // TODO JENKINS-34064 @Test void each() { assert evalCPS(""" @@ -667,7 +665,6 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { public static int add(int a, int b) { return a+b; } - @NotYetImplemented // TODO JENKINS-34064 @Test void eachArray() { assert evalCPS(""" From 11d48d1b5e193ac30f3533e3ae2707dfc9747f07 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 15 May 2017 11:57:06 -0400 Subject: [PATCH 399/932] [JENKINS-44280] Test for overloading methods --- .../groovy/cps/CpsTransformerTest.groovy | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index bf95db572..d68de5634 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -697,6 +697,25 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { ''') == true; } + @Issue("JENKINS-44280") + @NotYetImplemented + @Test + void overloadedMethods() { + assert evalCPS(''' + public String bar(List l) { + return bar((Iterable)l) + } + + public String bar(Iterable l) { + return "iterable" + } + + List s = ["a", "b"] + + return bar(s) + ''') == "iterable" + } + public static class Base { @Override String toString() { From bd4f0ba845c93c2aa8a63946465ba58911c0cf4d Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 15 May 2017 12:12:59 -0400 Subject: [PATCH 400/932] Removed types, added static test as well --- .../groovy/cps/CpsTransformerTest.groovy | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index d68de5634..fb5f9e15b 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -702,15 +702,34 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { @Test void overloadedMethods() { assert evalCPS(''' - public String bar(List l) { + public String bar(List l) { return bar((Iterable)l) } - public String bar(Iterable l) { + public String bar(Iterable l) { return "iterable" } - List s = ["a", "b"] + List s = ["a", "b"] + + return bar(s) + ''') == "iterable" + } + + @Issue("JENKINS-44280") + @NotYetImplemented + @Test + void overloadedStaticMethods() { + assert evalCPS(''' + public static String bar(List l) { + return bar((Iterable)l) + } + + public static String bar(Iterable l) { + return "iterable" + } + + List s = ["a", "b"] return bar(s) ''') == "iterable" From 3cb671c3d12e485eeaeb7615e2fedd73517fb45f Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 15 May 2017 13:22:18 -0400 Subject: [PATCH 401/932] Add typed vs raw-typed --- .../groovy/cps/CpsTransformerTest.groovy | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index fb5f9e15b..14d0de583 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -701,6 +701,25 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { @NotYetImplemented @Test void overloadedMethods() { + assert evalCPS(''' + public String bar(List l) { + return bar((Iterable)l) + } + + public String bar(Iterable l) { + return "iterable" + } + + List s = ["a", "b"] + + return bar(s) + ''') == "iterable" + } + + @Issue("JENKINS-44280") + @NotYetImplemented + @Test + void overloadedMethodsWithRawTypes() { assert evalCPS(''' public String bar(List l) { return bar((Iterable)l) From 3316034680440f040514b26b703bd2517b1eb800 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 15 May 2017 17:52:39 -0400 Subject: [PATCH 402/932] Adjusting API for categories. --- src/main/java/com/cloudbees/groovy/cps/Continuable.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index d36bddcd5..b0aabbabd 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -18,6 +18,7 @@ import static com.cloudbees.groovy.cps.impl.SourceLocation.UNKNOWN; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import groovy.lang.Closure; import org.codehaus.groovy.runtime.GroovyCategorySupport; @@ -29,7 +30,7 @@ public class Continuable implements Serializable { @SuppressWarnings("rawtypes") - static final List categories = ImmutableList.of( + public static final List categories = ImmutableList.of( CpsDefaultGroovyMethods.class, CpsDefaultGroovyStaticMethods.class, CpsProcessGroovyMethods.class); @@ -152,6 +153,10 @@ public Object runByThrow(Throwable arg) throws InvocationTargetException { * throwing an exception */ public Outcome run0(final Outcome cn) { + return run0(cn, categories); + } + + public Outcome run0(final Outcome cn, List categories) { return GroovyCategorySupport.use(categories, new Closure(null) { @Override public Outcome call() { From ba5769b7f7b860dfa5a0ef8eef2b23829b5ed0f8 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 15 May 2017 17:53:13 -0400 Subject: [PATCH 403/932] Regenerated. --- .../groovy/cps/CpsDefaultGroovyMethods.java | 1260 ++++++++++++++--- .../cps/CpsDefaultGroovyStaticMethods.java | 52 +- .../groovy/cps/CpsProcessGroovyMethods.java | 21 +- 3 files changed, 1089 insertions(+), 244 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.java b/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.java index 87248eeda..015780e7a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.java +++ b/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.java @@ -16,6 +16,8 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.SortedSet; +import java.util.Timer; +import java.util.TimerTask; import javax.annotation.Generated; import com.cloudbees.groovy.cps.impl.Caller; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; @@ -42,43 +44,60 @@ import org.codehaus.groovy.runtime.ReverseListIterator; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.BooleanClosureWrapper; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; import org.codehaus.groovy.util.ArrayIterator; -@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Fri May 12 13:24:26 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") +@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Mon May 15 17:17:37 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") public class CpsDefaultGroovyMethods { - public staticObject identity(Object self, Closure closure) { + public staticT identity(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "identity", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "identity", self, closure))) { return DefaultGroovyMethods.identity(self, closure); } + return CpsDefaultGroovyMethods.$identity__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private staticT $identity__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("identity")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.functionCall(200, b.constant(DefaultGroovyMethods.class), "with", b.localVariable("self"), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject with(Object self, Closure closure) { + public staticT with(U self, Closure closure) { if ((!Caller.isAsynchronous(self, "with", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "with", self, closure))) { return DefaultGroovyMethods.with(self, closure); } + return CpsDefaultGroovyMethods.$with__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private staticT $with__java_lang_Object__groovy_lang_Closure(U self, Closure closure) { Builder b = new Builder(loc("with")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(238, Closure.class, "clonedClosure", b.cast(239, b.functionCall(239, b.localVariable("closure"), "clone"), Closure.class, false)), b.functionCall(240, b.localVariable("clonedClosure"), "setResolveStrategy", b.property(240, b.constant(Closure.class), "DELEGATE_FIRST")), b.functionCall(241, b.localVariable("clonedClosure"), "setDelegate", b.localVariable("self")), b.return_(b.functionCall(242, b.localVariable("clonedClosure"), "call", b.localVariable("self"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject use(Object self, Class categoryClass, Closure closure) { + public staticT use(Object self, Class categoryClass, Closure closure) { if ((!Caller.isAsynchronous(self, "use", categoryClass, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "use", self, categoryClass, closure))) { return DefaultGroovyMethods.use(self, categoryClass, closure); } + return CpsDefaultGroovyMethods.$use__java_lang_Object__java_lang_Class__groovy_lang_Closure(self, categoryClass, closure); + } + + private staticT $use__java_lang_Object__java_lang_Class__groovy_lang_Closure(Object self, Class categoryClass, Closure closure) { Builder b = new Builder(loc("use")); CpsFunction f = new CpsFunction(Arrays.asList("self", "categoryClass", "closure"), b.block(b.return_(b.functionCall(407, b.constant(GroovyCategorySupport.class), "use", b.localVariable("categoryClass"), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, categoryClass, closure); } - public staticObject use(Object self, List categoryClassList, Closure closure) { + public staticT use(Object self, List categoryClassList, Closure closure) { if ((!Caller.isAsynchronous(self, "use", categoryClassList, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "use", self, categoryClassList, closure))) { return DefaultGroovyMethods.use(self, categoryClassList, closure); } + return CpsDefaultGroovyMethods.$use__java_lang_Object__java_util_List__groovy_lang_Closure(self, categoryClassList, closure); + } + + private staticT $use__java_lang_Object__java_util_List__groovy_lang_Closure(Object self, List categoryClassList, Closure closure) { Builder b = new Builder(loc("use")); CpsFunction f = new CpsFunction(Arrays.asList("self", "categoryClassList", "closure"), b.block(b.return_(b.functionCall(488, b.constant(GroovyCategorySupport.class), "use", b.localVariable("categoryClassList"), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, categoryClassList, closure); @@ -89,224 +108,352 @@ public static void addShutdownHook(Object self, Closure closure) { DefaultGroovyMethods.addShutdownHook(self, closure); return ; } + CpsDefaultGroovyMethods.$addShutdownHook__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private static void $addShutdownHook__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("addShutdownHook")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.functionCall(499, b.functionCall(499, b.constant(Runtime.class), "getRuntime"), "addShutdownHook", b.new_(499, Thread.class, b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticIterator unique(Iterator self, Closure closure) { + public staticIterator unique(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "unique", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, closure))) { return DefaultGroovyMethods.unique(self, closure); } + return CpsDefaultGroovyMethods.$unique__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private staticIterator $unique__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("unique")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.functionCall(1140, b.staticCall(1140, CpsDefaultGroovyMethods.class, "toList", b.cast(1140, b.staticCall(1140, CpsDefaultGroovyMethods.class, "unique", b.staticCall(1140, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), b.localVariable("closure")), Iterable.class, false)), "listIterator")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.functionCall(1140, b.staticCall(1140, CpsDefaultGroovyMethods.class, "$toList__java_lang_Iterable", b.cast(1140, b.staticCall(1140, CpsDefaultGroovyMethods.class, "$unique__java_util_List__groovy_lang_Closure", b.staticCall(1140, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), b.localVariable("closure")), Iterable.class, false)), "listIterator")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticCollection unique(Collection self, Closure closure) { + public staticCollection unique(Collection self, Closure closure) { if ((!Caller.isAsynchronous(self, "unique", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, closure))) { return DefaultGroovyMethods.unique(self, closure); } + return CpsDefaultGroovyMethods.$unique__java_util_Collection__groovy_lang_Closure(self, closure); + } + + private staticCollection $unique__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { Builder b = new Builder(loc("unique")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(1164, CpsDefaultGroovyMethods.class, "unique", b.localVariable("self"), b.constant(true), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(1164, CpsDefaultGroovyMethods.class, "$unique__java_util_Collection__boolean__groovy_lang_Closure", b.localVariable("self"), b.constant(true), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticList unique(List self, Closure closure) { + public staticList unique(List self, Closure closure) { if ((!Caller.isAsynchronous(self, "unique", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, closure))) { return DefaultGroovyMethods.unique(self, closure); } + return CpsDefaultGroovyMethods.$unique__java_util_List__groovy_lang_Closure(self, closure); + } + + private staticList $unique__java_util_List__groovy_lang_Closure(List self, Closure closure) { Builder b = new Builder(loc("unique")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1188, b.staticCall(1188, CpsDefaultGroovyMethods.class, "unique", b.cast(1188, b.localVariable("self"), Collection.class, false), b.constant(true), b.localVariable("closure")), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1188, b.staticCall(1188, CpsDefaultGroovyMethods.class, "$unique__java_util_Collection__boolean__groovy_lang_Closure", b.cast(1188, b.localVariable("self"), Collection.class, false), b.constant(true), b.localVariable("closure")), List.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticCollection unique(Collection self, boolean mutate, Closure closure) { + public staticCollection unique(Collection self, boolean mutate, Closure closure) { if ((!Caller.isAsynchronous(self, "unique", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, mutate, closure))) { return DefaultGroovyMethods.unique(self, mutate, closure); } + return CpsDefaultGroovyMethods.$unique__java_util_Collection__boolean__groovy_lang_Closure(self, mutate, closure); + } + + private staticCollection $unique__java_util_Collection__boolean__groovy_lang_Closure(Collection self, boolean mutate, Closure closure) { Builder b = new Builder(loc("unique")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(1220, int.class, "params", b.functionCall(1220, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareEqual(1221, b.localVariable("params"), b.constant(1)), b.block(b.assign(1222, b.localVariable("self"), b.staticCall(1222, CpsDefaultGroovyMethods.class, "unique", b.localVariable("self"), b.localVariable("mutate"), b.new_(1222, OrderBy.class, b.localVariable("closure"), b.constant(true))))), b.block(b.assign(1224, b.localVariable("self"), b.staticCall(1224, CpsDefaultGroovyMethods.class, "unique", b.localVariable("self"), b.localVariable("mutate"), b.new_(1224, ClosureComparator.class, b.localVariable("closure")))))), b.return_(b.localVariable("self")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(1220, int.class, "params", b.functionCall(1220, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareEqual(1221, b.localVariable("params"), b.constant(1)), b.block(b.assign(1222, b.localVariable("self"), b.staticCall(1222, CpsDefaultGroovyMethods.class, "$unique__java_util_Collection__boolean__java_util_Comparator", b.localVariable("self"), b.localVariable("mutate"), b.new_(1222, OrderBy.class, b.localVariable("closure"), b.constant(true))))), b.block(b.assign(1224, b.localVariable("self"), b.staticCall(1224, CpsDefaultGroovyMethods.class, "$unique__java_util_Collection__boolean__java_util_Comparator", b.localVariable("self"), b.localVariable("mutate"), b.new_(1224, ClosureComparator.class, b.localVariable("closure")))))), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, mutate, closure); } - public staticList unique(List self, boolean mutate, Closure closure) { + public staticList unique(List self, boolean mutate, Closure closure) { if ((!Caller.isAsynchronous(self, "unique", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, mutate, closure))) { return DefaultGroovyMethods.unique(self, mutate, closure); } + return CpsDefaultGroovyMethods.$unique__java_util_List__boolean__groovy_lang_Closure(self, mutate, closure); + } + + private staticList $unique__java_util_List__boolean__groovy_lang_Closure(List self, boolean mutate, Closure closure) { Builder b = new Builder(loc("unique")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.return_(b.cast(1257, b.staticCall(1257, CpsDefaultGroovyMethods.class, "unique", b.cast(1257, b.localVariable("self"), Collection.class, false), b.localVariable("mutate"), b.localVariable("closure")), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.return_(b.cast(1257, b.staticCall(1257, CpsDefaultGroovyMethods.class, "$unique__java_util_Collection__boolean__groovy_lang_Closure", b.cast(1257, b.localVariable("self"), Collection.class, false), b.localVariable("mutate"), b.localVariable("closure")), List.class, false)))); throw new CpsCallableInvocation(f, null, self, mutate, closure); } - public staticObject each(Object self, Closure closure) { + public staticIterator toUnique(Iterator self, Closure condition) { + if ((!Caller.isAsynchronous(self, "toUnique", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toUnique"))) { + return DefaultGroovyMethods.toUnique(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.toUnique(java.util.Iterator,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticCollection toUnique(Iterable self, Closure condition) { + if ((!Caller.isAsynchronous(self, "toUnique", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toUnique"))) { + return DefaultGroovyMethods.toUnique(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.toUnique(java.lang.Iterable,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticList toUnique(List self, Closure condition) { + if ((!Caller.isAsynchronous(self, "toUnique", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toUnique"))) { + return DefaultGroovyMethods.toUnique(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.toUnique(java.util.List,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticT[] toUnique(T[] self, Closure condition) { + if ((!Caller.isAsynchronous(self, "toUnique", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toUnique"))) { + return DefaultGroovyMethods.toUnique(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.toUnique(T[],groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticT each(T self, Closure closure) { if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { return DefaultGroovyMethods.each(self, closure); } + return CpsDefaultGroovyMethods.$each__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private staticT $each__java_lang_Object__groovy_lang_Closure(T self, Closure closure) { Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(1890, CpsDefaultGroovyMethods.class, "each", b.functionCall(1890, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")), b.localVariable("closure")), b.return_(b.localVariable("self")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(1890, CpsDefaultGroovyMethods.class, "$each__java_util_Iterator__groovy_lang_Closure", b.functionCall(1890, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")), b.localVariable("closure")), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject eachWithIndex(Object self, Closure closure) { + public staticT eachWithIndex(T self, Closure closure) { if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { return DefaultGroovyMethods.eachWithIndex(self, closure); } + return CpsDefaultGroovyMethods.$eachWithIndex__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private staticT $eachWithIndex__java_lang_Object__groovy_lang_Closure(T self, Closure closure) { Builder b = new Builder(loc("eachWithIndex")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(1905, Object[].class, "args", b.newArray(1905, Object.class, b.constant(2))), b.declareVariable(1906, int.class, "counter", b.constant(0)), b.forLoop(null, b.sequence(b.declareVariable(1907, Iterator.class, "iter", b.functionCall(1907, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(1907, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.assign(1908, b.array(1908, b.localVariable("args"), b.constant(0)), b.functionCall(1908, b.localVariable("iter"), "next")), b.assign(1909, b.array(1909, b.localVariable("args"), b.constant(1)), b.postfixInc(1909, b.localVariable("counter"))), b.functionCall(1910, b.localVariable("closure"), "call", b.localVariable("args")))), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticIterable eachWithIndex(Iterable self, Closure closure) { + public staticIterable eachWithIndex(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { return DefaultGroovyMethods.eachWithIndex(self, closure); } + return CpsDefaultGroovyMethods.$eachWithIndex__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticIterable $eachWithIndex__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(1926, CpsDefaultGroovyMethods.class, "eachWithIndex", b.functionCall(1926, b.localVariable("self"), "iterator"), b.localVariable("closure")), b.return_(b.localVariable("self")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(1926, CpsDefaultGroovyMethods.class, "$eachWithIndex__java_util_Iterator__groovy_lang_Closure", b.functionCall(1926, b.localVariable("self"), "iterator"), b.localVariable("closure")), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticIterator eachWithIndex(Iterator self, Closure closure) { + public staticIterator eachWithIndex(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { return DefaultGroovyMethods.eachWithIndex(self, closure); } + return CpsDefaultGroovyMethods.$eachWithIndex__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private staticIterator $eachWithIndex__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("eachWithIndex")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(1941, Object[].class, "args", b.newArray(1941, Object.class, b.constant(2))), b.declareVariable(1942, int.class, "counter", b.constant(0)), b.while_(null, b.functionCall(1943, b.localVariable("self"), "hasNext"), b.block(b.assign(1944, b.array(1944, b.localVariable("args"), b.constant(0)), b.functionCall(1944, b.localVariable("self"), "next")), b.assign(1945, b.array(1945, b.localVariable("args"), b.constant(1)), b.postfixInc(1945, b.localVariable("counter"))), b.functionCall(1946, b.localVariable("closure"), "call", b.localVariable("args")))), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticCollection eachWithIndex(Collection self, Closure closure) { + public staticCollection eachWithIndex(Collection self, Closure closure) { if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { return DefaultGroovyMethods.eachWithIndex(self, closure); } + return CpsDefaultGroovyMethods.$eachWithIndex__java_util_Collection__groovy_lang_Closure(self, closure); + } + + private staticCollection $eachWithIndex__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1962, b.staticCall(1962, CpsDefaultGroovyMethods.class, "eachWithIndex", b.cast(1962, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Collection.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1962, b.staticCall(1962, CpsDefaultGroovyMethods.class, "$eachWithIndex__java_lang_Iterable__groovy_lang_Closure", b.cast(1962, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Collection.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticList eachWithIndex(List self, Closure closure) { + public staticList eachWithIndex(List self, Closure closure) { if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { return DefaultGroovyMethods.eachWithIndex(self, closure); } + return CpsDefaultGroovyMethods.$eachWithIndex__java_util_List__groovy_lang_Closure(self, closure); + } + + private staticList $eachWithIndex__java_util_List__groovy_lang_Closure(List self, Closure closure) { Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1976, b.staticCall(1976, CpsDefaultGroovyMethods.class, "eachWithIndex", b.cast(1976, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1976, b.staticCall(1976, CpsDefaultGroovyMethods.class, "$eachWithIndex__java_lang_Iterable__groovy_lang_Closure", b.cast(1976, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), List.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticSet eachWithIndex(Set self, Closure closure) { + public staticSet eachWithIndex(Set self, Closure closure) { if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { return DefaultGroovyMethods.eachWithIndex(self, closure); } + return CpsDefaultGroovyMethods.$eachWithIndex__java_util_Set__groovy_lang_Closure(self, closure); + } + + private staticSet $eachWithIndex__java_util_Set__groovy_lang_Closure(Set self, Closure closure) { Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1990, b.staticCall(1990, CpsDefaultGroovyMethods.class, "eachWithIndex", b.cast(1990, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Set.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1990, b.staticCall(1990, CpsDefaultGroovyMethods.class, "$eachWithIndex__java_lang_Iterable__groovy_lang_Closure", b.cast(1990, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Set.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticSortedSet eachWithIndex(SortedSet self, Closure closure) { + public staticSortedSet eachWithIndex(SortedSet self, Closure closure) { if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { return DefaultGroovyMethods.eachWithIndex(self, closure); } + return CpsDefaultGroovyMethods.$eachWithIndex__java_util_SortedSet__groovy_lang_Closure(self, closure); + } + + private staticSortedSet $eachWithIndex__java_util_SortedSet__groovy_lang_Closure(SortedSet self, Closure closure) { Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2004, b.staticCall(2004, CpsDefaultGroovyMethods.class, "eachWithIndex", b.cast(2004, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), SortedSet.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2004, b.staticCall(2004, CpsDefaultGroovyMethods.class, "$eachWithIndex__java_lang_Iterable__groovy_lang_Closure", b.cast(2004, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), SortedSet.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticIterable each(Iterable self, Closure closure) { + public staticIterable each(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { return DefaultGroovyMethods.each(self, closure); } + return CpsDefaultGroovyMethods.$each__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticIterable $each__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2015, CpsDefaultGroovyMethods.class, "each", b.functionCall(2015, b.localVariable("self"), "iterator"), b.localVariable("closure")), b.return_(b.localVariable("self")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2015, CpsDefaultGroovyMethods.class, "$each__java_util_Iterator__groovy_lang_Closure", b.functionCall(2015, b.localVariable("self"), "iterator"), b.localVariable("closure")), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticIterator each(Iterator self, Closure closure) { + public staticIterator each(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { return DefaultGroovyMethods.each(self, closure); } + return CpsDefaultGroovyMethods.$each__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private staticIterator $each__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("each")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.while_(null, b.functionCall(2028, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(2029, Object.class, "arg", b.functionCall(2029, b.localVariable("self"), "next")), b.functionCall(2030, b.localVariable("closure"), "call", b.localVariable("arg")))), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticCollection each(Collection self, Closure closure) { + public staticCollection each(Collection self, Closure closure) { if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { return DefaultGroovyMethods.each(self, closure); } + return CpsDefaultGroovyMethods.$each__java_util_Collection__groovy_lang_Closure(self, closure); + } + + private staticCollection $each__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2044, b.staticCall(2044, CpsDefaultGroovyMethods.class, "each", b.cast(2044, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Collection.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2044, b.staticCall(2044, CpsDefaultGroovyMethods.class, "$each__java_lang_Iterable__groovy_lang_Closure", b.cast(2044, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Collection.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticList each(List self, Closure closure) { + public staticList each(List self, Closure closure) { if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { return DefaultGroovyMethods.each(self, closure); } + return CpsDefaultGroovyMethods.$each__java_util_List__groovy_lang_Closure(self, closure); + } + + private staticList $each__java_util_List__groovy_lang_Closure(List self, Closure closure) { Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2056, b.staticCall(2056, CpsDefaultGroovyMethods.class, "each", b.cast(2056, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2056, b.staticCall(2056, CpsDefaultGroovyMethods.class, "$each__java_lang_Iterable__groovy_lang_Closure", b.cast(2056, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), List.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticSet each(Set self, Closure closure) { + public staticSet each(Set self, Closure closure) { if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { return DefaultGroovyMethods.each(self, closure); } + return CpsDefaultGroovyMethods.$each__java_util_Set__groovy_lang_Closure(self, closure); + } + + private staticSet $each__java_util_Set__groovy_lang_Closure(Set self, Closure closure) { Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2068, b.staticCall(2068, CpsDefaultGroovyMethods.class, "each", b.cast(2068, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Set.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2068, b.staticCall(2068, CpsDefaultGroovyMethods.class, "$each__java_lang_Iterable__groovy_lang_Closure", b.cast(2068, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Set.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticSortedSet each(SortedSet self, Closure closure) { + public staticSortedSet each(SortedSet self, Closure closure) { if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { return DefaultGroovyMethods.each(self, closure); } + return CpsDefaultGroovyMethods.$each__java_util_SortedSet__groovy_lang_Closure(self, closure); + } + + private staticSortedSet $each__java_util_SortedSet__groovy_lang_Closure(SortedSet self, Closure closure) { Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2080, b.staticCall(2080, CpsDefaultGroovyMethods.class, "each", b.cast(2080, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), SortedSet.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2080, b.staticCall(2080, CpsDefaultGroovyMethods.class, "$each__java_lang_Iterable__groovy_lang_Closure", b.cast(2080, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), SortedSet.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap each(Map self, Closure closure) { + public staticMap each(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { return DefaultGroovyMethods.each(self, closure); } + return CpsDefaultGroovyMethods.$each__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticMap $each__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forInLoop(2106, null, java.util.Map.Entry.class, "entry", b.functionCall(2106, b.localVariable("self"), "entrySet"), b.block(b.staticCall(2107, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("closure"), b.localVariable("entry")))), b.return_(b.localVariable("self")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forInLoop(2106, null, java.util.Map.Entry.class, "entry", b.functionCall(2106, b.localVariable("self"), "entrySet"), b.block(b.staticCall(2107, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("closure"), b.localVariable("entry")))), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap reverseEach(Map self, Closure closure) { + public staticMap reverseEach(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "reverseEach", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "reverseEach", self, closure))) { return DefaultGroovyMethods.reverseEach(self, closure); } + return CpsDefaultGroovyMethods.$reverseEach__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticMap $reverseEach__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("reverseEach")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2127, Iterator.class, "entries", b.staticCall(2127, CpsDefaultGroovyMethods.class, "reverse", b.functionCall(2127, b.functionCall(2127, b.localVariable("self"), "entrySet"), "iterator"))), b.while_(null, b.functionCall(2128, b.localVariable("entries"), "hasNext"), b.block(b.staticCall(2129, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("closure"), b.functionCall(2129, b.localVariable("entries"), "next")))), b.return_(b.localVariable("self")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2127, Iterator.class, "entries", b.staticCall(2127, CpsDefaultGroovyMethods.class, "$reverse__java_util_Iterator", b.functionCall(2127, b.functionCall(2127, b.localVariable("self"), "entrySet"), "iterator"))), b.while_(null, b.functionCall(2128, b.localVariable("entries"), "hasNext"), b.block(b.staticCall(2129, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("closure"), b.functionCall(2129, b.localVariable("entries"), "next")))), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap eachWithIndex(Map self, Closure closure) { + public staticMap eachWithIndex(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { return DefaultGroovyMethods.eachWithIndex(self, closure); } + return CpsDefaultGroovyMethods.$eachWithIndex__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticMap $eachWithIndex__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2153, int.class, "counter", b.constant(0)), b.forInLoop(2154, null, java.util.Map.Entry.class, "entry", b.functionCall(2154, b.localVariable("self"), "entrySet"), b.block(b.staticCall(2155, CpsDefaultGroovyMethods.class, "callClosureForMapEntryAndCounter", b.localVariable("closure"), b.localVariable("entry"), b.postfixInc(2155, b.localVariable("counter"))))), b.return_(b.localVariable("self")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2153, int.class, "counter", b.constant(0)), b.forInLoop(2154, null, java.util.Map.Entry.class, "entry", b.functionCall(2154, b.localVariable("self"), "entrySet"), b.block(b.staticCall(2155, CpsDefaultGroovyMethods.class, "$callClosureForMapEntryAndCounter__groovy_lang_Closure__java_util_Map_Entry__int", b.localVariable("closure"), b.localVariable("entry"), b.postfixInc(2155, b.localVariable("counter"))))), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticList reverseEach(List self, Closure closure) { + public staticList reverseEach(List self, Closure closure) { if ((!Caller.isAsynchronous(self, "reverseEach", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "reverseEach", self, closure))) { return DefaultGroovyMethods.reverseEach(self, closure); } + return CpsDefaultGroovyMethods.$reverseEach__java_util_List__groovy_lang_Closure(self, closure); + } + + private staticList $reverseEach__java_util_List__groovy_lang_Closure(List self, Closure closure) { Builder b = new Builder(loc("reverseEach")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2172, CpsDefaultGroovyMethods.class, "each", b.new_(2172, ReverseListIterator.class, b.localVariable("self")), b.localVariable("closure")), b.return_(b.localVariable("self")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2172, CpsDefaultGroovyMethods.class, "$each__java_util_Iterator__groovy_lang_Closure", b.new_(2172, ReverseListIterator.class, b.localVariable("self")), b.localVariable("closure")), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject[] reverseEach(Object[] self, Closure closure) { + public staticT[] reverseEach(T[] self, Closure closure) { if ((!Caller.isAsynchronous(self, "reverseEach", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "reverseEach", self, closure))) { return DefaultGroovyMethods.reverseEach(self, closure); } + return CpsDefaultGroovyMethods.$reverseEach__java_lang_Object_array__groovy_lang_Closure(self, closure); + } + + private staticT[] $reverseEach__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { Builder b = new Builder(loc("reverseEach")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2185, CpsDefaultGroovyMethods.class, "each", b.new_(2185, ReverseListIterator.class, b.functionCall(2185, b.constant(Arrays.class), "asList", b.localVariable("self"))), b.localVariable("closure")), b.return_(b.localVariable("self")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2185, CpsDefaultGroovyMethods.class, "$each__java_util_Iterator__groovy_lang_Closure", b.new_(2185, ReverseListIterator.class, b.functionCall(2185, b.constant(Arrays.class), "asList", b.localVariable("self"))), b.localVariable("closure")), b.return_(b.localVariable("self")))); throw new CpsCallableInvocation(f, null, self, closure); } @@ -314,33 +461,49 @@ public static boolean every(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { return DefaultGroovyMethods.every(self, closure); } + return CpsDefaultGroovyMethods.$every__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private static boolean $every__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("every")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2203, BooleanClosureWrapper.class, "bcw", b.new_(2203, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2204, Iterator.class, "iter", b.functionCall(2204, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(2204, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.not(2205, b.functionCall(2205, b.localVariable("bcw"), "call", b.functionCall(2205, b.localVariable("iter"), "next"))), b.block(b.return_(b.constant(false)))))), b.return_(b.constant(true)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticboolean every(Iterator self, Closure closure) { + public staticboolean every(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { return DefaultGroovyMethods.every(self, closure); } + return CpsDefaultGroovyMethods.$every__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private staticboolean $every__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("every")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2226, BooleanClosureWrapper.class, "bcw", b.new_(2226, BooleanClosureWrapper.class, b.localVariable("closure"))), b.while_(null, b.functionCall(2227, b.localVariable("self"), "hasNext"), b.block(b.if_(b.not(2228, b.functionCall(2228, b.localVariable("bcw"), "call", b.functionCall(2228, b.localVariable("self"), "next"))), b.block(b.return_(b.constant(false)))))), b.return_(b.constant(true)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticboolean every(Iterable self, Closure closure) { + public staticboolean every(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { return DefaultGroovyMethods.every(self, closure); } + return CpsDefaultGroovyMethods.$every__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticboolean $every__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("every")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2249, CpsDefaultGroovyMethods.class, "every", b.functionCall(2249, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2249, CpsDefaultGroovyMethods.class, "$every__java_util_Iterator__groovy_lang_Closure", b.functionCall(2249, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticboolean every(Map self, Closure closure) { + public staticboolean every(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { return DefaultGroovyMethods.every(self, closure); } + return CpsDefaultGroovyMethods.$every__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticboolean $every__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("every")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2268, BooleanClosureWrapper.class, "bcw", b.new_(2268, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(2269, null, java.util.Map.Entry.class, "entry", b.functionCall(2269, b.localVariable("self"), "entrySet"), b.block(b.if_(b.not(2270, b.functionCall(2270, b.localVariable("bcw"), "callForMap", b.localVariable("entry"))), b.block(b.return_(b.constant(false)))))), b.return_(b.constant(true)))); throw new CpsCallableInvocation(f, null, self, closure); @@ -350,105 +513,153 @@ public static boolean any(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { return DefaultGroovyMethods.any(self, closure); } + return CpsDefaultGroovyMethods.$any__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private static boolean $any__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("any")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2307, BooleanClosureWrapper.class, "bcw", b.new_(2307, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2308, Iterator.class, "iter", b.functionCall(2308, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(2308, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.functionCall(2309, b.localVariable("bcw"), "call", b.functionCall(2309, b.localVariable("iter"), "next")), b.return_(b.constant(true))))), b.return_(b.constant(false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticboolean any(Iterator self, Closure closure) { + public staticboolean any(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { return DefaultGroovyMethods.any(self, closure); } + return CpsDefaultGroovyMethods.$any__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private staticboolean $any__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("any")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2324, BooleanClosureWrapper.class, "bcw", b.new_(2324, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2325, Iterator.class, "iter", b.localVariable("self"))), b.functionCall(2325, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.functionCall(2326, b.localVariable("bcw"), "call", b.functionCall(2326, b.localVariable("iter"), "next")), b.return_(b.constant(true))))), b.return_(b.constant(false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticboolean any(Iterable self, Closure closure) { + public staticboolean any(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { return DefaultGroovyMethods.any(self, closure); } + return CpsDefaultGroovyMethods.$any__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticboolean $any__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("any")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2341, BooleanClosureWrapper.class, "bcw", b.new_(2341, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2342, Iterator.class, "iter", b.functionCall(2342, b.localVariable("self"), "iterator"))), b.functionCall(2342, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.functionCall(2343, b.localVariable("bcw"), "call", b.functionCall(2343, b.localVariable("iter"), "next")), b.return_(b.constant(true))))), b.return_(b.constant(false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticboolean any(Map self, Closure closure) { + public staticboolean any(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { return DefaultGroovyMethods.any(self, closure); } + return CpsDefaultGroovyMethods.$any__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticboolean $any__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("any")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2365, BooleanClosureWrapper.class, "bcw", b.new_(2365, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(2366, null, java.util.Map.Entry.class, "entry", b.functionCall(2366, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(2367, b.localVariable("bcw"), "callForMap", b.localVariable("entry")), b.block(b.return_(b.constant(true)))))), b.return_(b.constant(false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticNumber count(Iterator self, Closure closure) { + public staticNumber count(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { return DefaultGroovyMethods.count(self, closure); } + return CpsDefaultGroovyMethods.$count__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private staticNumber $count__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("count")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2664, long.class, "answer", b.constant(0)), b.declareVariable(2665, BooleanClosureWrapper.class, "bcw", b.new_(2665, BooleanClosureWrapper.class, b.localVariable("closure"))), b.while_(null, b.functionCall(2666, b.localVariable("self"), "hasNext"), b.block(b.if_(b.functionCall(2667, b.localVariable("bcw"), "call", b.functionCall(2667, b.localVariable("self"), "next")), b.block(b.prefixInc(2668, b.localVariable("answer")))))), b.if_(b.lessThanEqual(2672, b.localVariable("answer"), b.property(2672, b.constant(Integer.class), "MAX_VALUE")), b.return_(b.cast(2672, b.localVariable("answer"), int.class, false))), b.return_(b.localVariable("answer")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticNumber count(Iterable self, Closure closure) { + public staticNumber count(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { return DefaultGroovyMethods.count(self, closure); } + return CpsDefaultGroovyMethods.$count__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticNumber $count__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("count")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2723, CpsDefaultGroovyMethods.class, "count", b.functionCall(2723, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2723, CpsDefaultGroovyMethods.class, "$count__java_util_Iterator__groovy_lang_Closure", b.functionCall(2723, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticNumber count(Map self, Closure closure) { + public staticNumber count(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { return DefaultGroovyMethods.count(self, closure); } + return CpsDefaultGroovyMethods.$count__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticNumber $count__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("count")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2740, long.class, "answer", b.constant(0)), b.declareVariable(2741, BooleanClosureWrapper.class, "bcw", b.new_(2741, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(2742, null, Object.class, "entry", b.functionCall(2742, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(2743, b.localVariable("bcw"), "callForMap", b.cast(2743, b.localVariable("entry"), java.util.Map.Entry.class, false)), b.block(b.prefixInc(2744, b.localVariable("answer")))))), b.if_(b.lessThanEqual(2748, b.localVariable("answer"), b.property(2748, b.constant(Integer.class), "MAX_VALUE")), b.return_(b.cast(2748, b.localVariable("answer"), int.class, false))), b.return_(b.localVariable("answer")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticNumber count(Object[] self, Closure closure) { + public staticNumber count(T[] self, Closure closure) { if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { return DefaultGroovyMethods.count(self, closure); } + return CpsDefaultGroovyMethods.$count__java_lang_Object_array__groovy_lang_Closure(self, closure); + } + + private staticNumber $count__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { Builder b = new Builder(loc("count")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2775, CpsDefaultGroovyMethods.class, "count", b.cast(2775, b.functionCall(2775, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2775, CpsDefaultGroovyMethods.class, "$count__java_lang_Iterable__groovy_lang_Closure", b.cast(2775, b.functionCall(2775, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticList collect(Object self, Closure transform) { + public staticList collect(Object self, Closure transform) { if ((!Caller.isAsynchronous(self, "collect", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, transform))) { return DefaultGroovyMethods.collect(self, transform); } + return CpsDefaultGroovyMethods.$collect__java_lang_Object__groovy_lang_Closure(self, transform); + } + + private staticList $collect__java_lang_Object__groovy_lang_Closure(Object self, Closure transform) { Builder b = new Builder(loc("collect")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3095, b.staticCall(3095, CpsDefaultGroovyMethods.class, "collect", b.localVariable("self"), b.new_(3095, ArrayList.class), b.localVariable("transform")), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3095, b.staticCall(3095, CpsDefaultGroovyMethods.class, "$collect__java_lang_Object__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3095, ArrayList.class), b.localVariable("transform")), List.class, false)))); throw new CpsCallableInvocation(f, null, self, transform); } - public staticCollection collect(Object self, Collection collector, Closure transform) { + public staticCollection collect(Object self, Collection collector, Closure transform) { if ((!Caller.isAsynchronous(self, "collect", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, collector, transform))) { return DefaultGroovyMethods.collect(self, collector, transform); } + return CpsDefaultGroovyMethods.$collect__java_lang_Object__java_util_Collection__groovy_lang_Closure(self, collector, transform); + } + + private staticCollection $collect__java_lang_Object__java_util_Collection__groovy_lang_Closure(Object self, Collection collector, Closure transform) { Builder b = new Builder(loc("collect")); CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forLoop(null, b.sequence(b.declareVariable(3123, Iterator.class, "iter", b.functionCall(3123, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(3123, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.functionCall(3124, b.localVariable("collector"), "add", b.functionCall(3124, b.localVariable("transform"), "call", b.functionCall(3124, b.localVariable("iter"), "next"))))), b.return_(b.localVariable("collector")))); throw new CpsCallableInvocation(f, null, self, collector, transform); } - public staticList collect(Collection self, Closure transform) { + public staticList collect(Collection self, Closure transform) { if ((!Caller.isAsynchronous(self, "collect", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, transform))) { return DefaultGroovyMethods.collect(self, transform); } + return CpsDefaultGroovyMethods.$collect__java_util_Collection__groovy_lang_Closure(self, transform); + } + + private staticList $collect__java_util_Collection__groovy_lang_Closure(Collection self, Closure transform) { Builder b = new Builder(loc("collect")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3140, b.staticCall(3140, CpsDefaultGroovyMethods.class, "collect", b.localVariable("self"), b.new_(3140, ArrayList.class, b.functionCall(3140, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3140, b.staticCall(3140, CpsDefaultGroovyMethods.class, "$collect__java_util_Collection__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3140, ArrayList.class, b.functionCall(3140, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); throw new CpsCallableInvocation(f, null, self, transform); } - public staticCollection collect(Collection self, Collection collector, Closure transform) { + public staticCollection collect(Collection self, Collection collector, Closure transform) { if ((!Caller.isAsynchronous(self, "collect", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, collector, transform))) { return DefaultGroovyMethods.collect(self, collector, transform); } + return CpsDefaultGroovyMethods.$collect__java_util_Collection__java_util_Collection__groovy_lang_Closure(self, collector, transform); + } + + private staticCollection $collect__java_util_Collection__java_util_Collection__groovy_lang_Closure(Collection self, Collection collector, Closure transform) { Builder b = new Builder(loc("collect")); CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3169, null, Object.class, "item", b.localVariable("self"), b.block(b.functionCall(3170, b.localVariable("collector"), "add", b.functionCall(3170, b.localVariable("transform"), "call", b.localVariable("item"))), b.if_(b.compareEqual(3171, b.functionCall(3171, b.localVariable("transform"), "getDirective"), b.property(3171, b.constant(Closure.class), "DONE")), b.block(b.break_(null))))), b.return_(b.localVariable("collector")))); throw new CpsCallableInvocation(f, null, self, collector, transform); @@ -458,8 +669,12 @@ public static List collectNested(Collection self, Closure transform) { if ((!Caller.isAsynchronous(self, "collectNested", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectNested", self, transform))) { return DefaultGroovyMethods.collectNested(self, transform); } + return CpsDefaultGroovyMethods.$collectNested__java_util_Collection__groovy_lang_Closure(self, transform); + } + + private static List $collectNested__java_util_Collection__groovy_lang_Closure(Collection self, Closure transform) { Builder b = new Builder(loc("collectNested")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3203, b.staticCall(3203, CpsDefaultGroovyMethods.class, "collectNested", b.cast(3203, b.localVariable("self"), Iterable.class, false), b.new_(3203, ArrayList.class, b.functionCall(3203, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3203, b.staticCall(3203, CpsDefaultGroovyMethods.class, "$collectNested__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.cast(3203, b.localVariable("self"), Iterable.class, false), b.new_(3203, ArrayList.class, b.functionCall(3203, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); throw new CpsCallableInvocation(f, null, self, transform); } @@ -467,8 +682,12 @@ public static List collectNested(Iterable self, Closure transform) { if ((!Caller.isAsynchronous(self, "collectNested", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectNested", self, transform))) { return DefaultGroovyMethods.collectNested(self, transform); } + return CpsDefaultGroovyMethods.$collectNested__java_lang_Iterable__groovy_lang_Closure(self, transform); + } + + private static List $collectNested__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure transform) { Builder b = new Builder(loc("collectNested")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3220, b.staticCall(3220, CpsDefaultGroovyMethods.class, "collectNested", b.localVariable("self"), b.new_(3220, ArrayList.class), b.localVariable("transform")), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3220, b.staticCall(3220, CpsDefaultGroovyMethods.class, "$collectNested__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3220, ArrayList.class), b.localVariable("transform")), List.class, false)))); throw new CpsCallableInvocation(f, null, self, transform); } @@ -476,152 +695,220 @@ public static Collection collectNested(Iterable self, Collection collector, Clos if ((!Caller.isAsynchronous(self, "collectNested", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectNested", self, collector, transform))) { return DefaultGroovyMethods.collectNested(self, collector, transform); } + return CpsDefaultGroovyMethods.$collectNested__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(self, collector, transform); + } + + private static Collection $collectNested__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(Iterable self, Collection collector, Closure transform) { Builder b = new Builder(loc("collectNested")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3261, null, Object.class, "item", b.localVariable("self"), b.block(b.if_(b.instanceOf(3262, b.localVariable("item"), b.constant(Collection.class)), b.block(b.declareVariable(3263, Collection.class, "c", b.cast(3263, b.localVariable("item"), Collection.class, false)), b.functionCall(3264, b.localVariable("collector"), "add", b.staticCall(3264, CpsDefaultGroovyMethods.class, "collectNested", b.cast(3264, b.localVariable("c"), Iterable.class, false), b.functionCall(3264, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("collector"), b.functionCall(3264, b.localVariable("c"), "size")), b.localVariable("transform")))), b.block(b.functionCall(3266, b.localVariable("collector"), "add", b.functionCall(3266, b.localVariable("transform"), "call", b.localVariable("item"))))), b.if_(b.compareEqual(3268, b.functionCall(3268, b.localVariable("transform"), "getDirective"), b.property(3268, b.constant(Closure.class), "DONE")), b.block(b.break_(null))))), b.return_(b.localVariable("collector")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3261, null, Object.class, "item", b.localVariable("self"), b.block(b.if_(b.instanceOf(3262, b.localVariable("item"), b.constant(Collection.class)), b.block(b.declareVariable(3263, Collection.class, "c", b.cast(3263, b.localVariable("item"), Collection.class, false)), b.functionCall(3264, b.localVariable("collector"), "add", b.staticCall(3264, CpsDefaultGroovyMethods.class, "$collectNested__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.cast(3264, b.localVariable("c"), Iterable.class, false), b.functionCall(3264, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("collector"), b.functionCall(3264, b.localVariable("c"), "size")), b.localVariable("transform")))), b.block(b.functionCall(3266, b.localVariable("collector"), "add", b.functionCall(3266, b.localVariable("transform"), "call", b.localVariable("item"))))), b.if_(b.compareEqual(3268, b.functionCall(3268, b.localVariable("transform"), "getDirective"), b.property(3268, b.constant(Closure.class), "DONE")), b.block(b.break_(null))))), b.return_(b.localVariable("collector")))); throw new CpsCallableInvocation(f, null, self, collector, transform); } - public staticList collectMany(Iterable self, Closure> projection) { + public staticList collectMany(Iterable self, Closure> projection) { if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { return DefaultGroovyMethods.collectMany(self, projection); } + return CpsDefaultGroovyMethods.$collectMany__java_lang_Iterable__groovy_lang_Closure(self, projection); + } + + private staticList $collectMany__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure> projection) { Builder b = new Builder(loc("collectMany")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.cast(3320, b.staticCall(3320, CpsDefaultGroovyMethods.class, "collectMany", b.localVariable("self"), b.new_(3320, ArrayList.class), b.localVariable("projection")), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.cast(3320, b.staticCall(3320, CpsDefaultGroovyMethods.class, "$collectMany__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3320, ArrayList.class), b.localVariable("projection")), List.class, false)))); throw new CpsCallableInvocation(f, null, self, projection); } - public staticCollection collectMany(Iterable self, Collection collector, Closure> projection) { + public staticCollection collectMany(Iterable self, Collection collector, Closure> projection) { if ((!Caller.isAsynchronous(self, "collectMany", collector, projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, collector, projection))) { return DefaultGroovyMethods.collectMany(self, collector, projection); } + return CpsDefaultGroovyMethods.$collectMany__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(self, collector, projection); + } + + private staticCollection $collectMany__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(Iterable self, Collection collector, Closure> projection) { Builder b = new Builder(loc("collectMany")); CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "projection"), b.block(b.forInLoop(3344, null, Object.class, "next", b.localVariable("self"), b.block(b.functionCall(3345, b.localVariable("collector"), "addAll", b.functionCall(3345, b.localVariable("projection"), "call", b.localVariable("next"))))), b.return_(b.localVariable("collector")))); throw new CpsCallableInvocation(f, null, self, collector, projection); } - public staticCollection collectMany(Map self, Collection collector, Closure> projection) { + public staticCollection collectMany(Map self, Collection collector, Closure> projection) { if ((!Caller.isAsynchronous(self, "collectMany", collector, projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, collector, projection))) { return DefaultGroovyMethods.collectMany(self, collector, projection); } + return CpsDefaultGroovyMethods.$collectMany__java_util_Map__java_util_Collection__groovy_lang_Closure(self, collector, projection); + } + + private staticCollection $collectMany__java_util_Map__java_util_Collection__groovy_lang_Closure(Map self, Collection collector, Closure> projection) { Builder b = new Builder(loc("collectMany")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "projection"), b.block(b.forInLoop(3367, null, java.util.Map.Entry.class, "entry", b.functionCall(3367, b.localVariable("self"), "entrySet"), b.block(b.functionCall(3368, b.localVariable("collector"), "addAll", b.staticCall(3368, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("projection"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "projection"), b.block(b.forInLoop(3367, null, java.util.Map.Entry.class, "entry", b.functionCall(3367, b.localVariable("self"), "entrySet"), b.block(b.functionCall(3368, b.localVariable("collector"), "addAll", b.staticCall(3368, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("projection"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); throw new CpsCallableInvocation(f, null, self, collector, projection); } - public staticCollection collectMany(Map self, Closure> projection) { + public staticCollection collectMany(Map self, Closure> projection) { if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { return DefaultGroovyMethods.collectMany(self, projection); } + return CpsDefaultGroovyMethods.$collectMany__java_util_Map__groovy_lang_Closure(self, projection); + } + + private staticCollection $collectMany__java_util_Map__groovy_lang_Closure(Map self, Closure> projection) { Builder b = new Builder(loc("collectMany")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3389, CpsDefaultGroovyMethods.class, "collectMany", b.localVariable("self"), b.new_(3389, ArrayList.class), b.localVariable("projection"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3389, CpsDefaultGroovyMethods.class, "$collectMany__java_util_Map__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3389, ArrayList.class), b.localVariable("projection"))))); throw new CpsCallableInvocation(f, null, self, projection); } - public staticList collectMany(Object[] self, Closure> projection) { + public staticList collectMany(E[] self, Closure> projection) { if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { return DefaultGroovyMethods.collectMany(self, projection); } + return CpsDefaultGroovyMethods.$collectMany__java_lang_Object_array__groovy_lang_Closure(self, projection); + } + + private staticList $collectMany__java_lang_Object_array__groovy_lang_Closure(E[] self, Closure> projection) { Builder b = new Builder(loc("collectMany")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3409, CpsDefaultGroovyMethods.class, "collectMany", b.cast(3409, b.staticCall(3409, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("projection"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3409, CpsDefaultGroovyMethods.class, "$collectMany__java_lang_Iterable__groovy_lang_Closure", b.cast(3409, b.staticCall(3409, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.localVariable("projection"))))); throw new CpsCallableInvocation(f, null, self, projection); } - public staticList collectMany(Iterator self, Closure> projection) { + public staticList collectMany(Iterator self, Closure> projection) { if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { return DefaultGroovyMethods.collectMany(self, projection); } + return CpsDefaultGroovyMethods.$collectMany__java_util_Iterator__groovy_lang_Closure(self, projection); + } + + private staticList $collectMany__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure> projection) { Builder b = new Builder(loc("collectMany")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3429, CpsDefaultGroovyMethods.class, "collectMany", b.cast(3429, b.staticCall(3429, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("projection"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3429, CpsDefaultGroovyMethods.class, "$collectMany__java_lang_Iterable__groovy_lang_Closure", b.cast(3429, b.staticCall(3429, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), Iterable.class, false), b.localVariable("projection"))))); throw new CpsCallableInvocation(f, null, self, projection); } - public staticCollection collect(Map self, Collection collector, Closure transform) { + public staticCollection collect(Map self, Collection collector, Closure transform) { if ((!Caller.isAsynchronous(self, "collect", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, collector, transform))) { return DefaultGroovyMethods.collect(self, collector, transform); } + return CpsDefaultGroovyMethods.$collect__java_util_Map__java_util_Collection__groovy_lang_Closure(self, collector, transform); + } + + private staticCollection $collect__java_util_Map__java_util_Collection__groovy_lang_Closure(Map self, Collection collector, Closure transform) { Builder b = new Builder(loc("collect")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3445, null, java.util.Map.Entry.class, "entry", b.functionCall(3445, b.localVariable("self"), "entrySet"), b.block(b.functionCall(3446, b.localVariable("collector"), "add", b.staticCall(3446, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("transform"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3445, null, java.util.Map.Entry.class, "entry", b.functionCall(3445, b.localVariable("self"), "entrySet"), b.block(b.functionCall(3446, b.localVariable("collector"), "add", b.staticCall(3446, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("transform"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); throw new CpsCallableInvocation(f, null, self, collector, transform); } - public staticList collect(Map self, Closure transform) { + public staticList collect(Map self, Closure transform) { if ((!Caller.isAsynchronous(self, "collect", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, transform))) { return DefaultGroovyMethods.collect(self, transform); } + return CpsDefaultGroovyMethods.$collect__java_util_Map__groovy_lang_Closure(self, transform); + } + + private staticList $collect__java_util_Map__groovy_lang_Closure(Map self, Closure transform) { Builder b = new Builder(loc("collect")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3463, b.staticCall(3463, CpsDefaultGroovyMethods.class, "collect", b.localVariable("self"), b.new_(3463, ArrayList.class, b.functionCall(3463, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3463, b.staticCall(3463, CpsDefaultGroovyMethods.class, "$collect__java_util_Map__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3463, ArrayList.class, b.functionCall(3463, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); throw new CpsCallableInvocation(f, null, self, transform); } - public staticMap collectEntries(Map self, Map collector, Closure transform) { + public staticMap collectEntries(Map self, Map collector, Closure transform) { if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { return DefaultGroovyMethods.collectEntries(self, collector, transform); } + return CpsDefaultGroovyMethods.$collectEntries__java_util_Map__java_util_Map__groovy_lang_Closure(self, collector, transform); + } + + private staticMap $collectEntries__java_util_Map__java_util_Map__groovy_lang_Closure(Map self, Map collector, Closure transform) { Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3488, null, java.util.Map.Entry.class, "entry", b.functionCall(3488, b.localVariable("self"), "entrySet"), b.block(b.staticCall(3489, CpsDefaultGroovyMethods.class, "addEntry", b.localVariable("collector"), b.staticCall(3489, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("transform"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3488, null, java.util.Map.Entry.class, "entry", b.functionCall(3488, b.localVariable("self"), "entrySet"), b.block(b.staticCall(3489, CpsDefaultGroovyMethods.class, "$addEntry__java_util_Map__java_lang_Object", b.localVariable("collector"), b.staticCall(3489, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("transform"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); throw new CpsCallableInvocation(f, null, self, collector, transform); } - public staticMap collectEntries(Map self, Closure transform) { + public staticMap collectEntries(Map self, Closure transform) { if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { return DefaultGroovyMethods.collectEntries(self, transform); } + return CpsDefaultGroovyMethods.$collectEntries__java_util_Map__groovy_lang_Closure(self, transform); + } + + private staticMap $collectEntries__java_util_Map__groovy_lang_Closure(Map self, Closure transform) { Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3515, CpsDefaultGroovyMethods.class, "collectEntries", b.localVariable("self"), b.functionCall(3515, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarMap", b.localVariable("self")), b.localVariable("transform"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3515, CpsDefaultGroovyMethods.class, "$collectEntries__java_util_Map__java_util_Map__groovy_lang_Closure", b.localVariable("self"), b.functionCall(3515, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarMap", b.localVariable("self")), b.localVariable("transform"))))); throw new CpsCallableInvocation(f, null, self, transform); } - public staticMap collectEntries(Iterator self, Closure transform) { + public staticMap collectEntries(Iterator self, Closure transform) { if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { return DefaultGroovyMethods.collectEntries(self, transform); } + return CpsDefaultGroovyMethods.$collectEntries__java_util_Iterator__groovy_lang_Closure(self, transform); + } + + private staticMap $collectEntries__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure transform) { Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3539, CpsDefaultGroovyMethods.class, "collectEntries", b.localVariable("self"), b.new_(3539, LinkedHashMap.class), b.localVariable("transform"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3539, CpsDefaultGroovyMethods.class, "$collectEntries__java_util_Iterator__java_util_Map__groovy_lang_Closure", b.localVariable("self"), b.new_(3539, LinkedHashMap.class), b.localVariable("transform"))))); throw new CpsCallableInvocation(f, null, self, transform); } - public staticMap collectEntries(Iterable self, Closure transform) { + public staticMap collectEntries(Iterable self, Closure transform) { if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { return DefaultGroovyMethods.collectEntries(self, transform); } + return CpsDefaultGroovyMethods.$collectEntries__java_lang_Iterable__groovy_lang_Closure(self, transform); + } + + private staticMap $collectEntries__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure transform) { Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3564, CpsDefaultGroovyMethods.class, "collectEntries", b.functionCall(3564, b.localVariable("self"), "iterator"), b.localVariable("transform"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3564, CpsDefaultGroovyMethods.class, "$collectEntries__java_util_Iterator__groovy_lang_Closure", b.functionCall(3564, b.localVariable("self"), "iterator"), b.localVariable("transform"))))); throw new CpsCallableInvocation(f, null, self, transform); } - public staticMap collectEntries(Iterator self, Map collector, Closure transform) { + public staticMap collectEntries(Iterator self, Map collector, Closure transform) { if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { return DefaultGroovyMethods.collectEntries(self, collector, transform); } + return CpsDefaultGroovyMethods.$collectEntries__java_util_Iterator__java_util_Map__groovy_lang_Closure(self, collector, transform); + } + + private staticMap $collectEntries__java_util_Iterator__java_util_Map__groovy_lang_Closure(Iterator self, Map collector, Closure transform) { Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.while_(null, b.functionCall(3630, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(3631, Object.class, "next", b.functionCall(3631, b.localVariable("self"), "next")), b.staticCall(3632, CpsDefaultGroovyMethods.class, "addEntry", b.localVariable("collector"), b.functionCall(3632, b.localVariable("transform"), "call", b.localVariable("next"))))), b.return_(b.localVariable("collector")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.while_(null, b.functionCall(3630, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(3631, Object.class, "next", b.functionCall(3631, b.localVariable("self"), "next")), b.staticCall(3632, CpsDefaultGroovyMethods.class, "$addEntry__java_util_Map__java_lang_Object", b.localVariable("collector"), b.functionCall(3632, b.localVariable("transform"), "call", b.localVariable("next"))))), b.return_(b.localVariable("collector")))); throw new CpsCallableInvocation(f, null, self, collector, transform); } - public staticMap collectEntries(Iterable self, Map collector, Closure transform) { + public staticMap collectEntries(Iterable self, Map collector, Closure transform) { if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { return DefaultGroovyMethods.collectEntries(self, collector, transform); } + return CpsDefaultGroovyMethods.$collectEntries__java_lang_Iterable__java_util_Map__groovy_lang_Closure(self, collector, transform); + } + + private staticMap $collectEntries__java_lang_Iterable__java_util_Map__groovy_lang_Closure(Iterable self, Map collector, Closure transform) { Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.return_(b.staticCall(3661, CpsDefaultGroovyMethods.class, "collectEntries", b.functionCall(3661, b.localVariable("self"), "iterator"), b.localVariable("collector"), b.localVariable("transform"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.return_(b.staticCall(3661, CpsDefaultGroovyMethods.class, "$collectEntries__java_util_Iterator__java_util_Map__groovy_lang_Closure", b.functionCall(3661, b.localVariable("self"), "iterator"), b.localVariable("collector"), b.localVariable("transform"))))); throw new CpsCallableInvocation(f, null, self, collector, transform); } - public staticMap collectEntries(Object[] self, Map collector, Closure transform) { + public staticMap collectEntries(E[] self, Map collector, Closure transform) { if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { return DefaultGroovyMethods.collectEntries(self, collector, transform); } + return CpsDefaultGroovyMethods.$collectEntries__java_lang_Object_array__java_util_Map__groovy_lang_Closure(self, collector, transform); + } + + private staticMap $collectEntries__java_lang_Object_array__java_util_Map__groovy_lang_Closure(E[] self, Map collector, Closure transform) { Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.return_(b.staticCall(3728, CpsDefaultGroovyMethods.class, "collectEntries", b.cast(3728, b.staticCall(3728, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("collector"), b.localVariable("transform"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.return_(b.staticCall(3728, CpsDefaultGroovyMethods.class, "$collectEntries__java_lang_Iterable__java_util_Map__groovy_lang_Closure", b.cast(3728, b.staticCall(3728, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.localVariable("collector"), b.localVariable("transform"))))); throw new CpsCallableInvocation(f, null, self, collector, transform); } - public staticMap collectEntries(Object[] self, Closure transform) { + public staticMap collectEntries(E[] self, Closure transform) { if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { return DefaultGroovyMethods.collectEntries(self, transform); } + return CpsDefaultGroovyMethods.$collectEntries__java_lang_Object_array__groovy_lang_Closure(self, transform); + } + + private staticMap $collectEntries__java_lang_Object_array__groovy_lang_Closure(E[] self, Closure transform) { Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3767, CpsDefaultGroovyMethods.class, "collectEntries", b.cast(3767, b.staticCall(3767, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.new_(3767, LinkedHashMap.class), b.localVariable("transform"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3767, CpsDefaultGroovyMethods.class, "$collectEntries__java_lang_Iterable__java_util_Map__groovy_lang_Closure", b.cast(3767, b.staticCall(3767, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.new_(3767, LinkedHashMap.class), b.localVariable("transform"))))); throw new CpsCallableInvocation(f, null, self, transform); } @@ -629,6 +916,10 @@ public static Object find(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "find", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, closure))) { return DefaultGroovyMethods.find(self, closure); } + return CpsDefaultGroovyMethods.$find__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private static Object $find__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("find")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(3808, BooleanClosureWrapper.class, "bcw", b.new_(3808, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(3809, Iterator.class, "iter", b.functionCall(3809, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(3809, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.declareVariable(3810, Object.class, "value", b.functionCall(3810, b.localVariable("iter"), "next")), b.if_(b.functionCall(3811, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.return_(b.localVariable("value")))))), b.return_(b.constant(null)))); throw new CpsCallableInvocation(f, null, self, closure); @@ -638,8 +929,12 @@ public static Object findResult(Object self, Object defaultResult, Closure closu if ((!Caller.isAsynchronous(self, "findResult", defaultResult, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, defaultResult, closure))) { return DefaultGroovyMethods.findResult(self, defaultResult, closure); } + return CpsDefaultGroovyMethods.$findResult__java_lang_Object__java_lang_Object__groovy_lang_Closure(self, defaultResult, closure); + } + + private static Object $findResult__java_lang_Object__java_lang_Object__groovy_lang_Closure(Object self, Object defaultResult, Closure closure) { Builder b = new Builder(loc("findResult")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(3846, Object.class, "result", b.staticCall(3846, CpsDefaultGroovyMethods.class, "findResult", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(3847, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(3846, Object.class, "result", b.staticCall(3846, CpsDefaultGroovyMethods.class, "$findResult__java_lang_Object__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(3847, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); throw new CpsCallableInvocation(f, null, self, defaultResult, closure); } @@ -647,125 +942,181 @@ public static Object findResult(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "findResult", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, closure))) { return DefaultGroovyMethods.findResult(self, closure); } + return CpsDefaultGroovyMethods.$findResult__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private static Object $findResult__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("findResult")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forLoop(null, b.sequence(b.declareVariable(3860, Iterator.class, "iter", b.functionCall(3860, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(3860, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.declareVariable(3861, Object.class, "value", b.functionCall(3861, b.localVariable("iter"), "next")), b.declareVariable(3862, Object.class, "result", b.functionCall(3862, b.localVariable("closure"), "call", b.localVariable("value"))), b.if_(b.compareNotEqual(3863, b.localVariable("result"), b.constant(null)), b.block(b.return_(b.localVariable("result")))))), b.return_(b.constant(null)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject find(Collection self, Closure closure) { + public staticT find(Collection self, Closure closure) { if ((!Caller.isAsynchronous(self, "find", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, closure))) { return DefaultGroovyMethods.find(self, closure); } + return CpsDefaultGroovyMethods.$find__java_util_Collection__groovy_lang_Closure(self, closure); + } + + private staticT $find__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { Builder b = new Builder(loc("find")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(3882, BooleanClosureWrapper.class, "bcw", b.new_(3882, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(3883, null, Object.class, "value", b.localVariable("self"), b.block(b.if_(b.functionCall(3884, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.return_(b.localVariable("value")))))), b.return_(b.constant(null)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject find(Object[] self, Closure condition) { + public staticT find(T[] self, Closure condition) { if ((!Caller.isAsynchronous(self, "find", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, condition))) { return DefaultGroovyMethods.find(self, condition); } + return CpsDefaultGroovyMethods.$find__java_lang_Object_array__groovy_lang_Closure(self, condition); + } + + private staticT $find__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure condition) { Builder b = new Builder(loc("find")); CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(3906, BooleanClosureWrapper.class, "bcw", b.new_(3906, BooleanClosureWrapper.class, b.localVariable("condition"))), b.forInLoop(3907, null, Object.class, "element", b.localVariable("self"), b.block(b.if_(b.functionCall(3908, b.localVariable("bcw"), "call", b.localVariable("element")), b.block(b.return_(b.localVariable("element")))))), b.return_(b.constant(null)))); throw new CpsCallableInvocation(f, null, self, condition); } - public staticObject findResult(Collection self, Object defaultResult, Closure closure) { + public staticT findResult(Collection self, U defaultResult, Closure closure) { if ((!Caller.isAsynchronous(self, "findResult", defaultResult, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, defaultResult, closure))) { return DefaultGroovyMethods.findResult(self, defaultResult, closure); } + return CpsDefaultGroovyMethods.$findResult__java_util_Collection__java_lang_Object__groovy_lang_Closure(self, defaultResult, closure); + } + + private staticT $findResult__java_util_Collection__java_lang_Object__groovy_lang_Closure(Collection self, U defaultResult, Closure closure) { Builder b = new Builder(loc("findResult")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(3951, Object.class, "result", b.staticCall(3951, CpsDefaultGroovyMethods.class, "findResult", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(3952, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(3951, Object.class, "result", b.staticCall(3951, CpsDefaultGroovyMethods.class, "$findResult__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(3952, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); throw new CpsCallableInvocation(f, null, self, defaultResult, closure); } - public staticObject findResult(Collection self, Closure closure) { + public staticT findResult(Collection self, Closure closure) { if ((!Caller.isAsynchronous(self, "findResult", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, closure))) { return DefaultGroovyMethods.findResult(self, closure); } + return CpsDefaultGroovyMethods.$findResult__java_util_Collection__groovy_lang_Closure(self, closure); + } + + private staticT $findResult__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { Builder b = new Builder(loc("findResult")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forInLoop(3972, null, Object.class, "value", b.localVariable("self"), b.block(b.declareVariable(3973, Object.class, "result", b.functionCall(3973, b.localVariable("closure"), "call", b.localVariable("value"))), b.if_(b.compareNotEqual(3974, b.localVariable("result"), b.constant(null)), b.block(b.return_(b.localVariable("result")))))), b.return_(b.constant(null)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticCollection findResults(Iterable self, Closure filteringTransform) { + public staticCollection findResults(Iterable self, Closure filteringTransform) { if ((!Caller.isAsynchronous(self, "findResults", filteringTransform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResults", self, filteringTransform))) { return DefaultGroovyMethods.findResults(self, filteringTransform); } + return CpsDefaultGroovyMethods.$findResults__java_lang_Iterable__groovy_lang_Closure(self, filteringTransform); + } + + private staticCollection $findResults__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure filteringTransform) { Builder b = new Builder(loc("findResults")); CpsFunction f = new CpsFunction(Arrays.asList("self", "filteringTransform"), b.block(b.declareVariable(4008, List.class, "result", b.new_(4008, ArrayList.class)), b.forInLoop(4009, null, Object.class, "value", b.localVariable("self"), b.block(b.declareVariable(4010, Object.class, "transformed", b.functionCall(4010, b.localVariable("filteringTransform"), "call", b.localVariable("value"))), b.if_(b.compareNotEqual(4011, b.localVariable("transformed"), b.constant(null)), b.block(b.functionCall(4012, b.localVariable("result"), "add", b.localVariable("transformed")))))), b.return_(b.localVariable("result")))); throw new CpsCallableInvocation(f, null, self, filteringTransform); } - public staticCollection findResults(Map self, Closure filteringTransform) { + public staticCollection findResults(Map self, Closure filteringTransform) { if ((!Caller.isAsynchronous(self, "findResults", filteringTransform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResults", self, filteringTransform))) { return DefaultGroovyMethods.findResults(self, filteringTransform); } + return CpsDefaultGroovyMethods.$findResults__java_util_Map__groovy_lang_Closure(self, filteringTransform); + } + + private staticCollection $findResults__java_util_Map__groovy_lang_Closure(Map self, Closure filteringTransform) { Builder b = new Builder(loc("findResults")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "filteringTransform"), b.block(b.declareVariable(4037, List.class, "result", b.new_(4037, ArrayList.class)), b.forInLoop(4038, null, java.util.Map.Entry.class, "entry", b.functionCall(4038, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(4039, Object.class, "transformed", b.staticCall(4039, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("filteringTransform"), b.localVariable("entry"))), b.if_(b.compareNotEqual(4040, b.localVariable("transformed"), b.constant(null)), b.block(b.functionCall(4041, b.localVariable("result"), "add", b.localVariable("transformed")))))), b.return_(b.localVariable("result")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "filteringTransform"), b.block(b.declareVariable(4037, List.class, "result", b.new_(4037, ArrayList.class)), b.forInLoop(4038, null, java.util.Map.Entry.class, "entry", b.functionCall(4038, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(4039, Object.class, "transformed", b.staticCall(4039, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("filteringTransform"), b.localVariable("entry"))), b.if_(b.compareNotEqual(4040, b.localVariable("transformed"), b.constant(null)), b.block(b.functionCall(4041, b.localVariable("result"), "add", b.localVariable("transformed")))))), b.return_(b.localVariable("result")))); throw new CpsCallableInvocation(f, null, self, filteringTransform); } - public staticjava.util.Map.Entry find(Map self, Closure closure) { + public staticjava.util.Map.Entry find(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "find", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, closure))) { return DefaultGroovyMethods.find(self, closure); } + return CpsDefaultGroovyMethods.$find__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticjava.util.Map.Entry $find__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("find")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4059, BooleanClosureWrapper.class, "bcw", b.new_(4059, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(4060, null, java.util.Map.Entry.class, "entry", b.functionCall(4060, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(4061, b.localVariable("bcw"), "callForMap", b.localVariable("entry")), b.block(b.return_(b.localVariable("entry")))))), b.return_(b.constant(null)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject findResult(Map self, Object defaultResult, Closure closure) { + public staticT findResult(Map self, U defaultResult, Closure closure) { if ((!Caller.isAsynchronous(self, "findResult", defaultResult, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, defaultResult, closure))) { return DefaultGroovyMethods.findResult(self, defaultResult, closure); } + return CpsDefaultGroovyMethods.$findResult__java_util_Map__java_lang_Object__groovy_lang_Closure(self, defaultResult, closure); + } + + private staticT $findResult__java_util_Map__java_lang_Object__groovy_lang_Closure(Map self, U defaultResult, Closure closure) { Builder b = new Builder(loc("findResult")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(4085, Object.class, "result", b.staticCall(4085, CpsDefaultGroovyMethods.class, "findResult", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(4086, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(4085, Object.class, "result", b.staticCall(4085, CpsDefaultGroovyMethods.class, "$findResult__java_util_Map__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(4086, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); throw new CpsCallableInvocation(f, null, self, defaultResult, closure); } - public staticObject findResult(Map self, Closure closure) { + public staticT findResult(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "findResult", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, closure))) { return DefaultGroovyMethods.findResult(self, closure); } + return CpsDefaultGroovyMethods.$findResult__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticT $findResult__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("findResult")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forInLoop(4106, null, java.util.Map.Entry.class, "entry", b.functionCall(4106, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(4107, Object.class, "result", b.staticCall(4107, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("closure"), b.localVariable("entry"))), b.if_(b.compareNotEqual(4108, b.localVariable("result"), b.constant(null)), b.block(b.return_(b.localVariable("result")))))), b.return_(b.constant(null)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forInLoop(4106, null, java.util.Map.Entry.class, "entry", b.functionCall(4106, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(4107, Object.class, "result", b.staticCall(4107, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("closure"), b.localVariable("entry"))), b.if_(b.compareNotEqual(4108, b.localVariable("result"), b.constant(null)), b.block(b.return_(b.localVariable("result")))))), b.return_(b.constant(null)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticSet findAll(Set self, Closure closure) { + public staticSet findAll(Set self, Closure closure) { if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { return DefaultGroovyMethods.findAll(self, closure); } + return CpsDefaultGroovyMethods.$findAll__java_util_Set__groovy_lang_Closure(self, closure); + } + + private staticSet $findAll__java_util_Set__groovy_lang_Closure(Set self, Closure closure) { Builder b = new Builder(loc("findAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4125, b.staticCall(4125, CpsDefaultGroovyMethods.class, "findAll", b.cast(4125, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), Set.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4125, b.staticCall(4125, CpsDefaultGroovyMethods.class, "$findAll__java_util_Collection__groovy_lang_Closure", b.cast(4125, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), Set.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticList findAll(List self, Closure closure) { + public staticList findAll(List self, Closure closure) { if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { return DefaultGroovyMethods.findAll(self, closure); } + return CpsDefaultGroovyMethods.$findAll__java_util_List__groovy_lang_Closure(self, closure); + } + + private staticList $findAll__java_util_List__groovy_lang_Closure(List self, Closure closure) { Builder b = new Builder(loc("findAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4138, b.staticCall(4138, CpsDefaultGroovyMethods.class, "findAll", b.cast(4138, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4138, b.staticCall(4138, CpsDefaultGroovyMethods.class, "$findAll__java_util_Collection__groovy_lang_Closure", b.cast(4138, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticCollection findAll(Collection self, Closure closure) { + public staticCollection findAll(Collection self, Closure closure) { if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { return DefaultGroovyMethods.findAll(self, closure); } + return CpsDefaultGroovyMethods.$findAll__java_util_Collection__groovy_lang_Closure(self, closure); + } + + private staticCollection $findAll__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { Builder b = new Builder(loc("findAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4151, Collection.class, "answer", b.functionCall(4151, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4152, Iterator.class, "iter", b.functionCall(4152, b.localVariable("self"), "iterator")), b.return_(b.staticCall(4153, CpsDefaultGroovyMethods.class, "findAll", b.localVariable("closure"), b.localVariable("answer"), b.localVariable("iter"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4151, Collection.class, "answer", b.functionCall(4151, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4152, Iterator.class, "iter", b.functionCall(4152, b.localVariable("self"), "iterator")), b.return_(b.staticCall(4153, CpsDefaultGroovyMethods.class, "$findAll__groovy_lang_Closure__java_util_Collection__java_util_Iterator", b.localVariable("closure"), b.localVariable("answer"), b.localVariable("iter"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticCollection findAll(Object[] self, Closure condition) { + public staticCollection findAll(T[] self, Closure condition) { if ((!Caller.isAsynchronous(self, "findAll", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, condition))) { return DefaultGroovyMethods.findAll(self, condition); } + return CpsDefaultGroovyMethods.$findAll__java_lang_Object_array__groovy_lang_Closure(self, condition); + } + + private staticCollection $findAll__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure condition) { Builder b = new Builder(loc("findAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(4169, Collection.class, "answer", b.new_(4169, ArrayList.class)), b.return_(b.staticCall(4170, CpsDefaultGroovyMethods.class, "findAll", b.localVariable("condition"), b.localVariable("answer"), b.new_(4170, ArrayIterator.class, b.localVariable("self")))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(4169, Collection.class, "answer", b.new_(4169, ArrayList.class)), b.return_(b.staticCall(4170, CpsDefaultGroovyMethods.class, "$findAll__groovy_lang_Closure__java_util_Collection__java_util_Iterator", b.localVariable("condition"), b.localVariable("answer"), b.new_(4170, ArrayIterator.class, b.localVariable("self")))))); throw new CpsCallableInvocation(f, null, self, condition); } @@ -773,24 +1124,36 @@ public static Collection findAll(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { return DefaultGroovyMethods.findAll(self, closure); } + return CpsDefaultGroovyMethods.$findAll__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private static Collection $findAll__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("findAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4254, List.class, "answer", b.new_(4254, ArrayList.class)), b.declareVariable(4255, Iterator.class, "iter", b.functionCall(4255, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.return_(b.staticCall(4256, CpsDefaultGroovyMethods.class, "findAll", b.localVariable("closure"), b.localVariable("answer"), b.localVariable("iter"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4254, List.class, "answer", b.new_(4254, ArrayList.class)), b.declareVariable(4255, Iterator.class, "iter", b.functionCall(4255, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.return_(b.staticCall(4256, CpsDefaultGroovyMethods.class, "$findAll__groovy_lang_Closure__java_util_Collection__java_util_Iterator", b.localVariable("closure"), b.localVariable("answer"), b.localVariable("iter"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticboolean retainAll(Collection self, Closure condition) { + public staticboolean retainAll(Collection self, Closure condition) { if ((!Caller.isAsynchronous(self, "retainAll", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "retainAll", self, condition))) { return DefaultGroovyMethods.retainAll(self, condition); } + return CpsDefaultGroovyMethods.$retainAll__java_util_Collection__groovy_lang_Closure(self, condition); + } + + private staticboolean $retainAll__java_util_Collection__groovy_lang_Closure(Collection self, Closure condition) { Builder b = new Builder(loc("retainAll")); CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(4385, Iterator.class, "iter", b.functionCall(4385, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.declareVariable(4386, BooleanClosureWrapper.class, "bcw", b.new_(4386, BooleanClosureWrapper.class, b.localVariable("condition"))), b.declareVariable(4387, int.class, "result", b.constant(false)), b.while_(null, b.functionCall(4388, b.localVariable("iter"), "hasNext"), b.block(b.declareVariable(4389, Object.class, "value", b.functionCall(4389, b.localVariable("iter"), "next")), b.if_(b.not(4390, b.functionCall(4390, b.localVariable("bcw"), "call", b.localVariable("value"))), b.block(b.functionCall(4391, b.localVariable("iter"), "remove"), b.assign(4392, b.localVariable("result"), b.constant(true)))))), b.return_(b.localVariable("result")))); throw new CpsCallableInvocation(f, null, self, condition); } - public staticboolean removeAll(Collection self, Closure condition) { + public staticboolean removeAll(Collection self, Closure condition) { if ((!Caller.isAsynchronous(self, "removeAll", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "removeAll", self, condition))) { return DefaultGroovyMethods.removeAll(self, condition); } + return CpsDefaultGroovyMethods.$removeAll__java_util_Collection__groovy_lang_Closure(self, condition); + } + + private staticboolean $removeAll__java_util_Collection__groovy_lang_Closure(Collection self, Closure condition) { Builder b = new Builder(loc("removeAll")); CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(4412, Iterator.class, "iter", b.functionCall(4412, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.declareVariable(4413, BooleanClosureWrapper.class, "bcw", b.new_(4413, BooleanClosureWrapper.class, b.localVariable("condition"))), b.declareVariable(4414, int.class, "result", b.constant(false)), b.while_(null, b.functionCall(4415, b.localVariable("iter"), "hasNext"), b.block(b.declareVariable(4416, Object.class, "value", b.functionCall(4416, b.localVariable("iter"), "next")), b.if_(b.functionCall(4417, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.functionCall(4418, b.localVariable("iter"), "remove"), b.assign(4419, b.localVariable("result"), b.constant(true)))))), b.return_(b.localVariable("result")))); throw new CpsCallableInvocation(f, null, self, condition); @@ -800,35 +1163,51 @@ public static Collection split(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { return DefaultGroovyMethods.split(self, closure); } + return CpsDefaultGroovyMethods.$split__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private static Collection $split__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("split")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4478, List.class, "accept", b.new_(4478, ArrayList.class)), b.declareVariable(4479, List.class, "reject", b.new_(4479, ArrayList.class)), b.return_(b.staticCall(4480, CpsDefaultGroovyMethods.class, "split", b.localVariable("closure"), b.localVariable("accept"), b.localVariable("reject"), b.functionCall(4480, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4478, List.class, "accept", b.new_(4478, ArrayList.class)), b.declareVariable(4479, List.class, "reject", b.new_(4479, ArrayList.class)), b.return_(b.staticCall(4480, CpsDefaultGroovyMethods.class, "$split__groovy_lang_Closure__java_util_Collection__java_util_Collection__java_util_Iterator", b.localVariable("closure"), b.localVariable("accept"), b.localVariable("reject"), b.functionCall(4480, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticCollection> split(Collection self, Closure closure) { + public staticCollection> split(Collection self, Closure closure) { if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { return DefaultGroovyMethods.split(self, closure); } + return CpsDefaultGroovyMethods.$split__java_util_Collection__groovy_lang_Closure(self, closure); + } + + private staticCollection> $split__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { Builder b = new Builder(loc("split")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4497, Collection.class, "accept", b.functionCall(4497, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4498, Collection.class, "reject", b.functionCall(4498, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4499, Iterator.class, "iter", b.functionCall(4499, b.localVariable("self"), "iterator")), b.return_(b.staticCall(4500, CpsDefaultGroovyMethods.class, "split", b.localVariable("closure"), b.localVariable("accept"), b.localVariable("reject"), b.localVariable("iter"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4497, Collection.class, "accept", b.functionCall(4497, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4498, Collection.class, "reject", b.functionCall(4498, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4499, Iterator.class, "iter", b.functionCall(4499, b.localVariable("self"), "iterator")), b.return_(b.staticCall(4500, CpsDefaultGroovyMethods.class, "$split__groovy_lang_Closure__java_util_Collection__java_util_Collection__java_util_Iterator", b.localVariable("closure"), b.localVariable("accept"), b.localVariable("reject"), b.localVariable("iter"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticList> split(List self, Closure closure) { + public staticList> split(List self, Closure closure) { if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { return DefaultGroovyMethods.split(self, closure); } + return CpsDefaultGroovyMethods.$split__java_util_List__groovy_lang_Closure(self, closure); + } + + private staticList> $split__java_util_List__groovy_lang_Closure(List self, Closure closure) { Builder b = new Builder(loc("split")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4534, b.cast(4534, b.staticCall(4534, CpsDefaultGroovyMethods.class, "split", b.cast(4534, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4534, b.cast(4534, b.staticCall(4534, CpsDefaultGroovyMethods.class, "$split__java_util_Collection__groovy_lang_Closure", b.cast(4534, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false), List.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticList> split(Set self, Closure closure) { + public staticList> split(Set self, Closure closure) { if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { return DefaultGroovyMethods.split(self, closure); } + return CpsDefaultGroovyMethods.$split__java_util_Set__groovy_lang_Closure(self, closure); + } + + private staticList> $split__java_util_Set__groovy_lang_Closure(Set self, Closure closure) { Builder b = new Builder(loc("split")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4552, b.cast(4552, b.staticCall(4552, CpsDefaultGroovyMethods.class, "split", b.cast(4552, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false), List.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4552, b.cast(4552, b.staticCall(4552, CpsDefaultGroovyMethods.class, "$split__java_util_Collection__groovy_lang_Closure", b.cast(4552, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false), List.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } @@ -836,8 +1215,12 @@ public static List combinations(Iterable self, Closure function) { if ((!Caller.isAsynchronous(self, "combinations", function))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "combinations", self, function))) { return DefaultGroovyMethods.combinations(self, function); } + return CpsDefaultGroovyMethods.$combinations__java_lang_Iterable__groovy_lang_Closure(self, function); + } + + private static List $combinations__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure function) { Builder b = new Builder(loc("combinations")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.return_(b.staticCall(4596, CpsDefaultGroovyMethods.class, "collect", b.functionCall(4596, b.constant(GroovyCollections.class), "combinations", b.localVariable("self")), b.localVariable("function"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.return_(b.staticCall(4596, CpsDefaultGroovyMethods.class, "$collect__java_util_Collection__groovy_lang_Closure", b.functionCall(4596, b.constant(GroovyCollections.class), "combinations", b.localVariable("self")), b.localVariable("function"))))); throw new CpsCallableInvocation(f, null, self, function); } @@ -846,177 +1229,257 @@ public static void eachCombination(Iterable self, Closure function) { DefaultGroovyMethods.eachCombination(self, function); return ; } + CpsDefaultGroovyMethods.$eachCombination__java_lang_Iterable__groovy_lang_Closure(self, function); + } + + private static void $eachCombination__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure function) { Builder b = new Builder(loc("eachCombination")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.staticCall(4611, CpsDefaultGroovyMethods.class, "each", b.functionCall(4611, b.constant(GroovyCollections.class), "combinations", b.localVariable("self")), b.localVariable("function")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.staticCall(4611, CpsDefaultGroovyMethods.class, "$each__java_util_List__groovy_lang_Closure", b.functionCall(4611, b.constant(GroovyCollections.class), "combinations", b.localVariable("self")), b.localVariable("function")))); throw new CpsCallableInvocation(f, null, self, function); } - public staticList permutations(Iterable self, Closure function) { + public staticList permutations(Iterable self, Closure function) { if ((!Caller.isAsynchronous(self, "permutations", function))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "permutations", self, function))) { return DefaultGroovyMethods.permutations(self, function); } + return CpsDefaultGroovyMethods.$permutations__java_lang_Iterable__groovy_lang_Closure(self, function); + } + + private staticList $permutations__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure function) { Builder b = new Builder(loc("permutations")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.return_(b.staticCall(4673, CpsDefaultGroovyMethods.class, "collect", b.staticCall(4673, CpsDefaultGroovyMethods.class, "permutations", b.localVariable("self")), b.localVariable("function"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.return_(b.staticCall(4673, CpsDefaultGroovyMethods.class, "$collect__java_util_Collection__groovy_lang_Closure", b.staticCall(4673, CpsDefaultGroovyMethods.class, "$permutations__java_lang_Iterable", b.localVariable("self")), b.localVariable("function"))))); throw new CpsCallableInvocation(f, null, self, function); } - public staticIterator> eachPermutation(Iterable self, Closure closure) { + public staticIterator> eachPermutation(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "eachPermutation", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachPermutation", self, closure))) { return DefaultGroovyMethods.eachPermutation(self, closure); } + return CpsDefaultGroovyMethods.$eachPermutation__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticIterator> $eachPermutation__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("eachPermutation")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4710, Iterator.class, "generator", b.new_(4710, PermutationGenerator.class, b.localVariable("self"))), b.while_(null, b.functionCall(4711, b.localVariable("generator"), "hasNext"), b.block(b.functionCall(4712, b.localVariable("closure"), "call", b.functionCall(4712, b.localVariable("generator"), "next")))), b.return_(b.localVariable("generator")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap findAll(Map self, Closure closure) { + public staticMap findAll(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { return DefaultGroovyMethods.findAll(self, closure); } + return CpsDefaultGroovyMethods.$findAll__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticMap $findAll__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("findAll")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4762, Map.class, "answer", b.functionCall(4762, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarMap", b.localVariable("self"))), b.declareVariable(4763, BooleanClosureWrapper.class, "bcw", b.new_(4763, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(4764, null, java.util.Map.Entry.class, "entry", b.functionCall(4764, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(4765, b.localVariable("bcw"), "callForMap", b.localVariable("entry")), b.block(b.functionCall(4766, b.localVariable("answer"), "put", b.functionCall(4766, b.localVariable("entry"), "getKey"), b.functionCall(4766, b.localVariable("entry"), "getValue")))))), b.return_(b.localVariable("answer")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap> groupBy(Iterable self, Closure closure) { + public staticMap> groupBy(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "groupBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupBy", self, closure))) { return DefaultGroovyMethods.groupBy(self, closure); } + return CpsDefaultGroovyMethods.$groupBy__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticMap> $groupBy__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("groupBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4799, Map.class, "answer", b.new_(4799, LinkedHashMap.class)), b.forInLoop(4800, null, Object.class, "element", b.localVariable("self"), b.block(b.declareVariable(4801, Object.class, "value", b.functionCall(4801, b.localVariable("closure"), "call", b.localVariable("element"))), b.staticCall(4802, CpsDefaultGroovyMethods.class, "groupAnswer", b.localVariable("answer"), b.localVariable("element"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4799, Map.class, "answer", b.new_(4799, LinkedHashMap.class)), b.forInLoop(4800, null, Object.class, "element", b.localVariable("self"), b.block(b.declareVariable(4801, Object.class, "value", b.functionCall(4801, b.localVariable("closure"), "call", b.localVariable("element"))), b.staticCall(4802, CpsDefaultGroovyMethods.class, "$groupAnswer__java_util_Map__java_lang_Object__java_lang_Object", b.localVariable("answer"), b.localVariable("element"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap> groupBy(Object[] self, Closure closure) { + public staticMap> groupBy(T[] self, Closure closure) { if ((!Caller.isAsynchronous(self, "groupBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupBy", self, closure))) { return DefaultGroovyMethods.groupBy(self, closure); } + return CpsDefaultGroovyMethods.$groupBy__java_lang_Object_array__groovy_lang_Closure(self, closure); + } + + private staticMap> $groupBy__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { Builder b = new Builder(loc("groupBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(4826, CpsDefaultGroovyMethods.class, "groupBy", b.cast(4826, b.functionCall(4826, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(4826, CpsDefaultGroovyMethods.class, "$groupBy__java_lang_Iterable__groovy_lang_Closure", b.cast(4826, b.functionCall(4826, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap countBy(Iterable self, Closure closure) { + public staticMap countBy(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { return DefaultGroovyMethods.countBy(self, closure); } + return CpsDefaultGroovyMethods.$countBy__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticMap $countBy__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("countBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(4993, CpsDefaultGroovyMethods.class, "countBy", b.functionCall(4993, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(4993, CpsDefaultGroovyMethods.class, "$countBy__java_util_Iterator__groovy_lang_Closure", b.functionCall(4993, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap countBy(Object[] self, Closure closure) { + public staticMap countBy(E[] self, Closure closure) { if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { return DefaultGroovyMethods.countBy(self, closure); } + return CpsDefaultGroovyMethods.$countBy__java_lang_Object_array__groovy_lang_Closure(self, closure); + } + + private staticMap $countBy__java_lang_Object_array__groovy_lang_Closure(E[] self, Closure closure) { Builder b = new Builder(loc("countBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5013, CpsDefaultGroovyMethods.class, "countBy", b.cast(5013, b.functionCall(5013, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5013, CpsDefaultGroovyMethods.class, "$countBy__java_lang_Iterable__groovy_lang_Closure", b.cast(5013, b.functionCall(5013, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap countBy(Iterator self, Closure closure) { + public staticMap countBy(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { return DefaultGroovyMethods.countBy(self, closure); } + return CpsDefaultGroovyMethods.$countBy__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private staticMap $countBy__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("countBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5033, Map.class, "answer", b.new_(5033, LinkedHashMap.class)), b.while_(null, b.functionCall(5034, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(5035, Object.class, "value", b.functionCall(5035, b.localVariable("closure"), "call", b.functionCall(5035, b.localVariable("self"), "next"))), b.staticCall(5036, CpsDefaultGroovyMethods.class, "countAnswer", b.localVariable("answer"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5033, Map.class, "answer", b.new_(5033, LinkedHashMap.class)), b.while_(null, b.functionCall(5034, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(5035, Object.class, "value", b.functionCall(5035, b.localVariable("closure"), "call", b.functionCall(5035, b.localVariable("self"), "next"))), b.staticCall(5036, CpsDefaultGroovyMethods.class, "$countAnswer__java_util_Map__java_lang_Object", b.localVariable("answer"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap>> groupEntriesBy(Map self, Closure closure) { + public staticMap>> groupEntriesBy(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "groupEntriesBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupEntriesBy", self, closure))) { return DefaultGroovyMethods.groupEntriesBy(self, closure); } + return CpsDefaultGroovyMethods.$groupEntriesBy__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticMap>> $groupEntriesBy__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("groupEntriesBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5060, Map.class, "answer", b.new_(5060, LinkedHashMap.class)), b.forInLoop(5061, null, java.util.Map.Entry.class, "entry", b.functionCall(5061, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(5062, Object.class, "value", b.staticCall(5062, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("closure"), b.localVariable("entry"))), b.staticCall(5063, CpsDefaultGroovyMethods.class, "groupAnswer", b.localVariable("answer"), b.localVariable("entry"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5060, Map.class, "answer", b.new_(5060, LinkedHashMap.class)), b.forInLoop(5061, null, java.util.Map.Entry.class, "entry", b.functionCall(5061, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(5062, Object.class, "value", b.staticCall(5062, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("closure"), b.localVariable("entry"))), b.staticCall(5063, CpsDefaultGroovyMethods.class, "$groupAnswer__java_util_Map__java_util_Map_Entry__java_lang_Object", b.localVariable("answer"), b.localVariable("entry"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap> groupBy(Map self, Closure closure) { + public staticMap> groupBy(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "groupBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupBy", self, closure))) { return DefaultGroovyMethods.groupBy(self, closure); } + return CpsDefaultGroovyMethods.$groupBy__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticMap> $groupBy__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("groupBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5090, Map.class, "initial", b.staticCall(5090, CpsDefaultGroovyMethods.class, "groupEntriesBy", b.localVariable("self"), b.localVariable("closure"))), b.declareVariable(5091, Map.class, "answer", b.new_(5091, LinkedHashMap.class)), b.forInLoop(5092, null, java.util.Map.Entry.class, "outer", b.functionCall(5092, b.localVariable("initial"), "entrySet"), b.block(b.declareVariable(5093, Object.class, "key", b.functionCall(5093, b.localVariable("outer"), "getKey")), b.declareVariable(5094, List.class, "entries", b.functionCall(5094, b.localVariable("outer"), "getValue")), b.declareVariable(5095, Map.class, "target", b.functionCall(5095, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarMap", b.localVariable("self"))), b.staticCall(5096, CpsDefaultGroovyMethods.class, "putAll", b.localVariable("target"), b.localVariable("entries")), b.functionCall(5097, b.localVariable("answer"), "put", b.localVariable("key"), b.localVariable("target")))), b.return_(b.localVariable("answer")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5090, Map.class, "initial", b.staticCall(5090, CpsDefaultGroovyMethods.class, "$groupEntriesBy__java_util_Map__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure"))), b.declareVariable(5091, Map.class, "answer", b.new_(5091, LinkedHashMap.class)), b.forInLoop(5092, null, java.util.Map.Entry.class, "outer", b.functionCall(5092, b.localVariable("initial"), "entrySet"), b.block(b.declareVariable(5093, Object.class, "key", b.functionCall(5093, b.localVariable("outer"), "getKey")), b.declareVariable(5094, List.class, "entries", b.functionCall(5094, b.localVariable("outer"), "getValue")), b.declareVariable(5095, Map.class, "target", b.functionCall(5095, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarMap", b.localVariable("self"))), b.staticCall(5096, CpsDefaultGroovyMethods.class, "$putAll__java_util_Map__java_util_Collection", b.localVariable("target"), b.localVariable("entries")), b.functionCall(5097, b.localVariable("answer"), "put", b.localVariable("key"), b.localVariable("target")))), b.return_(b.localVariable("answer")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap countBy(Map self, Closure closure) { + public staticMap countBy(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { return DefaultGroovyMethods.countBy(self, closure); } + return CpsDefaultGroovyMethods.$countBy__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticMap $countBy__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("countBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5190, Map.class, "answer", b.new_(5190, LinkedHashMap.class)), b.forInLoop(5191, null, Object.class, "entry", b.functionCall(5191, b.localVariable("self"), "entrySet"), b.block(b.staticCall(5192, CpsDefaultGroovyMethods.class, "countAnswer", b.localVariable("answer"), b.staticCall(5192, CpsDefaultGroovyMethods.class, "callClosureForMapEntry", b.localVariable("closure"), b.cast(5192, b.localVariable("entry"), java.util.Map.Entry.class, false))))), b.return_(b.localVariable("answer")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5190, Map.class, "answer", b.new_(5190, LinkedHashMap.class)), b.forInLoop(5191, null, Object.class, "entry", b.functionCall(5191, b.localVariable("self"), "entrySet"), b.block(b.staticCall(5192, CpsDefaultGroovyMethods.class, "$countAnswer__java_util_Map__java_lang_Object", b.localVariable("answer"), b.staticCall(5192, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("closure"), b.cast(5192, b.localVariable("entry"), java.util.Map.Entry.class, false))))), b.return_(b.localVariable("answer")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject inject(Collection self, Closure closure) { + public staticT inject(Collection self, Closure closure) { if ((!Caller.isAsynchronous(self, "inject", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, closure))) { return DefaultGroovyMethods.inject(self, closure); } + return CpsDefaultGroovyMethods.$inject__java_util_Collection__groovy_lang_Closure(self, closure); + } + + private staticT $inject__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.if_(b.functionCall(5269, b.localVariable("self"), "isEmpty"), b.block(b.throw_(5270, b.new_(5270, NoSuchElementException.class, b.constant("Cannot call inject() on an empty collection without passing an initial value."))))), b.declareVariable(5272, Iterator.class, "iter", b.functionCall(5272, b.localVariable("self"), "iterator")), b.declareVariable(5273, Object.class, "head", b.functionCall(5273, b.localVariable("iter"), "next")), b.declareVariable(5274, Collection.class, "tail", b.staticCall(5274, CpsDefaultGroovyMethods.class, "tail", b.localVariable("self"))), b.if_(b.not(5275, b.functionCall(5275, b.functionCall(5275, b.localVariable("tail"), "iterator"), "hasNext")), b.block(b.return_(b.localVariable("head")))), b.return_(b.cast(5279, b.staticCall(5279, CpsDefaultGroovyMethods.class, "inject", b.cast(5279, b.localVariable("tail"), Collection.class, false), b.localVariable("head"), b.localVariable("closure")), Object.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.if_(b.functionCall(5269, b.localVariable("self"), "isEmpty"), b.block(b.throw_(5270, b.new_(5270, NoSuchElementException.class, b.constant("Cannot call inject() on an empty collection without passing an initial value."))))), b.declareVariable(5272, Iterator.class, "iter", b.functionCall(5272, b.localVariable("self"), "iterator")), b.declareVariable(5273, Object.class, "head", b.functionCall(5273, b.localVariable("iter"), "next")), b.declareVariable(5274, Collection.class, "tail", b.staticCall(5274, CpsDefaultGroovyMethods.class, "$tail__java_lang_Iterable", b.localVariable("self"))), b.if_(b.not(5275, b.functionCall(5275, b.functionCall(5275, b.localVariable("tail"), "iterator"), "hasNext")), b.block(b.return_(b.localVariable("head")))), b.return_(b.cast(5279, b.staticCall(5279, CpsDefaultGroovyMethods.class, "$inject__java_util_Collection__java_lang_Object__groovy_lang_Closure", b.cast(5279, b.localVariable("tail"), Collection.class, false), b.localVariable("head"), b.localVariable("closure")), Object.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject inject(Collection self, Object initialValue, Closure closure) { + public staticT inject(Collection self, U initialValue, Closure closure) { if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { return DefaultGroovyMethods.inject(self, initialValue, closure); } + return CpsDefaultGroovyMethods.$inject__java_util_Collection__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); + } + + private staticT $inject__java_util_Collection__java_lang_Object__groovy_lang_Closure(Collection self, U initialValue, Closure closure) { Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.cast(5324, b.staticCall(5324, CpsDefaultGroovyMethods.class, "inject", b.cast(5324, b.functionCall(5324, b.localVariable("self"), "iterator"), Iterator.class, false), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.cast(5324, b.staticCall(5324, CpsDefaultGroovyMethods.class, "$inject__java_util_Iterator__java_lang_Object__groovy_lang_Closure", b.cast(5324, b.functionCall(5324, b.localVariable("self"), "iterator"), Iterator.class, false), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); throw new CpsCallableInvocation(f, null, self, initialValue, closure); } - public staticObject inject(Map self, Object initialValue, Closure closure) { + public staticT inject(Map self, U initialValue, Closure closure) { if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { return DefaultGroovyMethods.inject(self, initialValue, closure); } + return CpsDefaultGroovyMethods.$inject__java_util_Map__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); + } + + private staticT $inject__java_util_Map__java_lang_Object__groovy_lang_Closure(Map self, U initialValue, Closure closure) { Builder b = new Builder(loc("inject")); CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5350, Object.class, "value", b.localVariable("initialValue")), b.forInLoop(5351, null, java.util.Map.Entry.class, "entry", b.functionCall(5351, b.localVariable("self"), "entrySet"), b.block(b.if_(b.compareEqual(5352, b.functionCall(5352, b.localVariable("closure"), "getMaximumNumberOfParameters"), b.constant(3)), b.block(b.assign(5353, b.localVariable("value"), b.functionCall(5353, b.localVariable("closure"), "call", b.localVariable("value"), b.functionCall(5353, b.localVariable("entry"), "getKey"), b.functionCall(5353, b.localVariable("entry"), "getValue")))), b.block(b.assign(5355, b.localVariable("value"), b.functionCall(5355, b.localVariable("closure"), "call", b.localVariable("value"), b.localVariable("entry"))))))), b.return_(b.localVariable("value")))); throw new CpsCallableInvocation(f, null, self, initialValue, closure); } - public staticObject inject(Iterator self, Object initialValue, Closure closure) { + public staticT inject(Iterator self, U initialValue, Closure closure) { if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { return DefaultGroovyMethods.inject(self, initialValue, closure); } + return CpsDefaultGroovyMethods.$inject__java_util_Iterator__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); + } + + private staticT $inject__java_util_Iterator__java_lang_Object__groovy_lang_Closure(Iterator self, U initialValue, Closure closure) { Builder b = new Builder(loc("inject")); CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5377, Object.class, "value", b.localVariable("initialValue")), b.declareVariable(5378, Object[].class, "params", b.newArray(5378, Object.class, b.constant(2))), b.while_(null, b.functionCall(5379, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(5380, Object.class, "item", b.functionCall(5380, b.localVariable("self"), "next")), b.assign(5381, b.array(5381, b.localVariable("params"), b.constant(0)), b.localVariable("value")), b.assign(5382, b.array(5382, b.localVariable("params"), b.constant(1)), b.localVariable("item")), b.assign(5383, b.localVariable("value"), b.functionCall(5383, b.localVariable("closure"), "call", b.localVariable("params"))))), b.return_(b.localVariable("value")))); throw new CpsCallableInvocation(f, null, self, initialValue, closure); } - public staticObject inject(Object self, Closure closure) { + public staticT inject(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "inject", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, closure))) { return DefaultGroovyMethods.inject(self, closure); } + return CpsDefaultGroovyMethods.$inject__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private staticT $inject__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5403, Iterator.class, "iter", b.functionCall(5403, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.if_(b.not(5404, b.functionCall(5404, b.localVariable("iter"), "hasNext")), b.block(b.throw_(5405, b.new_(5405, NoSuchElementException.class, b.constant("Cannot call inject() over an empty iterable without passing an initial value."))))), b.declareVariable(5407, Object.class, "initialValue", b.functionCall(5407, b.localVariable("iter"), "next")), b.return_(b.cast(5408, b.staticCall(5408, CpsDefaultGroovyMethods.class, "inject", b.localVariable("iter"), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5403, Iterator.class, "iter", b.functionCall(5403, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.if_(b.not(5404, b.functionCall(5404, b.localVariable("iter"), "hasNext")), b.block(b.throw_(5405, b.new_(5405, NoSuchElementException.class, b.constant("Cannot call inject() over an empty iterable without passing an initial value."))))), b.declareVariable(5407, Object.class, "initialValue", b.functionCall(5407, b.localVariable("iter"), "next")), b.return_(b.cast(5408, b.staticCall(5408, CpsDefaultGroovyMethods.class, "$inject__java_util_Iterator__java_lang_Object__groovy_lang_Closure", b.localVariable("iter"), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject inject(Object self, Object initialValue, Closure closure) { + public staticT inject(Object self, U initialValue, Closure closure) { if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { return DefaultGroovyMethods.inject(self, initialValue, closure); } + return CpsDefaultGroovyMethods.$inject__java_lang_Object__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); + } + + private staticT $inject__java_lang_Object__java_lang_Object__groovy_lang_Closure(Object self, U initialValue, Closure closure) { Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5426, Iterator.class, "iter", b.functionCall(5426, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.return_(b.cast(5427, b.staticCall(5427, CpsDefaultGroovyMethods.class, "inject", b.localVariable("iter"), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5426, Iterator.class, "iter", b.functionCall(5426, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.return_(b.cast(5427, b.staticCall(5427, CpsDefaultGroovyMethods.class, "$inject__java_util_Iterator__java_lang_Object__groovy_lang_Closure", b.localVariable("iter"), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); throw new CpsCallableInvocation(f, null, self, initialValue, closure); } - public staticObject inject(Object[] self, Closure closure) { + public staticT inject(E[] self, Closure closure) { if ((!Caller.isAsynchronous(self, "inject", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, closure))) { return DefaultGroovyMethods.inject(self, closure); } + return CpsDefaultGroovyMethods.$inject__java_lang_Object_array__groovy_lang_Closure(self, closure); + } + + private staticT $inject__java_lang_Object_array__groovy_lang_Closure(E[] self, Closure closure) { Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5443, CpsDefaultGroovyMethods.class, "inject", b.cast(5443, b.localVariable("self"), Object.class, false), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5443, CpsDefaultGroovyMethods.class, "$inject__java_lang_Object__groovy_lang_Closure", b.cast(5443, b.localVariable("self"), Object.class, false), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject inject(Object[] self, Object initialValue, Closure closure) { + public staticT inject(E[] self, U initialValue, Closure closure) { if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { return DefaultGroovyMethods.inject(self, initialValue, closure); } + return CpsDefaultGroovyMethods.$inject__java_lang_Object_array__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); + } + + private staticT $inject__java_lang_Object_array__java_lang_Object__groovy_lang_Closure(E[] self, U initialValue, Closure closure) { Builder b = new Builder(loc("inject")); CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5461, Object[].class, "params", b.newArray(5461, Object.class, b.constant(2))), b.declareVariable(5462, Object.class, "value", b.localVariable("initialValue")), b.forInLoop(5463, null, Object.class, "next", b.localVariable("self"), b.block(b.assign(5464, b.array(5464, b.localVariable("params"), b.constant(0)), b.localVariable("value")), b.assign(5465, b.array(5465, b.localVariable("params"), b.constant(1)), b.localVariable("next")), b.assign(5466, b.localVariable("value"), b.functionCall(5466, b.localVariable("closure"), "call", b.localVariable("params"))))), b.return_(b.localVariable("value")))); throw new CpsCallableInvocation(f, null, self, initialValue, closure); @@ -1026,8 +1489,12 @@ public static Object sum(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "sum", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, closure))) { return DefaultGroovyMethods.sum(self, closure); } + return CpsDefaultGroovyMethods.$sum__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private static Object $sum__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5813, CpsDefaultGroovyMethods.class, "sum", b.localVariable("self"), b.constant(null), b.localVariable("closure"), b.constant(true))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5813, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.localVariable("self"), b.constant(null), b.localVariable("closure"), b.constant(true))))); throw new CpsCallableInvocation(f, null, self, closure); } @@ -1035,8 +1502,12 @@ public static Object sum(Object[] self, Closure closure) { if ((!Caller.isAsynchronous(self, "sum", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, closure))) { return DefaultGroovyMethods.sum(self, closure); } + return CpsDefaultGroovyMethods.$sum__java_lang_Object_array__groovy_lang_Closure(self, closure); + } + + private static Object $sum__java_lang_Object_array__groovy_lang_Closure(Object[] self, Closure closure) { Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5828, CpsDefaultGroovyMethods.class, "sum", b.staticCall(5828, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), b.constant(null), b.localVariable("closure"), b.constant(true))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5828, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.staticCall(5828, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), b.constant(null), b.localVariable("closure"), b.constant(true))))); throw new CpsCallableInvocation(f, null, self, closure); } @@ -1044,8 +1515,12 @@ public static Object sum(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "sum", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, closure))) { return DefaultGroovyMethods.sum(self, closure); } + return CpsDefaultGroovyMethods.$sum__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private static Object $sum__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5844, CpsDefaultGroovyMethods.class, "sum", b.staticCall(5844, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), b.constant(null), b.localVariable("closure"), b.constant(true))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5844, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.staticCall(5844, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), b.constant(null), b.localVariable("closure"), b.constant(true))))); throw new CpsCallableInvocation(f, null, self, closure); } @@ -1053,8 +1528,12 @@ public static Object sum(Iterable self, Object initialValue, Closure closure) { if ((!Caller.isAsynchronous(self, "sum", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, initialValue, closure))) { return DefaultGroovyMethods.sum(self, initialValue, closure); } + return CpsDefaultGroovyMethods.$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); + } + + private static Object $sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure(Iterable self, Object initialValue, Closure closure) { Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5871, CpsDefaultGroovyMethods.class, "sum", b.localVariable("self"), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5871, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.localVariable("self"), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); throw new CpsCallableInvocation(f, null, self, initialValue, closure); } @@ -1062,8 +1541,12 @@ public static Object sum(Object[] self, Object initialValue, Closure closure) { if ((!Caller.isAsynchronous(self, "sum", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, initialValue, closure))) { return DefaultGroovyMethods.sum(self, initialValue, closure); } + return CpsDefaultGroovyMethods.$sum__java_lang_Object_array__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); + } + + private static Object $sum__java_lang_Object_array__java_lang_Object__groovy_lang_Closure(Object[] self, Object initialValue, Closure closure) { Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5887, CpsDefaultGroovyMethods.class, "sum", b.staticCall(5887, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5887, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.staticCall(5887, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); throw new CpsCallableInvocation(f, null, self, initialValue, closure); } @@ -1071,223 +1554,427 @@ public static Object sum(Iterator self, Object initialValue, Closure clo if ((!Caller.isAsynchronous(self, "sum", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, initialValue, closure))) { return DefaultGroovyMethods.sum(self, initialValue, closure); } + return CpsDefaultGroovyMethods.$sum__java_util_Iterator__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); + } + + private static Object $sum__java_util_Iterator__java_lang_Object__groovy_lang_Closure(Iterator self, Object initialValue, Closure closure) { Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5904, CpsDefaultGroovyMethods.class, "sum", b.staticCall(5904, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5904, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.staticCall(5904, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); throw new CpsCallableInvocation(f, null, self, initialValue, closure); } - public staticObject min(Iterable self, Closure closure) { + static Object sum(Iterable self, Object initialValue, Closure closure, boolean first) { + return CpsDefaultGroovyMethods.$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean(self, initialValue, closure, first); + } + + private static Object $sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean(Iterable self, Object initialValue, Closure closure, boolean first) { + Builder b = new Builder(loc("sum")); + CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure", "first"), b.block(b.declareVariable(5908, Object.class, "result", b.localVariable("initialValue")), b.declareVariable(5909, Object[].class, "closureParam", b.newArray(5909, Object.class, b.constant(1))), b.declareVariable(5910, Object[].class, "plusParam", b.newArray(5910, Object.class, b.constant(1))), b.forInLoop(5911, null, Object.class, "next", b.localVariable("self"), b.block(b.assign(5912, b.array(5912, b.localVariable("closureParam"), b.constant(0)), b.localVariable("next")), b.assign(5913, b.array(5913, b.localVariable("plusParam"), b.constant(0)), b.functionCall(5913, b.localVariable("closure"), "call", b.localVariable("closureParam"))), b.if_(b.localVariable("first"), b.block(b.assign(5915, b.localVariable("result"), b.array(5915, b.localVariable("plusParam"), b.constant(0))), b.assign(5916, b.localVariable("first"), b.constant(false)), b.continue_(null))), b.declareVariable(5919, MetaClass.class, "metaClass", b.functionCall(5919, b.constant(InvokerHelper.class), "getMetaClass", b.localVariable("result"))), b.assign(5920, b.localVariable("result"), b.functionCall(5920, b.localVariable("metaClass"), "invokeMethod", b.localVariable("result"), b.constant("plus"), b.localVariable("plusParam"))))), b.return_(b.localVariable("result")))); + throw new CpsCallableInvocation(f, null, self, initialValue, closure, first); + } + + public staticT min(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { return DefaultGroovyMethods.min(self, closure); } + return CpsDefaultGroovyMethods.$min__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticT $min__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("min")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(6370, int.class, "params", b.functionCall(6370, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareNotEqual(6371, b.localVariable("params"), b.constant(1)), b.block(b.return_(b.staticCall(6372, CpsDefaultGroovyMethods.class, "min", b.localVariable("self"), b.new_(6372, ClosureComparator.class, b.localVariable("closure")))))), b.declareVariable(6374, int.class, "first", b.constant(true)), b.declareVariable(6375, Object.class, "answer", b.constant(null)), b.declareVariable(6376, Object.class, "answerValue", b.constant(null)), b.forInLoop(6377, null, Object.class, "item", b.localVariable("self"), b.block(b.declareVariable(6378, Object.class, "value", b.functionCall(6378, b.localVariable("closure"), "call", b.localVariable("item"))), b.if_(b.localVariable("first"), b.block(b.assign(6380, b.localVariable("first"), b.constant(false)), b.assign(6381, b.localVariable("answer"), b.localVariable("item")), b.assign(6382, b.localVariable("answerValue"), b.localVariable("value"))), b.if_(b.functionCall(6383, b.constant(ScriptBytecodeAdapter.class), "compareLessThan", b.localVariable("value"), b.localVariable("answerValue")), b.block(b.assign(6384, b.localVariable("answer"), b.localVariable("item")), b.assign(6385, b.localVariable("answerValue"), b.localVariable("value"))))))), b.return_(b.localVariable("answer")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(6370, int.class, "params", b.functionCall(6370, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareNotEqual(6371, b.localVariable("params"), b.constant(1)), b.block(b.return_(b.staticCall(6372, CpsDefaultGroovyMethods.class, "$min__java_lang_Iterable__java_util_Comparator", b.localVariable("self"), b.new_(6372, ClosureComparator.class, b.localVariable("closure")))))), b.declareVariable(6374, int.class, "first", b.constant(true)), b.declareVariable(6375, Object.class, "answer", b.constant(null)), b.declareVariable(6376, Object.class, "answerValue", b.constant(null)), b.forInLoop(6377, null, Object.class, "item", b.localVariable("self"), b.block(b.declareVariable(6378, Object.class, "value", b.functionCall(6378, b.localVariable("closure"), "call", b.localVariable("item"))), b.if_(b.localVariable("first"), b.block(b.assign(6380, b.localVariable("first"), b.constant(false)), b.assign(6381, b.localVariable("answer"), b.localVariable("item")), b.assign(6382, b.localVariable("answerValue"), b.localVariable("value"))), b.if_(b.functionCall(6383, b.constant(ScriptBytecodeAdapter.class), "compareLessThan", b.localVariable("value"), b.localVariable("answerValue")), b.block(b.assign(6384, b.localVariable("answer"), b.localVariable("item")), b.assign(6385, b.localVariable("answerValue"), b.localVariable("value"))))))), b.return_(b.localVariable("answer")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticjava.util.Map.Entry min(Map self, Closure closure) { + public staticjava.util.Map.Entry min(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { return DefaultGroovyMethods.min(self, closure); } + return CpsDefaultGroovyMethods.$min__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticjava.util.Map.Entry $min__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("min")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6426, CpsDefaultGroovyMethods.class, "min", b.cast(6426, b.functionCall(6426, b.localVariable("self"), "entrySet"), Iterable.class, false), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6426, CpsDefaultGroovyMethods.class, "$min__java_lang_Iterable__groovy_lang_Closure", b.cast(6426, b.functionCall(6426, b.localVariable("self"), "entrySet"), Iterable.class, false), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticjava.util.Map.Entry max(Map self, Closure closure) { + public staticjava.util.Map.Entry max(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { return DefaultGroovyMethods.max(self, closure); } + return CpsDefaultGroovyMethods.$max__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticjava.util.Map.Entry $max__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("max")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6464, CpsDefaultGroovyMethods.class, "max", b.cast(6464, b.functionCall(6464, b.localVariable("self"), "entrySet"), Iterable.class, false), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6464, CpsDefaultGroovyMethods.class, "$max__java_lang_Iterable__groovy_lang_Closure", b.cast(6464, b.functionCall(6464, b.localVariable("self"), "entrySet"), Iterable.class, false), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject min(Iterator self, Closure closure) { + public staticT min(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { return DefaultGroovyMethods.min(self, closure); } + return CpsDefaultGroovyMethods.$min__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private staticT $min__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("min")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6489, CpsDefaultGroovyMethods.class, "min", b.cast(6489, b.staticCall(6489, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6489, CpsDefaultGroovyMethods.class, "$min__java_lang_Iterable__groovy_lang_Closure", b.cast(6489, b.staticCall(6489, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject min(Object[] self, Closure closure) { + public staticT min(T[] self, Closure closure) { if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { return DefaultGroovyMethods.min(self, closure); } + return CpsDefaultGroovyMethods.$min__java_lang_Object_array__groovy_lang_Closure(self, closure); + } + + private staticT $min__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { Builder b = new Builder(loc("min")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6512, CpsDefaultGroovyMethods.class, "min", b.cast(6512, b.staticCall(6512, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6512, CpsDefaultGroovyMethods.class, "$min__java_lang_Iterable__groovy_lang_Closure", b.cast(6512, b.staticCall(6512, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject max(Iterable self, Closure closure) { + public staticT max(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { return DefaultGroovyMethods.max(self, closure); } + return CpsDefaultGroovyMethods.$max__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticT $max__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("max")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(6603, int.class, "params", b.functionCall(6603, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareNotEqual(6604, b.localVariable("params"), b.constant(1)), b.block(b.return_(b.staticCall(6605, CpsDefaultGroovyMethods.class, "max", b.localVariable("self"), b.new_(6605, ClosureComparator.class, b.localVariable("closure")))))), b.declareVariable(6607, int.class, "first", b.constant(true)), b.declareVariable(6608, Object.class, "answer", b.constant(null)), b.declareVariable(6609, Object.class, "answerValue", b.constant(null)), b.forInLoop(6610, null, Object.class, "item", b.localVariable("self"), b.block(b.declareVariable(6611, Object.class, "value", b.functionCall(6611, b.localVariable("closure"), "call", b.localVariable("item"))), b.if_(b.localVariable("first"), b.block(b.assign(6613, b.localVariable("first"), b.constant(false)), b.assign(6614, b.localVariable("answer"), b.localVariable("item")), b.assign(6615, b.localVariable("answerValue"), b.localVariable("value"))), b.if_(b.functionCall(6616, b.constant(ScriptBytecodeAdapter.class), "compareLessThan", b.localVariable("answerValue"), b.localVariable("value")), b.block(b.assign(6617, b.localVariable("answer"), b.localVariable("item")), b.assign(6618, b.localVariable("answerValue"), b.localVariable("value"))))))), b.return_(b.localVariable("answer")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(6603, int.class, "params", b.functionCall(6603, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareNotEqual(6604, b.localVariable("params"), b.constant(1)), b.block(b.return_(b.staticCall(6605, CpsDefaultGroovyMethods.class, "$max__java_lang_Iterable__java_util_Comparator", b.localVariable("self"), b.new_(6605, ClosureComparator.class, b.localVariable("closure")))))), b.declareVariable(6607, int.class, "first", b.constant(true)), b.declareVariable(6608, Object.class, "answer", b.constant(null)), b.declareVariable(6609, Object.class, "answerValue", b.constant(null)), b.forInLoop(6610, null, Object.class, "item", b.localVariable("self"), b.block(b.declareVariable(6611, Object.class, "value", b.functionCall(6611, b.localVariable("closure"), "call", b.localVariable("item"))), b.if_(b.localVariable("first"), b.block(b.assign(6613, b.localVariable("first"), b.constant(false)), b.assign(6614, b.localVariable("answer"), b.localVariable("item")), b.assign(6615, b.localVariable("answerValue"), b.localVariable("value"))), b.if_(b.functionCall(6616, b.constant(ScriptBytecodeAdapter.class), "compareLessThan", b.localVariable("answerValue"), b.localVariable("value")), b.block(b.assign(6617, b.localVariable("answer"), b.localVariable("item")), b.assign(6618, b.localVariable("answerValue"), b.localVariable("value"))))))), b.return_(b.localVariable("answer")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject max(Iterator self, Closure closure) { + public staticT max(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { return DefaultGroovyMethods.max(self, closure); } + return CpsDefaultGroovyMethods.$max__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private staticT $max__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("max")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6645, CpsDefaultGroovyMethods.class, "max", b.cast(6645, b.staticCall(6645, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6645, CpsDefaultGroovyMethods.class, "$max__java_lang_Iterable__groovy_lang_Closure", b.cast(6645, b.staticCall(6645, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject max(Object[] self, Closure closure) { + public staticT max(T[] self, Closure closure) { if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { return DefaultGroovyMethods.max(self, closure); } + return CpsDefaultGroovyMethods.$max__java_lang_Object_array__groovy_lang_Closure(self, closure); + } + + private staticT $max__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { Builder b = new Builder(loc("max")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6668, CpsDefaultGroovyMethods.class, "max", b.cast(6668, b.staticCall(6668, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6668, CpsDefaultGroovyMethods.class, "$max__java_lang_Iterable__groovy_lang_Closure", b.cast(6668, b.staticCall(6668, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticMap withDefault(Map self, Closure init) { + public staticMap withDefault(Map self, Closure init) { if ((!Caller.isAsynchronous(self, "withDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withDefault", self, init))) { return DefaultGroovyMethods.withDefault(self, init); } + return CpsDefaultGroovyMethods.$withDefault__java_util_Map__groovy_lang_Closure(self, init); + } + + private staticMap $withDefault__java_util_Map__groovy_lang_Closure(Map self, Closure init) { Builder b = new Builder(loc("withDefault")); CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.functionCall(7750, b.constant(MapWithDefault.class), "newInstance", b.localVariable("self"), b.localVariable("init"))))); throw new CpsCallableInvocation(f, null, self, init); } - public staticList withDefault(List self, Closure init) { + public staticList withDefault(List self, Closure init) { if ((!Caller.isAsynchronous(self, "withDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withDefault", self, init))) { return DefaultGroovyMethods.withDefault(self, init); } + return CpsDefaultGroovyMethods.$withDefault__java_util_List__groovy_lang_Closure(self, init); + } + + private staticList $withDefault__java_util_List__groovy_lang_Closure(List self, Closure init) { Builder b = new Builder(loc("withDefault")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.staticCall(7765, CpsDefaultGroovyMethods.class, "withLazyDefault", b.localVariable("self"), b.localVariable("init"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.staticCall(7765, CpsDefaultGroovyMethods.class, "$withLazyDefault__java_util_List__groovy_lang_Closure", b.localVariable("self"), b.localVariable("init"))))); throw new CpsCallableInvocation(f, null, self, init); } - public staticList withLazyDefault(List self, Closure init) { + public staticList withLazyDefault(List self, Closure init) { if ((!Caller.isAsynchronous(self, "withLazyDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withLazyDefault", self, init))) { return DefaultGroovyMethods.withLazyDefault(self, init); } + return CpsDefaultGroovyMethods.$withLazyDefault__java_util_List__groovy_lang_Closure(self, init); + } + + private staticList $withLazyDefault__java_util_List__groovy_lang_Closure(List self, Closure init) { Builder b = new Builder(loc("withLazyDefault")); CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.functionCall(7811, b.constant(ListWithDefault.class), "newInstance", b.localVariable("self"), b.constant(true), b.localVariable("init"))))); throw new CpsCallableInvocation(f, null, self, init); } - public staticList withEagerDefault(List self, Closure init) { + public staticList withEagerDefault(List self, Closure init) { if ((!Caller.isAsynchronous(self, "withEagerDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withEagerDefault", self, init))) { return DefaultGroovyMethods.withEagerDefault(self, init); } + return CpsDefaultGroovyMethods.$withEagerDefault__java_util_List__groovy_lang_Closure(self, init); + } + + private staticList $withEagerDefault__java_util_List__groovy_lang_Closure(List self, Closure init) { Builder b = new Builder(loc("withEagerDefault")); CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.functionCall(7851, b.constant(ListWithDefault.class), "newInstance", b.localVariable("self"), b.constant(false), b.localVariable("init"))))); throw new CpsCallableInvocation(f, null, self, init); } - public staticMap sort(Map self, Closure closure) { + public staticMap sort(Map self, Closure closure) { if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { return DefaultGroovyMethods.sort(self, closure); } + return CpsDefaultGroovyMethods.$sort__java_util_Map__groovy_lang_Closure(self, closure); + } + + private staticMap $sort__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8129, Map.class, "result", b.new_(8129, LinkedHashMap.class)), b.declareVariable(8130, List.class, "entries", b.staticCall(8130, CpsDefaultGroovyMethods.class, "asList", b.cast(8130, b.functionCall(8130, b.localVariable("self"), "entrySet"), Iterable.class, false))), b.staticCall(8131, CpsDefaultGroovyMethods.class, "sort", b.cast(8131, b.localVariable("entries"), Iterable.class, false), b.localVariable("closure")), b.forInLoop(8132, null, java.util.Map.Entry.class, "entry", b.localVariable("entries"), b.block(b.functionCall(8133, b.localVariable("result"), "put", b.functionCall(8133, b.localVariable("entry"), "getKey"), b.functionCall(8133, b.localVariable("entry"), "getValue")))), b.return_(b.localVariable("result")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8129, Map.class, "result", b.new_(8129, LinkedHashMap.class)), b.declareVariable(8130, List.class, "entries", b.staticCall(8130, CpsDefaultGroovyMethods.class, "$asList__java_lang_Iterable", b.cast(8130, b.functionCall(8130, b.localVariable("self"), "entrySet"), Iterable.class, false))), b.staticCall(8131, CpsDefaultGroovyMethods.class, "$sort__java_lang_Iterable__groovy_lang_Closure", b.cast(8131, b.localVariable("entries"), Iterable.class, false), b.localVariable("closure")), b.forInLoop(8132, null, java.util.Map.Entry.class, "entry", b.localVariable("entries"), b.block(b.functionCall(8133, b.localVariable("result"), "put", b.functionCall(8133, b.localVariable("entry"), "getKey"), b.functionCall(8133, b.localVariable("entry"), "getValue")))), b.return_(b.localVariable("result")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticIterator sort(Iterator self, Closure closure) { + public staticIterator sort(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { return DefaultGroovyMethods.sort(self, closure); } + return CpsDefaultGroovyMethods.$sort__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private staticIterator $sort__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.functionCall(8338, b.staticCall(8338, CpsDefaultGroovyMethods.class, "sort", b.cast(8338, b.staticCall(8338, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure")), "listIterator")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.functionCall(8338, b.staticCall(8338, CpsDefaultGroovyMethods.class, "$sort__java_lang_Iterable__groovy_lang_Closure", b.cast(8338, b.staticCall(8338, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), Iterable.class, false), b.localVariable("closure")), "listIterator")))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject[] sort(Object[] self, Closure closure) { + public staticT[] sort(T[] self, Closure closure) { if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { return DefaultGroovyMethods.sort(self, closure); } + return CpsDefaultGroovyMethods.$sort__java_lang_Object_array__groovy_lang_Closure(self, closure); + } + + private staticT[] $sort__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(8358, CpsDefaultGroovyMethods.class, "sort", b.localVariable("self"), b.constant(false), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(8358, CpsDefaultGroovyMethods.class, "$sort__java_lang_Object_array__boolean__groovy_lang_Closure", b.localVariable("self"), b.constant(false), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject[] sort(Object[] self, boolean mutate, Closure closure) { + public staticT[] sort(T[] self, boolean mutate, Closure closure) { if ((!Caller.isAsynchronous(self, "sort", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, mutate, closure))) { return DefaultGroovyMethods.sort(self, mutate, closure); } + return CpsDefaultGroovyMethods.$sort__java_lang_Object_array__boolean__groovy_lang_Closure(self, mutate, closure); + } + + private staticT[] $sort__java_lang_Object_array__boolean__groovy_lang_Closure(T[] self, boolean mutate, Closure closure) { Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(8388, Object[].class, "answer", b.cast(8388, b.functionCall(8388, b.staticCall(8388, CpsDefaultGroovyMethods.class, "sort", b.cast(8388, b.staticCall(8388, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure")), "toArray"), Object[].class, false)), b.if_(b.localVariable("mutate"), b.block(b.functionCall(8390, b.constant(System.class), "arraycopy", b.localVariable("answer"), b.constant(0), b.localVariable("self"), b.constant(0), b.property(8390, b.localVariable("answer"), "length")))), b.return_(b.ternaryOp(b.localVariable("mutate"), b.localVariable("self"), b.localVariable("answer"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(8388, Object[].class, "answer", b.cast(8388, b.functionCall(8388, b.staticCall(8388, CpsDefaultGroovyMethods.class, "$sort__java_lang_Iterable__groovy_lang_Closure", b.cast(8388, b.staticCall(8388, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.localVariable("closure")), "toArray"), Object[].class, false)), b.if_(b.localVariable("mutate"), b.block(b.functionCall(8390, b.constant(System.class), "arraycopy", b.localVariable("answer"), b.constant(0), b.localVariable("self"), b.constant(0), b.property(8390, b.localVariable("answer"), "length")))), b.return_(b.ternaryOp(b.localVariable("mutate"), b.localVariable("self"), b.localVariable("answer"))))); throw new CpsCallableInvocation(f, null, self, mutate, closure); } - public staticList sort(Iterable self, Closure closure) { + public staticList sort(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { return DefaultGroovyMethods.sort(self, closure); } + return CpsDefaultGroovyMethods.$sort__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticList $sort__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(8438, CpsDefaultGroovyMethods.class, "sort", b.localVariable("self"), b.constant(true), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(8438, CpsDefaultGroovyMethods.class, "$sort__java_lang_Iterable__boolean__groovy_lang_Closure", b.localVariable("self"), b.constant(true), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticList sort(Iterable self, boolean mutate, Closure closure) { + public staticList sort(Iterable self, boolean mutate, Closure closure) { if ((!Caller.isAsynchronous(self, "sort", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, mutate, closure))) { return DefaultGroovyMethods.sort(self, mutate, closure); } + return CpsDefaultGroovyMethods.$sort__java_lang_Iterable__boolean__groovy_lang_Closure(self, mutate, closure); + } + + private staticList $sort__java_lang_Iterable__boolean__groovy_lang_Closure(Iterable self, boolean mutate, Closure closure) { Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(8470, List.class, "list", b.ternaryOp(b.localVariable("mutate"), b.staticCall(8470, CpsDefaultGroovyMethods.class, "asList", b.localVariable("self")), b.staticCall(8470, CpsDefaultGroovyMethods.class, "toList", b.localVariable("self")))), b.declareVariable(8472, int.class, "params", b.functionCall(8472, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareEqual(8473, b.localVariable("params"), b.constant(1)), b.block(b.functionCall(8474, b.constant(Collections.class), "sort", b.localVariable("list"), b.new_(8474, OrderBy.class, b.localVariable("closure")))), b.block(b.functionCall(8476, b.constant(Collections.class), "sort", b.localVariable("list"), b.new_(8476, ClosureComparator.class, b.localVariable("closure"))))), b.return_(b.localVariable("list")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(8470, List.class, "list", b.ternaryOp(b.localVariable("mutate"), b.staticCall(8470, CpsDefaultGroovyMethods.class, "$asList__java_lang_Iterable", b.localVariable("self")), b.staticCall(8470, CpsDefaultGroovyMethods.class, "$toList__java_lang_Iterable", b.localVariable("self")))), b.declareVariable(8472, int.class, "params", b.functionCall(8472, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareEqual(8473, b.localVariable("params"), b.constant(1)), b.block(b.functionCall(8474, b.constant(Collections.class), "sort", b.localVariable("list"), b.new_(8474, OrderBy.class, b.localVariable("closure")))), b.block(b.functionCall(8476, b.constant(Collections.class), "sort", b.localVariable("list"), b.new_(8476, ClosureComparator.class, b.localVariable("closure"))))), b.return_(b.localVariable("list")))); throw new CpsCallableInvocation(f, null, self, mutate, closure); } - public staticList toSorted(Iterable self, Closure closure) { + public staticList toSorted(Iterable self, Closure closure) { if ((!Caller.isAsynchronous(self, "toSorted", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, closure))) { return DefaultGroovyMethods.toSorted(self, closure); } + return CpsDefaultGroovyMethods.$toSorted__java_lang_Iterable__groovy_lang_Closure(self, closure); + } + + private staticList $toSorted__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { Builder b = new Builder(loc("toSorted")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8568, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8568, b.functionCall(8568, b.localVariable("closure"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8568, OrderBy.class, b.localVariable("closure")), b.new_(8568, ClosureComparator.class, b.localVariable("closure")))), b.return_(b.staticCall(8569, CpsDefaultGroovyMethods.class, "toSorted", b.localVariable("self"), b.localVariable("comparator"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8568, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8568, b.functionCall(8568, b.localVariable("closure"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8568, OrderBy.class, b.localVariable("closure")), b.new_(8568, ClosureComparator.class, b.localVariable("closure")))), b.return_(b.staticCall(8569, CpsDefaultGroovyMethods.class, "$toSorted__java_lang_Iterable__java_util_Comparator", b.localVariable("self"), b.localVariable("comparator"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticIterator toSorted(Iterator self, Closure closure) { + public staticIterator toSorted(Iterator self, Closure closure) { if ((!Caller.isAsynchronous(self, "toSorted", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, closure))) { return DefaultGroovyMethods.toSorted(self, closure); } + return CpsDefaultGroovyMethods.$toSorted__java_util_Iterator__groovy_lang_Closure(self, closure); + } + + private staticIterator $toSorted__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { Builder b = new Builder(loc("toSorted")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8620, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8620, b.functionCall(8620, b.localVariable("closure"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8620, OrderBy.class, b.localVariable("closure")), b.new_(8620, ClosureComparator.class, b.localVariable("closure")))), b.return_(b.staticCall(8621, CpsDefaultGroovyMethods.class, "toSorted", b.localVariable("self"), b.localVariable("comparator"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8620, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8620, b.functionCall(8620, b.localVariable("closure"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8620, OrderBy.class, b.localVariable("closure")), b.new_(8620, ClosureComparator.class, b.localVariable("closure")))), b.return_(b.staticCall(8621, CpsDefaultGroovyMethods.class, "$toSorted__java_util_Iterator__java_util_Comparator", b.localVariable("self"), b.localVariable("comparator"))))); throw new CpsCallableInvocation(f, null, self, closure); } - public staticObject[] toSorted(Object[] self, Closure condition) { + public staticT[] toSorted(T[] self, Closure condition) { if ((!Caller.isAsynchronous(self, "toSorted", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, condition))) { return DefaultGroovyMethods.toSorted(self, condition); } + return CpsDefaultGroovyMethods.$toSorted__java_lang_Object_array__groovy_lang_Closure(self, condition); + } + + private staticT[] $toSorted__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure condition) { Builder b = new Builder(loc("toSorted")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(8674, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8674, b.functionCall(8674, b.localVariable("condition"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8674, OrderBy.class, b.localVariable("condition")), b.new_(8674, ClosureComparator.class, b.localVariable("condition")))), b.return_(b.staticCall(8675, CpsDefaultGroovyMethods.class, "toSorted", b.localVariable("self"), b.localVariable("comparator"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(8674, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8674, b.functionCall(8674, b.localVariable("condition"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8674, OrderBy.class, b.localVariable("condition")), b.new_(8674, ClosureComparator.class, b.localVariable("condition")))), b.return_(b.staticCall(8675, CpsDefaultGroovyMethods.class, "$toSorted__java_lang_Object_array__java_util_Comparator", b.localVariable("self"), b.localVariable("comparator"))))); throw new CpsCallableInvocation(f, null, self, condition); } - public staticMap toSorted(Map self, Closure condition) { + public staticMap toSorted(Map self, Closure condition) { if ((!Caller.isAsynchronous(self, "toSorted", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, condition))) { return DefaultGroovyMethods.toSorted(self, condition); } + return CpsDefaultGroovyMethods.$toSorted__java_util_Map__groovy_lang_Closure(self, condition); + } + + private staticMap $toSorted__java_util_Map__groovy_lang_Closure(Map self, Closure condition) { Builder b = new Builder(loc("toSorted")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(8751, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8751, b.functionCall(8751, b.localVariable("condition"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8751, OrderBy.class, b.localVariable("condition")), b.new_(8751, ClosureComparator.class, b.localVariable("condition")))), b.return_(b.staticCall(8752, CpsDefaultGroovyMethods.class, "toSorted", b.localVariable("self"), b.localVariable("comparator"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(8751, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8751, b.functionCall(8751, b.localVariable("condition"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8751, OrderBy.class, b.localVariable("condition")), b.new_(8751, ClosureComparator.class, b.localVariable("condition")))), b.return_(b.staticCall(8752, CpsDefaultGroovyMethods.class, "$toSorted__java_util_Map__java_util_Comparator", b.localVariable("self"), b.localVariable("comparator"))))); throw new CpsCallableInvocation(f, null, self, condition); } - public staticCollection flatten(Iterable self, Closure flattenUsing) { + public staticList takeWhile(List self, Closure condition) { + if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { + return DefaultGroovyMethods.takeWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(java.util.List,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticCollection takeWhile(Iterable self, Closure condition) { + if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { + return DefaultGroovyMethods.takeWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(java.lang.Iterable,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticSortedSet takeWhile(SortedSet self, Closure condition) { + if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { + return DefaultGroovyMethods.takeWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(java.util.SortedSet,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticMap takeWhile(Map self, Closure condition) { + if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { + return DefaultGroovyMethods.takeWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(java.util.Map,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticT[] takeWhile(T[] self, Closure condition) { + if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { + return DefaultGroovyMethods.takeWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(T[],groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticIterator takeWhile(Iterator self, Closure condition) { + if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { + return DefaultGroovyMethods.takeWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(java.util.Iterator,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticSortedSet dropWhile(SortedSet self, Closure condition) { + if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { + return DefaultGroovyMethods.dropWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(java.util.SortedSet,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticList dropWhile(List self, Closure condition) { + if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { + return DefaultGroovyMethods.dropWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(java.util.List,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticCollection dropWhile(Iterable self, Closure condition) { + if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { + return DefaultGroovyMethods.dropWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(java.lang.Iterable,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticMap dropWhile(Map self, Closure condition) { + if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { + return DefaultGroovyMethods.dropWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(java.util.Map,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticT[] dropWhile(T[] self, Closure condition) { + if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { + return DefaultGroovyMethods.dropWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(T[],groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticIterator dropWhile(Iterator self, Closure condition) { + if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { + return DefaultGroovyMethods.dropWhile(self, condition); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(java.util.Iterator,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public staticCollection flatten(Iterable self, Closure flattenUsing) { if ((!Caller.isAsynchronous(self, "flatten", flattenUsing))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "flatten", self, flattenUsing))) { return DefaultGroovyMethods.flatten(self, flattenUsing); } + return CpsDefaultGroovyMethods.$flatten__java_lang_Iterable__groovy_lang_Closure(self, flattenUsing); + } + + private staticCollection $flatten__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure flattenUsing) { Builder b = new Builder(loc("flatten")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "flattenUsing"), b.block(b.return_(b.staticCall(12163, CpsDefaultGroovyMethods.class, "flatten", b.localVariable("self"), b.functionCall(12163, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self")), b.localVariable("flattenUsing"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "flattenUsing"), b.block(b.return_(b.staticCall(12163, CpsDefaultGroovyMethods.class, "$flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.functionCall(12163, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self")), b.localVariable("flattenUsing"))))); throw new CpsCallableInvocation(f, null, self, flattenUsing); } + staticCollection flatten(Iterable elements, Collection addTo, Closure flattenUsing) { + return CpsDefaultGroovyMethods.$flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(elements, addTo, flattenUsing); + } + + private staticCollection $flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(Iterable elements, Collection addTo, Closure flattenUsing) { + Builder b = new Builder(loc("flatten")); + CpsFunction f = new CpsFunction(Arrays.asList("elements", "addTo", "flattenUsing"), b.block(b.forInLoop(12167, null, Object.class, "element", b.localVariable("elements"), b.block(b.if_(b.instanceOf(12168, b.localVariable("element"), b.constant(Collection.class)), b.block(b.staticCall(12169, CpsDefaultGroovyMethods.class, "$flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.cast(12169, b.localVariable("element"), Collection.class, false), b.localVariable("addTo"), b.localVariable("flattenUsing"))), b.if_(b.logicalAnd(12170, b.compareNotEqual(12170, b.localVariable("element"), b.constant(null)), b.functionCall(12170, b.functionCall(12170, b.localVariable("element"), "getClass"), "isArray")), b.block(b.staticCall(12171, CpsDefaultGroovyMethods.class, "$flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.functionCall(12171, b.constant(DefaultTypeTransformation.class), "arrayAsCollection", b.localVariable("element")), b.localVariable("addTo"), b.localVariable("flattenUsing"))), b.block(b.declareVariable(12173, Object.class, "flattened", b.functionCall(12173, b.localVariable("flattenUsing"), "call", b.list(b.localVariable("element")))), b.declareVariable(12174, int.class, "returnedSelf", b.compareEqual(12174, b.localVariable("flattened"), b.localVariable("element"))), b.if_(b.logicalAnd(12175, b.not(12175, b.localVariable("returnedSelf")), b.instanceOf(12175, b.localVariable("flattened"), b.constant(Collection.class))), b.block(b.declareVariable(12176, List.class, "list", b.staticCall(12176, CpsDefaultGroovyMethods.class, "$toList__java_lang_Iterable", b.cast(12176, b.localVariable("flattened"), Iterable.class, false))), b.if_(b.logicalAnd(12177, b.compareEqual(12177, b.functionCall(12177, b.localVariable("list"), "size"), b.constant(1)), b.compareEqual(12177, b.functionCall(12177, b.localVariable("list"), "get", b.constant(0)), b.localVariable("element"))), b.block(b.assign(12178, b.localVariable("returnedSelf"), b.constant(true)))))), b.if_(b.logicalAnd(12181, b.instanceOf(12181, b.localVariable("flattened"), b.constant(Collection.class)), b.not(12181, b.localVariable("returnedSelf"))), b.block(b.staticCall(12182, CpsDefaultGroovyMethods.class, "$flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.cast(12182, b.localVariable("flattened"), Collection.class, false), b.localVariable("addTo"), b.localVariable("flattenUsing"))), b.block(b.functionCall(12184, b.localVariable("addTo"), "add", b.localVariable("flattened"))))))))), b.return_(b.localVariable("addTo")))); + throw new CpsCallableInvocation(f, null, elements, addTo, flattenUsing); + } + public static void times(Number self, Closure closure) { if ((!Caller.isAsynchronous(self, "times", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "times", self, closure))) { DefaultGroovyMethods.times(self, closure); return ; } + CpsDefaultGroovyMethods.$times__java_lang_Number__groovy_lang_Closure(self, closure); + } + + private static void $times__java_lang_Number__groovy_lang_Closure(Number self, Closure closure) { Builder b = new Builder(loc("times")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forLoop(null, b.sequence(b.declareVariable(14342, int.class, "i", b.constant(0)), b.declareVariable(14342, int.class, "size", b.functionCall(14342, b.localVariable("self"), "intValue"))), b.lessThan(14342, b.localVariable("i"), b.localVariable("size")), b.sequence(b.postfixInc(14342, b.localVariable("i"))), b.block(b.functionCall(14343, b.localVariable("closure"), "call", b.localVariable("i")), b.if_(b.compareEqual(14344, b.functionCall(14344, b.localVariable("closure"), "getDirective"), b.property(14344, b.constant(Closure.class), "DONE")), b.block(b.break_(null))))))); throw new CpsCallableInvocation(f, null, self, closure); @@ -1298,6 +1985,10 @@ public static void upto(Number self, Number to, Closure closure) { DefaultGroovyMethods.upto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$upto__java_lang_Number__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $upto__java_lang_Number__java_lang_Number__groovy_lang_Closure(Number self, Number to, Closure closure) { Builder b = new Builder(loc("upto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14360, int.class, "self1", b.functionCall(14360, b.localVariable("self"), "intValue")), b.declareVariable(14361, int.class, "to1", b.functionCall(14361, b.localVariable("to"), "intValue")), b.if_(b.lessThanEqual(14362, b.localVariable("self1"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14363, int.class, "i", b.localVariable("self1"))), b.lessThanEqual(14363, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14363, b.localVariable("i"))), b.block(b.functionCall(14364, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14367, b.new_(14367, GroovyRuntimeException.class, b.plus(14367, b.plus(14367, b.plus(14367, b.plus(14367, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1308,6 +1999,10 @@ public static void upto(long self, Number to, Closure closure) { DefaultGroovyMethods.upto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$upto__long__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $upto__long__java_lang_Number__groovy_lang_Closure(long self, Number to, Closure closure) { Builder b = new Builder(loc("upto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14381, long.class, "to1", b.functionCall(14381, b.localVariable("to"), "longValue")), b.if_(b.lessThanEqual(14382, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14383, long.class, "i", b.localVariable("self"))), b.lessThanEqual(14383, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14383, b.localVariable("i"))), b.block(b.functionCall(14384, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14387, b.new_(14387, GroovyRuntimeException.class, b.plus(14387, b.plus(14387, b.plus(14387, b.plus(14387, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1318,6 +2013,10 @@ public static void upto(Long self, Number to, Closure closure) { DefaultGroovyMethods.upto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$upto__java_lang_Long__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $upto__java_lang_Long__java_lang_Number__groovy_lang_Closure(Long self, Number to, Closure closure) { Builder b = new Builder(loc("upto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14401, long.class, "to1", b.functionCall(14401, b.localVariable("to"), "longValue")), b.if_(b.lessThanEqual(14402, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14403, long.class, "i", b.localVariable("self"))), b.lessThanEqual(14403, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14403, b.localVariable("i"))), b.block(b.functionCall(14404, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14407, b.new_(14407, GroovyRuntimeException.class, b.plus(14407, b.plus(14407, b.plus(14407, b.plus(14407, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1328,6 +2027,10 @@ public static void upto(float self, Number to, Closure closure) { DefaultGroovyMethods.upto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$upto__float__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $upto__float__java_lang_Number__groovy_lang_Closure(float self, Number to, Closure closure) { Builder b = new Builder(loc("upto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14421, float.class, "to1", b.functionCall(14421, b.localVariable("to"), "floatValue")), b.if_(b.lessThanEqual(14422, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14423, float.class, "i", b.localVariable("self"))), b.lessThanEqual(14423, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14423, b.localVariable("i"))), b.block(b.functionCall(14424, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14427, b.new_(14427, GroovyRuntimeException.class, b.plus(14427, b.plus(14427, b.plus(14427, b.plus(14427, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1338,6 +2041,10 @@ public static void upto(Float self, Number to, Closure closure) { DefaultGroovyMethods.upto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$upto__java_lang_Float__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $upto__java_lang_Float__java_lang_Number__groovy_lang_Closure(Float self, Number to, Closure closure) { Builder b = new Builder(loc("upto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14441, float.class, "to1", b.functionCall(14441, b.localVariable("to"), "floatValue")), b.if_(b.lessThanEqual(14442, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14443, float.class, "i", b.localVariable("self"))), b.lessThanEqual(14443, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14443, b.localVariable("i"))), b.block(b.functionCall(14444, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14447, b.new_(14447, GroovyRuntimeException.class, b.plus(14447, b.plus(14447, b.plus(14447, b.plus(14447, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1348,6 +2055,10 @@ public static void upto(double self, Number to, Closure closure) { DefaultGroovyMethods.upto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$upto__double__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $upto__double__java_lang_Number__groovy_lang_Closure(double self, Number to, Closure closure) { Builder b = new Builder(loc("upto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14461, double.class, "to1", b.functionCall(14461, b.localVariable("to"), "doubleValue")), b.if_(b.lessThanEqual(14462, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14463, double.class, "i", b.localVariable("self"))), b.lessThanEqual(14463, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14463, b.localVariable("i"))), b.block(b.functionCall(14464, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14467, b.new_(14467, GroovyRuntimeException.class, b.plus(14467, b.plus(14467, b.plus(14467, b.plus(14467, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1358,6 +2069,10 @@ public static void upto(Double self, Number to, Closure closure) { DefaultGroovyMethods.upto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$upto__java_lang_Double__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $upto__java_lang_Double__java_lang_Number__groovy_lang_Closure(Double self, Number to, Closure closure) { Builder b = new Builder(loc("upto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14481, double.class, "to1", b.functionCall(14481, b.localVariable("to"), "doubleValue")), b.if_(b.lessThanEqual(14482, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14483, double.class, "i", b.localVariable("self"))), b.lessThanEqual(14483, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14483, b.localVariable("i"))), b.block(b.functionCall(14484, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14487, b.new_(14487, GroovyRuntimeException.class, b.plus(14487, b.plus(14487, b.plus(14487, b.plus(14487, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1368,6 +2083,10 @@ public static void upto(BigInteger self, Number to, Closure closure) { DefaultGroovyMethods.upto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$upto__java_math_BigInteger__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $upto__java_math_BigInteger__java_lang_Number__groovy_lang_Closure(BigInteger self, Number to, Closure closure) { Builder b = new Builder(loc("upto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.if_(b.instanceOf(14505, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14506, BigDecimal.class, "one", b.functionCall(14506, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.declareVariable(14507, BigDecimal.class, "self1", b.new_(14507, BigDecimal.class, b.localVariable("self"))), b.declareVariable(14508, BigDecimal.class, "to1", b.cast(14508, b.localVariable("to"), BigDecimal.class, false)), b.if_(b.lessThanEqual(14509, b.functionCall(14509, b.localVariable("self1"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14510, BigDecimal.class, "i", b.localVariable("self1"))), b.lessThanEqual(14510, b.functionCall(14510, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14510, b.localVariable("i"), b.functionCall(14510, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14511, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14514, b.new_(14514, GroovyRuntimeException.class, b.functionCall(14515, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to upto() cannot be less than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.if_(b.instanceOf(14518, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14519, BigInteger.class, "one", b.functionCall(14519, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14520, BigInteger.class, "to1", b.cast(14520, b.localVariable("to"), BigInteger.class, false)), b.if_(b.lessThanEqual(14521, b.functionCall(14521, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14522, BigInteger.class, "i", b.localVariable("self"))), b.lessThanEqual(14522, b.functionCall(14522, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14522, b.localVariable("i"), b.functionCall(14522, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14523, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14526, b.new_(14526, GroovyRuntimeException.class, b.functionCall(14527, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to upto() cannot be less than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.block(b.declareVariable(14530, BigInteger.class, "one", b.functionCall(14530, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14531, BigInteger.class, "to1", b.new_(14531, BigInteger.class, b.functionCall(14531, b.localVariable("to"), "toString"))), b.if_(b.lessThanEqual(14532, b.functionCall(14532, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14533, BigInteger.class, "i", b.localVariable("self"))), b.lessThanEqual(14533, b.functionCall(14533, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14533, b.localVariable("i"), b.functionCall(14533, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14534, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14537, b.new_(14537, GroovyRuntimeException.class, b.functionCall(14537, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to upto() cannot be less than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1378,6 +2097,10 @@ public static void upto(BigDecimal self, Number to, Closure closure) { DefaultGroovyMethods.upto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$upto__java_math_BigDecimal__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $upto__java_math_BigDecimal__java_lang_Number__groovy_lang_Closure(BigDecimal self, Number to, Closure closure) { Builder b = new Builder(loc("upto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14557, BigDecimal.class, "one", b.functionCall(14557, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.if_(b.instanceOf(14558, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14559, BigDecimal.class, "to1", b.cast(14559, b.localVariable("to"), BigDecimal.class, false)), b.if_(b.lessThanEqual(14560, b.functionCall(14560, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14561, BigDecimal.class, "i", b.localVariable("self"))), b.lessThanEqual(14561, b.functionCall(14561, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14561, b.localVariable("i"), b.functionCall(14561, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14562, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14565, b.new_(14565, GroovyRuntimeException.class, b.plus(14565, b.plus(14565, b.plus(14565, b.plus(14565, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.if_(b.instanceOf(14567, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14568, BigDecimal.class, "to1", b.new_(14568, BigDecimal.class, b.cast(14568, b.localVariable("to"), BigInteger.class, false))), b.if_(b.lessThanEqual(14569, b.functionCall(14569, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14570, BigDecimal.class, "i", b.localVariable("self"))), b.lessThanEqual(14570, b.functionCall(14570, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14570, b.localVariable("i"), b.functionCall(14570, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14571, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14574, b.new_(14574, GroovyRuntimeException.class, b.plus(14574, b.plus(14574, b.plus(14574, b.plus(14574, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.block(b.declareVariable(14577, BigDecimal.class, "to1", b.new_(14577, BigDecimal.class, b.functionCall(14577, b.localVariable("to"), "toString"))), b.if_(b.lessThanEqual(14578, b.functionCall(14578, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14579, BigDecimal.class, "i", b.localVariable("self"))), b.lessThanEqual(14579, b.functionCall(14579, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14579, b.localVariable("i"), b.functionCall(14579, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14580, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14583, b.new_(14583, GroovyRuntimeException.class, b.plus(14583, b.plus(14583, b.plus(14583, b.plus(14583, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1388,6 +2111,10 @@ public static void downto(Number self, Number to, Closure closure) { DefaultGroovyMethods.downto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$downto__java_lang_Number__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $downto__java_lang_Number__java_lang_Number__groovy_lang_Closure(Number self, Number to, Closure closure) { Builder b = new Builder(loc("downto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14598, int.class, "self1", b.functionCall(14598, b.localVariable("self"), "intValue")), b.declareVariable(14599, int.class, "to1", b.functionCall(14599, b.localVariable("to"), "intValue")), b.if_(b.greaterThanEqual(14600, b.localVariable("self1"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14601, int.class, "i", b.localVariable("self1"))), b.greaterThanEqual(14601, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14601, b.localVariable("i"))), b.block(b.functionCall(14602, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14605, b.new_(14605, GroovyRuntimeException.class, b.plus(14605, b.plus(14605, b.plus(14605, b.plus(14605, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1398,6 +2125,10 @@ public static void downto(long self, Number to, Closure closure) { DefaultGroovyMethods.downto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$downto__long__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $downto__long__java_lang_Number__groovy_lang_Closure(long self, Number to, Closure closure) { Builder b = new Builder(loc("downto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14619, long.class, "to1", b.functionCall(14619, b.localVariable("to"), "longValue")), b.if_(b.greaterThanEqual(14620, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14621, long.class, "i", b.localVariable("self"))), b.greaterThanEqual(14621, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14621, b.localVariable("i"))), b.block(b.functionCall(14622, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14625, b.new_(14625, GroovyRuntimeException.class, b.plus(14625, b.plus(14625, b.plus(14625, b.plus(14625, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1408,6 +2139,10 @@ public static void downto(Long self, Number to, Closure closure) { DefaultGroovyMethods.downto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$downto__java_lang_Long__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $downto__java_lang_Long__java_lang_Number__groovy_lang_Closure(Long self, Number to, Closure closure) { Builder b = new Builder(loc("downto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14639, long.class, "to1", b.functionCall(14639, b.localVariable("to"), "longValue")), b.if_(b.greaterThanEqual(14640, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14641, long.class, "i", b.localVariable("self"))), b.greaterThanEqual(14641, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14641, b.localVariable("i"))), b.block(b.functionCall(14642, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14645, b.new_(14645, GroovyRuntimeException.class, b.plus(14645, b.plus(14645, b.plus(14645, b.plus(14645, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1418,6 +2153,10 @@ public static void downto(float self, Number to, Closure closure) { DefaultGroovyMethods.downto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$downto__float__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $downto__float__java_lang_Number__groovy_lang_Closure(float self, Number to, Closure closure) { Builder b = new Builder(loc("downto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14659, float.class, "to1", b.functionCall(14659, b.localVariable("to"), "floatValue")), b.if_(b.greaterThanEqual(14660, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14661, float.class, "i", b.localVariable("self"))), b.greaterThanEqual(14661, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14661, b.localVariable("i"))), b.block(b.functionCall(14662, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14665, b.new_(14665, GroovyRuntimeException.class, b.plus(14665, b.plus(14665, b.plus(14665, b.plus(14665, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1428,6 +2167,10 @@ public static void downto(Float self, Number to, Closure closure) { DefaultGroovyMethods.downto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$downto__java_lang_Float__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $downto__java_lang_Float__java_lang_Number__groovy_lang_Closure(Float self, Number to, Closure closure) { Builder b = new Builder(loc("downto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14678, float.class, "to1", b.functionCall(14678, b.localVariable("to"), "floatValue")), b.if_(b.greaterThanEqual(14679, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14680, float.class, "i", b.localVariable("self"))), b.greaterThanEqual(14680, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14680, b.localVariable("i"))), b.block(b.functionCall(14681, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14684, b.new_(14684, GroovyRuntimeException.class, b.plus(14684, b.plus(14684, b.plus(14684, b.plus(14684, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1438,6 +2181,10 @@ public static void downto(double self, Number to, Closure closure) { DefaultGroovyMethods.downto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$downto__double__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $downto__double__java_lang_Number__groovy_lang_Closure(double self, Number to, Closure closure) { Builder b = new Builder(loc("downto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14697, double.class, "to1", b.functionCall(14697, b.localVariable("to"), "doubleValue")), b.if_(b.greaterThanEqual(14698, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14699, double.class, "i", b.localVariable("self"))), b.greaterThanEqual(14699, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14699, b.localVariable("i"))), b.block(b.functionCall(14700, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14703, b.new_(14703, GroovyRuntimeException.class, b.plus(14703, b.plus(14703, b.plus(14703, b.plus(14703, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1448,6 +2195,10 @@ public static void downto(Double self, Number to, Closure closure) { DefaultGroovyMethods.downto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$downto__java_lang_Double__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $downto__java_lang_Double__java_lang_Number__groovy_lang_Closure(Double self, Number to, Closure closure) { Builder b = new Builder(loc("downto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14716, double.class, "to1", b.functionCall(14716, b.localVariable("to"), "doubleValue")), b.if_(b.greaterThanEqual(14717, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14718, double.class, "i", b.localVariable("self"))), b.greaterThanEqual(14718, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14718, b.localVariable("i"))), b.block(b.functionCall(14719, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14722, b.new_(14722, GroovyRuntimeException.class, b.plus(14722, b.plus(14722, b.plus(14722, b.plus(14722, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1458,6 +2209,10 @@ public static void downto(BigInteger self, Number to, Closure closure) { DefaultGroovyMethods.downto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$downto__java_math_BigInteger__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $downto__java_math_BigInteger__java_lang_Number__groovy_lang_Closure(BigInteger self, Number to, Closure closure) { Builder b = new Builder(loc("downto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.if_(b.instanceOf(14735, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14736, BigDecimal.class, "one", b.functionCall(14736, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.declareVariable(14737, BigDecimal.class, "to1", b.cast(14737, b.localVariable("to"), BigDecimal.class, false)), b.declareVariable(14738, BigDecimal.class, "selfD", b.new_(14738, BigDecimal.class, b.localVariable("self"))), b.if_(b.greaterThanEqual(14739, b.functionCall(14739, b.localVariable("selfD"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14740, BigDecimal.class, "i", b.localVariable("selfD"))), b.greaterThanEqual(14740, b.functionCall(14740, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14740, b.localVariable("i"), b.functionCall(14740, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14741, b.localVariable("closure"), "call", b.functionCall(14741, b.localVariable("i"), "toBigInteger"))))), b.throw_(14744, b.new_(14744, GroovyRuntimeException.class, b.functionCall(14745, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to downto() cannot be greater than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.if_(b.instanceOf(14748, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14749, BigInteger.class, "one", b.functionCall(14749, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14750, BigInteger.class, "to1", b.cast(14750, b.localVariable("to"), BigInteger.class, false)), b.if_(b.greaterThanEqual(14751, b.functionCall(14751, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14752, BigInteger.class, "i", b.localVariable("self"))), b.greaterThanEqual(14752, b.functionCall(14752, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14752, b.localVariable("i"), b.functionCall(14752, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14753, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14756, b.new_(14756, GroovyRuntimeException.class, b.functionCall(14757, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to downto() cannot be greater than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.block(b.declareVariable(14761, BigInteger.class, "one", b.functionCall(14761, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14762, BigInteger.class, "to1", b.new_(14762, BigInteger.class, b.functionCall(14762, b.localVariable("to"), "toString"))), b.if_(b.greaterThanEqual(14763, b.functionCall(14763, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14764, BigInteger.class, "i", b.localVariable("self"))), b.greaterThanEqual(14764, b.functionCall(14764, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14764, b.localVariable("i"), b.functionCall(14764, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14765, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14768, b.new_(14768, GroovyRuntimeException.class, b.functionCall(14769, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to downto() cannot be greater than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1468,6 +2223,10 @@ public static void downto(BigDecimal self, Number to, Closure closure) { DefaultGroovyMethods.downto(self, to, closure); return ; } + CpsDefaultGroovyMethods.$downto__java_math_BigDecimal__java_lang_Number__groovy_lang_Closure(self, to, closure); + } + + private static void $downto__java_math_BigDecimal__java_lang_Number__groovy_lang_Closure(BigDecimal self, Number to, Closure closure) { Builder b = new Builder(loc("downto")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14789, BigDecimal.class, "one", b.functionCall(14789, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.if_(b.instanceOf(14790, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14791, BigDecimal.class, "to1", b.cast(14791, b.localVariable("to"), BigDecimal.class, false)), b.if_(b.greaterThanEqual(14792, b.functionCall(14792, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14793, BigDecimal.class, "i", b.localVariable("self"))), b.greaterThanEqual(14793, b.functionCall(14793, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14793, b.localVariable("i"), b.functionCall(14793, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14794, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14797, b.new_(14797, GroovyRuntimeException.class, b.plus(14797, b.plus(14797, b.plus(14797, b.plus(14797, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.if_(b.instanceOf(14798, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14799, BigDecimal.class, "to1", b.new_(14799, BigDecimal.class, b.cast(14799, b.localVariable("to"), BigInteger.class, false))), b.if_(b.greaterThanEqual(14800, b.functionCall(14800, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14801, BigDecimal.class, "i", b.localVariable("self"))), b.greaterThanEqual(14801, b.functionCall(14801, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14801, b.localVariable("i"), b.functionCall(14801, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14802, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14805, b.new_(14805, GroovyRuntimeException.class, b.plus(14805, b.plus(14805, b.plus(14805, b.plus(14805, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.block(b.declareVariable(14807, BigDecimal.class, "to1", b.new_(14807, BigDecimal.class, b.functionCall(14807, b.localVariable("to"), "toString"))), b.if_(b.greaterThanEqual(14808, b.functionCall(14808, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14809, BigDecimal.class, "i", b.localVariable("self"))), b.greaterThanEqual(14809, b.functionCall(14809, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14809, b.localVariable("i"), b.functionCall(14809, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14810, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14813, b.new_(14813, GroovyRuntimeException.class, b.plus(14813, b.plus(14813, b.plus(14813, b.plus(14813, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))))))); throw new CpsCallableInvocation(f, null, self, to, closure); @@ -1478,18 +2237,33 @@ public static void step(Number self, Number to, Number stepNumber, Closure closu DefaultGroovyMethods.step(self, to, stepNumber, closure); return ; } + CpsDefaultGroovyMethods.$step__java_lang_Number__java_lang_Number__java_lang_Number__groovy_lang_Closure(self, to, stepNumber, closure); + } + + private static void $step__java_lang_Number__java_lang_Number__java_lang_Number__groovy_lang_Closure(Number self, Number to, Number stepNumber, Closure closure) { Builder b = new Builder(loc("step")); CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "stepNumber", "closure"), b.block(b.if_(b.logicalOr(14832, b.logicalOr(14832, b.instanceOf(14832, b.localVariable("self"), b.constant(BigDecimal.class)), b.instanceOf(14832, b.localVariable("to"), b.constant(BigDecimal.class))), b.instanceOf(14832, b.localVariable("stepNumber"), b.constant(BigDecimal.class))), b.block(b.declareVariable(14833, BigDecimal.class, "zero", b.functionCall(14833, b.constant(BigDecimal.class), "valueOf", b.constant(0), b.constant(1))), b.declareVariable(14834, BigDecimal.class, "self1", b.ternaryOp(b.instanceOf(14834, b.localVariable("self"), b.constant(BigDecimal.class)), b.cast(14834, b.localVariable("self"), BigDecimal.class, false), b.new_(14834, BigDecimal.class, b.functionCall(14834, b.localVariable("self"), "toString")))), b.declareVariable(14835, BigDecimal.class, "to1", b.ternaryOp(b.instanceOf(14835, b.localVariable("to"), b.constant(BigDecimal.class)), b.cast(14835, b.localVariable("to"), BigDecimal.class, false), b.new_(14835, BigDecimal.class, b.functionCall(14835, b.localVariable("to"), "toString")))), b.declareVariable(14836, BigDecimal.class, "stepNumber1", b.ternaryOp(b.instanceOf(14836, b.localVariable("stepNumber"), b.constant(BigDecimal.class)), b.cast(14836, b.localVariable("stepNumber"), BigDecimal.class, false), b.new_(14836, BigDecimal.class, b.functionCall(14836, b.localVariable("stepNumber"), "toString")))), b.if_(b.logicalAnd(14837, b.greaterThan(14837, b.functionCall(14837, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.greaterThan(14837, b.functionCall(14837, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14838, BigDecimal.class, "i", b.localVariable("self1"))), b.lessThan(14838, b.functionCall(14838, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14838, b.localVariable("i"), b.functionCall(14838, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14839, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.logicalAnd(14841, b.lessThan(14841, b.functionCall(14841, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.lessThan(14841, b.functionCall(14841, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14842, BigDecimal.class, "i", b.localVariable("self1"))), b.greaterThan(14842, b.functionCall(14842, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14842, b.localVariable("i"), b.functionCall(14842, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14843, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.compareNotEqual(14845, b.functionCall(14845, b.localVariable("self1"), "compareTo", b.localVariable("to1")), b.constant(0)), b.throw_(14846, b.new_(14846, GroovyRuntimeException.class, b.plus(14846, b.plus(14846, b.plus(14846, b.plus(14846, b.plus(14846, b.plus(14846, b.constant("Infinite loop in "), b.localVariable("self1")), b.constant(".step(")), b.localVariable("to1")), b.constant(", ")), b.localVariable("stepNumber1")), b.constant(")")))))))), b.if_(b.logicalOr(14847, b.logicalOr(14847, b.instanceOf(14847, b.localVariable("self"), b.constant(BigInteger.class)), b.instanceOf(14847, b.localVariable("to"), b.constant(BigInteger.class))), b.instanceOf(14847, b.localVariable("stepNumber"), b.constant(BigInteger.class))), b.block(b.declareVariable(14848, BigInteger.class, "zero", b.functionCall(14848, b.constant(BigInteger.class), "valueOf", b.constant(0))), b.declareVariable(14849, BigInteger.class, "self1", b.ternaryOp(b.instanceOf(14849, b.localVariable("self"), b.constant(BigInteger.class)), b.cast(14849, b.localVariable("self"), BigInteger.class, false), b.new_(14849, BigInteger.class, b.functionCall(14849, b.localVariable("self"), "toString")))), b.declareVariable(14850, BigInteger.class, "to1", b.ternaryOp(b.instanceOf(14850, b.localVariable("to"), b.constant(BigInteger.class)), b.cast(14850, b.localVariable("to"), BigInteger.class, false), b.new_(14850, BigInteger.class, b.functionCall(14850, b.localVariable("to"), "toString")))), b.declareVariable(14851, BigInteger.class, "stepNumber1", b.ternaryOp(b.instanceOf(14851, b.localVariable("stepNumber"), b.constant(BigInteger.class)), b.cast(14851, b.localVariable("stepNumber"), BigInteger.class, false), b.new_(14851, BigInteger.class, b.functionCall(14851, b.localVariable("stepNumber"), "toString")))), b.if_(b.logicalAnd(14852, b.greaterThan(14852, b.functionCall(14852, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.greaterThan(14852, b.functionCall(14852, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14853, BigInteger.class, "i", b.localVariable("self1"))), b.lessThan(14853, b.functionCall(14853, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14853, b.localVariable("i"), b.functionCall(14853, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14854, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.logicalAnd(14856, b.lessThan(14856, b.functionCall(14856, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.lessThan(14856, b.functionCall(14856, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14857, BigInteger.class, "i", b.localVariable("self1"))), b.greaterThan(14857, b.functionCall(14857, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14857, b.localVariable("i"), b.functionCall(14857, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14858, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.compareNotEqual(14860, b.functionCall(14860, b.localVariable("self1"), "compareTo", b.localVariable("to1")), b.constant(0)), b.throw_(14861, b.new_(14861, GroovyRuntimeException.class, b.plus(14861, b.plus(14861, b.plus(14861, b.plus(14861, b.plus(14861, b.plus(14861, b.constant("Infinite loop in "), b.localVariable("self1")), b.constant(".step(")), b.localVariable("to1")), b.constant(", ")), b.localVariable("stepNumber1")), b.constant(")")))))))), b.block(b.declareVariable(14863, int.class, "self1", b.functionCall(14863, b.localVariable("self"), "intValue")), b.declareVariable(14864, int.class, "to1", b.functionCall(14864, b.localVariable("to"), "intValue")), b.declareVariable(14865, int.class, "stepNumber1", b.functionCall(14865, b.localVariable("stepNumber"), "intValue")), b.if_(b.logicalAnd(14866, b.greaterThan(14866, b.localVariable("stepNumber1"), b.constant(0)), b.greaterThan(14866, b.localVariable("to1"), b.localVariable("self1"))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14867, int.class, "i", b.localVariable("self1"))), b.lessThan(14867, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.plusEqual(14867, b.localVariable("i"), b.localVariable("stepNumber1"))), b.block(b.functionCall(14868, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.logicalAnd(14870, b.lessThan(14870, b.localVariable("stepNumber1"), b.constant(0)), b.lessThan(14870, b.localVariable("to1"), b.localVariable("self1"))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14871, int.class, "i", b.localVariable("self1"))), b.greaterThan(14871, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.plusEqual(14871, b.localVariable("i"), b.localVariable("stepNumber1"))), b.block(b.functionCall(14872, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.compareNotEqual(14874, b.localVariable("self1"), b.localVariable("to1")), b.throw_(14875, b.new_(14875, GroovyRuntimeException.class, b.plus(14875, b.plus(14875, b.plus(14875, b.plus(14875, b.plus(14875, b.plus(14875, b.constant("Infinite loop in "), b.localVariable("self1")), b.constant(".step(")), b.localVariable("to1")), b.constant(", ")), b.localVariable("stepNumber1")), b.constant(")")))))))))))); throw new CpsCallableInvocation(f, null, self, to, stepNumber, closure); } + public static TimerTask runAfter(Timer timer, int delay, Closure closure) { + if ((!Caller.isAsynchronous(timer, "runAfter", delay, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "runAfter"))) { + return DefaultGroovyMethods.runAfter(timer, delay, closure); + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.runAfter(java.util.Timer,int,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + public static void eachByte(Byte[] self, Closure closure) { if ((!Caller.isAsynchronous(self, "eachByte", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachByte", self, closure))) { DefaultGroovyMethods.eachByte(self, closure); return ; } + CpsDefaultGroovyMethods.$eachByte__java_lang_Byte_array__groovy_lang_Closure(self, closure); + } + + private static void $eachByte__java_lang_Byte_array__groovy_lang_Closure(Byte[] self, Closure closure) { Builder b = new Builder(loc("eachByte")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(15353, CpsDefaultGroovyMethods.class, "each", b.localVariable("self"), b.localVariable("closure")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(15353, CpsDefaultGroovyMethods.class, "$each__java_lang_Byte_array__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure")))); throw new CpsCallableInvocation(f, null, self, closure); } @@ -1498,8 +2272,12 @@ public static void eachByte(byte[] self, Closure closure) { DefaultGroovyMethods.eachByte(self, closure); return ; } + CpsDefaultGroovyMethods.$eachByte__byte_array__groovy_lang_Closure(self, closure); + } + + private static void $eachByte__byte_array__groovy_lang_Closure(byte[] self, Closure closure) { Builder b = new Builder(loc("eachByte")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(15365, CpsDefaultGroovyMethods.class, "each", b.localVariable("self"), b.localVariable("closure")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(15365, CpsDefaultGroovyMethods.class, "$each__byte_array__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure")))); throw new CpsCallableInvocation(f, null, self, closure); } @@ -1507,8 +2285,12 @@ public static int findIndexOf(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "findIndexOf", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexOf", self, closure))) { return DefaultGroovyMethods.findIndexOf(self, closure); } + return CpsDefaultGroovyMethods.$findIndexOf__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private static int $findIndexOf__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("findIndexOf")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15378, CpsDefaultGroovyMethods.class, "findIndexOf", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15378, CpsDefaultGroovyMethods.class, "$findIndexOf__java_lang_Object__int__groovy_lang_Closure", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } @@ -1516,6 +2298,10 @@ public static int findIndexOf(Object self, int startIndex, Closure closure) { if ((!Caller.isAsynchronous(self, "findIndexOf", startIndex, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexOf", self, startIndex, closure))) { return DefaultGroovyMethods.findIndexOf(self, startIndex, closure); } + return CpsDefaultGroovyMethods.$findIndexOf__java_lang_Object__int__groovy_lang_Closure(self, startIndex, closure); + } + + private static int $findIndexOf__java_lang_Object__int__groovy_lang_Closure(Object self, int startIndex, Closure closure) { Builder b = new Builder(loc("findIndexOf")); CpsFunction f = new CpsFunction(Arrays.asList("self", "startIndex", "closure"), b.block(b.declareVariable(15393, int.class, "result", b.constant(-1)), b.declareVariable(15394, int.class, "i", b.constant(0)), b.declareVariable(15395, BooleanClosureWrapper.class, "bcw", b.new_(15395, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(15396, Iterator.class, "iter", b.functionCall(15396, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(15396, b.localVariable("iter"), "hasNext"), b.sequence(b.postfixInc(15396, b.localVariable("i"))), b.block(b.declareVariable(15397, Object.class, "value", b.functionCall(15397, b.localVariable("iter"), "next")), b.if_(b.lessThan(15398, b.localVariable("i"), b.localVariable("startIndex")), b.block(b.continue_(null))), b.if_(b.functionCall(15401, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.assign(15402, b.localVariable("result"), b.localVariable("i")), b.break_(null))))), b.return_(b.localVariable("result")))); throw new CpsCallableInvocation(f, null, self, startIndex, closure); @@ -1525,8 +2311,12 @@ public static int findLastIndexOf(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "findLastIndexOf", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findLastIndexOf", self, closure))) { return DefaultGroovyMethods.findLastIndexOf(self, closure); } + return CpsDefaultGroovyMethods.$findLastIndexOf__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private static int $findLastIndexOf__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("findLastIndexOf")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15419, CpsDefaultGroovyMethods.class, "findLastIndexOf", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15419, CpsDefaultGroovyMethods.class, "$findLastIndexOf__java_lang_Object__int__groovy_lang_Closure", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } @@ -1534,6 +2324,10 @@ public static int findLastIndexOf(Object self, int startIndex, Closure closure) if ((!Caller.isAsynchronous(self, "findLastIndexOf", startIndex, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findLastIndexOf", self, startIndex, closure))) { return DefaultGroovyMethods.findLastIndexOf(self, startIndex, closure); } + return CpsDefaultGroovyMethods.$findLastIndexOf__java_lang_Object__int__groovy_lang_Closure(self, startIndex, closure); + } + + private static int $findLastIndexOf__java_lang_Object__int__groovy_lang_Closure(Object self, int startIndex, Closure closure) { Builder b = new Builder(loc("findLastIndexOf")); CpsFunction f = new CpsFunction(Arrays.asList("self", "startIndex", "closure"), b.block(b.declareVariable(15434, int.class, "result", b.constant(-1)), b.declareVariable(15435, int.class, "i", b.constant(0)), b.declareVariable(15436, BooleanClosureWrapper.class, "bcw", b.new_(15436, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(15437, Iterator.class, "iter", b.functionCall(15437, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(15437, b.localVariable("iter"), "hasNext"), b.sequence(b.postfixInc(15437, b.localVariable("i"))), b.block(b.declareVariable(15438, Object.class, "value", b.functionCall(15438, b.localVariable("iter"), "next")), b.if_(b.lessThan(15439, b.localVariable("i"), b.localVariable("startIndex")), b.block(b.continue_(null))), b.if_(b.functionCall(15442, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.assign(15443, b.localVariable("result"), b.localVariable("i")))))), b.return_(b.localVariable("result")))); throw new CpsCallableInvocation(f, null, self, startIndex, closure); @@ -1543,8 +2337,12 @@ public static List findIndexValues(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "findIndexValues", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexValues", self, closure))) { return DefaultGroovyMethods.findIndexValues(self, closure); } + return CpsDefaultGroovyMethods.$findIndexValues__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private static List $findIndexValues__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("findIndexValues")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15459, CpsDefaultGroovyMethods.class, "findIndexValues", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15459, CpsDefaultGroovyMethods.class, "$findIndexValues__java_lang_Object__java_lang_Number__groovy_lang_Closure", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); throw new CpsCallableInvocation(f, null, self, closure); } @@ -1552,6 +2350,10 @@ public static List findIndexValues(Object self, Number startIndex, Closu if ((!Caller.isAsynchronous(self, "findIndexValues", startIndex, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexValues", self, startIndex, closure))) { return DefaultGroovyMethods.findIndexValues(self, startIndex, closure); } + return CpsDefaultGroovyMethods.$findIndexValues__java_lang_Object__java_lang_Number__groovy_lang_Closure(self, startIndex, closure); + } + + private static List $findIndexValues__java_lang_Object__java_lang_Number__groovy_lang_Closure(Object self, Number startIndex, Closure closure) { Builder b = new Builder(loc("findIndexValues")); CpsFunction f = new CpsFunction(Arrays.asList("self", "startIndex", "closure"), b.block(b.declareVariable(15474, List.class, "result", b.new_(15474, ArrayList.class)), b.declareVariable(15475, long.class, "count", b.constant(0)), b.declareVariable(15476, long.class, "startCount", b.functionCall(15476, b.localVariable("startIndex"), "longValue")), b.declareVariable(15477, BooleanClosureWrapper.class, "bcw", b.new_(15477, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(15478, Iterator.class, "iter", b.functionCall(15478, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(15478, b.localVariable("iter"), "hasNext"), b.sequence(b.postfixInc(15478, b.localVariable("count"))), b.block(b.declareVariable(15479, Object.class, "value", b.functionCall(15479, b.localVariable("iter"), "next")), b.if_(b.lessThan(15480, b.localVariable("count"), b.localVariable("startCount")), b.block(b.continue_(null))), b.if_(b.functionCall(15483, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.functionCall(15484, b.localVariable("result"), "add", b.localVariable("count")))))), b.return_(b.localVariable("result")))); throw new CpsCallableInvocation(f, null, self, startIndex, closure); @@ -1561,6 +2363,10 @@ public static MetaClass metaClass(Class self, Closure closure) { if ((!Caller.isAsynchronous(self, "metaClass", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "metaClass", self, closure))) { return DefaultGroovyMethods.metaClass(self, closure); } + return CpsDefaultGroovyMethods.$metaClass__java_lang_Class__groovy_lang_Closure(self, closure); + } + + private static MetaClass $metaClass__java_lang_Class__groovy_lang_Closure(Class self, Closure closure) { Builder b = new Builder(loc("metaClass")); CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(15769, MetaClassRegistry.class, "metaClassRegistry", b.functionCall(15769, b.constant(GroovySystem.class), "getMetaClassRegistry")), b.declareVariable(15770, MetaClass.class, "mc", b.functionCall(15770, b.localVariable("metaClassRegistry"), "getMetaClass", b.localVariable("self"))), b.if_(b.instanceOf(15772, b.localVariable("mc"), b.constant(ExpandoMetaClass.class)), b.block(b.functionCall(15773, b.cast(15773, b.localVariable("mc"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("mc"))), b.block(b.if_(b.logicalAnd(15777, b.instanceOf(15777, b.localVariable("mc"), b.constant(DelegatingMetaClass.class)), b.instanceOf(15777, b.functionCall(15777, b.cast(15777, b.localVariable("mc"), DelegatingMetaClass.class, false), "getAdaptee"), b.constant(ExpandoMetaClass.class))), b.block(b.functionCall(15778, b.cast(15778, b.functionCall(15778, b.cast(15778, b.localVariable("mc"), DelegatingMetaClass.class, false), "getAdaptee"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("mc"))), b.block(b.if_(b.logicalAnd(15782, b.instanceOf(15782, b.localVariable("mc"), b.constant(DelegatingMetaClass.class)), b.compareEqual(15782, b.functionCall(15782, b.functionCall(15782, b.cast(15782, b.localVariable("mc"), DelegatingMetaClass.class, false), "getAdaptee"), "getClass"), b.property(15782, b.constant(MetaClassImpl.class), "class"))), b.block(b.declareVariable(15783, ExpandoMetaClass.class, "emc", b.new_(15783, ExpandoMetaClass.class, b.localVariable("self"), b.constant(false), b.constant(true))), b.functionCall(15784, b.localVariable("emc"), "initialize"), b.functionCall(15785, b.localVariable("emc"), "define", b.localVariable("closure")), b.functionCall(15786, b.cast(15786, b.localVariable("mc"), DelegatingMetaClass.class, false), "setAdaptee", b.localVariable("emc")), b.return_(b.localVariable("mc"))), b.block(b.if_(b.compareEqual(15790, b.functionCall(15790, b.localVariable("mc"), "getClass"), b.property(15790, b.constant(MetaClassImpl.class), "class")), b.block(b.assign(15792, b.localVariable("mc"), b.new_(15792, ExpandoMetaClass.class, b.localVariable("self"), b.constant(false), b.constant(true))), b.functionCall(15793, b.localVariable("mc"), "initialize"), b.functionCall(15794, b.cast(15794, b.localVariable("mc"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.functionCall(15795, b.localVariable("metaClassRegistry"), "setMetaClass", b.localVariable("self"), b.localVariable("mc")), b.return_(b.localVariable("mc"))), b.block(b.throw_(15799, b.new_(15799, GroovyRuntimeException.class, b.plus(15799, b.constant("Can't add methods to custom meta class "), b.localVariable("mc")))))))))))))); throw new CpsCallableInvocation(f, null, self, closure); @@ -1570,8 +2376,12 @@ public static MetaClass metaClass(Object self, Closure closure) { if ((!Caller.isAsynchronous(self, "metaClass", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "metaClass", self, closure))) { return DefaultGroovyMethods.metaClass(self, closure); } + return CpsDefaultGroovyMethods.$metaClass__java_lang_Object__groovy_lang_Closure(self, closure); + } + + private static MetaClass $metaClass__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { Builder b = new Builder(loc("metaClass")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(15816, MetaClass.class, "emc", b.staticCall(15816, CpsDefaultGroovyMethods.class, "hasPerInstanceMetaClass", b.localVariable("self"))), b.if_(b.compareEqual(15817, b.localVariable("emc"), b.constant(null)), b.block(b.declareVariable(15818, ExpandoMetaClass.class, "metaClass", b.new_(15818, ExpandoMetaClass.class, b.functionCall(15818, b.localVariable("self"), "getClass"), b.constant(false), b.constant(true))), b.functionCall(15819, b.localVariable("metaClass"), "initialize"), b.functionCall(15820, b.localVariable("metaClass"), "define", b.localVariable("closure")), b.if_(b.instanceOf(15821, b.localVariable("self"), b.constant(GroovyObject.class)), b.block(b.staticCall(15822, CpsDefaultGroovyMethods.class, "setMetaClass", b.cast(15822, b.localVariable("self"), GroovyObject.class, false), b.localVariable("metaClass"))), b.block(b.staticCall(15824, CpsDefaultGroovyMethods.class, "setMetaClass", b.localVariable("self"), b.localVariable("metaClass")))), b.return_(b.localVariable("metaClass"))), b.block(b.if_(b.instanceOf(15829, b.localVariable("emc"), b.constant(ExpandoMetaClass.class)), b.block(b.functionCall(15830, b.cast(15830, b.localVariable("emc"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("emc"))), b.block(b.if_(b.logicalAnd(15834, b.instanceOf(15834, b.localVariable("emc"), b.constant(DelegatingMetaClass.class)), b.instanceOf(15834, b.functionCall(15834, b.cast(15834, b.localVariable("emc"), DelegatingMetaClass.class, false), "getAdaptee"), b.constant(ExpandoMetaClass.class))), b.block(b.functionCall(15835, b.cast(15835, b.functionCall(15835, b.cast(15835, b.localVariable("emc"), DelegatingMetaClass.class, false), "getAdaptee"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("emc"))), b.block(b.throw_(15839, b.new_(15839, RuntimeException.class, b.plus(15839, b.constant("Can't add methods to non-ExpandoMetaClass "), b.localVariable("emc")))))))))))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(15816, MetaClass.class, "emc", b.staticCall(15816, CpsDefaultGroovyMethods.class, "$hasPerInstanceMetaClass__java_lang_Object", b.localVariable("self"))), b.if_(b.compareEqual(15817, b.localVariable("emc"), b.constant(null)), b.block(b.declareVariable(15818, ExpandoMetaClass.class, "metaClass", b.new_(15818, ExpandoMetaClass.class, b.functionCall(15818, b.localVariable("self"), "getClass"), b.constant(false), b.constant(true))), b.functionCall(15819, b.localVariable("metaClass"), "initialize"), b.functionCall(15820, b.localVariable("metaClass"), "define", b.localVariable("closure")), b.if_(b.instanceOf(15821, b.localVariable("self"), b.constant(GroovyObject.class)), b.block(b.staticCall(15822, CpsDefaultGroovyMethods.class, "$setMetaClass__groovy_lang_GroovyObject__groovy_lang_MetaClass", b.cast(15822, b.localVariable("self"), GroovyObject.class, false), b.localVariable("metaClass"))), b.block(b.staticCall(15824, CpsDefaultGroovyMethods.class, "$setMetaClass__java_lang_Object__groovy_lang_MetaClass", b.localVariable("self"), b.localVariable("metaClass")))), b.return_(b.localVariable("metaClass"))), b.block(b.if_(b.instanceOf(15829, b.localVariable("emc"), b.constant(ExpandoMetaClass.class)), b.block(b.functionCall(15830, b.cast(15830, b.localVariable("emc"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("emc"))), b.block(b.if_(b.logicalAnd(15834, b.instanceOf(15834, b.localVariable("emc"), b.constant(DelegatingMetaClass.class)), b.instanceOf(15834, b.functionCall(15834, b.cast(15834, b.localVariable("emc"), DelegatingMetaClass.class, false), "getAdaptee"), b.constant(ExpandoMetaClass.class))), b.block(b.functionCall(15835, b.cast(15835, b.functionCall(15835, b.cast(15835, b.localVariable("emc"), DelegatingMetaClass.class, false), "getAdaptee"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("emc"))), b.block(b.throw_(15839, b.new_(15839, RuntimeException.class, b.plus(15839, b.constant("Can't add methods to non-ExpandoMetaClass "), b.localVariable("emc")))))))))))); throw new CpsCallableInvocation(f, null, self, closure); } diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyStaticMethods.java b/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyStaticMethods.java index 2dfa95b61..6d099428a 100644 --- a/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyStaticMethods.java +++ b/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyStaticMethods.java @@ -9,44 +9,56 @@ import groovy.lang.Closure; import org.codehaus.groovy.runtime.DefaultGroovyStaticMethods; -@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Fri May 12 13:24:26 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") +@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Mon May 15 17:17:37 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") public class CpsDefaultGroovyStaticMethods { public static Thread start(Thread self, Closure closure) { - if ((!Caller.isAsynchronous(self, "start", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "start", self, closure))) { + if ((!Caller.isAsynchronous(self, "start", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "start"))) { return DefaultGroovyStaticMethods.start(self, closure); } - Builder b = new Builder(loc("start")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(46, CpsDefaultGroovyStaticMethods.class, "createThread", b.constant(null), b.constant(false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.start(java.lang.Thread,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); } public static Thread start(Thread self, String name, Closure closure) { - if ((!Caller.isAsynchronous(self, "start", name, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "start", self, name, closure))) { + if ((!Caller.isAsynchronous(self, "start", name, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "start"))) { return DefaultGroovyStaticMethods.start(self, name, closure); } - Builder b = new Builder(loc("start")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "name", "closure"), b.block(b.return_(b.staticCall(54, CpsDefaultGroovyStaticMethods.class, "createThread", b.localVariable("name"), b.constant(false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, name, closure); + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.start(java.lang.Thread,java.lang.String,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); } public static Thread startDaemon(Thread self, Closure closure) { - if ((!Caller.isAsynchronous(self, "startDaemon", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "startDaemon", self, closure))) { + if ((!Caller.isAsynchronous(self, "startDaemon", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "startDaemon"))) { return DefaultGroovyStaticMethods.startDaemon(self, closure); } - Builder b = new Builder(loc("startDaemon")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(69, CpsDefaultGroovyStaticMethods.class, "createThread", b.constant(null), b.constant(true), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.startDaemon(java.lang.Thread,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); } public static Thread startDaemon(Thread self, String name, Closure closure) { - if ((!Caller.isAsynchronous(self, "startDaemon", name, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "startDaemon", self, name, closure))) { + if ((!Caller.isAsynchronous(self, "startDaemon", name, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "startDaemon"))) { return DefaultGroovyStaticMethods.startDaemon(self, name, closure); } - Builder b = new Builder(loc("startDaemon")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "name", "closure"), b.block(b.return_(b.staticCall(83, CpsDefaultGroovyStaticMethods.class, "createThread", b.localVariable("name"), b.constant(true), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, name, closure); + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.startDaemon(java.lang.Thread,java.lang.String,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + static Thread createThread(String name, boolean daemon, Closure closure) { + return CpsDefaultGroovyStaticMethods.$createThread__java_lang_String__boolean__groovy_lang_Closure(name, daemon, closure); + } + + private static Thread $createThread__java_lang_String__boolean__groovy_lang_Closure(String name, boolean daemon, Closure closure) { + Builder b = new Builder(loc("createThread")); + CpsFunction f = new CpsFunction(Arrays.asList("name", "daemon", "closure"), b.block(b.declareVariable(86, Thread.class, "thread", b.ternaryOp(b.compareNotEqual(86, b.localVariable("name"), b.constant(null)), b.new_(86, Thread.class, b.localVariable("closure"), b.localVariable("name")), b.new_(87, Thread.class, b.localVariable("closure")))), b.if_(b.localVariable("daemon"), b.functionCall(87, b.localVariable("thread"), "setDaemon", b.constant(true))), b.functionCall(88, b.localVariable("thread"), "start"), b.return_(b.localVariable("thread")))); + throw new CpsCallableInvocation(f, null, name, daemon, closure); + } + + static void sleepImpl(long millis, Closure closure) { + CpsDefaultGroovyStaticMethods.$sleepImpl__long__groovy_lang_Closure(millis, closure); + } + + private static void $sleepImpl__long__groovy_lang_Closure(long millis, Closure closure) { + Builder b = new Builder(loc("sleepImpl")); + CpsFunction f = new CpsFunction(Arrays.asList("millis", "closure"), b.block(b.declareVariable(113, long.class, "start", b.functionCall(114, b.constant(System.class), "currentTimeMillis")), b.declareVariable(115, long.class, "rest", b.localVariable("millis")), b.declareVariable(116, long.class, "current", null), b.while_(null, b.greaterThan(117, b.localVariable("rest"), b.constant(0)), b.block(b.tryCatch(b.block(b.functionCall(119, b.constant(Thread.class), "sleep", b.localVariable("rest")), b.assign(121, b.localVariable("rest"), b.constant(0))), null))))); + throw new CpsCallableInvocation(f, null, millis, closure); } public static void sleep(Object self, long milliseconds, Closure onInterrupt) { @@ -54,8 +66,12 @@ public static void sleep(Object self, long milliseconds, Closure onInterrupt) { DefaultGroovyStaticMethods.sleep(self, milliseconds, onInterrupt); return ; } + CpsDefaultGroovyStaticMethods.$sleep__java_lang_Object__long__groovy_lang_Closure(self, milliseconds, onInterrupt); + } + + private static void $sleep__java_lang_Object__long__groovy_lang_Closure(Object self, long milliseconds, Closure onInterrupt) { Builder b = new Builder(loc("sleep")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "milliseconds", "onInterrupt"), b.block(b.staticCall(149, CpsDefaultGroovyStaticMethods.class, "sleepImpl", b.localVariable("milliseconds"), b.localVariable("onInterrupt")))); + CpsFunction f = new CpsFunction(Arrays.asList("self", "milliseconds", "onInterrupt"), b.block(b.staticCall(149, CpsDefaultGroovyStaticMethods.class, "$sleepImpl__long__groovy_lang_Closure", b.localVariable("milliseconds"), b.localVariable("onInterrupt")))); throw new CpsCallableInvocation(f, null, self, milliseconds, onInterrupt); } diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsProcessGroovyMethods.java b/src/main/java/com/cloudbees/groovy/cps/CpsProcessGroovyMethods.java index 47fbdf736..f4cde6d2c 100644 --- a/src/main/java/com/cloudbees/groovy/cps/CpsProcessGroovyMethods.java +++ b/src/main/java/com/cloudbees/groovy/cps/CpsProcessGroovyMethods.java @@ -2,11 +2,30 @@ package com.cloudbees.groovy.cps; import javax.annotation.Generated; +import com.cloudbees.groovy.cps.impl.Caller; +import groovy.lang.Closure; +import org.codehaus.groovy.runtime.ProcessGroovyMethods; -@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Fri May 12 13:24:26 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") +@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Mon May 15 17:17:37 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") public class CpsProcessGroovyMethods { + public static void withWriter(Process self, Closure closure) { + if ((!Caller.isAsynchronous(self, "withWriter", closure))&&(!Caller.isAsynchronous(CpsProcessGroovyMethods.class, "withWriter"))) { + ProcessGroovyMethods.withWriter(self, closure); + return ; + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.ProcessGroovyMethods.withWriter(java.lang.Process,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + + public static void withOutputStream(Process self, Closure closure) { + if ((!Caller.isAsynchronous(self, "withOutputStream", closure))&&(!Caller.isAsynchronous(CpsProcessGroovyMethods.class, "withOutputStream"))) { + ProcessGroovyMethods.withOutputStream(self, closure); + return ; + } + throw new UnsupportedOperationException("org.codehaus.groovy.runtime.ProcessGroovyMethods.withOutputStream(java.lang.Process,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); + } + private static MethodLocation loc(String methodName) { return new MethodLocation(CpsProcessGroovyMethods.class, methodName); } From 0de11cd879949cc27aa5b19cddbe381001e2f475 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 16 May 2017 11:06:15 -0400 Subject: [PATCH 404/932] Sideporting tests for collect, each and collectEntries --- .../groovy/cps/CpsTransformerTest.groovy | 340 +++++++++++++++++- 1 file changed, 324 insertions(+), 16 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index b54c8f552..43f093392 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -1,6 +1,5 @@ package com.cloudbees.groovy.cps -import com.cloudbees.groovy.cps.impl.ContinuationGroup import com.cloudbees.groovy.cps.impl.CpsCallableInvocation import groovy.transform.NotYetImplemented import org.junit.Test @@ -464,13 +463,29 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { /** * Testing {@link CpsDefaultGroovyMethods}. */ - @Test - void each() { - assert evalCPS(""" - def x = 0; + + // TODO: Move the CpsDefaultGroovyMethods stuff to a separate paremeterized test. + + private static final String eachString = """ + def x = 100; (0..10).each { y -> x+=y; } return x; -""") == 55; +""" + + @Test + void each() { + assert evalCPS(eachString) == 155; + } + + private String codeAsMethod(String contents) { + return """ + @NonCPS + def someMethod() { + ${contents} + } + + someMethod() +""" } /** @@ -479,16 +494,309 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { */ @Test void syncEach() { - assert evalCPS(""" - @NonCPS - def sum() { - def x = 0; - (0..10).each { y -> x+=y; } - return x; + assert evalCPS(codeAsMethod(eachString)) == 155; + } + + private static final String eachMapKVString = """ + def x = 100 + def m = [a: 1, b: 2, c: 3]; + m.each { k, v -> x += v } + return x; +""" + + @Test + void eachMapKV() { + assert evalCPS(eachMapKVString) == 106; + } + + @Test + void syncEachMapKV() { + assert evalCPS(codeAsMethod(eachMapKVString)) == 106; + } + + private static final String eachMapEntryString = """ + def x = 100 + def m = [a: 1, b: 2, c: 3]; + m.each { e -> x += e.getValue() } + return x; +""" + + @Test + void eachMapEntry() { + assert evalCPS(eachMapEntryString) == 106; + } + + @Test + void syncEachMapEntry() { + assert evalCPS(codeAsMethod(eachMapEntryString)) == 106; + } + + private static final String setEachString = """ + def x = 100 + ([1,2,3] as HashSet).each { y -> x += y } + return x +""" + + @Test + void setEach() { + assert evalCPS(setEachString) == 106 + } + + @Test + void syncSetEach() { + assert evalCPS(codeAsMethod(setEachString)) == 106; + } + + private final static String sortedSetEachString = """ + def x = 100 + ([1,2,3] as TreeSet).each { y -> x += y } + return x +""" + + @Test + void sortedSetEach() { + assert evalCPS(sortedSetEachString) == 106 + } + + @Test + void syncSortedSetEach() { + assert evalCPS(codeAsMethod(sortedSetEachString)) == 106; + } + + private final static String collectListString = """ + return [1, 2, 3].collect { it * 2 } +""" + + @Test + void collectList() { + assert evalCPS(collectListString) == [2, 4, 6] + } + + @Test + void syncCollectList() { + assert evalCPS(codeAsMethod(collectListString)) == [2, 4, 6]; + } + + private final static String collectListIntoExistingListString = """ + def existing = [2] + return [2, 3, 4].collect(existing) { it * 2 } +""" + + @Test + void collectListIntoExistingList() { + assert evalCPS(collectListIntoExistingListString) == [2, 4, 6, 8] + } + + @Test + void syncCollectListIntoExistingList() { + assert evalCPS(codeAsMethod(collectListIntoExistingListString)) == [2, 4, 6, 8]; } - sum() -""") == 55; + private static final String collectListIntoExistingSetString = """ + return [2, 3, 4].collect([2] as HashSet) { it * 2 } +""" + + @Test + void collectListIntoExistingSet() { + assert evalCPS(collectListIntoExistingSetString) == [2, 4, 6, 8] as HashSet + } + + @Test + void syncCollectListIntoExistingSet() { + assert evalCPS(codeAsMethod(collectListIntoExistingSetString)) == [2, 4, 6, 8] as HashSet; + } + + private static final String collectSetString = """ + return ([1, 2, 3] as HashSet).collect { it * 2 } +""" + + @Test + void collectSet() { + assert evalCPS(collectSetString) == [2, 4, 6] + } + + @Test + void syncCollectSet() { + assert evalCPS(codeAsMethod(collectSetString)) == [2, 4, 6] + } + + private static final String collectSetIntoExistingListString = """ + def existing = [2] + return ([2, 3, 4] as HashSet).collect(existing) { it * 2 } +""" + + @Test + void collectSetIntoExistingList() { + assert evalCPS(collectSetIntoExistingListString) == [2, 4, 6, 8] + } + + @Test + void syncCollectSetIntoExistingList() { + assert evalCPS(codeAsMethod(collectSetIntoExistingListString)) == [2, 4, 6, 8] + } + + private static final String collectSetIntoExistingSetString = """ + return ([2, 3, 4] as HashSet).collect([2] as HashSet) { it * 2 } +""" + + @Test + void collectSetIntoExistingSet() { + assert evalCPS(collectSetIntoExistingSetString) == [2, 4, 6, 8] as HashSet + } + + @Test + void syncCollectSetIntoExistingSet() { + assert evalCPS(codeAsMethod(collectSetIntoExistingSetString)) == [2, 4, 6, 8] as HashSet + } + + private static final String collectMapKVString = """ + def m = [a: 1, b: 2, c: 3]; + return m.collect { k, v -> v } +""" + + @Test + void collectMapKV() { + assert evalCPS(collectMapKVString) == [1, 2, 3]; + } + + @Test + void syncCollectMapKV() { + assert evalCPS(codeAsMethod(collectMapKVString)) == [1, 2, 3] + } + + private static final String collectMapEntryString = """ + def m = [a: 1, b: 2, c: 3]; + return m.collect { e -> e.getValue() } +""" + + @Test + void collectMapEntry() { + assert evalCPS(collectMapEntryString) == [1, 2, 3]; + } + + @Test + void syncCollectMapEntry() { + assert evalCPS(codeAsMethod(collectMapEntryString)) == [1, 2, 3] + } + + private static final String collectMapKVIntoExistingListString = """ + def m = [a: 2, b: 3, c: 4]; + return m.collect([1]) { k, v -> v } +""" + + @Test + void collectMapKVIntoExistingList() { + assert evalCPS(collectMapKVIntoExistingListString) == [1, 2, 3, 4]; + } + + @Test + void syncCollectMapKVIntoExistingList() { + assert evalCPS(codeAsMethod(collectMapKVIntoExistingListString)) == [1, 2, 3, 4] + } + + private static final String collectMapEntryIntoExistingListString = """ + def m = [a: 2, b: 3, c: 4]; + return m.collect([1]) { e -> e.getValue() } +""" + + @Test + void collectMapEntryIntoExistingList() { + assert evalCPS(collectMapEntryIntoExistingListString) == [1, 2, 3, 4]; + } + + @Test + void syncCollectMapEntryIntoExistingList() { + assert evalCPS(codeAsMethod(collectMapEntryIntoExistingListString)) == [1, 2, 3, 4] + } + + private static final String collectMapKVIntoExistingSetString = """ + def m = [a: 2, b: 3, c: 4]; + return m.collect([1] as HashSet) { k, v -> v } +""" + + @Test + void collectMapKVIntoExistingSet() { + assert evalCPS(collectMapKVIntoExistingSetString) == [1, 2, 3, 4] as HashSet; + } + + @Test + void syncCollectMapKVIntoExistingSet() { + assert evalCPS(codeAsMethod(collectMapKVIntoExistingSetString)) == [1, 2, 3, 4] as HashSet + } + + private static final String collectMapEntryIntoExistingSetString = """ + def m = [a: 2, b: 3, c: 4]; + return m.collect([1] as HashSet) { e -> e.getValue() } +""" + + @Test + void collectMapEntryIntoExistingSet() { + assert evalCPS(collectMapEntryIntoExistingSetString) == [1, 2, 3, 4] as HashSet; + } + + @Test + void syncCollectMapEntryIntoExistingSet() { + assert evalCPS(codeAsMethod(collectMapEntryIntoExistingSetString)) == [1, 2, 3, 4] as HashSet + } + + private static final String collectEntriesKVString = """ + def m = [a: 1, b: 2, c: 3] + return m.collectEntries { k, v -> [(k): v * 2] } +""" + + @Test + void collectEntriesKV() { + assert evalCPS(collectEntriesKVString) == [a: 2, b: 4, c: 6] + } + + @Test + void syncCollectEntriesKV() { + assert evalCPS(codeAsMethod(collectEntriesKVString)) == [a: 2, b: 4, c: 6] + } + + private static final String collectEntriesEntryString = """ + def m = [a: 1, b: 2, c: 3] + return m.collectEntries { e -> [(e.getKey()): e.getValue() * 2] } +""" + + @Test + void collectEntriesEntry() { + assert evalCPS(collectEntriesEntryString) == [a: 2, b: 4, c: 6] + } + + @Test + void syncCollectEntriesEntry() { + assert evalCPS(codeAsMethod(collectEntriesEntryString)) == [a: 2, b: 4, c: 6] + } + + private static final String collectEntriesKVExistingMapString = """ + def m = [b: 2, c: 3] + return m.collectEntries([a: 2]) { k, v -> [(k): v * 2] } +""" + + @Test + void collectEntriesKVExistingMap() { + assert evalCPS(collectEntriesKVExistingMapString) == [a: 2, b: 4, c: 6] + } + + @Test + void syncCollectEntriesExistingMap() { + assert evalCPS(codeAsMethod(collectEntriesKVExistingMapString)) == [a: 2, b: 4, c: 6] + } + + private static final String collectEntriesEntryExistingMapString = """ + def m = [b: 2, c: 3] + return m.collectEntries([a: 2]) { e -> [(e.getKey()): e.getValue() * 2] } +""" + + @Test + void collectEntriesEntryExistingMap() { + assert evalCPS(collectEntriesEntryExistingMapString) == [a: 2, b: 4, c: 6] + } + + @Test + void syncCollectEntriesExistingMapEntry() { + assert evalCPS(codeAsMethod(collectEntriesEntryExistingMapString)) == [a: 2, b: 4, c: 6] } @Test @@ -668,10 +976,10 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { @Test void eachArray() { assert evalCPS(""" - def x = 0; + def x = 10; [1, 2, 3].each { y -> x+=y; } return x; - """) == 6; + """) == 16; } @Issue('https://github.com/cloudbees/groovy-cps/issues/26') From ca6df431bc5ca2ee1fc4084e929459b8c04d9c53 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 16 May 2017 11:27:54 -0400 Subject: [PATCH 405/932] Deprecating method variants which fail to specify categories. --- .../java/com/cloudbees/groovy/cps/Continuable.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/src/main/java/com/cloudbees/groovy/cps/Continuable.java index b0aabbabd..91ba7f540 100644 --- a/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -140,22 +140,25 @@ public void printStackTrace(PrintWriter s) { * @throws InvocationTargetException * if the program threw an exception that it didn't handle by itself. */ + @Deprecated public Object run(Object arg) throws InvocationTargetException { return run0(new Outcome(arg,null)).wrapReplay(); } + @Deprecated public Object runByThrow(Throwable arg) throws InvocationTargetException { return run0(new Outcome(null,arg)).wrapReplay(); } - /** - * Resumes this program by either returning the value from {@link Continuable#suspend(Object)} or - * throwing an exception - */ + @Deprecated public Outcome run0(final Outcome cn) { return run0(cn, categories); } + /** + * Resumes this program by either returning the value from {@link Continuable#suspend(Object)} or + * throwing an exception + */ public Outcome run0(final Outcome cn, List categories) { return GroovyCategorySupport.use(categories, new Closure(null) { @Override From 986c20cbd137747421e780f58827d922c35e9c4a Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 16 May 2017 16:30:11 -0400 Subject: [PATCH 406/932] Move CpsDefaultGroovyMethods tests into their own parameterized class --- .../cps/CpsDefaultGroovyMethodsTest.groovy | 106 ++++++ .../groovy/cps/CpsTransformerTest.groovy | 339 ------------------ 2 files changed, 106 insertions(+), 339 deletions(-) create mode 100644 src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy new file mode 100644 index 000000000..b307c5617 --- /dev/null +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -0,0 +1,106 @@ +package com.cloudbees.groovy.cps + +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.Parameterized + +@RunWith(Parameterized.class) +class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { + private String testName + private String testCode + private Object testResult + + CpsDefaultGroovyMethodsTest(String testName, String testCode, Object testResult) { + this.testName = testName + this.testCode = testCode + this.testResult = testResult + } + + @Parameterized.Parameters(name="Name: {0}") + public static Iterable generateParameters() { + // First element is the name of the test + // Second element is the code to eval + // Third element is expected result + return [ + ["each", "def x = 100; (0..10).each { y -> x+=y }; return x", 155] as Object[], + ["eachMapKV", "def x = 100\n" + + "def m = [a: 1, b: 2, c: 3];\n" + + "m.each { k, v -> x += v }\n" + + "return x;", 106] as Object[], + ["eachMapEntry", "def x = 100\n" + + "def m = [a: 1, b: 2, c: 3];\n" + + "m.each { e -> x += e.getValue() }\n" + + "return x;", 106] as Object[], + ["setEach", "def x = 100\n" + + "([1,2,3] as HashSet).each { y -> x += y }\n" + + "return x", 106] as Object[], + ["sortedSetEach", "def x = 100\n" + + "([1,2,3] as TreeSet).each { y -> x += y }\n" + + "return x", 106] as Object[], + ["collectList", "return [1, 2, 3].collect { it * 2 }", [2, 4, 6]] as Object[], + ["collectListIntoExistingList", "def existing = [2]\n" + + "return [2, 3, 4].collect(existing) { it * 2 }", [2, 4, 6, 8]] as Object[], + ["collectListIntoExistingSet", "return [2, 3, 4].collect([2] as HashSet) { it * 2 }", + [2, 4, 6, 8] as HashSet] as Object[], + ["collectSet", "return ([1, 2, 3] as HashSet).collect { it * 2 }", [2, 4, 6]] as Object[], + ["collectSetIntoExistingList", "def existing = [2]\n" + + "return ([2, 3, 4] as HashSet).collect(existing) { it * 2 }", [2, 4, 6, 8]] as Object[], + ["collectSetIntoExistingSet", "return ([2, 3, 4] as HashSet).collect([2] as HashSet) { it * 2 }", + [2, 4, 6, 8] as HashSet] as Object[], + ["collectMapKV", "def m = [a: 1, b: 2, c: 3];\n" + + "return m.collect { k, v -> v }", [1, 2, 3]] as Object[], + ["collectMapEntry", "def m = [a: 1, b: 2, c: 3];\n" + + "return m.collect { e -> e.getValue() }", [1, 2, 3]] as Object[], + ["collectMapKVIntoExistingList", "def m = [a: 2, b: 3, c: 4];\n" + + "return m.collect([1]) { k, v -> v }", [1, 2, 3, 4]] as Object[], + ["collectMapEntryIntoExistingList", "def m = [a: 2, b: 3, c: 4];\n" + + "return m.collect([1]) { e -> e.getValue() }", [1, 2, 3, 4]] as Object[], + ["collectMapKVIntoExistingSet", "def m = [a: 2, b: 3, c: 4];\n" + + "return m.collect([1] as HashSet) { k, v -> v }", [1, 2, 3, 4] as HashSet] as Object[], + ["collectMapEntryIntoExistingSet", "def m = [a: 2, b: 3, c: 4];\n" + + "return m.collect([1] as HashSet) { e -> e.getValue() }", [1, 2, 3, 4] as HashSet] as Object[], + ["collectEntriesKV", "def m = [a: 1, b: 2, c: 3]\n" + + "return m.collectEntries { k, v -> [(k): v * 2] }", [a: 2, b: 4, c: 6]] as Object[], + ["collectEntriesEntry", "def m = [a: 1, b: 2, c: 3]\n" + + "return m.collectEntries { e -> [(e.getKey()): e.getValue() * 2] }", [a: 2, b: 4, c: 6]] as Object[], + ["collectEntriesIntoExistingMapKV", "def m = [b: 2, c: 3]\n" + + "return m.collectEntries([a: 2]) { k, v -> [(k): v * 2] }", [a: 2, b: 4, c: 6]] as Object[], + ["collectEntriesIntoExistingMapEntry", "def m = [b: 2, c: 3]\n" + + "return m.collectEntries([a: 2]) { e -> [(e.getKey()): e.getValue() * 2] }", [a: 2, b: 4, c: 6]] as Object[], + ["any", "return [0, 1, 2].any { i -> i == 1 }", true] as Object[] +/* + // Waiting for StringGroovyMethods to be added to transformer + ["eachLine", 'def s = """a\n' + + 'b\n' + + 'c\n' + + '"""\n' + + 'def list = []\n' + + 's.eachLine { l -> list.add(l) }\n' + + 'return l', ["a", "b", "c"]] as Object[] +*/ + ] + + } + + private String codeAsMethod(String contents) { + return """ + @NonCPS + def someMethod() { + ${contents} + } + + someMethod() +""" + } + + @Test + void cps() { + assert evalCPS(testCode) == testResult + } + + @Test + void sync() { + assert evalCPS(codeAsMethod(testCode)) == testResult + } + +} diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 43f093392..c7e731956 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -460,345 +460,6 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS("def x=50; x/=5; return x;") == 10; } - /** - * Testing {@link CpsDefaultGroovyMethods}. - */ - - // TODO: Move the CpsDefaultGroovyMethods stuff to a separate paremeterized test. - - private static final String eachString = """ - def x = 100; - (0..10).each { y -> x+=y; } - return x; -""" - - @Test - void each() { - assert evalCPS(eachString) == 155; - } - - private String codeAsMethod(String contents) { - return """ - @NonCPS - def someMethod() { - ${contents} - } - - someMethod() -""" - } - - /** - * Testing {@link CpsDefaultGroovyMethods} to ensure it doesn't kick in incorrectly - * while processing synchronous code - */ - @Test - void syncEach() { - assert evalCPS(codeAsMethod(eachString)) == 155; - } - - private static final String eachMapKVString = """ - def x = 100 - def m = [a: 1, b: 2, c: 3]; - m.each { k, v -> x += v } - return x; -""" - - @Test - void eachMapKV() { - assert evalCPS(eachMapKVString) == 106; - } - - @Test - void syncEachMapKV() { - assert evalCPS(codeAsMethod(eachMapKVString)) == 106; - } - - private static final String eachMapEntryString = """ - def x = 100 - def m = [a: 1, b: 2, c: 3]; - m.each { e -> x += e.getValue() } - return x; -""" - - @Test - void eachMapEntry() { - assert evalCPS(eachMapEntryString) == 106; - } - - @Test - void syncEachMapEntry() { - assert evalCPS(codeAsMethod(eachMapEntryString)) == 106; - } - - private static final String setEachString = """ - def x = 100 - ([1,2,3] as HashSet).each { y -> x += y } - return x -""" - - @Test - void setEach() { - assert evalCPS(setEachString) == 106 - } - - @Test - void syncSetEach() { - assert evalCPS(codeAsMethod(setEachString)) == 106; - } - - private final static String sortedSetEachString = """ - def x = 100 - ([1,2,3] as TreeSet).each { y -> x += y } - return x -""" - - @Test - void sortedSetEach() { - assert evalCPS(sortedSetEachString) == 106 - } - - @Test - void syncSortedSetEach() { - assert evalCPS(codeAsMethod(sortedSetEachString)) == 106; - } - - private final static String collectListString = """ - return [1, 2, 3].collect { it * 2 } -""" - - @Test - void collectList() { - assert evalCPS(collectListString) == [2, 4, 6] - } - - @Test - void syncCollectList() { - assert evalCPS(codeAsMethod(collectListString)) == [2, 4, 6]; - } - - private final static String collectListIntoExistingListString = """ - def existing = [2] - return [2, 3, 4].collect(existing) { it * 2 } -""" - - @Test - void collectListIntoExistingList() { - assert evalCPS(collectListIntoExistingListString) == [2, 4, 6, 8] - } - - @Test - void syncCollectListIntoExistingList() { - assert evalCPS(codeAsMethod(collectListIntoExistingListString)) == [2, 4, 6, 8]; - } - - private static final String collectListIntoExistingSetString = """ - return [2, 3, 4].collect([2] as HashSet) { it * 2 } -""" - - @Test - void collectListIntoExistingSet() { - assert evalCPS(collectListIntoExistingSetString) == [2, 4, 6, 8] as HashSet - } - - @Test - void syncCollectListIntoExistingSet() { - assert evalCPS(codeAsMethod(collectListIntoExistingSetString)) == [2, 4, 6, 8] as HashSet; - } - - private static final String collectSetString = """ - return ([1, 2, 3] as HashSet).collect { it * 2 } -""" - - @Test - void collectSet() { - assert evalCPS(collectSetString) == [2, 4, 6] - } - - @Test - void syncCollectSet() { - assert evalCPS(codeAsMethod(collectSetString)) == [2, 4, 6] - } - - private static final String collectSetIntoExistingListString = """ - def existing = [2] - return ([2, 3, 4] as HashSet).collect(existing) { it * 2 } -""" - - @Test - void collectSetIntoExistingList() { - assert evalCPS(collectSetIntoExistingListString) == [2, 4, 6, 8] - } - - @Test - void syncCollectSetIntoExistingList() { - assert evalCPS(codeAsMethod(collectSetIntoExistingListString)) == [2, 4, 6, 8] - } - - private static final String collectSetIntoExistingSetString = """ - return ([2, 3, 4] as HashSet).collect([2] as HashSet) { it * 2 } -""" - - @Test - void collectSetIntoExistingSet() { - assert evalCPS(collectSetIntoExistingSetString) == [2, 4, 6, 8] as HashSet - } - - @Test - void syncCollectSetIntoExistingSet() { - assert evalCPS(codeAsMethod(collectSetIntoExistingSetString)) == [2, 4, 6, 8] as HashSet - } - - private static final String collectMapKVString = """ - def m = [a: 1, b: 2, c: 3]; - return m.collect { k, v -> v } -""" - - @Test - void collectMapKV() { - assert evalCPS(collectMapKVString) == [1, 2, 3]; - } - - @Test - void syncCollectMapKV() { - assert evalCPS(codeAsMethod(collectMapKVString)) == [1, 2, 3] - } - - private static final String collectMapEntryString = """ - def m = [a: 1, b: 2, c: 3]; - return m.collect { e -> e.getValue() } -""" - - @Test - void collectMapEntry() { - assert evalCPS(collectMapEntryString) == [1, 2, 3]; - } - - @Test - void syncCollectMapEntry() { - assert evalCPS(codeAsMethod(collectMapEntryString)) == [1, 2, 3] - } - - private static final String collectMapKVIntoExistingListString = """ - def m = [a: 2, b: 3, c: 4]; - return m.collect([1]) { k, v -> v } -""" - - @Test - void collectMapKVIntoExistingList() { - assert evalCPS(collectMapKVIntoExistingListString) == [1, 2, 3, 4]; - } - - @Test - void syncCollectMapKVIntoExistingList() { - assert evalCPS(codeAsMethod(collectMapKVIntoExistingListString)) == [1, 2, 3, 4] - } - - private static final String collectMapEntryIntoExistingListString = """ - def m = [a: 2, b: 3, c: 4]; - return m.collect([1]) { e -> e.getValue() } -""" - - @Test - void collectMapEntryIntoExistingList() { - assert evalCPS(collectMapEntryIntoExistingListString) == [1, 2, 3, 4]; - } - - @Test - void syncCollectMapEntryIntoExistingList() { - assert evalCPS(codeAsMethod(collectMapEntryIntoExistingListString)) == [1, 2, 3, 4] - } - - private static final String collectMapKVIntoExistingSetString = """ - def m = [a: 2, b: 3, c: 4]; - return m.collect([1] as HashSet) { k, v -> v } -""" - - @Test - void collectMapKVIntoExistingSet() { - assert evalCPS(collectMapKVIntoExistingSetString) == [1, 2, 3, 4] as HashSet; - } - - @Test - void syncCollectMapKVIntoExistingSet() { - assert evalCPS(codeAsMethod(collectMapKVIntoExistingSetString)) == [1, 2, 3, 4] as HashSet - } - - private static final String collectMapEntryIntoExistingSetString = """ - def m = [a: 2, b: 3, c: 4]; - return m.collect([1] as HashSet) { e -> e.getValue() } -""" - - @Test - void collectMapEntryIntoExistingSet() { - assert evalCPS(collectMapEntryIntoExistingSetString) == [1, 2, 3, 4] as HashSet; - } - - @Test - void syncCollectMapEntryIntoExistingSet() { - assert evalCPS(codeAsMethod(collectMapEntryIntoExistingSetString)) == [1, 2, 3, 4] as HashSet - } - - private static final String collectEntriesKVString = """ - def m = [a: 1, b: 2, c: 3] - return m.collectEntries { k, v -> [(k): v * 2] } -""" - - @Test - void collectEntriesKV() { - assert evalCPS(collectEntriesKVString) == [a: 2, b: 4, c: 6] - } - - @Test - void syncCollectEntriesKV() { - assert evalCPS(codeAsMethod(collectEntriesKVString)) == [a: 2, b: 4, c: 6] - } - - private static final String collectEntriesEntryString = """ - def m = [a: 1, b: 2, c: 3] - return m.collectEntries { e -> [(e.getKey()): e.getValue() * 2] } -""" - - @Test - void collectEntriesEntry() { - assert evalCPS(collectEntriesEntryString) == [a: 2, b: 4, c: 6] - } - - @Test - void syncCollectEntriesEntry() { - assert evalCPS(codeAsMethod(collectEntriesEntryString)) == [a: 2, b: 4, c: 6] - } - - private static final String collectEntriesKVExistingMapString = """ - def m = [b: 2, c: 3] - return m.collectEntries([a: 2]) { k, v -> [(k): v * 2] } -""" - - @Test - void collectEntriesKVExistingMap() { - assert evalCPS(collectEntriesKVExistingMapString) == [a: 2, b: 4, c: 6] - } - - @Test - void syncCollectEntriesExistingMap() { - assert evalCPS(codeAsMethod(collectEntriesKVExistingMapString)) == [a: 2, b: 4, c: 6] - } - - private static final String collectEntriesEntryExistingMapString = """ - def m = [b: 2, c: 3] - return m.collectEntries([a: 2]) { e -> [(e.getKey()): e.getValue() * 2] } -""" - - @Test - void collectEntriesEntryExistingMap() { - assert evalCPS(collectEntriesEntryExistingMapString) == [a: 2, b: 4, c: 6] - } - - @Test - void syncCollectEntriesExistingMapEntry() { - assert evalCPS(codeAsMethod(collectEntriesEntryExistingMapString)) == [a: 2, b: 4, c: 6] - } - @Test void instanceOf() { assert evalCPS("null instanceof String")==false; From b8cf5c0ba5148c69a60a46a7ff25ed197f13b878 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 16 May 2017 18:53:08 -0400 Subject: [PATCH 407/932] Code review responses - still need to fix compilation --- .../cps/CpsDefaultGroovyMethodsTest.groovy | 22 +++++++++---------- .../groovy/cps/CpsTransformerTest.groovy | 9 -------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy index b307c5617..8fe5f8c8a 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -23,6 +23,9 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { // Third element is expected result return [ ["each", "def x = 100; (0..10).each { y -> x+=y }; return x", 155] as Object[], + ["eachArray", "def x = 10;\n" + + "[1, 2, 3].each { y -> x+=y; }\n" + + "return x;", 16] as Object[], ["eachMapKV", "def x = 100\n" + "def m = [a: 1, b: 2, c: 3];\n" + "m.each { k, v -> x += v }\n" + @@ -82,17 +85,6 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { } - private String codeAsMethod(String contents) { - return """ - @NonCPS - def someMethod() { - ${contents} - } - - someMethod() -""" - } - @Test void cps() { assert evalCPS(testCode) == testResult @@ -100,7 +92,13 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { @Test void sync() { - assert evalCPS(codeAsMethod(testCode)) == testResult + assert evalCPS(""" +@NonCPS +def someMethod() { + ${contents} +} +someMethod() +""") == testResult } } diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index c7e731956..5145dcb8d 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -634,15 +634,6 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { public static int add(int a, int b) { return a+b; } - @Test - void eachArray() { - assert evalCPS(""" - def x = 10; - [1, 2, 3].each { y -> x+=y; } - return x; - """) == 16; - } - @Issue('https://github.com/cloudbees/groovy-cps/issues/26') @Test void interfaceDeclaration() { From d21daf9b765ef5e42c40b8190204285fc64f8643 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 16 May 2017 19:00:42 -0400 Subject: [PATCH 408/932] Switch to gmavenplus, because gmaven is bad. --- pom.xml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 1e05b363c..20ce39f32 100644 --- a/pom.xml +++ b/pom.xml @@ -32,29 +32,19 @@ - org.codehaus.gmaven - gmaven-plugin - 1.5-jenkins-3 + org.codehaus.gmavenplus + gmavenplus-plugin + 1.5 generateStubs compile - generateTestStubs + testGenerateStubs testCompile - - 1.8 - - - - org.codehaus.gmaven.runtime - gmaven-runtime-1.8 - 1.5 - - org.apache.maven.plugins From 677626c344caac3f2a1eaca4e2c2fbff532984f5 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 16 May 2017 19:02:36 -0400 Subject: [PATCH 409/932] Whoops, bad copy-paste --- .../com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy index 8fe5f8c8a..a26b9c0df 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -95,7 +95,7 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { assert evalCPS(""" @NonCPS def someMethod() { - ${contents} + ${testCode} } someMethod() """) == testResult From eaa64092bcdea7a6012de03c85370eb53548231f Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 17 May 2017 10:20:15 -0400 Subject: [PATCH 410/932] More .any tests and added .every tests --- .../groovy/cps/CpsDefaultGroovyMethodsTest.groovy | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy index a26b9c0df..4db2fa856 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -70,7 +70,15 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { "return m.collectEntries([a: 2]) { k, v -> [(k): v * 2] }", [a: 2, b: 4, c: 6]] as Object[], ["collectEntriesIntoExistingMapEntry", "def m = [b: 2, c: 3]\n" + "return m.collectEntries([a: 2]) { e -> [(e.getKey()): e.getValue() * 2] }", [a: 2, b: 4, c: 6]] as Object[], - ["any", "return [0, 1, 2].any { i -> i == 1 }", true] as Object[] + ["any", "return [0, 1, 2].any { i -> i == 1 }", true] as Object[], + ["anyMapKV", "return [a: 0, b: 1, c: 2].any { k, v -> v == 1 }", true] as Object[], + ["anyMapEntry", "return [a: 0, b: 1, c: 2].any { e -> e.getValue() == 1 }", true] as Object[], + ["anyFalse", "return [0, 1, 2].any { i -> i > 2 }", false] as Object[], + ["every", "return [0, 1, 2].every { i -> i < 3 }", true] as Object[], + ["everyMapKV", "return [a: 0, b: 1, c: 2].every { k, v -> v < 3 }", true] as Object[], + ["everyMapEntry", "return [a: 0, b: 1, c: 2].every { e -> e.getValue() < 3 }", true] as Object[], + ["everyFalse", "return [0, 1, 2].every { i -> i < 2 }", false] as Object[] + /* // Waiting for StringGroovyMethods to be added to transformer ["eachLine", 'def s = """a\n' + From 3bda704b6c22ed05fdc73019dcb69a49af0c8e10 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 17 May 2017 10:45:18 -0400 Subject: [PATCH 411/932] collectEntries from list, collectMany, combinations tests --- .../cps/CpsDefaultGroovyMethodsTest.groovy | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy index 4db2fa856..a70442700 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -24,7 +24,7 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { return [ ["each", "def x = 100; (0..10).each { y -> x+=y }; return x", 155] as Object[], ["eachArray", "def x = 10;\n" + - "[1, 2, 3].each { y -> x+=y; }\n" + + "([1, 2, 3] as Integer[]).each { y -> x+=y; }\n" + "return x;", 16] as Object[], ["eachMapKV", "def x = 100\n" + "def m = [a: 1, b: 2, c: 3];\n" + @@ -77,8 +77,21 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { ["every", "return [0, 1, 2].every { i -> i < 3 }", true] as Object[], ["everyMapKV", "return [a: 0, b: 1, c: 2].every { k, v -> v < 3 }", true] as Object[], ["everyMapEntry", "return [a: 0, b: 1, c: 2].every { e -> e.getValue() < 3 }", true] as Object[], - ["everyFalse", "return [0, 1, 2].every { i -> i < 2 }", false] as Object[] - + ["everyFalse", "return [0, 1, 2].every { i -> i < 2 }", false] as Object[], + ["collectEntriesArray", "return ([1, 2, 3] as Integer[]).collectEntries { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]] as Object[], + ["collectEntriesArrayExistingMap", "return ([2, 3] as Integer[]).collectEntries([1: 2]) { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]] as Object[], + ["collectEntriesList", "return [1, 2, 3].collectEntries { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]] as Object[], + ["collectEntriesListExistingMap", "return [2, 3].collectEntries([1: 2]) { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]] as Object[], + ["collectMany", "(0..5).collectMany { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]] as Object[], + ["collectManyExistingList", "(1..5).collectMany([0,0]) { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]] as Object[], + ["collectManyArray", "([0, 1, 2, 3, 4, 5] as Integer[]).collectMany { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]] as Object[], + ["collectManyMapKV", "[a:0,b:1,c:2].collectMany { k,v -> [v, 2*v ]}", [0,0,1,2,2,4]] as Object[], + ["collectManyMapKVExistingList", "[b:1,c:2].collectMany([0,0]) { k,v -> [v, 2*v ]}", [0,0,1,2,2,4]] as Object[], + ["collectManyMapEntry", "[a:0,b:1,c:2].collectMany { e -> [e.getValue(), 2*e.getValue() ]}", [0,0,1,2,2,4]] as Object[], + ["collectManyMapEntryExistingList", "[b:1,c:2].collectMany([0,0]) { e -> [e.getValue(), 2*e.getValue() ]}", [0,0,1,2,2,4]] as Object[], + ["collectNested", "[[0,1,2],[3,4]].collectNested { i -> i * 2 }", [[0,2,4],[6,8]]] as Object[], + ["collectNestedExistingList", "[[0,1,2],[3,4]].collectNested(['test']) { i -> i * 2 }", ['test', [0,2,4],[6,8]]] as Object[], + ["combinations", "[[2, 3],[4, 5, 6]].combinations { x, y -> x*y }", [8, 12, 10, 15, 12, 18]] as Object[], /* // Waiting for StringGroovyMethods to be added to transformer ["eachLine", 'def s = """a\n' + From 151f17356fb69a07bbb76bc01c59c93a9969872f Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 17 May 2017 11:07:46 -0400 Subject: [PATCH 412/932] Simplified name pattern. --- .../com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy index a70442700..2f0eac05d 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -16,7 +16,7 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { this.testResult = testResult } - @Parameterized.Parameters(name="Name: {0}") + @Parameterized.Parameters(name="{0}") public static Iterable generateParameters() { // First element is the name of the test // Second element is the code to eval From 6fe76aa4ba71a7cd80471b031f20b104c17291fa Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 17 May 2017 13:37:33 -0400 Subject: [PATCH 413/932] Finish up adding tests for DefaultGroovyMethods. --- .../cps/CpsDefaultGroovyMethodsTest.groovy | 353 ++++++++++++++---- 1 file changed, 285 insertions(+), 68 deletions(-) diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy index 2f0eac05d..66c683e8e 100644 --- a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ b/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -21,89 +21,307 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { // First element is the name of the test // Second element is the code to eval // Third element is expected result - return [ - ["each", "def x = 100; (0..10).each { y -> x+=y }; return x", 155] as Object[], - ["eachArray", "def x = 10;\n" + - "([1, 2, 3] as Integer[]).each { y -> x+=y; }\n" + - "return x;", 16] as Object[], - ["eachMapKV", "def x = 100\n" + - "def m = [a: 1, b: 2, c: 3];\n" + - "m.each { k, v -> x += v }\n" + - "return x;", 106] as Object[], - ["eachMapEntry", "def x = 100\n" + - "def m = [a: 1, b: 2, c: 3];\n" + - "m.each { e -> x += e.getValue() }\n" + - "return x;", 106] as Object[], - ["setEach", "def x = 100\n" + - "([1,2,3] as HashSet).each { y -> x += y }\n" + - "return x", 106] as Object[], - ["sortedSetEach", "def x = 100\n" + - "([1,2,3] as TreeSet).each { y -> x += y }\n" + - "return x", 106] as Object[], - ["collectList", "return [1, 2, 3].collect { it * 2 }", [2, 4, 6]] as Object[], + def rawTests = [ + // .any + ["any", "return [0, 1, 2].any { i -> i == 1 }", true], + ["anyMapKV", "return [a: 0, b: 1, c: 2].any { k, v -> v == 1 }", true], + ["anyMapEntry", "return [a: 0, b: 1, c: 2].any { e -> e.value == 1 }", true], + ["anyFalse", "return [0, 1, 2].any { i -> i > 2 }", false], + + // TODO: asType? + + // .collect + ["collectList", "return [1, 2, 3].collect { it * 2 }", [2, 4, 6]], ["collectListIntoExistingList", "def existing = [2]\n" + - "return [2, 3, 4].collect(existing) { it * 2 }", [2, 4, 6, 8]] as Object[], + "return [2, 3, 4].collect(existing) { it * 2 }", [2, 4, 6, 8]], ["collectListIntoExistingSet", "return [2, 3, 4].collect([2] as HashSet) { it * 2 }", - [2, 4, 6, 8] as HashSet] as Object[], - ["collectSet", "return ([1, 2, 3] as HashSet).collect { it * 2 }", [2, 4, 6]] as Object[], + [2, 4, 6, 8] as HashSet], + ["collectSet", "return ([1, 2, 3] as HashSet).collect { it * 2 }", [2, 4, 6]], ["collectSetIntoExistingList", "def existing = [2]\n" + - "return ([2, 3, 4] as HashSet).collect(existing) { it * 2 }", [2, 4, 6, 8]] as Object[], + "return ([2, 3, 4] as HashSet).collect(existing) { it * 2 }", [2, 4, 6, 8]], ["collectSetIntoExistingSet", "return ([2, 3, 4] as HashSet).collect([2] as HashSet) { it * 2 }", - [2, 4, 6, 8] as HashSet] as Object[], + [2, 4, 6, 8] as HashSet], ["collectMapKV", "def m = [a: 1, b: 2, c: 3];\n" + - "return m.collect { k, v -> v }", [1, 2, 3]] as Object[], + "return m.collect { k, v -> v }", [1, 2, 3]], ["collectMapEntry", "def m = [a: 1, b: 2, c: 3];\n" + - "return m.collect { e -> e.getValue() }", [1, 2, 3]] as Object[], + "return m.collect { e -> e.value }", [1, 2, 3]], ["collectMapKVIntoExistingList", "def m = [a: 2, b: 3, c: 4];\n" + - "return m.collect([1]) { k, v -> v }", [1, 2, 3, 4]] as Object[], + "return m.collect([1]) { k, v -> v }", [1, 2, 3, 4]], ["collectMapEntryIntoExistingList", "def m = [a: 2, b: 3, c: 4];\n" + - "return m.collect([1]) { e -> e.getValue() }", [1, 2, 3, 4]] as Object[], + "return m.collect([1]) { e -> e.value }", [1, 2, 3, 4]], ["collectMapKVIntoExistingSet", "def m = [a: 2, b: 3, c: 4];\n" + - "return m.collect([1] as HashSet) { k, v -> v }", [1, 2, 3, 4] as HashSet] as Object[], + "return m.collect([1] as HashSet) { k, v -> v }", [1, 2, 3, 4] as HashSet], ["collectMapEntryIntoExistingSet", "def m = [a: 2, b: 3, c: 4];\n" + - "return m.collect([1] as HashSet) { e -> e.getValue() }", [1, 2, 3, 4] as HashSet] as Object[], + "return m.collect([1] as HashSet) { e -> e.value }", [1, 2, 3, 4] as HashSet], + + // .collectEntries ["collectEntriesKV", "def m = [a: 1, b: 2, c: 3]\n" + - "return m.collectEntries { k, v -> [(k): v * 2] }", [a: 2, b: 4, c: 6]] as Object[], + "return m.collectEntries { k, v -> [(k): v * 2] }", [a: 2, b: 4, c: 6]], ["collectEntriesEntry", "def m = [a: 1, b: 2, c: 3]\n" + - "return m.collectEntries { e -> [(e.getKey()): e.getValue() * 2] }", [a: 2, b: 4, c: 6]] as Object[], + "return m.collectEntries { e -> [(e.key): e.value * 2] }", [a: 2, b: 4, c: 6]], ["collectEntriesIntoExistingMapKV", "def m = [b: 2, c: 3]\n" + - "return m.collectEntries([a: 2]) { k, v -> [(k): v * 2] }", [a: 2, b: 4, c: 6]] as Object[], + "return m.collectEntries([a: 2]) { k, v -> [(k): v * 2] }", [a: 2, b: 4, c: 6]], ["collectEntriesIntoExistingMapEntry", "def m = [b: 2, c: 3]\n" + - "return m.collectEntries([a: 2]) { e -> [(e.getKey()): e.getValue() * 2] }", [a: 2, b: 4, c: 6]] as Object[], - ["any", "return [0, 1, 2].any { i -> i == 1 }", true] as Object[], - ["anyMapKV", "return [a: 0, b: 1, c: 2].any { k, v -> v == 1 }", true] as Object[], - ["anyMapEntry", "return [a: 0, b: 1, c: 2].any { e -> e.getValue() == 1 }", true] as Object[], - ["anyFalse", "return [0, 1, 2].any { i -> i > 2 }", false] as Object[], - ["every", "return [0, 1, 2].every { i -> i < 3 }", true] as Object[], - ["everyMapKV", "return [a: 0, b: 1, c: 2].every { k, v -> v < 3 }", true] as Object[], - ["everyMapEntry", "return [a: 0, b: 1, c: 2].every { e -> e.getValue() < 3 }", true] as Object[], - ["everyFalse", "return [0, 1, 2].every { i -> i < 2 }", false] as Object[], - ["collectEntriesArray", "return ([1, 2, 3] as Integer[]).collectEntries { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]] as Object[], - ["collectEntriesArrayExistingMap", "return ([2, 3] as Integer[]).collectEntries([1: 2]) { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]] as Object[], - ["collectEntriesList", "return [1, 2, 3].collectEntries { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]] as Object[], - ["collectEntriesListExistingMap", "return [2, 3].collectEntries([1: 2]) { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]] as Object[], - ["collectMany", "(0..5).collectMany { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]] as Object[], - ["collectManyExistingList", "(1..5).collectMany([0,0]) { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]] as Object[], - ["collectManyArray", "([0, 1, 2, 3, 4, 5] as Integer[]).collectMany { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]] as Object[], - ["collectManyMapKV", "[a:0,b:1,c:2].collectMany { k,v -> [v, 2*v ]}", [0,0,1,2,2,4]] as Object[], - ["collectManyMapKVExistingList", "[b:1,c:2].collectMany([0,0]) { k,v -> [v, 2*v ]}", [0,0,1,2,2,4]] as Object[], - ["collectManyMapEntry", "[a:0,b:1,c:2].collectMany { e -> [e.getValue(), 2*e.getValue() ]}", [0,0,1,2,2,4]] as Object[], - ["collectManyMapEntryExistingList", "[b:1,c:2].collectMany([0,0]) { e -> [e.getValue(), 2*e.getValue() ]}", [0,0,1,2,2,4]] as Object[], - ["collectNested", "[[0,1,2],[3,4]].collectNested { i -> i * 2 }", [[0,2,4],[6,8]]] as Object[], - ["collectNestedExistingList", "[[0,1,2],[3,4]].collectNested(['test']) { i -> i * 2 }", ['test', [0,2,4],[6,8]]] as Object[], - ["combinations", "[[2, 3],[4, 5, 6]].combinations { x, y -> x*y }", [8, 12, 10, 15, 12, 18]] as Object[], -/* - // Waiting for StringGroovyMethods to be added to transformer - ["eachLine", 'def s = """a\n' + - 'b\n' + - 'c\n' + - '"""\n' + - 'def list = []\n' + - 's.eachLine { l -> list.add(l) }\n' + - 'return l', ["a", "b", "c"]] as Object[] -*/ + "return m.collectEntries([a: 2]) { e -> [(e.key): e.value * 2] }", [a: 2, b: 4, c: 6]], + ["collectEntriesArray", "return ([1, 2, 3] as Integer[]).collectEntries { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]], + ["collectEntriesArrayExistingMap", "return ([2, 3] as Integer[]).collectEntries([1: 2]) { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]], + ["collectEntriesList", "return [1, 2, 3].collectEntries { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]], + ["collectEntriesListExistingMap", "return [2, 3].collectEntries([1: 2]) { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]], + + // .collectMany + ["collectMany", "(0..5).collectMany { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]], + ["collectManyExistingList", "(1..5).collectMany([0,0]) { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]], + ["collectManyArray", "([0, 1, 2, 3, 4, 5] as Integer[]).collectMany { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]], + ["collectManyMapKV", "[a:0,b:1,c:2].collectMany { k,v -> [v, 2*v ]}", [0,0,1,2,2,4]], + ["collectManyMapKVExistingList", "[b:1,c:2].collectMany([0,0]) { k,v -> [v, 2*v ]}", [0,0,1,2,2,4]], + ["collectManyMapEntry", "[a:0,b:1,c:2].collectMany { e -> [e.value, 2*e.value ]}", [0,0,1,2,2,4]], + ["collectManyMapEntryExistingList", "[b:1,c:2].collectMany([0,0]) { e -> [e.value, 2*e.value ]}", [0,0,1,2,2,4]], + + // .collectNested + ["collectNested", "[[0,1,2],[3,4]].collectNested { i -> i * 2 }", [[0,2,4],[6,8]]], + ["collectNestedExistingList", "[[0,1,2],[3,4]].collectNested(['test']) { i -> i * 2 }", ['test', [0,2,4],[6,8]]], + + // .combinations + ["combinations", "[[2, 3],[4, 5, 6]].combinations { x, y -> x*y }", [8, 12, 10, 15, 12, 18]], + + // .count + ["countList", "[1, 2, 3].count { i -> i > 1 }", 2], + ["countArray", "([1, 2, 3] as Integer[]).count { i -> i > 1 }", 2], + ["countMapKV", "[a: 1, b: 2, c: 3].count { k, v -> v > 1 }", 2], + ["countMapEntry", "[a: 1, b: 2, c: 3].count { e -> e.value > 1 }", 2], + + // .countBy + ["countByList", "['aaa', 'bbb', 'cc'].countBy { i -> i.length() }", [3:2, 2:1]], + ["countByArray", "(['aaa', 'bbb', 'cc'] as String[]).countBy { i -> i.length() }", [3:2, 2:1]], + ["countByMapKV", "[a: 'aaa', b: 'bbb', c: 'cc'].countBy { k, v -> v.length() }", [3:2, 2:1]], + ["countByMapEntry", "[a: 'aaa', b: 'bbb', c: 'cc'].countBy { e -> e.value.length() }", [3:2, 2:1]], + + // TODO: downto + + /* TODO: Waiting for dropWhile support + // .dropWhile + ["dropWhileList", "[1, 2, 3].dropWhile { i -> i < 2 }", [2, 3]], + ["dropWhileSet", "([1, 2, 3] as HashSet).dropWhile { i -> i < 2 }", [2, 3] as HashSet], + ["dropWhileSortedSet", "([1, 2, 3] as TreeSet).dropWhile { i -> i < 2 }", [2, 3] as TreeSet], + ["dropWhileMapKV", "[a: 1, b: 2, c: 3].dropWhile { k, v -> v < 2 }", [b: 2, c: 3]], + ["dropWhileMapEntry", "[a: 1, b: 2, c: 3].dropWhile { e -> e.value < 2 }", [b: 2, c: 3]], + */ + + // .each + ["each", "def x = 100; (0..10).each { y -> x+=y }; return x", 155], + ["eachArray", "def x = 10;\n" + + "([1, 2, 3] as Integer[]).each { y -> x+=y; }\n" + + "return x;", 16], + ["eachMapKV", "def x = 100\n" + + "def m = [a: 1, b: 2, c: 3];\n" + + "m.each { k, v -> x += v }\n" + + "return x;", 106], + ["eachMapEntry", "def x = 100\n" + + "def m = [a: 1, b: 2, c: 3];\n" + + "m.each { e -> x += e.value }\n" + + "return x;", 106], + ["eachSet", "def x = 100\n" + + "([1,2,3] as HashSet).each { y -> x += y }\n" + + "return x", 106], + ["eachSortedSet", "def x = 100\n" + + "([1,2,3] as TreeSet).each { y -> x += y }\n" + + "return x", 106], + + // TODO: eachByte + + // TODO: eachCombination + + // .eachPermutation + ["eachPermutation", "def l = [] as Set; ['a', 'b', 'c'].eachPermutation { i -> l << i }; return l", + [['a', 'b', 'c'], ['a', 'c', 'b'], ['b', 'a', 'c'], ['b', 'c', 'a'], ['c', 'a', 'b'], ['c', 'b', 'a']] as Set], + + // .eachWithIndex + ["eachWithIndex", "def x = 100; (0..10).eachWithIndex { y, i -> x+=y; x+=i }; return x", 210], + ["eachWithIndexArray", "def x = 10;\n" + + "([1, 2, 3] as Integer[]).eachWithIndex { y, i -> x+=y; x+=i }\n" + + "return x;", 19], + ["eachWithIndexMapKV", "def x = 100\n" + + "def m = [a: 1, b: 2, c: 3];\n" + + "m.eachWithIndex { k, v, i -> x += v; x+=i}\n" + + "return x;", 109], + ["eachWithIndexMapEntry", "def x = 100\n" + + "def m = [a: 1, b: 2, c: 3];\n" + + "m.eachWithIndex { e, i -> x += e.value; x+=i }\n" + + "return x;", 109], + ["eachWithIndexSet", "def x = 100\n" + + "([1,2,3] as HashSet).eachWithIndex { y, i -> x += y; x+=i }\n" + + "return x", 109], + ["eachWithIndexSortedSet", "def x = 100\n" + + "([1,2,3] as TreeSet).eachWithIndex { y, i -> x += y; x+=i }\n" + + "return x", 109], + + // .every + ["every", "return [0, 1, 2].every { i -> i < 3 }", true], + ["everyMapKV", "return [a: 0, b: 1, c: 2].every { k, v -> v < 3 }", true], + ["everyMapEntry", "return [a: 0, b: 1, c: 2].every { e -> e.value < 3 }", true], + ["everyFalse", "return [0, 1, 2].every { i -> i < 2 }", false], + + // .find + ["findList", "[1, 2, 3].find { i -> i == 2 }", 2], + ["findArray", "([1, 2, 3] as Integer[]).find { i -> i == 2 }", 2], + ["findMapKV", "[a: 1, b: 2, c: 3].find { k, v -> v == 2 }", [b: 2].entrySet().iterator().next()], + ["findMapEntry", "[a: 1, b: 2, c: 3].find { e -> e.value == 2 }", [b: 2].entrySet().iterator().next()], + + // .findAll + ["findAllList", "[1, 2, 3].findAll { i -> i > 1 }", [2, 3]], + ["findAllArray", "([1, 2, 3] as Integer[]).findAll { i -> i > 1 }", [2, 3]], + ["findAllSet", "([1, 2, 3] as HashSet).findAll { i -> i > 1 }", [2, 3] as HashSet], + ["findAllMapKV", "[a: 1, b: 2, c: 3].findAll { k, v -> v > 1 }", [b: 2, c: 3]], + ["findAllMapEntry", "[a: 1, b: 2, c: 3].findAll { e -> e.value > 1 }", [b: 2, c: 3]], + + // .findIndexOf + ["findIndexOf", "[1, 2, 3].findIndexOf { i -> i == 2 }", 1], + + // .findIndexValues + ["findIndexValues", "[0, 0, 1, 1, 2, 2].findIndexValues { i -> i == 1 }", [2, 3]], + + // .findLastIndexOf + ["findLastIndexOf", "[0, 0, 1, 1, 2, 2].findLastIndexOf { i -> i == 1 }", 3], + + // .findResult + ["findResultList", "[1, 2, 3].findResult { i -> if (i > 2) { return 'I found ' + i } }", "I found 3"], + ["findResultListDefault", "[1, 2, 3].findResult('default') { i -> if (i > 3) { return 'I found ' + i } }", "default"], + ["findResultMapKV", "[a: 1, b: 2, c: 3].findResult { k, v -> if (v > 2) { return 'I found ' + v } }", "I found 3"], + ["findResultMapKVDefault", "[a: 1, b: 2, c: 3].findResult('default') { k, v -> if (v > 3) { return 'I found ' + v } }", "default"], + ["findResultMapEntry", "[a: 1, b: 2, c: 3].findResult { e -> if (e.value > 2) { return 'I found ' + e.value } }", "I found 3"], + ["findResultMapEntryDefault", "[a: 1, b: 2, c: 3].findResult('default') { e -> if (e.value > 3) { return 'I found ' + e.value } }", "default"], + + // .findResults + ["findResultsList", "[1, 2, 3].findResults { i -> if (i > 1) { return 'I found ' + i } }", ["I found 2", "I found 3"]], + ["findResultsMapKV", "[a: 1, b: 2, c: 3].findResults { k, v -> if (v > 1) { return 'I found ' + v } }", ["I found 2", "I found 3"]], + ["findResultsMapEntry", "[a: 1, b: 2, c: 3].findResults { e -> if (e.value > 1) { return 'I found ' + e.value } }", ["I found 2", "I found 3"]], + + // .flatten + ["flatten", "[[0, 1], 'ab', 2].flatten { i -> def ans = i.iterator().toList(); ans != [i] ? ans : i }", + [0, 1, 'a', 'b', 2]], + + // .groupBy + ["groupByList", "[1, 'a', 2, 'b', 3.5, 4.6].groupBy { i -> i.class.simpleName }", + [Integer: [1, 2], String: ["a", "b"], BigDecimal: [3.5, 4.6]]], + ["groupByListMultipleCriteria", "[1, 'a', 2, 'b', 3.5, 4.6].groupBy({ i -> i.class.simpleName }, { it.class == Integer ? 'integer' : 'non-integer' })", + [Integer: ['integer': [1, 2]], String: ['non-integer': ["a", "b"]], BigDecimal: ['non-integer': [3.5, 4.6]]]], + ["groupByArray", "([1, 'a', 2, 'b', 3.5, 4.6] as Object[]).groupBy { i -> i.class.simpleName }", + [Integer: [1, 2], String: ["a", "b"], BigDecimal: [3.5, 4.6]]], + ["groupByArrayMultipleCriteria", "([1, 'a', 2, 'b', 3.5, 4.6] as Object[]).groupBy({ i -> i.class.simpleName }, { it.class == Integer ? 'integer' : 'non-integer' })", + [Integer: ['integer': [1, 2]], String: ['non-integer': ["a", "b"]], BigDecimal: ['non-integer': [3.5, 4.6]]]], + ["groupByMapKV", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy { k, v -> v.class.simpleName }", + [Integer: [1: 1, 3: 2], String: [2: "a", 4: "b"], BigDecimal: [5: 3.5, 6: 4.6]]], + ["groupByMapKVMultipleCriteria", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy({ k, v -> v.class.simpleName }, { k, v -> v.class == Integer ? 'integer' : 'non-integer' })", + [Integer: ['integer': [1: 1, 3: 2]], String: ['non-integer': [2: "a", 4: "b"]], BigDecimal: ['non-integer': [5: 3.5, 6: 4.6]]]], + ["groupByMapEntry", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy { e -> e.value.class.simpleName }", + [Integer: [1: 1, 3: 2], String: [2: "a", 4: "b"], BigDecimal: [5: 3.5, 6: 4.6]]], + ["groupByMapEntryMultipleCriteria", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy({ e -> e.value.class.simpleName }, { e -> e.value.class == Integer ? 'integer' : 'non-integer' })", + [Integer: ['integer': [1: 1, 3: 2]], String: ['non-integer': [2: "a", 4: "b"]], BigDecimal: ['non-integer': [5: 3.5, 6: 4.6]]]], + + // .groupEntriesBy + ["groupEntriesByMapKV", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupEntriesBy { k, v -> v.class.simpleName }", + [Integer: [1: 1, 3: 2].entrySet().toList(), String: [2: "a", 4: "b"].entrySet().toList(), BigDecimal: [5: 3.5, 6: 4.6].entrySet().toList()]], + ["groupEntriesByMapEntry", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupEntriesBy { e -> e.value.class.simpleName }", + [Integer: [1: 1, 3: 2].entrySet().toList(), String: [2: "a", 4: "b"].entrySet().toList(), BigDecimal: [5: 3.5, 6: 4.6].entrySet().toList()]], + + // TODO: identity + + // .inject + ["injectList", "[1, 2, 3].inject(4) { c, i -> c + i }", 10], + ["injectListNoInitialValue", "[1, 2, 3].inject { c, i -> c + i }", 6], + ["injectArray", "([1, 2, 3] as Integer[]).inject(4) { c, i -> c + i }", 10], + ["injectArrayNoInitialValue", "([1, 2, 3] as Integer[]).inject { c, i -> c + i }", 6], + ["injectMapKV", "[a: 1, b: 2, c: 3].inject(4) { c, k, v -> c + v }", 10], + ["injectMapEntry", "[a: 1, b: 2, c: 3].inject(4) { c, e -> c + e.value }", 10], + + // .max + ["maxList", "[42, 35, 17, 100].max { i -> i.toString().toList()*.toInteger().sum() }", 35], + ["maxArray", "([42, 35, 17, 100] as Integer[]).max { i -> i.toString().toList()*.toInteger().sum() }", 35], + ["maxMap", "[a: 42, b: 35, c: 17, d: 100].max { first, second -> first.value.toString().toList()*.toInteger().sum() <=> second.value.toString().toList()*.toInteger().sum() }", [b: 35].entrySet().iterator().next()], + + // TODO: metaClass + + // .min + ["minList", "[42, 35, 17, 100].min { i -> i.toString().toList()*.toInteger().sum() }", 100], + ["minArray", "([42, 35, 17, 100] as Integer[]).min { i -> i.toString().toList()*.toInteger().sum() }", 100], + ["minMap", "[a: 42, b: 35, c: 17, d: 100].min { first, second -> first.value.toString().toList()*.toInteger().sum() <=> second.value.toString().toList()*.toInteger().sum() }", [d: 100].entrySet().iterator().next()], + + // .permutations + ["permutations", "[1, 2, 3].permutations { i -> i.collect { v -> v * 2 } } as Set", [[2, 4, 6], [2, 6, 4], [4, 2, 6], [4, 6, 2], [6, 2, 4], [6, 4, 2]] as Set], + + // TODO: print and println? + + // .removeAll + ["removeAll", "def l = [1, 2, 3]; l.removeAll { i -> i == 2 }; return l", [1, 3]], + + // .retainAll + ["retainAll", "def l = [1, 2, 3, 4]; l.retainAll { i -> i % 2 == 0 }; return l", [2, 4]], + + // .reverseEach + ["reverseEachList", "def r = ''; ['a', 'b', 'c'].reverseEach { i -> r += i }; return r", "cba"], + ["reverseEachArray", "def r = ''; (['a', 'b', 'c'] as String[]).reverseEach { i -> r += i }; return r", "cba"], + ["reverseEachMapKV", "def r = ''; ['a': 1, 'b': 2, 'c': 3].reverseEach { k, v -> r += k }; return r", "cba"], + ["reverseEachMapEntry", "def r = ''; ['a': 1, 'b': 2, 'c': 3].reverseEach { e -> r += e.key }; return r", "cba"], + + // .sort + ["sortList", "[3, 1, -2, -4].sort { i -> i * i }", [1, -2, 3, -4]], + ["sortArray", "([3, 1, -2, -4] as Integer[]).sort { i -> i * i }", [1, -2, 3, -4]], + ["sortMapEntryByKey", "[a: 3, c: 1, b: -2, d: -4].sort { e -> e.key }", [a: 3, b: -2, c: 1, d: -4]], + ["sortMapEntryByValue", "[a: 3, c: 1, b: -2, d: -4].sort { e -> e.value }", [d: -4, b: -2, c: 1, a: 3]], + + // .split + ["splitList", "[1, 2, 3, 4].split { i -> i % 2 == 0 }", [[2, 4], [1, 3]]], + ["splitSet", "([1, 2, 3, 4] as HashSet).split { i -> i % 2 == 0 }", [[2, 4] as HashSet, [1, 3] as HashSet]], + + // TODO: step? + + // .sum + ["sumList", "['a', 'bb', 'ccc'].sum { i -> i.length() }", 6], + ["sumListInitialValue", "['a', 'bb', 'ccc'].sum(4) { i -> i.length() }", 10], + ["sumArray", "(['a', 'bb', 'ccc'] as String[]).sum { i -> i.length() }", 6], + ["sumArrayInitialValue", "(['a', 'bb', 'ccc'] as String[]).sum(4) { i -> i.length() }", 10], + + /* TODO: waiting for takeWhile support + // .takeWhile + ["takeWhileList", "[1, 2, 3].takeWhile { i -> i < 3 }", [1, 2]], + ["takeWhileSet", "([1, 2, 3] as HashSet).takeWhile { i -> i < 3 }", [1, 2] as HashSet], + ["takeWhileSortedSet", "([1, 2, 3] as TreeSet).takeWhile { i -> i < 3 }", [1, 2] as TreeSet], + ["takeWhileMapKV", "[a: 1, b: 2, c: 3].takeWhile { k, v -> v < 3 }", [a: 1, b: 2]], + ["takeWhileMapEntry", "[a: 1, b: 2, c: 3].takeWhile { e -> e.value < 3 }", [a: 1, b: 2]], + */ + + // TODO: times + + // .toSorted + ["toSortedList", "[3, 1, -2, -4].toSorted { i -> i * i }", [1, -2, 3, -4]], + ["toSortedArray", "([3, 1, -2, -4] as Integer[]).toSorted { i -> i * i }", [1, -2, 3, -4]], + ["toSortedMapEntryByKey", "[a: 3, c: 1, b: -2, d: -4].toSorted { e -> e.key }", [a: 3, b: -2, c: 1, d: -4]], + ["toSortedMapEntryByValue", "[a: 3, c: 1, b: -2, d: -4].toSorted { e -> e.value }", [d: -4, b: -2, c: 1, a: 3]], + + /* TODO: waiting for toUnique support + // .toUnique + ["toUniqueList", "[1, 2, -2, 3].toUnique { i -> i * i }", [1, 2, 3]], + ["toUniqueArray", "([1, 2, -2, 3] as Integer[]).toUnique { i -> i * i }", [1, 2, 3]], + ["toUniqueSet", "([1, 2, -2, 3] as HashSet).toUnique { i -> i * i }", [1, 2, 3] as HashSet], + */ + + // .unique + ["uniqueList", "[1, 2, -2, 3].unique { i -> i * i }", [1, 2, 3]], + ["uniqueSet", "([1, 2, -2, 3] as HashSet).unique { i -> i * i }", [1, 2, 3] as HashSet], + + // TODO: use? + + // TODO: with? + + // .withDefault + ["withDefaultList", "[].withDefault { i -> i * 2 }.get(1)", 2], + ["withDefaultMap", "[:].withDefault { k -> k * 2 }.get(1)", 2], + ] + assertEquals("Duplicate test names", [], rawTests.countBy { it[0] }.grep { it.value > 1}.collect { it.key }) + + return rawTests.collect { it as Object[] } } @Test @@ -121,5 +339,4 @@ def someMethod() { someMethod() """) == testResult } - } From 9e35476a21d6baa801775ce7852d11b4e4a0694d Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 17 May 2017 13:41:07 -0400 Subject: [PATCH 414/932] Integrating https://github.com/cloudbees/groovy-cps-dgm-builder/ at build time. --- dgm-builder/nbactions.xml | 46 + dgm-builder/pom.xml | 102 + .../com/cloudbees/groovy/cps/tool/Driver.java | 121 + .../cloudbees/groovy/cps/tool/Translator.java | 836 ++++++ TODO.txt => lib/TODO.txt | 0 ast.sh => lib/ast.sh | 0 lib/pom.xml | 163 ++ .../groovy/cps/CategorySupport.groovy | 0 .../groovy/cps/CpsTransformer.groovy | 0 .../groovy/cps/SandboxCpsTransformer.groovy | 0 .../java/com/cloudbees/groovy/cps/Block.java | 0 .../com/cloudbees/groovy/cps/Builder.java | 0 .../cloudbees/groovy/cps/CaseExpression.java | 0 .../cloudbees/groovy/cps/CatchExpression.java | 0 .../groovy/cps/ConcatenatedContinuation.java | 0 .../com/cloudbees/groovy/cps/Continuable.java | 0 .../cloudbees/groovy/cps/Continuation.java | 0 .../java/com/cloudbees/groovy/cps/Env.java | 0 .../java/com/cloudbees/groovy/cps/Envs.java | 0 .../java/com/cloudbees/groovy/cps/LValue.java | 0 .../com/cloudbees/groovy/cps/LValueBlock.java | 0 .../cloudbees/groovy/cps/MethodLocation.java | 0 .../java/com/cloudbees/groovy/cps/Next.java | 0 .../java/com/cloudbees/groovy/cps/NonCPS.java | 0 .../cps/ObjectInputStreamWithLoader.java | 0 .../com/cloudbees/groovy/cps/Outcome.java | 0 .../com/cloudbees/groovy/cps/Safepoint.java | 0 .../groovy/cps/SerializableScript.java | 0 .../groovy/cps/TransformerConfiguration.java | 0 .../groovy/cps/WorkflowTransformed.java | 0 .../com/cloudbees/groovy/cps/green/Cond.java | 0 .../groovy/cps/green/GreenThread.java | 0 .../groovy/cps/green/GreenThreadState.java | 0 .../groovy/cps/green/GreenWorld.java | 0 .../cloudbees/groovy/cps/green/Monitor.java | 0 .../groovy/cps/green/ThreadTask.java | 0 .../groovy/cps/green/package-info.java | 0 .../groovy/cps/impl/ArrayAccessBlock.java | 0 .../groovy/cps/impl/AssertBlock.java | 0 .../groovy/cps/impl/AssignmentBlock.java | 0 .../groovy/cps/impl/AttributeAccessBlock.java | 0 .../groovy/cps/impl/BlockScopeEnv.java | 0 .../groovy/cps/impl/BlockScopedBlock.java | 0 .../cloudbees/groovy/cps/impl/BreakBlock.java | 0 .../cloudbees/groovy/cps/impl/CallEnv.java | 0 .../groovy/cps/impl/CallSiteBlock.java | 0 .../groovy/cps/impl/CallSiteBlockSupport.java | 0 .../com/cloudbees/groovy/cps/impl/Caller.java | 0 .../cloudbees/groovy/cps/impl/CaseEnv.java | 0 .../groovy/cps/impl/ClosureBlock.java | 0 .../groovy/cps/impl/ClosureCallEnv.java | 0 .../cps/impl/CollectionLiteralBlock.java | 0 .../groovy/cps/impl/ConstantBlock.java | 0 .../groovy/cps/impl/ContinuationGroup.java | 0 .../groovy/cps/impl/ContinuationPtr.java | 0 .../groovy/cps/impl/ContinueBlock.java | 0 .../groovy/cps/impl/CpsCallable.java | 0 .../cps/impl/CpsCallableInvocation.java | 0 .../cloudbees/groovy/cps/impl/CpsClosure.java | 0 .../groovy/cps/impl/CpsClosureDef.java | 0 .../groovy/cps/impl/CpsFunction.java | 0 .../groovy/cps/impl/DoWhileBlock.java | 0 .../cloudbees/groovy/cps/impl/ElvisBlock.java | 0 .../cps/impl/ExcrementOperatorBlock.java | 0 .../groovy/cps/impl/ForInLoopBlock.java | 0 .../groovy/cps/impl/ForLoopBlock.java | 0 .../groovy/cps/impl/FunctionCallBlock.java | 0 .../groovy/cps/impl/FunctionCallEnv.java | 0 .../cloudbees/groovy/cps/impl/IfBlock.java | 0 .../groovy/cps/impl/JavaThisBlock.java | 0 .../cloudbees/groovy/cps/impl/ListBlock.java | 0 .../groovy/cps/impl/LocalVariableBlock.java | 0 .../groovy/cps/impl/LogicalOpBlock.java | 0 .../groovy/cps/impl/LoopBlockScopeEnv.java | 0 .../cloudbees/groovy/cps/impl/MapBlock.java | 0 .../groovy/cps/impl/MethodPointerBlock.java | 0 .../groovy/cps/impl/NewArrayBlock.java | 0 .../cloudbees/groovy/cps/impl/NotBlock.java | 0 .../groovy/cps/impl/PropertyAccessBlock.java | 0 .../groovy/cps/impl/PropertyishBlock.java | 0 .../cloudbees/groovy/cps/impl/ProxyEnv.java | 0 .../groovy/cps/impl/ReferenceStackTrace.java | 0 .../groovy/cps/impl/ReturnBlock.java | 0 .../groovy/cps/impl/SequenceBlock.java | 0 .../groovy/cps/impl/SourceLocation.java | 0 .../groovy/cps/impl/StaticFieldBlock.java | 0 .../com/cloudbees/groovy/cps/impl/Super.java | 0 .../cloudbees/groovy/cps/impl/SuperBlock.java | 0 .../groovy/cps/impl/SuspendBlock.java | 0 .../groovy/cps/impl/SwitchBlock.java | 0 .../cloudbees/groovy/cps/impl/ThrowBlock.java | 0 .../groovy/cps/impl/TryBlockEnv.java | 0 .../groovy/cps/impl/TryCatchBlock.java | 0 .../cps/impl/ValueBoundContinuation.java | 0 .../groovy/cps/impl/VariableDeclBlock.java | 0 .../cloudbees/groovy/cps/impl/WhileBlock.java | 0 .../cloudbees/groovy/cps/impl/YieldBlock.java | 0 .../groovy/cps/impl/package-info.java | 0 .../groovy/cps/sandbox/CallSiteTag.java | 0 .../groovy/cps/sandbox/DefaultInvoker.java | 0 .../cloudbees/groovy/cps/sandbox/Invoker.java | 0 .../groovy/cps/sandbox/SandboxInvoker.java | 0 .../cloudbees/groovy/cps/sandbox/Trusted.java | 0 .../groovy/cps/sandbox/Untrusted.java | 0 .../groovy/cps/AbstractGroovyCpsTest.groovy | 0 .../groovy/cps/ContinuableTest.groovy | 0 .../cps/CpsDefaultGroovyMethodsTest.groovy | 0 .../groovy/cps/CpsTransformerTest.groovy | 0 .../cloudbees/groovy/cps/SafepointTest.groovy | 0 .../groovy/cps/green/GreenThreadTest.groovy | 0 .../cps/impl/FunctionCallBlockTest.groovy | 0 .../groovy/cps/impl/MapBlockTest.groovy | 0 .../cps/impl/PropertyAccessBlockTest.groovy | 0 .../groovy/cps/impl/SwitchBlockTest.groovy | 0 .../groovy/cps/impl/ThrowBlockTest.groovy | 0 .../groovy/cps/impl/TryCatchBlockTest.groovy | 0 .../cps/sandbox/SandboxInvokerTest.groovy | 0 .../com/cloudbees/groovy/cps/BasicTest.java | 0 .../groovy/cps/VariableDeclarationTest.java | 0 .../cloudbees/groovy/cps/impl/CallerTest.java | 0 {src => lib/src}/test/java/foo.groovy | 0 test.groovy => lib/test.groovy | 0 pom.xml | 172 +- .../groovy/cps/CpsDefaultGroovyMethods.java | 2392 ----------------- .../cps/CpsDefaultGroovyStaticMethods.java | 82 - .../groovy/cps/CpsProcessGroovyMethods.java | 33 - 126 files changed, 1306 insertions(+), 2641 deletions(-) create mode 100644 dgm-builder/nbactions.xml create mode 100644 dgm-builder/pom.xml create mode 100644 dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java create mode 100644 dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java rename TODO.txt => lib/TODO.txt (100%) rename ast.sh => lib/ast.sh (100%) create mode 100644 lib/pom.xml rename {src => lib/src}/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy (100%) rename {src => lib/src}/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy (100%) rename {src => lib/src}/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/Block.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/Builder.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/CaseExpression.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/CatchExpression.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/Continuable.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/Continuation.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/Env.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/Envs.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/LValue.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/LValueBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/MethodLocation.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/Next.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/NonCPS.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/ObjectInputStreamWithLoader.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/Outcome.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/Safepoint.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/SerializableScript.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/TransformerConfiguration.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/WorkflowTransformed.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/green/Cond.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/green/GreenThread.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/green/Monitor.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/green/package-info.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/BlockScopedBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlockSupport.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/Caller.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/CaseEnv.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/CollectionLiteralBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/JavaThisBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/MapBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ReferenceStackTrace.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ReturnBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/StaticFieldBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/Super.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/SuperBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/impl/package-info.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/sandbox/CallSiteTag.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/sandbox/Trusted.java (100%) rename {src => lib/src}/main/java/com/cloudbees/groovy/cps/sandbox/Untrusted.java (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/SafepointTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy (100%) rename {src => lib/src}/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy (100%) rename {src => lib/src}/test/java/com/cloudbees/groovy/cps/BasicTest.java (100%) rename {src => lib/src}/test/java/com/cloudbees/groovy/cps/VariableDeclarationTest.java (100%) rename {src => lib/src}/test/java/com/cloudbees/groovy/cps/impl/CallerTest.java (100%) rename {src => lib/src}/test/java/foo.groovy (100%) rename test.groovy => lib/test.groovy (100%) delete mode 100644 src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.java delete mode 100644 src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyStaticMethods.java delete mode 100644 src/main/java/com/cloudbees/groovy/cps/CpsProcessGroovyMethods.java diff --git a/dgm-builder/nbactions.xml b/dgm-builder/nbactions.xml new file mode 100644 index 000000000..63328af14 --- /dev/null +++ b/dgm-builder/nbactions.xml @@ -0,0 +1,46 @@ + + + + run + + jar + + + process-classes + org.codehaus.mojo:exec-maven-plugin:1.2.1:exec + + + -classpath %classpath com.cloudbees.groovy.cps.tool.Driver target/translated + java + + + + debug + + jar + + + process-classes + org.codehaus.mojo:exec-maven-plugin:1.5.0:exec + + + -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath com.cloudbees.groovy.cps.tool.Driver target/translated + java + true + + + + profile + + jar + + + process-classes + org.codehaus.mojo:exec-maven-plugin:1.5.0:exec + + + -classpath %classpath com.cloudbees.groovy.cps.tool.Driver target/translated + java + + + diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml new file mode 100644 index 000000000..3c59fb618 --- /dev/null +++ b/dgm-builder/pom.xml @@ -0,0 +1,102 @@ + + 4.0.0 + + + com.cloudbees + groovy-cps-parent + 1.13-SNAPSHOT + + + groovy-cps-dgm-builder + + CpsDefaultGroovyMethods generator + + + + + maven-compiler-plugin + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + + + com.cloudbees.groovy.cps.tool.Driver + + + + jar-with-dependencies + + + + + + + + + org.kathrynhuxtable.maven.wagon + wagon-gitsite + 0.3.1 + + + + + + + org.kohsuke.sorcerer + sorcerer-javac + 0.10 + + + org.kohsuke.codemodel + codemodel + 2.7 + + + org.jenkins-ci.main + remoting + 2.51 + + + org.codehaus.groovy + groovy + ${groovy.version} + + + org.codehaus.groovy + groovy + sources + ${groovy.version} + + + com.google.guava + guava + 11.0.1 + + + org.jenkins-ci + test-annotations + 1.2 + test + + + + diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java new file mode 100644 index 000000000..88230cb10 --- /dev/null +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java @@ -0,0 +1,121 @@ +package com.cloudbees.groovy.cps.tool; + +import com.google.common.collect.ImmutableSet; +import com.sun.codemodel.writer.FileCodeWriter; +import com.sun.tools.javac.api.JavacTool; +import com.sun.tools.javac.file.JavacFileManager; +import com.sun.tools.javac.file.RelativePath.RelativeDirectory; +import com.sun.tools.javac.file.ZipArchive; +import groovy.lang.Closure; +import groovy.lang.GroovyShell; +import hudson.remoting.Which; + +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.type.DeclaredType; +import javax.tools.DiagnosticListener; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; +import java.io.File; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Set; +import java.util.function.Predicate; +import java.util.zip.ZipFile; + +import static java.util.Arrays.*; + +/** + * @author Kohsuke Kawaguchi + */ +public class Driver { + public static void main(String[] args) throws Exception { + new Driver().run(new File(args[0])); + } + + public void run(File dir) throws Exception { + JavaCompiler javac = JavacTool.create(); + DiagnosticListener errorListener = createErrorListener(); + + try (StandardJavaFileManager fileManager = javac.getStandardFileManager(errorListener, Locale.getDefault(), Charset.defaultCharset())) { + fileManager.setLocation(StandardLocation.CLASS_PATH, + Collections.singleton(Which.jarFile(GroovyShell.class))); + + File groovySrcJar = Which.jarFile(Driver.class.getClassLoader().getResource("groovy/lang/GroovyShell.java")); + + // classes to translate + // TODO include other classes mentioned in DgmConverter just in case (first see TODO in Translator.translate); and certainly StringGroovyMethods which has some Closure-based methods + List fileNames = asList("DefaultGroovyMethods", "ProcessGroovyMethods", "DefaultGroovyStaticMethods"); + + List src = new ArrayList<>(); + ZipArchive a = new ZipArchive((JavacFileManager) fileManager, new ZipFile(groovySrcJar)); + + for (String name : fileNames) { + src.add(a.getFileObject(new RelativeDirectory("org/codehaus/groovy/runtime"),name+".java")); + } + + // annotation processing appears to cause the source files to be reparsed + // (even though I couldn't find exactly where it's done), which causes + // Tree symbols created by the original JavacTask.parse() call to be thrown away, + // which breaks later processing. + // So for now, don't perform annotation processing + List options = asList("-proc:none"); + + Translator t = new Translator(javac.getTask(null, fileManager, errorListener, options, null, src)); + + final DeclaredType closureType = t.types.getDeclaredType(t.elements.getTypeElement(Closure.class.getName())); + + // TODO move all this into Translator + Predicate selector = (e) -> { + boolean r = + // Only interested here in methods; not currently handling nested classes. + e.getKind() == ElementKind.METHOD + // Top-level invocations can only be to public static methods. But some private/protected static helper methods need translation, too. + && e.getModifiers().contains(Modifier.STATIC) + // Has a Closure parameter in one of the arguments (not in the receiver). + // TODO need to accept nonpublic (helper) methods taking Closure as the first parameter. In fact may need to accept any helper methods. + && e.getParameters().subList(1, e.getParameters().size()).stream() + .anyMatch(p -> t.types.isAssignable(p.asType(), closureType)) + // Ran into problems resolving overloads from these methods. TODO might be obsolete with new overload delegation system. + && e.getAnnotation(Deprecated.class) == null; + //System.err.println("Translating " + e + "? " + r); + return r; + }; + + for (String name : fileNames) { + t.translate( + "org.codehaus.groovy.runtime."+name, + "com.cloudbees.groovy.cps.Cps"+name, + selector, + e -> !EXCLUSIONS.contains(e.getEnclosingElement().getSimpleName().toString() + "." + e.getSimpleName().toString()), + groovySrcJar.getName()); + } + + + dir.mkdirs(); + t.generateTo(new FileCodeWriter(dir)); + } + } + + private DiagnosticListener createErrorListener() { + return System.out::println; + } + + private static final Set EXCLUSIONS = ImmutableSet.of( + "DefaultGroovyMethods.runAfter", /* use anonymous inner class we can't handle */ + "DefaultGroovyMethods.accept" /* launches a thread */, + "DefaultGroovyStaticMethods.start", "DefaultGroovyStaticMethods.startDaemon", // ditto + "DefaultGroovyMethods.filterLine", /* anonymous inner classes */ + "DefaultGroovyMethods.dropWhile","DefaultGroovyMethods.takeWhile" /* TODO: translate inner classes to support this*/, + "DefaultGroovyMethods.toUnique", // ditto: UniqueIterator is private + + "ProcessGroovyMethods.withWriter", + "ProcessGroovyMethods.withOutputStream" /* anonymous inner class */ + ); +} diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java new file mode 100644 index 000000000..0ec26cad3 --- /dev/null +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -0,0 +1,836 @@ +package com.cloudbees.groovy.cps.tool; + +import com.sun.codemodel.CodeWriter; +import com.sun.codemodel.JClass; +import com.sun.codemodel.JClassAlreadyExistsException; +import com.sun.codemodel.JCodeModel; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JExpr; +import com.sun.codemodel.JExpression; +import com.sun.codemodel.JInvocation; +import com.sun.codemodel.JMethod; +import com.sun.codemodel.JMod; +import com.sun.codemodel.JOp; +import com.sun.codemodel.JType; +import com.sun.codemodel.JTypeVar; +import com.sun.codemodel.JVar; +import com.sun.source.tree.ArrayAccessTree; +import com.sun.source.tree.ArrayTypeTree; +import com.sun.source.tree.AssignmentTree; +import com.sun.source.tree.BinaryTree; +import com.sun.source.tree.BlockTree; +import com.sun.source.tree.BreakTree; +import com.sun.source.tree.ClassTree; +import com.sun.source.tree.CompilationUnitTree; +import com.sun.source.tree.CompoundAssignmentTree; +import com.sun.source.tree.ConditionalExpressionTree; +import com.sun.source.tree.ContinueTree; +import com.sun.source.tree.DoWhileLoopTree; +import com.sun.source.tree.EnhancedForLoopTree; +import com.sun.source.tree.ExpressionStatementTree; +import com.sun.source.tree.ExpressionTree; +import com.sun.source.tree.ForLoopTree; +import com.sun.source.tree.IdentifierTree; +import com.sun.source.tree.IfTree; +import com.sun.source.tree.InstanceOfTree; +import com.sun.source.tree.LiteralTree; +import com.sun.source.tree.MemberSelectTree; +import com.sun.source.tree.MethodInvocationTree; +import com.sun.source.tree.NewArrayTree; +import com.sun.source.tree.NewClassTree; +import com.sun.source.tree.ParameterizedTypeTree; +import com.sun.source.tree.ParenthesizedTree; +import com.sun.source.tree.PrimitiveTypeTree; +import com.sun.source.tree.ReturnTree; +import com.sun.source.tree.ThrowTree; +import com.sun.source.tree.Tree; +import com.sun.source.tree.Tree.Kind; +import com.sun.source.tree.TryTree; +import com.sun.source.tree.TypeCastTree; +import com.sun.source.tree.UnaryTree; +import com.sun.source.tree.VariableTree; +import com.sun.source.tree.WhileLoopTree; +import com.sun.source.tree.WildcardTree; +import com.sun.source.util.JavacTask; +import com.sun.source.util.SimpleTreeVisitor; +import com.sun.source.util.Trees; +import com.sun.tools.javac.code.Symbol; +import com.sun.tools.javac.code.Symbol.ClassSymbol; +import com.sun.tools.javac.code.Symbol.TypeVariableSymbol; +import com.sun.tools.javac.code.Symbol.VarSymbol; +import com.sun.tools.javac.code.Types.DefaultSymbolVisitor; +import com.sun.tools.javac.tree.JCTree; +import com.sun.tools.javac.tree.JCTree.JCFieldAccess; +import com.sun.tools.javac.tree.JCTree.JCIdent; + +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Name; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.NoType; +import javax.lang.model.type.PrimitiveType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.type.TypeVariable; +import javax.lang.model.type.WildcardType; +import javax.lang.model.util.ElementScanner7; +import javax.lang.model.util.Elements; +import javax.lang.model.util.SimpleTypeVisitor6; +import javax.lang.model.util.Types; +import javax.tools.JavaCompiler.CompilationTask; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Predicate; +import javax.annotation.Generated; +import javax.lang.model.element.Modifier; + +/** + * Generates {@code CpsDefaultGroovyMethods} from the source code of {@code DefaultGroovyMethods}. + * + * @author Kohsuke Kawaguchi + */ +@SuppressWarnings("Since15") +public class Translator { + + public final Types types; + public final Elements elements; + public final Trees trees; + public final JavacTask javac; + + private final JCodeModel codeModel = new JCodeModel(); + + // class references + private final JClass $Caller; + private final JClass $CpsFunction; + private final JClass $CpsCallableInvocation; + private final JClass $Builder; + private final JClass $CatchExpression; + + /** + * Parsed source files. + */ + private final Iterable parsed; + + /** + * Parse the source code and prepare for translations. + */ + public Translator(CompilationTask task) throws IOException { + this.javac = (JavacTask)task; + + $Caller = codeModel.ref("com.cloudbees.groovy.cps.impl.Caller"); + $CpsFunction = codeModel.ref("com.cloudbees.groovy.cps.impl.CpsFunction"); + $CpsCallableInvocation = codeModel.ref("com.cloudbees.groovy.cps.impl.CpsCallableInvocation"); + $Builder = codeModel.ref("com.cloudbees.groovy.cps.Builder"); + $CatchExpression = codeModel.ref("com.cloudbees.groovy.cps.CatchExpression"); + + trees = Trees.instance(javac); + elements = javac.getElements(); + types = javac.getTypes(); + + this.parsed = javac.parse(); + javac.analyze(); + } + + /** + * Transforms a single class. + */ + public void translate(String fqcn, String outfqcn, Predicate methodSelector, Predicate supportedSelector, String sourceJarName) throws JClassAlreadyExistsException { + // TODO avoid calling _class until we have confirmed we are selecting at least one method + final JDefinedClass $output = codeModel._class(outfqcn); + $output.annotate(Generated.class).param("value", Translator.class.getName()).param("date", new Date().toString()).param("comments", "based on " + sourceJarName); + + CompilationUnitTree dgmCut = getDefaultGroovyMethodCompilationUnitTree(parsed); + + ClassSymbol dgm = (ClassSymbol) elements.getTypeElement(fqcn); + dgm.accept(new ElementScanner7() { + public Void visitExecutable(ExecutableElement e, Void __) { + if (methodSelector.test(e)) { + try { + translateMethod(dgmCut, e, $output, fqcn, supportedSelector.test(e)); + } catch (Exception x) { + throw new RuntimeException("Unable to transform "+fqcn+"."+e, x); + } + } + return null; + } + },null); + + /* + private static MethodLocation loc(String methodName) { + return new MethodLocation(CpsDefaultGroovyMethods.class,methodName); + } + */ + + JClass $MethodLocation = codeModel.ref("com.cloudbees.groovy.cps.MethodLocation"); + $output.method(JMod.PRIVATE|JMod.STATIC, $MethodLocation, "loc").tap( m -> { + JVar $methodName = m.param(String.class, "methodName"); + m.body()._return(JExpr._new($MethodLocation).arg($output.dotclass()).arg($methodName)); + }); + } + + /** + * @param e + * Method in {@code fqcn} to translate. + */ + private void translateMethod(final CompilationUnitTree cut, ExecutableElement e, JDefinedClass $output, String fqcn, boolean supported) { + String methodName = n(e); + boolean isPublic = e.getModifiers().contains(Modifier.PUBLIC); + + // To allow sibling calls to overloads to be resolved properly at runtime, write the actual implementation to an overload-proof private method. + StringBuilder overloadResolved = new StringBuilder("$").append(methodName); + e.getParameters().forEach(ve -> { + overloadResolved.append("__").append(types.erasure(ve.asType()).toString().replace("[]", "_array").replaceAll("[^\\p{javaJavaIdentifierPart}]+", "_")); + }); // so, e.g., $eachByte__byte_array__groovy_lang_Closure + JMethod delegating = $output.method(isPublic ? JMod.PUBLIC | JMod.STATIC : JMod.STATIC, (JType) null, methodName); + JMethod m = supported ? $output.method(JMod.PRIVATE | JMod.STATIC, (JType) null, overloadResolved.toString()) : null; + + Map typeVars = new HashMap<>(); + e.getTypeParameters().forEach(p -> { + String name = n(p); + JTypeVar typeVar = delegating.generify(name); + JTypeVar typeVar2 = supported ? m.generify(name) : null; + p.getBounds().forEach(b -> { + JClass binding = (JClass) t(b, typeVars); + typeVar.bound(binding); + if (supported) { + typeVar2.bound(binding); + } + }); + typeVars.put(name, typeVar); + }); + JType type = t(e.getReturnType(), typeVars); + delegating.type(type); + if (supported) { + m.type(type); + } + + List delegatingParams = new ArrayList<>(); + List params = new ArrayList<>(); + e.getParameters().forEach(p -> { + JType paramType = t(p.asType(), typeVars); + delegatingParams.add(delegating.param(paramType, n(p))); + if (supported) { + params.add(m.param(paramType, n(p))); + } + }); + + e.getThrownTypes().forEach(ex -> { + delegating._throws((JClass)t(ex)); + if (supported) { + m._throws((JClass)t(ex)); + } + }); + + boolean returnsVoid = e.getReturnType().getKind() == TypeKind.VOID; + + if (isPublic) {// preamble + /* + If the call to this method happen outside CPS code, execute normally via DefaultGroovyMethods + */ + delegating.body()._if(JOp.cand( + JOp.not($Caller.staticInvoke("isAsynchronous").tap(inv -> { + inv.arg(delegatingParams.get(0)); + inv.arg(methodName); + for (int i = 1; i < delegatingParams.size(); i++) + inv.arg(delegatingParams.get(i)); + })), + JOp.not($Caller.staticInvoke("isAsynchronous") + .arg($output.dotclass()) + .arg(methodName) + .args(params)) + ))._then().tap(blk -> { + JClass $WhateverGroovyMethods = codeModel.ref(fqcn); + JInvocation forward = $WhateverGroovyMethods.staticInvoke(methodName).args(delegatingParams); + + if (returnsVoid) { + blk.add(forward); + blk._return(); + } else { + blk._return(forward); + } + }); + } + + if (supported) { + JInvocation delegateCall = $output.staticInvoke(overloadResolved.toString()); + if (returnsVoid) { + delegating.body().add(delegateCall); + } else { + delegating.body()._return(delegateCall); + } + delegatingParams.forEach(p -> delegateCall.arg(p)); + } else { + delegating.body()._throw(JExpr._new(codeModel.ref(UnsupportedOperationException.class)) + .arg(fqcn + "." + e + " is not yet supported for translation; use another idiom, or wrap in @NonCPS")); + return; + } + + JVar $b = m.body().decl($Builder, "b", JExpr._new($Builder).arg(JExpr.invoke("loc").arg(methodName))); + JInvocation f = JExpr._new($CpsFunction); + + // parameter names + f.arg(codeModel.ref(Arrays.class).staticInvoke("asList").tap( inv -> { + e.getParameters().forEach( p -> inv.arg(n(p)) ); + })); + + // translate the method body into an expression that invokes Builder + f.arg(trees.getTree(e).getBody().accept(new SimpleTreeVisitor() { + private JExpression visit(Tree t) { + if (t==null) return JExpr._null(); + return visit(t, null); + } + + /** + * Maps a symbol to its source location. + */ + private JExpression loc(Tree t) { + long pos = trees.getSourcePositions().getStartPosition(cut, t); + return JExpr.lit((int)cut.getLineMap().getLineNumber(pos)); + } + + @Override + public JExpression visitWhileLoop(WhileLoopTree wt, Void __) { + return $b.invoke("while_") + .arg(JExpr._null()) // TODO: label + .arg(visit(wt.getCondition())) + .arg(visit(wt.getStatement())); + } + + @Override + public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { + ExpressionTree ms = mt.getMethodSelect(); + JInvocation inv; + + if (ms instanceof MemberSelectTree) { + MemberSelectTree mst = (MemberSelectTree) ms; + inv = $b.invoke("functionCall") + .arg(loc(mt)) + .arg(visit(mst.getExpression())) + .arg(n(mst.getIdentifier())); + } else + if (ms instanceof JCIdent) { + // invocation without object selection, like foo(bar,zot) + JCIdent it = (JCIdent) ms; + if (!it.sym.owner.toString().equals(fqcn)) { + // static import + inv = $b.invoke("functionCall") + .arg(loc(mt)) + .arg($b.invoke("constant").arg(t(it.sym.owner.type).dotclass())) + .arg(n(it)); + } else { + // invocation on this class + StringBuilder overloadResolved = new StringBuilder("$").append(it.getName()); + it.type.getParameterTypes().forEach(t -> { + overloadResolved.append("__").append(types.erasure(t).toString().replace("[]", "_array").replaceAll("[^\\p{javaJavaIdentifierPart}]+", "_")); + }); + inv = $b.invoke("staticCall") + .arg(loc(mt)) + .arg($output.dotclass()) + .arg(overloadResolved.toString()); + } + } else { + // TODO: figure out what can come here + throw new UnsupportedOperationException(ms.toString()); + } + + mt.getArguments().forEach( a -> inv.arg(visit(a)) ); + return inv; + } + + @Override + public JExpression visitVariable(VariableTree vt, Void __) { + return $b.invoke("declareVariable") + .arg(loc(vt)) + .arg(erasure(vt).dotclass()) + .arg(n(vt)) + .arg(visit(vt.getInitializer())); + } + + @Override + public JExpression visitIdentifier(IdentifierTree it, Void __) { + JCIdent idt = (JCIdent) it; + return idt.sym.accept(new DefaultSymbolVisitor() { + @Override + public JExpression visitClassSymbol(ClassSymbol cs, Void __) { + return $b.invoke("constant").arg(t(cs.asType()).dotclass()); + } + + @Override + public JExpression visitVarSymbol(VarSymbol s, Void __) { + return $b.invoke("localVariable").arg(n(s.name)); + } + + @Override + public JExpression visitSymbol(Symbol s, Void __) { + throw new UnsupportedOperationException(s.toString()); + } + }, __); + } + + @Override + public JExpression visitBlock(BlockTree bt, Void __) { + JInvocation inv = $b.invoke("block"); + bt.getStatements().forEach(s -> inv.arg(visit(s))); + return inv; + } + + @Override + public JExpression visitReturn(ReturnTree rt, Void __) { + return $b.invoke("return_").arg(visit(rt.getExpression())); + } + + /** + * When used outside {@link MethodInvocationTree}, this is property access. + */ + @Override + public JExpression visitMemberSelect(MemberSelectTree mt, Void __) { + return $b.invoke("property") + .arg(loc(mt)) + .arg(visit(mt.getExpression())) + .arg(n(mt.getIdentifier())); + } + + @Override + public JExpression visitTypeCast(TypeCastTree tt, Void __) { + return $b.invoke("cast") + .arg(loc(tt)) + .arg(visit(tt.getExpression())) + .arg(erasure(tt.getType()).dotclass()) + .arg(JExpr.lit(false)); + } + + + @Override + public JExpression visitIf(IfTree it, Void __) { + JInvocation inv = $b.invoke("if_") + .arg(visit(it.getCondition())) + .arg(visit(it.getThenStatement())); + if (it.getElseStatement()!=null) + inv.arg(visit(it.getElseStatement())); + return inv; + } + + @Override + public JExpression visitNewClass(NewClassTree nt, Void __) { + // TODO: outer class + if (nt.getEnclosingExpression()!=null) + throw new UnsupportedOperationException(); + + return $b.invoke("new_").tap(inv -> { + inv.arg(loc(nt)); + inv.arg(t(((JCTree) nt).type).dotclass()); + nt.getArguments().forEach( et -> inv.arg(visit(et)) ); + }); + } + + @Override + public JExpression visitExpressionStatement(ExpressionStatementTree et, Void __) { + return visit(et.getExpression()); + } + + @Override + public JExpression visitLiteral(LiteralTree lt, Void __) { + return $b.invoke("constant").arg(JExpr.literal(lt.getValue())); + } + + @Override + public JExpression visitParenthesized(ParenthesizedTree pt, Void __) { + return visit(pt.getExpression()); + } + + @Override + public JExpression visitBinary(BinaryTree bt, Void __) { + return $b.invoke(opName(bt.getKind())) + .arg(loc(bt)) + .arg(visit(bt.getLeftOperand())) + .arg(visit(bt.getRightOperand())); + } + + @Override + public JExpression visitUnary(UnaryTree ut, Void __) { + return $b.invoke(opName(ut.getKind())) + .arg(loc(ut)) + .arg(visit(ut.getExpression())); + } + + @Override + public JExpression visitCompoundAssignment(CompoundAssignmentTree ct, Void __) { + return $b.invoke(opName(ct.getKind())) + .arg(loc(ct)) + .arg(visit(ct.getVariable())) + .arg(visit(ct.getExpression())); + } + + private String opName(Kind kind) { + switch (kind) { + case EQUAL_TO: return "compareEqual"; + case NOT_EQUAL_TO: return "compareNotEqual"; + case LESS_THAN_EQUAL: return "lessThanEqual"; + case LESS_THAN: return "lessThan"; + case GREATER_THAN_EQUAL: return "greaterThanEqual"; + case GREATER_THAN: return "greaterThan"; + case PREFIX_INCREMENT: return "prefixInc"; + case POSTFIX_INCREMENT: return "postfixInc"; + case POSTFIX_DECREMENT: return "postfixDec"; + case LOGICAL_COMPLEMENT: return "not"; + case CONDITIONAL_OR: return "logicalOr"; + case CONDITIONAL_AND: return "logicalAnd"; + case PLUS: return "plus"; + case PLUS_ASSIGNMENT: return "plusEqual"; + case MINUS: return "minus"; + case MINUS_ASSIGNMENT: return "minusEqual"; + } + throw new UnsupportedOperationException(kind.toString()); + } + + @Override + public JExpression visitAssignment(AssignmentTree at, Void __) { + return $b.invoke("assign") + .arg(loc(at)) + .arg(visit(at.getVariable())) + .arg(visit(at.getExpression())); + } + + @Override + public JExpression visitNewArray(NewArrayTree nt, Void __) { + if (nt.getInitializers()!=null) { + // This syntax does not seem to exist in Groovy (kohsuke in 88006fc tried to use a nonexistent Builder.newArrayFromInitializers). + return $b.invoke("list").tap(inv -> { + nt.getInitializers().forEach(d -> inv.arg(visit(d))); + }); + } else { + return $b.invoke("newArray").tap(inv -> { + inv.arg(loc(nt)); + inv.arg(t(nt.getType()).dotclass()); + nt.getDimensions().forEach(d -> inv.arg(visit(d))); + }); + } + } + + @Override + public JExpression visitForLoop(ForLoopTree ft, Void __) { + return $b.invoke("forLoop") + .arg(JExpr._null()) + .arg($b.invoke("sequence").tap(inv -> ft.getInitializer().forEach(i -> inv.arg(visit(i))))) + .arg(visit(ft.getCondition())) + .arg($b.invoke("sequence").tap(inv -> ft.getUpdate().forEach(i -> inv.arg(visit(i))))) + .arg(visit(ft.getStatement())); + } + + @Override + public JExpression visitEnhancedForLoop(EnhancedForLoopTree et, Void __) { + return $b.invoke("forInLoop") + .arg(loc(et)) + .arg(JExpr._null()) + .arg(erasure(et.getVariable()).dotclass()) + .arg(n(et.getVariable())) + .arg(visit(et.getExpression())) + .arg(visit(et.getStatement())); + } + + @Override + public JExpression visitArrayAccess(ArrayAccessTree at, Void __) { + return $b.invoke("array") + .arg(loc(at)) + .arg(visit(at.getExpression())) + .arg(visit(at.getIndex())); + } + + @Override + public JExpression visitBreak(BreakTree node, Void __) { + if (node.getLabel()!=null) + throw new UnsupportedOperationException(); + return $b.invoke("break_").arg(JExpr._null()); + } + + @Override + public JExpression visitContinue(ContinueTree node, Void aVoid) { + if (node.getLabel()!=null) + throw new UnsupportedOperationException(); + return $b.invoke("continue_").arg(JExpr._null()); + } + + @Override + public JExpression visitInstanceOf(InstanceOfTree it, Void __) { + return $b.invoke("instanceOf") + .arg(loc(it)) + .arg(visit(it.getExpression())) + .arg($b.invoke("constant").arg(t(it.getType()).dotclass())); + } + + @Override + public JExpression visitThrow(ThrowTree tt, Void __) { + return $b.invoke("throw_") + .arg(loc(tt)) + .arg(visit(tt.getExpression())); + } + + @Override + public JExpression visitDoWhileLoop(DoWhileLoopTree dt, Void __) { + return $b.invoke("doWhile") + .arg(JExpr._null()) + .arg(visit(dt.getStatement())) + .arg(visit(dt.getCondition())); + } + + @Override + public JExpression visitConditionalExpression(ConditionalExpressionTree ct, Void __) { + return $b.invoke("ternaryOp") + .arg(visit(ct.getCondition())) + .arg(visit(ct.getTrueExpression())) + .arg(visit(ct.getFalseExpression())); + } + + @Override + public JExpression visitTry(TryTree tt, Void __) { + return $b.invoke("tryCatch") + .arg(visit(tt.getBlock())) + .arg(visit(tt.getFinallyBlock())) + .tap(inv -> + tt.getCatches().forEach(ct -> + JExpr._new($CatchExpression) + .arg(t(ct.getParameter()).dotclass()) + .arg(n(ct.getParameter())) + .arg(visit(ct.getBlock()))) + ); + } + + @Override + protected JExpression defaultAction(Tree node, Void aVoid) { + throw new UnsupportedOperationException(node.toString()); + } + }, null)); + + JVar $f = m.body().decl($CpsFunction, "f", f); + m.body()._throw(JExpr._new($CpsCallableInvocation) + .arg($f) + .arg(JExpr._null()) + .args(params)); + } + + private CompilationUnitTree getDefaultGroovyMethodCompilationUnitTree(Iterable parsed) { + for (CompilationUnitTree cut : parsed) { + for (Tree t : cut.getTypeDecls()) { + if (t.getKind() == Kind.CLASS) { + ClassTree ct = (ClassTree)t; + if (ct.getSimpleName().toString().equals("DefaultGroovyMethods")) { // TODO use fqcn + return cut; + } + } + } + } + throw new IllegalStateException("DefaultGroovyMethods wasn't parsed"); + } + + + /** + * Convert a type representation from javac to codemodel. + */ + private JType t(Tree t) { + return t.accept(new TypeTranslator(), null); + } + + /** + * Converts a type representation to its erasure. + */ + private JType erasure(Tree t) { + return t.accept(new TypeTranslator() { + @Override + public JType visitParameterizedType(ParameterizedTypeTree pt, Void __) { + return visit(pt.getType()); + } + + @Override + public JType visitWildcard(WildcardTree wt, Void __) { + Tree b = wt.getBound(); + if (b==null) return codeModel.ref(Object.class); + else return visit(b); + } + + @Override + public JType visitIdentifier(IdentifierTree it, Void __) { + JCIdent idt = (JCIdent) it; + if (idt.sym instanceof ClassSymbol) { + ClassSymbol cs = (ClassSymbol) idt.sym; + return codeModel.ref(cs.className()); + } + if (idt.sym instanceof TypeVariableSymbol) { + TypeVariableSymbol tcs = (TypeVariableSymbol) idt.sym; + if (tcs.getBounds().isEmpty()) + return codeModel.ref(Object.class); + else + return t(tcs.getBounds().get(0)); + } + throw new UnsupportedOperationException(idt.sym.toString()); + } + }, null); + } + + private JType t(TypeMirror m) { + return t(m, Collections.emptyMap()); + } + + private JType t(TypeMirror m, Map typeVars) { + if (m.getKind().isPrimitive()) + return JType.parse(codeModel,m.toString()); + + return m.accept(new SimpleTypeVisitor6() { + @Override + public JType visitPrimitive(PrimitiveType t, Void __) { + return primitive(t, t.getKind()); + } + + @Override + public JType visitDeclared(DeclaredType t, Void __) { + String name = n(((TypeElement) t.asElement()).getQualifiedName()); + if (name.isEmpty()) + throw new UnsupportedOperationException("Anonymous class: "+t); + JClass base = codeModel.ref(name); + if (t.getTypeArguments().isEmpty()) + return base; + + List typeArgs = new ArrayList<>(); + t.getTypeArguments().forEach(a -> typeArgs.add((JClass) t(a, typeVars))); + return base.narrow(typeArgs); + } + + @Override + public JType visitTypeVariable(TypeVariable t, Void __) { + String name = t.asElement().getSimpleName().toString(); + JTypeVar var = typeVars.get(name); + if (var != null) { + return var; // TODO bounds + } else { + // TODO with(U,groovy.lang.Closure) somehow asks us to visit V, huh? + return t(t.getUpperBound(), typeVars); + } + } + + @Override + public JType visitNoType(NoType t, Void __) { + return primitive(t, t.getKind()); + } + + @Override + public JType visitArray(ArrayType t, Void __) { + return t(t.getComponentType(), typeVars).array(); + } + + @Override + public JType visitWildcard(WildcardType t, Void aVoid) { + if (t.getExtendsBound()!=null) { + return t(t.getExtendsBound(), typeVars).boxify().wildcard(); + } + if (t.getSuperBound()!=null) { + throw new UnsupportedOperationException(); + } + return codeModel.wildcard(); + } + + @Override + protected JType defaultAction(TypeMirror e, Void __) { + throw new UnsupportedOperationException(e.toString()); + } + }, null); + } + + private String n(Element e) { + return e.getSimpleName().toString(); + } + private String n(Name n) { + return n.toString(); + } + private String n(VariableTree v) { + return n(v.getName()); + } + private String n(IdentifierTree v) { + return n(v.getName()); + } + + private JType primitive(Object src, TypeKind k) { + switch (k) { + case BOOLEAN: return codeModel.INT; + case BYTE: return codeModel.BYTE; + case SHORT: return codeModel.SHORT; + case INT: return codeModel.INT; + case LONG: return codeModel.LONG; + case CHAR: return codeModel.CHAR; + case FLOAT: return codeModel.FLOAT; + case DOUBLE: return codeModel.DOUBLE; + case VOID: return codeModel.VOID; + } + throw new UnsupportedOperationException(src.toString()); + } + + /** + * Generate transalted result into source files. + */ + public void generateTo(CodeWriter cw) throws IOException { + codeModel.build(cw); + } + + private class TypeTranslator extends SimpleTreeVisitor { + protected JType visit(Tree t) { + return visit(t,null); + } + + @Override + public JType visitVariable(VariableTree node, Void __) { + return visit(node.getType()); + } + + @Override + public JType visitParameterizedType(ParameterizedTypeTree pt, Void __) { + JClass base = (JClass)visit(pt.getType()); + List args = new ArrayList<>(); + for (Tree arg : pt.getTypeArguments()) { + args.add((JClass)visit(arg)); + } + return base.narrow(args); + } + + @Override + public JType visitIdentifier(IdentifierTree it, Void __) { + JCIdent idt = (JCIdent) it; + return codeModel.ref(idt.sym.toString()); + } + + @Override + public JType visitPrimitiveType(PrimitiveTypeTree pt, Void aVoid) { + return primitive(pt, pt.getPrimitiveTypeKind()); + } + + @Override + public JType visitArrayType(ArrayTypeTree at, Void __) { + return visit(at.getType()).array(); + } + + /** + * Nested type + */ + @Override + public JType visitMemberSelect(MemberSelectTree mt, Void __) { + return t(((JCFieldAccess)mt).type); + } + + @Override + public JType visitWildcard(WildcardTree wt, Void __) { + Tree b = wt.getBound(); + if (b==null) return codeModel.wildcard(); + else return visit(b).boxify().wildcard(); + } + + @Override + protected JType defaultAction(Tree node, Void __) { + throw new UnsupportedOperationException(node.toString()); + } + } +} diff --git a/TODO.txt b/lib/TODO.txt similarity index 100% rename from TODO.txt rename to lib/TODO.txt diff --git a/ast.sh b/lib/ast.sh similarity index 100% rename from ast.sh rename to lib/ast.sh diff --git a/lib/pom.xml b/lib/pom.xml new file mode 100644 index 000000000..106ff7383 --- /dev/null +++ b/lib/pom.xml @@ -0,0 +1,163 @@ + + 4.0.0 + + + com.cloudbees + groovy-cps-parent + 1.13-SNAPSHOT + + + groovy-cps + + Groovy CPS Execution + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + properties + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + generate-sources + + exec + + + ${project.build.directory}/generated-sources/dgm + java + + -jar + ${com.cloudbees:groovy-cps-dgm-builder:jar:jar-with-dependencies} + ${project.build.directory}/generated-sources/dgm + + + + + + + org.apache.maven.plugins + maven-site-plugin + + + org.kohsuke + doxia-module-markdown + 1.0 + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + 1.5 + + + + generateStubs + compile + testGenerateStubs + testCompile + + + + ${project.build.directory}/generated-sources/groovy-stubs + ${project.build.directory}/generated-test-sources/groovy-stubs + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20 + + false + + + + + + org.kathrynhuxtable.maven.wagon + wagon-gitsite + 0.3.1 + + + + + + + com.cloudbees + groovy-cps-dgm-builder + ${project.version} + jar-with-dependencies + runtime + true + + + org.kohsuke + groovy-sandbox + 1.11 + true + + + org.kohsuke + groovy-sandbox + 1.11 + tests + test + + + org.codehaus.groovy + groovy + ${groovy.version} + + provided + + + org.codehaus.groovy + groovy-test + ${groovy.version} + test + + + com.google.guava + guava + 11.0.1 + + + junit + junit + 4.11 + test + + + org.jenkins-ci + test-annotations + 1.2 + test + + + + + + + maven-javadoc-plugin + + + + + diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy b/lib/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy similarity index 100% rename from src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy rename to lib/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy diff --git a/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/lib/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy similarity index 100% rename from src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy rename to lib/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy diff --git a/src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy b/lib/src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy similarity index 100% rename from src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy rename to lib/src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy diff --git a/src/main/java/com/cloudbees/groovy/cps/Block.java b/lib/src/main/java/com/cloudbees/groovy/cps/Block.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/Block.java rename to lib/src/main/java/com/cloudbees/groovy/cps/Block.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Builder.java b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/Builder.java rename to lib/src/main/java/com/cloudbees/groovy/cps/Builder.java diff --git a/src/main/java/com/cloudbees/groovy/cps/CaseExpression.java b/lib/src/main/java/com/cloudbees/groovy/cps/CaseExpression.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/CaseExpression.java rename to lib/src/main/java/com/cloudbees/groovy/cps/CaseExpression.java diff --git a/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java b/lib/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/CatchExpression.java rename to lib/src/main/java/com/cloudbees/groovy/cps/CatchExpression.java diff --git a/src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java b/lib/src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java rename to lib/src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/Continuable.java rename to lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuation.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/Continuation.java rename to lib/src/main/java/com/cloudbees/groovy/cps/Continuation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Env.java b/lib/src/main/java/com/cloudbees/groovy/cps/Env.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/Env.java rename to lib/src/main/java/com/cloudbees/groovy/cps/Env.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Envs.java b/lib/src/main/java/com/cloudbees/groovy/cps/Envs.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/Envs.java rename to lib/src/main/java/com/cloudbees/groovy/cps/Envs.java diff --git a/src/main/java/com/cloudbees/groovy/cps/LValue.java b/lib/src/main/java/com/cloudbees/groovy/cps/LValue.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/LValue.java rename to lib/src/main/java/com/cloudbees/groovy/cps/LValue.java diff --git a/src/main/java/com/cloudbees/groovy/cps/LValueBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/LValueBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/LValueBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/LValueBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/MethodLocation.java rename to lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Next.java b/lib/src/main/java/com/cloudbees/groovy/cps/Next.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/Next.java rename to lib/src/main/java/com/cloudbees/groovy/cps/Next.java diff --git a/src/main/java/com/cloudbees/groovy/cps/NonCPS.java b/lib/src/main/java/com/cloudbees/groovy/cps/NonCPS.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/NonCPS.java rename to lib/src/main/java/com/cloudbees/groovy/cps/NonCPS.java diff --git a/src/main/java/com/cloudbees/groovy/cps/ObjectInputStreamWithLoader.java b/lib/src/main/java/com/cloudbees/groovy/cps/ObjectInputStreamWithLoader.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/ObjectInputStreamWithLoader.java rename to lib/src/main/java/com/cloudbees/groovy/cps/ObjectInputStreamWithLoader.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Outcome.java b/lib/src/main/java/com/cloudbees/groovy/cps/Outcome.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/Outcome.java rename to lib/src/main/java/com/cloudbees/groovy/cps/Outcome.java diff --git a/src/main/java/com/cloudbees/groovy/cps/Safepoint.java b/lib/src/main/java/com/cloudbees/groovy/cps/Safepoint.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/Safepoint.java rename to lib/src/main/java/com/cloudbees/groovy/cps/Safepoint.java diff --git a/src/main/java/com/cloudbees/groovy/cps/SerializableScript.java b/lib/src/main/java/com/cloudbees/groovy/cps/SerializableScript.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/SerializableScript.java rename to lib/src/main/java/com/cloudbees/groovy/cps/SerializableScript.java diff --git a/src/main/java/com/cloudbees/groovy/cps/TransformerConfiguration.java b/lib/src/main/java/com/cloudbees/groovy/cps/TransformerConfiguration.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/TransformerConfiguration.java rename to lib/src/main/java/com/cloudbees/groovy/cps/TransformerConfiguration.java diff --git a/src/main/java/com/cloudbees/groovy/cps/WorkflowTransformed.java b/lib/src/main/java/com/cloudbees/groovy/cps/WorkflowTransformed.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/WorkflowTransformed.java rename to lib/src/main/java/com/cloudbees/groovy/cps/WorkflowTransformed.java diff --git a/src/main/java/com/cloudbees/groovy/cps/green/Cond.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/Cond.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/green/Cond.java rename to lib/src/main/java/com/cloudbees/groovy/cps/green/Cond.java diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java rename to lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java rename to lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java diff --git a/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java rename to lib/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java diff --git a/src/main/java/com/cloudbees/groovy/cps/green/Monitor.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/Monitor.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/green/Monitor.java rename to lib/src/main/java/com/cloudbees/groovy/cps/green/Monitor.java diff --git a/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java rename to lib/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java diff --git a/src/main/java/com/cloudbees/groovy/cps/green/package-info.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/package-info.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/green/package-info.java rename to lib/src/main/java/com/cloudbees/groovy/cps/green/package-info.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ArrayAccessBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/AttributeAccessBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopedBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopedBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/BlockScopedBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopedBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/BreakBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlockSupport.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlockSupport.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlockSupport.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlockSupport.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/Caller.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CaseEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CaseEnv.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/CaseEnv.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/CaseEnv.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CollectionLiteralBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CollectionLiteralBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/CollectionLiteralBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/CollectionLiteralBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ConstantBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationPtr.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinueBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/JavaThisBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/JavaThisBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/JavaThisBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/JavaThisBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/MapBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/MapBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/MapBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/MapBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ReferenceStackTrace.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ReferenceStackTrace.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ReferenceStackTrace.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ReferenceStackTrace.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ReturnBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ReturnBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ReturnBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ReturnBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/StaticFieldBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/StaticFieldBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/StaticFieldBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/StaticFieldBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/Super.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/Super.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/Super.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/Super.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SuperBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SuperBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/SuperBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/SuperBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/YieldBlock.java diff --git a/src/main/java/com/cloudbees/groovy/cps/impl/package-info.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/package-info.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/impl/package-info.java rename to lib/src/main/java/com/cloudbees/groovy/cps/impl/package-info.java diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/CallSiteTag.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/CallSiteTag.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/sandbox/CallSiteTag.java rename to lib/src/main/java/com/cloudbees/groovy/cps/sandbox/CallSiteTag.java diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java rename to lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java rename to lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java rename to lib/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Trusted.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Trusted.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/sandbox/Trusted.java rename to lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Trusted.java diff --git a/src/main/java/com/cloudbees/groovy/cps/sandbox/Untrusted.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Untrusted.java similarity index 100% rename from src/main/java/com/cloudbees/groovy/cps/sandbox/Untrusted.java rename to lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Untrusted.java diff --git a/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/SafepointTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/SafepointTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/SafepointTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/SafepointTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy diff --git a/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy similarity index 100% rename from src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy rename to lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy diff --git a/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/BasicTest.java similarity index 100% rename from src/test/java/com/cloudbees/groovy/cps/BasicTest.java rename to lib/src/test/java/com/cloudbees/groovy/cps/BasicTest.java diff --git a/src/test/java/com/cloudbees/groovy/cps/VariableDeclarationTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/VariableDeclarationTest.java similarity index 100% rename from src/test/java/com/cloudbees/groovy/cps/VariableDeclarationTest.java rename to lib/src/test/java/com/cloudbees/groovy/cps/VariableDeclarationTest.java diff --git a/src/test/java/com/cloudbees/groovy/cps/impl/CallerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/CallerTest.java similarity index 100% rename from src/test/java/com/cloudbees/groovy/cps/impl/CallerTest.java rename to lib/src/test/java/com/cloudbees/groovy/cps/impl/CallerTest.java diff --git a/src/test/java/foo.groovy b/lib/src/test/java/foo.groovy similarity index 100% rename from src/test/java/foo.groovy rename to lib/src/test/java/foo.groovy diff --git a/test.groovy b/lib/test.groovy similarity index 100% rename from test.groovy rename to lib/test.groovy diff --git a/pom.xml b/pom.xml index 20ce39f32..1ec68af7f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,137 +1,41 @@ - 4.0.0 + 4.0.0 + + + com.cloudbees + cloudbees-oss-parent + 7 + + + + groovy-cps-parent + 1.13-SNAPSHOT + pom + + Groovy CPS Execution Parent + + + UTF-8 + 2.4.7 + + + + scm:git:git@github.com/cloudbees/groovy-cps.git + scm:git:ssh://git@github.com/cloudbees/groovy-cps.git + HEAD + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + dgm-builder + lib + - - com.cloudbees - cloudbees-oss-parent - 7 - - - - groovy-cps - 1.13-SNAPSHOT - - Groovy CPS Execution - - - UTF-8 - 2.4.7 - - - - - - org.apache.maven.plugins - maven-site-plugin - - - org.kohsuke - doxia-module-markdown - 1.0 - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - 1.5 - - - - generateStubs - compile - testGenerateStubs - testCompile - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20 - - false - - - - - - org.kathrynhuxtable.maven.wagon - wagon-gitsite - 0.3.1 - - - - - - - org.kohsuke - groovy-sandbox - 1.11 - true - - - org.kohsuke - groovy-sandbox - 1.11 - tests - test - - - org.codehaus.groovy - groovy - ${groovy.version} - - provided - - - org.codehaus.groovy - groovy-test - ${groovy.version} - test - - - com.google.guava - guava - 11.0.1 - - - junit - junit - 4.11 - test - - - org.jenkins-ci - test-annotations - 1.2 - test - - - - - scm:git:git@github.com/cloudbees/${project.artifactId}.git - scm:git:ssh://git@github.com/cloudbees/${project.artifactId}.git - HEAD - - - - - - maven-javadoc-plugin - - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.java b/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.java deleted file mode 100644 index 015780e7a..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethods.java +++ /dev/null @@ -1,2392 +0,0 @@ - -package com.cloudbees.groovy.cps; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Set; -import java.util.SortedSet; -import java.util.Timer; -import java.util.TimerTask; -import javax.annotation.Generated; -import com.cloudbees.groovy.cps.impl.Caller; -import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; -import com.cloudbees.groovy.cps.impl.CpsFunction; -import groovy.lang.Closure; -import groovy.lang.DelegatingMetaClass; -import groovy.lang.ExpandoMetaClass; -import groovy.lang.GroovyObject; -import groovy.lang.GroovyRuntimeException; -import groovy.lang.GroovySystem; -import groovy.lang.ListWithDefault; -import groovy.lang.MapWithDefault; -import groovy.lang.MetaClass; -import groovy.lang.MetaClassImpl; -import groovy.lang.MetaClassRegistry; -import groovy.util.ClosureComparator; -import groovy.util.GroovyCollections; -import groovy.util.OrderBy; -import groovy.util.PermutationGenerator; -import org.codehaus.groovy.runtime.DefaultGroovyMethods; -import org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport; -import org.codehaus.groovy.runtime.GroovyCategorySupport; -import org.codehaus.groovy.runtime.InvokerHelper; -import org.codehaus.groovy.runtime.ReverseListIterator; -import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; -import org.codehaus.groovy.runtime.callsite.BooleanClosureWrapper; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; -import org.codehaus.groovy.util.ArrayIterator; - -@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Mon May 15 17:17:37 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") -public class CpsDefaultGroovyMethods { - - - public staticT identity(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "identity", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "identity", self, closure))) { - return DefaultGroovyMethods.identity(self, closure); - } - return CpsDefaultGroovyMethods.$identity__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private staticT $identity__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("identity")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.functionCall(200, b.constant(DefaultGroovyMethods.class), "with", b.localVariable("self"), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT with(U self, Closure closure) { - if ((!Caller.isAsynchronous(self, "with", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "with", self, closure))) { - return DefaultGroovyMethods.with(self, closure); - } - return CpsDefaultGroovyMethods.$with__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private staticT $with__java_lang_Object__groovy_lang_Closure(U self, Closure closure) { - Builder b = new Builder(loc("with")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(238, Closure.class, "clonedClosure", b.cast(239, b.functionCall(239, b.localVariable("closure"), "clone"), Closure.class, false)), b.functionCall(240, b.localVariable("clonedClosure"), "setResolveStrategy", b.property(240, b.constant(Closure.class), "DELEGATE_FIRST")), b.functionCall(241, b.localVariable("clonedClosure"), "setDelegate", b.localVariable("self")), b.return_(b.functionCall(242, b.localVariable("clonedClosure"), "call", b.localVariable("self"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT use(Object self, Class categoryClass, Closure closure) { - if ((!Caller.isAsynchronous(self, "use", categoryClass, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "use", self, categoryClass, closure))) { - return DefaultGroovyMethods.use(self, categoryClass, closure); - } - return CpsDefaultGroovyMethods.$use__java_lang_Object__java_lang_Class__groovy_lang_Closure(self, categoryClass, closure); - } - - private staticT $use__java_lang_Object__java_lang_Class__groovy_lang_Closure(Object self, Class categoryClass, Closure closure) { - Builder b = new Builder(loc("use")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "categoryClass", "closure"), b.block(b.return_(b.functionCall(407, b.constant(GroovyCategorySupport.class), "use", b.localVariable("categoryClass"), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, categoryClass, closure); - } - - public staticT use(Object self, List categoryClassList, Closure closure) { - if ((!Caller.isAsynchronous(self, "use", categoryClassList, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "use", self, categoryClassList, closure))) { - return DefaultGroovyMethods.use(self, categoryClassList, closure); - } - return CpsDefaultGroovyMethods.$use__java_lang_Object__java_util_List__groovy_lang_Closure(self, categoryClassList, closure); - } - - private staticT $use__java_lang_Object__java_util_List__groovy_lang_Closure(Object self, List categoryClassList, Closure closure) { - Builder b = new Builder(loc("use")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "categoryClassList", "closure"), b.block(b.return_(b.functionCall(488, b.constant(GroovyCategorySupport.class), "use", b.localVariable("categoryClassList"), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, categoryClassList, closure); - } - - public static void addShutdownHook(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "addShutdownHook", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "addShutdownHook", self, closure))) { - DefaultGroovyMethods.addShutdownHook(self, closure); - return ; - } - CpsDefaultGroovyMethods.$addShutdownHook__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private static void $addShutdownHook__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("addShutdownHook")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.functionCall(499, b.functionCall(499, b.constant(Runtime.class), "getRuntime"), "addShutdownHook", b.new_(499, Thread.class, b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticIterator unique(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "unique", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, closure))) { - return DefaultGroovyMethods.unique(self, closure); - } - return CpsDefaultGroovyMethods.$unique__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private staticIterator $unique__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("unique")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.functionCall(1140, b.staticCall(1140, CpsDefaultGroovyMethods.class, "$toList__java_lang_Iterable", b.cast(1140, b.staticCall(1140, CpsDefaultGroovyMethods.class, "$unique__java_util_List__groovy_lang_Closure", b.staticCall(1140, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), b.localVariable("closure")), Iterable.class, false)), "listIterator")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticCollection unique(Collection self, Closure closure) { - if ((!Caller.isAsynchronous(self, "unique", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, closure))) { - return DefaultGroovyMethods.unique(self, closure); - } - return CpsDefaultGroovyMethods.$unique__java_util_Collection__groovy_lang_Closure(self, closure); - } - - private staticCollection $unique__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { - Builder b = new Builder(loc("unique")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(1164, CpsDefaultGroovyMethods.class, "$unique__java_util_Collection__boolean__groovy_lang_Closure", b.localVariable("self"), b.constant(true), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticList unique(List self, Closure closure) { - if ((!Caller.isAsynchronous(self, "unique", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, closure))) { - return DefaultGroovyMethods.unique(self, closure); - } - return CpsDefaultGroovyMethods.$unique__java_util_List__groovy_lang_Closure(self, closure); - } - - private staticList $unique__java_util_List__groovy_lang_Closure(List self, Closure closure) { - Builder b = new Builder(loc("unique")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1188, b.staticCall(1188, CpsDefaultGroovyMethods.class, "$unique__java_util_Collection__boolean__groovy_lang_Closure", b.cast(1188, b.localVariable("self"), Collection.class, false), b.constant(true), b.localVariable("closure")), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticCollection unique(Collection self, boolean mutate, Closure closure) { - if ((!Caller.isAsynchronous(self, "unique", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, mutate, closure))) { - return DefaultGroovyMethods.unique(self, mutate, closure); - } - return CpsDefaultGroovyMethods.$unique__java_util_Collection__boolean__groovy_lang_Closure(self, mutate, closure); - } - - private staticCollection $unique__java_util_Collection__boolean__groovy_lang_Closure(Collection self, boolean mutate, Closure closure) { - Builder b = new Builder(loc("unique")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(1220, int.class, "params", b.functionCall(1220, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareEqual(1221, b.localVariable("params"), b.constant(1)), b.block(b.assign(1222, b.localVariable("self"), b.staticCall(1222, CpsDefaultGroovyMethods.class, "$unique__java_util_Collection__boolean__java_util_Comparator", b.localVariable("self"), b.localVariable("mutate"), b.new_(1222, OrderBy.class, b.localVariable("closure"), b.constant(true))))), b.block(b.assign(1224, b.localVariable("self"), b.staticCall(1224, CpsDefaultGroovyMethods.class, "$unique__java_util_Collection__boolean__java_util_Comparator", b.localVariable("self"), b.localVariable("mutate"), b.new_(1224, ClosureComparator.class, b.localVariable("closure")))))), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, mutate, closure); - } - - public staticList unique(List self, boolean mutate, Closure closure) { - if ((!Caller.isAsynchronous(self, "unique", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "unique", self, mutate, closure))) { - return DefaultGroovyMethods.unique(self, mutate, closure); - } - return CpsDefaultGroovyMethods.$unique__java_util_List__boolean__groovy_lang_Closure(self, mutate, closure); - } - - private staticList $unique__java_util_List__boolean__groovy_lang_Closure(List self, boolean mutate, Closure closure) { - Builder b = new Builder(loc("unique")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.return_(b.cast(1257, b.staticCall(1257, CpsDefaultGroovyMethods.class, "$unique__java_util_Collection__boolean__groovy_lang_Closure", b.cast(1257, b.localVariable("self"), Collection.class, false), b.localVariable("mutate"), b.localVariable("closure")), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, mutate, closure); - } - - public staticIterator toUnique(Iterator self, Closure condition) { - if ((!Caller.isAsynchronous(self, "toUnique", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toUnique"))) { - return DefaultGroovyMethods.toUnique(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.toUnique(java.util.Iterator,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticCollection toUnique(Iterable self, Closure condition) { - if ((!Caller.isAsynchronous(self, "toUnique", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toUnique"))) { - return DefaultGroovyMethods.toUnique(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.toUnique(java.lang.Iterable,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticList toUnique(List self, Closure condition) { - if ((!Caller.isAsynchronous(self, "toUnique", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toUnique"))) { - return DefaultGroovyMethods.toUnique(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.toUnique(java.util.List,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticT[] toUnique(T[] self, Closure condition) { - if ((!Caller.isAsynchronous(self, "toUnique", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toUnique"))) { - return DefaultGroovyMethods.toUnique(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.toUnique(T[],groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticT each(T self, Closure closure) { - if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { - return DefaultGroovyMethods.each(self, closure); - } - return CpsDefaultGroovyMethods.$each__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private staticT $each__java_lang_Object__groovy_lang_Closure(T self, Closure closure) { - Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(1890, CpsDefaultGroovyMethods.class, "$each__java_util_Iterator__groovy_lang_Closure", b.functionCall(1890, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")), b.localVariable("closure")), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT eachWithIndex(T self, Closure closure) { - if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { - return DefaultGroovyMethods.eachWithIndex(self, closure); - } - return CpsDefaultGroovyMethods.$eachWithIndex__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private staticT $eachWithIndex__java_lang_Object__groovy_lang_Closure(T self, Closure closure) { - Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(1905, Object[].class, "args", b.newArray(1905, Object.class, b.constant(2))), b.declareVariable(1906, int.class, "counter", b.constant(0)), b.forLoop(null, b.sequence(b.declareVariable(1907, Iterator.class, "iter", b.functionCall(1907, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(1907, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.assign(1908, b.array(1908, b.localVariable("args"), b.constant(0)), b.functionCall(1908, b.localVariable("iter"), "next")), b.assign(1909, b.array(1909, b.localVariable("args"), b.constant(1)), b.postfixInc(1909, b.localVariable("counter"))), b.functionCall(1910, b.localVariable("closure"), "call", b.localVariable("args")))), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticIterable eachWithIndex(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { - return DefaultGroovyMethods.eachWithIndex(self, closure); - } - return CpsDefaultGroovyMethods.$eachWithIndex__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticIterable $eachWithIndex__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(1926, CpsDefaultGroovyMethods.class, "$eachWithIndex__java_util_Iterator__groovy_lang_Closure", b.functionCall(1926, b.localVariable("self"), "iterator"), b.localVariable("closure")), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticIterator eachWithIndex(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { - return DefaultGroovyMethods.eachWithIndex(self, closure); - } - return CpsDefaultGroovyMethods.$eachWithIndex__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private staticIterator $eachWithIndex__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(1941, Object[].class, "args", b.newArray(1941, Object.class, b.constant(2))), b.declareVariable(1942, int.class, "counter", b.constant(0)), b.while_(null, b.functionCall(1943, b.localVariable("self"), "hasNext"), b.block(b.assign(1944, b.array(1944, b.localVariable("args"), b.constant(0)), b.functionCall(1944, b.localVariable("self"), "next")), b.assign(1945, b.array(1945, b.localVariable("args"), b.constant(1)), b.postfixInc(1945, b.localVariable("counter"))), b.functionCall(1946, b.localVariable("closure"), "call", b.localVariable("args")))), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticCollection eachWithIndex(Collection self, Closure closure) { - if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { - return DefaultGroovyMethods.eachWithIndex(self, closure); - } - return CpsDefaultGroovyMethods.$eachWithIndex__java_util_Collection__groovy_lang_Closure(self, closure); - } - - private staticCollection $eachWithIndex__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { - Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1962, b.staticCall(1962, CpsDefaultGroovyMethods.class, "$eachWithIndex__java_lang_Iterable__groovy_lang_Closure", b.cast(1962, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Collection.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticList eachWithIndex(List self, Closure closure) { - if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { - return DefaultGroovyMethods.eachWithIndex(self, closure); - } - return CpsDefaultGroovyMethods.$eachWithIndex__java_util_List__groovy_lang_Closure(self, closure); - } - - private staticList $eachWithIndex__java_util_List__groovy_lang_Closure(List self, Closure closure) { - Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1976, b.staticCall(1976, CpsDefaultGroovyMethods.class, "$eachWithIndex__java_lang_Iterable__groovy_lang_Closure", b.cast(1976, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticSet eachWithIndex(Set self, Closure closure) { - if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { - return DefaultGroovyMethods.eachWithIndex(self, closure); - } - return CpsDefaultGroovyMethods.$eachWithIndex__java_util_Set__groovy_lang_Closure(self, closure); - } - - private staticSet $eachWithIndex__java_util_Set__groovy_lang_Closure(Set self, Closure closure) { - Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(1990, b.staticCall(1990, CpsDefaultGroovyMethods.class, "$eachWithIndex__java_lang_Iterable__groovy_lang_Closure", b.cast(1990, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Set.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticSortedSet eachWithIndex(SortedSet self, Closure closure) { - if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { - return DefaultGroovyMethods.eachWithIndex(self, closure); - } - return CpsDefaultGroovyMethods.$eachWithIndex__java_util_SortedSet__groovy_lang_Closure(self, closure); - } - - private staticSortedSet $eachWithIndex__java_util_SortedSet__groovy_lang_Closure(SortedSet self, Closure closure) { - Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2004, b.staticCall(2004, CpsDefaultGroovyMethods.class, "$eachWithIndex__java_lang_Iterable__groovy_lang_Closure", b.cast(2004, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), SortedSet.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticIterable each(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { - return DefaultGroovyMethods.each(self, closure); - } - return CpsDefaultGroovyMethods.$each__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticIterable $each__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2015, CpsDefaultGroovyMethods.class, "$each__java_util_Iterator__groovy_lang_Closure", b.functionCall(2015, b.localVariable("self"), "iterator"), b.localVariable("closure")), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticIterator each(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { - return DefaultGroovyMethods.each(self, closure); - } - return CpsDefaultGroovyMethods.$each__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private staticIterator $each__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.while_(null, b.functionCall(2028, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(2029, Object.class, "arg", b.functionCall(2029, b.localVariable("self"), "next")), b.functionCall(2030, b.localVariable("closure"), "call", b.localVariable("arg")))), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticCollection each(Collection self, Closure closure) { - if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { - return DefaultGroovyMethods.each(self, closure); - } - return CpsDefaultGroovyMethods.$each__java_util_Collection__groovy_lang_Closure(self, closure); - } - - private staticCollection $each__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { - Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2044, b.staticCall(2044, CpsDefaultGroovyMethods.class, "$each__java_lang_Iterable__groovy_lang_Closure", b.cast(2044, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Collection.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticList each(List self, Closure closure) { - if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { - return DefaultGroovyMethods.each(self, closure); - } - return CpsDefaultGroovyMethods.$each__java_util_List__groovy_lang_Closure(self, closure); - } - - private staticList $each__java_util_List__groovy_lang_Closure(List self, Closure closure) { - Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2056, b.staticCall(2056, CpsDefaultGroovyMethods.class, "$each__java_lang_Iterable__groovy_lang_Closure", b.cast(2056, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticSet each(Set self, Closure closure) { - if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { - return DefaultGroovyMethods.each(self, closure); - } - return CpsDefaultGroovyMethods.$each__java_util_Set__groovy_lang_Closure(self, closure); - } - - private staticSet $each__java_util_Set__groovy_lang_Closure(Set self, Closure closure) { - Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2068, b.staticCall(2068, CpsDefaultGroovyMethods.class, "$each__java_lang_Iterable__groovy_lang_Closure", b.cast(2068, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), Set.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticSortedSet each(SortedSet self, Closure closure) { - if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { - return DefaultGroovyMethods.each(self, closure); - } - return CpsDefaultGroovyMethods.$each__java_util_SortedSet__groovy_lang_Closure(self, closure); - } - - private staticSortedSet $each__java_util_SortedSet__groovy_lang_Closure(SortedSet self, Closure closure) { - Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(2080, b.staticCall(2080, CpsDefaultGroovyMethods.class, "$each__java_lang_Iterable__groovy_lang_Closure", b.cast(2080, b.localVariable("self"), Iterable.class, false), b.localVariable("closure")), SortedSet.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap each(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "each", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "each", self, closure))) { - return DefaultGroovyMethods.each(self, closure); - } - return CpsDefaultGroovyMethods.$each__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticMap $each__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("each")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forInLoop(2106, null, java.util.Map.Entry.class, "entry", b.functionCall(2106, b.localVariable("self"), "entrySet"), b.block(b.staticCall(2107, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("closure"), b.localVariable("entry")))), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap reverseEach(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "reverseEach", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "reverseEach", self, closure))) { - return DefaultGroovyMethods.reverseEach(self, closure); - } - return CpsDefaultGroovyMethods.$reverseEach__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticMap $reverseEach__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("reverseEach")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2127, Iterator.class, "entries", b.staticCall(2127, CpsDefaultGroovyMethods.class, "$reverse__java_util_Iterator", b.functionCall(2127, b.functionCall(2127, b.localVariable("self"), "entrySet"), "iterator"))), b.while_(null, b.functionCall(2128, b.localVariable("entries"), "hasNext"), b.block(b.staticCall(2129, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("closure"), b.functionCall(2129, b.localVariable("entries"), "next")))), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap eachWithIndex(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "eachWithIndex", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachWithIndex", self, closure))) { - return DefaultGroovyMethods.eachWithIndex(self, closure); - } - return CpsDefaultGroovyMethods.$eachWithIndex__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticMap $eachWithIndex__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("eachWithIndex")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2153, int.class, "counter", b.constant(0)), b.forInLoop(2154, null, java.util.Map.Entry.class, "entry", b.functionCall(2154, b.localVariable("self"), "entrySet"), b.block(b.staticCall(2155, CpsDefaultGroovyMethods.class, "$callClosureForMapEntryAndCounter__groovy_lang_Closure__java_util_Map_Entry__int", b.localVariable("closure"), b.localVariable("entry"), b.postfixInc(2155, b.localVariable("counter"))))), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticList reverseEach(List self, Closure closure) { - if ((!Caller.isAsynchronous(self, "reverseEach", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "reverseEach", self, closure))) { - return DefaultGroovyMethods.reverseEach(self, closure); - } - return CpsDefaultGroovyMethods.$reverseEach__java_util_List__groovy_lang_Closure(self, closure); - } - - private staticList $reverseEach__java_util_List__groovy_lang_Closure(List self, Closure closure) { - Builder b = new Builder(loc("reverseEach")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2172, CpsDefaultGroovyMethods.class, "$each__java_util_Iterator__groovy_lang_Closure", b.new_(2172, ReverseListIterator.class, b.localVariable("self")), b.localVariable("closure")), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT[] reverseEach(T[] self, Closure closure) { - if ((!Caller.isAsynchronous(self, "reverseEach", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "reverseEach", self, closure))) { - return DefaultGroovyMethods.reverseEach(self, closure); - } - return CpsDefaultGroovyMethods.$reverseEach__java_lang_Object_array__groovy_lang_Closure(self, closure); - } - - private staticT[] $reverseEach__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { - Builder b = new Builder(loc("reverseEach")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(2185, CpsDefaultGroovyMethods.class, "$each__java_util_Iterator__groovy_lang_Closure", b.new_(2185, ReverseListIterator.class, b.functionCall(2185, b.constant(Arrays.class), "asList", b.localVariable("self"))), b.localVariable("closure")), b.return_(b.localVariable("self")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static boolean every(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { - return DefaultGroovyMethods.every(self, closure); - } - return CpsDefaultGroovyMethods.$every__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private static boolean $every__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("every")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2203, BooleanClosureWrapper.class, "bcw", b.new_(2203, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2204, Iterator.class, "iter", b.functionCall(2204, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(2204, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.not(2205, b.functionCall(2205, b.localVariable("bcw"), "call", b.functionCall(2205, b.localVariable("iter"), "next"))), b.block(b.return_(b.constant(false)))))), b.return_(b.constant(true)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticboolean every(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { - return DefaultGroovyMethods.every(self, closure); - } - return CpsDefaultGroovyMethods.$every__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private staticboolean $every__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("every")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2226, BooleanClosureWrapper.class, "bcw", b.new_(2226, BooleanClosureWrapper.class, b.localVariable("closure"))), b.while_(null, b.functionCall(2227, b.localVariable("self"), "hasNext"), b.block(b.if_(b.not(2228, b.functionCall(2228, b.localVariable("bcw"), "call", b.functionCall(2228, b.localVariable("self"), "next"))), b.block(b.return_(b.constant(false)))))), b.return_(b.constant(true)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticboolean every(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { - return DefaultGroovyMethods.every(self, closure); - } - return CpsDefaultGroovyMethods.$every__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticboolean $every__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("every")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2249, CpsDefaultGroovyMethods.class, "$every__java_util_Iterator__groovy_lang_Closure", b.functionCall(2249, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticboolean every(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "every", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "every", self, closure))) { - return DefaultGroovyMethods.every(self, closure); - } - return CpsDefaultGroovyMethods.$every__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticboolean $every__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("every")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2268, BooleanClosureWrapper.class, "bcw", b.new_(2268, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(2269, null, java.util.Map.Entry.class, "entry", b.functionCall(2269, b.localVariable("self"), "entrySet"), b.block(b.if_(b.not(2270, b.functionCall(2270, b.localVariable("bcw"), "callForMap", b.localVariable("entry"))), b.block(b.return_(b.constant(false)))))), b.return_(b.constant(true)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static boolean any(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { - return DefaultGroovyMethods.any(self, closure); - } - return CpsDefaultGroovyMethods.$any__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private static boolean $any__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("any")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2307, BooleanClosureWrapper.class, "bcw", b.new_(2307, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2308, Iterator.class, "iter", b.functionCall(2308, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(2308, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.functionCall(2309, b.localVariable("bcw"), "call", b.functionCall(2309, b.localVariable("iter"), "next")), b.return_(b.constant(true))))), b.return_(b.constant(false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticboolean any(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { - return DefaultGroovyMethods.any(self, closure); - } - return CpsDefaultGroovyMethods.$any__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private staticboolean $any__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("any")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2324, BooleanClosureWrapper.class, "bcw", b.new_(2324, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2325, Iterator.class, "iter", b.localVariable("self"))), b.functionCall(2325, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.functionCall(2326, b.localVariable("bcw"), "call", b.functionCall(2326, b.localVariable("iter"), "next")), b.return_(b.constant(true))))), b.return_(b.constant(false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticboolean any(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { - return DefaultGroovyMethods.any(self, closure); - } - return CpsDefaultGroovyMethods.$any__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticboolean $any__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("any")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2341, BooleanClosureWrapper.class, "bcw", b.new_(2341, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(2342, Iterator.class, "iter", b.functionCall(2342, b.localVariable("self"), "iterator"))), b.functionCall(2342, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.if_(b.functionCall(2343, b.localVariable("bcw"), "call", b.functionCall(2343, b.localVariable("iter"), "next")), b.return_(b.constant(true))))), b.return_(b.constant(false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticboolean any(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "any", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "any", self, closure))) { - return DefaultGroovyMethods.any(self, closure); - } - return CpsDefaultGroovyMethods.$any__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticboolean $any__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("any")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2365, BooleanClosureWrapper.class, "bcw", b.new_(2365, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(2366, null, java.util.Map.Entry.class, "entry", b.functionCall(2366, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(2367, b.localVariable("bcw"), "callForMap", b.localVariable("entry")), b.block(b.return_(b.constant(true)))))), b.return_(b.constant(false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticNumber count(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { - return DefaultGroovyMethods.count(self, closure); - } - return CpsDefaultGroovyMethods.$count__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private staticNumber $count__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("count")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2664, long.class, "answer", b.constant(0)), b.declareVariable(2665, BooleanClosureWrapper.class, "bcw", b.new_(2665, BooleanClosureWrapper.class, b.localVariable("closure"))), b.while_(null, b.functionCall(2666, b.localVariable("self"), "hasNext"), b.block(b.if_(b.functionCall(2667, b.localVariable("bcw"), "call", b.functionCall(2667, b.localVariable("self"), "next")), b.block(b.prefixInc(2668, b.localVariable("answer")))))), b.if_(b.lessThanEqual(2672, b.localVariable("answer"), b.property(2672, b.constant(Integer.class), "MAX_VALUE")), b.return_(b.cast(2672, b.localVariable("answer"), int.class, false))), b.return_(b.localVariable("answer")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticNumber count(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { - return DefaultGroovyMethods.count(self, closure); - } - return CpsDefaultGroovyMethods.$count__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticNumber $count__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("count")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2723, CpsDefaultGroovyMethods.class, "$count__java_util_Iterator__groovy_lang_Closure", b.functionCall(2723, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticNumber count(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { - return DefaultGroovyMethods.count(self, closure); - } - return CpsDefaultGroovyMethods.$count__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticNumber $count__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("count")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(2740, long.class, "answer", b.constant(0)), b.declareVariable(2741, BooleanClosureWrapper.class, "bcw", b.new_(2741, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(2742, null, Object.class, "entry", b.functionCall(2742, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(2743, b.localVariable("bcw"), "callForMap", b.cast(2743, b.localVariable("entry"), java.util.Map.Entry.class, false)), b.block(b.prefixInc(2744, b.localVariable("answer")))))), b.if_(b.lessThanEqual(2748, b.localVariable("answer"), b.property(2748, b.constant(Integer.class), "MAX_VALUE")), b.return_(b.cast(2748, b.localVariable("answer"), int.class, false))), b.return_(b.localVariable("answer")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticNumber count(T[] self, Closure closure) { - if ((!Caller.isAsynchronous(self, "count", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "count", self, closure))) { - return DefaultGroovyMethods.count(self, closure); - } - return CpsDefaultGroovyMethods.$count__java_lang_Object_array__groovy_lang_Closure(self, closure); - } - - private staticNumber $count__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { - Builder b = new Builder(loc("count")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(2775, CpsDefaultGroovyMethods.class, "$count__java_lang_Iterable__groovy_lang_Closure", b.cast(2775, b.functionCall(2775, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticList collect(Object self, Closure transform) { - if ((!Caller.isAsynchronous(self, "collect", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, transform))) { - return DefaultGroovyMethods.collect(self, transform); - } - return CpsDefaultGroovyMethods.$collect__java_lang_Object__groovy_lang_Closure(self, transform); - } - - private staticList $collect__java_lang_Object__groovy_lang_Closure(Object self, Closure transform) { - Builder b = new Builder(loc("collect")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3095, b.staticCall(3095, CpsDefaultGroovyMethods.class, "$collect__java_lang_Object__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3095, ArrayList.class), b.localVariable("transform")), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, transform); - } - - public staticCollection collect(Object self, Collection collector, Closure transform) { - if ((!Caller.isAsynchronous(self, "collect", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, collector, transform))) { - return DefaultGroovyMethods.collect(self, collector, transform); - } - return CpsDefaultGroovyMethods.$collect__java_lang_Object__java_util_Collection__groovy_lang_Closure(self, collector, transform); - } - - private staticCollection $collect__java_lang_Object__java_util_Collection__groovy_lang_Closure(Object self, Collection collector, Closure transform) { - Builder b = new Builder(loc("collect")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forLoop(null, b.sequence(b.declareVariable(3123, Iterator.class, "iter", b.functionCall(3123, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(3123, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.functionCall(3124, b.localVariable("collector"), "add", b.functionCall(3124, b.localVariable("transform"), "call", b.functionCall(3124, b.localVariable("iter"), "next"))))), b.return_(b.localVariable("collector")))); - throw new CpsCallableInvocation(f, null, self, collector, transform); - } - - public staticList collect(Collection self, Closure transform) { - if ((!Caller.isAsynchronous(self, "collect", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, transform))) { - return DefaultGroovyMethods.collect(self, transform); - } - return CpsDefaultGroovyMethods.$collect__java_util_Collection__groovy_lang_Closure(self, transform); - } - - private staticList $collect__java_util_Collection__groovy_lang_Closure(Collection self, Closure transform) { - Builder b = new Builder(loc("collect")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3140, b.staticCall(3140, CpsDefaultGroovyMethods.class, "$collect__java_util_Collection__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3140, ArrayList.class, b.functionCall(3140, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, transform); - } - - public staticCollection collect(Collection self, Collection collector, Closure transform) { - if ((!Caller.isAsynchronous(self, "collect", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, collector, transform))) { - return DefaultGroovyMethods.collect(self, collector, transform); - } - return CpsDefaultGroovyMethods.$collect__java_util_Collection__java_util_Collection__groovy_lang_Closure(self, collector, transform); - } - - private staticCollection $collect__java_util_Collection__java_util_Collection__groovy_lang_Closure(Collection self, Collection collector, Closure transform) { - Builder b = new Builder(loc("collect")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3169, null, Object.class, "item", b.localVariable("self"), b.block(b.functionCall(3170, b.localVariable("collector"), "add", b.functionCall(3170, b.localVariable("transform"), "call", b.localVariable("item"))), b.if_(b.compareEqual(3171, b.functionCall(3171, b.localVariable("transform"), "getDirective"), b.property(3171, b.constant(Closure.class), "DONE")), b.block(b.break_(null))))), b.return_(b.localVariable("collector")))); - throw new CpsCallableInvocation(f, null, self, collector, transform); - } - - public static List collectNested(Collection self, Closure transform) { - if ((!Caller.isAsynchronous(self, "collectNested", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectNested", self, transform))) { - return DefaultGroovyMethods.collectNested(self, transform); - } - return CpsDefaultGroovyMethods.$collectNested__java_util_Collection__groovy_lang_Closure(self, transform); - } - - private static List $collectNested__java_util_Collection__groovy_lang_Closure(Collection self, Closure transform) { - Builder b = new Builder(loc("collectNested")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3203, b.staticCall(3203, CpsDefaultGroovyMethods.class, "$collectNested__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.cast(3203, b.localVariable("self"), Iterable.class, false), b.new_(3203, ArrayList.class, b.functionCall(3203, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, transform); - } - - public static List collectNested(Iterable self, Closure transform) { - if ((!Caller.isAsynchronous(self, "collectNested", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectNested", self, transform))) { - return DefaultGroovyMethods.collectNested(self, transform); - } - return CpsDefaultGroovyMethods.$collectNested__java_lang_Iterable__groovy_lang_Closure(self, transform); - } - - private static List $collectNested__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure transform) { - Builder b = new Builder(loc("collectNested")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3220, b.staticCall(3220, CpsDefaultGroovyMethods.class, "$collectNested__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3220, ArrayList.class), b.localVariable("transform")), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, transform); - } - - public static Collection collectNested(Iterable self, Collection collector, Closure transform) { - if ((!Caller.isAsynchronous(self, "collectNested", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectNested", self, collector, transform))) { - return DefaultGroovyMethods.collectNested(self, collector, transform); - } - return CpsDefaultGroovyMethods.$collectNested__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(self, collector, transform); - } - - private static Collection $collectNested__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(Iterable self, Collection collector, Closure transform) { - Builder b = new Builder(loc("collectNested")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3261, null, Object.class, "item", b.localVariable("self"), b.block(b.if_(b.instanceOf(3262, b.localVariable("item"), b.constant(Collection.class)), b.block(b.declareVariable(3263, Collection.class, "c", b.cast(3263, b.localVariable("item"), Collection.class, false)), b.functionCall(3264, b.localVariable("collector"), "add", b.staticCall(3264, CpsDefaultGroovyMethods.class, "$collectNested__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.cast(3264, b.localVariable("c"), Iterable.class, false), b.functionCall(3264, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("collector"), b.functionCall(3264, b.localVariable("c"), "size")), b.localVariable("transform")))), b.block(b.functionCall(3266, b.localVariable("collector"), "add", b.functionCall(3266, b.localVariable("transform"), "call", b.localVariable("item"))))), b.if_(b.compareEqual(3268, b.functionCall(3268, b.localVariable("transform"), "getDirective"), b.property(3268, b.constant(Closure.class), "DONE")), b.block(b.break_(null))))), b.return_(b.localVariable("collector")))); - throw new CpsCallableInvocation(f, null, self, collector, transform); - } - - public staticList collectMany(Iterable self, Closure> projection) { - if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { - return DefaultGroovyMethods.collectMany(self, projection); - } - return CpsDefaultGroovyMethods.$collectMany__java_lang_Iterable__groovy_lang_Closure(self, projection); - } - - private staticList $collectMany__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure> projection) { - Builder b = new Builder(loc("collectMany")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.cast(3320, b.staticCall(3320, CpsDefaultGroovyMethods.class, "$collectMany__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3320, ArrayList.class), b.localVariable("projection")), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, projection); - } - - public staticCollection collectMany(Iterable self, Collection collector, Closure> projection) { - if ((!Caller.isAsynchronous(self, "collectMany", collector, projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, collector, projection))) { - return DefaultGroovyMethods.collectMany(self, collector, projection); - } - return CpsDefaultGroovyMethods.$collectMany__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(self, collector, projection); - } - - private staticCollection $collectMany__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(Iterable self, Collection collector, Closure> projection) { - Builder b = new Builder(loc("collectMany")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "projection"), b.block(b.forInLoop(3344, null, Object.class, "next", b.localVariable("self"), b.block(b.functionCall(3345, b.localVariable("collector"), "addAll", b.functionCall(3345, b.localVariable("projection"), "call", b.localVariable("next"))))), b.return_(b.localVariable("collector")))); - throw new CpsCallableInvocation(f, null, self, collector, projection); - } - - public staticCollection collectMany(Map self, Collection collector, Closure> projection) { - if ((!Caller.isAsynchronous(self, "collectMany", collector, projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, collector, projection))) { - return DefaultGroovyMethods.collectMany(self, collector, projection); - } - return CpsDefaultGroovyMethods.$collectMany__java_util_Map__java_util_Collection__groovy_lang_Closure(self, collector, projection); - } - - private staticCollection $collectMany__java_util_Map__java_util_Collection__groovy_lang_Closure(Map self, Collection collector, Closure> projection) { - Builder b = new Builder(loc("collectMany")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "projection"), b.block(b.forInLoop(3367, null, java.util.Map.Entry.class, "entry", b.functionCall(3367, b.localVariable("self"), "entrySet"), b.block(b.functionCall(3368, b.localVariable("collector"), "addAll", b.staticCall(3368, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("projection"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); - throw new CpsCallableInvocation(f, null, self, collector, projection); - } - - public staticCollection collectMany(Map self, Closure> projection) { - if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { - return DefaultGroovyMethods.collectMany(self, projection); - } - return CpsDefaultGroovyMethods.$collectMany__java_util_Map__groovy_lang_Closure(self, projection); - } - - private staticCollection $collectMany__java_util_Map__groovy_lang_Closure(Map self, Closure> projection) { - Builder b = new Builder(loc("collectMany")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3389, CpsDefaultGroovyMethods.class, "$collectMany__java_util_Map__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3389, ArrayList.class), b.localVariable("projection"))))); - throw new CpsCallableInvocation(f, null, self, projection); - } - - public staticList collectMany(E[] self, Closure> projection) { - if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { - return DefaultGroovyMethods.collectMany(self, projection); - } - return CpsDefaultGroovyMethods.$collectMany__java_lang_Object_array__groovy_lang_Closure(self, projection); - } - - private staticList $collectMany__java_lang_Object_array__groovy_lang_Closure(E[] self, Closure> projection) { - Builder b = new Builder(loc("collectMany")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3409, CpsDefaultGroovyMethods.class, "$collectMany__java_lang_Iterable__groovy_lang_Closure", b.cast(3409, b.staticCall(3409, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.localVariable("projection"))))); - throw new CpsCallableInvocation(f, null, self, projection); - } - - public staticList collectMany(Iterator self, Closure> projection) { - if ((!Caller.isAsynchronous(self, "collectMany", projection))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectMany", self, projection))) { - return DefaultGroovyMethods.collectMany(self, projection); - } - return CpsDefaultGroovyMethods.$collectMany__java_util_Iterator__groovy_lang_Closure(self, projection); - } - - private staticList $collectMany__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure> projection) { - Builder b = new Builder(loc("collectMany")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "projection"), b.block(b.return_(b.staticCall(3429, CpsDefaultGroovyMethods.class, "$collectMany__java_lang_Iterable__groovy_lang_Closure", b.cast(3429, b.staticCall(3429, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), Iterable.class, false), b.localVariable("projection"))))); - throw new CpsCallableInvocation(f, null, self, projection); - } - - public staticCollection collect(Map self, Collection collector, Closure transform) { - if ((!Caller.isAsynchronous(self, "collect", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, collector, transform))) { - return DefaultGroovyMethods.collect(self, collector, transform); - } - return CpsDefaultGroovyMethods.$collect__java_util_Map__java_util_Collection__groovy_lang_Closure(self, collector, transform); - } - - private staticCollection $collect__java_util_Map__java_util_Collection__groovy_lang_Closure(Map self, Collection collector, Closure transform) { - Builder b = new Builder(loc("collect")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3445, null, java.util.Map.Entry.class, "entry", b.functionCall(3445, b.localVariable("self"), "entrySet"), b.block(b.functionCall(3446, b.localVariable("collector"), "add", b.staticCall(3446, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("transform"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); - throw new CpsCallableInvocation(f, null, self, collector, transform); - } - - public staticList collect(Map self, Closure transform) { - if ((!Caller.isAsynchronous(self, "collect", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collect", self, transform))) { - return DefaultGroovyMethods.collect(self, transform); - } - return CpsDefaultGroovyMethods.$collect__java_util_Map__groovy_lang_Closure(self, transform); - } - - private staticList $collect__java_util_Map__groovy_lang_Closure(Map self, Closure transform) { - Builder b = new Builder(loc("collect")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.cast(3463, b.staticCall(3463, CpsDefaultGroovyMethods.class, "$collect__java_util_Map__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.new_(3463, ArrayList.class, b.functionCall(3463, b.localVariable("self"), "size")), b.localVariable("transform")), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, transform); - } - - public staticMap collectEntries(Map self, Map collector, Closure transform) { - if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { - return DefaultGroovyMethods.collectEntries(self, collector, transform); - } - return CpsDefaultGroovyMethods.$collectEntries__java_util_Map__java_util_Map__groovy_lang_Closure(self, collector, transform); - } - - private staticMap $collectEntries__java_util_Map__java_util_Map__groovy_lang_Closure(Map self, Map collector, Closure transform) { - Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.forInLoop(3488, null, java.util.Map.Entry.class, "entry", b.functionCall(3488, b.localVariable("self"), "entrySet"), b.block(b.staticCall(3489, CpsDefaultGroovyMethods.class, "$addEntry__java_util_Map__java_lang_Object", b.localVariable("collector"), b.staticCall(3489, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("transform"), b.localVariable("entry"))))), b.return_(b.localVariable("collector")))); - throw new CpsCallableInvocation(f, null, self, collector, transform); - } - - public staticMap collectEntries(Map self, Closure transform) { - if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { - return DefaultGroovyMethods.collectEntries(self, transform); - } - return CpsDefaultGroovyMethods.$collectEntries__java_util_Map__groovy_lang_Closure(self, transform); - } - - private staticMap $collectEntries__java_util_Map__groovy_lang_Closure(Map self, Closure transform) { - Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3515, CpsDefaultGroovyMethods.class, "$collectEntries__java_util_Map__java_util_Map__groovy_lang_Closure", b.localVariable("self"), b.functionCall(3515, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarMap", b.localVariable("self")), b.localVariable("transform"))))); - throw new CpsCallableInvocation(f, null, self, transform); - } - - public staticMap collectEntries(Iterator self, Closure transform) { - if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { - return DefaultGroovyMethods.collectEntries(self, transform); - } - return CpsDefaultGroovyMethods.$collectEntries__java_util_Iterator__groovy_lang_Closure(self, transform); - } - - private staticMap $collectEntries__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure transform) { - Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3539, CpsDefaultGroovyMethods.class, "$collectEntries__java_util_Iterator__java_util_Map__groovy_lang_Closure", b.localVariable("self"), b.new_(3539, LinkedHashMap.class), b.localVariable("transform"))))); - throw new CpsCallableInvocation(f, null, self, transform); - } - - public staticMap collectEntries(Iterable self, Closure transform) { - if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { - return DefaultGroovyMethods.collectEntries(self, transform); - } - return CpsDefaultGroovyMethods.$collectEntries__java_lang_Iterable__groovy_lang_Closure(self, transform); - } - - private staticMap $collectEntries__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure transform) { - Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3564, CpsDefaultGroovyMethods.class, "$collectEntries__java_util_Iterator__groovy_lang_Closure", b.functionCall(3564, b.localVariable("self"), "iterator"), b.localVariable("transform"))))); - throw new CpsCallableInvocation(f, null, self, transform); - } - - public staticMap collectEntries(Iterator self, Map collector, Closure transform) { - if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { - return DefaultGroovyMethods.collectEntries(self, collector, transform); - } - return CpsDefaultGroovyMethods.$collectEntries__java_util_Iterator__java_util_Map__groovy_lang_Closure(self, collector, transform); - } - - private staticMap $collectEntries__java_util_Iterator__java_util_Map__groovy_lang_Closure(Iterator self, Map collector, Closure transform) { - Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.while_(null, b.functionCall(3630, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(3631, Object.class, "next", b.functionCall(3631, b.localVariable("self"), "next")), b.staticCall(3632, CpsDefaultGroovyMethods.class, "$addEntry__java_util_Map__java_lang_Object", b.localVariable("collector"), b.functionCall(3632, b.localVariable("transform"), "call", b.localVariable("next"))))), b.return_(b.localVariable("collector")))); - throw new CpsCallableInvocation(f, null, self, collector, transform); - } - - public staticMap collectEntries(Iterable self, Map collector, Closure transform) { - if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { - return DefaultGroovyMethods.collectEntries(self, collector, transform); - } - return CpsDefaultGroovyMethods.$collectEntries__java_lang_Iterable__java_util_Map__groovy_lang_Closure(self, collector, transform); - } - - private staticMap $collectEntries__java_lang_Iterable__java_util_Map__groovy_lang_Closure(Iterable self, Map collector, Closure transform) { - Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.return_(b.staticCall(3661, CpsDefaultGroovyMethods.class, "$collectEntries__java_util_Iterator__java_util_Map__groovy_lang_Closure", b.functionCall(3661, b.localVariable("self"), "iterator"), b.localVariable("collector"), b.localVariable("transform"))))); - throw new CpsCallableInvocation(f, null, self, collector, transform); - } - - public staticMap collectEntries(E[] self, Map collector, Closure transform) { - if ((!Caller.isAsynchronous(self, "collectEntries", collector, transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, collector, transform))) { - return DefaultGroovyMethods.collectEntries(self, collector, transform); - } - return CpsDefaultGroovyMethods.$collectEntries__java_lang_Object_array__java_util_Map__groovy_lang_Closure(self, collector, transform); - } - - private staticMap $collectEntries__java_lang_Object_array__java_util_Map__groovy_lang_Closure(E[] self, Map collector, Closure transform) { - Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "collector", "transform"), b.block(b.return_(b.staticCall(3728, CpsDefaultGroovyMethods.class, "$collectEntries__java_lang_Iterable__java_util_Map__groovy_lang_Closure", b.cast(3728, b.staticCall(3728, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.localVariable("collector"), b.localVariable("transform"))))); - throw new CpsCallableInvocation(f, null, self, collector, transform); - } - - public staticMap collectEntries(E[] self, Closure transform) { - if ((!Caller.isAsynchronous(self, "collectEntries", transform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "collectEntries", self, transform))) { - return DefaultGroovyMethods.collectEntries(self, transform); - } - return CpsDefaultGroovyMethods.$collectEntries__java_lang_Object_array__groovy_lang_Closure(self, transform); - } - - private staticMap $collectEntries__java_lang_Object_array__groovy_lang_Closure(E[] self, Closure transform) { - Builder b = new Builder(loc("collectEntries")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "transform"), b.block(b.return_(b.staticCall(3767, CpsDefaultGroovyMethods.class, "$collectEntries__java_lang_Iterable__java_util_Map__groovy_lang_Closure", b.cast(3767, b.staticCall(3767, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.new_(3767, LinkedHashMap.class), b.localVariable("transform"))))); - throw new CpsCallableInvocation(f, null, self, transform); - } - - public static Object find(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "find", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, closure))) { - return DefaultGroovyMethods.find(self, closure); - } - return CpsDefaultGroovyMethods.$find__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private static Object $find__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("find")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(3808, BooleanClosureWrapper.class, "bcw", b.new_(3808, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(3809, Iterator.class, "iter", b.functionCall(3809, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(3809, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.declareVariable(3810, Object.class, "value", b.functionCall(3810, b.localVariable("iter"), "next")), b.if_(b.functionCall(3811, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.return_(b.localVariable("value")))))), b.return_(b.constant(null)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static Object findResult(Object self, Object defaultResult, Closure closure) { - if ((!Caller.isAsynchronous(self, "findResult", defaultResult, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, defaultResult, closure))) { - return DefaultGroovyMethods.findResult(self, defaultResult, closure); - } - return CpsDefaultGroovyMethods.$findResult__java_lang_Object__java_lang_Object__groovy_lang_Closure(self, defaultResult, closure); - } - - private static Object $findResult__java_lang_Object__java_lang_Object__groovy_lang_Closure(Object self, Object defaultResult, Closure closure) { - Builder b = new Builder(loc("findResult")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(3846, Object.class, "result", b.staticCall(3846, CpsDefaultGroovyMethods.class, "$findResult__java_lang_Object__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(3847, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, defaultResult, closure); - } - - public static Object findResult(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "findResult", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, closure))) { - return DefaultGroovyMethods.findResult(self, closure); - } - return CpsDefaultGroovyMethods.$findResult__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private static Object $findResult__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("findResult")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forLoop(null, b.sequence(b.declareVariable(3860, Iterator.class, "iter", b.functionCall(3860, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(3860, b.localVariable("iter"), "hasNext"), b.sequence(), b.block(b.declareVariable(3861, Object.class, "value", b.functionCall(3861, b.localVariable("iter"), "next")), b.declareVariable(3862, Object.class, "result", b.functionCall(3862, b.localVariable("closure"), "call", b.localVariable("value"))), b.if_(b.compareNotEqual(3863, b.localVariable("result"), b.constant(null)), b.block(b.return_(b.localVariable("result")))))), b.return_(b.constant(null)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT find(Collection self, Closure closure) { - if ((!Caller.isAsynchronous(self, "find", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, closure))) { - return DefaultGroovyMethods.find(self, closure); - } - return CpsDefaultGroovyMethods.$find__java_util_Collection__groovy_lang_Closure(self, closure); - } - - private staticT $find__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { - Builder b = new Builder(loc("find")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(3882, BooleanClosureWrapper.class, "bcw", b.new_(3882, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(3883, null, Object.class, "value", b.localVariable("self"), b.block(b.if_(b.functionCall(3884, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.return_(b.localVariable("value")))))), b.return_(b.constant(null)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT find(T[] self, Closure condition) { - if ((!Caller.isAsynchronous(self, "find", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, condition))) { - return DefaultGroovyMethods.find(self, condition); - } - return CpsDefaultGroovyMethods.$find__java_lang_Object_array__groovy_lang_Closure(self, condition); - } - - private staticT $find__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure condition) { - Builder b = new Builder(loc("find")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(3906, BooleanClosureWrapper.class, "bcw", b.new_(3906, BooleanClosureWrapper.class, b.localVariable("condition"))), b.forInLoop(3907, null, Object.class, "element", b.localVariable("self"), b.block(b.if_(b.functionCall(3908, b.localVariable("bcw"), "call", b.localVariable("element")), b.block(b.return_(b.localVariable("element")))))), b.return_(b.constant(null)))); - throw new CpsCallableInvocation(f, null, self, condition); - } - - public staticT findResult(Collection self, U defaultResult, Closure closure) { - if ((!Caller.isAsynchronous(self, "findResult", defaultResult, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, defaultResult, closure))) { - return DefaultGroovyMethods.findResult(self, defaultResult, closure); - } - return CpsDefaultGroovyMethods.$findResult__java_util_Collection__java_lang_Object__groovy_lang_Closure(self, defaultResult, closure); - } - - private staticT $findResult__java_util_Collection__java_lang_Object__groovy_lang_Closure(Collection self, U defaultResult, Closure closure) { - Builder b = new Builder(loc("findResult")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(3951, Object.class, "result", b.staticCall(3951, CpsDefaultGroovyMethods.class, "$findResult__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(3952, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, defaultResult, closure); - } - - public staticT findResult(Collection self, Closure closure) { - if ((!Caller.isAsynchronous(self, "findResult", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, closure))) { - return DefaultGroovyMethods.findResult(self, closure); - } - return CpsDefaultGroovyMethods.$findResult__java_util_Collection__groovy_lang_Closure(self, closure); - } - - private staticT $findResult__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { - Builder b = new Builder(loc("findResult")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forInLoop(3972, null, Object.class, "value", b.localVariable("self"), b.block(b.declareVariable(3973, Object.class, "result", b.functionCall(3973, b.localVariable("closure"), "call", b.localVariable("value"))), b.if_(b.compareNotEqual(3974, b.localVariable("result"), b.constant(null)), b.block(b.return_(b.localVariable("result")))))), b.return_(b.constant(null)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticCollection findResults(Iterable self, Closure filteringTransform) { - if ((!Caller.isAsynchronous(self, "findResults", filteringTransform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResults", self, filteringTransform))) { - return DefaultGroovyMethods.findResults(self, filteringTransform); - } - return CpsDefaultGroovyMethods.$findResults__java_lang_Iterable__groovy_lang_Closure(self, filteringTransform); - } - - private staticCollection $findResults__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure filteringTransform) { - Builder b = new Builder(loc("findResults")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "filteringTransform"), b.block(b.declareVariable(4008, List.class, "result", b.new_(4008, ArrayList.class)), b.forInLoop(4009, null, Object.class, "value", b.localVariable("self"), b.block(b.declareVariable(4010, Object.class, "transformed", b.functionCall(4010, b.localVariable("filteringTransform"), "call", b.localVariable("value"))), b.if_(b.compareNotEqual(4011, b.localVariable("transformed"), b.constant(null)), b.block(b.functionCall(4012, b.localVariable("result"), "add", b.localVariable("transformed")))))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, filteringTransform); - } - - public staticCollection findResults(Map self, Closure filteringTransform) { - if ((!Caller.isAsynchronous(self, "findResults", filteringTransform))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResults", self, filteringTransform))) { - return DefaultGroovyMethods.findResults(self, filteringTransform); - } - return CpsDefaultGroovyMethods.$findResults__java_util_Map__groovy_lang_Closure(self, filteringTransform); - } - - private staticCollection $findResults__java_util_Map__groovy_lang_Closure(Map self, Closure filteringTransform) { - Builder b = new Builder(loc("findResults")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "filteringTransform"), b.block(b.declareVariable(4037, List.class, "result", b.new_(4037, ArrayList.class)), b.forInLoop(4038, null, java.util.Map.Entry.class, "entry", b.functionCall(4038, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(4039, Object.class, "transformed", b.staticCall(4039, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("filteringTransform"), b.localVariable("entry"))), b.if_(b.compareNotEqual(4040, b.localVariable("transformed"), b.constant(null)), b.block(b.functionCall(4041, b.localVariable("result"), "add", b.localVariable("transformed")))))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, filteringTransform); - } - - public staticjava.util.Map.Entry find(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "find", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "find", self, closure))) { - return DefaultGroovyMethods.find(self, closure); - } - return CpsDefaultGroovyMethods.$find__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticjava.util.Map.Entry $find__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("find")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4059, BooleanClosureWrapper.class, "bcw", b.new_(4059, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(4060, null, java.util.Map.Entry.class, "entry", b.functionCall(4060, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(4061, b.localVariable("bcw"), "callForMap", b.localVariable("entry")), b.block(b.return_(b.localVariable("entry")))))), b.return_(b.constant(null)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT findResult(Map self, U defaultResult, Closure closure) { - if ((!Caller.isAsynchronous(self, "findResult", defaultResult, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, defaultResult, closure))) { - return DefaultGroovyMethods.findResult(self, defaultResult, closure); - } - return CpsDefaultGroovyMethods.$findResult__java_util_Map__java_lang_Object__groovy_lang_Closure(self, defaultResult, closure); - } - - private staticT $findResult__java_util_Map__java_lang_Object__groovy_lang_Closure(Map self, U defaultResult, Closure closure) { - Builder b = new Builder(loc("findResult")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "defaultResult", "closure"), b.block(b.declareVariable(4085, Object.class, "result", b.staticCall(4085, CpsDefaultGroovyMethods.class, "$findResult__java_util_Map__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure"))), b.if_(b.compareEqual(4086, b.localVariable("result"), b.constant(null)), b.return_(b.localVariable("defaultResult"))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, defaultResult, closure); - } - - public staticT findResult(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "findResult", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findResult", self, closure))) { - return DefaultGroovyMethods.findResult(self, closure); - } - return CpsDefaultGroovyMethods.$findResult__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticT $findResult__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("findResult")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forInLoop(4106, null, java.util.Map.Entry.class, "entry", b.functionCall(4106, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(4107, Object.class, "result", b.staticCall(4107, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("closure"), b.localVariable("entry"))), b.if_(b.compareNotEqual(4108, b.localVariable("result"), b.constant(null)), b.block(b.return_(b.localVariable("result")))))), b.return_(b.constant(null)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticSet findAll(Set self, Closure closure) { - if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { - return DefaultGroovyMethods.findAll(self, closure); - } - return CpsDefaultGroovyMethods.$findAll__java_util_Set__groovy_lang_Closure(self, closure); - } - - private staticSet $findAll__java_util_Set__groovy_lang_Closure(Set self, Closure closure) { - Builder b = new Builder(loc("findAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4125, b.staticCall(4125, CpsDefaultGroovyMethods.class, "$findAll__java_util_Collection__groovy_lang_Closure", b.cast(4125, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), Set.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticList findAll(List self, Closure closure) { - if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { - return DefaultGroovyMethods.findAll(self, closure); - } - return CpsDefaultGroovyMethods.$findAll__java_util_List__groovy_lang_Closure(self, closure); - } - - private staticList $findAll__java_util_List__groovy_lang_Closure(List self, Closure closure) { - Builder b = new Builder(loc("findAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4138, b.staticCall(4138, CpsDefaultGroovyMethods.class, "$findAll__java_util_Collection__groovy_lang_Closure", b.cast(4138, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticCollection findAll(Collection self, Closure closure) { - if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { - return DefaultGroovyMethods.findAll(self, closure); - } - return CpsDefaultGroovyMethods.$findAll__java_util_Collection__groovy_lang_Closure(self, closure); - } - - private staticCollection $findAll__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { - Builder b = new Builder(loc("findAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4151, Collection.class, "answer", b.functionCall(4151, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4152, Iterator.class, "iter", b.functionCall(4152, b.localVariable("self"), "iterator")), b.return_(b.staticCall(4153, CpsDefaultGroovyMethods.class, "$findAll__groovy_lang_Closure__java_util_Collection__java_util_Iterator", b.localVariable("closure"), b.localVariable("answer"), b.localVariable("iter"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticCollection findAll(T[] self, Closure condition) { - if ((!Caller.isAsynchronous(self, "findAll", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, condition))) { - return DefaultGroovyMethods.findAll(self, condition); - } - return CpsDefaultGroovyMethods.$findAll__java_lang_Object_array__groovy_lang_Closure(self, condition); - } - - private staticCollection $findAll__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure condition) { - Builder b = new Builder(loc("findAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(4169, Collection.class, "answer", b.new_(4169, ArrayList.class)), b.return_(b.staticCall(4170, CpsDefaultGroovyMethods.class, "$findAll__groovy_lang_Closure__java_util_Collection__java_util_Iterator", b.localVariable("condition"), b.localVariable("answer"), b.new_(4170, ArrayIterator.class, b.localVariable("self")))))); - throw new CpsCallableInvocation(f, null, self, condition); - } - - public static Collection findAll(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { - return DefaultGroovyMethods.findAll(self, closure); - } - return CpsDefaultGroovyMethods.$findAll__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private static Collection $findAll__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("findAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4254, List.class, "answer", b.new_(4254, ArrayList.class)), b.declareVariable(4255, Iterator.class, "iter", b.functionCall(4255, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.return_(b.staticCall(4256, CpsDefaultGroovyMethods.class, "$findAll__groovy_lang_Closure__java_util_Collection__java_util_Iterator", b.localVariable("closure"), b.localVariable("answer"), b.localVariable("iter"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticboolean retainAll(Collection self, Closure condition) { - if ((!Caller.isAsynchronous(self, "retainAll", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "retainAll", self, condition))) { - return DefaultGroovyMethods.retainAll(self, condition); - } - return CpsDefaultGroovyMethods.$retainAll__java_util_Collection__groovy_lang_Closure(self, condition); - } - - private staticboolean $retainAll__java_util_Collection__groovy_lang_Closure(Collection self, Closure condition) { - Builder b = new Builder(loc("retainAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(4385, Iterator.class, "iter", b.functionCall(4385, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.declareVariable(4386, BooleanClosureWrapper.class, "bcw", b.new_(4386, BooleanClosureWrapper.class, b.localVariable("condition"))), b.declareVariable(4387, int.class, "result", b.constant(false)), b.while_(null, b.functionCall(4388, b.localVariable("iter"), "hasNext"), b.block(b.declareVariable(4389, Object.class, "value", b.functionCall(4389, b.localVariable("iter"), "next")), b.if_(b.not(4390, b.functionCall(4390, b.localVariable("bcw"), "call", b.localVariable("value"))), b.block(b.functionCall(4391, b.localVariable("iter"), "remove"), b.assign(4392, b.localVariable("result"), b.constant(true)))))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, condition); - } - - public staticboolean removeAll(Collection self, Closure condition) { - if ((!Caller.isAsynchronous(self, "removeAll", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "removeAll", self, condition))) { - return DefaultGroovyMethods.removeAll(self, condition); - } - return CpsDefaultGroovyMethods.$removeAll__java_util_Collection__groovy_lang_Closure(self, condition); - } - - private staticboolean $removeAll__java_util_Collection__groovy_lang_Closure(Collection self, Closure condition) { - Builder b = new Builder(loc("removeAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(4412, Iterator.class, "iter", b.functionCall(4412, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.declareVariable(4413, BooleanClosureWrapper.class, "bcw", b.new_(4413, BooleanClosureWrapper.class, b.localVariable("condition"))), b.declareVariable(4414, int.class, "result", b.constant(false)), b.while_(null, b.functionCall(4415, b.localVariable("iter"), "hasNext"), b.block(b.declareVariable(4416, Object.class, "value", b.functionCall(4416, b.localVariable("iter"), "next")), b.if_(b.functionCall(4417, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.functionCall(4418, b.localVariable("iter"), "remove"), b.assign(4419, b.localVariable("result"), b.constant(true)))))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, condition); - } - - public static Collection split(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { - return DefaultGroovyMethods.split(self, closure); - } - return CpsDefaultGroovyMethods.$split__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private static Collection $split__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("split")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4478, List.class, "accept", b.new_(4478, ArrayList.class)), b.declareVariable(4479, List.class, "reject", b.new_(4479, ArrayList.class)), b.return_(b.staticCall(4480, CpsDefaultGroovyMethods.class, "$split__groovy_lang_Closure__java_util_Collection__java_util_Collection__java_util_Iterator", b.localVariable("closure"), b.localVariable("accept"), b.localVariable("reject"), b.functionCall(4480, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticCollection> split(Collection self, Closure closure) { - if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { - return DefaultGroovyMethods.split(self, closure); - } - return CpsDefaultGroovyMethods.$split__java_util_Collection__groovy_lang_Closure(self, closure); - } - - private staticCollection> $split__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { - Builder b = new Builder(loc("split")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4497, Collection.class, "accept", b.functionCall(4497, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4498, Collection.class, "reject", b.functionCall(4498, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self"))), b.declareVariable(4499, Iterator.class, "iter", b.functionCall(4499, b.localVariable("self"), "iterator")), b.return_(b.staticCall(4500, CpsDefaultGroovyMethods.class, "$split__groovy_lang_Closure__java_util_Collection__java_util_Collection__java_util_Iterator", b.localVariable("closure"), b.localVariable("accept"), b.localVariable("reject"), b.localVariable("iter"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticList> split(List self, Closure closure) { - if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { - return DefaultGroovyMethods.split(self, closure); - } - return CpsDefaultGroovyMethods.$split__java_util_List__groovy_lang_Closure(self, closure); - } - - private staticList> $split__java_util_List__groovy_lang_Closure(List self, Closure closure) { - Builder b = new Builder(loc("split")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4534, b.cast(4534, b.staticCall(4534, CpsDefaultGroovyMethods.class, "$split__java_util_Collection__groovy_lang_Closure", b.cast(4534, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticList> split(Set self, Closure closure) { - if ((!Caller.isAsynchronous(self, "split", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "split", self, closure))) { - return DefaultGroovyMethods.split(self, closure); - } - return CpsDefaultGroovyMethods.$split__java_util_Set__groovy_lang_Closure(self, closure); - } - - private staticList> $split__java_util_Set__groovy_lang_Closure(Set self, Closure closure) { - Builder b = new Builder(loc("split")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.cast(4552, b.cast(4552, b.staticCall(4552, CpsDefaultGroovyMethods.class, "$split__java_util_Collection__groovy_lang_Closure", b.cast(4552, b.localVariable("self"), Collection.class, false), b.localVariable("closure")), List.class, false), List.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static List combinations(Iterable self, Closure function) { - if ((!Caller.isAsynchronous(self, "combinations", function))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "combinations", self, function))) { - return DefaultGroovyMethods.combinations(self, function); - } - return CpsDefaultGroovyMethods.$combinations__java_lang_Iterable__groovy_lang_Closure(self, function); - } - - private static List $combinations__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure function) { - Builder b = new Builder(loc("combinations")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.return_(b.staticCall(4596, CpsDefaultGroovyMethods.class, "$collect__java_util_Collection__groovy_lang_Closure", b.functionCall(4596, b.constant(GroovyCollections.class), "combinations", b.localVariable("self")), b.localVariable("function"))))); - throw new CpsCallableInvocation(f, null, self, function); - } - - public static void eachCombination(Iterable self, Closure function) { - if ((!Caller.isAsynchronous(self, "eachCombination", function))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachCombination", self, function))) { - DefaultGroovyMethods.eachCombination(self, function); - return ; - } - CpsDefaultGroovyMethods.$eachCombination__java_lang_Iterable__groovy_lang_Closure(self, function); - } - - private static void $eachCombination__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure function) { - Builder b = new Builder(loc("eachCombination")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.staticCall(4611, CpsDefaultGroovyMethods.class, "$each__java_util_List__groovy_lang_Closure", b.functionCall(4611, b.constant(GroovyCollections.class), "combinations", b.localVariable("self")), b.localVariable("function")))); - throw new CpsCallableInvocation(f, null, self, function); - } - - public staticList permutations(Iterable self, Closure function) { - if ((!Caller.isAsynchronous(self, "permutations", function))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "permutations", self, function))) { - return DefaultGroovyMethods.permutations(self, function); - } - return CpsDefaultGroovyMethods.$permutations__java_lang_Iterable__groovy_lang_Closure(self, function); - } - - private staticList $permutations__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure function) { - Builder b = new Builder(loc("permutations")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "function"), b.block(b.return_(b.staticCall(4673, CpsDefaultGroovyMethods.class, "$collect__java_util_Collection__groovy_lang_Closure", b.staticCall(4673, CpsDefaultGroovyMethods.class, "$permutations__java_lang_Iterable", b.localVariable("self")), b.localVariable("function"))))); - throw new CpsCallableInvocation(f, null, self, function); - } - - public staticIterator> eachPermutation(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "eachPermutation", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachPermutation", self, closure))) { - return DefaultGroovyMethods.eachPermutation(self, closure); - } - return CpsDefaultGroovyMethods.$eachPermutation__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticIterator> $eachPermutation__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("eachPermutation")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4710, Iterator.class, "generator", b.new_(4710, PermutationGenerator.class, b.localVariable("self"))), b.while_(null, b.functionCall(4711, b.localVariable("generator"), "hasNext"), b.block(b.functionCall(4712, b.localVariable("closure"), "call", b.functionCall(4712, b.localVariable("generator"), "next")))), b.return_(b.localVariable("generator")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap findAll(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "findAll", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findAll", self, closure))) { - return DefaultGroovyMethods.findAll(self, closure); - } - return CpsDefaultGroovyMethods.$findAll__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticMap $findAll__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("findAll")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4762, Map.class, "answer", b.functionCall(4762, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarMap", b.localVariable("self"))), b.declareVariable(4763, BooleanClosureWrapper.class, "bcw", b.new_(4763, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forInLoop(4764, null, java.util.Map.Entry.class, "entry", b.functionCall(4764, b.localVariable("self"), "entrySet"), b.block(b.if_(b.functionCall(4765, b.localVariable("bcw"), "callForMap", b.localVariable("entry")), b.block(b.functionCall(4766, b.localVariable("answer"), "put", b.functionCall(4766, b.localVariable("entry"), "getKey"), b.functionCall(4766, b.localVariable("entry"), "getValue")))))), b.return_(b.localVariable("answer")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap> groupBy(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "groupBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupBy", self, closure))) { - return DefaultGroovyMethods.groupBy(self, closure); - } - return CpsDefaultGroovyMethods.$groupBy__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticMap> $groupBy__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("groupBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(4799, Map.class, "answer", b.new_(4799, LinkedHashMap.class)), b.forInLoop(4800, null, Object.class, "element", b.localVariable("self"), b.block(b.declareVariable(4801, Object.class, "value", b.functionCall(4801, b.localVariable("closure"), "call", b.localVariable("element"))), b.staticCall(4802, CpsDefaultGroovyMethods.class, "$groupAnswer__java_util_Map__java_lang_Object__java_lang_Object", b.localVariable("answer"), b.localVariable("element"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap> groupBy(T[] self, Closure closure) { - if ((!Caller.isAsynchronous(self, "groupBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupBy", self, closure))) { - return DefaultGroovyMethods.groupBy(self, closure); - } - return CpsDefaultGroovyMethods.$groupBy__java_lang_Object_array__groovy_lang_Closure(self, closure); - } - - private staticMap> $groupBy__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { - Builder b = new Builder(loc("groupBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(4826, CpsDefaultGroovyMethods.class, "$groupBy__java_lang_Iterable__groovy_lang_Closure", b.cast(4826, b.functionCall(4826, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap countBy(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { - return DefaultGroovyMethods.countBy(self, closure); - } - return CpsDefaultGroovyMethods.$countBy__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticMap $countBy__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("countBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(4993, CpsDefaultGroovyMethods.class, "$countBy__java_util_Iterator__groovy_lang_Closure", b.functionCall(4993, b.localVariable("self"), "iterator"), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap countBy(E[] self, Closure closure) { - if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { - return DefaultGroovyMethods.countBy(self, closure); - } - return CpsDefaultGroovyMethods.$countBy__java_lang_Object_array__groovy_lang_Closure(self, closure); - } - - private staticMap $countBy__java_lang_Object_array__groovy_lang_Closure(E[] self, Closure closure) { - Builder b = new Builder(loc("countBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5013, CpsDefaultGroovyMethods.class, "$countBy__java_lang_Iterable__groovy_lang_Closure", b.cast(5013, b.functionCall(5013, b.constant(Arrays.class), "asList", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap countBy(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { - return DefaultGroovyMethods.countBy(self, closure); - } - return CpsDefaultGroovyMethods.$countBy__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private staticMap $countBy__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("countBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5033, Map.class, "answer", b.new_(5033, LinkedHashMap.class)), b.while_(null, b.functionCall(5034, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(5035, Object.class, "value", b.functionCall(5035, b.localVariable("closure"), "call", b.functionCall(5035, b.localVariable("self"), "next"))), b.staticCall(5036, CpsDefaultGroovyMethods.class, "$countAnswer__java_util_Map__java_lang_Object", b.localVariable("answer"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap>> groupEntriesBy(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "groupEntriesBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupEntriesBy", self, closure))) { - return DefaultGroovyMethods.groupEntriesBy(self, closure); - } - return CpsDefaultGroovyMethods.$groupEntriesBy__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticMap>> $groupEntriesBy__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("groupEntriesBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5060, Map.class, "answer", b.new_(5060, LinkedHashMap.class)), b.forInLoop(5061, null, java.util.Map.Entry.class, "entry", b.functionCall(5061, b.localVariable("self"), "entrySet"), b.block(b.declareVariable(5062, Object.class, "value", b.staticCall(5062, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("closure"), b.localVariable("entry"))), b.staticCall(5063, CpsDefaultGroovyMethods.class, "$groupAnswer__java_util_Map__java_util_Map_Entry__java_lang_Object", b.localVariable("answer"), b.localVariable("entry"), b.localVariable("value")))), b.return_(b.localVariable("answer")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap> groupBy(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "groupBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "groupBy", self, closure))) { - return DefaultGroovyMethods.groupBy(self, closure); - } - return CpsDefaultGroovyMethods.$groupBy__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticMap> $groupBy__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("groupBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5090, Map.class, "initial", b.staticCall(5090, CpsDefaultGroovyMethods.class, "$groupEntriesBy__java_util_Map__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure"))), b.declareVariable(5091, Map.class, "answer", b.new_(5091, LinkedHashMap.class)), b.forInLoop(5092, null, java.util.Map.Entry.class, "outer", b.functionCall(5092, b.localVariable("initial"), "entrySet"), b.block(b.declareVariable(5093, Object.class, "key", b.functionCall(5093, b.localVariable("outer"), "getKey")), b.declareVariable(5094, List.class, "entries", b.functionCall(5094, b.localVariable("outer"), "getValue")), b.declareVariable(5095, Map.class, "target", b.functionCall(5095, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarMap", b.localVariable("self"))), b.staticCall(5096, CpsDefaultGroovyMethods.class, "$putAll__java_util_Map__java_util_Collection", b.localVariable("target"), b.localVariable("entries")), b.functionCall(5097, b.localVariable("answer"), "put", b.localVariable("key"), b.localVariable("target")))), b.return_(b.localVariable("answer")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap countBy(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "countBy", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "countBy", self, closure))) { - return DefaultGroovyMethods.countBy(self, closure); - } - return CpsDefaultGroovyMethods.$countBy__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticMap $countBy__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("countBy")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5190, Map.class, "answer", b.new_(5190, LinkedHashMap.class)), b.forInLoop(5191, null, Object.class, "entry", b.functionCall(5191, b.localVariable("self"), "entrySet"), b.block(b.staticCall(5192, CpsDefaultGroovyMethods.class, "$countAnswer__java_util_Map__java_lang_Object", b.localVariable("answer"), b.staticCall(5192, CpsDefaultGroovyMethods.class, "$callClosureForMapEntry__groovy_lang_Closure__java_util_Map_Entry", b.localVariable("closure"), b.cast(5192, b.localVariable("entry"), java.util.Map.Entry.class, false))))), b.return_(b.localVariable("answer")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT inject(Collection self, Closure closure) { - if ((!Caller.isAsynchronous(self, "inject", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, closure))) { - return DefaultGroovyMethods.inject(self, closure); - } - return CpsDefaultGroovyMethods.$inject__java_util_Collection__groovy_lang_Closure(self, closure); - } - - private staticT $inject__java_util_Collection__groovy_lang_Closure(Collection self, Closure closure) { - Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.if_(b.functionCall(5269, b.localVariable("self"), "isEmpty"), b.block(b.throw_(5270, b.new_(5270, NoSuchElementException.class, b.constant("Cannot call inject() on an empty collection without passing an initial value."))))), b.declareVariable(5272, Iterator.class, "iter", b.functionCall(5272, b.localVariable("self"), "iterator")), b.declareVariable(5273, Object.class, "head", b.functionCall(5273, b.localVariable("iter"), "next")), b.declareVariable(5274, Collection.class, "tail", b.staticCall(5274, CpsDefaultGroovyMethods.class, "$tail__java_lang_Iterable", b.localVariable("self"))), b.if_(b.not(5275, b.functionCall(5275, b.functionCall(5275, b.localVariable("tail"), "iterator"), "hasNext")), b.block(b.return_(b.localVariable("head")))), b.return_(b.cast(5279, b.staticCall(5279, CpsDefaultGroovyMethods.class, "$inject__java_util_Collection__java_lang_Object__groovy_lang_Closure", b.cast(5279, b.localVariable("tail"), Collection.class, false), b.localVariable("head"), b.localVariable("closure")), Object.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT inject(Collection self, U initialValue, Closure closure) { - if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { - return DefaultGroovyMethods.inject(self, initialValue, closure); - } - return CpsDefaultGroovyMethods.$inject__java_util_Collection__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); - } - - private staticT $inject__java_util_Collection__java_lang_Object__groovy_lang_Closure(Collection self, U initialValue, Closure closure) { - Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.cast(5324, b.staticCall(5324, CpsDefaultGroovyMethods.class, "$inject__java_util_Iterator__java_lang_Object__groovy_lang_Closure", b.cast(5324, b.functionCall(5324, b.localVariable("self"), "iterator"), Iterator.class, false), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); - throw new CpsCallableInvocation(f, null, self, initialValue, closure); - } - - public staticT inject(Map self, U initialValue, Closure closure) { - if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { - return DefaultGroovyMethods.inject(self, initialValue, closure); - } - return CpsDefaultGroovyMethods.$inject__java_util_Map__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); - } - - private staticT $inject__java_util_Map__java_lang_Object__groovy_lang_Closure(Map self, U initialValue, Closure closure) { - Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5350, Object.class, "value", b.localVariable("initialValue")), b.forInLoop(5351, null, java.util.Map.Entry.class, "entry", b.functionCall(5351, b.localVariable("self"), "entrySet"), b.block(b.if_(b.compareEqual(5352, b.functionCall(5352, b.localVariable("closure"), "getMaximumNumberOfParameters"), b.constant(3)), b.block(b.assign(5353, b.localVariable("value"), b.functionCall(5353, b.localVariable("closure"), "call", b.localVariable("value"), b.functionCall(5353, b.localVariable("entry"), "getKey"), b.functionCall(5353, b.localVariable("entry"), "getValue")))), b.block(b.assign(5355, b.localVariable("value"), b.functionCall(5355, b.localVariable("closure"), "call", b.localVariable("value"), b.localVariable("entry"))))))), b.return_(b.localVariable("value")))); - throw new CpsCallableInvocation(f, null, self, initialValue, closure); - } - - public staticT inject(Iterator self, U initialValue, Closure closure) { - if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { - return DefaultGroovyMethods.inject(self, initialValue, closure); - } - return CpsDefaultGroovyMethods.$inject__java_util_Iterator__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); - } - - private staticT $inject__java_util_Iterator__java_lang_Object__groovy_lang_Closure(Iterator self, U initialValue, Closure closure) { - Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5377, Object.class, "value", b.localVariable("initialValue")), b.declareVariable(5378, Object[].class, "params", b.newArray(5378, Object.class, b.constant(2))), b.while_(null, b.functionCall(5379, b.localVariable("self"), "hasNext"), b.block(b.declareVariable(5380, Object.class, "item", b.functionCall(5380, b.localVariable("self"), "next")), b.assign(5381, b.array(5381, b.localVariable("params"), b.constant(0)), b.localVariable("value")), b.assign(5382, b.array(5382, b.localVariable("params"), b.constant(1)), b.localVariable("item")), b.assign(5383, b.localVariable("value"), b.functionCall(5383, b.localVariable("closure"), "call", b.localVariable("params"))))), b.return_(b.localVariable("value")))); - throw new CpsCallableInvocation(f, null, self, initialValue, closure); - } - - public staticT inject(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "inject", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, closure))) { - return DefaultGroovyMethods.inject(self, closure); - } - return CpsDefaultGroovyMethods.$inject__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private staticT $inject__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(5403, Iterator.class, "iter", b.functionCall(5403, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.if_(b.not(5404, b.functionCall(5404, b.localVariable("iter"), "hasNext")), b.block(b.throw_(5405, b.new_(5405, NoSuchElementException.class, b.constant("Cannot call inject() over an empty iterable without passing an initial value."))))), b.declareVariable(5407, Object.class, "initialValue", b.functionCall(5407, b.localVariable("iter"), "next")), b.return_(b.cast(5408, b.staticCall(5408, CpsDefaultGroovyMethods.class, "$inject__java_util_Iterator__java_lang_Object__groovy_lang_Closure", b.localVariable("iter"), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT inject(Object self, U initialValue, Closure closure) { - if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { - return DefaultGroovyMethods.inject(self, initialValue, closure); - } - return CpsDefaultGroovyMethods.$inject__java_lang_Object__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); - } - - private staticT $inject__java_lang_Object__java_lang_Object__groovy_lang_Closure(Object self, U initialValue, Closure closure) { - Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5426, Iterator.class, "iter", b.functionCall(5426, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self"))), b.return_(b.cast(5427, b.staticCall(5427, CpsDefaultGroovyMethods.class, "$inject__java_util_Iterator__java_lang_Object__groovy_lang_Closure", b.localVariable("iter"), b.localVariable("initialValue"), b.localVariable("closure")), Object.class, false)))); - throw new CpsCallableInvocation(f, null, self, initialValue, closure); - } - - public staticT inject(E[] self, Closure closure) { - if ((!Caller.isAsynchronous(self, "inject", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, closure))) { - return DefaultGroovyMethods.inject(self, closure); - } - return CpsDefaultGroovyMethods.$inject__java_lang_Object_array__groovy_lang_Closure(self, closure); - } - - private staticT $inject__java_lang_Object_array__groovy_lang_Closure(E[] self, Closure closure) { - Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5443, CpsDefaultGroovyMethods.class, "$inject__java_lang_Object__groovy_lang_Closure", b.cast(5443, b.localVariable("self"), Object.class, false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT inject(E[] self, U initialValue, Closure closure) { - if ((!Caller.isAsynchronous(self, "inject", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "inject", self, initialValue, closure))) { - return DefaultGroovyMethods.inject(self, initialValue, closure); - } - return CpsDefaultGroovyMethods.$inject__java_lang_Object_array__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); - } - - private staticT $inject__java_lang_Object_array__java_lang_Object__groovy_lang_Closure(E[] self, U initialValue, Closure closure) { - Builder b = new Builder(loc("inject")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.declareVariable(5461, Object[].class, "params", b.newArray(5461, Object.class, b.constant(2))), b.declareVariable(5462, Object.class, "value", b.localVariable("initialValue")), b.forInLoop(5463, null, Object.class, "next", b.localVariable("self"), b.block(b.assign(5464, b.array(5464, b.localVariable("params"), b.constant(0)), b.localVariable("value")), b.assign(5465, b.array(5465, b.localVariable("params"), b.constant(1)), b.localVariable("next")), b.assign(5466, b.localVariable("value"), b.functionCall(5466, b.localVariable("closure"), "call", b.localVariable("params"))))), b.return_(b.localVariable("value")))); - throw new CpsCallableInvocation(f, null, self, initialValue, closure); - } - - public static Object sum(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "sum", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, closure))) { - return DefaultGroovyMethods.sum(self, closure); - } - return CpsDefaultGroovyMethods.$sum__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private static Object $sum__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5813, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.localVariable("self"), b.constant(null), b.localVariable("closure"), b.constant(true))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static Object sum(Object[] self, Closure closure) { - if ((!Caller.isAsynchronous(self, "sum", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, closure))) { - return DefaultGroovyMethods.sum(self, closure); - } - return CpsDefaultGroovyMethods.$sum__java_lang_Object_array__groovy_lang_Closure(self, closure); - } - - private static Object $sum__java_lang_Object_array__groovy_lang_Closure(Object[] self, Closure closure) { - Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5828, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.staticCall(5828, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), b.constant(null), b.localVariable("closure"), b.constant(true))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static Object sum(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "sum", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, closure))) { - return DefaultGroovyMethods.sum(self, closure); - } - return CpsDefaultGroovyMethods.$sum__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private static Object $sum__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(5844, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.staticCall(5844, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), b.constant(null), b.localVariable("closure"), b.constant(true))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static Object sum(Iterable self, Object initialValue, Closure closure) { - if ((!Caller.isAsynchronous(self, "sum", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, initialValue, closure))) { - return DefaultGroovyMethods.sum(self, initialValue, closure); - } - return CpsDefaultGroovyMethods.$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); - } - - private static Object $sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure(Iterable self, Object initialValue, Closure closure) { - Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5871, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.localVariable("self"), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); - throw new CpsCallableInvocation(f, null, self, initialValue, closure); - } - - public static Object sum(Object[] self, Object initialValue, Closure closure) { - if ((!Caller.isAsynchronous(self, "sum", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, initialValue, closure))) { - return DefaultGroovyMethods.sum(self, initialValue, closure); - } - return CpsDefaultGroovyMethods.$sum__java_lang_Object_array__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); - } - - private static Object $sum__java_lang_Object_array__java_lang_Object__groovy_lang_Closure(Object[] self, Object initialValue, Closure closure) { - Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5887, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.staticCall(5887, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); - throw new CpsCallableInvocation(f, null, self, initialValue, closure); - } - - public static Object sum(Iterator self, Object initialValue, Closure closure) { - if ((!Caller.isAsynchronous(self, "sum", initialValue, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sum", self, initialValue, closure))) { - return DefaultGroovyMethods.sum(self, initialValue, closure); - } - return CpsDefaultGroovyMethods.$sum__java_util_Iterator__java_lang_Object__groovy_lang_Closure(self, initialValue, closure); - } - - private static Object $sum__java_util_Iterator__java_lang_Object__groovy_lang_Closure(Iterator self, Object initialValue, Closure closure) { - Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure"), b.block(b.return_(b.staticCall(5904, CpsDefaultGroovyMethods.class, "$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean", b.staticCall(5904, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), b.localVariable("initialValue"), b.localVariable("closure"), b.constant(false))))); - throw new CpsCallableInvocation(f, null, self, initialValue, closure); - } - - static Object sum(Iterable self, Object initialValue, Closure closure, boolean first) { - return CpsDefaultGroovyMethods.$sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean(self, initialValue, closure, first); - } - - private static Object $sum__java_lang_Iterable__java_lang_Object__groovy_lang_Closure__boolean(Iterable self, Object initialValue, Closure closure, boolean first) { - Builder b = new Builder(loc("sum")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "initialValue", "closure", "first"), b.block(b.declareVariable(5908, Object.class, "result", b.localVariable("initialValue")), b.declareVariable(5909, Object[].class, "closureParam", b.newArray(5909, Object.class, b.constant(1))), b.declareVariable(5910, Object[].class, "plusParam", b.newArray(5910, Object.class, b.constant(1))), b.forInLoop(5911, null, Object.class, "next", b.localVariable("self"), b.block(b.assign(5912, b.array(5912, b.localVariable("closureParam"), b.constant(0)), b.localVariable("next")), b.assign(5913, b.array(5913, b.localVariable("plusParam"), b.constant(0)), b.functionCall(5913, b.localVariable("closure"), "call", b.localVariable("closureParam"))), b.if_(b.localVariable("first"), b.block(b.assign(5915, b.localVariable("result"), b.array(5915, b.localVariable("plusParam"), b.constant(0))), b.assign(5916, b.localVariable("first"), b.constant(false)), b.continue_(null))), b.declareVariable(5919, MetaClass.class, "metaClass", b.functionCall(5919, b.constant(InvokerHelper.class), "getMetaClass", b.localVariable("result"))), b.assign(5920, b.localVariable("result"), b.functionCall(5920, b.localVariable("metaClass"), "invokeMethod", b.localVariable("result"), b.constant("plus"), b.localVariable("plusParam"))))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, initialValue, closure, first); - } - - public staticT min(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { - return DefaultGroovyMethods.min(self, closure); - } - return CpsDefaultGroovyMethods.$min__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticT $min__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("min")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(6370, int.class, "params", b.functionCall(6370, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareNotEqual(6371, b.localVariable("params"), b.constant(1)), b.block(b.return_(b.staticCall(6372, CpsDefaultGroovyMethods.class, "$min__java_lang_Iterable__java_util_Comparator", b.localVariable("self"), b.new_(6372, ClosureComparator.class, b.localVariable("closure")))))), b.declareVariable(6374, int.class, "first", b.constant(true)), b.declareVariable(6375, Object.class, "answer", b.constant(null)), b.declareVariable(6376, Object.class, "answerValue", b.constant(null)), b.forInLoop(6377, null, Object.class, "item", b.localVariable("self"), b.block(b.declareVariable(6378, Object.class, "value", b.functionCall(6378, b.localVariable("closure"), "call", b.localVariable("item"))), b.if_(b.localVariable("first"), b.block(b.assign(6380, b.localVariable("first"), b.constant(false)), b.assign(6381, b.localVariable("answer"), b.localVariable("item")), b.assign(6382, b.localVariable("answerValue"), b.localVariable("value"))), b.if_(b.functionCall(6383, b.constant(ScriptBytecodeAdapter.class), "compareLessThan", b.localVariable("value"), b.localVariable("answerValue")), b.block(b.assign(6384, b.localVariable("answer"), b.localVariable("item")), b.assign(6385, b.localVariable("answerValue"), b.localVariable("value"))))))), b.return_(b.localVariable("answer")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticjava.util.Map.Entry min(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { - return DefaultGroovyMethods.min(self, closure); - } - return CpsDefaultGroovyMethods.$min__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticjava.util.Map.Entry $min__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("min")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6426, CpsDefaultGroovyMethods.class, "$min__java_lang_Iterable__groovy_lang_Closure", b.cast(6426, b.functionCall(6426, b.localVariable("self"), "entrySet"), Iterable.class, false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticjava.util.Map.Entry max(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { - return DefaultGroovyMethods.max(self, closure); - } - return CpsDefaultGroovyMethods.$max__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticjava.util.Map.Entry $max__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("max")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6464, CpsDefaultGroovyMethods.class, "$max__java_lang_Iterable__groovy_lang_Closure", b.cast(6464, b.functionCall(6464, b.localVariable("self"), "entrySet"), Iterable.class, false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT min(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { - return DefaultGroovyMethods.min(self, closure); - } - return CpsDefaultGroovyMethods.$min__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private staticT $min__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("min")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6489, CpsDefaultGroovyMethods.class, "$min__java_lang_Iterable__groovy_lang_Closure", b.cast(6489, b.staticCall(6489, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT min(T[] self, Closure closure) { - if ((!Caller.isAsynchronous(self, "min", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "min", self, closure))) { - return DefaultGroovyMethods.min(self, closure); - } - return CpsDefaultGroovyMethods.$min__java_lang_Object_array__groovy_lang_Closure(self, closure); - } - - private staticT $min__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { - Builder b = new Builder(loc("min")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6512, CpsDefaultGroovyMethods.class, "$min__java_lang_Iterable__groovy_lang_Closure", b.cast(6512, b.staticCall(6512, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT max(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { - return DefaultGroovyMethods.max(self, closure); - } - return CpsDefaultGroovyMethods.$max__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticT $max__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("max")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(6603, int.class, "params", b.functionCall(6603, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareNotEqual(6604, b.localVariable("params"), b.constant(1)), b.block(b.return_(b.staticCall(6605, CpsDefaultGroovyMethods.class, "$max__java_lang_Iterable__java_util_Comparator", b.localVariable("self"), b.new_(6605, ClosureComparator.class, b.localVariable("closure")))))), b.declareVariable(6607, int.class, "first", b.constant(true)), b.declareVariable(6608, Object.class, "answer", b.constant(null)), b.declareVariable(6609, Object.class, "answerValue", b.constant(null)), b.forInLoop(6610, null, Object.class, "item", b.localVariable("self"), b.block(b.declareVariable(6611, Object.class, "value", b.functionCall(6611, b.localVariable("closure"), "call", b.localVariable("item"))), b.if_(b.localVariable("first"), b.block(b.assign(6613, b.localVariable("first"), b.constant(false)), b.assign(6614, b.localVariable("answer"), b.localVariable("item")), b.assign(6615, b.localVariable("answerValue"), b.localVariable("value"))), b.if_(b.functionCall(6616, b.constant(ScriptBytecodeAdapter.class), "compareLessThan", b.localVariable("answerValue"), b.localVariable("value")), b.block(b.assign(6617, b.localVariable("answer"), b.localVariable("item")), b.assign(6618, b.localVariable("answerValue"), b.localVariable("value"))))))), b.return_(b.localVariable("answer")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT max(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { - return DefaultGroovyMethods.max(self, closure); - } - return CpsDefaultGroovyMethods.$max__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private staticT $max__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("max")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6645, CpsDefaultGroovyMethods.class, "$max__java_lang_Iterable__groovy_lang_Closure", b.cast(6645, b.staticCall(6645, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT max(T[] self, Closure closure) { - if ((!Caller.isAsynchronous(self, "max", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "max", self, closure))) { - return DefaultGroovyMethods.max(self, closure); - } - return CpsDefaultGroovyMethods.$max__java_lang_Object_array__groovy_lang_Closure(self, closure); - } - - private staticT $max__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { - Builder b = new Builder(loc("max")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(6668, CpsDefaultGroovyMethods.class, "$max__java_lang_Iterable__groovy_lang_Closure", b.cast(6668, b.staticCall(6668, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticMap withDefault(Map self, Closure init) { - if ((!Caller.isAsynchronous(self, "withDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withDefault", self, init))) { - return DefaultGroovyMethods.withDefault(self, init); - } - return CpsDefaultGroovyMethods.$withDefault__java_util_Map__groovy_lang_Closure(self, init); - } - - private staticMap $withDefault__java_util_Map__groovy_lang_Closure(Map self, Closure init) { - Builder b = new Builder(loc("withDefault")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.functionCall(7750, b.constant(MapWithDefault.class), "newInstance", b.localVariable("self"), b.localVariable("init"))))); - throw new CpsCallableInvocation(f, null, self, init); - } - - public staticList withDefault(List self, Closure init) { - if ((!Caller.isAsynchronous(self, "withDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withDefault", self, init))) { - return DefaultGroovyMethods.withDefault(self, init); - } - return CpsDefaultGroovyMethods.$withDefault__java_util_List__groovy_lang_Closure(self, init); - } - - private staticList $withDefault__java_util_List__groovy_lang_Closure(List self, Closure init) { - Builder b = new Builder(loc("withDefault")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.staticCall(7765, CpsDefaultGroovyMethods.class, "$withLazyDefault__java_util_List__groovy_lang_Closure", b.localVariable("self"), b.localVariable("init"))))); - throw new CpsCallableInvocation(f, null, self, init); - } - - public staticList withLazyDefault(List self, Closure init) { - if ((!Caller.isAsynchronous(self, "withLazyDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withLazyDefault", self, init))) { - return DefaultGroovyMethods.withLazyDefault(self, init); - } - return CpsDefaultGroovyMethods.$withLazyDefault__java_util_List__groovy_lang_Closure(self, init); - } - - private staticList $withLazyDefault__java_util_List__groovy_lang_Closure(List self, Closure init) { - Builder b = new Builder(loc("withLazyDefault")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.functionCall(7811, b.constant(ListWithDefault.class), "newInstance", b.localVariable("self"), b.constant(true), b.localVariable("init"))))); - throw new CpsCallableInvocation(f, null, self, init); - } - - public staticList withEagerDefault(List self, Closure init) { - if ((!Caller.isAsynchronous(self, "withEagerDefault", init))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "withEagerDefault", self, init))) { - return DefaultGroovyMethods.withEagerDefault(self, init); - } - return CpsDefaultGroovyMethods.$withEagerDefault__java_util_List__groovy_lang_Closure(self, init); - } - - private staticList $withEagerDefault__java_util_List__groovy_lang_Closure(List self, Closure init) { - Builder b = new Builder(loc("withEagerDefault")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "init"), b.block(b.return_(b.functionCall(7851, b.constant(ListWithDefault.class), "newInstance", b.localVariable("self"), b.constant(false), b.localVariable("init"))))); - throw new CpsCallableInvocation(f, null, self, init); - } - - public staticMap sort(Map self, Closure closure) { - if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { - return DefaultGroovyMethods.sort(self, closure); - } - return CpsDefaultGroovyMethods.$sort__java_util_Map__groovy_lang_Closure(self, closure); - } - - private staticMap $sort__java_util_Map__groovy_lang_Closure(Map self, Closure closure) { - Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8129, Map.class, "result", b.new_(8129, LinkedHashMap.class)), b.declareVariable(8130, List.class, "entries", b.staticCall(8130, CpsDefaultGroovyMethods.class, "$asList__java_lang_Iterable", b.cast(8130, b.functionCall(8130, b.localVariable("self"), "entrySet"), Iterable.class, false))), b.staticCall(8131, CpsDefaultGroovyMethods.class, "$sort__java_lang_Iterable__groovy_lang_Closure", b.cast(8131, b.localVariable("entries"), Iterable.class, false), b.localVariable("closure")), b.forInLoop(8132, null, java.util.Map.Entry.class, "entry", b.localVariable("entries"), b.block(b.functionCall(8133, b.localVariable("result"), "put", b.functionCall(8133, b.localVariable("entry"), "getKey"), b.functionCall(8133, b.localVariable("entry"), "getValue")))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticIterator sort(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { - return DefaultGroovyMethods.sort(self, closure); - } - return CpsDefaultGroovyMethods.$sort__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private staticIterator $sort__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.functionCall(8338, b.staticCall(8338, CpsDefaultGroovyMethods.class, "$sort__java_lang_Iterable__groovy_lang_Closure", b.cast(8338, b.staticCall(8338, CpsDefaultGroovyMethods.class, "$toList__java_util_Iterator", b.localVariable("self")), Iterable.class, false), b.localVariable("closure")), "listIterator")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT[] sort(T[] self, Closure closure) { - if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { - return DefaultGroovyMethods.sort(self, closure); - } - return CpsDefaultGroovyMethods.$sort__java_lang_Object_array__groovy_lang_Closure(self, closure); - } - - private staticT[] $sort__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure closure) { - Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(8358, CpsDefaultGroovyMethods.class, "$sort__java_lang_Object_array__boolean__groovy_lang_Closure", b.localVariable("self"), b.constant(false), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT[] sort(T[] self, boolean mutate, Closure closure) { - if ((!Caller.isAsynchronous(self, "sort", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, mutate, closure))) { - return DefaultGroovyMethods.sort(self, mutate, closure); - } - return CpsDefaultGroovyMethods.$sort__java_lang_Object_array__boolean__groovy_lang_Closure(self, mutate, closure); - } - - private staticT[] $sort__java_lang_Object_array__boolean__groovy_lang_Closure(T[] self, boolean mutate, Closure closure) { - Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(8388, Object[].class, "answer", b.cast(8388, b.functionCall(8388, b.staticCall(8388, CpsDefaultGroovyMethods.class, "$sort__java_lang_Iterable__groovy_lang_Closure", b.cast(8388, b.staticCall(8388, CpsDefaultGroovyMethods.class, "$toList__java_lang_Object_array", b.localVariable("self")), Iterable.class, false), b.localVariable("closure")), "toArray"), Object[].class, false)), b.if_(b.localVariable("mutate"), b.block(b.functionCall(8390, b.constant(System.class), "arraycopy", b.localVariable("answer"), b.constant(0), b.localVariable("self"), b.constant(0), b.property(8390, b.localVariable("answer"), "length")))), b.return_(b.ternaryOp(b.localVariable("mutate"), b.localVariable("self"), b.localVariable("answer"))))); - throw new CpsCallableInvocation(f, null, self, mutate, closure); - } - - public staticList sort(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "sort", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, closure))) { - return DefaultGroovyMethods.sort(self, closure); - } - return CpsDefaultGroovyMethods.$sort__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticList $sort__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(8438, CpsDefaultGroovyMethods.class, "$sort__java_lang_Iterable__boolean__groovy_lang_Closure", b.localVariable("self"), b.constant(true), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticList sort(Iterable self, boolean mutate, Closure closure) { - if ((!Caller.isAsynchronous(self, "sort", mutate, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "sort", self, mutate, closure))) { - return DefaultGroovyMethods.sort(self, mutate, closure); - } - return CpsDefaultGroovyMethods.$sort__java_lang_Iterable__boolean__groovy_lang_Closure(self, mutate, closure); - } - - private staticList $sort__java_lang_Iterable__boolean__groovy_lang_Closure(Iterable self, boolean mutate, Closure closure) { - Builder b = new Builder(loc("sort")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "mutate", "closure"), b.block(b.declareVariable(8470, List.class, "list", b.ternaryOp(b.localVariable("mutate"), b.staticCall(8470, CpsDefaultGroovyMethods.class, "$asList__java_lang_Iterable", b.localVariable("self")), b.staticCall(8470, CpsDefaultGroovyMethods.class, "$toList__java_lang_Iterable", b.localVariable("self")))), b.declareVariable(8472, int.class, "params", b.functionCall(8472, b.localVariable("closure"), "getMaximumNumberOfParameters")), b.if_(b.compareEqual(8473, b.localVariable("params"), b.constant(1)), b.block(b.functionCall(8474, b.constant(Collections.class), "sort", b.localVariable("list"), b.new_(8474, OrderBy.class, b.localVariable("closure")))), b.block(b.functionCall(8476, b.constant(Collections.class), "sort", b.localVariable("list"), b.new_(8476, ClosureComparator.class, b.localVariable("closure"))))), b.return_(b.localVariable("list")))); - throw new CpsCallableInvocation(f, null, self, mutate, closure); - } - - public staticList toSorted(Iterable self, Closure closure) { - if ((!Caller.isAsynchronous(self, "toSorted", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, closure))) { - return DefaultGroovyMethods.toSorted(self, closure); - } - return CpsDefaultGroovyMethods.$toSorted__java_lang_Iterable__groovy_lang_Closure(self, closure); - } - - private staticList $toSorted__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure closure) { - Builder b = new Builder(loc("toSorted")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8568, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8568, b.functionCall(8568, b.localVariable("closure"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8568, OrderBy.class, b.localVariable("closure")), b.new_(8568, ClosureComparator.class, b.localVariable("closure")))), b.return_(b.staticCall(8569, CpsDefaultGroovyMethods.class, "$toSorted__java_lang_Iterable__java_util_Comparator", b.localVariable("self"), b.localVariable("comparator"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticIterator toSorted(Iterator self, Closure closure) { - if ((!Caller.isAsynchronous(self, "toSorted", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, closure))) { - return DefaultGroovyMethods.toSorted(self, closure); - } - return CpsDefaultGroovyMethods.$toSorted__java_util_Iterator__groovy_lang_Closure(self, closure); - } - - private staticIterator $toSorted__java_util_Iterator__groovy_lang_Closure(Iterator self, Closure closure) { - Builder b = new Builder(loc("toSorted")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(8620, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8620, b.functionCall(8620, b.localVariable("closure"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8620, OrderBy.class, b.localVariable("closure")), b.new_(8620, ClosureComparator.class, b.localVariable("closure")))), b.return_(b.staticCall(8621, CpsDefaultGroovyMethods.class, "$toSorted__java_util_Iterator__java_util_Comparator", b.localVariable("self"), b.localVariable("comparator"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public staticT[] toSorted(T[] self, Closure condition) { - if ((!Caller.isAsynchronous(self, "toSorted", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, condition))) { - return DefaultGroovyMethods.toSorted(self, condition); - } - return CpsDefaultGroovyMethods.$toSorted__java_lang_Object_array__groovy_lang_Closure(self, condition); - } - - private staticT[] $toSorted__java_lang_Object_array__groovy_lang_Closure(T[] self, Closure condition) { - Builder b = new Builder(loc("toSorted")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(8674, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8674, b.functionCall(8674, b.localVariable("condition"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8674, OrderBy.class, b.localVariable("condition")), b.new_(8674, ClosureComparator.class, b.localVariable("condition")))), b.return_(b.staticCall(8675, CpsDefaultGroovyMethods.class, "$toSorted__java_lang_Object_array__java_util_Comparator", b.localVariable("self"), b.localVariable("comparator"))))); - throw new CpsCallableInvocation(f, null, self, condition); - } - - public staticMap toSorted(Map self, Closure condition) { - if ((!Caller.isAsynchronous(self, "toSorted", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "toSorted", self, condition))) { - return DefaultGroovyMethods.toSorted(self, condition); - } - return CpsDefaultGroovyMethods.$toSorted__java_util_Map__groovy_lang_Closure(self, condition); - } - - private staticMap $toSorted__java_util_Map__groovy_lang_Closure(Map self, Closure condition) { - Builder b = new Builder(loc("toSorted")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "condition"), b.block(b.declareVariable(8751, Comparator.class, "comparator", b.ternaryOp(b.compareEqual(8751, b.functionCall(8751, b.localVariable("condition"), "getMaximumNumberOfParameters"), b.constant(1)), b.new_(8751, OrderBy.class, b.localVariable("condition")), b.new_(8751, ClosureComparator.class, b.localVariable("condition")))), b.return_(b.staticCall(8752, CpsDefaultGroovyMethods.class, "$toSorted__java_util_Map__java_util_Comparator", b.localVariable("self"), b.localVariable("comparator"))))); - throw new CpsCallableInvocation(f, null, self, condition); - } - - public staticList takeWhile(List self, Closure condition) { - if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { - return DefaultGroovyMethods.takeWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(java.util.List,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticCollection takeWhile(Iterable self, Closure condition) { - if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { - return DefaultGroovyMethods.takeWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(java.lang.Iterable,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticSortedSet takeWhile(SortedSet self, Closure condition) { - if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { - return DefaultGroovyMethods.takeWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(java.util.SortedSet,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticMap takeWhile(Map self, Closure condition) { - if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { - return DefaultGroovyMethods.takeWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(java.util.Map,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticT[] takeWhile(T[] self, Closure condition) { - if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { - return DefaultGroovyMethods.takeWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(T[],groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticIterator takeWhile(Iterator self, Closure condition) { - if ((!Caller.isAsynchronous(self, "takeWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "takeWhile"))) { - return DefaultGroovyMethods.takeWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.takeWhile(java.util.Iterator,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticSortedSet dropWhile(SortedSet self, Closure condition) { - if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { - return DefaultGroovyMethods.dropWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(java.util.SortedSet,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticList dropWhile(List self, Closure condition) { - if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { - return DefaultGroovyMethods.dropWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(java.util.List,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticCollection dropWhile(Iterable self, Closure condition) { - if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { - return DefaultGroovyMethods.dropWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(java.lang.Iterable,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticMap dropWhile(Map self, Closure condition) { - if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { - return DefaultGroovyMethods.dropWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(java.util.Map,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticT[] dropWhile(T[] self, Closure condition) { - if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { - return DefaultGroovyMethods.dropWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(T[],groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticIterator dropWhile(Iterator self, Closure condition) { - if ((!Caller.isAsynchronous(self, "dropWhile", condition))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "dropWhile"))) { - return DefaultGroovyMethods.dropWhile(self, condition); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.dropWhile(java.util.Iterator,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public staticCollection flatten(Iterable self, Closure flattenUsing) { - if ((!Caller.isAsynchronous(self, "flatten", flattenUsing))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "flatten", self, flattenUsing))) { - return DefaultGroovyMethods.flatten(self, flattenUsing); - } - return CpsDefaultGroovyMethods.$flatten__java_lang_Iterable__groovy_lang_Closure(self, flattenUsing); - } - - private staticCollection $flatten__java_lang_Iterable__groovy_lang_Closure(Iterable self, Closure flattenUsing) { - Builder b = new Builder(loc("flatten")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "flattenUsing"), b.block(b.return_(b.staticCall(12163, CpsDefaultGroovyMethods.class, "$flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.localVariable("self"), b.functionCall(12163, b.constant(DefaultGroovyMethodsSupport.class), "createSimilarCollection", b.localVariable("self")), b.localVariable("flattenUsing"))))); - throw new CpsCallableInvocation(f, null, self, flattenUsing); - } - - staticCollection flatten(Iterable elements, Collection addTo, Closure flattenUsing) { - return CpsDefaultGroovyMethods.$flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(elements, addTo, flattenUsing); - } - - private staticCollection $flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure(Iterable elements, Collection addTo, Closure flattenUsing) { - Builder b = new Builder(loc("flatten")); - CpsFunction f = new CpsFunction(Arrays.asList("elements", "addTo", "flattenUsing"), b.block(b.forInLoop(12167, null, Object.class, "element", b.localVariable("elements"), b.block(b.if_(b.instanceOf(12168, b.localVariable("element"), b.constant(Collection.class)), b.block(b.staticCall(12169, CpsDefaultGroovyMethods.class, "$flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.cast(12169, b.localVariable("element"), Collection.class, false), b.localVariable("addTo"), b.localVariable("flattenUsing"))), b.if_(b.logicalAnd(12170, b.compareNotEqual(12170, b.localVariable("element"), b.constant(null)), b.functionCall(12170, b.functionCall(12170, b.localVariable("element"), "getClass"), "isArray")), b.block(b.staticCall(12171, CpsDefaultGroovyMethods.class, "$flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.functionCall(12171, b.constant(DefaultTypeTransformation.class), "arrayAsCollection", b.localVariable("element")), b.localVariable("addTo"), b.localVariable("flattenUsing"))), b.block(b.declareVariable(12173, Object.class, "flattened", b.functionCall(12173, b.localVariable("flattenUsing"), "call", b.list(b.localVariable("element")))), b.declareVariable(12174, int.class, "returnedSelf", b.compareEqual(12174, b.localVariable("flattened"), b.localVariable("element"))), b.if_(b.logicalAnd(12175, b.not(12175, b.localVariable("returnedSelf")), b.instanceOf(12175, b.localVariable("flattened"), b.constant(Collection.class))), b.block(b.declareVariable(12176, List.class, "list", b.staticCall(12176, CpsDefaultGroovyMethods.class, "$toList__java_lang_Iterable", b.cast(12176, b.localVariable("flattened"), Iterable.class, false))), b.if_(b.logicalAnd(12177, b.compareEqual(12177, b.functionCall(12177, b.localVariable("list"), "size"), b.constant(1)), b.compareEqual(12177, b.functionCall(12177, b.localVariable("list"), "get", b.constant(0)), b.localVariable("element"))), b.block(b.assign(12178, b.localVariable("returnedSelf"), b.constant(true)))))), b.if_(b.logicalAnd(12181, b.instanceOf(12181, b.localVariable("flattened"), b.constant(Collection.class)), b.not(12181, b.localVariable("returnedSelf"))), b.block(b.staticCall(12182, CpsDefaultGroovyMethods.class, "$flatten__java_lang_Iterable__java_util_Collection__groovy_lang_Closure", b.cast(12182, b.localVariable("flattened"), Collection.class, false), b.localVariable("addTo"), b.localVariable("flattenUsing"))), b.block(b.functionCall(12184, b.localVariable("addTo"), "add", b.localVariable("flattened"))))))))), b.return_(b.localVariable("addTo")))); - throw new CpsCallableInvocation(f, null, elements, addTo, flattenUsing); - } - - public static void times(Number self, Closure closure) { - if ((!Caller.isAsynchronous(self, "times", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "times", self, closure))) { - DefaultGroovyMethods.times(self, closure); - return ; - } - CpsDefaultGroovyMethods.$times__java_lang_Number__groovy_lang_Closure(self, closure); - } - - private static void $times__java_lang_Number__groovy_lang_Closure(Number self, Closure closure) { - Builder b = new Builder(loc("times")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.forLoop(null, b.sequence(b.declareVariable(14342, int.class, "i", b.constant(0)), b.declareVariable(14342, int.class, "size", b.functionCall(14342, b.localVariable("self"), "intValue"))), b.lessThan(14342, b.localVariable("i"), b.localVariable("size")), b.sequence(b.postfixInc(14342, b.localVariable("i"))), b.block(b.functionCall(14343, b.localVariable("closure"), "call", b.localVariable("i")), b.if_(b.compareEqual(14344, b.functionCall(14344, b.localVariable("closure"), "getDirective"), b.property(14344, b.constant(Closure.class), "DONE")), b.block(b.break_(null))))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static void upto(Number self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { - DefaultGroovyMethods.upto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$upto__java_lang_Number__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $upto__java_lang_Number__java_lang_Number__groovy_lang_Closure(Number self, Number to, Closure closure) { - Builder b = new Builder(loc("upto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14360, int.class, "self1", b.functionCall(14360, b.localVariable("self"), "intValue")), b.declareVariable(14361, int.class, "to1", b.functionCall(14361, b.localVariable("to"), "intValue")), b.if_(b.lessThanEqual(14362, b.localVariable("self1"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14363, int.class, "i", b.localVariable("self1"))), b.lessThanEqual(14363, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14363, b.localVariable("i"))), b.block(b.functionCall(14364, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14367, b.new_(14367, GroovyRuntimeException.class, b.plus(14367, b.plus(14367, b.plus(14367, b.plus(14367, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void upto(long self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { - DefaultGroovyMethods.upto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$upto__long__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $upto__long__java_lang_Number__groovy_lang_Closure(long self, Number to, Closure closure) { - Builder b = new Builder(loc("upto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14381, long.class, "to1", b.functionCall(14381, b.localVariable("to"), "longValue")), b.if_(b.lessThanEqual(14382, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14383, long.class, "i", b.localVariable("self"))), b.lessThanEqual(14383, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14383, b.localVariable("i"))), b.block(b.functionCall(14384, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14387, b.new_(14387, GroovyRuntimeException.class, b.plus(14387, b.plus(14387, b.plus(14387, b.plus(14387, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void upto(Long self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { - DefaultGroovyMethods.upto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$upto__java_lang_Long__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $upto__java_lang_Long__java_lang_Number__groovy_lang_Closure(Long self, Number to, Closure closure) { - Builder b = new Builder(loc("upto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14401, long.class, "to1", b.functionCall(14401, b.localVariable("to"), "longValue")), b.if_(b.lessThanEqual(14402, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14403, long.class, "i", b.localVariable("self"))), b.lessThanEqual(14403, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14403, b.localVariable("i"))), b.block(b.functionCall(14404, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14407, b.new_(14407, GroovyRuntimeException.class, b.plus(14407, b.plus(14407, b.plus(14407, b.plus(14407, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void upto(float self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { - DefaultGroovyMethods.upto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$upto__float__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $upto__float__java_lang_Number__groovy_lang_Closure(float self, Number to, Closure closure) { - Builder b = new Builder(loc("upto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14421, float.class, "to1", b.functionCall(14421, b.localVariable("to"), "floatValue")), b.if_(b.lessThanEqual(14422, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14423, float.class, "i", b.localVariable("self"))), b.lessThanEqual(14423, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14423, b.localVariable("i"))), b.block(b.functionCall(14424, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14427, b.new_(14427, GroovyRuntimeException.class, b.plus(14427, b.plus(14427, b.plus(14427, b.plus(14427, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void upto(Float self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { - DefaultGroovyMethods.upto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$upto__java_lang_Float__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $upto__java_lang_Float__java_lang_Number__groovy_lang_Closure(Float self, Number to, Closure closure) { - Builder b = new Builder(loc("upto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14441, float.class, "to1", b.functionCall(14441, b.localVariable("to"), "floatValue")), b.if_(b.lessThanEqual(14442, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14443, float.class, "i", b.localVariable("self"))), b.lessThanEqual(14443, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14443, b.localVariable("i"))), b.block(b.functionCall(14444, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14447, b.new_(14447, GroovyRuntimeException.class, b.plus(14447, b.plus(14447, b.plus(14447, b.plus(14447, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void upto(double self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { - DefaultGroovyMethods.upto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$upto__double__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $upto__double__java_lang_Number__groovy_lang_Closure(double self, Number to, Closure closure) { - Builder b = new Builder(loc("upto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14461, double.class, "to1", b.functionCall(14461, b.localVariable("to"), "doubleValue")), b.if_(b.lessThanEqual(14462, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14463, double.class, "i", b.localVariable("self"))), b.lessThanEqual(14463, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14463, b.localVariable("i"))), b.block(b.functionCall(14464, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14467, b.new_(14467, GroovyRuntimeException.class, b.plus(14467, b.plus(14467, b.plus(14467, b.plus(14467, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void upto(Double self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { - DefaultGroovyMethods.upto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$upto__java_lang_Double__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $upto__java_lang_Double__java_lang_Number__groovy_lang_Closure(Double self, Number to, Closure closure) { - Builder b = new Builder(loc("upto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14481, double.class, "to1", b.functionCall(14481, b.localVariable("to"), "doubleValue")), b.if_(b.lessThanEqual(14482, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14483, double.class, "i", b.localVariable("self"))), b.lessThanEqual(14483, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixInc(14483, b.localVariable("i"))), b.block(b.functionCall(14484, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14487, b.new_(14487, GroovyRuntimeException.class, b.plus(14487, b.plus(14487, b.plus(14487, b.plus(14487, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void upto(BigInteger self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { - DefaultGroovyMethods.upto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$upto__java_math_BigInteger__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $upto__java_math_BigInteger__java_lang_Number__groovy_lang_Closure(BigInteger self, Number to, Closure closure) { - Builder b = new Builder(loc("upto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.if_(b.instanceOf(14505, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14506, BigDecimal.class, "one", b.functionCall(14506, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.declareVariable(14507, BigDecimal.class, "self1", b.new_(14507, BigDecimal.class, b.localVariable("self"))), b.declareVariable(14508, BigDecimal.class, "to1", b.cast(14508, b.localVariable("to"), BigDecimal.class, false)), b.if_(b.lessThanEqual(14509, b.functionCall(14509, b.localVariable("self1"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14510, BigDecimal.class, "i", b.localVariable("self1"))), b.lessThanEqual(14510, b.functionCall(14510, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14510, b.localVariable("i"), b.functionCall(14510, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14511, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14514, b.new_(14514, GroovyRuntimeException.class, b.functionCall(14515, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to upto() cannot be less than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.if_(b.instanceOf(14518, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14519, BigInteger.class, "one", b.functionCall(14519, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14520, BigInteger.class, "to1", b.cast(14520, b.localVariable("to"), BigInteger.class, false)), b.if_(b.lessThanEqual(14521, b.functionCall(14521, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14522, BigInteger.class, "i", b.localVariable("self"))), b.lessThanEqual(14522, b.functionCall(14522, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14522, b.localVariable("i"), b.functionCall(14522, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14523, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14526, b.new_(14526, GroovyRuntimeException.class, b.functionCall(14527, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to upto() cannot be less than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.block(b.declareVariable(14530, BigInteger.class, "one", b.functionCall(14530, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14531, BigInteger.class, "to1", b.new_(14531, BigInteger.class, b.functionCall(14531, b.localVariable("to"), "toString"))), b.if_(b.lessThanEqual(14532, b.functionCall(14532, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14533, BigInteger.class, "i", b.localVariable("self"))), b.lessThanEqual(14533, b.functionCall(14533, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14533, b.localVariable("i"), b.functionCall(14533, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14534, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14537, b.new_(14537, GroovyRuntimeException.class, b.functionCall(14537, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to upto() cannot be less than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void upto(BigDecimal self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "upto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "upto", self, to, closure))) { - DefaultGroovyMethods.upto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$upto__java_math_BigDecimal__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $upto__java_math_BigDecimal__java_lang_Number__groovy_lang_Closure(BigDecimal self, Number to, Closure closure) { - Builder b = new Builder(loc("upto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14557, BigDecimal.class, "one", b.functionCall(14557, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.if_(b.instanceOf(14558, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14559, BigDecimal.class, "to1", b.cast(14559, b.localVariable("to"), BigDecimal.class, false)), b.if_(b.lessThanEqual(14560, b.functionCall(14560, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14561, BigDecimal.class, "i", b.localVariable("self"))), b.lessThanEqual(14561, b.functionCall(14561, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14561, b.localVariable("i"), b.functionCall(14561, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14562, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14565, b.new_(14565, GroovyRuntimeException.class, b.plus(14565, b.plus(14565, b.plus(14565, b.plus(14565, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.if_(b.instanceOf(14567, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14568, BigDecimal.class, "to1", b.new_(14568, BigDecimal.class, b.cast(14568, b.localVariable("to"), BigInteger.class, false))), b.if_(b.lessThanEqual(14569, b.functionCall(14569, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14570, BigDecimal.class, "i", b.localVariable("self"))), b.lessThanEqual(14570, b.functionCall(14570, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14570, b.localVariable("i"), b.functionCall(14570, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14571, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14574, b.new_(14574, GroovyRuntimeException.class, b.plus(14574, b.plus(14574, b.plus(14574, b.plus(14574, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.block(b.declareVariable(14577, BigDecimal.class, "to1", b.new_(14577, BigDecimal.class, b.functionCall(14577, b.localVariable("to"), "toString"))), b.if_(b.lessThanEqual(14578, b.functionCall(14578, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14579, BigDecimal.class, "i", b.localVariable("self"))), b.lessThanEqual(14579, b.functionCall(14579, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14579, b.localVariable("i"), b.functionCall(14579, b.localVariable("i"), "add", b.localVariable("one")))), b.block(b.functionCall(14580, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14583, b.new_(14583, GroovyRuntimeException.class, b.plus(14583, b.plus(14583, b.plus(14583, b.plus(14583, b.constant("The argument ("), b.localVariable("to")), b.constant(") to upto() cannot be less than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void downto(Number self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { - DefaultGroovyMethods.downto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$downto__java_lang_Number__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $downto__java_lang_Number__java_lang_Number__groovy_lang_Closure(Number self, Number to, Closure closure) { - Builder b = new Builder(loc("downto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14598, int.class, "self1", b.functionCall(14598, b.localVariable("self"), "intValue")), b.declareVariable(14599, int.class, "to1", b.functionCall(14599, b.localVariable("to"), "intValue")), b.if_(b.greaterThanEqual(14600, b.localVariable("self1"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14601, int.class, "i", b.localVariable("self1"))), b.greaterThanEqual(14601, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14601, b.localVariable("i"))), b.block(b.functionCall(14602, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14605, b.new_(14605, GroovyRuntimeException.class, b.plus(14605, b.plus(14605, b.plus(14605, b.plus(14605, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void downto(long self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { - DefaultGroovyMethods.downto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$downto__long__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $downto__long__java_lang_Number__groovy_lang_Closure(long self, Number to, Closure closure) { - Builder b = new Builder(loc("downto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14619, long.class, "to1", b.functionCall(14619, b.localVariable("to"), "longValue")), b.if_(b.greaterThanEqual(14620, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14621, long.class, "i", b.localVariable("self"))), b.greaterThanEqual(14621, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14621, b.localVariable("i"))), b.block(b.functionCall(14622, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14625, b.new_(14625, GroovyRuntimeException.class, b.plus(14625, b.plus(14625, b.plus(14625, b.plus(14625, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void downto(Long self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { - DefaultGroovyMethods.downto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$downto__java_lang_Long__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $downto__java_lang_Long__java_lang_Number__groovy_lang_Closure(Long self, Number to, Closure closure) { - Builder b = new Builder(loc("downto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14639, long.class, "to1", b.functionCall(14639, b.localVariable("to"), "longValue")), b.if_(b.greaterThanEqual(14640, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14641, long.class, "i", b.localVariable("self"))), b.greaterThanEqual(14641, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14641, b.localVariable("i"))), b.block(b.functionCall(14642, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14645, b.new_(14645, GroovyRuntimeException.class, b.plus(14645, b.plus(14645, b.plus(14645, b.plus(14645, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void downto(float self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { - DefaultGroovyMethods.downto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$downto__float__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $downto__float__java_lang_Number__groovy_lang_Closure(float self, Number to, Closure closure) { - Builder b = new Builder(loc("downto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14659, float.class, "to1", b.functionCall(14659, b.localVariable("to"), "floatValue")), b.if_(b.greaterThanEqual(14660, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14661, float.class, "i", b.localVariable("self"))), b.greaterThanEqual(14661, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14661, b.localVariable("i"))), b.block(b.functionCall(14662, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14665, b.new_(14665, GroovyRuntimeException.class, b.plus(14665, b.plus(14665, b.plus(14665, b.plus(14665, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void downto(Float self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { - DefaultGroovyMethods.downto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$downto__java_lang_Float__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $downto__java_lang_Float__java_lang_Number__groovy_lang_Closure(Float self, Number to, Closure closure) { - Builder b = new Builder(loc("downto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14678, float.class, "to1", b.functionCall(14678, b.localVariable("to"), "floatValue")), b.if_(b.greaterThanEqual(14679, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14680, float.class, "i", b.localVariable("self"))), b.greaterThanEqual(14680, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14680, b.localVariable("i"))), b.block(b.functionCall(14681, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14684, b.new_(14684, GroovyRuntimeException.class, b.plus(14684, b.plus(14684, b.plus(14684, b.plus(14684, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void downto(double self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { - DefaultGroovyMethods.downto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$downto__double__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $downto__double__java_lang_Number__groovy_lang_Closure(double self, Number to, Closure closure) { - Builder b = new Builder(loc("downto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14697, double.class, "to1", b.functionCall(14697, b.localVariable("to"), "doubleValue")), b.if_(b.greaterThanEqual(14698, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14699, double.class, "i", b.localVariable("self"))), b.greaterThanEqual(14699, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14699, b.localVariable("i"))), b.block(b.functionCall(14700, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14703, b.new_(14703, GroovyRuntimeException.class, b.plus(14703, b.plus(14703, b.plus(14703, b.plus(14703, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void downto(Double self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { - DefaultGroovyMethods.downto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$downto__java_lang_Double__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $downto__java_lang_Double__java_lang_Number__groovy_lang_Closure(Double self, Number to, Closure closure) { - Builder b = new Builder(loc("downto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14716, double.class, "to1", b.functionCall(14716, b.localVariable("to"), "doubleValue")), b.if_(b.greaterThanEqual(14717, b.localVariable("self"), b.localVariable("to1")), b.block(b.forLoop(null, b.sequence(b.declareVariable(14718, double.class, "i", b.localVariable("self"))), b.greaterThanEqual(14718, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.postfixDec(14718, b.localVariable("i"))), b.block(b.functionCall(14719, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14722, b.new_(14722, GroovyRuntimeException.class, b.plus(14722, b.plus(14722, b.plus(14722, b.plus(14722, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on."))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void downto(BigInteger self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { - DefaultGroovyMethods.downto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$downto__java_math_BigInteger__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $downto__java_math_BigInteger__java_lang_Number__groovy_lang_Closure(BigInteger self, Number to, Closure closure) { - Builder b = new Builder(loc("downto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.if_(b.instanceOf(14735, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14736, BigDecimal.class, "one", b.functionCall(14736, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.declareVariable(14737, BigDecimal.class, "to1", b.cast(14737, b.localVariable("to"), BigDecimal.class, false)), b.declareVariable(14738, BigDecimal.class, "selfD", b.new_(14738, BigDecimal.class, b.localVariable("self"))), b.if_(b.greaterThanEqual(14739, b.functionCall(14739, b.localVariable("selfD"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14740, BigDecimal.class, "i", b.localVariable("selfD"))), b.greaterThanEqual(14740, b.functionCall(14740, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14740, b.localVariable("i"), b.functionCall(14740, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14741, b.localVariable("closure"), "call", b.functionCall(14741, b.localVariable("i"), "toBigInteger"))))), b.throw_(14744, b.new_(14744, GroovyRuntimeException.class, b.functionCall(14745, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to downto() cannot be greater than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.if_(b.instanceOf(14748, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14749, BigInteger.class, "one", b.functionCall(14749, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14750, BigInteger.class, "to1", b.cast(14750, b.localVariable("to"), BigInteger.class, false)), b.if_(b.greaterThanEqual(14751, b.functionCall(14751, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14752, BigInteger.class, "i", b.localVariable("self"))), b.greaterThanEqual(14752, b.functionCall(14752, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14752, b.localVariable("i"), b.functionCall(14752, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14753, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14756, b.new_(14756, GroovyRuntimeException.class, b.functionCall(14757, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to downto() cannot be greater than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))), b.block(b.declareVariable(14761, BigInteger.class, "one", b.functionCall(14761, b.constant(BigInteger.class), "valueOf", b.constant(1))), b.declareVariable(14762, BigInteger.class, "to1", b.new_(14762, BigInteger.class, b.functionCall(14762, b.localVariable("to"), "toString"))), b.if_(b.greaterThanEqual(14763, b.functionCall(14763, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14764, BigInteger.class, "i", b.localVariable("self"))), b.greaterThanEqual(14764, b.functionCall(14764, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14764, b.localVariable("i"), b.functionCall(14764, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14765, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14768, b.new_(14768, GroovyRuntimeException.class, b.functionCall(14769, b.constant(MessageFormat.class), "format", b.constant("The argument ({0}) to downto() cannot be greater than the value ({1}) it''s called on."), b.localVariable("to"), b.localVariable("self")))))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void downto(BigDecimal self, Number to, Closure closure) { - if ((!Caller.isAsynchronous(self, "downto", to, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "downto", self, to, closure))) { - DefaultGroovyMethods.downto(self, to, closure); - return ; - } - CpsDefaultGroovyMethods.$downto__java_math_BigDecimal__java_lang_Number__groovy_lang_Closure(self, to, closure); - } - - private static void $downto__java_math_BigDecimal__java_lang_Number__groovy_lang_Closure(BigDecimal self, Number to, Closure closure) { - Builder b = new Builder(loc("downto")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "closure"), b.block(b.declareVariable(14789, BigDecimal.class, "one", b.functionCall(14789, b.constant(BigDecimal.class), "valueOf", b.constant(10), b.constant(1))), b.if_(b.instanceOf(14790, b.localVariable("to"), b.constant(BigDecimal.class)), b.block(b.declareVariable(14791, BigDecimal.class, "to1", b.cast(14791, b.localVariable("to"), BigDecimal.class, false)), b.if_(b.greaterThanEqual(14792, b.functionCall(14792, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14793, BigDecimal.class, "i", b.localVariable("self"))), b.greaterThanEqual(14793, b.functionCall(14793, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14793, b.localVariable("i"), b.functionCall(14793, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14794, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14797, b.new_(14797, GroovyRuntimeException.class, b.plus(14797, b.plus(14797, b.plus(14797, b.plus(14797, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.if_(b.instanceOf(14798, b.localVariable("to"), b.constant(BigInteger.class)), b.block(b.declareVariable(14799, BigDecimal.class, "to1", b.new_(14799, BigDecimal.class, b.cast(14799, b.localVariable("to"), BigInteger.class, false))), b.if_(b.greaterThanEqual(14800, b.functionCall(14800, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14801, BigDecimal.class, "i", b.localVariable("self"))), b.greaterThanEqual(14801, b.functionCall(14801, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14801, b.localVariable("i"), b.functionCall(14801, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14802, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14805, b.new_(14805, GroovyRuntimeException.class, b.plus(14805, b.plus(14805, b.plus(14805, b.plus(14805, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))), b.block(b.declareVariable(14807, BigDecimal.class, "to1", b.new_(14807, BigDecimal.class, b.functionCall(14807, b.localVariable("to"), "toString"))), b.if_(b.greaterThanEqual(14808, b.functionCall(14808, b.localVariable("self"), "compareTo", b.localVariable("to1")), b.constant(0)), b.block(b.forLoop(null, b.sequence(b.declareVariable(14809, BigDecimal.class, "i", b.localVariable("self"))), b.greaterThanEqual(14809, b.functionCall(14809, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14809, b.localVariable("i"), b.functionCall(14809, b.localVariable("i"), "subtract", b.localVariable("one")))), b.block(b.functionCall(14810, b.localVariable("closure"), "call", b.localVariable("i"))))), b.throw_(14813, b.new_(14813, GroovyRuntimeException.class, b.plus(14813, b.plus(14813, b.plus(14813, b.plus(14813, b.constant("The argument ("), b.localVariable("to")), b.constant(") to downto() cannot be greater than the value (")), b.localVariable("self")), b.constant(") it's called on.")))))))))); - throw new CpsCallableInvocation(f, null, self, to, closure); - } - - public static void step(Number self, Number to, Number stepNumber, Closure closure) { - if ((!Caller.isAsynchronous(self, "step", to, stepNumber, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "step", self, to, stepNumber, closure))) { - DefaultGroovyMethods.step(self, to, stepNumber, closure); - return ; - } - CpsDefaultGroovyMethods.$step__java_lang_Number__java_lang_Number__java_lang_Number__groovy_lang_Closure(self, to, stepNumber, closure); - } - - private static void $step__java_lang_Number__java_lang_Number__java_lang_Number__groovy_lang_Closure(Number self, Number to, Number stepNumber, Closure closure) { - Builder b = new Builder(loc("step")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "to", "stepNumber", "closure"), b.block(b.if_(b.logicalOr(14832, b.logicalOr(14832, b.instanceOf(14832, b.localVariable("self"), b.constant(BigDecimal.class)), b.instanceOf(14832, b.localVariable("to"), b.constant(BigDecimal.class))), b.instanceOf(14832, b.localVariable("stepNumber"), b.constant(BigDecimal.class))), b.block(b.declareVariable(14833, BigDecimal.class, "zero", b.functionCall(14833, b.constant(BigDecimal.class), "valueOf", b.constant(0), b.constant(1))), b.declareVariable(14834, BigDecimal.class, "self1", b.ternaryOp(b.instanceOf(14834, b.localVariable("self"), b.constant(BigDecimal.class)), b.cast(14834, b.localVariable("self"), BigDecimal.class, false), b.new_(14834, BigDecimal.class, b.functionCall(14834, b.localVariable("self"), "toString")))), b.declareVariable(14835, BigDecimal.class, "to1", b.ternaryOp(b.instanceOf(14835, b.localVariable("to"), b.constant(BigDecimal.class)), b.cast(14835, b.localVariable("to"), BigDecimal.class, false), b.new_(14835, BigDecimal.class, b.functionCall(14835, b.localVariable("to"), "toString")))), b.declareVariable(14836, BigDecimal.class, "stepNumber1", b.ternaryOp(b.instanceOf(14836, b.localVariable("stepNumber"), b.constant(BigDecimal.class)), b.cast(14836, b.localVariable("stepNumber"), BigDecimal.class, false), b.new_(14836, BigDecimal.class, b.functionCall(14836, b.localVariable("stepNumber"), "toString")))), b.if_(b.logicalAnd(14837, b.greaterThan(14837, b.functionCall(14837, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.greaterThan(14837, b.functionCall(14837, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14838, BigDecimal.class, "i", b.localVariable("self1"))), b.lessThan(14838, b.functionCall(14838, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14838, b.localVariable("i"), b.functionCall(14838, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14839, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.logicalAnd(14841, b.lessThan(14841, b.functionCall(14841, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.lessThan(14841, b.functionCall(14841, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14842, BigDecimal.class, "i", b.localVariable("self1"))), b.greaterThan(14842, b.functionCall(14842, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14842, b.localVariable("i"), b.functionCall(14842, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14843, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.compareNotEqual(14845, b.functionCall(14845, b.localVariable("self1"), "compareTo", b.localVariable("to1")), b.constant(0)), b.throw_(14846, b.new_(14846, GroovyRuntimeException.class, b.plus(14846, b.plus(14846, b.plus(14846, b.plus(14846, b.plus(14846, b.plus(14846, b.constant("Infinite loop in "), b.localVariable("self1")), b.constant(".step(")), b.localVariable("to1")), b.constant(", ")), b.localVariable("stepNumber1")), b.constant(")")))))))), b.if_(b.logicalOr(14847, b.logicalOr(14847, b.instanceOf(14847, b.localVariable("self"), b.constant(BigInteger.class)), b.instanceOf(14847, b.localVariable("to"), b.constant(BigInteger.class))), b.instanceOf(14847, b.localVariable("stepNumber"), b.constant(BigInteger.class))), b.block(b.declareVariable(14848, BigInteger.class, "zero", b.functionCall(14848, b.constant(BigInteger.class), "valueOf", b.constant(0))), b.declareVariable(14849, BigInteger.class, "self1", b.ternaryOp(b.instanceOf(14849, b.localVariable("self"), b.constant(BigInteger.class)), b.cast(14849, b.localVariable("self"), BigInteger.class, false), b.new_(14849, BigInteger.class, b.functionCall(14849, b.localVariable("self"), "toString")))), b.declareVariable(14850, BigInteger.class, "to1", b.ternaryOp(b.instanceOf(14850, b.localVariable("to"), b.constant(BigInteger.class)), b.cast(14850, b.localVariable("to"), BigInteger.class, false), b.new_(14850, BigInteger.class, b.functionCall(14850, b.localVariable("to"), "toString")))), b.declareVariable(14851, BigInteger.class, "stepNumber1", b.ternaryOp(b.instanceOf(14851, b.localVariable("stepNumber"), b.constant(BigInteger.class)), b.cast(14851, b.localVariable("stepNumber"), BigInteger.class, false), b.new_(14851, BigInteger.class, b.functionCall(14851, b.localVariable("stepNumber"), "toString")))), b.if_(b.logicalAnd(14852, b.greaterThan(14852, b.functionCall(14852, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.greaterThan(14852, b.functionCall(14852, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14853, BigInteger.class, "i", b.localVariable("self1"))), b.lessThan(14853, b.functionCall(14853, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14853, b.localVariable("i"), b.functionCall(14853, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14854, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.logicalAnd(14856, b.lessThan(14856, b.functionCall(14856, b.localVariable("stepNumber1"), "compareTo", b.localVariable("zero")), b.constant(0)), b.lessThan(14856, b.functionCall(14856, b.localVariable("to1"), "compareTo", b.localVariable("self1")), b.constant(0))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14857, BigInteger.class, "i", b.localVariable("self1"))), b.greaterThan(14857, b.functionCall(14857, b.localVariable("i"), "compareTo", b.localVariable("to1")), b.constant(0)), b.sequence(b.assign(14857, b.localVariable("i"), b.functionCall(14857, b.localVariable("i"), "add", b.localVariable("stepNumber1")))), b.block(b.functionCall(14858, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.compareNotEqual(14860, b.functionCall(14860, b.localVariable("self1"), "compareTo", b.localVariable("to1")), b.constant(0)), b.throw_(14861, b.new_(14861, GroovyRuntimeException.class, b.plus(14861, b.plus(14861, b.plus(14861, b.plus(14861, b.plus(14861, b.plus(14861, b.constant("Infinite loop in "), b.localVariable("self1")), b.constant(".step(")), b.localVariable("to1")), b.constant(", ")), b.localVariable("stepNumber1")), b.constant(")")))))))), b.block(b.declareVariable(14863, int.class, "self1", b.functionCall(14863, b.localVariable("self"), "intValue")), b.declareVariable(14864, int.class, "to1", b.functionCall(14864, b.localVariable("to"), "intValue")), b.declareVariable(14865, int.class, "stepNumber1", b.functionCall(14865, b.localVariable("stepNumber"), "intValue")), b.if_(b.logicalAnd(14866, b.greaterThan(14866, b.localVariable("stepNumber1"), b.constant(0)), b.greaterThan(14866, b.localVariable("to1"), b.localVariable("self1"))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14867, int.class, "i", b.localVariable("self1"))), b.lessThan(14867, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.plusEqual(14867, b.localVariable("i"), b.localVariable("stepNumber1"))), b.block(b.functionCall(14868, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.logicalAnd(14870, b.lessThan(14870, b.localVariable("stepNumber1"), b.constant(0)), b.lessThan(14870, b.localVariable("to1"), b.localVariable("self1"))), b.block(b.forLoop(null, b.sequence(b.declareVariable(14871, int.class, "i", b.localVariable("self1"))), b.greaterThan(14871, b.localVariable("i"), b.localVariable("to1")), b.sequence(b.plusEqual(14871, b.localVariable("i"), b.localVariable("stepNumber1"))), b.block(b.functionCall(14872, b.localVariable("closure"), "call", b.localVariable("i"))))), b.if_(b.compareNotEqual(14874, b.localVariable("self1"), b.localVariable("to1")), b.throw_(14875, b.new_(14875, GroovyRuntimeException.class, b.plus(14875, b.plus(14875, b.plus(14875, b.plus(14875, b.plus(14875, b.plus(14875, b.constant("Infinite loop in "), b.localVariable("self1")), b.constant(".step(")), b.localVariable("to1")), b.constant(", ")), b.localVariable("stepNumber1")), b.constant(")")))))))))))); - throw new CpsCallableInvocation(f, null, self, to, stepNumber, closure); - } - - public static TimerTask runAfter(Timer timer, int delay, Closure closure) { - if ((!Caller.isAsynchronous(timer, "runAfter", delay, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "runAfter"))) { - return DefaultGroovyMethods.runAfter(timer, delay, closure); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyMethods.runAfter(java.util.Timer,int,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public static void eachByte(Byte[] self, Closure closure) { - if ((!Caller.isAsynchronous(self, "eachByte", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachByte", self, closure))) { - DefaultGroovyMethods.eachByte(self, closure); - return ; - } - CpsDefaultGroovyMethods.$eachByte__java_lang_Byte_array__groovy_lang_Closure(self, closure); - } - - private static void $eachByte__java_lang_Byte_array__groovy_lang_Closure(Byte[] self, Closure closure) { - Builder b = new Builder(loc("eachByte")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(15353, CpsDefaultGroovyMethods.class, "$each__java_lang_Byte_array__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static void eachByte(byte[] self, Closure closure) { - if ((!Caller.isAsynchronous(self, "eachByte", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "eachByte", self, closure))) { - DefaultGroovyMethods.eachByte(self, closure); - return ; - } - CpsDefaultGroovyMethods.$eachByte__byte_array__groovy_lang_Closure(self, closure); - } - - private static void $eachByte__byte_array__groovy_lang_Closure(byte[] self, Closure closure) { - Builder b = new Builder(loc("eachByte")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.staticCall(15365, CpsDefaultGroovyMethods.class, "$each__byte_array__groovy_lang_Closure", b.localVariable("self"), b.localVariable("closure")))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static int findIndexOf(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "findIndexOf", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexOf", self, closure))) { - return DefaultGroovyMethods.findIndexOf(self, closure); - } - return CpsDefaultGroovyMethods.$findIndexOf__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private static int $findIndexOf__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("findIndexOf")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15378, CpsDefaultGroovyMethods.class, "$findIndexOf__java_lang_Object__int__groovy_lang_Closure", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static int findIndexOf(Object self, int startIndex, Closure closure) { - if ((!Caller.isAsynchronous(self, "findIndexOf", startIndex, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexOf", self, startIndex, closure))) { - return DefaultGroovyMethods.findIndexOf(self, startIndex, closure); - } - return CpsDefaultGroovyMethods.$findIndexOf__java_lang_Object__int__groovy_lang_Closure(self, startIndex, closure); - } - - private static int $findIndexOf__java_lang_Object__int__groovy_lang_Closure(Object self, int startIndex, Closure closure) { - Builder b = new Builder(loc("findIndexOf")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "startIndex", "closure"), b.block(b.declareVariable(15393, int.class, "result", b.constant(-1)), b.declareVariable(15394, int.class, "i", b.constant(0)), b.declareVariable(15395, BooleanClosureWrapper.class, "bcw", b.new_(15395, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(15396, Iterator.class, "iter", b.functionCall(15396, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(15396, b.localVariable("iter"), "hasNext"), b.sequence(b.postfixInc(15396, b.localVariable("i"))), b.block(b.declareVariable(15397, Object.class, "value", b.functionCall(15397, b.localVariable("iter"), "next")), b.if_(b.lessThan(15398, b.localVariable("i"), b.localVariable("startIndex")), b.block(b.continue_(null))), b.if_(b.functionCall(15401, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.assign(15402, b.localVariable("result"), b.localVariable("i")), b.break_(null))))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, startIndex, closure); - } - - public static int findLastIndexOf(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "findLastIndexOf", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findLastIndexOf", self, closure))) { - return DefaultGroovyMethods.findLastIndexOf(self, closure); - } - return CpsDefaultGroovyMethods.$findLastIndexOf__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private static int $findLastIndexOf__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("findLastIndexOf")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15419, CpsDefaultGroovyMethods.class, "$findLastIndexOf__java_lang_Object__int__groovy_lang_Closure", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static int findLastIndexOf(Object self, int startIndex, Closure closure) { - if ((!Caller.isAsynchronous(self, "findLastIndexOf", startIndex, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findLastIndexOf", self, startIndex, closure))) { - return DefaultGroovyMethods.findLastIndexOf(self, startIndex, closure); - } - return CpsDefaultGroovyMethods.$findLastIndexOf__java_lang_Object__int__groovy_lang_Closure(self, startIndex, closure); - } - - private static int $findLastIndexOf__java_lang_Object__int__groovy_lang_Closure(Object self, int startIndex, Closure closure) { - Builder b = new Builder(loc("findLastIndexOf")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "startIndex", "closure"), b.block(b.declareVariable(15434, int.class, "result", b.constant(-1)), b.declareVariable(15435, int.class, "i", b.constant(0)), b.declareVariable(15436, BooleanClosureWrapper.class, "bcw", b.new_(15436, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(15437, Iterator.class, "iter", b.functionCall(15437, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(15437, b.localVariable("iter"), "hasNext"), b.sequence(b.postfixInc(15437, b.localVariable("i"))), b.block(b.declareVariable(15438, Object.class, "value", b.functionCall(15438, b.localVariable("iter"), "next")), b.if_(b.lessThan(15439, b.localVariable("i"), b.localVariable("startIndex")), b.block(b.continue_(null))), b.if_(b.functionCall(15442, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.assign(15443, b.localVariable("result"), b.localVariable("i")))))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, startIndex, closure); - } - - public static List findIndexValues(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "findIndexValues", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexValues", self, closure))) { - return DefaultGroovyMethods.findIndexValues(self, closure); - } - return CpsDefaultGroovyMethods.$findIndexValues__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private static List $findIndexValues__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("findIndexValues")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.return_(b.staticCall(15459, CpsDefaultGroovyMethods.class, "$findIndexValues__java_lang_Object__java_lang_Number__groovy_lang_Closure", b.localVariable("self"), b.constant(0), b.localVariable("closure"))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static List findIndexValues(Object self, Number startIndex, Closure closure) { - if ((!Caller.isAsynchronous(self, "findIndexValues", startIndex, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "findIndexValues", self, startIndex, closure))) { - return DefaultGroovyMethods.findIndexValues(self, startIndex, closure); - } - return CpsDefaultGroovyMethods.$findIndexValues__java_lang_Object__java_lang_Number__groovy_lang_Closure(self, startIndex, closure); - } - - private static List $findIndexValues__java_lang_Object__java_lang_Number__groovy_lang_Closure(Object self, Number startIndex, Closure closure) { - Builder b = new Builder(loc("findIndexValues")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "startIndex", "closure"), b.block(b.declareVariable(15474, List.class, "result", b.new_(15474, ArrayList.class)), b.declareVariable(15475, long.class, "count", b.constant(0)), b.declareVariable(15476, long.class, "startCount", b.functionCall(15476, b.localVariable("startIndex"), "longValue")), b.declareVariable(15477, BooleanClosureWrapper.class, "bcw", b.new_(15477, BooleanClosureWrapper.class, b.localVariable("closure"))), b.forLoop(null, b.sequence(b.declareVariable(15478, Iterator.class, "iter", b.functionCall(15478, b.constant(InvokerHelper.class), "asIterator", b.localVariable("self")))), b.functionCall(15478, b.localVariable("iter"), "hasNext"), b.sequence(b.postfixInc(15478, b.localVariable("count"))), b.block(b.declareVariable(15479, Object.class, "value", b.functionCall(15479, b.localVariable("iter"), "next")), b.if_(b.lessThan(15480, b.localVariable("count"), b.localVariable("startCount")), b.block(b.continue_(null))), b.if_(b.functionCall(15483, b.localVariable("bcw"), "call", b.localVariable("value")), b.block(b.functionCall(15484, b.localVariable("result"), "add", b.localVariable("count")))))), b.return_(b.localVariable("result")))); - throw new CpsCallableInvocation(f, null, self, startIndex, closure); - } - - public static MetaClass metaClass(Class self, Closure closure) { - if ((!Caller.isAsynchronous(self, "metaClass", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "metaClass", self, closure))) { - return DefaultGroovyMethods.metaClass(self, closure); - } - return CpsDefaultGroovyMethods.$metaClass__java_lang_Class__groovy_lang_Closure(self, closure); - } - - private static MetaClass $metaClass__java_lang_Class__groovy_lang_Closure(Class self, Closure closure) { - Builder b = new Builder(loc("metaClass")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(15769, MetaClassRegistry.class, "metaClassRegistry", b.functionCall(15769, b.constant(GroovySystem.class), "getMetaClassRegistry")), b.declareVariable(15770, MetaClass.class, "mc", b.functionCall(15770, b.localVariable("metaClassRegistry"), "getMetaClass", b.localVariable("self"))), b.if_(b.instanceOf(15772, b.localVariable("mc"), b.constant(ExpandoMetaClass.class)), b.block(b.functionCall(15773, b.cast(15773, b.localVariable("mc"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("mc"))), b.block(b.if_(b.logicalAnd(15777, b.instanceOf(15777, b.localVariable("mc"), b.constant(DelegatingMetaClass.class)), b.instanceOf(15777, b.functionCall(15777, b.cast(15777, b.localVariable("mc"), DelegatingMetaClass.class, false), "getAdaptee"), b.constant(ExpandoMetaClass.class))), b.block(b.functionCall(15778, b.cast(15778, b.functionCall(15778, b.cast(15778, b.localVariable("mc"), DelegatingMetaClass.class, false), "getAdaptee"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("mc"))), b.block(b.if_(b.logicalAnd(15782, b.instanceOf(15782, b.localVariable("mc"), b.constant(DelegatingMetaClass.class)), b.compareEqual(15782, b.functionCall(15782, b.functionCall(15782, b.cast(15782, b.localVariable("mc"), DelegatingMetaClass.class, false), "getAdaptee"), "getClass"), b.property(15782, b.constant(MetaClassImpl.class), "class"))), b.block(b.declareVariable(15783, ExpandoMetaClass.class, "emc", b.new_(15783, ExpandoMetaClass.class, b.localVariable("self"), b.constant(false), b.constant(true))), b.functionCall(15784, b.localVariable("emc"), "initialize"), b.functionCall(15785, b.localVariable("emc"), "define", b.localVariable("closure")), b.functionCall(15786, b.cast(15786, b.localVariable("mc"), DelegatingMetaClass.class, false), "setAdaptee", b.localVariable("emc")), b.return_(b.localVariable("mc"))), b.block(b.if_(b.compareEqual(15790, b.functionCall(15790, b.localVariable("mc"), "getClass"), b.property(15790, b.constant(MetaClassImpl.class), "class")), b.block(b.assign(15792, b.localVariable("mc"), b.new_(15792, ExpandoMetaClass.class, b.localVariable("self"), b.constant(false), b.constant(true))), b.functionCall(15793, b.localVariable("mc"), "initialize"), b.functionCall(15794, b.cast(15794, b.localVariable("mc"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.functionCall(15795, b.localVariable("metaClassRegistry"), "setMetaClass", b.localVariable("self"), b.localVariable("mc")), b.return_(b.localVariable("mc"))), b.block(b.throw_(15799, b.new_(15799, GroovyRuntimeException.class, b.plus(15799, b.constant("Can't add methods to custom meta class "), b.localVariable("mc")))))))))))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - public static MetaClass metaClass(Object self, Closure closure) { - if ((!Caller.isAsynchronous(self, "metaClass", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyMethods.class, "metaClass", self, closure))) { - return DefaultGroovyMethods.metaClass(self, closure); - } - return CpsDefaultGroovyMethods.$metaClass__java_lang_Object__groovy_lang_Closure(self, closure); - } - - private static MetaClass $metaClass__java_lang_Object__groovy_lang_Closure(Object self, Closure closure) { - Builder b = new Builder(loc("metaClass")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "closure"), b.block(b.declareVariable(15816, MetaClass.class, "emc", b.staticCall(15816, CpsDefaultGroovyMethods.class, "$hasPerInstanceMetaClass__java_lang_Object", b.localVariable("self"))), b.if_(b.compareEqual(15817, b.localVariable("emc"), b.constant(null)), b.block(b.declareVariable(15818, ExpandoMetaClass.class, "metaClass", b.new_(15818, ExpandoMetaClass.class, b.functionCall(15818, b.localVariable("self"), "getClass"), b.constant(false), b.constant(true))), b.functionCall(15819, b.localVariable("metaClass"), "initialize"), b.functionCall(15820, b.localVariable("metaClass"), "define", b.localVariable("closure")), b.if_(b.instanceOf(15821, b.localVariable("self"), b.constant(GroovyObject.class)), b.block(b.staticCall(15822, CpsDefaultGroovyMethods.class, "$setMetaClass__groovy_lang_GroovyObject__groovy_lang_MetaClass", b.cast(15822, b.localVariable("self"), GroovyObject.class, false), b.localVariable("metaClass"))), b.block(b.staticCall(15824, CpsDefaultGroovyMethods.class, "$setMetaClass__java_lang_Object__groovy_lang_MetaClass", b.localVariable("self"), b.localVariable("metaClass")))), b.return_(b.localVariable("metaClass"))), b.block(b.if_(b.instanceOf(15829, b.localVariable("emc"), b.constant(ExpandoMetaClass.class)), b.block(b.functionCall(15830, b.cast(15830, b.localVariable("emc"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("emc"))), b.block(b.if_(b.logicalAnd(15834, b.instanceOf(15834, b.localVariable("emc"), b.constant(DelegatingMetaClass.class)), b.instanceOf(15834, b.functionCall(15834, b.cast(15834, b.localVariable("emc"), DelegatingMetaClass.class, false), "getAdaptee"), b.constant(ExpandoMetaClass.class))), b.block(b.functionCall(15835, b.cast(15835, b.functionCall(15835, b.cast(15835, b.localVariable("emc"), DelegatingMetaClass.class, false), "getAdaptee"), ExpandoMetaClass.class, false), "define", b.localVariable("closure")), b.return_(b.localVariable("emc"))), b.block(b.throw_(15839, b.new_(15839, RuntimeException.class, b.plus(15839, b.constant("Can't add methods to non-ExpandoMetaClass "), b.localVariable("emc")))))))))))); - throw new CpsCallableInvocation(f, null, self, closure); - } - - private static MethodLocation loc(String methodName) { - return new MethodLocation(CpsDefaultGroovyMethods.class, methodName); - } - -} diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyStaticMethods.java b/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyStaticMethods.java deleted file mode 100644 index 6d099428a..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/CpsDefaultGroovyStaticMethods.java +++ /dev/null @@ -1,82 +0,0 @@ - -package com.cloudbees.groovy.cps; - -import java.util.Arrays; -import javax.annotation.Generated; -import com.cloudbees.groovy.cps.impl.Caller; -import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; -import com.cloudbees.groovy.cps.impl.CpsFunction; -import groovy.lang.Closure; -import org.codehaus.groovy.runtime.DefaultGroovyStaticMethods; - -@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Mon May 15 17:17:37 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") -public class CpsDefaultGroovyStaticMethods { - - - public static Thread start(Thread self, Closure closure) { - if ((!Caller.isAsynchronous(self, "start", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "start"))) { - return DefaultGroovyStaticMethods.start(self, closure); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.start(java.lang.Thread,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public static Thread start(Thread self, String name, Closure closure) { - if ((!Caller.isAsynchronous(self, "start", name, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "start"))) { - return DefaultGroovyStaticMethods.start(self, name, closure); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.start(java.lang.Thread,java.lang.String,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public static Thread startDaemon(Thread self, Closure closure) { - if ((!Caller.isAsynchronous(self, "startDaemon", closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "startDaemon"))) { - return DefaultGroovyStaticMethods.startDaemon(self, closure); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.startDaemon(java.lang.Thread,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public static Thread startDaemon(Thread self, String name, Closure closure) { - if ((!Caller.isAsynchronous(self, "startDaemon", name, closure))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "startDaemon"))) { - return DefaultGroovyStaticMethods.startDaemon(self, name, closure); - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.startDaemon(java.lang.Thread,java.lang.String,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - static Thread createThread(String name, boolean daemon, Closure closure) { - return CpsDefaultGroovyStaticMethods.$createThread__java_lang_String__boolean__groovy_lang_Closure(name, daemon, closure); - } - - private static Thread $createThread__java_lang_String__boolean__groovy_lang_Closure(String name, boolean daemon, Closure closure) { - Builder b = new Builder(loc("createThread")); - CpsFunction f = new CpsFunction(Arrays.asList("name", "daemon", "closure"), b.block(b.declareVariable(86, Thread.class, "thread", b.ternaryOp(b.compareNotEqual(86, b.localVariable("name"), b.constant(null)), b.new_(86, Thread.class, b.localVariable("closure"), b.localVariable("name")), b.new_(87, Thread.class, b.localVariable("closure")))), b.if_(b.localVariable("daemon"), b.functionCall(87, b.localVariable("thread"), "setDaemon", b.constant(true))), b.functionCall(88, b.localVariable("thread"), "start"), b.return_(b.localVariable("thread")))); - throw new CpsCallableInvocation(f, null, name, daemon, closure); - } - - static void sleepImpl(long millis, Closure closure) { - CpsDefaultGroovyStaticMethods.$sleepImpl__long__groovy_lang_Closure(millis, closure); - } - - private static void $sleepImpl__long__groovy_lang_Closure(long millis, Closure closure) { - Builder b = new Builder(loc("sleepImpl")); - CpsFunction f = new CpsFunction(Arrays.asList("millis", "closure"), b.block(b.declareVariable(113, long.class, "start", b.functionCall(114, b.constant(System.class), "currentTimeMillis")), b.declareVariable(115, long.class, "rest", b.localVariable("millis")), b.declareVariable(116, long.class, "current", null), b.while_(null, b.greaterThan(117, b.localVariable("rest"), b.constant(0)), b.block(b.tryCatch(b.block(b.functionCall(119, b.constant(Thread.class), "sleep", b.localVariable("rest")), b.assign(121, b.localVariable("rest"), b.constant(0))), null))))); - throw new CpsCallableInvocation(f, null, millis, closure); - } - - public static void sleep(Object self, long milliseconds, Closure onInterrupt) { - if ((!Caller.isAsynchronous(self, "sleep", milliseconds, onInterrupt))&&(!Caller.isAsynchronous(CpsDefaultGroovyStaticMethods.class, "sleep", self, milliseconds, onInterrupt))) { - DefaultGroovyStaticMethods.sleep(self, milliseconds, onInterrupt); - return ; - } - CpsDefaultGroovyStaticMethods.$sleep__java_lang_Object__long__groovy_lang_Closure(self, milliseconds, onInterrupt); - } - - private static void $sleep__java_lang_Object__long__groovy_lang_Closure(Object self, long milliseconds, Closure onInterrupt) { - Builder b = new Builder(loc("sleep")); - CpsFunction f = new CpsFunction(Arrays.asList("self", "milliseconds", "onInterrupt"), b.block(b.staticCall(149, CpsDefaultGroovyStaticMethods.class, "$sleepImpl__long__groovy_lang_Closure", b.localVariable("milliseconds"), b.localVariable("onInterrupt")))); - throw new CpsCallableInvocation(f, null, self, milliseconds, onInterrupt); - } - - private static MethodLocation loc(String methodName) { - return new MethodLocation(CpsDefaultGroovyStaticMethods.class, methodName); - } - -} diff --git a/src/main/java/com/cloudbees/groovy/cps/CpsProcessGroovyMethods.java b/src/main/java/com/cloudbees/groovy/cps/CpsProcessGroovyMethods.java deleted file mode 100644 index f4cde6d2c..000000000 --- a/src/main/java/com/cloudbees/groovy/cps/CpsProcessGroovyMethods.java +++ /dev/null @@ -1,33 +0,0 @@ - -package com.cloudbees.groovy.cps; - -import javax.annotation.Generated; -import com.cloudbees.groovy.cps.impl.Caller; -import groovy.lang.Closure; -import org.codehaus.groovy.runtime.ProcessGroovyMethods; - -@Generated(value = "com.cloudbees.groovy.cps.tool.Translator", date = "Mon May 15 17:17:37 EDT 2017", comments = "based on groovy-2.4.7-sources.jar") -public class CpsProcessGroovyMethods { - - - public static void withWriter(Process self, Closure closure) { - if ((!Caller.isAsynchronous(self, "withWriter", closure))&&(!Caller.isAsynchronous(CpsProcessGroovyMethods.class, "withWriter"))) { - ProcessGroovyMethods.withWriter(self, closure); - return ; - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.ProcessGroovyMethods.withWriter(java.lang.Process,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - public static void withOutputStream(Process self, Closure closure) { - if ((!Caller.isAsynchronous(self, "withOutputStream", closure))&&(!Caller.isAsynchronous(CpsProcessGroovyMethods.class, "withOutputStream"))) { - ProcessGroovyMethods.withOutputStream(self, closure); - return ; - } - throw new UnsupportedOperationException("org.codehaus.groovy.runtime.ProcessGroovyMethods.withOutputStream(java.lang.Process,groovy.lang.Closure) is not yet supported for translation; use another idiom, or wrap in @NonCPS"); - } - - private static MethodLocation loc(String methodName) { - return new MethodLocation(CpsProcessGroovyMethods.class, methodName); - } - -} From 33797605df3e40a3498fec6b704223870af6d8a9 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 17 May 2017 14:15:04 -0400 Subject: [PATCH 415/932] Make it possible to run `mvn -Dtest=CpsDefaultGroovyMethodsTest package` at root level. --- dgm-builder/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 3c59fb618..27c159939 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -49,6 +49,13 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + false + + From eef9030a20127c16a9c5d7fbd2a15966e1ae17b0 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 17 May 2017 14:40:13 -0400 Subject: [PATCH 416/932] Method selection as currently conceived is better handled by Translator. --- .../com/cloudbees/groovy/cps/tool/Driver.java | 29 --------- .../cloudbees/groovy/cps/tool/Translator.java | 64 +++++++++++-------- 2 files changed, 39 insertions(+), 54 deletions(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java index 88230cb10..17836af9c 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java @@ -6,14 +6,9 @@ import com.sun.tools.javac.file.JavacFileManager; import com.sun.tools.javac.file.RelativePath.RelativeDirectory; import com.sun.tools.javac.file.ZipArchive; -import groovy.lang.Closure; import groovy.lang.GroovyShell; import hudson.remoting.Which; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.type.DeclaredType; import javax.tools.DiagnosticListener; import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; @@ -26,14 +21,10 @@ import java.util.List; import java.util.Locale; import java.util.Set; -import java.util.function.Predicate; import java.util.zip.ZipFile; import static java.util.Arrays.*; -/** - * @author Kohsuke Kawaguchi - */ public class Driver { public static void main(String[] args) throws Exception { new Driver().run(new File(args[0])); @@ -69,30 +60,10 @@ public void run(File dir) throws Exception { Translator t = new Translator(javac.getTask(null, fileManager, errorListener, options, null, src)); - final DeclaredType closureType = t.types.getDeclaredType(t.elements.getTypeElement(Closure.class.getName())); - - // TODO move all this into Translator - Predicate selector = (e) -> { - boolean r = - // Only interested here in methods; not currently handling nested classes. - e.getKind() == ElementKind.METHOD - // Top-level invocations can only be to public static methods. But some private/protected static helper methods need translation, too. - && e.getModifiers().contains(Modifier.STATIC) - // Has a Closure parameter in one of the arguments (not in the receiver). - // TODO need to accept nonpublic (helper) methods taking Closure as the first parameter. In fact may need to accept any helper methods. - && e.getParameters().subList(1, e.getParameters().size()).stream() - .anyMatch(p -> t.types.isAssignable(p.asType(), closureType)) - // Ran into problems resolving overloads from these methods. TODO might be obsolete with new overload delegation system. - && e.getAnnotation(Deprecated.class) == null; - //System.err.println("Translating " + e + "? " + r); - return r; - }; - for (String name : fileNames) { t.translate( "org.codehaus.groovy.runtime."+name, "com.cloudbees.groovy.cps.Cps"+name, - selector, e -> !EXCLUSIONS.contains(e.getEnclosingElement().getSimpleName().toString() + "." + e.getSimpleName().toString()), groovySrcJar.getName()); } diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 0ec26cad3..eb603503d 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -62,6 +62,7 @@ import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCFieldAccess; import com.sun.tools.javac.tree.JCTree.JCIdent; +import groovy.lang.Closure; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; @@ -90,20 +91,19 @@ import java.util.Map; import java.util.function.Predicate; import javax.annotation.Generated; +import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; /** - * Generates {@code CpsDefaultGroovyMethods} from the source code of {@code DefaultGroovyMethods}. - * - * @author Kohsuke Kawaguchi + * Generates, for example, {@code CpsDefaultGroovyMethods} from the source code of {@code DefaultGroovyMethods}. */ @SuppressWarnings("Since15") public class Translator { - public final Types types; - public final Elements elements; - public final Trees trees; - public final JavacTask javac; + private final Types types; + private final Elements elements; + private final Trees trees; + private final JavacTask javac; private final JCodeModel codeModel = new JCodeModel(); @@ -113,6 +113,8 @@ public class Translator { private final JClass $CpsCallableInvocation; private final JClass $Builder; private final JClass $CatchExpression; + private final DeclaredType closureType; + /** * Parsed source files. @@ -134,6 +136,7 @@ public Translator(CompilationTask task) throws IOException { trees = Trees.instance(javac); elements = javac.getElements(); types = javac.getTypes(); + closureType = types.getDeclaredType(elements.getTypeElement(Closure.class.getName())); this.parsed = javac.parse(); javac.analyze(); @@ -142,7 +145,7 @@ public Translator(CompilationTask task) throws IOException { /** * Transforms a single class. */ - public void translate(String fqcn, String outfqcn, Predicate methodSelector, Predicate supportedSelector, String sourceJarName) throws JClassAlreadyExistsException { + public void translate(String fqcn, String outfqcn, Predicate supportedSelector, String sourceJarName) throws JClassAlreadyExistsException { // TODO avoid calling _class until we have confirmed we are selecting at least one method final JDefinedClass $output = codeModel._class(outfqcn); $output.annotate(Generated.class).param("value", Translator.class.getName()).param("date", new Date().toString()).param("comments", "based on " + sourceJarName); @@ -151,13 +154,24 @@ public void translate(String fqcn, String outfqcn, Predicate ClassSymbol dgm = (ClassSymbol) elements.getTypeElement(fqcn); dgm.accept(new ElementScanner7() { + @Override public Void visitExecutable(ExecutableElement e, Void __) { - if (methodSelector.test(e)) { - try { - translateMethod(dgmCut, e, $output, fqcn, supportedSelector.test(e)); - } catch (Exception x) { - throw new RuntimeException("Unable to transform "+fqcn+"."+e, x); - } + if (e.getKind() != ElementKind.METHOD) { + return null; // Only interested here in methods; not currently handling nested classes. + } + if (!e.getModifiers().contains(Modifier.STATIC)) { + return null; // Top-level invocations can only be public static methods. But some private/protected static helper methods need translation, too. + } + if (!e.getParameters().subList(1, e.getParameters().size()).stream().anyMatch(p -> types.isAssignable(p.asType(), closureType))) { + return null; // Do not translate methods not taking Closure as an argument (ignore receivers). + } + if (e.getAnnotation(Deprecated.class) != null) { + return null; // Ran into problems resolving overloads from these methods. TODO might be obsolete with new overload delegation system. + } + try { + translateMethod(dgmCut, e, $output, fqcn, supportedSelector.test(e)); + } catch (Exception x) { + throw new RuntimeException("Unable to transform "+fqcn+"."+e, x); } return null; } @@ -235,17 +249,17 @@ private void translateMethod(final CompilationUnitTree cut, ExecutableElement e, /* If the call to this method happen outside CPS code, execute normally via DefaultGroovyMethods */ - delegating.body()._if(JOp.cand( - JOp.not($Caller.staticInvoke("isAsynchronous").tap(inv -> { - inv.arg(delegatingParams.get(0)); - inv.arg(methodName); - for (int i = 1; i < delegatingParams.size(); i++) - inv.arg(delegatingParams.get(i)); - })), - JOp.not($Caller.staticInvoke("isAsynchronous") - .arg($output.dotclass()) - .arg(methodName) - .args(params)) + delegating.body()._if(JOp.cand( + JOp.not($Caller.staticInvoke("isAsynchronous").tap(inv -> { + inv.arg(delegatingParams.get(0)); + inv.arg(methodName); + for (int i = 1; i < delegatingParams.size(); i++) + inv.arg(delegatingParams.get(i)); + })), + JOp.not($Caller.staticInvoke("isAsynchronous") + .arg($output.dotclass()) + .arg(methodName) + .args(params)) ))._then().tap(blk -> { JClass $WhateverGroovyMethods = codeModel.ref(fqcn); JInvocation forward = $WhateverGroovyMethods.staticInvoke(methodName).args(delegatingParams); From 490ef7e77a2edaf9d67049c65c6460d71ec1cb8a Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 17 May 2017 14:45:39 -0400 Subject: [PATCH 417/932] Fix uniqueSet test --- .../cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy index 66c683e8e..bced5a3e1 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -307,7 +307,7 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { // .unique ["uniqueList", "[1, 2, -2, 3].unique { i -> i * i }", [1, 2, 3]], - ["uniqueSet", "([1, 2, -2, 3] as HashSet).unique { i -> i * i }", [1, 2, 3] as HashSet], + ["uniqueSet", "([1, 2, -2, 3] as HashSet).unique { i -> i * i }.collect { it.abs() } as HashSet", [1, 2, 3] as HashSet], // TODO: use? @@ -321,7 +321,7 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { assertEquals("Duplicate test names", [], rawTests.countBy { it[0] }.grep { it.value > 1}.collect { it.key }) - return rawTests.collect { it as Object[] } + return rawTests.collect { it.toArray() } } @Test From 0b5dbfe0d61f5055001a09cba555f6775fd49d68 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 May 2017 16:59:00 -0400 Subject: [PATCH 418/932] Switching from a blacklist to a whitelist for translation, and improving code generation to delegate to untranslated public methods when possible. --- .../com/cloudbees/groovy/cps/tool/Driver.java | 18 +- .../cloudbees/groovy/cps/tool/Translator.java | 147 ++++++++------ .../groovy/cps/tool/translatable.txt | 180 ++++++++++++++++++ .../com/cloudbees/groovy/cps/Continuable.java | 3 +- 4 files changed, 267 insertions(+), 81 deletions(-) create mode 100644 dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java index 17836af9c..5de67ddbb 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java @@ -1,6 +1,5 @@ package com.cloudbees.groovy.cps.tool; -import com.google.common.collect.ImmutableSet; import com.sun.codemodel.writer.FileCodeWriter; import com.sun.tools.javac.api.JavacTool; import com.sun.tools.javac.file.JavacFileManager; @@ -20,7 +19,6 @@ import java.util.Collections; import java.util.List; import java.util.Locale; -import java.util.Set; import java.util.zip.ZipFile; import static java.util.Arrays.*; @@ -41,8 +39,8 @@ public void run(File dir) throws Exception { File groovySrcJar = Which.jarFile(Driver.class.getClassLoader().getResource("groovy/lang/GroovyShell.java")); // classes to translate - // TODO include other classes mentioned in DgmConverter just in case (first see TODO in Translator.translate); and certainly StringGroovyMethods which has some Closure-based methods - List fileNames = asList("DefaultGroovyMethods", "ProcessGroovyMethods", "DefaultGroovyStaticMethods"); + // TODO include other classes mentioned in DgmConverter if they have any applicable methods; and certainly StringGroovyMethods which has some Closure-based methods + List fileNames = asList("DefaultGroovyMethods", "DefaultGroovyStaticMethods"); List src = new ArrayList<>(); ZipArchive a = new ZipArchive((JavacFileManager) fileManager, new ZipFile(groovySrcJar)); @@ -64,7 +62,6 @@ public void run(File dir) throws Exception { t.translate( "org.codehaus.groovy.runtime."+name, "com.cloudbees.groovy.cps.Cps"+name, - e -> !EXCLUSIONS.contains(e.getEnclosingElement().getSimpleName().toString() + "." + e.getSimpleName().toString()), groovySrcJar.getName()); } @@ -78,15 +75,4 @@ private DiagnosticListener createErrorListener() { return System.out::println; } - private static final Set EXCLUSIONS = ImmutableSet.of( - "DefaultGroovyMethods.runAfter", /* use anonymous inner class we can't handle */ - "DefaultGroovyMethods.accept" /* launches a thread */, - "DefaultGroovyStaticMethods.start", "DefaultGroovyStaticMethods.startDaemon", // ditto - "DefaultGroovyMethods.filterLine", /* anonymous inner classes */ - "DefaultGroovyMethods.dropWhile","DefaultGroovyMethods.takeWhile" /* TODO: translate inner classes to support this*/, - "DefaultGroovyMethods.toUnique", // ditto: UniqueIterator is private - - "ProcessGroovyMethods.withWriter", - "ProcessGroovyMethods.withOutputStream" /* anonymous inner class */ - ); } diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index eb603503d..5dc93c84d 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -1,5 +1,6 @@ package com.cloudbees.groovy.cps.tool; +import com.google.common.io.Resources; import com.sun.codemodel.CodeWriter; import com.sun.codemodel.JClass; import com.sun.codemodel.JClassAlreadyExistsException; @@ -82,14 +83,19 @@ import javax.lang.model.util.Types; import javax.tools.JavaCompiler.CompilationTask; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.function.Predicate; +import java.util.Optional; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; import javax.annotation.Generated; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; @@ -100,6 +106,15 @@ @SuppressWarnings("Since15") public class Translator { + private static final Set translatable; + static { + try { + translatable = new HashSet<>(Resources.readLines(Translator.class.getResource("translatable.txt"), StandardCharsets.UTF_8)); + } catch (IOException x) { + throw new ExceptionInInitializerError(x); + } + } + private final Types types; private final Elements elements; private final Trees trees; @@ -114,7 +129,12 @@ public class Translator { private final JClass $Builder; private final JClass $CatchExpression; private final DeclaredType closureType; - + + /** + * To allow sibling calls to overloads to be resolved properly at runtime, write the actual implementation to an overload-proof private method. + * Example key: {@code $eachByte__byte_array__groovy_lang_Closure} + */ + private final Map overloadsResolved = new TreeMap<>(); /** * Parsed source files. @@ -142,40 +162,44 @@ public Translator(CompilationTask task) throws IOException { javac.analyze(); } + private String mangledName(ExecutableElement e) { + StringBuilder overloadResolved = new StringBuilder("$").append(n(e)); + e.getParameters().forEach(ve -> { + overloadResolved.append("__").append(types.erasure(ve.asType()).toString().replace("[]", "_array").replaceAll("[^\\p{javaJavaIdentifierPart}]+", "_")); + }); + return overloadResolved.toString(); + } + /** * Transforms a single class. */ - public void translate(String fqcn, String outfqcn, Predicate supportedSelector, String sourceJarName) throws JClassAlreadyExistsException { - // TODO avoid calling _class until we have confirmed we are selecting at least one method + public void translate(String fqcn, String outfqcn, String sourceJarName) throws JClassAlreadyExistsException { final JDefinedClass $output = codeModel._class(outfqcn); $output.annotate(Generated.class).param("value", Translator.class.getName()).param("date", new Date().toString()).param("comments", "based on " + sourceJarName); + $output.annotate(SuppressWarnings.class).param("value", "rawtypes"); + $output.constructor(JMod.PRIVATE); - CompilationUnitTree dgmCut = getDefaultGroovyMethodCompilationUnitTree(parsed); + CompilationUnitTree dgmCut = getDefaultGroovyMethodCompilationUnitTree(parsed, fqcn); + overloadsResolved.clear(); ClassSymbol dgm = (ClassSymbol) elements.getTypeElement(fqcn); dgm.accept(new ElementScanner7() { @Override public Void visitExecutable(ExecutableElement e, Void __) { - if (e.getKind() != ElementKind.METHOD) { - return null; // Only interested here in methods; not currently handling nested classes. - } - if (!e.getModifiers().contains(Modifier.STATIC)) { - return null; // Top-level invocations can only be public static methods. But some private/protected static helper methods need translation, too. - } - if (!e.getParameters().subList(1, e.getParameters().size()).stream().anyMatch(p -> types.isAssignable(p.asType(), closureType))) { - return null; // Do not translate methods not taking Closure as an argument (ignore receivers). - } - if (e.getAnnotation(Deprecated.class) != null) { - return null; // Ran into problems resolving overloads from these methods. TODO might be obsolete with new overload delegation system. - } - try { - translateMethod(dgmCut, e, $output, fqcn, supportedSelector.test(e)); - } catch (Exception x) { - throw new RuntimeException("Unable to transform "+fqcn+"."+e, x); + if (translatable.contains(fqcn + "." + e)) { + overloadsResolved.put(mangledName(e), e); } return null; } },null); + // TODO verify that we actually found everything listed in translatables + overloadsResolved.forEach((overloadResolved, e) -> { + try { + translateMethod(dgmCut, e, $output, fqcn, overloadResolved); + } catch (Exception x) { + throw new RuntimeException("Unable to transform " + fqcn + "." + e, x); + } + }); /* private static MethodLocation loc(String methodName) { @@ -194,53 +218,40 @@ private static MethodLocation loc(String methodName) { * @param e * Method in {@code fqcn} to translate. */ - private void translateMethod(final CompilationUnitTree cut, ExecutableElement e, JDefinedClass $output, String fqcn, boolean supported) { + private void translateMethod(final CompilationUnitTree cut, ExecutableElement e, JDefinedClass $output, String fqcn, String overloadResolved) { String methodName = n(e); boolean isPublic = e.getModifiers().contains(Modifier.PUBLIC); - // To allow sibling calls to overloads to be resolved properly at runtime, write the actual implementation to an overload-proof private method. - StringBuilder overloadResolved = new StringBuilder("$").append(methodName); - e.getParameters().forEach(ve -> { - overloadResolved.append("__").append(types.erasure(ve.asType()).toString().replace("[]", "_array").replaceAll("[^\\p{javaJavaIdentifierPart}]+", "_")); - }); // so, e.g., $eachByte__byte_array__groovy_lang_Closure JMethod delegating = $output.method(isPublic ? JMod.PUBLIC | JMod.STATIC : JMod.STATIC, (JType) null, methodName); - JMethod m = supported ? $output.method(JMod.PRIVATE | JMod.STATIC, (JType) null, overloadResolved.toString()) : null; + JMethod m = $output.method(JMod.PRIVATE | JMod.STATIC, (JType) null, overloadResolved); Map typeVars = new HashMap<>(); e.getTypeParameters().forEach(p -> { String name = n(p); JTypeVar typeVar = delegating.generify(name); - JTypeVar typeVar2 = supported ? m.generify(name) : null; + JTypeVar typeVar2 = m.generify(name); p.getBounds().forEach(b -> { JClass binding = (JClass) t(b, typeVars); typeVar.bound(binding); - if (supported) { - typeVar2.bound(binding); - } + typeVar2.bound(binding); }); typeVars.put(name, typeVar); }); JType type = t(e.getReturnType(), typeVars); delegating.type(type); - if (supported) { - m.type(type); - } + m.type(type); List delegatingParams = new ArrayList<>(); List params = new ArrayList<>(); e.getParameters().forEach(p -> { JType paramType = t(p.asType(), typeVars); delegatingParams.add(delegating.param(paramType, n(p))); - if (supported) { - params.add(m.param(paramType, n(p))); - } + params.add(m.param(paramType, n(p))); }); e.getThrownTypes().forEach(ex -> { delegating._throws((JClass)t(ex)); - if (supported) { - m._throws((JClass)t(ex)); - } + m._throws((JClass)t(ex)); }); boolean returnsVoid = e.getReturnType().getKind() == TypeKind.VOID; @@ -273,19 +284,13 @@ private void translateMethod(final CompilationUnitTree cut, ExecutableElement e, }); } - if (supported) { - JInvocation delegateCall = $output.staticInvoke(overloadResolved.toString()); - if (returnsVoid) { - delegating.body().add(delegateCall); - } else { - delegating.body()._return(delegateCall); - } - delegatingParams.forEach(p -> delegateCall.arg(p)); + JInvocation delegateCall = $output.staticInvoke(overloadResolved); + if (returnsVoid) { + delegating.body().add(delegateCall); } else { - delegating.body()._throw(JExpr._new(codeModel.ref(UnsupportedOperationException.class)) - .arg(fqcn + "." + e + " is not yet supported for translation; use another idiom, or wrap in @NonCPS")); - return; + delegating.body()._return(delegateCall); } + delegatingParams.forEach(p -> delegateCall.arg(p)); JVar $b = m.body().decl($Builder, "b", JExpr._new($Builder).arg(JExpr.invoke("loc").arg(methodName))); JInvocation f = JExpr._new($CpsFunction); @@ -341,14 +346,30 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { .arg(n(it)); } else { // invocation on this class - StringBuilder overloadResolved = new StringBuilder("$").append(it.getName()); - it.type.getParameterTypes().forEach(t -> { - overloadResolved.append("__").append(types.erasure(t).toString().replace("[]", "_array").replaceAll("[^\\p{javaJavaIdentifierPart}]+", "_")); - }); - inv = $b.invoke("staticCall") - .arg(loc(mt)) - .arg($output.dotclass()) - .arg(overloadResolved.toString()); + String overloadResolved = mangledName((Symbol.MethodSymbol) it.sym); + Optional callSite = elements.getTypeElement(fqcn).getEnclosedElements().stream().filter(e -> + e.getKind() == ElementKind.METHOD && mangledName((ExecutableElement) e).equals(overloadResolved) + ).findAny(); + if (callSite.isPresent()) { + ExecutableElement e = (ExecutableElement) callSite.get(); + if (e.getModifiers().contains(Modifier.PUBLIC) && !e.getParameters().stream().anyMatch(p -> types.isAssignable(p.asType(), closureType))) { + // Delegate to the standard version. + inv = $b.invoke("staticCall") + .arg(loc(mt)) + .arg(t(it.sym.owner.type).dotclass()) + .arg(n(e)); + } else if (overloadsResolved.containsKey(overloadResolved)) { + // Private, so delegate to our mangled version. + inv = $b.invoke("staticCall") + .arg(loc(mt)) + .arg($output.dotclass()) + .arg(overloadResolved); + } else { + throw new IllegalStateException("Not yet translating a " + e.getModifiers() + " method; translatable.txt might need to include: " + fqcn + "." + e); + } + } else { + throw new IllegalStateException("Could not find self-call site " + overloadResolved + " for " + mt); + } } } else { // TODO: figure out what can come here @@ -630,18 +651,18 @@ protected JExpression defaultAction(Tree node, Void aVoid) { .args(params)); } - private CompilationUnitTree getDefaultGroovyMethodCompilationUnitTree(Iterable parsed) { + private CompilationUnitTree getDefaultGroovyMethodCompilationUnitTree(Iterable parsed, String fqcn) { for (CompilationUnitTree cut : parsed) { for (Tree t : cut.getTypeDecls()) { if (t.getKind() == Kind.CLASS) { ClassTree ct = (ClassTree)t; - if (ct.getSimpleName().toString().equals("DefaultGroovyMethods")) { // TODO use fqcn + if (ct.getSimpleName().toString().equals(fqcn.replaceFirst("^.+[.]", ""))) { // TODO how do we get the FQCN of a ClassTree? return cut; } } } } - throw new IllegalStateException("DefaultGroovyMethods wasn't parsed"); + throw new IllegalStateException(fqcn + " wasn't parsed"); } diff --git a/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt b/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt new file mode 100644 index 000000000..50d757957 --- /dev/null +++ b/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt @@ -0,0 +1,180 @@ +org.codehaus.groovy.runtime.DefaultGroovyMethods.inject(E[],U,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.inject(java.util.Collection,U,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.inject(java.util.Iterator,U,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.inject(E[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.groupBy(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.groupEntriesBy(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.countBy(E[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.countBy(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.countBy(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.groupAnswer(java.util.Map>,T,K) +org.codehaus.groovy.runtime.DefaultGroovyMethods.groupBy(T[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.groupBy(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.countBy(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectEntries(E[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectEntries(E[],java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectEntries(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectEntries(java.lang.Iterable,java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectEntries(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectEntries(java.util.Iterator,java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectEntries(java.util.Map,java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.inject(java.util.Map,U,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.addEntry(java.util.Map,java.lang.Object) +org.codehaus.groovy.runtime.DefaultGroovyMethods.any(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectEntries(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.count(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.each(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachWithIndex(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.every(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.find(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findAll(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.max(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.min(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.reverseEach(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.toSorted(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.withDefault(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collect(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collect(java.util.Collection,java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectMany(E[],groovy.lang.Closure>) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectMany(java.lang.Iterable,groovy.lang.Closure>) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectMany(java.lang.Iterable,java.util.Collection,groovy.lang.Closure>) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectMany(java.util.Iterator,groovy.lang.Closure>) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collect(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collect(java.util.Map,java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectMany(java.util.Map,groovy.lang.Closure>) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectMany(java.util.Map,java.util.Collection,groovy.lang.Closure>) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findResult(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findResults(java.util.Map,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findResult(java.util.Map,U,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findResult(java.util.Collection,U,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.inject(java.lang.Object,U,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findResult(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findResults(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.with(U,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.inject(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.inject(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.permutations(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.any(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.any(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.callClosureForMapEntry(groovy.lang.Closure,java.util.Map.Entry) +org.codehaus.groovy.runtime.DefaultGroovyMethods.callClosureForMapEntryAndCounter(groovy.lang.Closure,java.util.Map.Entry,int) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collect(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collect(java.lang.Object,java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.count(T[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.count(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.count(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.countAnswer(java.util.Map,T) +org.codehaus.groovy.runtime.DefaultGroovyMethods.each(T,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.each(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.each(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.each(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.each(java.util.List,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.each(java.util.Set,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.each(java.util.SortedSet,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachPermutation(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachWithIndex(T,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachWithIndex(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachWithIndex(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachWithIndex(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachWithIndex(java.util.List,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachWithIndex(java.util.Set,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachWithIndex(java.util.SortedSet,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.every(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.every(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.find(T[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.find(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findAll(T[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findAll(groovy.lang.Closure,java.util.Collection,java.util.Iterator) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findAll(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findAll(java.util.List,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findAll(java.util.Set,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.flatten(java.lang.Iterable,java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.flatten(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.identity(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.max(T[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.max(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.max(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.min(T[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.min(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.min(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.removeAll(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.retainAll(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.reverseEach(T[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.reverseEach(java.util.List,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(T[],boolean,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(T[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(java.lang.Iterable,boolean,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.split(groovy.lang.Closure,java.util.Collection,java.util.Collection,java.util.Iterator) +org.codehaus.groovy.runtime.DefaultGroovyMethods.split(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.split(java.util.List,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.split(java.util.Set,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.toSorted(T[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.toSorted(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.toSorted(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.Collection,boolean,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.List,boolean,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.List,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.use(java.lang.Object,java.lang.Class,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.use(java.lang.Object,java.util.List,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.withDefault(java.util.List,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.withEagerDefault(java.util.List,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.withLazyDefault(java.util.List,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.addShutdownHook(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.any(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectNested(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectNested(java.lang.Iterable,java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.collectNested(java.util.Collection,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.combinations(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.downto(double,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.downto(float,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.downto(java.lang.Double,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.downto(java.lang.Float,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.downto(java.lang.Long,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.downto(java.lang.Number,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.downto(java.math.BigDecimal,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.downto(java.math.BigInteger,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.downto(long,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachByte(byte[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachByte(java.lang.Byte[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.eachCombination(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.every(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.find(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findAll(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findIndexOf(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findIndexOf(java.lang.Object,int,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findIndexValues(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findIndexValues(java.lang.Object,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findLastIndexOf(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findLastIndexOf(java.lang.Object,int,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findResult(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.findResult(java.lang.Object,java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.hasPerInstanceMetaClass(java.lang.Object) +org.codehaus.groovy.runtime.DefaultGroovyMethods.metaClass(java.lang.Class,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.metaClass(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.split(java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.step(java.lang.Number,java.lang.Number,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sum(java.lang.Iterable,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sum(java.lang.Iterable,java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sum(java.lang.Iterable,java.lang.Object,groovy.lang.Closure,boolean) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sum(java.lang.Object[],groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sum(java.lang.Object[],java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sum(java.util.Iterator,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.sum(java.util.Iterator,java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.times(java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.upto(double,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.upto(float,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.upto(java.lang.Double,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.upto(java.lang.Float,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.upto(java.lang.Long,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.upto(java.lang.Number,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.upto(java.math.BigDecimal,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.upto(java.math.BigInteger,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.upto(long,java.lang.Number,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.createThread(java.lang.String,boolean,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.sleep(java.lang.Object,long,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.sleepImpl(long,groovy.lang.Closure) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 91ba7f540..3d5962c25 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -32,8 +32,7 @@ public class Continuable implements Serializable { @SuppressWarnings("rawtypes") public static final List categories = ImmutableList.of( CpsDefaultGroovyMethods.class, - CpsDefaultGroovyStaticMethods.class, - CpsProcessGroovyMethods.class); + CpsDefaultGroovyStaticMethods.class); /** * When the program resumes with a value (in particular an exception thrown), what environment From aa0a9654910b7f0bc3ccea7164d5415eda200469 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 May 2017 17:14:20 -0400 Subject: [PATCH 419/932] Found the fix for CpsDefaultGroovyMethodsTest#cps[collectMapKV]. --- .../cloudbees/groovy/cps/tool/Translator.java | 3 +-- .../com/cloudbees/groovy/cps/Builder.java | 9 ++++++++ .../impl/NewArrayFromInitializersBlock.java | 22 +++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayFromInitializersBlock.java diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 5dc93c84d..8e5fb42f8 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -537,8 +537,7 @@ public JExpression visitAssignment(AssignmentTree at, Void __) { @Override public JExpression visitNewArray(NewArrayTree nt, Void __) { if (nt.getInitializers()!=null) { - // This syntax does not seem to exist in Groovy (kohsuke in 88006fc tried to use a nonexistent Builder.newArrayFromInitializers). - return $b.invoke("list").tap(inv -> { + return $b.invoke("newArrayFromInitializers").tap(inv -> { nt.getInitializers().forEach(d -> inv.arg(visit(d))); }); } else { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java index eb9426b37..01001a809 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -25,6 +25,7 @@ import com.cloudbees.groovy.cps.impl.MapBlock; import com.cloudbees.groovy.cps.impl.MethodPointerBlock; import com.cloudbees.groovy.cps.impl.NewArrayBlock; +import com.cloudbees.groovy.cps.impl.NewArrayFromInitializersBlock; import com.cloudbees.groovy.cps.impl.NotBlock; import com.cloudbees.groovy.cps.impl.PropertyAccessBlock; import com.cloudbees.groovy.cps.impl.ReturnBlock; @@ -651,6 +652,14 @@ public Block newArray(int line, Class type, Block... argExps) { return new NewArrayBlock(loc(line),type,argExps); } + /** + * Array with initializers like {@code new Object[] {1, "two"}} which exists in Java but not Groovy. + * Only used by {@link CpsDefaultGroovyMethods} and friends. + */ + public Block newArrayFromInitializers(Block... args) { + return new NewArrayFromInitializersBlock(args); + } + /** * {@code return exp;} */ diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayFromInitializersBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayFromInitializersBlock.java new file mode 100644 index 000000000..bc319947e --- /dev/null +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayFromInitializersBlock.java @@ -0,0 +1,22 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Builder; + +/** + * @see Builder#newArrayFromInitializers + */ +public class NewArrayFromInitializersBlock extends CollectionLiteralBlock { + + public NewArrayFromInitializersBlock(Block... args) { + super(args); + } + + @Override + protected Object toCollection(Object[] result) { + return result; + } + + private static final long serialVersionUID = 1L; + +} From ecb368dbcdb2381fbb60c1c1e0b36dcbd5dd0d1d Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 May 2017 17:58:45 -0400 Subject: [PATCH 420/932] Generate in place. --- dgm-builder/nbactions.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dgm-builder/nbactions.xml b/dgm-builder/nbactions.xml index 63328af14..e864b2346 100644 --- a/dgm-builder/nbactions.xml +++ b/dgm-builder/nbactions.xml @@ -10,7 +10,7 @@ org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - -classpath %classpath com.cloudbees.groovy.cps.tool.Driver target/translated + -classpath %classpath com.cloudbees.groovy.cps.tool.Driver ../lib/target/generated-sources/dgm/ java @@ -24,7 +24,7 @@ org.codehaus.mojo:exec-maven-plugin:1.5.0:exec - -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath com.cloudbees.groovy.cps.tool.Driver target/translated + -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath com.cloudbees.groovy.cps.tool.Driver ../lib/target/generated-sources/dgm/ java true @@ -39,7 +39,7 @@ org.codehaus.mojo:exec-maven-plugin:1.5.0:exec - -classpath %classpath com.cloudbees.groovy.cps.tool.Driver target/translated + -classpath %classpath com.cloudbees.groovy.cps.tool.Driver ../lib/target/generated-sources/dgm/ java From 16c1ad64b6becac5f5545fd72ce1b99744b59346 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 May 2017 18:01:30 -0400 Subject: [PATCH 421/932] Was incorrectly translating boolean variables. --- .../src/main/java/com/cloudbees/groovy/cps/tool/Translator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 8e5fb42f8..472e13415 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -791,7 +791,7 @@ private String n(IdentifierTree v) { private JType primitive(Object src, TypeKind k) { switch (k) { - case BOOLEAN: return codeModel.INT; + case BOOLEAN: return codeModel.BOOLEAN; case BYTE: return codeModel.BYTE; case SHORT: return codeModel.SHORT; case INT: return codeModel.INT; From 29e98a1d6e94b40440266a0fa48b1a90546185a2 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 May 2017 18:04:00 -0400 Subject: [PATCH 422/932] Spread method calls are not yet supported by CpsTransformer. --- .../com/cloudbees/groovy/cps/CpsTransformer.groovy | 4 +++- .../groovy/cps/CpsDefaultGroovyMethodsTest.groovy | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/lib/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy index 5ec62cfe9..30295b901 100644 --- a/lib/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ b/lib/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy @@ -396,7 +396,9 @@ class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor makeNode("javaThis_") else visit(call.objectExpression); - // TODO: spread (which will require safepoints) + if (call.spreadSafe) { + throw new UnsupportedOperationException("TODO spread not yet supported in ${call.text}") // will require safepoints + } visit(call.method); literal(call.safe); visit(((TupleExpression)call.arguments).expressions) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy index bced5a3e1..51d479f79 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -235,16 +235,16 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { ["injectMapEntry", "[a: 1, b: 2, c: 3].inject(4) { c, e -> c + e.value }", 10], // .max - ["maxList", "[42, 35, 17, 100].max { i -> i.toString().toList()*.toInteger().sum() }", 35], - ["maxArray", "([42, 35, 17, 100] as Integer[]).max { i -> i.toString().toList()*.toInteger().sum() }", 35], - ["maxMap", "[a: 42, b: 35, c: 17, d: 100].max { first, second -> first.value.toString().toList()*.toInteger().sum() <=> second.value.toString().toList()*.toInteger().sum() }", [b: 35].entrySet().iterator().next()], + ["maxList", "[42, 35, 17, 100].max {i -> i.toString().toList().collect {it.toInteger()}.sum() }", 35], + ["maxArray", "([42, 35, 17, 100] as Integer[]).max { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 35], + ["maxMap", "[a: 42, b: 35, c: 17, d: 100].max { first, second -> first.value.toString().toList().collect {it.toInteger()}.sum() <=> second.value.toString().toList().collect {it.toInteger()}.sum() }", [b: 35].entrySet().iterator().next()], // TODO: metaClass // .min - ["minList", "[42, 35, 17, 100].min { i -> i.toString().toList()*.toInteger().sum() }", 100], - ["minArray", "([42, 35, 17, 100] as Integer[]).min { i -> i.toString().toList()*.toInteger().sum() }", 100], - ["minMap", "[a: 42, b: 35, c: 17, d: 100].min { first, second -> first.value.toString().toList()*.toInteger().sum() <=> second.value.toString().toList()*.toInteger().sum() }", [d: 100].entrySet().iterator().next()], + ["minList", "[42, 35, 17, 100].min { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 100], + ["minArray", "([42, 35, 17, 100] as Integer[]).min { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 100], + ["minMap", "[a: 42, b: 35, c: 17, d: 100].min { first, second -> first.value.toString().toList().collect {it.toInteger()}.sum() <=> second.value.toString().toList().collect {it.toInteger()}.sum() }", [d: 100].entrySet().iterator().next()], // .permutations ["permutations", "[1, 2, 3].permutations { i -> i.collect { v -> v * 2 } } as Set", [[2, 4, 6], [2, 6, 4], [4, 2, 6], [4, 6, 2], [6, 2, 4], [6, 4, 2]] as Set], From 1a255dc75a5ca038be721e7e1f5c8425279b1686 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 May 2017 18:20:46 -0400 Subject: [PATCH 423/932] Have no way of translating sorting methods for now. --- .../com/cloudbees/groovy/cps/tool/translatable.txt | 10 ---------- .../groovy/cps/CpsDefaultGroovyMethodsTest.groovy | 4 ++++ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt b/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt index 50d757957..a701c48f9 100644 --- a/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt +++ b/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt @@ -31,8 +31,6 @@ org.codehaus.groovy.runtime.DefaultGroovyMethods.findAll(java.util.Map org.codehaus.groovy.runtime.DefaultGroovyMethods.max(java.util.Map,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.min(java.util.Map,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.reverseEach(java.util.Map,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(java.util.Map,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.toSorted(java.util.Map,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.withDefault(java.util.Map,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.collect(java.util.Collection,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.collect(java.util.Collection,java.util.Collection,groovy.lang.Closure) @@ -102,18 +100,10 @@ org.codehaus.groovy.runtime.DefaultGroovyMethods.removeAll(java.util.Collecti org.codehaus.groovy.runtime.DefaultGroovyMethods.retainAll(java.util.Collection,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.reverseEach(T[],groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.reverseEach(java.util.List,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(T[],boolean,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(T[],groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(java.lang.Iterable,boolean,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(java.lang.Iterable,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.sort(java.util.Iterator,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.split(groovy.lang.Closure,java.util.Collection,java.util.Collection,java.util.Iterator) org.codehaus.groovy.runtime.DefaultGroovyMethods.split(java.util.Collection,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.split(java.util.List,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.split(java.util.Set,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.toSorted(T[],groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.toSorted(java.lang.Iterable,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.toSorted(java.util.Iterator,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.Collection,boolean,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.Collection,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.Iterator,groovy.lang.Closure) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy index 51d479f79..9524ef1d4 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -263,11 +263,13 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { ["reverseEachMapKV", "def r = ''; ['a': 1, 'b': 2, 'c': 3].reverseEach { k, v -> r += k }; return r", "cba"], ["reverseEachMapEntry", "def r = ''; ['a': 1, 'b': 2, 'c': 3].reverseEach { e -> r += e.key }; return r", "cba"], + /* TODO would need to translate OrderBy and ClosureComparator // .sort ["sortList", "[3, 1, -2, -4].sort { i -> i * i }", [1, -2, 3, -4]], ["sortArray", "([3, 1, -2, -4] as Integer[]).sort { i -> i * i }", [1, -2, 3, -4]], ["sortMapEntryByKey", "[a: 3, c: 1, b: -2, d: -4].sort { e -> e.key }", [a: 3, b: -2, c: 1, d: -4]], ["sortMapEntryByValue", "[a: 3, c: 1, b: -2, d: -4].sort { e -> e.value }", [d: -4, b: -2, c: 1, a: 3]], + */ // .split ["splitList", "[1, 2, 3, 4].split { i -> i % 2 == 0 }", [[2, 4], [1, 3]]], @@ -292,11 +294,13 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { // TODO: times + /* TODO as above // .toSorted ["toSortedList", "[3, 1, -2, -4].toSorted { i -> i * i }", [1, -2, 3, -4]], ["toSortedArray", "([3, 1, -2, -4] as Integer[]).toSorted { i -> i * i }", [1, -2, 3, -4]], ["toSortedMapEntryByKey", "[a: 3, c: 1, b: -2, d: -4].toSorted { e -> e.key }", [a: 3, b: -2, c: 1, d: -4]], ["toSortedMapEntryByValue", "[a: 3, c: 1, b: -2, d: -4].toSorted { e -> e.value }", [d: -4, b: -2, c: 1, a: 3]], + */ /* TODO: waiting for toUnique support // .toUnique From 7ddb7a45a4d7b73496bead6c79430d9f31529dfa Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 May 2017 18:30:13 -0400 Subject: [PATCH 424/932] Some more methods which cannot be translated pending translation of helper classes. --- .../java/com/cloudbees/groovy/cps/tool/Translator.java | 1 + .../com/cloudbees/groovy/cps/tool/translatable.txt | 7 ------- .../groovy/cps/CpsDefaultGroovyMethodsTest.groovy | 6 ++++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 472e13415..143576344 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -189,6 +189,7 @@ public Void visitExecutable(ExecutableElement e, Void __) { if (translatable.contains(fqcn + "." + e)) { overloadsResolved.put(mangledName(e), e); } + // TODO else if it is public and has a Closure argument, translate to a form that just throws UnsupportedOperationException when called in CPS mode return null; } },null); diff --git a/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt b/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt index a701c48f9..f05fef812 100644 --- a/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt +++ b/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt @@ -28,8 +28,6 @@ org.codehaus.groovy.runtime.DefaultGroovyMethods.eachWithIndex(java.util.Ma org.codehaus.groovy.runtime.DefaultGroovyMethods.every(java.util.Map,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.find(java.util.Map,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.findAll(java.util.Map,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.max(java.util.Map,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.min(java.util.Map,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.reverseEach(java.util.Map,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.withDefault(java.util.Map,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.collect(java.util.Collection,groovy.lang.Closure) @@ -104,11 +102,6 @@ org.codehaus.groovy.runtime.DefaultGroovyMethods.split(groovy.lang.Closure,ja org.codehaus.groovy.runtime.DefaultGroovyMethods.split(java.util.Collection,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.split(java.util.List,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.split(java.util.Set,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.Collection,boolean,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.Collection,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.Iterator,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.List,boolean,groovy.lang.Closure) -org.codehaus.groovy.runtime.DefaultGroovyMethods.unique(java.util.List,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.use(java.lang.Object,java.lang.Class,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.use(java.lang.Object,java.util.List,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.withDefault(java.util.List,groovy.lang.Closure) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy index 9524ef1d4..d65a0302c 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -237,14 +237,18 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { // .max ["maxList", "[42, 35, 17, 100].max {i -> i.toString().toList().collect {it.toInteger()}.sum() }", 35], ["maxArray", "([42, 35, 17, 100] as Integer[]).max { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 35], + /* TODO ClosureComparator ["maxMap", "[a: 42, b: 35, c: 17, d: 100].max { first, second -> first.value.toString().toList().collect {it.toInteger()}.sum() <=> second.value.toString().toList().collect {it.toInteger()}.sum() }", [b: 35].entrySet().iterator().next()], + */ // TODO: metaClass // .min ["minList", "[42, 35, 17, 100].min { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 100], ["minArray", "([42, 35, 17, 100] as Integer[]).min { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 100], + /* TODO ClosureComparator ["minMap", "[a: 42, b: 35, c: 17, d: 100].min { first, second -> first.value.toString().toList().collect {it.toInteger()}.sum() <=> second.value.toString().toList().collect {it.toInteger()}.sum() }", [d: 100].entrySet().iterator().next()], + */ // .permutations ["permutations", "[1, 2, 3].permutations { i -> i.collect { v -> v * 2 } } as Set", [[2, 4, 6], [2, 6, 4], [4, 2, 6], [4, 6, 2], [6, 2, 4], [6, 4, 2]] as Set], @@ -309,9 +313,11 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { ["toUniqueSet", "([1, 2, -2, 3] as HashSet).toUnique { i -> i * i }", [1, 2, 3] as HashSet], */ + /* TODO also relies on OrderBy & ClosureComparator // .unique ["uniqueList", "[1, 2, -2, 3].unique { i -> i * i }", [1, 2, 3]], ["uniqueSet", "([1, 2, -2, 3] as HashSet).unique { i -> i * i }.collect { it.abs() } as HashSet", [1, 2, 3] as HashSet], + */ // TODO: use? From 72b43eeb7939b447b07ee6023438f41940051de5 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 May 2017 19:02:02 -0400 Subject: [PATCH 425/932] Some groupBy overloads were broken by lack of handling of varargs methods. --- .../main/java/com/cloudbees/groovy/cps/tool/Translator.java | 5 +++-- .../com/cloudbees/groovy/cps/tool/translatable.txt | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 143576344..3fc6d2b61 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -189,6 +189,7 @@ public Void visitExecutable(ExecutableElement e, Void __) { if (translatable.contains(fqcn + "." + e)) { overloadsResolved.put(mangledName(e), e); } + // System.err.println("Not translating " + e.getAnnotationMirrors() + " " + e.getModifiers() + " " + fqcn + "." + e); // TODO else if it is public and has a Closure argument, translate to a form that just throws UnsupportedOperationException when called in CPS mode return null; } @@ -246,7 +247,7 @@ private void translateMethod(final CompilationUnitTree cut, ExecutableElement e, List params = new ArrayList<>(); e.getParameters().forEach(p -> { JType paramType = t(p.asType(), typeVars); - delegatingParams.add(delegating.param(paramType, n(p))); + delegatingParams.add(e.isVarArgs() && p == e.getParameters().get(e.getParameters().size() - 1) ? delegating.varParam(paramType.elementType(), n(p)) : delegating.param(paramType, n(p))); params.add(m.param(paramType, n(p))); }); @@ -353,7 +354,7 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { ).findAny(); if (callSite.isPresent()) { ExecutableElement e = (ExecutableElement) callSite.get(); - if (e.getModifiers().contains(Modifier.PUBLIC) && !e.getParameters().stream().anyMatch(p -> types.isAssignable(p.asType(), closureType))) { + if (e.getModifiers().contains(Modifier.PUBLIC) && !e.isVarArgs() && !e.getParameters().stream().anyMatch(p -> types.isAssignable(p.asType(), closureType))) { // Delegate to the standard version. inv = $b.invoke("staticCall") .arg(loc(mt)) diff --git a/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt b/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt index f05fef812..a14c62258 100644 --- a/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt +++ b/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt @@ -136,6 +136,12 @@ org.codehaus.groovy.runtime.DefaultGroovyMethods.findLastIndexOf(java.lang.Objec org.codehaus.groovy.runtime.DefaultGroovyMethods.findLastIndexOf(java.lang.Object,int,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.findResult(java.lang.Object,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.findResult(java.lang.Object,java.lang.Object,groovy.lang.Closure) +org.codehaus.groovy.runtime.DefaultGroovyMethods.groupBy(java.lang.Iterable,java.lang.Object...) +org.codehaus.groovy.runtime.DefaultGroovyMethods.groupBy(java.lang.Iterable,java.util.List) +org.codehaus.groovy.runtime.DefaultGroovyMethods.groupBy(java.lang.Object[],java.lang.Object...) +org.codehaus.groovy.runtime.DefaultGroovyMethods.groupBy(java.lang.Object[],java.util.List) +org.codehaus.groovy.runtime.DefaultGroovyMethods.groupBy(java.util.Map,java.lang.Object...) +org.codehaus.groovy.runtime.DefaultGroovyMethods.groupBy(java.util.Map,java.util.List) org.codehaus.groovy.runtime.DefaultGroovyMethods.hasPerInstanceMetaClass(java.lang.Object) org.codehaus.groovy.runtime.DefaultGroovyMethods.metaClass(java.lang.Class,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyMethods.metaClass(java.lang.Object,groovy.lang.Closure) From 0f1af3283b0d3ea6dba945a63ee8043c8bfe58b7 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 May 2017 19:07:59 -0400 Subject: [PATCH 426/932] Adjusting test to use less exotic syntax. --- .../cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy index d65a0302c..f249db51d 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy @@ -82,7 +82,8 @@ class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { ["collectNestedExistingList", "[[0,1,2],[3,4]].collectNested(['test']) { i -> i * 2 }", ['test', [0,2,4],[6,8]]], // .combinations - ["combinations", "[[2, 3],[4, 5, 6]].combinations { x, y -> x*y }", [8, 12, 10, 15, 12, 18]], + // TODO { x, y -> x*y } does not work as CpsTransformer apparently does not grok how to deconstruct array arguments + ["combinations", "[[2, 3],[4, 5, 6]].combinations { xy -> xy[0] * xy[1] }", [8, 12, 10, 15, 12, 18]], // .count ["countList", "[1, 2, 3].count { i -> i > 1 }", 2], From a4a181e98eefa238929a5178c4d22d77b3d964de Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 30 May 2017 17:22:14 -0400 Subject: [PATCH 427/932] [maven-release-plugin] prepare release groovy-cps-parent-1.13 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 27c159939..2b6a025dc 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.13-SNAPSHOT + 1.13 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 106ff7383..2d3c9200b 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.13-SNAPSHOT + 1.13 groovy-cps diff --git a/pom.xml b/pom.xml index 1ec68af7f..176069770 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.13-SNAPSHOT + 1.13 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.13 From d857de57cce0aa9ea01b9bd9854923877eeaa7c0 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 30 May 2017 17:22:18 -0400 Subject: [PATCH 428/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 2b6a025dc..69e97a1bb 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.13 + 1.14-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 2d3c9200b..0e9263c1a 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.13 + 1.14-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 176069770..833afce0c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.13 + 1.14-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.13 + HEAD From 0066f19c80d44fe8fe433307f45d9ad7ab4342af Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 30 May 2017 17:26:32 -0400 Subject: [PATCH 429/932] Different mojo to suppress. --- dgm-builder/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 69e97a1bb..cea7a6d74 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -27,6 +27,13 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + + true + + org.apache.maven.plugins maven-assembly-plugin From e28e29318be2fae377e13a720e17bc98c6084641 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 30 May 2017 17:37:56 -0400 Subject: [PATCH 430/932] Revert "Different mojo to suppress." This reverts commit 0066f19c80d44fe8fe433307f45d9ad7ab4342af. --- dgm-builder/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index cea7a6d74..29b0409b3 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -27,6 +27,7 @@ true + org.apache.maven.plugins maven-assembly-plugin From d01659757d022c74867b1f5363496e19870e3571 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Thu, 1 Jun 2017 13:02:18 -0500 Subject: [PATCH 431/932] Generate/attach test jars, test source jars. --- lib/pom.xml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/lib/pom.xml b/lib/pom.xml index 0e9263c1a..885489e3f 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -85,6 +85,17 @@ false + + maven-jar-plugin + + + test-jar + + test-jar + + + + @@ -160,4 +171,24 @@ + + + cloudbees-oss-release + + + + maven-source-plugin + + + attach-test-sources + + test-jar-no-fork + + + + + + + + From 8d4dfa3c21f45c18d52b7edb82aa6ac802dd9fb9 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 1 Jun 2017 14:16:58 -0400 Subject: [PATCH 432/932] [maven-release-plugin] prepare release groovy-cps-parent-1.13.1 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 29b0409b3..c50cc4547 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.14-SNAPSHOT + 1.13.1 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 885489e3f..463dc3696 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.14-SNAPSHOT + 1.13.1 groovy-cps diff --git a/pom.xml b/pom.xml index 833afce0c..a391ede7b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.14-SNAPSHOT + 1.13.1 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.13.1 From 9a19fba20697510ebb503c4e9ed3dc20470923c6 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 1 Jun 2017 14:17:02 -0400 Subject: [PATCH 433/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index c50cc4547..29b0409b3 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.13.1 + 1.14-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 463dc3696..885489e3f 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.13.1 + 1.14-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index a391ede7b..833afce0c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.13.1 + 1.14-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.13.1 + HEAD From 99c88a920e27f791eaa96d508c541a4bba85b007 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 2 Jun 2017 18:24:12 -0400 Subject: [PATCH 434/932] Rewrote CpsTransformer in Java for better speed and stack usage. --- lib/pom.xml | 7 + .../groovy/cps/CategorySupport.groovy | 18 - .../groovy/cps/CpsTransformer.groovy | 958 ------------- .../groovy/cps/SandboxCpsTransformer.groovy | 39 - .../cloudbees/groovy/cps/CpsTransformer.java | 1214 +++++++++++++++++ .../groovy/cps/SandboxCpsTransformer.java | 40 + 6 files changed, 1261 insertions(+), 1015 deletions(-) delete mode 100644 lib/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy delete mode 100644 lib/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy delete mode 100644 lib/src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy create mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java create mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java diff --git a/lib/pom.xml b/lib/pom.xml index 885489e3f..1f2747c82 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -13,6 +13,13 @@ + + maven-compiler-plugin + + 1.7 + 1.7 + + org.apache.maven.plugins maven-dependency-plugin diff --git a/lib/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy b/lib/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy deleted file mode 100644 index 52d199fad..000000000 --- a/lib/src/main/groovy/com/cloudbees/groovy/cps/CategorySupport.groovy +++ /dev/null @@ -1,18 +0,0 @@ -package com.cloudbees.groovy.cps - -import org.codehaus.groovy.runtime.GroovyCategorySupport - -import java.util.concurrent.Callable - -/** - * Invokes {@link GroovyCategorySupport#use(java.lang.Class, groovy.lang.Closure)} with {@link Runnable}. - * - * @author Kohsuke Kawaguchi - */ -class CategorySupport { - public static T use(Class category, Callable r) { - return GroovyCategorySupport.use(category) { - return r.call(); - } - } -} diff --git a/lib/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy b/lib/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy deleted file mode 100644 index 30295b901..000000000 --- a/lib/src/main/groovy/com/cloudbees/groovy/cps/CpsTransformer.groovy +++ /dev/null @@ -1,958 +0,0 @@ -package com.cloudbees.groovy.cps - -import com.cloudbees.groovy.cps.impl.CpsCallableInvocation -import com.cloudbees.groovy.cps.impl.CpsFunction -import com.cloudbees.groovy.cps.sandbox.Trusted -import com.cloudbees.groovy.cps.sandbox.Untrusted -import org.codehaus.groovy.ast.* -import org.codehaus.groovy.ast.expr.* -import org.codehaus.groovy.ast.stmt.* -import org.codehaus.groovy.classgen.AsmClassGenerator -import org.codehaus.groovy.classgen.BytecodeExpression -import org.codehaus.groovy.classgen.GeneratorContext -import org.codehaus.groovy.classgen.Verifier -import org.codehaus.groovy.control.CompilePhase -import org.codehaus.groovy.control.Janitor -import org.codehaus.groovy.control.SourceUnit -import org.codehaus.groovy.control.customizers.CompilationCustomizer -import org.codehaus.groovy.runtime.powerassert.SourceText -import org.codehaus.groovy.syntax.SyntaxException -import org.codehaus.groovy.syntax.Token - -import javax.annotation.Nonnull -import java.lang.annotation.Annotation -import java.lang.reflect.Modifier -import java.util.concurrent.atomic.AtomicLong - -import static org.codehaus.groovy.syntax.Types.* - -/** - * Performs CPS transformation of Groovy methods. - * - *

- * Every method not annotated with {@link NonCPS} gets rewritten. The general strategy of CPS transformation is - * as follows: - * - *

- * Before: - * 

- * Object foo(int x, int y) {
- *   return x+y;
- * }
- *
- * - *

- * After: - * 

- * Object foo(int x, int y) {
- *   // the first part is AST of the method body
- *   // the rest (including implicit receiver argument) is actual value of arguments
- *   throw new CpsCallableInvocation(___cps___N, this, new Object[] {x, y});
- * }
- *
- * private static CpsFunction ___cps___N = ___cps___N();
- *
- * private static final CpsFunction ___cps___N() {
- *   Builder b = new Builder(...);
- *   return new CpsFunction(['x','y'], b.plus(b.localVariable("x"), b.localVariable("y"))
- * }
- *
- * - *

- * That is, we transform a Groovy AST of the method body into a tree of {@link Block}s by using {@link Builder}, - * then the method just returns this function object and expect the caller to evaluate it, instead of executing the method - * synchronously before it returns. - * - *

- * This class achieves this transformation by implementing {@link GroovyCodeVisitor} and traverse Groovy AST tree - * in the in-order. As we traverse this tree, we produce another Groovy AST tree that invokes {@link Builder}. - * Note that we aren't calling Builder directly here; that's supposed to happen when the Groovy code under transformation - * actually runs. - * - *

- * Groovy AST that calls {@link Builder} is a tree of function call, so we build {@link MethodCallExpression}s - * in the top-down manner. We do this by {@link CpsTransformer#makeNode(String)}, which creates a call to {@code Builder.xxx(...)}, - * then supply the closure that fills in the arguments to this call by walking down the original Groovy AST tree. - * This walk-down is done by calling {@link CpsTransformer#visit(ASTNode)} (to recursively visit ASTs), or by calling {@link CpsTransformer#literal(String)} - * methods, which generate string/class/etc literals, as sometimes {@link Builder} methods need them as well. - * - * @author Kohsuke Kawaguchi - */ -class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor { - private static final AtomicLong iota = new AtomicLong(); - private SourceUnit sourceUnit; - protected ClassNode classNode; - protected TransformerConfiguration config = new TransformerConfiguration(); - - CpsTransformer() { - super(CompilePhase.CANONICALIZATION) - } - - public void setConfiguration(@Nonnull TransformerConfiguration config) { - this.config = config; - } - - @Override - void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { - if (classNode.isInterface()) - return; // not touching interfaces - - this.sourceUnit = source; - this.classNode = classNode; - try { - -// copy(source.ast.methods)?.each { visitMethod(it) } -// classNode?.declaredConstructors?.each { visitMethod(it) } // can't transform constructor - def methods = classNode?.methods - if (methods) { - new ArrayList(methods).each { visitMethod(it) } - } -// classNode?.objectInitializerStatements?.each { it.visit(visitor) } -// classNode?.fields?.each { visitor.visitField(it) } - - - // groovy puts timestamp of compilation into a class file, causing serialVersionUID to change. - // this tends to be undesirable for CPS involving persistence. - // set the timestamp to some bogus value will prevent Verifier from adding a field that encodes - // timestamp in the field name - // see http://stackoverflow.com/questions/15310136/neverhappen-variable-in-compiled-classes - if (classNode.getField(Verifier.__TIMESTAMP)==null) - classNode.addField(Verifier.__TIMESTAMP,Modifier.STATIC|Modifier.PRIVATE, ClassHelper.long_TYPE, - new ConstantExpression(0L)); - - classNode.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)); - - } finally { - this.sourceUnit = null; - this.classNode = null; - this.parent = null; - } - } - - /** - * Should this method be transformed? - */ - protected boolean shouldBeTransformed(MethodNode node) { - return !node.isSynthetic() && - !hasAnnotation(node, NonCPS.class) && - !hasAnnotation(node, WorkflowTransformed.class) && - !node.isAbstract(); - } - - boolean hasAnnotation(MethodNode node, Class a) { - node.annotations.find { it.classNode.name == a.name } != null - } - - /** - * Transforms asynchronous workflow method. - * - * From: - * - * ReturnT foo( T1 arg1, T2 arg2, ...) { - * ... body ... - * } - * - * To: - * - * private static CpsFunction ___cps___N = ___cps___N(); - * - * private static final CpsFunction ___cps___N() { - * return new CpsFunction(['arg1','arg2','arg3',...], CPS-transformed-method-body) - * } - * - * ReturnT foo( T1 arg1, T2 arg2, ...) { - * throw new CpsCallableInvocation(___cps___N, this, new Object[] {arg1, arg2, ...}) - * } - */ - public void visitMethod(MethodNode m) { - if (!shouldBeTransformed(m)) { - visitNontransformedMethod(m); - return; - } - - Expression body; - - // transform the body - parent = { - e -> body = e - // println "in $classNode.name transformed $m.typeDescriptor to $e.text" - } - visitWithSafepoint(m.code) - - def params = new ListExpression(); - m.parameters.each { params.addExpression(new ConstantExpression(it.name))} - - /* - CpsFunction ___cps___N() { - Builder b = new Builder(...); - return new CpsFunction( << parameters >>, << body: AST tree building code >>); - } - */ - - def cpsName = "___cps___${iota.getAndIncrement()}" - - def builderMethod = m.declaringClass.addMethod(cpsName, PRIVATE_STATIC_FINAL, FUNCTION_TYPE, new Parameter[0], new ClassNode[0], - new BlockStatement([ - new ExpressionStatement(new DeclarationExpression(BUILDER, new Token(ASSIGN, "=", -1, -1), makeBuilder(m))), - new ReturnStatement(new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body))) - ], new VariableScope()) - ) - builderMethod.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)) - - def f = m.declaringClass.addField(cpsName, PRIVATE_STATIC_FINAL, FUNCTION_TYPE, - new StaticMethodCallExpression(m.declaringClass, cpsName, new TupleExpression())); -// new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body))); - - - def paramArray = new ArrayExpression(ClassHelper.OBJECT_TYPE, m.parameters.collect {new VariableExpression(it)}); - def args = new TupleExpression(new VariableExpression(f), THIS, paramArray); - - m.code = new ThrowStatement(new ConstructorCallExpression(CPSCALLINVK_TYPE,args)); - - m.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)); - } - - /** - * Generates code that instantiates a new {@link Builder}. - * - *

- * Hook for subtypes to tweak builder, for example to {@link Builder#contextualize(com.cloudbees.groovy.cps.sandbox.CallSiteTag...)} - * - * 

-     * Builder b = new Builder(new MethodLocation(...));
-     * b.withClosureType(...);
-     *
- * - * @param m - * Method being transformed. - */ - protected Expression makeBuilder(MethodNode m) { - Expression b = new ConstructorCallExpression(BUIDER_TYPE, new TupleExpression( - new ConstructorCallExpression(METHOD_LOCATION_TYPE, new TupleExpression( - new ConstantExpression(m.declaringClass.name), - new ConstantExpression(m.name), - new ConstantExpression(sourceUnit.name) - )) - )); - b = new MethodCallExpression(b, "withClosureType", - new TupleExpression(new ClassExpression(config.closureType))); - - def tag = getTrustTag() - if (tag!=null) { - b = new MethodCallExpression(b, "contextualize", - new PropertyExpression(new ClassExpression(ClassHelper.makeCached(tag)), "INSTANCE")); - } - return b; - } - - /** - * {@link Trusted} or {@link Untrusted} tag that gets added to call site. - * - * @see "doc/sandbox.md" - */ - protected Class getTrustTag() { - return Trusted.class - } - - /** - * For methods that are not CPS-transformed. - */ - protected void visitNontransformedMethod(MethodNode m) { - } - - - /** - * As we visit expressions in the method body, we convert them to the {@link Builder} invocations - * and pass them back to this closure. - */ - protected Closure parent; - - protected void visit(ASTNode e) { - if (e instanceof EmptyExpression) { - // working around a bug in EmptyExpression.visit() that doesn't call any method - visitEmptyExpression(e); - } else - if (e instanceof EmptyStatement) { - // working around a bug in EmptyStatement.visit() that doesn't call any method - visitEmptyStatement(e); - } else { - e.visit(this); - } - } - - protected void visit(Collection col) { - for (def e : col) { - visit(e); - } - } - - /** - * Like {@link #visit(ASTNode)} but also inserts the safepoint at the top. - */ - protected void visitWithSafepoint(Statement st) { - if (config.safepoints.isEmpty()) { - visit(st); // common case optimization - } else { - makeNode("block") { - // insert function call for each safepoint - config.safepoints.each { s -> - makeNode("staticCall") { - loc(st) - literal(s.node) - literal(s.methodName) - } - } - visit(st) - } - } - } - - /** - * Makes an AST fragment that calls {@link Builder} with specific method. - * - * @param methodName - * Method on {@link Builder} to call. - * @param args - * Can be closure for building argument nodes, Expression, or List of Expressions. - */ - protected void makeNode(String methodName, Object args) { - parent(new MethodCallExpression(BUILDER, methodName, makeChildren(args))); - } - - /** - * Makes an AST fragment that instantiates a new instance of the given type. - * - * @param args - * Can be closure for building argument nodes, Expression, or List of Expressions. - */ - protected void makeNode(ClassNode type, Object args) { - parent(new ConstructorCallExpression(type, makeChildren(args))); - } - - /** - * Given closure, {@link Expression} or a list of them, package them up into - * {@link TupleExpression} - */ - protected TupleExpression makeChildren(args) { - if (args==null) return new TupleExpression(); - if (args instanceof Closure) { - def argExps = [] - def old = parent; - try { - parent = { a -> argExps.add(a) } - - args(); // evaluate arguments - args = argExps; - } finally { - parent = old - } - } - - return new TupleExpression(args); - } - - protected void makeNode(String methodName) { - makeNode(methodName,null) - } - - protected void loc(ASTNode e) { - literal(e.lineNumber); - } - - /** - * Used in the closure block of {@link #makeNode(String, Object)} to create a literal string argument. - */ - protected void literal(String s) { - parent(new ConstantExpression(s)) - } - - protected void literal(ClassNode c) { - parent(new ClassExpression(c)) - } - - protected void literal(int n) { - parent(new ConstantExpression(n,true)) - } - - protected void literal(boolean b) { - parent(new ConstantExpression(b,true)) - } - - void visitEmptyExpression(EmptyExpression e) { - makeNode("noop") - } - - void visitEmptyStatement(EmptyStatement e) { - makeNode("noop") - } - - void visitMethodCallExpression(MethodCallExpression call) { - makeNode("functionCall") { - loc(call) - - // isImplicitThis==true even when objectExpression is not 'this'. - // See InvocationWriter.makeCall, - if (call.isImplicitThis() && AsmClassGenerator.isThisExpression(call.objectExpression)) - makeNode("javaThis_") - else - visit(call.objectExpression); - if (call.spreadSafe) { - throw new UnsupportedOperationException("TODO spread not yet supported in ${call.text}") // will require safepoints - } - visit(call.method); - literal(call.safe); - visit(((TupleExpression)call.arguments).expressions) - } - } - - void visitBlockStatement(BlockStatement b) { - makeNode("block") { - visit(b.statements) - } - } - - void visitForLoop(ForStatement forLoop) { - if (forLoop.variable==ForStatement.FOR_LOOP_DUMMY) { - // for ( e1; e2; e3 ) { ... } - ClosureListExpression loop = forLoop.collectionExpression - assert loop.expressions.size()==3; - - makeNode("forLoop") { - literal(forLoop.statementLabel) - visit(loop.expressions) - visitWithSafepoint(forLoop.loopBlock) - } - } else { - // for (x in col) { ... } - makeNode("forInLoop") { - loc(forLoop); - literal(forLoop.statementLabel) - literal(forLoop.variableType) - literal(forLoop.variable.name) - visit(forLoop.collectionExpression) - visitWithSafepoint(forLoop.loopBlock) - } - } - } - - void visitWhileLoop(WhileStatement loop) { - makeNode("while_") { - literal(loop.statementLabel) - visit(loop.booleanExpression) - visitWithSafepoint(loop.loopBlock) - } - } - - void visitDoWhileLoop(DoWhileStatement loop) { - makeNode("doWhile") { - literal(loop.statementLabel) - visit(loop.booleanExpression) - visitWithSafepoint(loop.loopBlock) - } - } - - void visitIfElse(IfStatement stmt) { - makeNode("if_") { - visit(stmt.booleanExpression) - visit(stmt.ifBlock) - visit(stmt.elseBlock) - } - } - - void visitExpressionStatement(ExpressionStatement statement) { - visit(statement.expression) - } - - void visitReturnStatement(ReturnStatement statement) { - makeNode("return_") { - visit(statement.expression); - } - } - - void visitAssertStatement(AssertStatement statement) { - def j = new Janitor() - def text = new SourceText(statement, sourceUnit, j).normalizedText - j.cleanup() - - makeNode("assert_") { - visit(statement.booleanExpression) - visit(statement.messageExpression) - literal(text) - } - } - - void visitTryCatchFinally(TryCatchStatement stmt) { - makeNode("tryCatch") { - visit(stmt.tryStatement) - visit(stmt.finallyStatement) - visit(stmt.catchStatements) - } - } - - void visitSwitch(SwitchStatement stmt) { - makeNode("switch_") { - literal(stmt.statementLabel) - visit(stmt.expression) - visit(stmt.defaultStatement) - visit(stmt.caseStatements) - } - } - - void visitCaseStatement(CaseStatement stmt) { - makeNode("case_") { - loc(stmt) - visit(stmt.expression) - visit(stmt.code) - } - } - - void visitBreakStatement(BreakStatement statement) { - makeNode("break_", new ConstantExpression(statement.label)); - } - - void visitContinueStatement(ContinueStatement statement) { - makeNode("continue_", new ConstantExpression(statement.label)); - } - - void visitThrowStatement(ThrowStatement st) { - makeNode("throw_") { - loc(st) - visit(st.expression) - } - } - - void visitSynchronizedStatement(SynchronizedStatement statement) { - throw new UnsupportedOperationException(); - } - - void visitCatchStatement(CatchStatement stmt) { - makeNode(CATCH_EXPRESSION_TYPE) { - literal(stmt.exceptionType) - literal(stmt.variable.name) - visit(stmt.code) - } - } - - void visitStaticMethodCallExpression(StaticMethodCallExpression exp) { - makeNode("staticCall") { - loc(exp) - literal(exp.ownerType) - literal(exp.method) - visit(((TupleExpression)exp.arguments).expressions) - } - } - - void visitConstructorCallExpression(ConstructorCallExpression call) { - makeNode("new_") { - loc(call) - literal(call.type) - visit(((TupleExpression)call.arguments).expressions) - } - } - - void visitTernaryExpression(TernaryExpression exp) { - makeNode("ternaryOp") { - visit(exp.booleanExpression) - visit(exp.trueExpression) - visit(exp.falseExpression) - } - } - - void visitShortTernaryExpression(ElvisOperatorExpression exp) { - makeNode("elvisOp") { - visit(exp.booleanExpression) - visit(exp.falseExpression) - } - } - - // Constants from Token.type to a method on Builder - private static Map BINARY_OP_TO_BUILDER_METHOD = [ - (COMPARE_EQUAL) :"compareEqual", - (COMPARE_NOT_EQUAL) :"compareNotEqual", - (COMPARE_TO) :"compareTo", - (COMPARE_GREATER_THAN) :"greaterThan", - (COMPARE_GREATER_THAN_EQUAL) :"greaterThanEqual", - (COMPARE_LESS_THAN) :"lessThan", - (COMPARE_LESS_THAN_EQUAL) :"lessThanEqual", - (LOGICAL_AND) :"logicalAnd", - (LOGICAL_OR) :"logicalOr", - (BITWISE_AND) :"bitwiseAnd", - (BITWISE_AND_EQUAL) :"bitwiseAndEqual", - (BITWISE_OR) :"bitwiseOr", - (BITWISE_OR_EQUAL) :"bitwiseOrEqual", - (BITWISE_XOR) :"bitwiseXor", - (BITWISE_XOR_EQUAL) :"bitwiseXorEqual", - (PLUS) :"plus", - (PLUS_EQUAL) :"plusEqual", - (MINUS) :"minus", - (MINUS_EQUAL) :"minusEqual", - (MULTIPLY) :"multiply", - (MULTIPLY_EQUAL) :"multiplyEqual", - (DIVIDE) :"div", - (DIVIDE_EQUAL) :"divEqual", - (INTDIV) :"intdiv", - (INTDIV_EQUAL) :"intdivEqual", - (MOD) :"mod", - (MOD_EQUAL) :"modEqual", - (POWER) :"power", - (POWER_EQUAL) :"powerEqual", - (EQUAL) :"assign", - (KEYWORD_INSTANCEOF) :"instanceOf", - (LEFT_SQUARE_BRACKET) :"array", - - (LEFT_SHIFT) :"leftShift", - (LEFT_SHIFT_EQUAL) :"leftShiftEqual", - (RIGHT_SHIFT) :"rightShift", - (RIGHT_SHIFT_EQUAL) :"rightShiftEqual", - (RIGHT_SHIFT_UNSIGNED) :"rightShiftUnsigned", - (RIGHT_SHIFT_UNSIGNED_EQUAL) :"rightShiftUnsignedEqual", - - (FIND_REGEX) :"findRegex", - (MATCH_REGEX) :"matchRegex", - (KEYWORD_IN) :"isCase", - ] - - /** - * @see org.codehaus.groovy.classgen.asm.BinaryExpressionHelper#eval(BinaryExpression) - */ - void visitBinaryExpression(BinaryExpression exp) { - def body = {// for building CPS tree for two expressions - loc(exp) - visit(exp.leftExpression) - visit(exp.rightExpression) - } - - def name = BINARY_OP_TO_BUILDER_METHOD[exp.operation.type] - if (name!=null) { - makeNode(name,body) - return; - } - - throw new UnsupportedOperationException("Operation: " + exp.operation + " not supported"); - } - - void visitPrefixExpression(PrefixExpression exp) { - makeNode("prefix"+ prepostfixOperatorSuffix(exp)) { - loc(exp) - visit(exp.expression) - } - } - - void visitPostfixExpression(PostfixExpression exp) { - makeNode("postfix"+ prepostfixOperatorSuffix(exp)) { - loc(exp) - visit(exp.expression) - } - } - - protected String prepostfixOperatorSuffix(Expression exp) { - switch (exp.operation.type) { - case PLUS_PLUS: return "Inc"; - case MINUS_MINUS: return "Dec"; - default: - throw new UnsupportedOperationException("Unknown operator:" + exp.operation.text) - } - } - - void visitBooleanExpression(BooleanExpression exp) { - visit(exp.expression); - } - - void visitClosureExpression(ClosureExpression exp) { - makeNode("closure") { - loc(exp) - - def types = new ListExpression(); - def params = new ListExpression(); - - // the interpretation of the 'parameters' is messed up. According to ClosureWriter, - // when the user explicitly defines no parameter "{ -> foo() }" then this is null, - // when the user doesn't define any parameter explicitly { foo() }, then this is empty, - if (exp.parameters==null) { - } else - if (exp.parameters.length==0) { - types.addExpression(new ClassExpression(OBJECT_TYPE)); - params.addExpression(new ConstantExpression("it")); - } else { - exp.parameters.each { - types.addExpression(new ClassExpression(it.type)); - params.addExpression(new ConstantExpression(it.name)) - } - } - parent(types); - parent(params) - visitWithSafepoint(exp.code) - } - } - - void visitTupleExpression(TupleExpression expression) { - throw new UnsupportedOperationException(); - } - - void visitMapExpression(MapExpression exp) { - makeNode("map") { - exp.mapEntryExpressions.each { e -> - visit(e.keyExpression) - visit(e.valueExpression) - } - } - } - - void visitMapEntryExpression(MapEntryExpression expression) { - throw new UnsupportedOperationException(); - } - - void visitListExpression(ListExpression exp) { - makeNode("list") { - visit(exp.expressions) - } - } - - void visitRangeExpression(RangeExpression exp) { - makeNode("range") { - loc(exp) - visit(exp.from) - visit(exp.to) - literal(exp.inclusive) - } - } - - void visitPropertyExpression(PropertyExpression exp) { - // TODO: spread - if (exp.objectExpression instanceof VariableExpression && exp.objectExpression.thisExpression && - exp.property instanceof ConstantExpression && classNode.getSetterMethod('set' + Verifier.capitalize(exp.property.value), false) != null) { - makeNode("attribute") { - loc(exp) - visit(exp.objectExpression) - visit(exp.property) - literal(exp.safe) - } - } else { - makeNode("property") { - loc(exp) - visit(exp.objectExpression) - visit(exp.property) - literal(exp.safe) - } - } - } - - void visitAttributeExpression(AttributeExpression exp) { - // TODO: spread - makeNode("attribute") { - loc(exp) - visit(exp.objectExpression) - visit(exp.property) - literal(exp.safe) - } - } - - void visitFieldExpression(FieldExpression exp) { - def f = exp.field - if (f.isStatic()) { - makeNode("staticField") { - loc(exp) - literal(f.type) - literal(exp.fieldName) - } - } else { - makeNode("property") { - loc(exp) - makeNode("this_") - literal(exp.fieldName) - } - } - } - - void visitMethodPointerExpression(MethodPointerExpression exp) { - makeNode("methodPointer") { - loc(exp) - visit(exp.expression) - visit(exp.methodName) - } - } - - void visitConstantExpression(ConstantExpression expression) { - makeNode("constant", expression) - } - - void visitClassExpression(ClassExpression expression) { - makeNode("constant", expression) - } - - void visitVariableExpression(VariableExpression exp) { - def ref = exp.accessedVariable - if (ref instanceof VariableExpression /* local variable */ - || ref instanceof Parameter) { - makeNode("localVariable") { - loc(exp) - literal(exp.name) - } - } else - if (ref instanceof DynamicVariable - || ref instanceof PropertyNode - || ref instanceof FieldNode) { - if (ref instanceof FieldNode && classNode.getGetterMethod('get' + Verifier.capitalize(exp.name)) != null) { - makeNode("attribute") { - loc(exp) - makeNode("javaThis_") - visit(new ConstantExpression(exp.name)) - literal(false) - } - } else { - makeNode("property") { - loc(exp) - makeNode("javaThis_") - literal(exp.name) - } - } - } else - if (exp.name=="this") { - /* Kohsuke: TODO: I don't really understand the 'true' block of the code, so I'm missing something - if (controller.isStaticMethod() || (!controller.getCompileStack().isImplicitThis() && controller.isStaticContext())) { - if (controller.isInClosure()) classNode = controller.getOutermostClass(); - visitClassExpression(new ClassExpression(classNode)); - } else { - loadThis(); - } - */ - makeNode("this_") - } else - if (exp.name=="super") { - makeNode("super_") { - literal(classNode) - } - } else - sourceUnit.addError(new SyntaxException("Unsupported expression for CPS transformation", exp.lineNumber, exp.columnNumber)) - } - - void visitDeclarationExpression(DeclarationExpression exp) { - if (exp.isMultipleAssignmentDeclaration()) { - // def (a,b)=list - makeNode("sequence") { - for (VariableExpression v in exp.tupleExpression.expressions) { - makeNode("declareVariable") { - loc(exp) - literal(v.type) - literal(v.name) - } - } - makeNode("assign") { - loc(exp) - visit(exp.leftExpression) - visit(exp.rightExpression) - } - } - } else { - // def x=v; - makeNode("declareVariable") { - def v = exp.variableExpression - loc(exp) - literal(v.type) - literal(v.name) - visit(exp.rightExpression) // this will not produce anything if this is EmptyExpression - } - } - } - - void visitGStringExpression(GStringExpression exp) { - makeNode("gstring") { - loc(exp) - makeNode("list") { - visit(exp.values) - } - makeNode("list") { - visit(exp.strings) - } - } - } - - void visitArrayExpression(ArrayExpression exp) { - if (exp.sizeExpression!=null) { - // array instanation like new String[1][2][3] - makeNode("newArray") { - loc(exp) - literal(exp.elementType) - visit(exp.sizeExpression) - } - } else { - throw new UnsupportedOperationException(); - } - } - - void visitSpreadExpression(SpreadExpression expression) { - throw new UnsupportedOperationException(); - } - - void visitSpreadMapExpression(SpreadMapExpression expression) { - throw new UnsupportedOperationException(); - } - - void visitNotExpression(NotExpression exp) { - makeNode("not") { - loc(exp) - visit(exp.expression) - } - } - - void visitUnaryMinusExpression(UnaryMinusExpression exp) { - makeNode("unaryMinus") { - loc(exp) - visit(exp.expression) - } - } - - void visitUnaryPlusExpression(UnaryPlusExpression exp) { - makeNode("unaryPlus") { - loc(exp) - visit(exp.expression) - } - } - - void visitBitwiseNegationExpression(BitwiseNegationExpression exp) { - makeNode("bitwiseNegation") { - loc(exp) - visit(exp.expression) - } - } - - void visitCastExpression(CastExpression exp) { - makeNode("cast") { - loc(exp) - visit(exp.expression) - literal(exp.type) - literal(exp.isCoerce()) - } - } - - void visitArgumentlistExpression(ArgumentListExpression expression) { - throw new UnsupportedOperationException(); - } - - void visitClosureListExpression(ClosureListExpression closureListExpression) { - throw new UnsupportedOperationException(); - } - - void visitBytecodeExpression(BytecodeExpression expression) { - throw new UnsupportedOperationException(); - } - - private static final ClassNode OBJECT_TYPE = ClassHelper.makeCached(Object.class); - private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(CpsFunction.class); - private static final ClassNode CATCH_EXPRESSION_TYPE = ClassHelper.makeCached(CatchExpression.class); - private static final ClassNode BUILDER_TYPE = ClassHelper.makeCached(Builder.class); - private static final ClassNode CPSCALLINVK_TYPE = ClassHelper.makeCached(CpsCallableInvocation.class); - private static final ClassNode WORKFLOW_TRANSFORMED_TYPE = ClassHelper.makeCached(WorkflowTransformed.class); - private static final ClassNode BUIDER_TYPE = ClassHelper.makeCached(Builder.class); - private static final ClassNode METHOD_LOCATION_TYPE = ClassHelper.makeCached(MethodLocation.class); - - private static final VariableExpression BUILDER = new VariableExpression("b",BUILDER_TYPE); // new PropertyExpression(new ClassExpression(BUILDER_TYPE), "INSTANCE") - private static final VariableExpression THIS = new VariableExpression("this"); - - /** - * Closure's default "it" parameter. - */ - private static final Parameter IT = new Parameter(ClassHelper.OBJECT_TYPE, "it", ConstantExpression.NULL); - - private static final int PRIVATE_STATIC_FINAL = Modifier.STATIC | Modifier.PRIVATE | Modifier.FINAL -} diff --git a/lib/src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy b/lib/src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy deleted file mode 100644 index 311195dcd..000000000 --- a/lib/src/main/groovy/com/cloudbees/groovy/cps/SandboxCpsTransformer.groovy +++ /dev/null @@ -1,39 +0,0 @@ -package com.cloudbees.groovy.cps - -import com.cloudbees.groovy.cps.sandbox.Untrusted -import org.codehaus.groovy.ast.ClassCodeExpressionTransformer -import org.codehaus.groovy.ast.ClassNode -import org.codehaus.groovy.ast.MethodNode -import org.codehaus.groovy.classgen.GeneratorContext -import org.codehaus.groovy.control.SourceUnit -import org.kohsuke.groovy.sandbox.SandboxTransformer - -/** - * {@link CpsTransformer} + {@link org.kohsuke.groovy.sandbox.SandboxTransformer} - * - * @author Kohsuke Kawaguchi - */ -class SandboxCpsTransformer extends CpsTransformer { - private final SandboxTransformer st = new SandboxTransformer() - private ClassCodeExpressionTransformer stv; - - @Override - void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { - stv = st.createVisitor(source) - super.call(source, context, classNode) - } - - /** - * If the method is not CPS transformed, we need to sandbox-transform that method to intercept calls - * that happen in these methods. - */ - @Override - protected void visitNontransformedMethod(MethodNode m) { - stv.visitMethod(m); - } - - @Override - protected Class getTrustTag() { - return Untrusted.class; - } -} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java new file mode 100644 index 000000000..f1f493cf0 --- /dev/null +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -0,0 +1,1214 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; +import com.cloudbees.groovy.cps.impl.CpsFunction; +import com.cloudbees.groovy.cps.sandbox.Trusted; +import com.cloudbees.groovy.cps.sandbox.Untrusted; +import java.lang.annotation.Annotation; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.annotation.Nonnull; +import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.stmt.*; +import org.codehaus.groovy.classgen.AsmClassGenerator; +import org.codehaus.groovy.classgen.BytecodeExpression; +import org.codehaus.groovy.classgen.GeneratorContext; +import org.codehaus.groovy.classgen.Verifier; +import org.codehaus.groovy.control.CompilePhase; +import org.codehaus.groovy.control.Janitor; +import org.codehaus.groovy.control.SourceUnit; +import org.codehaus.groovy.control.customizers.CompilationCustomizer; +import org.codehaus.groovy.runtime.powerassert.SourceText; +import org.codehaus.groovy.syntax.SyntaxException; +import org.codehaus.groovy.syntax.Token; +import static org.codehaus.groovy.syntax.Types.*; + +/** + * Performs CPS transformation of Groovy methods. + * + *

+ * Every method not annotated with {@link NonCPS} gets rewritten. The general + * strategy of CPS transformation is as follows: + * + *

+ * Before: + * 

+ * Object foo(int x, int y) {
+ *   return x+y;
+ * }
+ *
+ * + *

+ * After: + * 

+ * Object foo(int x, int y) {
+ *   // the first part is AST of the method body
+ *   // the rest (including implicit receiver argument) is actual value of arguments
+ *   throw new CpsCallableInvocation(___cps___N, this, new Object[] {x, y});
+ * }
+ *
+ * private static CpsFunction ___cps___N = ___cps___N();
+ *
+ * private static final CpsFunction ___cps___N() {
+ *   Builder b = new Builder(...);
+ *   return new CpsFunction(['x','y'], b.plus(b.localVariable("x"), b.localVariable("y"))
+ * }
+ *
+ * + *

+ * That is, we transform a Groovy AST of the method body into a tree of + * {@link Block}s by using {@link Builder}, then the method just returns this + * function object and expect the caller to evaluate it, instead of executing + * the method synchronously before it returns. + * + *

+ * This class achieves this transformation by implementing + * {@link GroovyCodeVisitor} and traverse Groovy AST tree in the in-order. As we + * traverse this tree, we produce another Groovy AST tree that invokes + * {@link Builder}. Note that we aren't calling Builder directly here; that's + * supposed to happen when the Groovy code under transformation actually runs. + * + *

+ * Groovy AST that calls {@link Builder} is a tree of function call, so we build + * {@link MethodCallExpression}s in the top-down manner. We do this by + * {@link CpsTransformer#makeNode(String, Runnable)}, which creates a call to + * {@code Builder.xxx(...)}, then supply the closure that fills in the arguments + * to this call by walking down the original Groovy AST tree. This walk-down is + * done by calling {@link CpsTransformer#visit(ASTNode)} (to recursively visit + * ASTs), or by calling {@link CpsTransformer#literal(String)} methods, which + * generate string/class/etc literals, as sometimes {@link Builder} methods need + * them as well. + * + * @author Kohsuke Kawaguchi + */ +public class CpsTransformer extends CompilationCustomizer implements GroovyCodeVisitor { + + private static final Logger LOGGER = Logger.getLogger(CpsTransformer.class.getName()); + + private static final AtomicLong iota = new AtomicLong(); + + private SourceUnit sourceUnit; + + protected ClassNode classNode; + + protected TransformerConfiguration config = new TransformerConfiguration(); + + public CpsTransformer() { + super(CompilePhase.CANONICALIZATION); + } + + public void setConfiguration(@Nonnull TransformerConfiguration config) { + this.config = config; + } + + @Override + public void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { + if (classNode.isInterface()) { + return; // not touching interfaces + } + this.sourceUnit = source; + this.classNode = classNode; + try { + +// copy(source.ast.methods)?.each { visitMethod(it) } +// classNode?.declaredConstructors?.each { visitMethod(it) } // can't transform constructor + if (classNode != null) { + for (MethodNode method : new ArrayList<>(classNode.getMethods())) { + visitMethod(method); + } + } +// classNode?.objectInitializerStatements?.each { it.visit(visitor) } +// classNode?.fields?.each { visitor.visitField(it) } + + // groovy puts timestamp of compilation into a class file, causing serialVersionUID to change. + // this tends to be undesirable for CPS involving persistence. + // set the timestamp to some bogus value will prevent Verifier from adding a field that encodes + // timestamp in the field name + // see http://stackoverflow.com/questions/15310136/neverhappen-variable-in-compiled-classes + if (classNode.getField(Verifier.__TIMESTAMP) == null) { + classNode.addField(Verifier.__TIMESTAMP, Modifier.STATIC | Modifier.PRIVATE, ClassHelper.long_TYPE, + new ConstantExpression(0L)); + } + + classNode.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)); + + } finally { + this.sourceUnit = null; + this.classNode = null; + this.parent = null; + } + } + + /** + * Should this method be transformed? + */ + protected boolean shouldBeTransformed(MethodNode node) { + return !node.isSynthetic() && + !hasAnnotation(node, NonCPS.class) && + !hasAnnotation(node, WorkflowTransformed.class) && + !node.isAbstract(); + } + + boolean hasAnnotation(MethodNode node, Class a) { + for (AnnotationNode ann : node.getAnnotations()) { + if (ann.getClassNode().getName().equals(a.getName())) { + return true; + } + } + return false; + } + + /** + * Transforms asynchronous workflow method. + * + * From: + * + * ReturnT foo( T1 arg1, T2 arg2, ...) { ... body ... } + * + * To: + * + * private static CpsFunction ___cps___N = ___cps___N(); + * + * private static final CpsFunction ___cps___N() { return new + * CpsFunction(['arg1','arg2','arg3',...], CPS-transformed-method-body) } + * + * ReturnT foo( T1 arg1, T2 arg2, ...) { throw new + * CpsCallableInvocation(___cps___N, this, new Object[] {arg1, arg2, ...}) } + */ + public void visitMethod(final MethodNode m) { + if (!shouldBeTransformed(m)) { + visitNontransformedMethod(m); + return; + } + + final AtomicReference body = new AtomicReference<>(); + + // transform the body + parent = new ParentClosure() { + @Override + public void call(Expression e) { + body.set(e); + if (LOGGER.isLoggable(Level.FINEST)) { + LOGGER.log(Level.FINEST, "in {0} transformed {1} to {2}", new Object[] {classNode.getName(), m.getTypeDescriptor(), e.getText()}); + } + } + }; + visitWithSafepoint(m.getCode()); + + ListExpression params = new ListExpression(); + for (Parameter p : m.getParameters()) { + params.addExpression(new ConstantExpression(p.getName())); + } + + /* + CpsFunction ___cps___N() { + Builder b = new Builder(...); + return new CpsFunction( << parameters >>, << body: AST tree building code >>); + } + */ + String cpsName = "___cps___" + iota.getAndIncrement(); + + MethodNode builderMethod = m.getDeclaringClass().addMethod(cpsName, PRIVATE_STATIC_FINAL, FUNCTION_TYPE, new Parameter[0], new ClassNode[0], + new BlockStatement(Arrays.asList( + new ExpressionStatement(new DeclarationExpression(BUILDER, new Token(ASSIGN, "=", -1, -1), makeBuilder(m))), + new ReturnStatement(new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body.get()))) + ), new VariableScope()) + ); + builderMethod.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)); + + FieldNode f = m.getDeclaringClass().addField(cpsName, PRIVATE_STATIC_FINAL, FUNCTION_TYPE, + new StaticMethodCallExpression(m.getDeclaringClass(), cpsName, new TupleExpression())); +// new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body))); + + List paramExpressions = new ArrayList<>(); + for (Parameter p : m.getParameters()) { + paramExpressions.add(new VariableExpression(p)); + } + ArrayExpression paramArray = new ArrayExpression(ClassHelper.OBJECT_TYPE, paramExpressions); + TupleExpression args = new TupleExpression(new VariableExpression(f), THIS, paramArray); + + m.setCode(new ThrowStatement(new ConstructorCallExpression(CPSCALLINVK_TYPE, args))); + + m.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)); + } + + /** + * Generates code that instantiates a new {@link Builder}. + * + *

+ * Hook for subtypes to tweak builder, for example to + * {@link Builder#contextualize(com.cloudbees.groovy.cps.sandbox.CallSiteTag...)} + * + * 

+     * Builder b = new Builder(new MethodLocation(...));
+     * b.withClosureType(...);
+     *
+ * + * @param m Method being transformed. + */ + protected Expression makeBuilder(MethodNode m) { + Expression b = new ConstructorCallExpression(BUIDER_TYPE, new TupleExpression( + new ConstructorCallExpression(METHOD_LOCATION_TYPE, new TupleExpression( + new ConstantExpression(m.getDeclaringClass().getName()), + new ConstantExpression(m.getName()), + new ConstantExpression(sourceUnit.getName()) + )) + )); + b = new MethodCallExpression(b, "withClosureType", + new TupleExpression(new ClassExpression(config.getClosureType()))); + + Class tag = getTrustTag(); + if (tag != null) { + b = new MethodCallExpression(b, "contextualize", + new PropertyExpression(new ClassExpression(ClassHelper.makeCached(tag)), "INSTANCE")); + } + return b; + } + + /** + * {@link Trusted} or {@link Untrusted} tag that gets added to call site. + * + * @see "doc/sandbox.md" + */ + protected Class getTrustTag() { + return Trusted.class; + } + + /** + * For methods that are not CPS-transformed. + */ + protected void visitNontransformedMethod(MethodNode m) { + } + + // TODO Java 8 @FunctionalInterface, or switch to Consumer + protected interface ParentClosure { + void call(Expression e); + } + + /** + * As we visit expressions in the method body, we convert them to the + * {@link Builder} invocations and pass them back to this closure. + */ + protected ParentClosure parent; + + protected void visit(ASTNode e) { + LOGGER.log(Level.FINER, "visiting {0}:{1}", new Object[] {sourceUnit.getName(), e.getLineNumber()}); + if (e instanceof EmptyExpression) { + // working around a bug in EmptyExpression.visit() that doesn't call any method + visitEmptyExpression((EmptyExpression) e); + } else if (e instanceof EmptyStatement) { + // working around a bug in EmptyStatement.visit() that doesn't call any method + visitEmptyStatement((EmptyStatement) e); + } else { + e.visit(this); + } + } + + protected void visit(Collection col) { + for (ASTNode e : col) { + visit(e); + } + } + + /** + * Like {@link #visit(ASTNode)} but also inserts the safepoint at the top. + */ + protected void visitWithSafepoint(final Statement st) { + if (config.getSafepoints().isEmpty()) { + visit(st); // common case optimization + } else { + makeNode("block", new Runnable() { + @Override + public void run() { + // insert function call for each safepoint + for (final Safepoint s : config.getSafepoints()) { + makeNode("staticCall", new Runnable() { + @Override + public void run() { + loc(st); + literal(s.node); + literal(s.methodName); + } + }); + } + visit(st); + } + }); + } + } + + /** + * Makes an AST fragment that calls {@link Builder} with specific method. + * + * @param methodName Method on {@link Builder} to call. + */ + protected void makeNode(String methodName, Expression... args) { + parent.call(new MethodCallExpression(BUILDER, methodName, makeChildren(args))); + } + + /** + * Makes an AST fragment that calls {@link Builder} with specific method. + * + * @param methodName Method on {@link Builder} to call. + */ + protected void makeNode(String methodName, Runnable body) { + parent.call(new MethodCallExpression(BUILDER, methodName, makeChildren(body))); + } + + /** + * Makes an AST fragment that instantiates a new instance of the given type. + */ + protected void makeNode(ClassNode type, Expression... args) { + parent.call(new ConstructorCallExpression(type, makeChildren(args))); + } + + /** + * Makes an AST fragment that instantiates a new instance of the given type. + */ + protected void makeNode(ClassNode type, Runnable body) { + parent.call(new ConstructorCallExpression(type, makeChildren(body))); + } + + /** + * Shorthand for {@link TupleExpression#TupleExpression(Expression[])}. + */ + protected TupleExpression makeChildren(Expression... args) { + return new TupleExpression(args); + } + + /** + * Given closure, package them up into a tuple. + */ + protected TupleExpression makeChildren(Runnable body) { + final List argExps = new ArrayList<>(); + ParentClosure old = parent; + try { + parent = new ParentClosure() { + @Override + public void call(Expression e) { + argExps.add(e); + } + }; + body.run(); // evaluate arguments + return new TupleExpression(argExps); + } finally { + parent = old; + } + } + + protected void loc(ASTNode e) { + literal(e.getLineNumber()); + } + + /** + * Used in the closure block of {@link #makeNode(String, Runnable)} to create + * a literal string argument. + */ + protected void literal(String s) { + parent.call(new ConstantExpression(s)); + } + + protected void literal(ClassNode c) { + parent.call(new ClassExpression(c)); + } + + protected void literal(int n) { + parent.call(new ConstantExpression(n, true)); + } + + protected void literal(boolean b) { + parent.call(new ConstantExpression(b, true)); + } + + void visitEmptyExpression(EmptyExpression e) { + makeNode("noop"); + } + + void visitEmptyStatement(EmptyStatement e) { + makeNode("noop"); + } + + @Override + public void visitMethodCallExpression(final MethodCallExpression call) { + makeNode("functionCall", new Runnable() { + @Override + public void run() { + loc(call); + + // isImplicitThis==true even when objectExpression is not 'this'. + // See InvocationWriter.makeCall, + if (call.isImplicitThis() && AsmClassGenerator.isThisExpression(call.getObjectExpression())) { + makeNode("javaThis_"); + } else { + visit(call.getObjectExpression()); + } + if (call.isSpreadSafe()) { + throw new UnsupportedOperationException("spread not yet supported in " + call.getText()); // TODO will require safepoints + } + visit(call.getMethod()); + literal(call.isSafe()); + visit(((TupleExpression) call.getArguments()).getExpressions()); + } + }); + } + + @Override + public void visitBlockStatement(final BlockStatement b) { + makeNode("block", new Runnable() { + @Override + public void run() { + visit(b.getStatements()); + } + }); + } + + @Override + public void visitForLoop(final ForStatement forLoop) { + if (ForStatement.FOR_LOOP_DUMMY.equals(forLoop.getVariable())) { + // for ( e1; e2; e3 ) { ... } + final ClosureListExpression loop = (ClosureListExpression) forLoop.getCollectionExpression(); + assert loop.getExpressions().size() == 3; + + makeNode("forLoop", new Runnable() { + @Override + public void run() { + literal(forLoop.getStatementLabel()); + visit(loop.getExpressions()); + visitWithSafepoint(forLoop.getLoopBlock()); + } + }); + } else { + // for (x in col) { ... } + makeNode("forInLoop", new Runnable() { + @Override + public void run() { + loc(forLoop); + literal(forLoop.getStatementLabel()); + literal(forLoop.getVariableType()); + literal(forLoop.getVariable().getName()); + visit(forLoop.getCollectionExpression()); + visitWithSafepoint(forLoop.getLoopBlock()); + } + }); + } + } + + @Override + public void visitWhileLoop(final WhileStatement loop) { + makeNode("while_", new Runnable() { + @Override + public void run() { + literal(loop.getStatementLabel()); + visit(loop.getBooleanExpression()); + visitWithSafepoint(loop.getLoopBlock()); + } + }); + } + + @Override + public void visitDoWhileLoop(final DoWhileStatement loop) { + makeNode("doWhile", new Runnable() { + @Override + public void run() { + literal(loop.getStatementLabel()); + visit(loop.getBooleanExpression()); + visitWithSafepoint(loop.getLoopBlock()); + } + }); + } + + @Override + public void visitIfElse(final IfStatement stmt) { + makeNode("if_", new Runnable() { + @Override + public void run() { + visit(stmt.getBooleanExpression()); + visit(stmt.getIfBlock()); + visit(stmt.getElseBlock()); + } + }); + } + + @Override + public void visitExpressionStatement(ExpressionStatement statement) { + visit(statement.getExpression()); + } + + @Override + public void visitReturnStatement(final ReturnStatement statement) { + makeNode("return_", new Runnable() { + @Override + public void run() { + visit(statement.getExpression()); + } + }); + } + + @Override + public void visitAssertStatement(final AssertStatement statement) { + Janitor j = new Janitor(); + final String text = new SourceText(statement, sourceUnit, j).getNormalizedText(); + j.cleanup(); + + makeNode("assert_", new Runnable() { + @Override + public void run() { + visit(statement.getBooleanExpression()); + visit(statement.getMessageExpression()); + literal(text); + } + }); + } + + @Override + public void visitTryCatchFinally(final TryCatchStatement stmt) { + makeNode("tryCatch", new Runnable() { + @Override + public void run() { + visit(stmt.getTryStatement()); + visit(stmt.getFinallyStatement()); + visit(stmt.getCatchStatements()); + } + }); + } + + @Override + public void visitSwitch(final SwitchStatement stmt) { + makeNode("switch_", new Runnable() { + @Override + public void run() { + literal(stmt.getStatementLabel()); + visit(stmt.getExpression()); + visit(stmt.getDefaultStatement()); + visit(stmt.getCaseStatements()); + } + }); + } + + @Override + public void visitCaseStatement(final CaseStatement stmt) { + makeNode("case_", new Runnable() { + @Override + public void run() { + loc(stmt); + visit(stmt.getExpression()); + visit(stmt.getCode()); + } + }); + } + + @Override + public void visitBreakStatement(BreakStatement statement) { + makeNode("break_", new ConstantExpression(statement.getLabel())); + } + + @Override + public void visitContinueStatement(ContinueStatement statement) { + makeNode("continue_", new ConstantExpression(statement.getLabel())); + } + + @Override + public void visitThrowStatement(final ThrowStatement st) { + makeNode("throw_", new Runnable() { + @Override + public void run() { + loc(st); + visit(st.getExpression()); + } + }); + } + + @Override + public void visitSynchronizedStatement(SynchronizedStatement statement) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitCatchStatement(final CatchStatement stmt) { + makeNode(CATCH_EXPRESSION_TYPE, new Runnable() { + @Override + public void run() { + literal(stmt.getExceptionType()); + literal(stmt.getVariable().getName()); + visit(stmt.getCode()); + } + }); + } + + @Override + public void visitStaticMethodCallExpression(final StaticMethodCallExpression exp) { + makeNode("staticCall", new Runnable() { + @Override + public void run() { + loc(exp); + literal(exp.getOwnerType()); + literal(exp.getMethod()); + visit(((TupleExpression) exp.getArguments()).getExpressions()); + } + }); + } + + @Override + public void visitConstructorCallExpression(final ConstructorCallExpression call) { + makeNode("new_", new Runnable() { + @Override + public void run() { + loc(call); + literal(call.getType()); + visit(((TupleExpression) call.getArguments()).getExpressions()); + } + }); + } + + @Override + public void visitTernaryExpression(final TernaryExpression exp) { + makeNode("ternaryOp", new Runnable() { + @Override + public void run() { + visit(exp.getBooleanExpression()); + visit(exp.getTrueExpression()); + visit(exp.getFalseExpression()); + } + }); + } + + @Override + public void visitShortTernaryExpression(final ElvisOperatorExpression exp) { + makeNode("elvisOp", new Runnable() { + @Override + public void run() { + visit(exp.getBooleanExpression()); + visit(exp.getFalseExpression()); + } + }); + } + + // Constants from Token.type to a method on Builder + private static final Map BINARY_OP_TO_BUILDER_METHOD = new HashMap<>(); + static { + BINARY_OP_TO_BUILDER_METHOD.put(COMPARE_EQUAL, "compareEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(COMPARE_NOT_EQUAL, "compareNotEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(COMPARE_TO, "compareTo"); + BINARY_OP_TO_BUILDER_METHOD.put(COMPARE_GREATER_THAN, "greaterThan"); + BINARY_OP_TO_BUILDER_METHOD.put(COMPARE_GREATER_THAN_EQUAL, "greaterThanEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(COMPARE_LESS_THAN, "lessThan"); + BINARY_OP_TO_BUILDER_METHOD.put(COMPARE_LESS_THAN_EQUAL, "lessThanEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(LOGICAL_AND, "logicalAnd"); + BINARY_OP_TO_BUILDER_METHOD.put(LOGICAL_OR, "logicalOr"); + BINARY_OP_TO_BUILDER_METHOD.put(BITWISE_AND, "bitwiseAnd"); + BINARY_OP_TO_BUILDER_METHOD.put(BITWISE_AND_EQUAL, "bitwiseAndEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(BITWISE_OR, "bitwiseOr"); + BINARY_OP_TO_BUILDER_METHOD.put(BITWISE_OR_EQUAL, "bitwiseOrEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(BITWISE_XOR, "bitwiseXor"); + BINARY_OP_TO_BUILDER_METHOD.put(BITWISE_XOR_EQUAL, "bitwiseXorEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(PLUS, "plus"); + BINARY_OP_TO_BUILDER_METHOD.put(PLUS_EQUAL, "plusEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(MINUS, "minus"); + BINARY_OP_TO_BUILDER_METHOD.put(MINUS_EQUAL, "minusEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(MULTIPLY, "multiply"); + BINARY_OP_TO_BUILDER_METHOD.put(MULTIPLY_EQUAL, "multiplyEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(DIVIDE, "div"); + BINARY_OP_TO_BUILDER_METHOD.put(DIVIDE_EQUAL, "divEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(INTDIV, "intdiv"); + BINARY_OP_TO_BUILDER_METHOD.put(INTDIV_EQUAL, "intdivEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(MOD, "mod"); + BINARY_OP_TO_BUILDER_METHOD.put(MOD_EQUAL, "modEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(POWER, "power"); + BINARY_OP_TO_BUILDER_METHOD.put(POWER_EQUAL, "powerEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(EQUAL, "assign"); + BINARY_OP_TO_BUILDER_METHOD.put(KEYWORD_INSTANCEOF, "instanceOf"); + BINARY_OP_TO_BUILDER_METHOD.put(LEFT_SQUARE_BRACKET, "array"); + + BINARY_OP_TO_BUILDER_METHOD.put(LEFT_SHIFT, "leftShift"); + BINARY_OP_TO_BUILDER_METHOD.put(LEFT_SHIFT_EQUAL, "leftShiftEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(RIGHT_SHIFT, "rightShift"); + BINARY_OP_TO_BUILDER_METHOD.put(RIGHT_SHIFT_EQUAL, "rightShiftEqual"); + BINARY_OP_TO_BUILDER_METHOD.put(RIGHT_SHIFT_UNSIGNED, "rightShiftUnsigned"); + BINARY_OP_TO_BUILDER_METHOD.put(RIGHT_SHIFT_UNSIGNED_EQUAL, "rightShiftUnsignedEqual"); + + BINARY_OP_TO_BUILDER_METHOD.put(FIND_REGEX, "findRegex"); + BINARY_OP_TO_BUILDER_METHOD.put(MATCH_REGEX, "matchRegex"); + BINARY_OP_TO_BUILDER_METHOD.put(KEYWORD_IN, "isCase"); + } + + /** + * @see + * org.codehaus.groovy.classgen.asm.BinaryExpressionHelper#eval(BinaryExpression) + */ + @Override + public void visitBinaryExpression(final BinaryExpression exp) { + String name = BINARY_OP_TO_BUILDER_METHOD.get(exp.getOperation().getType()); + if (name != null) { + makeNode(name, new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getLeftExpression()); + visit(exp.getRightExpression()); + } + }); + return; + } + + throw new UnsupportedOperationException("Operation: " + exp.getOperation() + " not supported"); + } + + @Override + public void visitPrefixExpression(final PrefixExpression exp) { + makeNode("prefix" + prepostfixOperatorSuffix(exp.getOperation()), new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getExpression()); + } + }); + } + + @Override + public void visitPostfixExpression(final PostfixExpression exp) { + makeNode("postfix" + prepostfixOperatorSuffix(exp.getOperation()), new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getExpression()); + } + }); + } + + protected String prepostfixOperatorSuffix(Token operation) { + switch (operation.getType()) { + case PLUS_PLUS: + return "Inc"; + case MINUS_MINUS: + return "Dec"; + default: + throw new UnsupportedOperationException("Unknown operator:" + operation.getText()); + } + } + + @Override + public void visitBooleanExpression(BooleanExpression exp) { + visit(exp.getExpression()); + } + + @Override + public void visitClosureExpression(final ClosureExpression exp) { + makeNode("closure", new Runnable() { + @Override + public void run() { + loc(exp); + + ListExpression types = new ListExpression(); + ListExpression params = new ListExpression(); + + // the interpretation of the 'parameters' is messed up. According to ClosureWriter, + // when the user explicitly defines no parameter "{ -> foo() }" then this is null, + // when the user doesn't define any parameter explicitly { foo() }, then this is empty, + if (exp.getParameters() == null) { + } else if (exp.getParameters().length == 0) { + types.addExpression(new ClassExpression(OBJECT_TYPE)); + params.addExpression(new ConstantExpression("it")); + } else { + for (Parameter p : exp.getParameters()) { + types.addExpression(new ClassExpression(p.getType())); + params.addExpression(new ConstantExpression(p.getName())); + } + } + parent.call(types); + parent.call(params); + visitWithSafepoint(exp.getCode()); + } + }); + } + + @Override + public void visitTupleExpression(TupleExpression expression) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitMapExpression(final MapExpression exp) { + makeNode("map", new Runnable() { + @Override + public void run() { + for (MapEntryExpression e : exp.getMapEntryExpressions()) { + visit(e.getKeyExpression()); + visit(e.getValueExpression()); + } + } + }); + } + + @Override + public void visitMapEntryExpression(MapEntryExpression expression) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitListExpression(final ListExpression exp) { + makeNode("list", new Runnable() { + @Override + public void run() { + visit(exp.getExpressions()); + } + }); + } + + @Override + public void visitRangeExpression(final RangeExpression exp) { + makeNode("range", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getFrom()); + visit(exp.getTo()); + literal(exp.isInclusive()); + } + }); + } + + @Override + public void visitPropertyExpression(final PropertyExpression exp) { + // TODO: spread + if (exp.getObjectExpression() instanceof VariableExpression && ((VariableExpression) exp.getObjectExpression()).isThisExpression() && + exp.getProperty() instanceof ConstantExpression && classNode.getSetterMethod("set" + Verifier.capitalize((String) ((ConstantExpression) exp.getProperty()).getValue()), false) != null) { + makeNode("attribute", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getObjectExpression()); + visit(exp.getProperty()); + literal(exp.isSafe()); + } + }); + } else { + makeNode("property", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getObjectExpression()); + visit(exp.getProperty()); + literal(exp.isSafe()); + } + }); + } + } + + @Override + public void visitAttributeExpression(final AttributeExpression exp) { + // TODO: spread + makeNode("attribute", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getObjectExpression()); + visit(exp.getProperty()); + literal(exp.isSafe()); + } + }); + } + + @Override + public void visitFieldExpression(final FieldExpression exp) { + final FieldNode f = exp.getField(); + if (f.isStatic()) { + makeNode("staticField", new Runnable() { + @Override + public void run() { + loc(exp); + literal(f.getType()); + literal(exp.getFieldName()); + } + }); + } else { + makeNode("property", new Runnable() { + @Override + public void run() { + loc(exp); + makeNode("this_"); + literal(exp.getFieldName()); + } + }); + } + } + + @Override + public void visitMethodPointerExpression(final MethodPointerExpression exp) { + makeNode("methodPointer", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getExpression()); + visit(exp.getMethodName()); + } + }); + } + + @Override + public void visitConstantExpression(ConstantExpression expression) { + makeNode("constant", expression); + } + + @Override + public void visitClassExpression(ClassExpression expression) { + makeNode("constant", expression); + } + + @Override + public void visitVariableExpression(final VariableExpression exp) { + Variable ref = exp.getAccessedVariable(); + if (ref instanceof VariableExpression /* local variable */ || + ref instanceof Parameter) { + makeNode("localVariable", new Runnable() { + @Override + public void run() { + loc(exp); + literal(exp.getName()); + } + }); + } else if (ref instanceof DynamicVariable || + ref instanceof PropertyNode || + ref instanceof FieldNode) { + if (ref instanceof FieldNode && classNode.getGetterMethod("get" + Verifier.capitalize(exp.getName())) != null) { + makeNode("attribute", new Runnable() { + @Override + public void run() { + loc(exp); + makeNode("javaThis_"); + visit(new ConstantExpression(exp.getName())); + literal(false); + } + }); + } else { + makeNode("property", new Runnable() { + @Override + public void run() { + loc(exp); + makeNode("javaThis_"); + literal(exp.getName()); + } + }); + } + } else if ("this".equals(exp.getName())) { + /* Kohsuke: TODO: I don't really understand the 'true' block of the code, so I'm missing something + if (controller.isStaticMethod() || (!controller.getCompileStack().isImplicitThis() && controller.isStaticContext())) { + if (controller.isInClosure()) classNode = controller.getOutermostClass(); + visitClassExpression(new ClassExpression(classNode)); + } else { + loadThis(); + } + */ + makeNode("this_"); + } else if ("super".equals(exp.getName())) { + makeNode("super_", new Runnable() { + @Override + public void run() { + literal(classNode); + } + }); + } else { + sourceUnit.addError(new SyntaxException("Unsupported expression for CPS transformation", exp.getLineNumber(), exp.getColumnNumber())); + } + } + + @Override + public void visitDeclarationExpression(final DeclarationExpression exp) { + if (exp.isMultipleAssignmentDeclaration()) { + // def (a,b)=list + makeNode("sequence", new Runnable() { + @Override + public void run() { + for (Expression e : exp.getTupleExpression().getExpressions()) { + final VariableExpression v = (VariableExpression) e; + makeNode("declareVariable", new Runnable() { + @Override + public void run() { + loc(exp); + literal(v.getType()); + literal(v.getName()); + } + }); + } + makeNode("assign", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getLeftExpression()); + visit(exp.getRightExpression()); + } + }); + } + }); + } else { + // def x=v; + makeNode("declareVariable", new Runnable() { + @Override + public void run() { + VariableExpression v = exp.getVariableExpression(); + loc(exp); + literal(v.getType()); + literal(v.getName()); + visit(exp.getRightExpression()); // this will not produce anything if this is EmptyExpression + } + }); + } + } + + @Override + public void visitGStringExpression(final GStringExpression exp) { + makeNode("gstring", new Runnable() { + @Override + public void run() { + loc(exp); + makeNode("list", new Runnable() { + @Override + public void run() { + visit(exp.getValues()); + } + }); + makeNode("list", new Runnable() { + @Override + public void run() { + visit(exp.getStrings()); + } + }); + } + }); + } + + @Override + public void visitArrayExpression(final ArrayExpression exp) { + if (exp.getSizeExpression() != null) { + // array instanation like new String[1][2][3] + makeNode("newArray", new Runnable() { + @Override + public void run() { + loc(exp); + literal(exp.getElementType()); + visit(exp.getSizeExpression()); + } + }); + } else { + throw new UnsupportedOperationException(); + } + } + + @Override + public void visitSpreadExpression(SpreadExpression expression) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitSpreadMapExpression(SpreadMapExpression expression) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitNotExpression(final NotExpression exp) { + makeNode("not", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getExpression()); + } + }); + } + + @Override + public void visitUnaryMinusExpression(final UnaryMinusExpression exp) { + makeNode("unaryMinus", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getExpression()); + } + }); + } + + @Override + public void visitUnaryPlusExpression(final UnaryPlusExpression exp) { + makeNode("unaryPlus", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getExpression()); + } + }); + } + + @Override + public void visitBitwiseNegationExpression(final BitwiseNegationExpression exp) { + makeNode("bitwiseNegation", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getExpression()); + } + }); + } + + @Override + public void visitCastExpression(final CastExpression exp) { + makeNode("cast", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getExpression()); + literal(exp.getType()); + literal(exp.isCoerce()); + } + }); + } + + @Override + public void visitArgumentlistExpression(ArgumentListExpression expression) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitClosureListExpression(ClosureListExpression closureListExpression) { + throw new UnsupportedOperationException(); + } + + @Override + public void visitBytecodeExpression(BytecodeExpression expression) { + throw new UnsupportedOperationException(); + } + + private static final ClassNode OBJECT_TYPE = ClassHelper.makeCached(Object.class); + + private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(CpsFunction.class); + + private static final ClassNode CATCH_EXPRESSION_TYPE = ClassHelper.makeCached(CatchExpression.class); + + private static final ClassNode BUILDER_TYPE = ClassHelper.makeCached(Builder.class); + + private static final ClassNode CPSCALLINVK_TYPE = ClassHelper.makeCached(CpsCallableInvocation.class); + + private static final ClassNode WORKFLOW_TRANSFORMED_TYPE = ClassHelper.makeCached(WorkflowTransformed.class); + + private static final ClassNode BUIDER_TYPE = ClassHelper.makeCached(Builder.class); + + private static final ClassNode METHOD_LOCATION_TYPE = ClassHelper.makeCached(MethodLocation.class); + + private static final VariableExpression BUILDER = new VariableExpression("b", BUILDER_TYPE); // new PropertyExpression(new ClassExpression(BUILDER_TYPE), "INSTANCE") + + private static final VariableExpression THIS = new VariableExpression("this"); + + /** + * Closure's default "it" parameter. + */ + private static final Parameter IT = new Parameter(ClassHelper.OBJECT_TYPE, "it", ConstantExpression.NULL); + + private static final int PRIVATE_STATIC_FINAL = Modifier.STATIC | Modifier.PRIVATE | Modifier.FINAL; +} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java new file mode 100644 index 000000000..60837f600 --- /dev/null +++ b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java @@ -0,0 +1,40 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.sandbox.Untrusted; +import org.codehaus.groovy.ast.ClassCodeExpressionTransformer; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.classgen.GeneratorContext; +import org.codehaus.groovy.control.SourceUnit; +import org.kohsuke.groovy.sandbox.SandboxTransformer; + +/** + * {@link CpsTransformer} + {@link org.kohsuke.groovy.sandbox.SandboxTransformer} + * + * @author Kohsuke Kawaguchi + */ +public class SandboxCpsTransformer extends CpsTransformer { + private final SandboxTransformer st = new SandboxTransformer(); + + private ClassCodeExpressionTransformer stv; + + @Override + public void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { + stv = st.createVisitor(source); + super.call(source, context, classNode); + } + + /** + * If the method is not CPS transformed, we need to sandbox-transform that + * method to intercept calls that happen in these methods. + */ + @Override + protected void visitNontransformedMethod(MethodNode m) { + stv.visitMethod(m); + } + + @Override + protected Class getTrustTag() { + return Untrusted.class; + } +} From 7f1b826d292d00f730cc52cb8beb5ef6fda7f6ff Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Sat, 3 Jun 2017 09:18:13 -0400 Subject: [PATCH 435/932] [maven-release-plugin] prepare release groovy-cps-parent-1.14 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 29b0409b3..cfe80ee50 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.14-SNAPSHOT + 1.14 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 1f2747c82..674b7e0e7 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.14-SNAPSHOT + 1.14 groovy-cps diff --git a/pom.xml b/pom.xml index 833afce0c..e5441adc3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.14-SNAPSHOT + 1.14 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.14 From 63b6aa1aa3b9414b4b2657ffbb5eeea39b21d115 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Sat, 3 Jun 2017 09:18:17 -0400 Subject: [PATCH 436/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index cfe80ee50..d4a5d51ea 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.14 + 1.15-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 674b7e0e7..19316ed5c 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.14 + 1.15-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index e5441adc3..c20aaa498 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.14 + 1.15-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.14 + HEAD From ad1208eb7175e140e1032228db370b51d196d012 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 9 Jun 2017 16:00:24 -0400 Subject: [PATCH 437/932] [FIXED JENKINS-38268] Proper lexical scoping for closure variables. Previously, any variables that hadn't been explicitly declared (via `ClosureCallEnv.declareVariable`) in a `Closure` would end up getting set in the captured `Env`. Which means we'd end up setting things globally when we really didn't mean to. This changes that to only set a variable in the captured `Env` if there's no `locals` variable defined by that name *and* the captured `Env` has a non-null return for `getVariableType(name)` - i.e., the variable name has already been declared in the captured `Env`. --- .../cloudbees/groovy/cps/impl/ClosureCallEnv.java | 14 ++++++++------ .../cloudbees/groovy/cps/CpsTransformerTest.groovy | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java index 7b4fc30d8..553a1301f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java @@ -3,6 +3,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import javax.annotation.Nonnull; import java.util.HashMap; import java.util.Map; @@ -27,23 +28,24 @@ public ClosureCallEnv(Env caller, Continuation returnAddress, SourceLocation loc this.captured = captured; } - public void declareVariable(Class type, String name) { + public void declareVariable(@Nonnull Class type, @Nonnull String name) { locals.put(name,null); getTypes().put(name, type); } - public Object getLocalVariable(String name) { + public Object getLocalVariable(@Nonnull String name) { if (locals.containsKey(name)) return locals.get(name); else return captured.getLocalVariable(name); } - public void setLocalVariable(String name, Object value) { - if (locals.containsKey(name)) - locals.put(name, value); - else + public void setLocalVariable(@Nonnull String name, Object value) { + if (!locals.containsKey(name) && captured.getLocalVariableType(name) != null) { captured.setLocalVariable(name, value); + } else { + locals.put(name, value); + } } public Class getLocalVariableType(String name) { diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 8e1c5f823..7f4617434 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -777,4 +777,18 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { ''') == 'FOO'; } + @Issue("JENKINS-38268") + @Test + void lexicalScope() { + assert evalCPS(''' +def a = [id: 'a', count: 0] +def b = [id: 'b', count: 0] + +def toRun = [a, b].collect { thing -> return { thing.count = thing.count + 1 } } + +toRun.each { arg -> arg() } + +return [a.count, b.count] +''') == [1, 1] + } } From 1e9fbd1a2beb660b3a09067741704568eba9c5b4 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 9 Jun 2017 16:34:53 -0400 Subject: [PATCH 438/932] Clearer conditional. --- .../java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java index 553a1301f..c7624f6bd 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java @@ -41,10 +41,10 @@ public Object getLocalVariable(@Nonnull String name) { } public void setLocalVariable(@Nonnull String name, Object value) { - if (!locals.containsKey(name) && captured.getLocalVariableType(name) != null) { - captured.setLocalVariable(name, value); - } else { + if (locals.containsKey(name) || captured.getLocalVariableType(name) == null) { locals.put(name, value); + } else { + captured.setLocalVariable(name, value); } } From 8c3d2a42819287f26896a1a903e48a5a0e5c956f Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 9 Jun 2017 16:44:39 -0400 Subject: [PATCH 439/932] Switching to fix CpsCallable.assignArguments instead. --- .../cloudbees/groovy/cps/impl/ClosureCallEnv.java | 12 +++++------- .../com/cloudbees/groovy/cps/impl/CpsCallable.java | 3 +++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java index c7624f6bd..7b4fc30d8 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java @@ -3,7 +3,6 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; -import javax.annotation.Nonnull; import java.util.HashMap; import java.util.Map; @@ -28,24 +27,23 @@ public ClosureCallEnv(Env caller, Continuation returnAddress, SourceLocation loc this.captured = captured; } - public void declareVariable(@Nonnull Class type, @Nonnull String name) { + public void declareVariable(Class type, String name) { locals.put(name,null); getTypes().put(name, type); } - public Object getLocalVariable(@Nonnull String name) { + public Object getLocalVariable(String name) { if (locals.containsKey(name)) return locals.get(name); else return captured.getLocalVariable(name); } - public void setLocalVariable(@Nonnull String name, Object value) { - if (locals.containsKey(name) || captured.getLocalVariableType(name) == null) { + public void setLocalVariable(String name, Object value) { + if (locals.containsKey(name)) locals.put(name, value); - } else { + else captured.setLocalVariable(name, value); - } } public Class getLocalVariableType(String name) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java index ad9a46396..fd9af4ca8 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java @@ -45,6 +45,9 @@ public abstract class CpsCallable implements Serializable { protected final void assignArguments(List args, Env e) { // TODO: var args for (int i=0; i< Math.min(args.size(),parameters.size()); i++) { + Class argClass = args.get(i) != null ? args.get(i).getClass() : Object.class; + + e.declareVariable(argClass, parameters.get(i)); e.setLocalVariable(parameters.get(i), args.get(i)); } } From 7358c72e6cea1a6fff870b1094dfc6a44f4c70b4 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 9 Jun 2017 16:57:34 -0400 Subject: [PATCH 440/932] Always declare CpsCallable arguments as Object.class --- .../main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java index fd9af4ca8..32951d28a 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallable.java @@ -45,9 +45,7 @@ public abstract class CpsCallable implements Serializable { protected final void assignArguments(List args, Env e) { // TODO: var args for (int i=0; i< Math.min(args.size(),parameters.size()); i++) { - Class argClass = args.get(i) != null ? args.get(i).getClass() : Object.class; - - e.declareVariable(argClass, parameters.get(i)); + e.declareVariable(Object.class, parameters.get(i)); e.setLocalVariable(parameters.get(i), args.get(i)); } } From 4f66dec9010b3a19c716f2d3bd72cac5f7b4d827 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 13 Jun 2017 16:12:45 -0400 Subject: [PATCH 441/932] [maven-release-plugin] prepare release groovy-cps-parent-1.15 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index d4a5d51ea..22d72a997 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.15-SNAPSHOT + 1.15 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 19316ed5c..15c92787a 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.15-SNAPSHOT + 1.15 groovy-cps diff --git a/pom.xml b/pom.xml index c20aaa498..b945108cd 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.15-SNAPSHOT + 1.15 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.15 From 0774f967fa49388ae8137b96cc8fee815a8300b5 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 13 Jun 2017 16:12:54 -0400 Subject: [PATCH 442/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 22d72a997..adc102a13 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.15 + 1.16-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 15c92787a..64d57f38c 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.15 + 1.16-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index b945108cd..c69d547c6 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.15 + 1.16-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.15 + HEAD From 70bd4a1f4670b868e7e4dc45bd98a82fca94c20b Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 14 Jun 2017 14:30:05 -0400 Subject: [PATCH 443/932] Use trusted builder for translation. --- .../main/java/com/cloudbees/groovy/cps/tool/Translator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 3fc6d2b61..97b30fd8b 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -294,7 +294,8 @@ private void translateMethod(final CompilationUnitTree cut, ExecutableElement e, } delegatingParams.forEach(p -> delegateCall.arg(p)); - JVar $b = m.body().decl($Builder, "b", JExpr._new($Builder).arg(JExpr.invoke("loc").arg(methodName))); + JVar $b = m.body().decl($Builder, "b", JExpr._new($Builder).arg(JExpr.invoke("loc").arg(methodName)). + invoke("contextualize").arg(codeModel.ref("com.cloudbees.groovy.cps.sandbox.Trusted").staticRef("INSTANCE"))); JInvocation f = JExpr._new($CpsFunction); // parameter names From 6bf7d2798e4d4bb30b7685829b10581f257f9595 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 14 Jun 2017 16:09:16 -0400 Subject: [PATCH 444/932] More discussion to help understand PR #62 --- doc/sandbox.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/sandbox.md b/doc/sandbox.md index 744cbcecd..ae9735a93 100644 --- a/doc/sandbox.md +++ b/doc/sandbox.md @@ -27,6 +27,26 @@ whether the code is trusted or not, wherever it calls methods or access properti is that this will designate whether or not this invocation should be checked for security (untrusted), or the invocation should be always allowed to happen (trusted.) +The implication of this is that, if you compile a function with the trusted tag, the function is +now responsible for making sure that it will never get tricked into allowing untrusted caller to +invoke something on its behalf that it's not supposed to. This is the same basic rule of thumb +for writing a code in `PrivilegedAction`. For example, the following code is not OK because +it allows untrusted code to access any environment variable: + +``` +def foo(name) {// imagine this function compiled with a trusted tag + return System.getenv(name) +} +``` + +The following code is OK because arguments from the untrusted code cannot control where a file gets written: + +``` +def foo(value) {// imagine this function compiled with a trusted tag + File.createTempFile("foo","tmp").text = value +} +``` + The call site tagging mechanism itself is more general, so it can be used for other purposes, for example to record where it came from, etc. From ed5e00d85dc7b62cbec046e008b86ffe1cb622cd Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 15 Jun 2017 15:32:45 -0400 Subject: [PATCH 445/932] [maven-release-plugin] prepare release groovy-cps-parent-1.16 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index adc102a13..01d7d222e 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.16-SNAPSHOT + 1.16 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 64d57f38c..648922aca 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.16-SNAPSHOT + 1.16 groovy-cps diff --git a/pom.xml b/pom.xml index c69d547c6..61623a0be 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.16-SNAPSHOT + 1.16 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.16 From 55b7ce94f8cc4ba067eb4f55460ed882a0b73493 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 15 Jun 2017 15:32:49 -0400 Subject: [PATCH 446/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 01d7d222e..415de1213 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.16 + 1.17-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 648922aca..171157a50 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.16 + 1.17-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 61623a0be..824249804 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.16 + 1.17-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.16 + HEAD From 275d027f5c90996309778740ca83c919f6f18040 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 3 Jul 2017 12:46:29 -0400 Subject: [PATCH 447/932] [SECURITY-551] Secure miscellaneous code blocks. --- .../cloudbees/groovy/cps/CpsTransformer.java | 31 ++++-- .../groovy/cps/SandboxCpsTransformer.java | 24 ++++- .../cps/sandbox/SandboxInvokerTest.groovy | 96 ++++++++++++++++++- 3 files changed, 139 insertions(+), 12 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index f1f493cf0..cfb158a70 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -4,6 +4,7 @@ import com.cloudbees.groovy.cps.impl.CpsFunction; import com.cloudbees.groovy.cps.sandbox.Trusted; import com.cloudbees.groovy.cps.sandbox.Untrusted; +import com.google.common.annotations.VisibleForTesting; import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -95,7 +96,8 @@ public class CpsTransformer extends CompilationCustomizer implements GroovyCodeV private static final Logger LOGGER = Logger.getLogger(CpsTransformer.class.getName()); - private static final AtomicLong iota = new AtomicLong(); + @VisibleForTesting + public static final AtomicLong iota = new AtomicLong(); private SourceUnit sourceUnit; @@ -120,15 +122,18 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod this.classNode = classNode; try { -// copy(source.ast.methods)?.each { visitMethod(it) } -// classNode?.declaredConstructors?.each { visitMethod(it) } // can't transform constructor - if (classNode != null) { - for (MethodNode method : new ArrayList<>(classNode.getMethods())) { - visitMethod(method); - } + for (MethodNode method : new ArrayList<>(classNode.getMethods())) { + visitMethod(method); + } + for (ConstructorNode constructor : new ArrayList<>(classNode.getDeclaredConstructors())) { + visitNontransformedMethod(constructor); + } + for (FieldNode field : new ArrayList<>(classNode.getFields())) { + visitNontransformedField(field); + } + for (Statement statement : new ArrayList<>(classNode.getObjectInitializerStatements())) { + visitNontransformedStatement(statement); } -// classNode?.objectInitializerStatements?.each { it.visit(visitor) } -// classNode?.fields?.each { visitor.visitField(it) } // groovy puts timestamp of compilation into a class file, causing serialVersionUID to change. // this tends to be undesirable for CPS involving persistence. @@ -290,6 +295,12 @@ protected Class getTrustTag() { protected void visitNontransformedMethod(MethodNode m) { } + protected void visitNontransformedField(FieldNode f) { + } + + protected void visitNontransformedStatement(Statement s) { + } + // TODO Java 8 @FunctionalInterface, or switch to Consumer protected interface ParentClosure { void call(Expression e); @@ -1099,7 +1110,7 @@ public void run() { } }); } else { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException(exp.getText()); } } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java index 60837f600..30ca35877 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java @@ -3,13 +3,15 @@ import com.cloudbees.groovy.cps.sandbox.Untrusted; import org.codehaus.groovy.ast.ClassCodeExpressionTransformer; import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.FieldNode; import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.stmt.Statement; import org.codehaus.groovy.classgen.GeneratorContext; import org.codehaus.groovy.control.SourceUnit; import org.kohsuke.groovy.sandbox.SandboxTransformer; /** - * {@link CpsTransformer} + {@link org.kohsuke.groovy.sandbox.SandboxTransformer} + * {@link CpsTransformer} + {@link SandboxTransformer} * * @author Kohsuke Kawaguchi */ @@ -27,12 +29,32 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod /** * If the method is not CPS transformed, we need to sandbox-transform that * method to intercept calls that happen in these methods. + * This includes all constructor bodies. + * @see SandboxTransformer#call */ @Override protected void visitNontransformedMethod(MethodNode m) { stv.visitMethod(m); } + /** + * Field initializers are never transformed, but we still need to run the sandbox transformer on them. + * @see SandboxTransformer#call + */ + @Override + protected void visitNontransformedField(FieldNode f) { + stv.visitField(f); + } + + /** + * Miscellaneous statements like object initializers are never transformed, but we still need to run the sandbox transformer on them. + * @see SandboxTransformer#call + */ + @Override + protected void visitNontransformedStatement(Statement s) { + s.visit(stv); + } + @Override protected Class getTrustTag() { return Untrusted.class; diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index 362834abb..8082c66d3 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -2,7 +2,9 @@ package com.cloudbees.groovy.cps.sandbox import com.cloudbees.groovy.cps.* import com.cloudbees.groovy.cps.impl.FunctionCallEnv +import org.junit.Before import org.junit.Test +import org.jvnet.hudson.test.Issue; import org.kohsuke.groovy.sandbox.ClassRecorder import java.awt.Point @@ -18,6 +20,10 @@ public class SandboxInvokerTest extends AbstractGroovyCpsTest { new SandboxCpsTransformer() } + @Before public void zeroIota() { + CpsTransformer.iota.set(0) + } + /** * Covers all the intercepted operations. */ @@ -39,6 +45,9 @@ public class SandboxInvokerTest extends AbstractGroovyCpsTest { """) assertIntercept(""" +Script1:___cps___0() +Script1:___cps___1() +Script1.super(Script1).setBinding(Binding) new Point(Integer,Integer) Point.equals(Point) Point.x @@ -68,7 +77,13 @@ ScriptBytecodeAdapter:compareEqual(Integer,Integer) return length("foo") """) - assertIntercept('Script1.length(String)','String.length()') + assertIntercept(''' +Script1:___cps___0() +Script1:___cps___1() +Script1.super(Script1).setBinding(Binding) +Script1.length(String) +String.length() +''') } @@ -106,6 +121,9 @@ ScriptBytecodeAdapter:compareEqual(Integer,Integer) assert [new Point(1,4),new File("foo")]==evalCpsSandbox("trusted.foo(4)"); assertIntercept(""" +Script2:___cps___6() +Script2:___cps___7() +Script2.super(Script2).setBinding(Binding) Script2.trusted Script1.foo(Integer) new File(String) @@ -132,10 +150,86 @@ new File(String) ''')=="xbase" assertIntercept(""" +Script1:___cps___0() +Script1:___cps___1() +Script1.super(Script1).setBinding(Binding) new Bar() +Foo:___cps___2() Bar.toString() Bar.super(Foo).toString() String.plus(String) """) } + + @Issue("SECURITY-551") + @Test public void constructors() { + evalCpsSandbox(''' + import java.awt.Point; + class C { + Point p + C() { + p = new Point(1, 3) + } + } + assert new C().p.y == 3 + ''') + assertIntercept(''' +Script1:___cps___0() +Script1:___cps___1() +Script1.super(Script1).setBinding(Binding) +new C() +new Point(Integer,Integer) +C.p=Point +C.p +Point.y +ScriptBytecodeAdapter:compareEqual(Double,Integer) +''') + } + + @Issue("SECURITY-551") + @Test public void fields() { + evalCpsSandbox(''' + import java.awt.Point; + class C { + Point p = new Point(1, 3) + } + assert new C().p.y == 3 + ''') + assertIntercept(''' +Script1:___cps___0() +Script1:___cps___1() +Script1.super(Script1).setBinding(Binding) +new C() +new Point(Integer,Integer) +C.p +Point.y +ScriptBytecodeAdapter:compareEqual(Double,Integer) +''') + } + + @Issue("SECURITY-551") + @Test public void initializers() { + evalCpsSandbox(''' + import java.awt.Point; + class C { + Point p + { + p = new Point(1, 3) + } + } + assert new C().p.y == 3 + ''') + assertIntercept(''' +Script1:___cps___0() +Script1:___cps___1() +Script1.super(Script1).setBinding(Binding) +new C() +new Point(Integer,Integer) +C.p=Point +C.p +Point.y +ScriptBytecodeAdapter:compareEqual(Double,Integer) +''') + } + } From 09fcbae62db45fd12f4840549a159e394911e82e Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 3 Jul 2017 13:00:00 -0400 Subject: [PATCH 448/932] Removing obsolete wagon-gitsite extension, obsolete since 0ae62f364e7a77c8f7df899d0f5ef8437646905c. --- lib/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/pom.xml b/lib/pom.xml index 171157a50..daa11465d 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -104,13 +104,6 @@ - - - org.kathrynhuxtable.maven.wagon - wagon-gitsite - 0.3.1 - - From 20521157abd689351a7afd5ed2274b91077ed88a Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 3 Jul 2017 13:02:47 -0400 Subject: [PATCH 449/932] [maven-release-plugin] prepare release groovy-cps-parent-1.17 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 415de1213..d20d1f54f 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.17-SNAPSHOT + 1.17 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 171157a50..b1df1f941 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.17-SNAPSHOT + 1.17 groovy-cps diff --git a/pom.xml b/pom.xml index 824249804..ade4cf2d4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.17-SNAPSHOT + 1.17 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.17 From 75903bafce3a46a235260ae0446e77294d2abea1 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 3 Jul 2017 13:02:47 -0400 Subject: [PATCH 450/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index d20d1f54f..a18b5c6f0 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.17 + 1.18-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index b1df1f941..b9ec9c7c9 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.17 + 1.18-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index ade4cf2d4..c839c76e0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.17 + 1.18-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.17 + HEAD From 625135ca8b2aebdb6b121b7e5fd9b8d8c735b4d1 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 3 Jul 2017 13:59:40 -0400 Subject: [PATCH 451/932] Do nothing in CpsCallableInvocation.fillInStackTrace. --- .../cloudbees/groovy/cps/impl/CpsCallableInvocation.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 3aa5853fb..929ca96aa 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -49,4 +49,10 @@ public Next eval(Env e, Continuation k) { } }; } + + @Override + public synchronized Throwable fillInStackTrace() { + return this; + } + } From 465854d89505c26722ae4cc9a62f8d730edd6bc7 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 28 Jul 2017 18:20:17 -0400 Subject: [PATCH 452/932] Closed sandbox bypasses via: [SECURITY-566] interface coercion [SECURITY-567] method referencing [SECURITY-580] list to constructor coercion [SECURITY-582] super constructor --- lib/pom.xml | 17 +- .../com/cloudbees/groovy/cps/Builder.java | 15 +- .../cloudbees/groovy/cps/CpsTransformer.java | 34 ++-- .../groovy/cps/SandboxCpsTransformer.java | 57 ++++++- .../cps/impl/CpsCallableInvocation.java | 3 +- .../groovy/cps/impl/MethodPointerBlock.java | 21 ++- .../groovy/cps/sandbox/DefaultInvoker.java | 5 + .../cloudbees/groovy/cps/sandbox/Invoker.java | 2 + .../groovy/cps/sandbox/SandboxInvoker.java | 6 + .../groovy/cps/CpsTransformerTest.groovy | 23 +++ .../cps/sandbox/SandboxInvokerTest.groovy | 157 +++++++++++++++++- 11 files changed, 305 insertions(+), 35 deletions(-) diff --git a/lib/pom.xml b/lib/pom.xml index b9ec9c7c9..8af2aff87 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -71,8 +71,6 @@ - generateStubs - compile testGenerateStubs testCompile @@ -113,6 +111,9 @@ + + 1.13 + com.cloudbees @@ -125,13 +126,13 @@ org.kohsuke groovy-sandbox - 1.11 + ${groovy-sandbox.version} true org.kohsuke groovy-sandbox - 1.11 + ${groovy-sandbox.version} tests test @@ -170,14 +171,6 @@ - - - - maven-javadoc-plugin - - - - cloudbees-oss-release diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java index 01001a809..a6774ecfc 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -49,6 +49,8 @@ import static com.cloudbees.groovy.cps.Block.*; import static java.util.Arrays.*; +import org.codehaus.groovy.ast.expr.CastExpression; +import org.kohsuke.groovy.sandbox.impl.Checker; /** * Builder pattern for constructing {@link Block}s into a tree. @@ -125,7 +127,7 @@ public Block constant(Object o) { } public Block methodPointer(int line, Block lhs, Block methodName) { - return new MethodPointerBlock(loc(line),lhs,methodName); + return new MethodPointerBlock(loc(line),lhs,methodName, tags); } public Block zero() { @@ -587,6 +589,17 @@ public Block cast(int line, Block block, Class type, boolean coerce) { block,constant(type)); } + /** + * Cast to type when {@link CastExpression#isCoerce} from {@link SandboxCpsTransformer}. + */ + // TODO should ideally be defined in some sandbox-specific subtype of Builder + public Block sandboxCast(int line, Block block, Class type, boolean ignoreAutoboxing, boolean strict) { + return staticCall(line, Checker.class, + "checkedCast", + constant(type), block, + constant(ignoreAutoboxing), constant(true), constant(strict)); + } + public Block instanceOf(int line, Block value, Block type) { return functionCall(line,type,"isInstance",value); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index cfb158a70..64c61f35c 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -125,9 +125,7 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod for (MethodNode method : new ArrayList<>(classNode.getMethods())) { visitMethod(method); } - for (ConstructorNode constructor : new ArrayList<>(classNode.getDeclaredConstructors())) { - visitNontransformedMethod(constructor); - } + processConstructors(classNode); for (FieldNode field : new ArrayList<>(classNode.getFields())) { visitNontransformedField(field); } @@ -154,6 +152,12 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod } } + protected void processConstructors(ClassNode classNode) { + for (ConstructorNode constructor : new ArrayList<>(classNode.getDeclaredConstructors())) { + visitNontransformedMethod(constructor); + } + } + /** * Should this method be transformed? */ @@ -203,9 +207,6 @@ public void visitMethod(final MethodNode m) { @Override public void call(Expression e) { body.set(e); - if (LOGGER.isLoggable(Level.FINEST)) { - LOGGER.log(Level.FINEST, "in {0} transformed {1} to {2}", new Object[] {classNode.getName(), m.getTypeDescriptor(), e.getText()}); - } } }; visitWithSafepoint(m.getCode()); @@ -223,11 +224,10 @@ CpsFunction ___cps___N() { */ String cpsName = "___cps___" + iota.getAndIncrement(); + DeclarationExpression builderDeclaration = new DeclarationExpression(BUILDER, new Token(ASSIGN, "=", -1, -1), makeBuilder(m)); + ReturnStatement returnStatement = new ReturnStatement(new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body.get()))); MethodNode builderMethod = m.getDeclaringClass().addMethod(cpsName, PRIVATE_STATIC_FINAL, FUNCTION_TYPE, new Parameter[0], new ClassNode[0], - new BlockStatement(Arrays.asList( - new ExpressionStatement(new DeclarationExpression(BUILDER, new Token(ASSIGN, "=", -1, -1), makeBuilder(m))), - new ReturnStatement(new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body.get()))) - ), new VariableScope()) + new BlockStatement(Arrays.asList(new ExpressionStatement(builderDeclaration), returnStatement), new VariableScope()) ); builderMethod.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)); @@ -242,9 +242,20 @@ CpsFunction ___cps___N() { ArrayExpression paramArray = new ArrayExpression(ClassHelper.OBJECT_TYPE, paramExpressions); TupleExpression args = new TupleExpression(new VariableExpression(f), THIS, paramArray); - m.setCode(new ThrowStatement(new ConstructorCallExpression(CPSCALLINVK_TYPE, args))); + ConstructorCallExpression cce = new ConstructorCallExpression(CPSCALLINVK_TYPE, args); + m.setCode(new ThrowStatement(cce)); m.addAnnotation(new AnnotationNode(WORKFLOW_TRANSFORMED_TYPE)); + + if (LOGGER.isLoggable(Level.FINEST)) { + LOGGER.log(Level.FINEST, "in {0} transformed {1} to {2}: throw {3} plus {4}: {5}; {6}", new Object[] { + classNode.getName(), m.getTypeDescriptor(), + // TODO https://github.com/apache/groovy/pull/574 m.getCode().getText() does not work well + m.getText(), cce.getText(), + // TODO ditto for builderMethod.getCode().getText() + builderMethod.getText(), builderDeclaration.getText(), returnStatement.getText() + }); + } } /** @@ -1177,6 +1188,7 @@ public void run() { visit(exp.getExpression()); literal(exp.getType()); literal(exp.isCoerce()); + // TODO what about ignoreAutoboxing & strict? } }); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java index 30ca35877..1000ad6d4 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java @@ -5,6 +5,9 @@ import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.FieldNode; import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.expr.CastExpression; +import org.codehaus.groovy.ast.expr.DeclarationExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.Statement; import org.codehaus.groovy.classgen.GeneratorContext; import org.codehaus.groovy.control.SourceUnit; @@ -22,10 +25,15 @@ public class SandboxCpsTransformer extends CpsTransformer { @Override public void call(SourceUnit source, GeneratorContext context, ClassNode classNode) { - stv = st.createVisitor(source); + stv = st.createVisitor(source, classNode); super.call(source, context, classNode); } + @Override + protected void processConstructors(ClassNode classNode) { + st.processConstructors(stv, classNode); + } + /** * If the method is not CPS transformed, we need to sandbox-transform that * method to intercept calls that happen in these methods. @@ -55,6 +63,53 @@ protected void visitNontransformedStatement(Statement s) { s.visit(stv); } + @Override + public void visitCastExpression(final CastExpression exp) { + if (exp.isCoerce()) { + makeNode("sandboxCast", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getExpression()); + literal(exp.getType()); + literal(exp.isIgnoringAutoboxing()); + literal(exp.isStrict()); + } + }); + } else { + super.visitCastExpression(exp); + } + } + + @Override + public void visitDeclarationExpression(final DeclarationExpression exp) { + if (exp.isMultipleAssignmentDeclaration()) { + throw new UnsupportedOperationException("multiple assignments not supported"); // TODO + } else if (SandboxTransformer.mightBePositionalArgumentConstructor(exp.getVariableExpression())) { + makeNode("declareVariable", new Runnable() { + @Override + public void run() { + VariableExpression v = exp.getVariableExpression(); + loc(exp); + literal(v.getType()); + literal(v.getName()); + makeNode("sandboxCast", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getRightExpression()); + literal(exp.getVariableExpression().getType()); + literal(false); + literal(false); + } + }); + } + }); + } else { + super.visitDeclarationExpression(exp); + } + } + @Override protected Class getTrustTag() { return Untrusted.class; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 3aa5853fb..454f43812 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -8,6 +8,7 @@ import java.util.List; import static java.util.Arrays.*; +import java.util.Collections; /** * When an CPS-interpreted method is invoked, it immediately throws this error @@ -32,7 +33,7 @@ public class CpsCallableInvocation extends Error/*not really an error but we wan public CpsCallableInvocation(CpsCallable call, Object receiver, Object... arguments) { this.call = call; this.receiver = receiver; - this.arguments = asList(arguments); + this.arguments = arguments != null ? asList(arguments) : Collections.emptyList(); } public Next invoke(Env caller, SourceLocation loc, Continuation k) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java index f53876a66..3065eba58 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java @@ -4,23 +4,37 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; +import com.cloudbees.groovy.cps.sandbox.CallSiteTag; +import com.cloudbees.groovy.cps.sandbox.Invoker; import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.MethodClosure; +import javax.annotation.Nonnull; +import java.util.Collection; +import java.util.Collections; + /** * Method pointer expression: {@code LHS&.methodName} * * @author Kohsuke Kawaguchi */ -public class MethodPointerBlock implements Block { +public class MethodPointerBlock implements CallSiteBlock { private final SourceLocation loc; private final Block lhsExp; private final Block methodNameExp; + private final Collection tags; // can be null for instances deserialized from the old form - public MethodPointerBlock(SourceLocation loc, Block lhsExp, Block methodNameExp) { + public MethodPointerBlock(SourceLocation loc, Block lhsExp, Block methodNameExp, Collection tags) { this.loc = loc; this.lhsExp = lhsExp; this.methodNameExp = methodNameExp; + this.tags = tags; + } + + @Nonnull + @Override + public Collection getTags() { + return tags !=null ? Collections.unmodifiableCollection(tags) : Collections.emptySet(); } public Next eval(Env e, Continuation k) { @@ -51,8 +65,7 @@ public Next fixLhs(Object lhs) { * Obtain a method pointer, which is really just a {@link MethodClosure}. */ public Next done(Object methodName) { - // see AsmClassGenerator.visitMethodPointerExpression - return k.receive(InvokerHelper.getMethodPointer(lhs,(String)methodName)); + return k.receive(e.getInvoker().contextualize(MethodPointerBlock.this).methodPointer(lhs, (String)methodName)); } private static final long serialVersionUID = 1L; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java index 659e19060..f7b93d0e3 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java @@ -3,6 +3,7 @@ import com.cloudbees.groovy.cps.impl.CallSiteBlock; import groovy.lang.MetaClass; import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.runtime.MethodClosure; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.CallSiteArray; @@ -55,6 +56,10 @@ public void setArray(Object lhs, Object index, Object value) throws Throwable { fakeCallSite("putAt").call(lhs,index,value); } + public Object methodPointer(Object lhs, String name) { + return new MethodClosure(lhs, name); + } + public Invoker contextualize(CallSiteBlock tags) { return this; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java index 0a67f0a54..61e0f2a41 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java @@ -54,6 +54,8 @@ public interface Invoker extends Serializable { void setArray(Object lhs, Object index, Object value) throws Throwable; + Object methodPointer(Object lhs, String name); + /** * Returns a child {@link Invoker} used to make a call on behalf of the given {@link CallSiteBlock}. */ diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java index d3d58140a..2ea12ef72 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java @@ -4,6 +4,7 @@ import org.codehaus.groovy.syntax.Types; import org.kohsuke.groovy.sandbox.GroovyInterceptor; import org.kohsuke.groovy.sandbox.impl.Checker; +import org.kohsuke.groovy.sandbox.impl.SandboxedMethodClosure; /** * {@link Invoker} that goes through the groovy-sandbox {@link GroovyInterceptor}, @@ -48,6 +49,11 @@ public void setArray(Object lhs, Object index, Object value) throws Throwable { Checker.checkedSetArray(lhs,index,Types.ASSIGN,value); } + public Object methodPointer(Object lhs, String name) { + return new SandboxedMethodClosure(lhs, name); + } + + public Invoker contextualize(CallSiteBlock tags) { if (tags.getTags().contains(Untrusted.INSTANCE)) return this; diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 7f4617434..d9eb7e5fa 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -155,6 +155,19 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { """)==55 } + @Test void typeCoercion() { + assert evalCPS(''' + interface I { + Locale[] getAvailableLocales() + } + try { + (Locale as I).getAvailableLocales() + } catch (e) { + e.toString() + } +''') == Locale.availableLocales + } + /** * */ @@ -791,4 +804,14 @@ toRun.each { arg -> arg() } return [a.count, b.count] ''') == [1, 1] } + + @Issue("SECURITY-567") + @Test + void methodPointer() { + assert evalCPS(''' +def b = new CpsTransformerTest.Base() + +return (b.&toString)() + (String.getClass().&getSimpleName)() +''') == "baseClass" + } } diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index 8082c66d3..7d512bc9b 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -2,9 +2,10 @@ package com.cloudbees.groovy.cps.sandbox import com.cloudbees.groovy.cps.* import com.cloudbees.groovy.cps.impl.FunctionCallEnv +import org.codehaus.groovy.runtime.ProxyGeneratorAdapter import org.junit.Before import org.junit.Test -import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.Issue import org.kohsuke.groovy.sandbox.ClassRecorder import java.awt.Point @@ -136,6 +137,30 @@ new File(String) String toString() { return "base"; } + + String multipleArgs(String first, String second) { + return "Hello, " + first + " " + second; + } + + String noArg() { + return "No argument" + } + + String oneArg(String first) { + return "Just one arg: " + first + } + + public static String staticMultipleArgs(String first, String second) { + return "Hello, " + first + " " + second; + } + + public static String staticNoArg() { + return "No argument" + } + + public static String staticOneArg(String first) { + return "Just one arg: " + first + } } @Test void superClass() { @@ -149,16 +174,18 @@ new File(String) new Bar().toString(); ''')=="xbase" - assertIntercept(""" + assertIntercept(''' Script1:___cps___0() Script1:___cps___1() Script1.super(Script1).setBinding(Binding) new Bar() Foo:___cps___2() +new Foo() +new SandboxInvokerTest$Base() Bar.toString() Bar.super(Foo).toString() String.plus(String) -""") +''') } @Issue("SECURITY-551") @@ -179,7 +206,6 @@ Script1:___cps___1() Script1.super(Script1).setBinding(Binding) new C() new Point(Integer,Integer) -C.p=Point C.p Point.y ScriptBytecodeAdapter:compareEqual(Double,Integer) @@ -225,10 +251,131 @@ Script1:___cps___1() Script1.super(Script1).setBinding(Binding) new C() new Point(Integer,Integer) -C.p=Point C.p Point.y ScriptBytecodeAdapter:compareEqual(Double,Integer) +''') + } + + @Issue("SECURITY-566") + @Test public void typeCoercion() { + ProxyGeneratorAdapter.pxyCounter.set(0); // make sure *_groovyProxy names are predictable + evalCpsSandbox(''' + interface Static { + Locale[] getAvailableLocales() + } + interface Instance { + String getCountry() + } + assert (Locale as Static).getAvailableLocales() != null + assert (Locale as Static).availableLocales != null + assert Locale.getAvailableLocales() != null + assert (Locale.getDefault() as Instance).getCountry() != null + assert (Locale.getDefault() as Instance).country != null + assert Locale.getDefault().getCountry() != null + ''') + // TODO recording Checker.checkedCast is undesirable, but how to avoid it? + assertIntercept(''' +Script1:___cps___0() +Script1:___cps___1() +Script1.super(Script1).setBinding(Binding) +Checker:checkedCast(Class,Class,Boolean,Boolean,Boolean) +Locale:getAvailableLocales() +Class1_groovyProxy.getAvailableLocales() +ScriptBytecodeAdapter:compareNotEqual(Locale[],null) +Checker:checkedCast(Class,Class,Boolean,Boolean,Boolean) +Locale:getAvailableLocales() +Class1_groovyProxy.availableLocales +ScriptBytecodeAdapter:compareNotEqual(Locale[],null) +Locale:getAvailableLocales() +ScriptBytecodeAdapter:compareNotEqual(Locale[],null) +Locale:getDefault() +Checker:checkedCast(Class,Locale,Boolean,Boolean,Boolean) +Locale.getCountry() +Locale2_groovyProxy.getCountry() +ScriptBytecodeAdapter:compareNotEqual(String,null) +Locale:getDefault() +Checker:checkedCast(Class,Locale,Boolean,Boolean,Boolean) +Locale.getCountry() +Locale2_groovyProxy.country +ScriptBytecodeAdapter:compareNotEqual(String,null) +Locale:getDefault() +Locale.getCountry() +ScriptBytecodeAdapter:compareNotEqual(String,null) +''') + } + + @Issue("SECURITY-567") + @Test + void methodPointers() { + evalCpsSandbox(''' +import java.util.concurrent.Callable +def b = new SandboxInvokerTest.Base() +(b.&noArg)() +(b.&multipleArgs)('Kohsuke', 'Kawaguchi') +(b.&oneArg)('Something') +['Something'].each(b.&oneArg) +Callable c = b.&noArg +c() +def runit(Callable c) {c()} +runit({-> b.noArg()}) +runit(b.&noArg) +runit({-> b.noArg()} as Callable) +runit(b.&noArg as Callable) +''') + assertIntercept(''' +Script1:___cps___0() +Script1:___cps___1() +Script1:___cps___2() +Script1.super(Script1).setBinding(Binding) +new SandboxInvokerTest$Base() +SandboxedMethodClosure.call() +SandboxInvokerTest$Base.noArg() +SandboxedMethodClosure.call(String,String) +SandboxInvokerTest$Base.multipleArgs(String,String) +SandboxedMethodClosure.call(String) +SandboxInvokerTest$Base.oneArg(String) +ArrayList.each(SandboxedMethodClosure) +SandboxInvokerTest$Base.oneArg(String) +SandboxedMethodClosure.call() +SandboxInvokerTest$Base.noArg() +Script1.runit(CpsClosure) +CpsClosure.call() +SandboxInvokerTest$Base.noArg() +Script1.runit(SandboxedMethodClosure) +SandboxedMethodClosure.call() +SandboxInvokerTest$Base.noArg() +Checker:checkedCast(Class,CpsClosure,Boolean,Boolean,Boolean) +CpsClosure.call() +Script1.runit(CpsClosure) +CpsClosure.call() +SandboxInvokerTest$Base.noArg() +Checker:checkedCast(Class,SandboxedMethodClosure,Boolean,Boolean,Boolean) +SandboxedMethodClosure.call() +Script1.runit(SandboxedMethodClosure) +SandboxedMethodClosure.call() +SandboxInvokerTest$Base.noArg() +''') + } + + @Issue("SECURITY-567") + @Test + void methodPointersStatic() { + evalCpsSandbox(''' +(SandboxInvokerTest.Base.&staticMultipleArgs)('Kohsuke', 'Kawaguchi') +(SandboxInvokerTest.Base.&staticNoArg)() +(SandboxInvokerTest.Base.&staticOneArg)('Something') +''') + assertIntercept(''' +Script1:___cps___0() +Script1:___cps___1() +Script1.super(Script1).setBinding(Binding) +SandboxedMethodClosure.call(String,String) +SandboxInvokerTest$Base:staticMultipleArgs(String,String) +SandboxedMethodClosure.call() +SandboxInvokerTest$Base:staticNoArg() +SandboxedMethodClosure.call(String) +SandboxInvokerTest$Base:staticOneArg(String) ''') } From 271bc01672d1981fd2311650c80468101c35c317 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 28 Jul 2017 18:25:21 -0400 Subject: [PATCH 453/932] [maven-release-plugin] prepare release groovy-cps-parent-1.18 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index a18b5c6f0..5cf46a67b 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.18-SNAPSHOT + 1.18 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 8af2aff87..cc8fbda5b 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.18-SNAPSHOT + 1.18 groovy-cps diff --git a/pom.xml b/pom.xml index c839c76e0..56f725b46 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.18-SNAPSHOT + 1.18 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.18 From 333f3c389fd31a1938cfb0c23575890cf421a129 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 28 Jul 2017 18:25:21 -0400 Subject: [PATCH 454/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 5cf46a67b..6ab8ae9a3 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.18 + 1.19-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index cc8fbda5b..1af0c3f61 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.18 + 1.19-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 56f725b46..9bd7725ee 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.18 + 1.19-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.18 + HEAD From 960e00ba12a2ee46821112b8e26ca86c7e281c50 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 4 Aug 2017 12:46:50 -0400 Subject: [PATCH 455/932] Add groovy-sandbox.version POM property I'm working on tooling to do testing of core + groovy-sandbox + groovy-cps + workflow-cps + script-security + the rest of the main Pipeline plugins against bleeding-edge versions of each other and different versions of Groovy. To do this, it'd be a lot easier if the dependencies between the various things I'm building/testing had their versions controlled by properties. --- lib/pom.xml | 4 ++-- pom.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/pom.xml b/lib/pom.xml index b9ec9c7c9..b469e0bd1 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -125,13 +125,13 @@ org.kohsuke groovy-sandbox - 1.11 + ${groovy-sandbox.version} true org.kohsuke groovy-sandbox - 1.11 + ${groovy-sandbox.version} tests test diff --git a/pom.xml b/pom.xml index c839c76e0..45d28275e 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ UTF-8 2.4.7 + 1.11 From 40391f8e606aa9c3d779c24560896b56d1a66edc Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 4 Aug 2017 13:17:23 -0400 Subject: [PATCH 456/932] Move property to lib/pom.xml --- lib/pom.xml | 4 ++++ pom.xml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/pom.xml b/lib/pom.xml index b469e0bd1..587826d9f 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -11,6 +11,10 @@ Groovy CPS Execution + + 1.11 + + diff --git a/pom.xml b/pom.xml index 45d28275e..c839c76e0 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,6 @@ UTF-8 2.4.7 - 1.11 From b5b7d4b38279d5be6f3a08b2764bab7f8e745249 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 8 Aug 2017 14:05:05 -0400 Subject: [PATCH 457/932] d5df5da039e21bbe14e42efe50244532df9fa846 was a semantic merge conflict. --- lib/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/pom.xml b/lib/pom.xml index 8e295d437..1af0c3f61 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -11,10 +11,6 @@ Groovy CPS Execution - - 1.11 - - From 570d85e3c5be401bafdfc7b6fd8ac0a95b2c1e6e Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 15 Aug 2017 15:56:28 -0400 Subject: [PATCH 458/932] [JENKINS-46088] Downstream testing of double-transformation fix Downstream of https://github.com/jenkinsci/groovy-sandbox/pull/37 --- lib/pom.xml | 2 +- .../cps/sandbox/SandboxInvokerTest.groovy | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/lib/pom.xml b/lib/pom.xml index 1af0c3f61..3a69fe08a 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -112,7 +112,7 @@ - 1.13 + 1.14-20170815.195233-3 diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index 7d512bc9b..0c8d4f82f 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -87,6 +87,40 @@ String.length() ''') } + @Issue("JENKINS-46088") + @Test + void matcherTypeAssignment() { + assert "falsefalse" == evalCpsSandbox(''' + @NonCPS + def nonCPSMatcherMethod(String x) { + java.util.regex.Matcher m = x =~ /bla/ + return m.matches() + } + + def cpsMatcherMethod(String x) { + java.util.regex.Matcher m = x =~ /bla/ + return m.matches() + } + + return "${nonCPSMatcherMethod('foo')}${cpsMatcherMethod('foo')}" +''') + assertIntercept(''' +Script1:___cps___0() +Script1:___cps___1() +Script1:___cps___2() +Script1.super(Script1).setBinding(Binding) +Script1.nonCPSMatcherMethod(String) +ScriptBytecodeAdapter:findRegex(String,String) +Matcher.matches() +Script1.cpsMatcherMethod(String) +ScriptBytecodeAdapter:findRegex(String,String) +Checker:checkedCast(Class,Matcher,Boolean,Boolean,Boolean) +Matcher.matches() +ScriptBytecodeAdapter:asType(ArrayList,Class) +ScriptBytecodeAdapter:asType(ArrayList,Class) +new GStringImpl(Object[],String[]) +''') + } private Object evalCpsSandbox(String script) { FunctionCallEnv e = Envs.empty(); From 3540130e44af7c1cc09afeffac092d4a7a300cf6 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 16 Aug 2017 13:27:11 -0400 Subject: [PATCH 459/932] Use release 1.14 of groovy-sandbox --- lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pom.xml b/lib/pom.xml index 3a69fe08a..de9b3c359 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -112,7 +112,7 @@ - 1.14-20170815.195233-3 + 1.14 From ab94d341b96317c73a98ad9c5ba358469cc1d553 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 22 Aug 2017 17:48:09 -0400 Subject: [PATCH 460/932] [FIXED JENKINS-46358] Add support for StringGroovyMethods w/closures Note that this does *not* include `splitEachLine`, due to that requiring a private untranslated class. --- .../com/cloudbees/groovy/cps/tool/Driver.java | 4 +- .../cloudbees/groovy/cps/tool/Translator.java | 52 ++++++++-- .../groovy/cps/tool/translatable.txt | 23 +++++ .../com/cloudbees/groovy/cps/Continuable.java | 3 +- .../cps/CpsStringGroovyMethodsTest.groovy | 96 +++++++++++++++++++ 5 files changed, 166 insertions(+), 12 deletions(-) create mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java index 5de67ddbb..c810c357a 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java @@ -40,7 +40,9 @@ public void run(File dir) throws Exception { // classes to translate // TODO include other classes mentioned in DgmConverter if they have any applicable methods; and certainly StringGroovyMethods which has some Closure-based methods - List fileNames = asList("DefaultGroovyMethods", "DefaultGroovyStaticMethods"); + List fileNames = asList("DefaultGroovyMethods", + "DefaultGroovyStaticMethods", + "StringGroovyMethods"); List src = new ArrayList<>(); ZipArchive a = new ZipArchive((JavacFileManager) fileManager, new ZipFile(groovySrcJar)); diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 97b30fd8b..7d1639128 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -95,7 +95,6 @@ import java.util.Optional; import java.util.Set; import java.util.TreeMap; -import java.util.TreeSet; import javax.annotation.Generated; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; @@ -129,6 +128,7 @@ public class Translator { private final JClass $Builder; private final JClass $CatchExpression; private final DeclaredType closureType; + private final Map otherTranslated = new HashMap<>(); /** * To allow sibling calls to overloads to be resolved properly at runtime, write the actual implementation to an overload-proof private method. @@ -214,6 +214,9 @@ private static MethodLocation loc(String methodName) { JVar $methodName = m.param(String.class, "methodName"); m.body()._return(JExpr._new($MethodLocation).arg($output.dotclass()).arg($methodName)); }); + + // Record the fqcn we've already translated for possible use later. + otherTranslated.put(fqcn, $output); } /** @@ -333,20 +336,40 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { if (ms instanceof MemberSelectTree) { MemberSelectTree mst = (MemberSelectTree) ms; - inv = $b.invoke("functionCall") - .arg(loc(mt)) - .arg(visit(mst.getExpression())) - .arg(n(mst.getIdentifier())); + // Make sure we translate any method calls to a transformed class too. + if (mst.getExpression() instanceof JCIdent && + !((JCIdent)mst.getExpression()).sym.toString().equals(fqcn) && + otherTranslated.containsKey(((JCIdent)mst.getExpression()).sym.toString())) { + inv = $b.invoke("functionCall") + .arg(loc(mt)) + .arg($b.invoke("constant").arg( + otherTranslated.get(((JCIdent)mst.getExpression()).sym.toString()).dotclass())) + .arg(n(mst.getIdentifier())); + + } else { + inv = $b.invoke("functionCall") + .arg(loc(mt)) + .arg(visit(mst.getExpression())) + .arg(n(mst.getIdentifier())); + } } else if (ms instanceof JCIdent) { // invocation without object selection, like foo(bar,zot) JCIdent it = (JCIdent) ms; if (!it.sym.owner.toString().equals(fqcn)) { - // static import - inv = $b.invoke("functionCall") - .arg(loc(mt)) - .arg($b.invoke("constant").arg(t(it.sym.owner.type).dotclass())) - .arg(n(it)); + if (otherTranslated.containsKey(it.sym.owner.toString())) { + // static import from transformed class + inv = $b.invoke("functionCall") + .arg(loc(mt)) + .arg($b.invoke("constant").arg(otherTranslated.get(it.sym.owner.toString()).dotclass())) + .arg(n(it)); + } else { + // static import from non-transformed class + inv = $b.invoke("functionCall") + .arg(loc(mt)) + .arg($b.invoke("constant").arg(t(it.sym.owner.type).dotclass())) + .arg(n(it)); + } } else { // invocation on this class String overloadResolved = mangledName((Symbol.MethodSymbol) it.sym); @@ -537,6 +560,15 @@ public JExpression visitAssignment(AssignmentTree at, Void __) { .arg(visit(at.getExpression())); } + @Override + public JExpression visitArrayType(ArrayTypeTree at, Void __) { + if (at.getType() instanceof IdentifierTree) { + return visitIdentifier((IdentifierTree) at.getType(), __); + } else { + return defaultAction(at, __); + } + } + @Override public JExpression visitNewArray(NewArrayTree nt, Void __) { if (nt.getInitializers()!=null) { diff --git a/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt b/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt index a14c62258..49e248b2e 100644 --- a/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt +++ b/dgm-builder/src/main/resources/com/cloudbees/groovy/cps/tool/translatable.txt @@ -167,3 +167,26 @@ org.codehaus.groovy.runtime.DefaultGroovyMethods.upto(long,java.lang.Number,groo org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.createThread(java.lang.String,boolean,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.sleep(java.lang.Object,long,groovy.lang.Closure) org.codehaus.groovy.runtime.DefaultGroovyStaticMethods.sleepImpl(long,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.eachMatch(T,java.lang.CharSequence,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.eachMatch(T,java.util.regex.Pattern,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.eachMatch(java.lang.String,java.util.regex.Pattern,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.eachMatch(java.lang.String,java.lang.String,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.find(java.lang.CharSequence,java.lang.CharSequence,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.find(java.lang.CharSequence,java.util.regex.Pattern,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.find(java.lang.String,java.util.regex.Pattern,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.find(java.lang.String,java.lang.String,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.findAll(java.lang.CharSequence,java.lang.CharSequence,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.findAll(java.lang.CharSequence,java.util.regex.Pattern,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.findAll(java.lang.String,java.util.regex.Pattern,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.findAll(java.lang.String,java.lang.String,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.getReplacement(java.util.regex.Matcher,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.replaceAll(java.lang.CharSequence,java.lang.CharSequence,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.replaceAll(java.lang.CharSequence,java.util.regex.Pattern,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.replaceAll(java.lang.String,java.util.regex.Pattern,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.replaceAll(java.lang.String,java.lang.String,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.replaceFirst(java.lang.CharSequence,java.lang.CharSequence,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.replaceFirst(java.lang.CharSequence,java.util.regex.Pattern,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.replaceFirst(java.lang.String,java.util.regex.Pattern,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.replaceFirst(java.lang.String,java.lang.String,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.takeWhile(java.lang.CharSequence,groovy.lang.Closure) +org.codehaus.groovy.runtime.StringGroovyMethods.takeWhile(groovy.lang.GString,groovy.lang.Closure) \ No newline at end of file diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 3d5962c25..648eb0cff 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -32,7 +32,8 @@ public class Continuable implements Serializable { @SuppressWarnings("rawtypes") public static final List categories = ImmutableList.of( CpsDefaultGroovyMethods.class, - CpsDefaultGroovyStaticMethods.class); + CpsDefaultGroovyStaticMethods.class, + CpsStringGroovyMethods.class); /** * When the program resumes with a value (in particular an exception thrown), what environment diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy new file mode 100644 index 000000000..847b848ba --- /dev/null +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy @@ -0,0 +1,96 @@ +package com.cloudbees.groovy.cps + +import org.junit.Ignore +import org.junit.Test + + +class CpsStringGroovyMethodsTest extends AbstractGroovyCpsTest { + @Test + void eachMatch() { + evalCPSAndSync(''' +int matchCount = 0 +"foobarfoooobar".eachMatch(~/foo/) { matchCount++ } +return matchCount +''', 2) + + evalCPSAndSync(''' +int matchCount = 0 +"foobarfoooobar".eachMatch('foo') { matchCount++ } +return matchCount +''', 2) + } + + @Test + void find() { + evalCPSAndSync(''' +return "foobar".find("oob") { it.reverse() } +''', "raboof") + + evalCPSAndSync(''' +return "foobar".find(~/oob/) { it.reverse() } +''', "raboof") + } + + @Test + void findAll() { + evalCPSAndSync(''' +return "foobarfoobarfoo".findAll("foo") { it.reverse() } +''', ['oof', 'oof', 'oof']) + + evalCPSAndSync(''' +return "foobarfoobarfoo".findAll(~/foo/) { it.reverse() } +''', ['oof', 'oof', 'oof']) + } + + @Test + void replaceAll() { + evalCPSAndSync(''' +return "foobarfoobarfoo".replaceAll("foo") { it.reverse() } +''', "oofbaroofbaroof") + + evalCPSAndSync(''' +return "foobarfoobarfoo".replaceAll(~/foo/) { it.reverse() } +''', "oofbaroofbaroof") + } + + @Test + void replaceFirst() { + evalCPSAndSync(''' +return "foobarfoobarfoo".replaceFirst("foo") { it.reverse() } +''', "oofbarfoobarfoo") + + evalCPSAndSync(''' +return "foobarfoobarfoo".replaceFirst(~/foo/) { it.reverse() } +''', "oofbarfoobarfoo") + } + + @Ignore("Waiting for StringGroovyMethods.LineIterable translation") + @Test + void splitEachLine() { + evalCPSAndSync(''' +return """ +abc|def +ghi|jkl +mno|pqr +""".splitEachLine("|") { it.reverse() } +''', "bob") + } + + @Test + void takeWhile() { + evalCPSAndSync(''' +return "Groovy".takeWhile{ it != 'v' } +''', "Groo") + } + + private void evalCPSAndSync(String script, Object value) { + evalCPS(script) == value + evalCPS(""" +@NonCPS +def someMethod() { + ${script} +} +someMethod() +""") == value + } +} From 77f3438401cf8005f07fb85f4b5fce345d13efe7 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 22 Aug 2017 17:56:33 -0400 Subject: [PATCH 461/932] Adding a GString takeWhile test --- .../cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy index 847b848ba..f35650a9b 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy @@ -80,6 +80,11 @@ mno|pqr void takeWhile() { evalCPSAndSync(''' return "Groovy".takeWhile{ it != 'v' } +''', "Groo") + + evalCPSAndSync(''' +def vStr = 'v' +return "Groovy".takeWhile{ it != "${vStr}" } ''', "Groo") } From 522f56c624d1510c2e60106d987d13de65086af4 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 22 Aug 2017 18:13:45 -0400 Subject: [PATCH 462/932] Oops, was testing the wrong thing --- .../cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy index f35650a9b..367665e49 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy @@ -83,8 +83,8 @@ return "Groovy".takeWhile{ it != 'v' } ''', "Groo") evalCPSAndSync(''' -def vStr = 'v' -return "Groovy".takeWhile{ it != "${vStr}" } +def ovyStr = 'ovy' +return "Gro${ovyStr}".takeWhile{ it != "v" } ''', "Groo") } From d93226e1561859d54f43f717c91a3276ef3eeb6c Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 23 Aug 2017 09:50:53 -0400 Subject: [PATCH 463/932] Some additional comments --- .../java/com/cloudbees/groovy/cps/tool/Translator.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 7d1639128..28b63d52f 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -336,7 +336,10 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { if (ms instanceof MemberSelectTree) { MemberSelectTree mst = (MemberSelectTree) ms; - // Make sure we translate any method calls to a transformed class too. + // If this is a call to a static method on another class, it may be an already-translated method, + // in which case, we need to use that translated method, not the original. So check if the expression + // is an identifier, that it's not the class we're in the process of translating, and if it's one + // of the other known translated classes. if (mst.getExpression() instanceof JCIdent && !((JCIdent)mst.getExpression()).sym.toString().equals(fqcn) && otherTranslated.containsKey(((JCIdent)mst.getExpression()).sym.toString())) { @@ -560,6 +563,9 @@ public JExpression visitAssignment(AssignmentTree at, Void __) { .arg(visit(at.getExpression())); } + /** + * This is needed to handle cases like {@code Object[].class}. + */ @Override public JExpression visitArrayType(ArrayTypeTree at, Void __) { if (at.getType() instanceof IdentifierTree) { From b4b5927884f7c9b4c7507f30b42094134b387f80 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 5 Sep 2017 14:35:20 -0400 Subject: [PATCH 464/932] [maven-release-plugin] prepare release groovy-cps-parent-1.19 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 6ab8ae9a3..b1dfa1677 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.19-SNAPSHOT + 1.19 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index f77435ed7..49e6c1761 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.19-SNAPSHOT + 1.19 groovy-cps diff --git a/pom.xml b/pom.xml index 9bd7725ee..d6a2eeb59 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.19-SNAPSHOT + 1.19 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.19 From df7c85af9cacdd1917f52afe1b3bdca324fd2c38 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 5 Sep 2017 14:35:25 -0400 Subject: [PATCH 465/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index b1dfa1677..14a2fc33b 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.19 + 1.20-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 49e6c1761..2b4f85db3 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.19 + 1.20-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index d6a2eeb59..1225e1621 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.19 + 1.20-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.19 + HEAD From a75d1b5a9b65f1269079b2c7a5b143504b08d8fd Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 13 Sep 2017 17:59:52 -0400 Subject: [PATCH 466/932] [FIXED JENKINS-32213] Automatically make all CPS classes serializable --- .../java/com/cloudbees/groovy/cps/CpsTransformer.java | 8 ++++++++ .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 64c61f35c..902af44cf 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -5,6 +5,8 @@ import com.cloudbees.groovy.cps.sandbox.Trusted; import com.cloudbees.groovy.cps.sandbox.Untrusted; import com.google.common.annotations.VisibleForTesting; + +import java.io.Serializable; import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -133,6 +135,10 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod visitNontransformedStatement(statement); } + if (!classNode.declaresInterface(SERIAIZABLE_TYPE)) { + classNode.addInterface(SERIAIZABLE_TYPE); + } + // groovy puts timestamp of compilation into a class file, causing serialVersionUID to change. // this tends to be undesirable for CPS involving persistence. // set the timestamp to some bogus value will prevent Verifier from adding a field that encodes @@ -1224,6 +1230,8 @@ public void visitBytecodeExpression(BytecodeExpression expression) { private static final ClassNode METHOD_LOCATION_TYPE = ClassHelper.makeCached(MethodLocation.class); + private static final ClassNode SERIAIZABLE_TYPE = ClassHelper.makeCached(Serializable.class); + private static final VariableExpression BUILDER = new VariableExpression("b", BUILDER_TYPE); // new PropertyExpression(new ClassExpression(BUILDER_TYPE), "INSTANCE") private static final VariableExpression THIS = new VariableExpression("this"); diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index d9eb7e5fa..e1004390e 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -814,4 +814,10 @@ def b = new CpsTransformerTest.Base() return (b.&toString)() + (String.getClass().&getSimpleName)() ''') == "baseClass" } + + @Issue("JENKINS-32213") + @Test + void allClassesSerializable() { + evalCPSonly('class C {}; def c = new C(); assert c instanceof Serializable') + } } From 2c408196d69b9aa93566fa09210a9cd31b94b629 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Thu, 14 Sep 2017 10:44:06 -0400 Subject: [PATCH 467/932] Hai, i r typo will u b mah friend --- .../main/java/com/cloudbees/groovy/cps/CpsTransformer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 902af44cf..6f73060c8 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -135,8 +135,8 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod visitNontransformedStatement(statement); } - if (!classNode.declaresInterface(SERIAIZABLE_TYPE)) { - classNode.addInterface(SERIAIZABLE_TYPE); + if (!classNode.declaresInterface(SERIALIZABLE_TYPE)) { + classNode.addInterface(SERIALIZABLE_TYPE); } // groovy puts timestamp of compilation into a class file, causing serialVersionUID to change. @@ -1230,7 +1230,7 @@ public void visitBytecodeExpression(BytecodeExpression expression) { private static final ClassNode METHOD_LOCATION_TYPE = ClassHelper.makeCached(MethodLocation.class); - private static final ClassNode SERIAIZABLE_TYPE = ClassHelper.makeCached(Serializable.class); + private static final ClassNode SERIALIZABLE_TYPE = ClassHelper.makeCached(Serializable.class); private static final VariableExpression BUILDER = new VariableExpression("b", BUILDER_TYPE); // new PropertyExpression(new ClassExpression(BUILDER_TYPE), "INSTANCE") From 1bed0560ced3e3363dde0204624f89d16389935b Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 18 Sep 2017 16:41:14 -0400 Subject: [PATCH 468/932] Commented updated in light of JENKINS-46703. --- .../src/main/java/com/cloudbees/groovy/cps/tool/Driver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java index c810c357a..78321b921 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java @@ -39,7 +39,7 @@ public void run(File dir) throws Exception { File groovySrcJar = Which.jarFile(Driver.class.getClassLoader().getResource("groovy/lang/GroovyShell.java")); // classes to translate - // TODO include other classes mentioned in DgmConverter if they have any applicable methods; and certainly StringGroovyMethods which has some Closure-based methods + // TODO include other classes mentioned in DefaultGroovyMethods.DGM_LIKE_CLASSES if they have any applicable methods List fileNames = asList("DefaultGroovyMethods", "DefaultGroovyStaticMethods", "StringGroovyMethods"); From 3344ca70913ec0cb2102befda2bf9a932f6e4332 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 18 Sep 2017 17:02:57 -0400 Subject: [PATCH 469/932] [FIXED JENKINS-44027] Support multiple assignment --- .../cloudbees/groovy/cps/CpsTransformer.java | 63 ++++++++++++++----- .../groovy/cps/CpsTransformerTest.groovy | 12 ++++ 2 files changed, 58 insertions(+), 17 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 64c61f35c..ad27be97c 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -763,6 +763,29 @@ public void run() { BINARY_OP_TO_BUILDER_METHOD.put(KEYWORD_IN, "isCase"); } + private void multipleAssignment(final Expression parentExpression, + TupleExpression tuple, + ListExpression list) { + List listExpressions = list.getExpressions(); + List tupleExpressions = tuple.getExpressions(); + if (listExpressions.size() < tupleExpressions.size()) { + // TODO: Better error handling. + throw new UnsupportedOperationException(); + } + for (int i = 0, tupleExpressionsSize = tupleExpressions.size(); i < tupleExpressionsSize; i++) { + final Expression tupleExpression = tupleExpressions.get(i); + final Expression listExpression = listExpressions.get(i); + makeNode("assign", new Runnable() { + @Override + public void run() { + loc(parentExpression); + visit(tupleExpression); + visit(listExpression); + } + }); + } + } + /** * @see * org.codehaus.groovy.classgen.asm.BinaryExpressionHelper#eval(BinaryExpression) @@ -771,14 +794,22 @@ public void run() { public void visitBinaryExpression(final BinaryExpression exp) { String name = BINARY_OP_TO_BUILDER_METHOD.get(exp.getOperation().getType()); if (name != null) { - makeNode(name, new Runnable() { - @Override - public void run() { - loc(exp); - visit(exp.getLeftExpression()); - visit(exp.getRightExpression()); - } - }); + if (name.equals("assign") && + exp.getLeftExpression() instanceof TupleExpression && + exp.getRightExpression() instanceof ListExpression) { + multipleAssignment(exp, + (TupleExpression)exp.getLeftExpression(), + (ListExpression)exp.getRightExpression()); + } else { + makeNode(name, new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getLeftExpression()); + visit(exp.getRightExpression()); + } + }); + } return; } @@ -1050,25 +1081,23 @@ public void visitDeclarationExpression(final DeclarationExpression exp) { makeNode("sequence", new Runnable() { @Override public void run() { + // TODO: Possibly move this logic into multipleAssignment(...) or replace that with more specific + // logic. for (Expression e : exp.getTupleExpression().getExpressions()) { final VariableExpression v = (VariableExpression) e; makeNode("declareVariable", new Runnable() { @Override public void run() { - loc(exp); literal(v.getType()); literal(v.getName()); } }); } - makeNode("assign", new Runnable() { - @Override - public void run() { - loc(exp); - visit(exp.getLeftExpression()); - visit(exp.getRightExpression()); - } - }); + if (exp.getRightExpression() instanceof ListExpression) { + multipleAssignment(exp, + exp.getTupleExpression(), + (ListExpression)exp.getRightExpression()); + } } }); } else { diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index d9eb7e5fa..4760c3bcf 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -814,4 +814,16 @@ def b = new CpsTransformerTest.Base() return (b.&toString)() + (String.getClass().&getSimpleName)() ''') == "baseClass" } + + @Issue("JENKINS-44027") + @Test + void multipleAssignment() { + assert evalCPS(''' +def (a, b) = ['first', 'second'] +def c, d +(c, d) = ['third', 'fourth'] + +return a + b + c + d +''') == 'firstsecondthirdfourth' + } } From a934a3952dba91da43f5ec66d9a351527d0ebeb8 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 20 Sep 2017 14:36:25 -0400 Subject: [PATCH 470/932] Better matching of Groovy behavior for multiple assignments --- .../cloudbees/groovy/cps/CpsTransformer.java | 46 +++++++++++-------- .../groovy/cps/CpsTransformerTest.groovy | 32 +++++++++++++ 2 files changed, 59 insertions(+), 19 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index ad27be97c..a47589f6f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -764,23 +764,35 @@ public void run() { } private void multipleAssignment(final Expression parentExpression, - TupleExpression tuple, - ListExpression list) { - List listExpressions = list.getExpressions(); + final TupleExpression tuple, + final Expression rhs) { List tupleExpressions = tuple.getExpressions(); - if (listExpressions.size() < tupleExpressions.size()) { - // TODO: Better error handling. - throw new UnsupportedOperationException(); - } + for (int i = 0, tupleExpressionsSize = tupleExpressions.size(); i < tupleExpressionsSize; i++) { final Expression tupleExpression = tupleExpressions.get(i); - final Expression listExpression = listExpressions.get(i); + final int index = i; + // def (a, b, c) = [1, 2] is allowed - c will just be null in that scenario. + // def (a, b) = [1, 2, 3] is allowed as well - 3 is just discarded. + // def (a, b) = 4 will error due to Integer.getAt(int) not being a thing + // def (a, b) = "what" is allowed - a will equal 'w', and b will equal 'h' makeNode("assign", new Runnable() { @Override public void run() { loc(parentExpression); visit(tupleExpression); - visit(listExpression); + makeNode("array", new Runnable() { + @Override + public void run() { + loc(rhs); + visit(rhs); + makeNode("constant", new Runnable() { + @Override + public void run() { + literal(index); + } + }); + } + }); } }); } @@ -795,11 +807,10 @@ public void visitBinaryExpression(final BinaryExpression exp) { String name = BINARY_OP_TO_BUILDER_METHOD.get(exp.getOperation().getType()); if (name != null) { if (name.equals("assign") && - exp.getLeftExpression() instanceof TupleExpression && - exp.getRightExpression() instanceof ListExpression) { + exp.getLeftExpression() instanceof TupleExpression) { multipleAssignment(exp, (TupleExpression)exp.getLeftExpression(), - (ListExpression)exp.getRightExpression()); + exp.getRightExpression()); } else { makeNode(name, new Runnable() { @Override @@ -1081,8 +1092,6 @@ public void visitDeclarationExpression(final DeclarationExpression exp) { makeNode("sequence", new Runnable() { @Override public void run() { - // TODO: Possibly move this logic into multipleAssignment(...) or replace that with more specific - // logic. for (Expression e : exp.getTupleExpression().getExpressions()) { final VariableExpression v = (VariableExpression) e; makeNode("declareVariable", new Runnable() { @@ -1093,11 +1102,10 @@ public void run() { } }); } - if (exp.getRightExpression() instanceof ListExpression) { - multipleAssignment(exp, - exp.getTupleExpression(), - (ListExpression)exp.getRightExpression()); - } + multipleAssignment(exp, + exp.getTupleExpression(), + exp.getRightExpression()); + } }); } else { diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 4760c3bcf..746f071d5 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -826,4 +826,36 @@ def c, d return a + b + c + d ''') == 'firstsecondthirdfourth' } + + @Issue("JENKINS-44027") + @Test + void nonArrayLikeMultipleAssignment() { + assert evalCPS(''' +try { + def (a,b) = 4 + return false +} catch (Exception e) { + return e instanceof MissingMethodException +} +''') == true + } + + @Issue("JENKINS-44027") + @Test + void arrayLikeMultipleAssignment() { + assert evalCPS(''' +def (a,b) = "what" +return a + b +''') == "wh" + } + + @Issue("JENKINS-44027") + @Test + void mismatchedSizeMultipleAssignment() { + assert evalCPS(''' +def (a, b) = ['first', 'second', 'third'] +def (c, d) = ['fourth'] +return [a, b, c, d].join(' ') +''') == "first second fourth null" + } } From 2b43c3830e18a30f011583fbe63dc97902dab807 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 20 Sep 2017 14:40:21 -0400 Subject: [PATCH 471/932] Simplifying array getAt logic for multiple assignment a bit --- .../java/com/cloudbees/groovy/cps/CpsTransformer.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index a47589f6f..144a5e709 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -770,7 +770,7 @@ private void multipleAssignment(final Expression parentExpression, for (int i = 0, tupleExpressionsSize = tupleExpressions.size(); i < tupleExpressionsSize; i++) { final Expression tupleExpression = tupleExpressions.get(i); - final int index = i; + final Expression index = new ConstantExpression(i, true); // def (a, b, c) = [1, 2] is allowed - c will just be null in that scenario. // def (a, b) = [1, 2, 3] is allowed as well - 3 is just discarded. // def (a, b) = 4 will error due to Integer.getAt(int) not being a thing @@ -785,12 +785,7 @@ public void run() { public void run() { loc(rhs); visit(rhs); - makeNode("constant", new Runnable() { - @Override - public void run() { - literal(index); - } - }); + makeNode("constant", index); } }); } From ea34d116fef8842fd211493d26ee0a0520addb89 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 20 Sep 2017 15:01:13 -0400 Subject: [PATCH 472/932] Simplify making serializable, add more test cases --- .../com/cloudbees/groovy/cps/CpsTransformer.java | 4 +--- .../cloudbees/groovy/cps/CpsTransformerTest.groovy | 13 +++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 6f73060c8..acfd77871 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -135,9 +135,7 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod visitNontransformedStatement(statement); } - if (!classNode.declaresInterface(SERIALIZABLE_TYPE)) { - classNode.addInterface(SERIALIZABLE_TYPE); - } + classNode.addInterface(SERIALIZABLE_TYPE); // groovy puts timestamp of compilation into a class file, causing serialVersionUID to change. // this tends to be undesirable for CPS involving persistence. diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index e1004390e..da54803d2 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -819,5 +819,18 @@ return (b.&toString)() + (String.getClass().&getSimpleName)() @Test void allClassesSerializable() { evalCPSonly('class C {}; def c = new C(); assert c instanceof Serializable') + evalCPSonly('class C implements Serializable {}; def c = new C(); assert c instanceof Serializable') + evalCPSonly(''' +@NonCPS +def notSerializable() { + def r = new Runnable() { + @Override + public void run() {} + } + return r instanceof Serializable +} + +return notSerializable() +''') == false } } From 9ac3a7914dbea5f4320acddf4dc613a272f7d36c Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Thu, 21 Sep 2017 13:21:31 -0400 Subject: [PATCH 473/932] Presize env hashmaps to be smaller unless needed --- .../cloudbees/groovy/cps/impl/BlockScopeEnv.java | 4 ++++ .../com/cloudbees/groovy/cps/impl/CallEnv.java | 8 +++++++- .../cloudbees/groovy/cps/impl/ClosureCallEnv.java | 9 +++++++-- .../cloudbees/groovy/cps/impl/CpsFunction.java | 2 +- .../groovy/cps/impl/FunctionCallEnv.java | 15 ++++++++++++--- .../cloudbees/groovy/cps/impl/TryCatchBlock.java | 2 +- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java index 4bf8f624a..a92430f6e 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java @@ -16,6 +16,10 @@ public class BlockScopeEnv extends ProxyEnv { private Map types = new HashMap(); public BlockScopeEnv(Env parent) { + this(parent, 1); + } + + public BlockScopeEnv(Env parent, int size) { super(parent); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 011e929e4..fa56c1340 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -6,6 +6,7 @@ import com.cloudbees.groovy.cps.sandbox.Invoker; import javax.annotation.Nullable; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -17,7 +18,7 @@ */ /*package*/ abstract class CallEnv implements Env { private final Continuation returnAddress; - private Map types = new HashMap(); + private Map types; /** * Caller environment, used for throwing an exception. @@ -39,11 +40,16 @@ * The environment of the call site. Can be null but only if the caller is outside CPS execution. */ public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc) { + this(caller, returnAddress, loc, 1); + } + + public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc, int localsCount) { this.caller = caller; this.returnAddress = returnAddress; this.callSiteLoc = loc; this.invoker = caller==null ? Invoker.INSTANCE : caller.getInvoker(); assert returnAddress!=null; + types = new HashMap(localsCount); } /** Because might deserialize old version of class with null value for field */ diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java index 7b4fc30d8..30031c78a 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java @@ -12,7 +12,7 @@ * @author Kohsuke Kawaguchi */ class ClosureCallEnv extends CallEnv { - final Map locals = new HashMap(); + final Map locals; final CpsClosure closure; @@ -22,9 +22,14 @@ class ClosureCallEnv extends CallEnv { final Env captured; public ClosureCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Env captured, CpsClosure closure) { - super(caller,returnAddress,loc); + this(caller, returnAddress, loc, captured, closure, 1); + } + + public ClosureCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Env captured, CpsClosure closure, int localsSize) { + super(caller,returnAddress,loc, localsSize); this.closure = closure; this.captured = captured; + locals = new HashMap(localsSize); } public void declareVariable(Class type, String name) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java index 39aa8aec5..6b3c420f7 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java @@ -18,7 +18,7 @@ public CpsFunction(List parameters, Block body) { } public Next invoke(Env caller, SourceLocation loc, Object receiver, List args, Continuation k) { - Env e = new FunctionCallEnv(caller, k, loc, receiver); + Env e = new FunctionCallEnv(caller, k, loc, receiver, args.size()); assignArguments(args,e); return new Next(body, e, k); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index 0f135f6e4..993efe419 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -12,14 +12,19 @@ // TODO: should be package local once all the impls move into this class public class FunctionCallEnv extends CallEnv { // TODO: delegate? - final Map locals = new HashMap(); + Map locals; /** * @param caller * The environment of the call site. Can be null but only if the caller is outside CPS execution. */ public FunctionCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Object _this) { - super(caller,returnAddress,loc); + this(caller, returnAddress, loc, _this, 1); + } + + public FunctionCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Object _this, int localsCount) { + super(caller,returnAddress,loc, localsCount); + locals = new HashMap(localsCount+1); locals.put("this",_this); } @@ -29,7 +34,11 @@ public void declareVariable(Class type, String name) { } public Object getLocalVariable(String name) { - return locals.get(name); + if (name.equals("this")) { + return closureOwner(); + } else { + return locals.get(name); + } } public void setLocalVariable(String name, Object value) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java index 06d849396..784b19bd2 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryCatchBlock.java @@ -30,7 +30,7 @@ public Next eval(final Env e, final Continuation k) { for (final CatchExpression c : catches) { f.addHandler(c.type, new Continuation() { public Next receive(Object t) { - BlockScopeEnv b = new BlockScopeEnv(e); + BlockScopeEnv b = new BlockScopeEnv(e, 1); b.declareVariable(c.type, c.name); b.setLocalVariable(c.name, t); From 6cfe76fcc9fd6b2ad00e720df977f310f0f53d79 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Thu, 21 Sep 2017 13:40:00 -0400 Subject: [PATCH 474/932] Lazy-initialize hashmaps for environments --- .../com/cloudbees/groovy/cps/impl/CallEnv.java | 16 ++++++++++++++-- .../groovy/cps/impl/ClosureCallEnv.java | 18 +++++++++++++----- .../groovy/cps/impl/CpsClosureDef.java | 2 +- .../groovy/cps/impl/FunctionCallEnv.java | 4 ++-- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index fa56c1340..432002e1f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -49,13 +49,25 @@ public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc, int l this.callSiteLoc = loc; this.invoker = caller==null ? Invoker.INSTANCE : caller.getInvoker(); assert returnAddress!=null; - types = new HashMap(localsCount); + if (localsCount <= 0) { + types = Collections.EMPTY_MAP; + } else { + types = new HashMap(localsCount); + } } /** Because might deserialize old version of class with null value for field */ protected Map getTypes() { if (types == null) { - this.types = new HashMap(); + this.types = Collections.emptyMap(); + } + return this.types; + } + + /** Used when we are actually going to mutate the types info */ + protected Map getTypesForMutation() { + if (types == null || types == Collections.EMPTY_MAP) { + this.types = new HashMap(1); } return this.types; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java index 30031c78a..6fd1731e8 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java @@ -3,6 +3,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -12,7 +13,7 @@ * @author Kohsuke Kawaguchi */ class ClosureCallEnv extends CallEnv { - final Map locals; + Map locals; final CpsClosure closure; @@ -22,19 +23,26 @@ class ClosureCallEnv extends CallEnv { final Env captured; public ClosureCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Env captured, CpsClosure closure) { - this(caller, returnAddress, loc, captured, closure, 1); + this(caller, returnAddress, loc, captured, closure, 0); } public ClosureCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Env captured, CpsClosure closure, int localsSize) { super(caller,returnAddress,loc, localsSize); this.closure = closure; this.captured = captured; - locals = new HashMap(localsSize); + if (localsSize <= 0) { + locals = Collections.emptyMap(); + } else { + locals = new HashMap(localsSize); + } } public void declareVariable(Class type, String name) { - locals.put(name,null); - getTypes().put(name, type); + if (locals == Collections.EMPTY_MAP) { + locals = new HashMap(1); + } + locals.put(name, null); + getTypesForMutation().put(name, type); } public Object getLocalVariable(String name) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java index b462022ad..d31ea07ae 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java @@ -28,7 +28,7 @@ class CpsClosureDef extends CpsCallable { @Override Next invoke(Env caller, SourceLocation loc, Object receiver, List args, Continuation k) { - Env e = new ClosureCallEnv(caller, k, loc, capture, self); + Env e = new ClosureCallEnv(caller, k, loc, capture, self, args.size()); assignArguments(args, e); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index 993efe419..09e37fb37 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -19,13 +19,13 @@ public class FunctionCallEnv extends CallEnv { * The environment of the call site. Can be null but only if the caller is outside CPS execution. */ public FunctionCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Object _this) { - this(caller, returnAddress, loc, _this, 1); + this(caller, returnAddress, loc, _this, 0); } public FunctionCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Object _this, int localsCount) { super(caller,returnAddress,loc, localsCount); locals = new HashMap(localsCount+1); - locals.put("this",_this); + locals.put("this", _this); } public void declareVariable(Class type, String name) { From 0462f151b26952f3b75d0de17211e5a1b6d4b91c Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Thu, 21 Sep 2017 16:29:55 -0400 Subject: [PATCH 475/932] Fix an oopsie --- .../java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index 09e37fb37..06b95468b 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -34,11 +34,7 @@ public void declareVariable(Class type, String name) { } public Object getLocalVariable(String name) { - if (name.equals("this")) { - return closureOwner(); - } else { - return locals.get(name); - } + return locals.get(name); } public void setLocalVariable(String name, Object value) { From 27d5f4ad0adcfa4af0bc4e9b6de16a506eba9522 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Thu, 21 Sep 2017 16:38:45 -0400 Subject: [PATCH 476/932] Refine zero-size FunctionCallEnv handling --- lib/src/main/java/com/cloudbees/groovy/cps/Envs.java | 4 ++-- .../java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Envs.java b/lib/src/main/java/com/cloudbees/groovy/cps/Envs.java index 460a63edc..58c14f8de 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Envs.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Envs.java @@ -16,14 +16,14 @@ public class Envs { * regular Java program. */ public static Env empty() { - return new FunctionCallEnv(null,Continuation.HALT,null,null); + return new FunctionCallEnv(null,Continuation.HALT,null,null, 0); } /** * Works like {@link #empty()} except it allows a custom {@link Invoker}. */ public static Env empty(Invoker inv) { - FunctionCallEnv e = new FunctionCallEnv(null, Continuation.HALT, null, null); + FunctionCallEnv e = new FunctionCallEnv(null, Continuation.HALT, null, null, 0); e.setInvoker(inv); return e; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index 06b95468b..52909ab3a 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -24,7 +24,7 @@ public FunctionCallEnv(Env caller, Continuation returnAddress, SourceLocation lo public FunctionCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Object _this, int localsCount) { super(caller,returnAddress,loc, localsCount); - locals = new HashMap(localsCount+1); + locals = new HashMap( (localsCount <= 0) ? 1 : localsCount+1); locals.put("this", _this); } From 051945240451c609274e6c78d1916c19cd221fdc Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Thu, 21 Sep 2017 16:52:33 -0400 Subject: [PATCH 477/932] Give the other Env types the lazy hashmap initialization goodness --- .../groovy/cps/impl/BlockScopeEnv.java | 27 ++++++++++++++----- .../groovy/cps/impl/TryBlockEnv.java | 2 +- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java index a92430f6e..a74a827b7 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.Env; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -12,20 +13,34 @@ */ // TODO: should be package local once all the impls move into this class public class BlockScopeEnv extends ProxyEnv { - private final Map locals = new HashMap(); - private Map types = new HashMap(); + private Map locals; + private Map types; public BlockScopeEnv(Env parent) { - this(parent, 1); + this(parent, 0); } - public BlockScopeEnv(Env parent, int size) { + public BlockScopeEnv(Env parent, int localsSize) { super(parent); + if (localsSize <= 0) { + locals = Collections.emptyMap(); + types = Collections.emptyMap(); + } else { + locals = new HashMap(localsSize); + types = new HashMap(localsSize); + } } public void declareVariable(Class type, String name) { + if (locals == Collections.EMPTY_MAP) { + this.locals = new HashMap(1); + } locals.put(name, null); - getTypes().put(name, type); + + if (types == null || types == Collections.EMPTY_MAP) { + types = new HashMap(1); + } + types.put(name, type); } public Object getLocalVariable(String name) { @@ -38,7 +53,7 @@ public Object getLocalVariable(String name) { /** Because might deserialize old version of class with null value for field */ private Map getTypes() { if (types == null) { - this.types = new HashMap(); + this.types = Collections.emptyMap(); } return this.types; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java index 988046c1f..b905a336b 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java @@ -17,7 +17,7 @@ */ // TODO: should be package local once all the impls move into this class public class TryBlockEnv extends ProxyEnv { - private final Map handlers = new LinkedHashMap(); + private final Map handlers = new LinkedHashMap(1); @Nullable private final Block finally_; From a13f2215e580a9f051f8867c345a5ae90e1cdb45 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Thu, 21 Sep 2017 17:07:20 -0400 Subject: [PATCH 478/932] Eagerly initialize locals where we know we need them in the for-in loop --- .../java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java | 2 +- .../com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java index cdb745283..599110c59 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java @@ -42,7 +42,7 @@ class ContinuationImpl extends ContinuationGroup { Iterator itr; ContinuationImpl(Env _e, Continuation loopEnd) { - this.e = new LoopBlockScopeEnv(_e,label,loopEnd,increment.bind(this)); + this.e = new LoopBlockScopeEnv(_e,label,loopEnd,increment.bind(this),1); this.e.declareVariable(type,variable); this.loopEnd = loopEnd; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java index f6dc52d3f..458bca0a9 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LoopBlockScopeEnv.java @@ -13,7 +13,11 @@ class LoopBlockScopeEnv extends BlockScopeEnv { private final Continuation break_, continue_; LoopBlockScopeEnv(Env parent, String label, Continuation break_, Continuation continue_) { - super(parent); + this (parent, label, break_, continue_, 0); + } + + LoopBlockScopeEnv(Env parent, String label, Continuation break_, Continuation continue_, int localsCount) { + super(parent, localsCount); this.label = label; this.break_ = break_; this.continue_ = continue_; From 457eb6a7f7f0c020c5fde9804ce9c152d58bd6e0 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Thu, 21 Sep 2017 17:32:33 -0400 Subject: [PATCH 479/932] Fix to initialCapacity for maps --- .../com/cloudbees/groovy/cps/impl/BlockScopeEnv.java | 9 +++++---- .../main/java/com/cloudbees/groovy/cps/impl/CallEnv.java | 5 +++-- .../com/cloudbees/groovy/cps/impl/ClosureCallEnv.java | 5 +++-- .../com/cloudbees/groovy/cps/impl/FunctionCallEnv.java | 3 ++- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java index a74a827b7..d71b47613 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Env; +import com.google.common.collect.Maps; import java.util.Collections; import java.util.HashMap; @@ -26,19 +27,19 @@ public BlockScopeEnv(Env parent, int localsSize) { locals = Collections.emptyMap(); types = Collections.emptyMap(); } else { - locals = new HashMap(localsSize); - types = new HashMap(localsSize); + locals = Maps.newHashMapWithExpectedSize(localsSize); + types = Maps.newHashMapWithExpectedSize(localsSize); } } public void declareVariable(Class type, String name) { if (locals == Collections.EMPTY_MAP) { - this.locals = new HashMap(1); + this.locals = new HashMap(2); } locals.put(name, null); if (types == null || types == Collections.EMPTY_MAP) { - types = new HashMap(1); + types = new HashMap(2); } types.put(name, type); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 432002e1f..d47e3919a 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -4,6 +4,7 @@ import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; import com.cloudbees.groovy.cps.sandbox.Invoker; +import com.google.common.collect.Maps; import javax.annotation.Nullable; import java.util.Collections; @@ -52,7 +53,7 @@ public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc, int l if (localsCount <= 0) { types = Collections.EMPTY_MAP; } else { - types = new HashMap(localsCount); + types = Maps.newHashMapWithExpectedSize(localsCount); } } @@ -67,7 +68,7 @@ protected Map getTypes() { /** Used when we are actually going to mutate the types info */ protected Map getTypesForMutation() { if (types == null || types == Collections.EMPTY_MAP) { - this.types = new HashMap(1); + this.types = new HashMap(2); } return this.types; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java index 6fd1731e8..e8469a23e 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import com.google.common.collect.Maps; import java.util.Collections; import java.util.HashMap; @@ -33,13 +34,13 @@ public ClosureCallEnv(Env caller, Continuation returnAddress, SourceLocation loc if (localsSize <= 0) { locals = Collections.emptyMap(); } else { - locals = new HashMap(localsSize); + locals = Maps.newHashMapWithExpectedSize(localsSize); } } public void declareVariable(Class type, String name) { if (locals == Collections.EMPTY_MAP) { - locals = new HashMap(1); + locals = new HashMap(2); } locals.put(name, null); getTypesForMutation().put(name, type); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index 52909ab3a..751a6c489 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import com.google.common.collect.Maps; import java.util.HashMap; import java.util.Map; @@ -24,7 +25,7 @@ public FunctionCallEnv(Env caller, Continuation returnAddress, SourceLocation lo public FunctionCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Object _this, int localsCount) { super(caller,returnAddress,loc, localsCount); - locals = new HashMap( (localsCount <= 0) ? 1 : localsCount+1); + locals = (localsCount <= 0) ? new HashMap(2) : Maps.newHashMapWithExpectedSize(localsCount+1); locals.put("this", _this); } From 4ab62acabf0a072fdd4fa4e26397d6ddc5a59ed3 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Thu, 21 Sep 2017 17:34:37 -0400 Subject: [PATCH 480/932] And of course the TryBlockEnv as well --- .../main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java index b905a336b..60cadc86f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java @@ -17,7 +17,7 @@ */ // TODO: should be package local once all the impls move into this class public class TryBlockEnv extends ProxyEnv { - private final Map handlers = new LinkedHashMap(1); + private final Map handlers = new LinkedHashMap(2); @Nullable private final Block finally_; From 5b6d6f8e2c87115529a15b32eb62e5046858db15 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Fri, 22 Sep 2017 09:47:19 -0400 Subject: [PATCH 481/932] Make @jglick happier about comments and protect against hypothetical wacky Collections.emptyMap() implementations --- .../com/cloudbees/groovy/cps/impl/BlockScopeEnv.java | 10 +++++++--- .../java/com/cloudbees/groovy/cps/impl/CallEnv.java | 4 +++- .../com/cloudbees/groovy/cps/impl/ClosureCallEnv.java | 3 ++- .../com/cloudbees/groovy/cps/impl/FunctionCallEnv.java | 3 ++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java index d71b47613..2961695cf 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java @@ -14,7 +14,10 @@ */ // TODO: should be package local once all the impls move into this class public class BlockScopeEnv extends ProxyEnv { + /** To conserve memory, lazily declared using {@link Collections#EMPTY_MAP} until we declare variables, then converted to a (small) {@link HashMap} */ private Map locals; + + /** To conserve memory, lazily declared using {@link Collections#EMPTY_MAP} until we declare variables, then converted to a (small) {@link HashMap} */ private Map types; public BlockScopeEnv(Env parent) { @@ -24,8 +27,9 @@ public BlockScopeEnv(Env parent) { public BlockScopeEnv(Env parent, int localsSize) { super(parent); if (localsSize <= 0) { - locals = Collections.emptyMap(); - types = Collections.emptyMap(); + // Lazily declare using EMPTY_MAP to conserve memory until we actually declare some variables + locals = Collections.EMPTY_MAP; + types = Collections.EMPTY_MAP; } else { locals = Maps.newHashMapWithExpectedSize(localsSize); types = Maps.newHashMapWithExpectedSize(localsSize); @@ -54,7 +58,7 @@ public Object getLocalVariable(String name) { /** Because might deserialize old version of class with null value for field */ private Map getTypes() { if (types == null) { - this.types = Collections.emptyMap(); + this.types = Collections.EMPTY_MAP; } return this.types; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index d47e3919a..3bbaa9841 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -19,6 +19,8 @@ */ /*package*/ abstract class CallEnv implements Env { private final Continuation returnAddress; + + /** To conserve memory, lazily declared using {@link Collections#EMPTY_MAP} until we declare variables, then converted to a (small) {@link HashMap} */ private Map types; /** @@ -60,7 +62,7 @@ public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc, int l /** Because might deserialize old version of class with null value for field */ protected Map getTypes() { if (types == null) { - this.types = Collections.emptyMap(); + this.types = Collections.EMPTY_MAP; } return this.types; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java index e8469a23e..2361aa8a5 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java @@ -14,6 +14,7 @@ * @author Kohsuke Kawaguchi */ class ClosureCallEnv extends CallEnv { + /** Lazily declared using {@link Collections#EMPTY_MAP} until we declare variables, then converted to a (small) {@link HashMap} *//** To conserve memory, lazily declared using {@link Collections#EMPTY_MAP} until we declare variables, then converted to a (small) {@link HashMap} */ Map locals; final CpsClosure closure; @@ -32,7 +33,7 @@ public ClosureCallEnv(Env caller, Continuation returnAddress, SourceLocation loc this.closure = closure; this.captured = captured; if (localsSize <= 0) { - locals = Collections.emptyMap(); + locals = Collections.EMPTY_MAP; } else { locals = Maps.newHashMapWithExpectedSize(localsSize); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index 751a6c489..435352f86 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -4,6 +4,7 @@ import com.cloudbees.groovy.cps.Env; import com.google.common.collect.Maps; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -12,7 +13,7 @@ */ // TODO: should be package local once all the impls move into this class public class FunctionCallEnv extends CallEnv { - // TODO: delegate? + /** To conserve memory, lazily declared using {@link Collections#EMPTY_MAP} until we declare variables, then converted to a (small) {@link HashMap} */ Map locals; /** From 750463724fa2d9ec6bceb8ffdd773516995e7a70 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 22 Sep 2017 16:33:06 -0400 Subject: [PATCH 482/932] [FIXED JENKINS-47071] Replace BooleanClosureWrapper with serializable BooleanClosureWrapper isn't serializable, so attempts to serialize it (i.e., saveProgram) result in errors. This replaces BooleanClosureWrapper with CpsBooleanClosureWrapper, which *is* serializable. --- .../cloudbees/groovy/cps/tool/Translator.java | 18 +++++++- .../cps/impl/CpsBooleanClosureWrapper.java | 43 +++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsBooleanClosureWrapper.java diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 28b63d52f..902ac6fef 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -413,7 +413,7 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { public JExpression visitVariable(VariableTree vt, Void __) { return $b.invoke("declareVariable") .arg(loc(vt)) - .arg(erasure(vt).dotclass()) + .arg(cpsTypeTranslation(erasure(vt))) .arg(n(vt)) .arg(visit(vt.getInitializer())); } @@ -490,7 +490,7 @@ public JExpression visitNewClass(NewClassTree nt, Void __) { return $b.invoke("new_").tap(inv -> { inv.arg(loc(nt)); - inv.arg(t(((JCTree) nt).type).dotclass()); + inv.arg(cpsTypeTranslation(t(((JCTree) nt).type))); nt.getArguments().forEach( et -> inv.arg(visit(et)) ); }); } @@ -845,6 +845,20 @@ private JType primitive(Object src, TypeKind k) { throw new UnsupportedOperationException(src.toString()); } + /** + * Replaces non-serializable types with CPS-specific variants. + * + * @param original a {@link JType} to inspect + * @return The {@link JType#dotclass()} for either the original {@link JType} or for the CPS equivalent. + */ + private JExpression cpsTypeTranslation(JType original) { + if (original.fullName().equals("org.codehaus.groovy.runtime.callsite.BooleanClosureWrapper")) { + return codeModel.ref("com.cloudbees.groovy.cps.impl.CpsBooleanClosureWrapper").dotclass(); + } else { + return original.dotclass(); + } + } + /** * Generate transalted result into source files. */ diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsBooleanClosureWrapper.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsBooleanClosureWrapper.java new file mode 100644 index 000000000..02710509c --- /dev/null +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsBooleanClosureWrapper.java @@ -0,0 +1,43 @@ +package com.cloudbees.groovy.cps.impl; + +import groovy.lang.Closure; +import org.codehaus.groovy.runtime.callsite.BooleanReturningMethodInvoker; + +import java.io.Serializable; +import java.util.Map; + +/** + * A serializable equivalent of {@link org.codehaus.groovy.runtime.callsite.BooleanClosureWrapper}, where the + * {@link BooleanReturningMethodInvoker} is instantiated when {@link #call(Object...)} is called to avoid serialization + * issues with that as well. + */ +public class CpsBooleanClosureWrapper implements Serializable { + private final Closure wrapped; + private final int numberOfArguments; + + public CpsBooleanClosureWrapper(Closure wrapped) { + this.wrapped = wrapped; + numberOfArguments = wrapped.getMaximumNumberOfParameters(); + } + + /** + * normal closure call + */ + public boolean call(Object... args) { + BooleanReturningMethodInvoker bmi = new BooleanReturningMethodInvoker("call"); + return bmi.invoke(wrapped, args); + } + + /** + * Bridge for a call based on a map entry. If the call is done on a {@link Closure} + * taking one argument, then we give in the {@link Map.Entry}, otherwise we will + * give in the key and value. + */ + public boolean callForMap(Map.Entry entry) { + if (numberOfArguments==2) { + return call(entry.getKey(), entry.getValue()); + } else { + return call(entry); + } + } +} From d83c8092e016bbb9a8a21d406e51c3203dd9011f Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 22 Sep 2017 16:48:29 -0400 Subject: [PATCH 483/932] Just delegate to a freshly created BooleanClosureWrapper --- .../groovy/cps/impl/CpsBooleanClosureWrapper.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsBooleanClosureWrapper.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsBooleanClosureWrapper.java index 02710509c..6dcf7249b 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsBooleanClosureWrapper.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsBooleanClosureWrapper.java @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps.impl; import groovy.lang.Closure; +import org.codehaus.groovy.runtime.callsite.BooleanClosureWrapper; import org.codehaus.groovy.runtime.callsite.BooleanReturningMethodInvoker; import java.io.Serializable; @@ -13,19 +14,16 @@ */ public class CpsBooleanClosureWrapper implements Serializable { private final Closure wrapped; - private final int numberOfArguments; public CpsBooleanClosureWrapper(Closure wrapped) { this.wrapped = wrapped; - numberOfArguments = wrapped.getMaximumNumberOfParameters(); } /** * normal closure call */ public boolean call(Object... args) { - BooleanReturningMethodInvoker bmi = new BooleanReturningMethodInvoker("call"); - return bmi.invoke(wrapped, args); + return new BooleanClosureWrapper(wrapped).call(args); } /** @@ -34,10 +32,6 @@ public boolean call(Object... args) { * give in the key and value. */ public boolean callForMap(Map.Entry entry) { - if (numberOfArguments==2) { - return call(entry.getKey(), entry.getValue()); - } else { - return call(entry); - } + return new BooleanClosureWrapper(wrapped).callForMap(entry); } } From cd717903c6382a125575cf99d15e9d8415344e6e Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 25 Sep 2017 10:34:41 -0400 Subject: [PATCH 484/932] [maven-release-plugin] prepare release groovy-cps-parent-1.20 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 14a2fc33b..deb9cae21 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.20-SNAPSHOT + 1.20 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 2b4f85db3..3d0773096 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.20-SNAPSHOT + 1.20 groovy-cps diff --git a/pom.xml b/pom.xml index 1225e1621..0608fba65 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.20-SNAPSHOT + 1.20 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.20 From 241edce7c880da3d0306994b6086a82c5c9808c2 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 25 Sep 2017 10:34:45 -0400 Subject: [PATCH 485/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index deb9cae21..ef32a7880 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.20 + 1.21-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 3d0773096..e572eb19c 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.20 + 1.21-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 0608fba65..2cb4acaa2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.20 + 1.21-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.20 + HEAD From f2d5b95d2369272dec0757d46c2b293e82206e32 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Sat, 7 Oct 2017 13:47:27 -0400 Subject: [PATCH 486/932] Correctly size some wastefully sized arraylists noted in heap dumps --- .../cloudbees/groovy/cps/CpsTransformer.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index a3dfa4189..14b24e6cc 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -239,8 +240,9 @@ CpsFunction ___cps___N() { new StaticMethodCallExpression(m.getDeclaringClass(), cpsName, new TupleExpression())); // new ConstructorCallExpression(FUNCTION_TYPE, new TupleExpression(params, body))); - List paramExpressions = new ArrayList<>(); - for (Parameter p : m.getParameters()) { + Parameter[] pms = m.getParameters(); + List paramExpressions = new ArrayList<>(pms.length); + for (Parameter p : pms) { paramExpressions.add(new VariableExpression(p)); } ArrayExpression paramArray = new ArrayExpression(ClassHelper.OBJECT_TYPE, paramExpressions); @@ -871,21 +873,28 @@ public void visitClosureExpression(final ClosureExpression exp) { public void run() { loc(exp); - ListExpression types = new ListExpression(); - ListExpression params = new ListExpression(); + ListExpression types; + ListExpression params; // the interpretation of the 'parameters' is messed up. According to ClosureWriter, // when the user explicitly defines no parameter "{ -> foo() }" then this is null, // when the user doesn't define any parameter explicitly { foo() }, then this is empty, if (exp.getParameters() == null) { + types = new ListExpression(Collections.EMPTY_LIST); + params = new ListExpression(Collections.EMPTY_LIST); } else if (exp.getParameters().length == 0) { - types.addExpression(new ClassExpression(OBJECT_TYPE)); - params.addExpression(new ConstantExpression("it")); + types = new ListExpression(Collections.singletonList(new ClassExpression(OBJECT_TYPE))); + params = new ListExpression(Collections.singletonList(new ConstantExpression("it"))); } else { - for (Parameter p : exp.getParameters()) { - types.addExpression(new ClassExpression(p.getType())); - params.addExpression(new ConstantExpression(p.getName())); + Parameter[] paramArray = exp.getParameters(); + List typesList = new ArrayList(paramArray.length); + List paramsList = new ArrayList(paramArray.length); + for (Parameter p : paramArray) { + typesList.add(new ClassExpression(p.getType())); + paramsList.add(new ConstantExpression(p.getName())); } + types = new ListExpression(typesList); + params = new ListExpression(paramsList); } parent.call(types); parent.call(params); From e1454a3f1d901fca4a1e335ece1fe2b3ef2c5443 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Sat, 7 Oct 2017 20:17:03 -0400 Subject: [PATCH 487/932] MethodLocation implements equals and hashCode --- .../cloudbees/groovy/cps/MethodLocation.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java index 028982ef9..e6d4b8188 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps; import java.io.Serializable; +import java.util.Objects; /** * Triplet of source file / declaring class / method name. @@ -47,4 +48,23 @@ public StackTraceElement toStackTrace(int lineNumber) { public static final MethodLocation UNKNOWN = new MethodLocation("Unknown", "Unknown", "Unknown"); private static final long serialVersionUID = 1L; + + @Override + public int hashCode() { + return Objects.hash(declaringClass, methodName, fileName); + } + + @Override + public boolean equals(Object o){ + if (o == this) { + return true; + } else if (!(o instanceof MethodLocation)) { + return false; + } else { + MethodLocation ob = (MethodLocation)o; + return this.methodName.equals(ob.methodName) + && this.fileName.equals(ob.fileName) + && this.declaringClass.equals(ob.declaringClass); + } + } } From 7e8f5305387de66285fee6d55d86d9c6a7f892d3 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Mon, 9 Oct 2017 10:39:49 -0400 Subject: [PATCH 488/932] Track depth of nested blocks and throw StackOverflowError when they exceed an arbitrary threshold --- .../cloudbees/groovy/cps/DepthTrackingEnv.java | 12 ++++++++++++ .../com/cloudbees/groovy/cps/impl/CallEnv.java | 14 +++++++++++++- .../com/cloudbees/groovy/cps/impl/ProxyEnv.java | 15 ++++++++++++++- .../groovy/cps/impl/FunctionCallBlockTest.groovy | 15 +++++++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java new file mode 100644 index 000000000..276046318 --- /dev/null +++ b/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java @@ -0,0 +1,12 @@ +package com.cloudbees.groovy.cps; + +/** + * @author Sam Van Oort + */ +public interface DepthTrackingEnv extends Env { + + /** Limit on how deeply environments can recurse */ + int MAX_LEGAL_DEPTH = 2000; + + public int getDepth(); +} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 3bbaa9841..4939d9751 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.DepthTrackingEnv; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; import com.cloudbees.groovy.cps.sandbox.Invoker; @@ -17,7 +18,7 @@ * * @author Kohsuke Kawaguchi */ -/*package*/ abstract class CallEnv implements Env { +/*package*/ abstract class CallEnv implements DepthTrackingEnv { private final Continuation returnAddress; /** To conserve memory, lazily declared using {@link Collections#EMPTY_MAP} until we declare variables, then converted to a (small) {@link HashMap} */ @@ -38,6 +39,8 @@ private Invoker invoker; + int depth; + /** * @param caller * The environment of the call site. Can be null but only if the caller is outside CPS execution. @@ -57,6 +60,11 @@ public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc, int l } else { types = Maps.newHashMapWithExpectedSize(localsCount); } + depth = (caller instanceof DepthTrackingEnv) ? depth = ((DepthTrackingEnv) caller).getDepth() + 1 : 1; + + if (depth > DepthTrackingEnv.MAX_LEGAL_DEPTH) { + throw new StackOverflowError("Excessively nested blocks/function calls exceed limit of"+DepthTrackingEnv.MAX_LEGAL_DEPTH+":"+depth); + } } /** Because might deserialize old version of class with null value for field */ @@ -125,4 +133,8 @@ public void buildStackTraceElements(List stack, int depth) { } private static final long serialVersionUID = 1L; + + public int getDepth() { + return depth; + } } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java index 0b72c9e6d..39902c185 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps.impl; import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.DepthTrackingEnv; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.sandbox.Invoker; @@ -13,11 +14,18 @@ * * @author Kohsuke Kawaguchi */ -public class ProxyEnv implements Env { +public class ProxyEnv implements DepthTrackingEnv { protected final Env parent; + int depth = 0; + public ProxyEnv(Env parent) { this.parent = parent; + depth = (parent instanceof DepthTrackingEnv) ? ((DepthTrackingEnv) parent).getDepth() + 1 : 1; + + if (depth > DepthTrackingEnv.MAX_LEGAL_DEPTH) { + throw new StackOverflowError("Excessively nested blocks/function calls exceed limit of"+DepthTrackingEnv.MAX_LEGAL_DEPTH+":"+depth); + } } public void declareVariable(Class type, String name) { @@ -65,4 +73,9 @@ public void buildStackTraceElements(List stack, int depth) { } private static final long serialVersionUID = 1L; + + @Override + public int getDepth() { + return depth; + } } diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy index 4317f2167..84cd9bce7 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy @@ -21,6 +21,21 @@ class FunctionCallBlockTest extends AbstractGroovyCpsTest { throw new NamingException(); } + @Test + void infiniteRecursion() { + try { + assert evalCPSonly(""" + def thing = null; + def getThing() { + return (thing == null) ? "bob" : thing; + } + def stuff = getThing(); + """) == "cheese"; + } catch (StackOverflowError soe) { + println "Expected exception thrown for endlessly recursive function"; + } // Test passed + } + @Test void stackTraceFixup() { List elements = evalCPSonly(""" From ff3fec0bd515c80317ee9070ad28a940ac8a3b8f Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Mon, 9 Oct 2017 10:44:52 -0400 Subject: [PATCH 489/932] Expose MethodLocation from SourceLocation --- .../java/com/cloudbees/groovy/cps/impl/SourceLocation.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java index 965976db6..5d45dc901 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java @@ -13,6 +13,10 @@ public final class SourceLocation implements Serializable { private final MethodLocation method; private final int lineNumber; + MethodLocation getMethod() { + return method; + } + public SourceLocation(MethodLocation method, int lineNumber) { this.method = method; this.lineNumber = lineNumber; From 91320edc73ec6e9041224071da3019cfc5993f8a Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Mon, 9 Oct 2017 14:47:36 -0400 Subject: [PATCH 490/932] Refine showing cases where functions exceed recursion limits and increase limit --- .../java/com/cloudbees/groovy/cps/DepthTrackingEnv.java | 2 +- .../main/java/com/cloudbees/groovy/cps/impl/CallEnv.java | 6 +++++- .../main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java index 276046318..596e72fe5 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java @@ -6,7 +6,7 @@ public interface DepthTrackingEnv extends Env { /** Limit on how deeply environments can recurse */ - int MAX_LEGAL_DEPTH = 2000; + int MAX_LEGAL_DEPTH = 4000; public int getDepth(); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 4939d9751..486349edc 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -63,7 +63,11 @@ public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc, int l depth = (caller instanceof DepthTrackingEnv) ? depth = ((DepthTrackingEnv) caller).getDepth() + 1 : 1; if (depth > DepthTrackingEnv.MAX_LEGAL_DEPTH) { - throw new StackOverflowError("Excessively nested blocks/function calls exceed limit of"+DepthTrackingEnv.MAX_LEGAL_DEPTH+":"+depth); + if (loc != null) { + throw new StackOverflowError("Excessively nested blocks/function at "+loc.toString()+" - look for unbounded recursion - call depth "+depth); + } else { + throw new StackOverflowError("Excessively nested blocks/function - look for unbounded recursion - call depth "+depth); + } } } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java index 39902c185..09d1a5728 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java @@ -22,10 +22,6 @@ public class ProxyEnv implements DepthTrackingEnv { public ProxyEnv(Env parent) { this.parent = parent; depth = (parent instanceof DepthTrackingEnv) ? ((DepthTrackingEnv) parent).getDepth() + 1 : 1; - - if (depth > DepthTrackingEnv.MAX_LEGAL_DEPTH) { - throw new StackOverflowError("Excessively nested blocks/function calls exceed limit of"+DepthTrackingEnv.MAX_LEGAL_DEPTH+":"+depth); - } } public void declareVariable(Class type, String name) { From 322e77f02a7c47b8d69610c25ce8c8221ceeccba Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Mon, 9 Oct 2017 14:48:07 -0400 Subject: [PATCH 491/932] Revert "MethodLocation implements equals and hashCode" This reverts commit e1454a3f1d901fca4a1e335ece1fe2b3ef2c5443. --- .../cloudbees/groovy/cps/MethodLocation.java | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java index e6d4b8188..028982ef9 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java @@ -1,7 +1,6 @@ package com.cloudbees.groovy.cps; import java.io.Serializable; -import java.util.Objects; /** * Triplet of source file / declaring class / method name. @@ -48,23 +47,4 @@ public StackTraceElement toStackTrace(int lineNumber) { public static final MethodLocation UNKNOWN = new MethodLocation("Unknown", "Unknown", "Unknown"); private static final long serialVersionUID = 1L; - - @Override - public int hashCode() { - return Objects.hash(declaringClass, methodName, fileName); - } - - @Override - public boolean equals(Object o){ - if (o == this) { - return true; - } else if (!(o instanceof MethodLocation)) { - return false; - } else { - MethodLocation ob = (MethodLocation)o; - return this.methodName.equals(ob.methodName) - && this.fileName.equals(ob.fileName) - && this.declaringClass.equals(ob.declaringClass); - } - } } From d17610da46a6ca1b71217bbc740ee705b0a6c8b0 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Mon, 9 Oct 2017 14:50:29 -0400 Subject: [PATCH 492/932] Pull out unnecessary changes --- .../java/com/cloudbees/groovy/cps/impl/SourceLocation.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java index 5d45dc901..965976db6 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SourceLocation.java @@ -13,10 +13,6 @@ public final class SourceLocation implements Serializable { private final MethodLocation method; private final int lineNumber; - MethodLocation getMethod() { - return method; - } - public SourceLocation(MethodLocation method, int lineNumber) { this.method = method; this.lineNumber = lineNumber; From a72bef918ddbf6658cf2571fdd984d9075984104 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Mon, 9 Oct 2017 15:03:00 -0400 Subject: [PATCH 493/932] Only limit recursion depth for closures/functions and test this with more steps --- .../com/cloudbees/groovy/cps/DepthTrackingEnv.java | 2 +- .../com/cloudbees/groovy/cps/impl/CallEnv.java | 4 ++-- .../com/cloudbees/groovy/cps/impl/ProxyEnv.java | 2 +- .../groovy/cps/impl/FunctionCallBlockTest.groovy | 14 +++++++++++--- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java index 596e72fe5..119d63575 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java @@ -6,7 +6,7 @@ public interface DepthTrackingEnv extends Env { /** Limit on how deeply environments can recurse */ - int MAX_LEGAL_DEPTH = 4000; + int MAX_LEGAL_DEPTH = 3000; public int getDepth(); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 486349edc..f729e5eb4 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -64,9 +64,9 @@ public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc, int l if (depth > DepthTrackingEnv.MAX_LEGAL_DEPTH) { if (loc != null) { - throw new StackOverflowError("Excessively nested blocks/function at "+loc.toString()+" - look for unbounded recursion - call depth "+depth); + throw new StackOverflowError("Excessively nested closures/functions at "+loc.toString()+" - look for unbounded recursion - call depth: "+depth); } else { - throw new StackOverflowError("Excessively nested blocks/function - look for unbounded recursion - call depth "+depth); + throw new StackOverflowError("Excessively nested blocks/function - look for unbounded recursion - call depth: "+depth); } } } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java index 09d1a5728..46c4c4291 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ProxyEnv.java @@ -21,7 +21,7 @@ public class ProxyEnv implements DepthTrackingEnv { public ProxyEnv(Env parent) { this.parent = parent; - depth = (parent instanceof DepthTrackingEnv) ? ((DepthTrackingEnv) parent).getDepth() + 1 : 1; + depth = (parent instanceof DepthTrackingEnv) ? ((DepthTrackingEnv) parent).getDepth(): 0; } public void declareVariable(Class type, String name) { diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy index 84cd9bce7..c29ee28b7 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps.impl import com.cloudbees.groovy.cps.AbstractGroovyCpsTest +import com.cloudbees.groovy.cps.Continuation import org.junit.Test import javax.naming.NamingException @@ -21,18 +22,25 @@ class FunctionCallBlockTest extends AbstractGroovyCpsTest { throw new NamingException(); } + /** Need to run more steps so we can hit the recursion limit */ + Object evalCPSonly(String script, int numSteps) { + return parseCps(script).invoke(null, null, Continuation.HALT).run(numSteps).replay() + } + @Test void infiniteRecursion() { try { assert evalCPSonly(""" def thing = null; def getThing() { - return (thing == null) ? "bob" : thing; + return thing == null; } def stuff = getThing(); - """) == "cheese"; + """, 25000) == "cheese"; } catch (StackOverflowError soe) { - println "Expected exception thrown for endlessly recursive function"; + println "PASSED: expected exception thrown for endlessly recursive function, see trace below"; + soe.printStackTrace() + } // Test passed } From 5c1998958e45021141423957f30209158638940e Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Mon, 9 Oct 2017 15:53:24 -0400 Subject: [PATCH 494/932] Fix some review nits --- .../com/cloudbees/groovy/cps/DepthTrackingEnv.java | 6 ++++-- .../java/com/cloudbees/groovy/cps/impl/CallEnv.java | 6 +++--- .../groovy/cps/impl/FunctionCallBlockTest.groovy | 12 +++--------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java index 119d63575..effcd52ac 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java @@ -5,8 +5,10 @@ */ public interface DepthTrackingEnv extends Env { - /** Limit on how deeply environments can recurse */ - int MAX_LEGAL_DEPTH = 3000; + /** Limit on how deeply environments can recurse. + * Capped somewhat low to try to limit the ability to run a program that will generate a StackOverflowError when serialized. */ + int MAX_LEGAL_DEPTH = 1024; + /** Return how deep this environment is within nested closure/function calls. */ public int getDepth(); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index f729e5eb4..1e05742fb 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -60,13 +60,13 @@ public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc, int l } else { types = Maps.newHashMapWithExpectedSize(localsCount); } - depth = (caller instanceof DepthTrackingEnv) ? depth = ((DepthTrackingEnv) caller).getDepth() + 1 : 1; + depth = (caller instanceof DepthTrackingEnv) ? ((DepthTrackingEnv) caller).getDepth() + 1 : 1; if (depth > DepthTrackingEnv.MAX_LEGAL_DEPTH) { if (loc != null) { - throw new StackOverflowError("Excessively nested closures/functions at "+loc.toString()+" - look for unbounded recursion - call depth: "+depth); + throw new StackOverflowError("Excessively nested closures/functions at "+loc+" - look for unbounded recursion - call depth: "+depth); } else { - throw new StackOverflowError("Excessively nested blocks/function - look for unbounded recursion - call depth: "+depth); + throw new StackOverflowError("Excessively nested closures/functions - look for unbounded recursion - call depth: "+depth); } } } diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy index c29ee28b7..cd5783512 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy @@ -22,11 +22,6 @@ class FunctionCallBlockTest extends AbstractGroovyCpsTest { throw new NamingException(); } - /** Need to run more steps so we can hit the recursion limit */ - Object evalCPSonly(String script, int numSteps) { - return parseCps(script).invoke(null, null, Continuation.HALT).run(numSteps).replay() - } - @Test void infiniteRecursion() { try { @@ -36,12 +31,11 @@ class FunctionCallBlockTest extends AbstractGroovyCpsTest { return thing == null; } def stuff = getThing(); - """, 25000) == "cheese"; + """) == "cheese"; // Fails if we don't throw an exception, also fails if we run more than 10k steps. } catch (StackOverflowError soe) { println "PASSED: expected exception thrown for endlessly recursive function, see trace below"; - soe.printStackTrace() - - } // Test passed + soe.printStackTrace(); + } } @Test From 782f8891a076981b58ce0a84037a8edde38a9d9b Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Wed, 11 Oct 2017 16:09:44 -0400 Subject: [PATCH 495/932] Custom POM versions for workflow-cps to take up --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index ef32a7880..186b150a5 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.21-SNAPSHOT + 1.21-stop-recursion-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index e572eb19c..88e4a4c3d 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.21-SNAPSHOT + 1.21-stop-recursion-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 2cb4acaa2..7308eb0af 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.21-SNAPSHOT + 1.21-stop-recursion-SNAPSHOT pom Groovy CPS Execution Parent From fea79e79fa1a49dbbca0f6bd481cafd679699bed Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Wed, 18 Oct 2017 16:43:52 -0400 Subject: [PATCH 496/932] More cleanly pass error from excessive stack depth in CPS code so pipeline fails more cleanly --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- .../com/cloudbees/groovy/cps/impl/CallEnv.java | 10 +--------- .../cloudbees/groovy/cps/impl/CpsClosureDef.java | 14 ++++++++++++++ .../com/cloudbees/groovy/cps/impl/CpsFunction.java | 14 ++++++++++++++ pom.xml | 3 ++- 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 186b150a5..f55ecd6ed 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.21-stop-recursion-SNAPSHOT + 1.21-stop-recursion2-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 88e4a4c3d..e0d048bb0 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.21-stop-recursion-SNAPSHOT + 1.21-stop-recursion2-SNAPSHOT groovy-cps diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 1e05742fb..ff2423e8f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -60,15 +60,7 @@ public CallEnv(Env caller, Continuation returnAddress, SourceLocation loc, int l } else { types = Maps.newHashMapWithExpectedSize(localsCount); } - depth = (caller instanceof DepthTrackingEnv) ? ((DepthTrackingEnv) caller).getDepth() + 1 : 1; - - if (depth > DepthTrackingEnv.MAX_LEGAL_DEPTH) { - if (loc != null) { - throw new StackOverflowError("Excessively nested closures/functions at "+loc+" - look for unbounded recursion - call depth: "+depth); - } else { - throw new StackOverflowError("Excessively nested closures/functions - look for unbounded recursion - call depth: "+depth); - } - } + depth = (caller instanceof DepthTrackingEnv) ? ((DepthTrackingEnv) caller).getDepth() + 1 : 1; } /** Because might deserialize old version of class with null value for field */ diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java index d31ea07ae..0271759f4 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.DepthTrackingEnv; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; @@ -34,6 +35,19 @@ Next invoke(Env caller, SourceLocation loc, Object receiver, List args, Conti // TODO: who handles 'it' ? + // 'e' will be a DepthTrackingEnv for all pipelines begun with this version of the library + // but if we upgrade groovy-cps and resume older pipelines, they won't be. + if (e instanceof DepthTrackingEnv && ((DepthTrackingEnv)e).getDepth() > DepthTrackingEnv.MAX_LEGAL_DEPTH) { + StackOverflowError err; + int depth = ((DepthTrackingEnv) e).getDepth(); + if (loc != null) { + err = new StackOverflowError("Excessively nested closures/functions at "+loc+" - look for unbounded recursion - call depth: "+depth); + } else { + err = new StackOverflowError("Excessively nested closures/functions - look for unbounded recursion - call depth: "+depth); + } + return e.getExceptionHandler(StackOverflowError.class).receive(err); + } + return new Next(body, e, k); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java index 6b3c420f7..3420ff30a 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.DepthTrackingEnv; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; @@ -20,6 +21,19 @@ public CpsFunction(List parameters, Block body) { public Next invoke(Env caller, SourceLocation loc, Object receiver, List args, Continuation k) { Env e = new FunctionCallEnv(caller, k, loc, receiver, args.size()); assignArguments(args,e); + + // 'e' will be a DepthTrackingEnv for all pipelines begun with this version of the library + // but if we upgrade groovy-cps and resume older pipelines, they won't be. + if (e instanceof DepthTrackingEnv && ((DepthTrackingEnv)e).getDepth() > DepthTrackingEnv.MAX_LEGAL_DEPTH) { + StackOverflowError err; + int depth = ((DepthTrackingEnv) e).getDepth(); + if (loc != null) { + err = new StackOverflowError("Excessively nested closures/functions at "+loc+" - look for unbounded recursion - call depth: "+depth); + } else { + err = new StackOverflowError("Excessively nested closures/functions - look for unbounded recursion - call depth: "+depth); + } + return e.getExceptionHandler(StackOverflowError.class).receive(err); + } return new Next(body, e, k); } diff --git a/pom.xml b/pom.xml index 7308eb0af..05c0a56ce 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,8 @@ groovy-cps-parent - 1.21-stop-recursion-SNAPSHOT + + 1.21-stop-recursion2-SNAPSHOT pom Groovy CPS Execution Parent From 136ab41eb266b8b2e1e76f2674ba9882e50e28e5 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Wed, 18 Oct 2017 17:55:44 -0400 Subject: [PATCH 497/932] Heh, no need to code against something that cannot happen --- .../com/cloudbees/groovy/cps/impl/CpsClosureDef.java | 11 ++++------- .../com/cloudbees/groovy/cps/impl/CpsFunction.java | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java index 0271759f4..c202e01c6 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosureDef.java @@ -29,21 +29,18 @@ class CpsClosureDef extends CpsCallable { @Override Next invoke(Env caller, SourceLocation loc, Object receiver, List args, Continuation k) { - Env e = new ClosureCallEnv(caller, k, loc, capture, self, args.size()); + ClosureCallEnv e = new ClosureCallEnv(caller, k, loc, capture, self, args.size()); assignArguments(args, e); // TODO: who handles 'it' ? - // 'e' will be a DepthTrackingEnv for all pipelines begun with this version of the library - // but if we upgrade groovy-cps and resume older pipelines, they won't be. - if (e instanceof DepthTrackingEnv && ((DepthTrackingEnv)e).getDepth() > DepthTrackingEnv.MAX_LEGAL_DEPTH) { + if (e.getDepth() > DepthTrackingEnv.MAX_LEGAL_DEPTH) { StackOverflowError err; - int depth = ((DepthTrackingEnv) e).getDepth(); if (loc != null) { - err = new StackOverflowError("Excessively nested closures/functions at "+loc+" - look for unbounded recursion - call depth: "+depth); + err = new StackOverflowError("Excessively nested closures/functions at "+loc+" - look for unbounded recursion - call depth: "+e.getDepth()); } else { - err = new StackOverflowError("Excessively nested closures/functions - look for unbounded recursion - call depth: "+depth); + err = new StackOverflowError("Excessively nested closures/functions - look for unbounded recursion - call depth: "+e.getDepth()); } return e.getExceptionHandler(StackOverflowError.class).receive(err); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java index 3420ff30a..e68abf018 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsFunction.java @@ -19,18 +19,15 @@ public CpsFunction(List parameters, Block body) { } public Next invoke(Env caller, SourceLocation loc, Object receiver, List args, Continuation k) { - Env e = new FunctionCallEnv(caller, k, loc, receiver, args.size()); + FunctionCallEnv e = new FunctionCallEnv(caller, k, loc, receiver, args.size()); assignArguments(args,e); - // 'e' will be a DepthTrackingEnv for all pipelines begun with this version of the library - // but if we upgrade groovy-cps and resume older pipelines, they won't be. - if (e instanceof DepthTrackingEnv && ((DepthTrackingEnv)e).getDepth() > DepthTrackingEnv.MAX_LEGAL_DEPTH) { + if (e.getDepth() > DepthTrackingEnv.MAX_LEGAL_DEPTH) { StackOverflowError err; - int depth = ((DepthTrackingEnv) e).getDepth(); if (loc != null) { - err = new StackOverflowError("Excessively nested closures/functions at "+loc+" - look for unbounded recursion - call depth: "+depth); + err = new StackOverflowError("Excessively nested closures/functions at "+loc+" - look for unbounded recursion - call depth: "+e.getDepth()); } else { - err = new StackOverflowError("Excessively nested closures/functions - look for unbounded recursion - call depth: "+depth); + err = new StackOverflowError("Excessively nested closures/functions - look for unbounded recursion - call depth: "+e.getDepth()); } return e.getExceptionHandler(StackOverflowError.class).receive(err); } From e4c80da01931915c93725f6dd6a5de26a815d4b1 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Wed, 18 Oct 2017 17:58:38 -0400 Subject: [PATCH 498/932] Revert custom versions of POMs for merge --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index f55ecd6ed..ef32a7880 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.21-stop-recursion2-SNAPSHOT + 1.21-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index e0d048bb0..e572eb19c 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.21-stop-recursion2-SNAPSHOT + 1.21-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 05c0a56ce..2cb4acaa2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,7 @@ groovy-cps-parent - - 1.21-stop-recursion2-SNAPSHOT + 1.21-SNAPSHOT pom Groovy CPS Execution Parent From 655a0a252b0a4b05a0029d816e51914c7936b380 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 20 Oct 2017 11:51:54 +0200 Subject: [PATCH 499/932] [JENKINS-47363] Meaningful errors for oversized map/list expressions This is probably better than #78 - that works around the problem, but in a fairly hackish way, while this instead accepts the limitation and gives a meaningful error message when a list expression is >250 elements or a map expression is >125 entries. --- .../cloudbees/groovy/cps/CpsTransformer.java | 38 ++++++++++++------- .../groovy/cps/CpsTransformerTest.groovy | 34 ++++++++++++++++- 2 files changed, 57 insertions(+), 15 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index a3dfa4189..5a32ba6a8 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -901,15 +901,20 @@ public void visitTupleExpression(TupleExpression expression) { @Override public void visitMapExpression(final MapExpression exp) { - makeNode("map", new Runnable() { - @Override - public void run() { - for (MapEntryExpression e : exp.getMapEntryExpressions()) { - visit(e.getKeyExpression()); - visit(e.getValueExpression()); + if (exp.getMapEntryExpressions().size() > 125) { + sourceUnit.addError(new SyntaxException("Map expressions can only contain up to 125 entries", + exp.getLineNumber(), exp.getColumnNumber())); + } else { + makeNode("map", new Runnable() { + @Override + public void run() { + for (MapEntryExpression e : exp.getMapEntryExpressions()) { + visit(e.getKeyExpression()); + visit(e.getValueExpression()); + } } - } - }); + }); + } } @Override @@ -919,12 +924,17 @@ public void visitMapEntryExpression(MapEntryExpression expression) { @Override public void visitListExpression(final ListExpression exp) { - makeNode("list", new Runnable() { - @Override - public void run() { - visit(exp.getExpressions()); - } - }); + if (exp.getExpressions().size() > 250) { + sourceUnit.addError(new SyntaxException("List expressions can only contain up to 250 elements", + exp.getLineNumber(), exp.getColumnNumber())); + } else { + makeNode("list", new Runnable() { + @Override + public void run() { + visit(exp.getExpressions()); + } + }); + } } @Override diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 8b4b366c8..a243d04c7 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -2,6 +2,7 @@ package com.cloudbees.groovy.cps import com.cloudbees.groovy.cps.impl.CpsCallableInvocation import groovy.transform.NotYetImplemented +import org.codehaus.groovy.control.MultipleCompilationErrorsException import org.junit.Test import org.jvnet.hudson.test.Issue @@ -877,4 +878,35 @@ def (c, d) = ['fourth'] return [a, b, c, d].join(' ') ''') == "first second fourth null" } -} + + @Issue("JENKINS-47363") + @Test + void excessiveListElements() { + def l = 0..250 + def s = l.join(",\n") + try { + assert evalCPS(""" +def b = [${s}] +return b.size() +""") == 251 + } catch (Exception e) { + assert e instanceof MultipleCompilationErrorsException + assert e.message.contains('List expressions can only contain up to 250 elements') + } + } + + @Issue("JENKINS-47363") + @Test + void excessiveMapElements() { + def l = 0..250 + def s = l.collect { "${it}:${it}" }.join(",\n") + try { + assert evalCPS(""" +def b = [${s}] +return b.size() +""") == 251 + } catch (Exception e) { + assert e instanceof MultipleCompilationErrorsException + assert e.message.contains('Map expressions can only contain up to 125 entries') + } + }} From 4264cfce818af473809c7a7add23b931861b0636 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 1 Nov 2017 12:48:13 -0400 Subject: [PATCH 500/932] Test updates --- .../groovy/cps/CpsTransformerTest.groovy | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index a243d04c7..3de15c6cc 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -882,11 +882,18 @@ return [a, b, c, d].join(' ') @Issue("JENKINS-47363") @Test void excessiveListElements() { - def l = 0..250 - def s = l.join(",\n") + def l1 = 0..249 + def s1 = l1.join(",\n") + assert evalCPS(""" +def b = [${s1}] +return b.size() +""") == 250 + + def l2 = 0..250 + def s2 = l2.join(",\n") try { assert evalCPS(""" -def b = [${s}] +def b = [${s2}] return b.size() """) == 251 } catch (Exception e) { @@ -898,15 +905,22 @@ return b.size() @Issue("JENKINS-47363") @Test void excessiveMapElements() { - def l = 0..250 - def s = l.collect { "${it}:${it}" }.join(",\n") + def l1 = 0..124 + def s1 = l1.collect { "${it}:${it}" }.join(",\n") + assert evalCPS(""" +def b = [${s1}] +return b.size() +""") == 125 + def l2 = 0..125 + def s2 = l2.collect { "${it}:${it}" }.join(",\n") try { assert evalCPS(""" -def b = [${s}] +def b = [${s2}] return b.size() -""") == 251 +""") == 126 } catch (Exception e) { assert e instanceof MultipleCompilationErrorsException assert e.message.contains('Map expressions can only contain up to 125 entries') } - }} + } +} From 46db19d42f699cf02f60afcd6ecde42681c6a1c3 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 29 Nov 2017 17:37:26 -0500 Subject: [PATCH 501/932] [maven-release-plugin] prepare release groovy-cps-parent-1.21 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index ef32a7880..f9eeae3e5 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.21-SNAPSHOT + 1.21 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index e572eb19c..9a0658bb3 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.21-SNAPSHOT + 1.21 groovy-cps diff --git a/pom.xml b/pom.xml index 2cb4acaa2..d6e6ef4b7 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.21-SNAPSHOT + 1.21 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.21 From 4337f7f9a520f9d6a3dcb00cafc942f3ca243e23 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 29 Nov 2017 17:37:31 -0500 Subject: [PATCH 502/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index f9eeae3e5..f21b358de 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.21 + 1.22-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 9a0658bb3..328d41e9b 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.21 + 1.22-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index d6e6ef4b7..f3601646b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.21 + 1.22-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.21 + HEAD From 106d861e2085b09c6229c689fdcb1f2a26ea4959 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 29 Jan 2018 20:11:27 -0500 Subject: [PATCH 503/932] Do not run the sandbox transformer on field initializers created by the CPS transformer. private static final CpsFunction __cps__123 = __cps__123(); // ^^^^^^^^^^^^ --- .../cloudbees/groovy/cps/CpsTransformer.java | 6 ++--- .../cps/sandbox/SandboxInvokerTest.groovy | 25 ------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 73d9ac803..0800c815d 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -125,13 +125,13 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod this.classNode = classNode; try { + for (FieldNode field : new ArrayList<>(classNode.getFields())) { + visitNontransformedField(field); + } for (MethodNode method : new ArrayList<>(classNode.getMethods())) { visitMethod(method); } processConstructors(classNode); - for (FieldNode field : new ArrayList<>(classNode.getFields())) { - visitNontransformedField(field); - } for (Statement statement : new ArrayList<>(classNode.getObjectInitializerStatements())) { visitNontransformedStatement(statement); } diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index 0c8d4f82f..f90be73bf 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -46,8 +46,6 @@ public class SandboxInvokerTest extends AbstractGroovyCpsTest { """) assertIntercept(""" -Script1:___cps___0() -Script1:___cps___1() Script1.super(Script1).setBinding(Binding) new Point(Integer,Integer) Point.equals(Point) @@ -79,8 +77,6 @@ ScriptBytecodeAdapter:compareEqual(Integer,Integer) return length("foo") """) assertIntercept(''' -Script1:___cps___0() -Script1:___cps___1() Script1.super(Script1).setBinding(Binding) Script1.length(String) String.length() @@ -105,9 +101,6 @@ String.length() return "${nonCPSMatcherMethod('foo')}${cpsMatcherMethod('foo')}" ''') assertIntercept(''' -Script1:___cps___0() -Script1:___cps___1() -Script1:___cps___2() Script1.super(Script1).setBinding(Binding) Script1.nonCPSMatcherMethod(String) ScriptBytecodeAdapter:findRegex(String,String) @@ -156,8 +149,6 @@ new GStringImpl(Object[],String[]) assert [new Point(1,4),new File("foo")]==evalCpsSandbox("trusted.foo(4)"); assertIntercept(""" -Script2:___cps___6() -Script2:___cps___7() Script2.super(Script2).setBinding(Binding) Script2.trusted Script1.foo(Integer) @@ -209,11 +200,8 @@ new File(String) ''')=="xbase" assertIntercept(''' -Script1:___cps___0() -Script1:___cps___1() Script1.super(Script1).setBinding(Binding) new Bar() -Foo:___cps___2() new Foo() new SandboxInvokerTest$Base() Bar.toString() @@ -235,8 +223,6 @@ String.plus(String) assert new C().p.y == 3 ''') assertIntercept(''' -Script1:___cps___0() -Script1:___cps___1() Script1.super(Script1).setBinding(Binding) new C() new Point(Integer,Integer) @@ -256,8 +242,6 @@ ScriptBytecodeAdapter:compareEqual(Double,Integer) assert new C().p.y == 3 ''') assertIntercept(''' -Script1:___cps___0() -Script1:___cps___1() Script1.super(Script1).setBinding(Binding) new C() new Point(Integer,Integer) @@ -280,8 +264,6 @@ ScriptBytecodeAdapter:compareEqual(Double,Integer) assert new C().p.y == 3 ''') assertIntercept(''' -Script1:___cps___0() -Script1:___cps___1() Script1.super(Script1).setBinding(Binding) new C() new Point(Integer,Integer) @@ -310,8 +292,6 @@ ScriptBytecodeAdapter:compareEqual(Double,Integer) ''') // TODO recording Checker.checkedCast is undesirable, but how to avoid it? assertIntercept(''' -Script1:___cps___0() -Script1:___cps___1() Script1.super(Script1).setBinding(Binding) Checker:checkedCast(Class,Class,Boolean,Boolean,Boolean) Locale:getAvailableLocales() @@ -358,9 +338,6 @@ runit({-> b.noArg()} as Callable) runit(b.&noArg as Callable) ''') assertIntercept(''' -Script1:___cps___0() -Script1:___cps___1() -Script1:___cps___2() Script1.super(Script1).setBinding(Binding) new SandboxInvokerTest$Base() SandboxedMethodClosure.call() @@ -401,8 +378,6 @@ SandboxInvokerTest$Base.noArg() (SandboxInvokerTest.Base.&staticOneArg)('Something') ''') assertIntercept(''' -Script1:___cps___0() -Script1:___cps___1() Script1.super(Script1).setBinding(Binding) SandboxedMethodClosure.call(String,String) SandboxInvokerTest$Base:staticMultipleArgs(String,String) From c89d4011cffd12402862e2c146afbec90c6cbe6b Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 29 Jan 2018 20:27:17 -0500 Subject: [PATCH 504/932] [maven-release-plugin] prepare release groovy-cps-parent-1.22 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index f21b358de..169f9af57 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.22-SNAPSHOT + 1.22 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 328d41e9b..db2ef7120 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.22-SNAPSHOT + 1.22 groovy-cps diff --git a/pom.xml b/pom.xml index f3601646b..b06dcbb7d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.22-SNAPSHOT + 1.22 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.22 From cbd53c3d7f6e30ce138a9aef8446621c2d2496cb Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 29 Jan 2018 20:27:21 -0500 Subject: [PATCH 505/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 169f9af57..b442e9566 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.22 + 1.23-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index db2ef7120..fa5feb287 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.22 + 1.23-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index b06dcbb7d..82b11850a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.22 + 1.23-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.22 + HEAD From 58d4b7ccd8225a4d4c75dca67a1a81360aed5a75 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 20 Feb 2018 18:49:59 -0500 Subject: [PATCH 506/932] [FIXED JENKINS-45575] Add support for multiple assignment in sandbox Also get rid of `SandboxCpsTransformer#visitDeclarationExpression` by switching to overridden methods for getting the value for both single and multiple assignments that do the `SandboxTransformer#mightBePositionalArgumentConstructor` logic directly. --- .../cloudbees/groovy/cps/CpsTransformer.java | 26 ++++++---- .../groovy/cps/SandboxCpsTransformer.java | 51 +++++++++++++------ .../cps/sandbox/SandboxInvokerTest.groovy | 47 +++++++++++++++++ 3 files changed, 99 insertions(+), 25 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 0800c815d..906c3efe3 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -786,19 +786,23 @@ private void multipleAssignment(final Expression parentExpression, public void run() { loc(parentExpression); visit(tupleExpression); - makeNode("array", new Runnable() { - @Override - public void run() { - loc(rhs); - visit(rhs); - makeNode("constant", index); - } - }); + getMultipleAssignmentValueOrCast((VariableExpression)tupleExpression, rhs, index); } }); } } + protected void getMultipleAssignmentValueOrCast(final VariableExpression varExp, final Expression rhs, final Expression index) { + makeNode("array", new Runnable() { + @Override + public void run() { + loc(rhs); + visit(rhs); + makeNode("constant", index); + } + }); + } + /** * @see * org.codehaus.groovy.classgen.asm.BinaryExpressionHelper#eval(BinaryExpression) @@ -1135,12 +1139,16 @@ public void run() { loc(exp); literal(v.getType()); literal(v.getName()); - visit(exp.getRightExpression()); // this will not produce anything if this is EmptyExpression + visitAssignmentOrCast(v, exp.getRightExpression()); } }); } } + protected void visitAssignmentOrCast(final VariableExpression varExp, final Expression rhs) { + visit(rhs); // this will not produce anything if this is EmptyExpression + } + @Override public void visitGStringExpression(final GStringExpression exp) { makeNode("gstring", new Runnable() { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java index 1000ad6d4..9455fb925 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java @@ -6,13 +6,18 @@ import org.codehaus.groovy.ast.FieldNode; import org.codehaus.groovy.ast.MethodNode; import org.codehaus.groovy.ast.expr.CastExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; import org.codehaus.groovy.ast.expr.DeclarationExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.TupleExpression; import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.Statement; import org.codehaus.groovy.classgen.GeneratorContext; import org.codehaus.groovy.control.SourceUnit; import org.kohsuke.groovy.sandbox.SandboxTransformer; +import java.util.List; + /** * {@link CpsTransformer} + {@link SandboxTransformer} * @@ -82,31 +87,45 @@ public void run() { } @Override - public void visitDeclarationExpression(final DeclarationExpression exp) { - if (exp.isMultipleAssignmentDeclaration()) { - throw new UnsupportedOperationException("multiple assignments not supported"); // TODO - } else if (SandboxTransformer.mightBePositionalArgumentConstructor(exp.getVariableExpression())) { - makeNode("declareVariable", new Runnable() { + protected void visitAssignmentOrCast(final VariableExpression varExp, final Expression rhs) { + if (SandboxTransformer.mightBePositionalArgumentConstructor(varExp)) { + makeNode("sandboxCast", new Runnable() { @Override public void run() { - VariableExpression v = exp.getVariableExpression(); - loc(exp); - literal(v.getType()); - literal(v.getName()); - makeNode("sandboxCast", new Runnable() { + loc(varExp); + visit(rhs); + literal(varExp.getType()); + literal(false); + literal(false); + } + }); + } else { + super.visitAssignmentOrCast(varExp, rhs); + } + } + + @Override + protected void getMultipleAssignmentValueOrCast(final VariableExpression varExp, final Expression rhs, final Expression index) { + if (SandboxTransformer.mightBePositionalArgumentConstructor(varExp)) { + makeNode("sandboxCast", new Runnable() { + @Override + public void run() { + loc(varExp); + makeNode("array", new Runnable() { @Override public void run() { - loc(exp); - visit(exp.getRightExpression()); - literal(exp.getVariableExpression().getType()); - literal(false); - literal(false); + loc(rhs); + visit(rhs); + makeNode("constant", index); } }); + literal(varExp.getType()); + literal(false); + literal(false); } }); } else { - super.visitDeclarationExpression(exp); + super.getMultipleAssignmentValueOrCast(varExp, rhs, index); } } diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index f90be73bf..132f1db77 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -388,4 +388,51 @@ SandboxInvokerTest$Base:staticOneArg(String) ''') } + @Issue("JENKINS-45575") + @Test + void sandboxedMultipleAssignment() { + assert evalCpsSandbox(''' +def (a, b) = ['first', 'second'] +def c, d +(c, d) = ['third', 'fourth'] + +return a + b + c + d +''') == 'firstsecondthirdfourth' + } + + @Issue("JENKINS-45575") + @Test + void typeCoercionMultipleAssignment() { + ProxyGeneratorAdapter.pxyCounter.set(0); // make sure *_groovyProxy names are predictable + evalCpsSandbox(''' + interface Static { + Locale[] getAvailableLocales() + } + interface Instance { + String getCountry() + } + def (a, b) = [Locale as Static, Locale.getDefault() as Instance] + assert a.getAvailableLocales() != null + assert b.country != null +''') + assertIntercept(''' +Script1.super(Script1).setBinding(Binding) +Checker:checkedCast(Class,Class,Boolean,Boolean,Boolean) +Locale:getAvailableLocales() +Locale:getDefault() +Checker:checkedCast(Class,Locale,Boolean,Boolean,Boolean) +Locale.getCountry() +ArrayList[Integer] +Checker:checkedCast(Class,Class,Boolean,Boolean,Boolean) +Locale:getAvailableLocales() +Locale:getDefault() +Checker:checkedCast(Class,Locale,Boolean,Boolean,Boolean) +Locale.getCountry() +ArrayList[Integer] +Class1_groovyProxy.getAvailableLocales() +ScriptBytecodeAdapter:compareNotEqual(Locale[],null) +Locale2_groovyProxy.country +ScriptBytecodeAdapter:compareNotEqual(String,null) +''') + } } From 77bfa718e5df526682e5ca206b3fef69bbe2b933 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Thu, 22 Feb 2018 17:37:32 -0500 Subject: [PATCH 507/932] [FIXED JENKINS-49679] Don't run RHS of multiple assignment more than once Evaluate the RHS into a temp variable and use that instead of the original expression. --- .../cloudbees/groovy/cps/CpsTransformer.java | 7 ++++- .../groovy/cps/CpsTransformerTest.groovy | 24 +++++++++++++++ .../cps/sandbox/SandboxInvokerTest.groovy | 29 +++++++++++++++---- 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 906c3efe3..8b7723148 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -774,6 +774,10 @@ private void multipleAssignment(final Expression parentExpression, final Expression rhs) { List tupleExpressions = tuple.getExpressions(); + final VariableExpression rhsTmpVar = new VariableExpression("___cpsTmpVar___" + iota.getAndIncrement()); + rhsTmpVar.setAccessedVariable(rhsTmpVar); + DeclarationExpression decl = new DeclarationExpression(rhsTmpVar, new Token(ASSIGN, "=", -1, -1), rhs); + visit(decl); for (int i = 0, tupleExpressionsSize = tupleExpressions.size(); i < tupleExpressionsSize; i++) { final Expression tupleExpression = tupleExpressions.get(i); final Expression index = new ConstantExpression(i, true); @@ -786,7 +790,7 @@ private void multipleAssignment(final Expression parentExpression, public void run() { loc(parentExpression); visit(tupleExpression); - getMultipleAssignmentValueOrCast((VariableExpression)tupleExpression, rhs, index); + getMultipleAssignmentValueOrCast((VariableExpression)tupleExpression, rhsTmpVar, index); } }); } @@ -1103,6 +1107,7 @@ public void run() { } }); } else { + System.err.println("V: " + exp); sourceUnit.addError(new SyntaxException("Unsupported expression for CPS transformation", exp.getLineNumber(), exp.getColumnNumber())); } } diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 3de15c6cc..20b1e43d2 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -923,4 +923,28 @@ return b.size() assert e.message.contains('Map expressions can only contain up to 125 entries') } } + + @Issue("JENKINS-49679") + @Test + void multipleAssignmentRunsMethodOnce() { + assert evalCPS(''' +alreadyRun = false + +def getAandB() { + if (!alreadyRun) { + alreadyRun = true + return ['first', 'second'] + } else { + return ['bad', 'worse'] + } +} + +def (a, b) = getAandB() +def c, d +(c, d) = ['third', 'fourth'] + +return a + b + c + d +''') == 'firstsecondthirdfourth' + } + } diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index 132f1db77..8f935466a 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -423,11 +423,6 @@ Locale:getDefault() Checker:checkedCast(Class,Locale,Boolean,Boolean,Boolean) Locale.getCountry() ArrayList[Integer] -Checker:checkedCast(Class,Class,Boolean,Boolean,Boolean) -Locale:getAvailableLocales() -Locale:getDefault() -Checker:checkedCast(Class,Locale,Boolean,Boolean,Boolean) -Locale.getCountry() ArrayList[Integer] Class1_groovyProxy.getAvailableLocales() ScriptBytecodeAdapter:compareNotEqual(Locale[],null) @@ -435,4 +430,28 @@ Locale2_groovyProxy.country ScriptBytecodeAdapter:compareNotEqual(String,null) ''') } + + @Issue("JENKINS-49679") + @Test + void sandboxedMultipleAssignmentRunsMethodOnce() { + assert evalCpsSandbox(''' +alreadyRun = false + +def getAandB() { + if (!alreadyRun) { + alreadyRun = true + return ['first', 'second'] + } else { + return ['bad', 'worse'] + } +} + +def (a, b) = getAandB() +def c, d +(c, d) = ['third', 'fourth'] + +return a + b + c + d +''') == 'firstsecondthirdfourth' + } + } From 7aa9173e16cc90c6c97494856e73758800329cfa Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 27 Feb 2018 10:12:15 -0500 Subject: [PATCH 508/932] [JENKINS-26313] Add javadoc explaining why constructors can't be transformed --- .../main/java/com/cloudbees/groovy/cps/CpsTransformer.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 906c3efe3..808954fab 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -157,6 +157,11 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod } } + /** + * Constructors can't be transformed - if we throw a {@link CpsCallableInvocation} from inside a constructor, there's + * no way to get back to the continuation. The object does not get created and so we're unable to proceed with it. + * The same thing applies for object initializers. + */ protected void processConstructors(ClassNode classNode) { for (ConstructorNode constructor : new ArrayList<>(classNode.getDeclaredConstructors())) { visitNontransformedMethod(constructor); From d3c3ddeffd8f3a6fe3955a769b74570e5a24848d Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 7 Aug 2017 17:33:11 -0400 Subject: [PATCH 509/932] [JENKINS-45982] Reproducing issue. --- .../groovy/cps/CpsTransformerTest.groovy | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 3de15c6cc..86fb8a05e 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -731,6 +731,7 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { return "base"; } } + @Test void superClass() { assert evalCPS(''' @@ -743,6 +744,29 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { ''')=="xbase" } + @NotYetImplemented + @Issue("JENKINS-45982") + @Test + void transformedSuperClass() { + assert evalCPS(''' + class Foo extends CpsTransformerTest.Base { + public String toString() { + return "x"+super.toString(); + } + public String other() { + return "base" + } + } + new Foo().toString() + class Bar extends Foo { + public String other() { + return "y"+super.other() + } + } + new Bar().other(); + ''')=="ybase" + } + @Test @Issue("https://github.com/cloudbees/groovy-cps/issues/42") void abstractMethod() { From 00826b597da0ec26f23e5b80f9fca559720e476d Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 8 Aug 2017 14:15:43 -0400 Subject: [PATCH 510/932] Adding sandboxed test as well. --- .../groovy/cps/CpsTransformerTest.groovy | 4 ---- .../cps/sandbox/SandboxInvokerTest.groovy | 22 +++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 86fb8a05e..e7675fd9d 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -750,14 +750,10 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { void transformedSuperClass() { assert evalCPS(''' class Foo extends CpsTransformerTest.Base { - public String toString() { - return "x"+super.toString(); - } public String other() { return "base" } } - new Foo().toString() class Bar extends Foo { public String other() { return "y"+super.other() diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index 132f1db77..3a38da6bf 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -2,6 +2,7 @@ package com.cloudbees.groovy.cps.sandbox import com.cloudbees.groovy.cps.* import com.cloudbees.groovy.cps.impl.FunctionCallEnv +import groovy.transform.NotYetImplemented import org.codehaus.groovy.runtime.ProxyGeneratorAdapter import org.junit.Before import org.junit.Test @@ -210,6 +211,27 @@ String.plus(String) ''') } + @NotYetImplemented + @Issue("JENKINS-45982") + @Test + void transformedSuperClass() { + assert evalCpsSandbox(''' + class Foo extends SandboxInvokerTest.Base { + public String other() { + return "base" + } + } + class Bar extends Foo { + public String other() { + return "y"+super.other() + } + } + new Bar().other(); + ''')=="ybase" + + // TODO: add assertIntercept once this can actually work and we know the call tree. + } + @Issue("SECURITY-551") @Test public void constructors() { evalCpsSandbox(''' From 5ce2bbca42e86a45d270de870a69379e08986a3a Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 27 Feb 2018 13:08:20 -0500 Subject: [PATCH 511/932] [FIXED JENKINS-45982] Unwrap GroovyRuntimeExceptions from super calls This behaves the same as PogoMetaClassSite#call now (which is what actually ends up being called from DefaultInvoker#methodCall eventually). We need to unwrap the InvokerInvocationException to get at the CpsCallableInvocation. This depends on https://github.com/jenkinsci/groovy-sandbox/pull/43 for the sandbox test. --- lib/pom.xml | 2 +- .../com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java | 9 +++++++-- .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 1 - .../groovy/cps/sandbox/SandboxInvokerTest.groovy | 1 - 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/pom.xml b/lib/pom.xml index fa5feb287..b6e5a0913 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -105,7 +105,7 @@ - 1.14 + 1.17-20180227.180728-1 diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java index f7b93d0e3..104b1df24 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps.sandbox; import com.cloudbees.groovy.cps.impl.CallSiteBlock; +import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaClass; import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.MethodClosure; @@ -26,8 +27,12 @@ public Object constructorCall(Class lhs, Object[] args) throws Throwable { } public Object superCall(Class methodType, Object receiver, String method, Object[] args) throws Throwable { - MetaClass mc = InvokerHelper.getMetaClass(receiver.getClass()); - return mc.invokeMethod(methodType, receiver, method, args, true, true); + try { + MetaClass mc = InvokerHelper.getMetaClass(receiver.getClass()); + return mc.invokeMethod(methodType, receiver, method, args, true, true); + } catch (GroovyRuntimeException gre) { + throw ScriptBytecodeAdapter.unwrap(gre); + } } public Object getProperty(Object lhs, String name) throws Throwable { diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index e7675fd9d..5161c7f46 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -744,7 +744,6 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { ''')=="xbase" } - @NotYetImplemented @Issue("JENKINS-45982") @Test void transformedSuperClass() { diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index 3a38da6bf..0b8a177f4 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -211,7 +211,6 @@ String.plus(String) ''') } - @NotYetImplemented @Issue("JENKINS-45982") @Test void transformedSuperClass() { From bca101752e9ccf5167f73fb86cff9ef88be4545d Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 5 Mar 2018 16:30:55 -0500 Subject: [PATCH 512/932] Whoops, silly println, go away. --- lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 8b7723148..4fc67392c 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -1107,7 +1107,6 @@ public void run() { } }); } else { - System.err.println("V: " + exp); sourceUnit.addError(new SyntaxException("Unsupported expression for CPS transformation", exp.getLineNumber(), exp.getColumnNumber())); } } From 0e98fa6e637dd566255aa65229449d2a1dfa9a62 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 5 Mar 2018 16:32:27 -0500 Subject: [PATCH 513/932] [maven-release-plugin] prepare release groovy-cps-parent-1.23 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index b442e9566..0d57e2d76 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.23-SNAPSHOT + 1.23 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index fa5feb287..b20f4f709 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.23-SNAPSHOT + 1.23 groovy-cps diff --git a/pom.xml b/pom.xml index 82b11850a..73788f5a4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.23-SNAPSHOT + 1.23 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.23 From 4e052722f571d616f9d81dfb09b8193f69dda02c Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 5 Mar 2018 16:32:31 -0500 Subject: [PATCH 514/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 0d57e2d76..76d832856 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.23 + 1.24-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index b20f4f709..cff25d555 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.23 + 1.24-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 73788f5a4..a7009c6c4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.23 + 1.24-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.23 + HEAD From 90b1f90c46a547014852119d25eed8861ae396d7 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 9 Mar 2018 16:56:53 -0500 Subject: [PATCH 515/932] [JENKINS-31314] Sketch of diagnostics for mismatched function call vs. CpsCallableInvocation catch. --- .../com/cloudbees/groovy/cps/Continuable.java | 7 +++- .../cloudbees/groovy/cps/CpsTransformer.java | 2 +- .../com/cloudbees/groovy/cps/Logging.java | 39 +++++++++++++++++++ .../groovy/cps/impl/ContinuationGroup.java | 8 ++++ .../cps/impl/CpsCallableInvocation.java | 12 ++++++ .../cloudbees/groovy/cps/impl/CpsClosure.java | 8 ++-- 6 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/Logging.java diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 648eb0cff..de4a6c0eb 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -221,8 +221,13 @@ public boolean isResumable() { * When the continuable is resumed via {@link #run(Object)} later, the argument to the run method * will become the return value from this method to the CPS-transformed program. */ + @Deprecated public static Object suspend(final Object v) { - throw new CpsCallableInvocation(SuspendBlock.SUSPEND,null,v); + return suspend("suspend?", v); + } + + public static Object suspend(String methodName, Object v) { + throw new CpsCallableInvocation(methodName, SuspendBlock.SUSPEND,null,v); } /** diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 2064c17b1..ee32ed40c 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -251,7 +251,7 @@ CpsFunction ___cps___N() { paramExpressions.add(new VariableExpression(p)); } ArrayExpression paramArray = new ArrayExpression(ClassHelper.OBJECT_TYPE, paramExpressions); - TupleExpression args = new TupleExpression(new VariableExpression(f), THIS, paramArray); + TupleExpression args = new TupleExpression(Arrays.asList(new ConstantExpression(m.getName()), new VariableExpression(f), THIS, paramArray)); ConstructorCallExpression cce = new ConstructorCallExpression(CPSCALLINVK_TYPE, args); m.setCode(new ThrowStatement(cce)); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Logging.java b/lib/src/main/java/com/cloudbees/groovy/cps/Logging.java new file mode 100644 index 000000000..be8db962f --- /dev/null +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Logging.java @@ -0,0 +1,39 @@ +/* + * Copyright 2018 CloudBees, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.cloudbees.groovy.cps; + +import java.io.PrintStream; +import javax.annotation.CheckForNull; + +/** + * Contextually-appropriate logging. + */ +public class Logging { + + static final ThreadLocal currentLogger = new ThreadLocal<>(); + + public static void register(@CheckForNull PrintStream ps) { + currentLogger.set(ps); + } + + public static @CheckForNull PrintStream current() { + return currentLogger.get(); + } + + private Logging() {} + +} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 86870d5bd..e5d803c5f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -4,6 +4,7 @@ import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Logging; import com.cloudbees.groovy.cps.Next; import com.cloudbees.groovy.cps.sandbox.Invoker; import org.codehaus.groovy.runtime.callsite.CallSite; @@ -15,6 +16,7 @@ import java.util.List; import static com.cloudbees.groovy.cps.impl.SourceLocation.*; +import java.io.PrintStream; /** * Base class for defining a series of {@link Continuation} methods that share the same set of contextual values. @@ -59,6 +61,12 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat // if this was a normal function, the method had just executed synchronously return k.receive(v); } catch (CpsCallableInvocation inv) { + if (!methodName.equals(inv.methodName)) { + PrintStream ps = Logging.current(); + if (ps != null) { + ps.println("expected to call " + methodName + " but wound up catching " + inv.methodName); + } + } return inv.invoke(e, loc, k); } catch (Throwable t) { return throwException(e, t, loc, new ReferenceStackTrace()); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 9ef6f0009..a1352083e 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -26,11 +26,18 @@ * @author Kohsuke Kawaguchi */ public class CpsCallableInvocation extends Error/*not really an error but we want something that doesn't change signature*/ { + public final String methodName; public final CpsCallable call; public final Object receiver; public final List arguments; + @Deprecated public CpsCallableInvocation(CpsCallable call, Object receiver, Object... arguments) { + this("?", call, receiver, arguments); + } + + public CpsCallableInvocation(String description, CpsCallable call, Object receiver, Object... arguments) { + this.methodName = description; this.call = call; this.receiver = receiver; this.arguments = arguments != null ? asList(arguments) : Collections.emptyList(); @@ -56,4 +63,9 @@ public synchronized Throwable fillInStackTrace() { return this; } + @Override + public String toString() { + return "CpsCallableInvocation{methodName=" + methodName + ", call=" + call + ", receiver=" + receiver + ", arguments=" + arguments + '}'; + } + } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java index 545595b8b..69d6a1a09 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java @@ -30,17 +30,17 @@ public CpsClosure(Object owner, Object thisObject, List parameters, Bloc // returning CpsCallable lets the caller know that it needs to do CPS evaluation of this closure. @Override public Object call() { - throw new CpsCallableInvocation(def,this); + throw new CpsCallableInvocation("call", def,this); } @Override public Object call(Object... args) { - throw new CpsCallableInvocation(def,this,args); + throw new CpsCallableInvocation("call", def,this,args); } @Override public Object call(Object arguments) { - throw new CpsCallableInvocation(def,this,arguments); + throw new CpsCallableInvocation("call", def,this,arguments); } /** @@ -50,7 +50,7 @@ public Object call(Object arguments) { * {@link CurriedClosure} invokes this method directly (via {@link MetaClassImpl#invokeMethod(Class, Object, String, Object[], boolean, boolean)} */ public Object doCall(Object... args) { - throw new CpsCallableInvocation(def,this,args); + throw new CpsCallableInvocation("call", def,this,args); } private static final long serialVersionUID = 1L; From 6c97a358ef743d24f7f80319bc2849cd011a85e0 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 12 Mar 2018 10:32:00 -0400 Subject: [PATCH 516/932] Switch to 1.17 release of groovy-sandbox. --- lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pom.xml b/lib/pom.xml index 4d2e7539b..d366f41eb 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -105,7 +105,7 @@ - 1.17-20180227.180728-1 + 1.17 From 3c0e4c65cd660e915b905db158813aefe0ad616f Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 12 Mar 2018 14:51:38 -0400 Subject: [PATCH 517/932] [maven-release-plugin] prepare release groovy-cps-parent-1.24 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 76d832856..3c5c0e69f 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.24-SNAPSHOT + 1.24 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index d366f41eb..0587adbe2 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.24-SNAPSHOT + 1.24 groovy-cps diff --git a/pom.xml b/pom.xml index a7009c6c4..dc2f60be5 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.24-SNAPSHOT + 1.24 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.24 From 846d8d8eed10c57063d50894d2949e9a8fd21ae0 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 12 Mar 2018 14:51:43 -0400 Subject: [PATCH 518/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 3c5c0e69f..e63cb87c5 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.24 + 1.25-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 0587adbe2..a8ccb9e61 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.24 + 1.25-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index dc2f60be5..4ed398101 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.24 + 1.25-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.24 + HEAD From ad1a9823dc13d586896dbc53df51be84e6940c05 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 13 Mar 2018 15:48:20 -0400 Subject: [PATCH 519/932] Handling default Groovy methods. --- .../src/main/java/com/cloudbees/groovy/cps/tool/Translator.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 902ac6fef..4b0ee3ae7 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -389,6 +389,7 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { .arg(n(e)); } else if (overloadsResolved.containsKey(overloadResolved)) { // Private, so delegate to our mangled version. + // TODO add a String parameter to each internal helper method for the expected methodName to pass to CpsCallableInvocation. inv = $b.invoke("staticCall") .arg(loc(mt)) .arg($output.dotclass()) @@ -686,6 +687,7 @@ protected JExpression defaultAction(Tree node, Void aVoid) { JVar $f = m.body().decl($CpsFunction, "f", f); m.body()._throw(JExpr._new($CpsCallableInvocation) + .arg(JExpr.lit(methodName)) .arg($f) .arg(JExpr._null()) .args(params)); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index e5d803c5f..ae84d1a81 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -61,7 +61,7 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat // if this was a normal function, the method had just executed synchronously return k.receive(v); } catch (CpsCallableInvocation inv) { - if (!methodName.equals(inv.methodName)) { + if (!methodName.equals(inv.methodName) && /* see TODO comment in Translator w.r.t. overloadsResolved */ !methodName.startsWith("$")) { PrintStream ps = Logging.current(); if (ps != null) { ps.println("expected to call " + methodName + " but wound up catching " + inv.methodName); From 78778330ee48e3ad173e67c1758878e07be643f6 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 13 Mar 2018 16:57:19 -0400 Subject: [PATCH 520/932] Do not print a false positive on evaluate. --- .../groovy/cps/impl/ContinuationGroup.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index ae84d1a81..e766118e4 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -61,7 +61,7 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat // if this was a normal function, the method had just executed synchronously return k.receive(v); } catch (CpsCallableInvocation inv) { - if (!methodName.equals(inv.methodName) && /* see TODO comment in Translator w.r.t. overloadsResolved */ !methodName.startsWith("$")) { + if (isMismatch(methodName, inv.methodName)) { PrintStream ps = Logging.current(); if (ps != null) { ps.println("expected to call " + methodName + " but wound up catching " + inv.methodName); @@ -73,6 +73,21 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat } } + /** @see JENKINS-31314 */ + private static boolean isMismatch(String expected, String caught) { + if (expected.equals(caught)) { + return false; + } + if (expected.startsWith("$")) { + // see TODO comment in Translator w.r.t. overloadsResolved + return false; + } + if (expected.equals("evaluate") && caught.equals("run")) { + return false; + } + return true; + } + /** * Fix up the stack trace of an exception thrown from synchronous code. */ From bd086029f9cc42c472cfc48514740b86af6f71db Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 17 May 2018 18:27:53 -0400 Subject: [PATCH 521/932] Record internal calls to what look like Jenkins APIs made during the course of Pipeline builds. --- .../workflow/cps/CpsBodyExecution.java | 2 +- .../workflow/cps/CpsFlowExecution.java | 66 ++++++++- .../plugins/workflow/cps/LoggingInvoker.java | 130 ++++++++++++++++++ 3 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java index bd564ca30..83ce9b8b5 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java @@ -171,7 +171,7 @@ private Continuable createContinuable(CpsThread currentThread, CpsCallableInvoca FunctionCallEnv caller = new FunctionCallEnv(null, onSuccess, null, null); if (currentThread.getExecution().isSandbox()) - caller.setInvoker(new SandboxInvoker()); + caller.setInvoker(new LoggingInvoker(new SandboxInvoker())); // catch an exception thrown from body and treat that as a failure TryBlockEnv env = new TryBlockEnv(caller, null); diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index b087dfee8..7a515f501 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -134,6 +134,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Set; +import java.util.TreeSet; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -384,6 +385,9 @@ enum TimingKind { @GuardedBy("this") @CheckForNull Map timings; + @GuardedBy("this") + private @CheckForNull Set internalCalls; + @Deprecated public CpsFlowExecution(String script, FlowExecutionOwner owner) throws IOException { this(script, false, owner); @@ -455,6 +459,17 @@ synchronized void logTimings() { } } + /** + * Mark a call to an internal API made by this build. + * @param call a representation of the call site; for example, {@code hudson.model.Run.setDescription} + */ + synchronized void recordInternalCall(String call) { + if (internalCalls == null) { + internalCalls = new TreeSet<>(); + } + internalCalls.add(call); + } + /** * Returns a groovy compiler used to load the script. * @@ -547,7 +562,7 @@ public void run() { * During sandbox execution, we need to call sandbox interceptor while executing asynchronous code. */ private Env createInitialEnv() { - return Envs.empty( isSandbox() ? new SandboxInvoker() : new DefaultInvoker()); + return Envs.empty(new LoggingInvoker(isSandbox() ? new SandboxInvoker() : new DefaultInvoker())); } }); } @@ -1603,6 +1618,9 @@ public void marshal(Object source, HierarchicalStreamWriter w, MarshallingContex if (e.timings != null) { writeChild(w, context, "timings", e.timings, Map.class); } + if (e.internalCalls != null) { + writeChild(w, context, "internalCalls", e.internalCalls, Set.class); + } } writeChild(w, context, "sandbox", e.sandbox, Boolean.class); if (e.user != null) { @@ -1681,6 +1699,9 @@ public Object unmarshal(HierarchicalStreamReader reader, final UnmarshallingCont } else if (nodeName.equals("timings")) { Map timings = readChild(reader, context, Map.class, result); setField(result, "timings", timings); + } else if (nodeName.equals("internalCalls")) { + Set internalCalls = readChild(reader, context, Set.class, result); + setField(result, "internalCalls", internalCalls); } else if (nodeName.equals("sandbox")) { boolean sandbox = readChild(reader, context, Boolean.class, result); setField(result, "sandbox", sandbox); @@ -1900,6 +1921,49 @@ public void autopersist(@Nonnull FlowNode n) throws IOException { } + @Extension(optional=true) public static class PipelineInternalCalls extends Component { + + @Override public Set getRequiredPermissions() { + return Collections.singleton(Jenkins.ADMINISTER); + } + + @Override public String getDisplayName() { + return "List of internal API calls made by Pipeline builds (typically from trusted libraries)"; + } + + @Override public void addContents(Container container) { + container.add(new Content("nodes/master/pipeline-internal-calls.txt") { + @Override public void writeTo(OutputStream outputStream) throws IOException { + PrintWriter pw = new PrintWriter(new OutputStreamWriter(outputStream, Charsets.UTF_8)); + for (Job job : Jenkins.getActiveInstance().getAllItems(Job.class)) { + // TODO as above + if (job instanceof Queue.FlyweightTask) { + Run run = job.getLastCompletedBuild(); + if (run instanceof FlowExecutionOwner.Executable) { + FlowExecutionOwner owner = ((FlowExecutionOwner.Executable) run).asFlowExecutionOwner(); + if (owner != null) { + FlowExecution exec = owner.get(); + if (exec instanceof CpsFlowExecution) { + Set calls = ((CpsFlowExecution) exec).internalCalls; + if (calls != null) { + pw.println("Internal calls for " + run + ":"); + for (String call : calls) { + pw.println(" " + call); + } + pw.println(); + } + } + } + } + } + } + pw.flush(); + } + }); + } + + } + /** Persist the execution if we are set up to save the execution with every step. */ void saveExecutionIfDurable() { if (this.getDurabilityHint().isPersistWithEveryStep()) { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java new file mode 100644 index 000000000..82c519e81 --- /dev/null +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java @@ -0,0 +1,130 @@ +/* + * The MIT License + * + * Copyright 2018 CloudBees, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package org.jenkinsci.plugins.workflow.cps; + +import com.cloudbees.groovy.cps.impl.CallSiteBlock; +import com.cloudbees.groovy.cps.sandbox.Invoker; +import java.util.function.Supplier; + +/** + * Captures CPS-transformed events. + */ +final class LoggingInvoker implements Invoker { + + private final Invoker delegate; + + LoggingInvoker(Invoker delegate) { + this.delegate = delegate; + } + + private void record(String call) { + CpsThreadGroup g = CpsThreadGroup.current(); + if (g == null) { + assert false : "should never happen"; + return; + } + CpsFlowExecution execution = g.getExecution(); + if (execution == null) { + assert false : "should never happen"; + return; + } + execution.recordInternalCall(call); + } + + private static boolean isInternal(Class clazz) { + // TODO more precise would be the logic in jenkins.security.ClassFilterImpl.isLocationWhitelisted + // (simply checking whether the class loader can “see”, say, jenkins/model/Jenkins.class + // would falsely mark third-party libs bundled in Jenkins plugins) + String name = clazz.getName(); + // acc. to `find …/jenkinsci/*/src/main/java -type f -exec egrep -h '^package ' {} \; | sort | uniq` this is decent + return name.contains("jenkins") || name.contains("hudson") || name.contains("cloudbees"); + } + + private void maybeRecord(Class clazz, Supplier message) { + if (isInternal(clazz)) { + record(message.get()); + } + } + + private void maybeRecord(Object o, Supplier message) { + if (o != null && isInternal(o.getClass())) { + record(message.get()); + } + } + + @Override public Object methodCall(Object receiver, String method, Object[] args) throws Throwable { + maybeRecord(receiver, () -> receiver.getClass().getName() + "." + method); + return delegate.methodCall(receiver, method, args); + } + + @Override public Object constructorCall(Class lhs, Object[] args) throws Throwable { + maybeRecord(lhs, () -> lhs.getName() + "."); + return delegate.constructorCall(lhs, args); + } + + @Override public Object superCall(Class senderType, Object receiver, String method, Object[] args) throws Throwable { + maybeRecord(senderType, () -> senderType.getName() + "."); + return delegate.superCall(senderType, receiver, method, args); + } + + @Override public Object getProperty(Object lhs, String name) throws Throwable { + maybeRecord(lhs, () -> lhs.getClass().getName() + "." + name); + return delegate.getProperty(lhs, name); + } + + @Override public void setProperty(Object lhs, String name, Object value) throws Throwable { + maybeRecord(lhs, () -> lhs.getClass().getName() + "." + name); + delegate.setProperty(lhs, name, value); + } + + @Override public Object getAttribute(Object lhs, String name) throws Throwable { + maybeRecord(lhs, () -> lhs.getClass().getName() + "." + name); + return delegate.getAttribute(lhs, name); + } + + @Override public void setAttribute(Object lhs, String name, Object value) throws Throwable { + maybeRecord(lhs, () -> lhs.getClass().getName() + "." + name); + delegate.setAttribute(lhs, name, value); + } + + @Override public Object getArray(Object lhs, Object index) throws Throwable { + return delegate.getArray(lhs, index); + } + + @Override public void setArray(Object lhs, Object index, Object value) throws Throwable { + delegate.setArray(lhs, index, value); + } + + @Override public Object methodPointer(Object lhs, String name) { + maybeRecord(lhs, () -> lhs.getClass().getName() + "." + name); + return delegate.methodPointer(lhs, name); + } + + @Override public Invoker contextualize(CallSiteBlock tags) { + Invoker contextualized = delegate.contextualize(tags); + return contextualized instanceof LoggingInvoker ? contextualized : new LoggingInvoker(contextualized); + } + +} From dfd4bd99f01a0c5a3ac07e7ff69a5a8dbf7475bc Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 24 May 2018 12:15:09 -0400 Subject: [PATCH 522/932] Making creating of LoggingInvoker more uniform. --- .../jenkinsci/plugins/workflow/cps/CpsBodyExecution.java | 4 +--- .../jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 9 ++++++--- .../jenkinsci/plugins/workflow/cps/LoggingInvoker.java | 8 +++++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java index 83ce9b8b5..7210f884c 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java @@ -7,7 +7,6 @@ import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import com.cloudbees.groovy.cps.impl.TryBlockEnv; -import com.cloudbees.groovy.cps.sandbox.SandboxInvoker; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.SettableFuture; @@ -170,8 +169,7 @@ private Continuable createContinuable(CpsThread currentThread, CpsCallableInvoca // TODO: we need to capture the surrounding calling context to capture variables, and switch to ClosureCallEnv FunctionCallEnv caller = new FunctionCallEnv(null, onSuccess, null, null); - if (currentThread.getExecution().isSandbox()) - caller.setInvoker(new LoggingInvoker(new SandboxInvoker())); + caller.setInvoker(currentThread.getExecution().createInvoker()); // catch an exception thrown from body and treat that as a failure TryBlockEnv env = new TryBlockEnv(caller, null); diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 7a515f501..1981aca3b 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -30,8 +30,7 @@ import com.cloudbees.groovy.cps.Outcome; import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.ThrowBlock; -import com.cloudbees.groovy.cps.sandbox.DefaultInvoker; -import com.cloudbees.groovy.cps.sandbox.SandboxInvoker; +import com.cloudbees.groovy.cps.sandbox.Invoker; import com.cloudbees.jenkins.support.api.Component; import com.cloudbees.jenkins.support.api.Container; import com.cloudbees.jenkins.support.api.Content; @@ -562,11 +561,15 @@ public void run() { * During sandbox execution, we need to call sandbox interceptor while executing asynchronous code. */ private Env createInitialEnv() { - return Envs.empty(new LoggingInvoker(isSandbox() ? new SandboxInvoker() : new DefaultInvoker())); + return Envs.empty(); } }); } + Invoker createInvoker() { + return LoggingInvoker.create(isSandbox()); + } + private CpsScript parseScript() throws IOException { // classloader hierarchy. See doc/classloader.md trusted = new CpsGroovyShellFactory(this).forTrusted().build(); diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java index 82c519e81..afe4c9c8d 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java @@ -25,7 +25,9 @@ package org.jenkinsci.plugins.workflow.cps; import com.cloudbees.groovy.cps.impl.CallSiteBlock; +import com.cloudbees.groovy.cps.sandbox.DefaultInvoker; import com.cloudbees.groovy.cps.sandbox.Invoker; +import com.cloudbees.groovy.cps.sandbox.SandboxInvoker; import java.util.function.Supplier; /** @@ -33,9 +35,13 @@ */ final class LoggingInvoker implements Invoker { + public static Invoker create(boolean sandbox) { + return new LoggingInvoker(sandbox ? new SandboxInvoker() : new DefaultInvoker()); + } + private final Invoker delegate; - LoggingInvoker(Invoker delegate) { + private LoggingInvoker(Invoker delegate) { this.delegate = delegate; } From dfe614a2ff8292735bd08e6f40986ebf18a122c7 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 29 May 2018 11:35:17 -0400 Subject: [PATCH 523/932] Oops! --- .../org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 1981aca3b..c73541cc4 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -561,7 +561,7 @@ public void run() { * During sandbox execution, we need to call sandbox interceptor while executing asynchronous code. */ private Env createInitialEnv() { - return Envs.empty(); + return Envs.empty(createInvoker()); } }); } From 44019a282ee0a6db5e32130c4542394ad27b80eb Mon Sep 17 00:00:00 2001 From: Stuart Rowe Date: Thu, 5 Jul 2018 10:34:40 -0700 Subject: [PATCH 524/932] Add test case demonstrating stack overflow when a CPS transformed method calls a super.method(...) which in turn calls super.methd(...) --- .../groovy/cps/CpsTransformerTest.groovy | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 55de86cca..5ee262fab 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -762,6 +762,25 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { ''')=="ybase" } + @NotYetImplemented + @Issue("JENKINS-52395") + @Test + void transformedSuperSuperClass() { + assert evalCPS(''' + class Foo extends CpsTransformerTest.Base { + public String toString() { + return "x"+super.toString() + } + } + class Bar extends Foo { + public String toString() { + return "y"+super.toString() + } + } + new Bar().toString(); + ''')=="yxbase" + } + @Test @Issue("https://github.com/cloudbees/groovy-cps/issues/42") void abstractMethod() { From a70164f90aa4cc447954bb80c3aaf4687cf49223 Mon Sep 17 00:00:00 2001 From: Adam Koch Date: Tue, 21 Aug 2018 08:54:40 -0500 Subject: [PATCH 525/932] Update to headers It looks like maybe markdown changed since this was written. I added a space after # so the text was made into a header. --- doc/sandbox.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/sandbox.md b/doc/sandbox.md index ae9735a93..f16ce0210 100644 --- a/doc/sandbox.md +++ b/doc/sandbox.md @@ -10,7 +10,7 @@ in CPS. To do this, groovy-cps has some optional components (`SandboxInvoker` and `SandboxCpsTransformer`) that combines Groovy sandbox with groovy-cps. -#How to use it +# How to use it Use `SandboxCpsTransformer` instead of `CpsTransformer` to translate the source code, then use `SandboxInvoker` instead of `DefaultInvoker` during runtime to perform checks. @@ -19,7 +19,7 @@ To mix trusted code and untrusted code, use two `GroovyShell`, one with `Sandbox In this way, the portion of the code compiled with `CpsTransformer` will run without security check, while the other portion compiled with `SandboxCpsTransformer` will be sandboxed. -#How this works +# How this works ## Tagging call site As `CpsTransformer` translates the program, it adds some metadata to each AST node indicating @@ -56,4 +56,4 @@ The invoker will receive call site tags that are added by `CpsTransformer`, incl this invocation is trusted (see `Invoker.contextualize()`). If the client application has used `SandboxInvoker` instead of `DefaultInvoker`, it'll honor this trusted tag and -perform access control appropriately. \ No newline at end of file +perform access control appropriately. From 028714a277e888b27e1f2dc37e3abdbdeec01f93 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 17 Oct 2018 15:58:39 +0200 Subject: [PATCH 526/932] Switch to compilation errors when reasonable. Better error messages are generally better things to have. --- .../cloudbees/groovy/cps/CpsTransformer.java | 37 ++++++++---- .../groovy/cps/CpsTransformerTest.groovy | 58 +++++++++++++++++++ 2 files changed, 84 insertions(+), 11 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 2064c17b1..a1a1fa459 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -486,7 +486,8 @@ public void run() { visit(call.getObjectExpression()); } if (call.isSpreadSafe()) { - throw new UnsupportedOperationException("spread not yet supported in " + call.getText()); // TODO will require safepoints + sourceUnit.addError(new SyntaxException("spread not yet supported for CPS transformation", + call.getLineNumber(), call.getColumnNumber())); } visit(call.getMethod()); literal(call.isSafe()); @@ -663,7 +664,8 @@ public void run() { @Override public void visitSynchronizedStatement(SynchronizedStatement statement) { - throw new UnsupportedOperationException(); + sourceUnit.addError(new SyntaxException("synchronized is unsupported for CPS transformation", + statement.getLineNumber(), statement.getColumnNumber())); } @Override @@ -838,7 +840,8 @@ public void run() { return; } - throw new UnsupportedOperationException("Operation: " + exp.getOperation() + " not supported"); + sourceUnit.addError(new SyntaxException("Unsupported operation in this context", + exp.getLineNumber(), exp.getColumnNumber())); } @Override @@ -918,7 +921,8 @@ public void run() { @Override public void visitTupleExpression(TupleExpression expression) { - throw new UnsupportedOperationException(); + sourceUnit.addError(new SyntaxException("Unsupported tuple expression in this context", + expression.getLineNumber(), expression.getColumnNumber())); } @Override @@ -941,7 +945,8 @@ public void run() { @Override public void visitMapEntryExpression(MapEntryExpression expression) { - throw new UnsupportedOperationException(); + sourceUnit.addError(new SyntaxException("Unsupported map entry expression for CPS transformation in this context", + expression.getLineNumber(), expression.getColumnNumber())); } @Override @@ -1193,18 +1198,22 @@ public void run() { } }); } else { - throw new UnsupportedOperationException(exp.getText()); + // Note - it does not appear this path is actually reachable. + sourceUnit.addError(new SyntaxException("Unsupported array expression for CPS transformation in this context", + exp.getLineNumber(), exp.getColumnNumber())); } } @Override public void visitSpreadExpression(SpreadExpression expression) { - throw new UnsupportedOperationException(); + sourceUnit.addError(new SyntaxException("spread not yet supported for CPS transformation", + expression.getLineNumber(), expression.getColumnNumber())); } @Override public void visitSpreadMapExpression(SpreadMapExpression expression) { - throw new UnsupportedOperationException(); + sourceUnit.addError(new SyntaxException("spread map not yet supported for CPS transformation", + expression.getLineNumber(), expression.getColumnNumber())); } @Override @@ -1267,17 +1276,23 @@ public void run() { @Override public void visitArgumentlistExpression(ArgumentListExpression expression) { - throw new UnsupportedOperationException(); + // This should not be reachable since ArgumentListExpression only shows up in contexts where we already handle it directly. + sourceUnit.addError(new SyntaxException("Unsupported argument list expression for CPS transformation in this context", + expression.getLineNumber(), expression.getColumnNumber())); } @Override public void visitClosureListExpression(ClosureListExpression closureListExpression) { - throw new UnsupportedOperationException(); + // This should not be reachable since ClosureListExpression only shows up in context where we already handle it directly. + sourceUnit.addError(new SyntaxException("Unsupported closure list expression for CPS transformation in this context", + closureListExpression.getLineNumber(), closureListExpression.getColumnNumber())); } @Override public void visitBytecodeExpression(BytecodeExpression expression) { - throw new UnsupportedOperationException(); + // This can't be encountered in a source file. + sourceUnit.addError(new SyntaxException("Unsupported expression for CPS transformation", + expression.getLineNumber(), expression.getColumnNumber())); } private static final ClassNode OBJECT_TYPE = ClassHelper.makeCached(Object.class); diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 55de86cca..27b60253a 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -966,4 +966,62 @@ return a + b + c + d ''') == 'firstsecondthirdfourth' } + @Test + void mapEntryInBadContext() { + try { + assert evalCPS(''' +return [[a: "a"], [b: "b"][c: "c"]]''') == "hi" + } catch (Exception e) { + assert e instanceof MultipleCompilationErrorsException + assert e.message.contains('Unsupported map entry expression for CPS transformation in this context') + } + } + + @Test + void spreadMethodCall() { + try { + assert evalCPS(''' +return ["a", "b", "c"]*.hashCode()''') == "hi" + } catch (Exception e) { + assert e instanceof MultipleCompilationErrorsException + assert e.message.contains('spread not yet supported for CPS transformation') + } + } + + @Test + void synchronizedStatement() { + try { + assert evalCPS(''' +synchronized(this) { return 1 }''') == "hi" + } catch (Exception e) { + assert e instanceof MultipleCompilationErrorsException + assert e.message.contains('synchronized is unsupported for CPS transformation') + } + } + + @Test + void spreadExpression() { + try { + assert evalCPS(''' +def x = [1, 2, 3] +return [*x, 4, 5] +''') == "hi" + } catch (Exception e) { + assert e instanceof MultipleCompilationErrorsException + assert e.message.contains('spread not yet supported for CPS transformation') + } + } + + @Test + void spreadMapExpression() { + try { + assert evalCPS(''' +def x = [a: 1, b: 2, c: 3] +return [*:x, d: 4, e: 5] +''') == "hi" + } catch (Exception e) { + assert e instanceof MultipleCompilationErrorsException + assert e.message.contains('spread map not yet supported for CPS transformation') + } + } } From 0eb89aaf24065dbbdf6db84516ac1a52cd435e6d Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 17 Oct 2018 20:27:18 -0400 Subject: [PATCH 527/932] [SECURITY-1186] Forbid sandboxed classes from overriding finalize. --- lib/pom.xml | 2 +- .../groovy/cps/SandboxCpsTransformer.java | 15 +++++--- .../cps/sandbox/SandboxInvokerTest.groovy | 35 +++++++++++++++++-- 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/lib/pom.xml b/lib/pom.xml index a8ccb9e61..2a9f7f2c1 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -105,7 +105,7 @@ - 1.17 + 1.20 diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java index 9455fb925..6697c8c48 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java @@ -6,18 +6,13 @@ import org.codehaus.groovy.ast.FieldNode; import org.codehaus.groovy.ast.MethodNode; import org.codehaus.groovy.ast.expr.CastExpression; -import org.codehaus.groovy.ast.expr.ConstantExpression; -import org.codehaus.groovy.ast.expr.DeclarationExpression; import org.codehaus.groovy.ast.expr.Expression; -import org.codehaus.groovy.ast.expr.TupleExpression; import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.Statement; import org.codehaus.groovy.classgen.GeneratorContext; import org.codehaus.groovy.control.SourceUnit; import org.kohsuke.groovy.sandbox.SandboxTransformer; -import java.util.List; - /** * {@link CpsTransformer} + {@link SandboxTransformer} * @@ -47,6 +42,7 @@ protected void processConstructors(ClassNode classNode) { */ @Override protected void visitNontransformedMethod(MethodNode m) { + st.forbidIfFinalizer(m); stv.visitMethod(m); } @@ -68,6 +64,15 @@ protected void visitNontransformedStatement(Statement s) { s.visit(stv); } + /** + * Overriding to allow for rejecting {@code finalize} methods when sandboxed. + */ + @Override + public void visitMethod(MethodNode m) { + st.forbidIfFinalizer(m); + super.visitMethod(m); + } + @Override public void visitCastExpression(final CastExpression exp) { if (exp.isCoerce()) { diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index 143d81cb9..5c085987d 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -10,6 +10,11 @@ import org.jvnet.hudson.test.Issue import org.kohsuke.groovy.sandbox.ClassRecorder import java.awt.Point +import org.codehaus.groovy.control.MultipleCompilationErrorsException + +import static org.hamcrest.CoreMatchers.containsString +import static org.hamcrest.CoreMatchers.equalTo +import static org.hamcrest.CoreMatchers.instanceOf /** * @author Kohsuke Kawaguchi @@ -378,12 +383,10 @@ Script1.runit(SandboxedMethodClosure) SandboxedMethodClosure.call() SandboxInvokerTest$Base.noArg() Checker:checkedCast(Class,CpsClosure,Boolean,Boolean,Boolean) -CpsClosure.call() Script1.runit(CpsClosure) CpsClosure.call() SandboxInvokerTest$Base.noArg() Checker:checkedCast(Class,SandboxedMethodClosure,Boolean,Boolean,Boolean) -SandboxedMethodClosure.call() Script1.runit(SandboxedMethodClosure) SandboxedMethodClosure.call() SandboxInvokerTest$Base.noArg() @@ -475,4 +478,32 @@ return a + b + c + d ''') == 'firstsecondthirdfourth' } + @Issue("SECURITY-1186") + @Test + void finalizerForbidden() { + try { + evalCpsSandbox('class Test { @Override public void finalize() { } }; null'); + fail("Finalizers should be rejected"); + } catch (MultipleCompilationErrorsException e) { + assertThat(e.getErrorCollector().getErrorCount(), equalTo(1)); + Exception innerE = e.getErrorCollector().getException(0); + assertThat(innerE, instanceOf(SecurityException.class)); + assertThat(innerE.getMessage(), containsString("Object.finalize()")); + } + } + + @Issue("SECURITY-1186") + @Test + void nonCpsfinalizerForbidden() { + try { + evalCpsSandbox('class Test { @Override @NonCPS public void finalize() { } }; null'); + fail("Finalizers should be rejected"); + } catch (MultipleCompilationErrorsException e) { + assertThat(e.getErrorCollector().getErrorCount(), equalTo(1)); + Exception innerE = e.getErrorCollector().getException(0); + assertThat(innerE, instanceOf(SecurityException.class)); + assertThat(innerE.getMessage(), containsString("Object.finalize()")); + } + } + } From 622dcebe1919c1a4f6564c20e00f5e6b6f0cfda0 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 17 Oct 2018 20:30:14 -0400 Subject: [PATCH 528/932] [maven-release-plugin] prepare release groovy-cps-parent-1.25 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index e63cb87c5..b25e8957c 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.25-SNAPSHOT + 1.25 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 2a9f7f2c1..5468093d3 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.25-SNAPSHOT + 1.25 groovy-cps diff --git a/pom.xml b/pom.xml index 4ed398101..8280a995d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.25-SNAPSHOT + 1.25 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.25 From 03d323b8321fe440281dd4499518070ea0f482e2 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 17 Oct 2018 20:30:14 -0400 Subject: [PATCH 529/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index b25e8957c..2b0efda1a 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.25 + 1.26-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 5468093d3..3f8f76400 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.25 + 1.26-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 8280a995d..5cd5a3b35 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.25 + 1.26-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.25 + HEAD From 52e0f91dab94cbe0c9955528aff74e74dc670e29 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Fri, 22 Feb 2019 11:10:10 -0500 Subject: [PATCH 530/932] Add ignored test for unfixed variant of JENKINS-31484 --- .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 5ee262fab..3007d72c3 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -3,6 +3,7 @@ package com.cloudbees.groovy.cps import com.cloudbees.groovy.cps.impl.CpsCallableInvocation import groovy.transform.NotYetImplemented import org.codehaus.groovy.control.MultipleCompilationErrorsException +import org.junit.Ignore import org.junit.Test import org.jvnet.hudson.test.Issue @@ -605,6 +606,13 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS('class C {private int x = 33; int getX() {2 * x}}; new C().x') == 66 } + @Issue("JENKINS-31484") + @Ignore("Currently throws StackOverflowError") + @Test + void fieldViaGetterWithThis() { + assert evalCPS('class C {private int x = 33; int getX() {2 * this.x}}; new C().x') == 66 + } + @Issue("JENKINS-31484") @Test void fieldViaSetter() { From f0cf5e8ac8c0d0a1025aa735f26b2493944a4f04 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 18 Mar 2019 19:39:59 -0400 Subject: [PATCH 531/932] [SECURITY-1353] Problems with casts --- lib/pom.xml | 2 +- .../com/cloudbees/groovy/cps/Builder.java | 12 +++++-- .../groovy/cps/SandboxCpsTransformer.java | 31 +++++++++---------- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/lib/pom.xml b/lib/pom.xml index 3f8f76400..caec8b3bb 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -105,7 +105,7 @@ - 1.20 + 1.21 diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java index a6774ecfc..e158a9683 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -589,15 +589,23 @@ public Block cast(int line, Block block, Class type, boolean coerce) { block,constant(type)); } + /** + * @deprecated Just for compatibility with old scripts; prefer {@link #sandboxCastOrCoerce} + */ + @Deprecated + public Block sandboxCast(int line, Block block, Class type, boolean ignoreAutoboxing, boolean strict) { + return sandboxCastOrCoerce(line, block, type, ignoreAutoboxing, true, strict); + } + /** * Cast to type when {@link CastExpression#isCoerce} from {@link SandboxCpsTransformer}. */ // TODO should ideally be defined in some sandbox-specific subtype of Builder - public Block sandboxCast(int line, Block block, Class type, boolean ignoreAutoboxing, boolean strict) { + public Block sandboxCastOrCoerce(int line, Block block, Class type, boolean ignoreAutoboxing, boolean coerce, boolean strict) { return staticCall(line, Checker.class, "checkedCast", constant(type), block, - constant(ignoreAutoboxing), constant(true), constant(strict)); + constant(ignoreAutoboxing), constant(coerce), constant(strict)); } public Block instanceOf(int line, Block value, Block type) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java index 6697c8c48..c195b34b0 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java @@ -75,32 +75,30 @@ public void visitMethod(MethodNode m) { @Override public void visitCastExpression(final CastExpression exp) { - if (exp.isCoerce()) { - makeNode("sandboxCast", new Runnable() { - @Override - public void run() { - loc(exp); - visit(exp.getExpression()); - literal(exp.getType()); - literal(exp.isIgnoringAutoboxing()); - literal(exp.isStrict()); - } - }); - } else { - super.visitCastExpression(exp); - } + makeNode("sandboxCastOrCoerce", new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getExpression()); + literal(exp.getType()); + literal(exp.isIgnoringAutoboxing()); + literal(exp.isCoerce()); + literal(exp.isStrict()); + } + }); } @Override protected void visitAssignmentOrCast(final VariableExpression varExp, final Expression rhs) { if (SandboxTransformer.mightBePositionalArgumentConstructor(varExp)) { - makeNode("sandboxCast", new Runnable() { + makeNode("sandboxCastOrCoerce", new Runnable() { @Override public void run() { loc(varExp); visit(rhs); literal(varExp.getType()); literal(false); + literal(true); literal(false); } }); @@ -112,7 +110,7 @@ public void run() { @Override protected void getMultipleAssignmentValueOrCast(final VariableExpression varExp, final Expression rhs, final Expression index) { if (SandboxTransformer.mightBePositionalArgumentConstructor(varExp)) { - makeNode("sandboxCast", new Runnable() { + makeNode("sandboxCastOrCoerce", new Runnable() { @Override public void run() { loc(varExp); @@ -126,6 +124,7 @@ public void run() { }); literal(varExp.getType()); literal(false); + literal(true); literal(false); } }); From 1bd7794b3ed2ff4a88075eed62f34aee6bd64863 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 18 Mar 2019 19:42:09 -0400 Subject: [PATCH 532/932] [maven-release-plugin] prepare release groovy-cps-parent-1.26 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 2b0efda1a..75ef2ca9a 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.26-SNAPSHOT + 1.26 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index caec8b3bb..9de245275 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.26-SNAPSHOT + 1.26 groovy-cps diff --git a/pom.xml b/pom.xml index 5cd5a3b35..1f0b17086 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.26-SNAPSHOT + 1.26 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.26 From 67754b58ab3b2e86b3433e25c8b2ec1313253f1f Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 18 Mar 2019 19:42:09 -0400 Subject: [PATCH 533/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 75ef2ca9a..7ecfdd529 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.26 + 1.27-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 9de245275..049c7b235 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.26 + 1.27-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 1f0b17086..d9b565f0c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.26 + 1.27-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.26 + HEAD From 411b4df3696322a684f8c0bbdaec35ce85e33f2a Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 29 Mar 2019 11:20:36 -0400 Subject: [PATCH 534/932] com.cloudbees:cloudbees-oss-parent:9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9b565f0c..c4e6aea9e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.cloudbees cloudbees-oss-parent - 7 + 9 From 2575eccd8e04291eff8961a28106011d1d53be08 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 Apr 2019 21:15:39 -0400 Subject: [PATCH 535/932] Better synchronize access to CpsFlowExecution.internalCalls. --- .../workflow/cps/CpsFlowExecution.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 7211b3923..9b8f96bb0 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -463,13 +463,17 @@ synchronized void logTimings() { * Mark a call to an internal API made by this build. * @param call a representation of the call site; for example, {@code hudson.model.Run.setDescription} */ - synchronized void recordInternalCall(String call) { + synchronized void recordInternalCall(@Nonnull String call) { if (internalCalls == null) { internalCalls = new TreeSet<>(); } internalCalls.add(call); } + synchronized @Nonnull Set getInternalCalls() { + return internalCalls != null ? new TreeSet<>(internalCalls) : Collections.emptySet(); + } + /** * Returns a groovy compiler used to load the script. * @@ -1961,7 +1965,7 @@ public void autopersist(@Nonnull FlowNode n) throws IOException { container.add(new Content("nodes/master/pipeline-internal-calls.txt") { @Override public void writeTo(OutputStream outputStream) throws IOException { PrintWriter pw = new PrintWriter(new OutputStreamWriter(outputStream, Charsets.UTF_8)); - for (Job job : Jenkins.getActiveInstance().getAllItems(Job.class)) { + for (Job job : Jenkins.get().getAllItems(Job.class)) { // TODO as above if (job instanceof Queue.FlyweightTask) { Run run = job.getLastCompletedBuild(); @@ -1970,14 +1974,11 @@ public void autopersist(@Nonnull FlowNode n) throws IOException { if (owner != null) { FlowExecution exec = owner.get(); if (exec instanceof CpsFlowExecution) { - Set calls = ((CpsFlowExecution) exec).internalCalls; - if (calls != null) { - pw.println("Internal calls for " + run + ":"); - for (String call : calls) { - pw.println(" " + call); - } - pw.println(); + pw.println("Internal calls for " + run + ":"); + for (String call : ((CpsFlowExecution) exec).getInternalCalls()) { + pw.println(" " + call); } + pw.println(); } } } From 5760c5f979e894d4421f6ac26297a3b605652173 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 Apr 2019 21:16:10 -0400 Subject: [PATCH 536/932] Fixed handling of static method calls. --- .../plugins/workflow/cps/LoggingInvoker.java | 33 ++++++++--- .../workflow/cps/LoggingInvokerTest.java | 56 +++++++++++++++++++ 2 files changed, 80 insertions(+), 9 deletions(-) create mode 100644 src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java index afe4c9c8d..bf292369c 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java @@ -29,6 +29,8 @@ import com.cloudbees.groovy.cps.sandbox.Invoker; import com.cloudbees.groovy.cps.sandbox.SandboxInvoker; import java.util.function.Supplier; +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; /** * Captures CPS-transformed events. @@ -60,6 +62,9 @@ private void record(String call) { } private static boolean isInternal(Class clazz) { + if (clazz == Safepoint.class) { + return false; + } // TODO more precise would be the logic in jenkins.security.ClassFilterImpl.isLocationWhitelisted // (simply checking whether the class loader can “see”, say, jenkins/model/Jenkins.class // would falsely mark third-party libs bundled in Jenkins plugins) @@ -74,14 +79,19 @@ private void maybeRecord(Class clazz, Supplier message) { } } - private void maybeRecord(Object o, Supplier message) { - if (o != null && isInternal(o.getClass())) { - record(message.get()); + private static @Nonnull Class classOf(@CheckForNull Object receiver) { + if (receiver == null) { + return Void.class; + } else if (receiver instanceof Class) { + return (Class) receiver; + } else { + return receiver.getClass(); } } @Override public Object methodCall(Object receiver, String method, Object[] args) throws Throwable { - maybeRecord(receiver, () -> receiver.getClass().getName() + "." + method); + Class clazz = classOf(receiver); + maybeRecord(clazz, () -> clazz.getName() + "." + method); return delegate.methodCall(receiver, method, args); } @@ -96,22 +106,26 @@ private void maybeRecord(Object o, Supplier message) { } @Override public Object getProperty(Object lhs, String name) throws Throwable { - maybeRecord(lhs, () -> lhs.getClass().getName() + "." + name); + Class clazz = classOf(lhs); + maybeRecord(clazz, () -> clazz.getName() + "." + name); return delegate.getProperty(lhs, name); } @Override public void setProperty(Object lhs, String name, Object value) throws Throwable { - maybeRecord(lhs, () -> lhs.getClass().getName() + "." + name); + Class clazz = classOf(lhs); + maybeRecord(clazz, () -> clazz.getName() + "." + name); delegate.setProperty(lhs, name, value); } @Override public Object getAttribute(Object lhs, String name) throws Throwable { - maybeRecord(lhs, () -> lhs.getClass().getName() + "." + name); + Class clazz = classOf(lhs); + maybeRecord(clazz, () -> clazz.getName() + "." + name); return delegate.getAttribute(lhs, name); } @Override public void setAttribute(Object lhs, String name, Object value) throws Throwable { - maybeRecord(lhs, () -> lhs.getClass().getName() + "." + name); + Class clazz = classOf(lhs); + maybeRecord(clazz, () -> clazz.getName() + "." + name); delegate.setAttribute(lhs, name, value); } @@ -124,7 +138,8 @@ private void maybeRecord(Object o, Supplier message) { } @Override public Object methodPointer(Object lhs, String name) { - maybeRecord(lhs, () -> lhs.getClass().getName() + "." + name); + Class clazz = classOf(lhs); + maybeRecord(clazz, () -> clazz.getName() + "." + name); return delegate.methodPointer(lhs, name); } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java new file mode 100644 index 000000000..afea981f0 --- /dev/null +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java @@ -0,0 +1,56 @@ +/* + * The MIT License + * + * Copyright 2019 CloudBees, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package org.jenkinsci.plugins.workflow.cps; + +import java.util.Arrays; +import java.util.TreeSet; +import org.jenkinsci.plugins.workflow.job.WorkflowJob; +import org.jenkinsci.plugins.workflow.job.WorkflowRun; +import org.junit.Test; +import static org.junit.Assert.*; +import org.junit.Rule; +import org.jvnet.hudson.test.JenkinsRule; + +public class LoggingInvokerTest { + + @Rule public JenkinsRule r = new JenkinsRule(); + + @Test public void smokes() throws Exception { + assertInternalCalls("currentBuild.rawBuild.description = 'XXX'; Jenkins.instance.systemMessage = 'XXX'", false, + "hudson.model.Hudson.systemMessage", + "jenkins.model.Jenkins.instance", + "org.jenkinsci.plugins.workflow.job.WorkflowRun.description", + "org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper.rawBuild"); + } + + private void assertInternalCalls(String script, boolean sandbox, String... calls) throws Exception { + WorkflowJob p = r.createProject(WorkflowJob.class); + p.setDefinition(new CpsFlowDefinition(script, sandbox)); + WorkflowRun b = r.buildAndAssertSuccess(p); + CpsFlowExecution exec = (CpsFlowExecution) b.getExecution(); + assertEquals(new TreeSet<>(Arrays.asList(calls)).toString(), exec.getInternalCalls().toString()); + } + +} From ae6856e64b3210f6faafa7d6a53bf27948ab2bfa Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 Apr 2019 21:39:33 -0400 Subject: [PATCH 537/932] Never match calls to Groovy classes, regardless of name. --- .../org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java | 4 ++++ .../jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java index bf292369c..7f3e9ca7f 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java @@ -28,6 +28,7 @@ import com.cloudbees.groovy.cps.sandbox.DefaultInvoker; import com.cloudbees.groovy.cps.sandbox.Invoker; import com.cloudbees.groovy.cps.sandbox.SandboxInvoker; +import groovy.lang.GroovyClassLoader; import java.util.function.Supplier; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; @@ -65,6 +66,9 @@ private static boolean isInternal(Class clazz) { if (clazz == Safepoint.class) { return false; } + if (clazz.getClassLoader() instanceof GroovyClassLoader) { // similar to GroovyClassLoaderWhitelist + return false; + } // TODO more precise would be the logic in jenkins.security.ClassFilterImpl.isLocationWhitelisted // (simply checking whether the class loader can “see”, say, jenkins/model/Jenkins.class // would falsely mark third-party libs bundled in Jenkins plugins) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java index afea981f0..29fd72917 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java @@ -45,6 +45,10 @@ public class LoggingInvokerTest { "org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper.rawBuild"); } + @Test public void groovyCalls() throws Exception { + assertInternalCalls("class jenkinsHacks {}; echo(/created ${new jenkinsHacks()}/)", true); + } + private void assertInternalCalls(String script, boolean sandbox, String... calls) throws Exception { WorkflowJob p = r.createProject(WorkflowJob.class); p.setDefinition(new CpsFlowDefinition(script, sandbox)); From fedc614e9aa96f9ea1b8091ef13b032453ecb414 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 Apr 2019 21:48:57 -0400 Subject: [PATCH 538/932] Was also getting confused by CpsClosure2. --- .../jenkinsci/plugins/workflow/cps/LoggingInvoker.java | 2 +- .../plugins/workflow/cps/LoggingInvokerTest.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java index 7f3e9ca7f..afa90cf4c 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java @@ -63,7 +63,7 @@ private void record(String call) { } private static boolean isInternal(Class clazz) { - if (clazz == Safepoint.class) { + if (clazz == Safepoint.class || clazz == CpsClosure2.class) { return false; } if (clazz.getClassLoader() instanceof GroovyClassLoader) { // similar to GroovyClassLoaderWhitelist diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java index 29fd72917..89b48c47a 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java @@ -30,12 +30,12 @@ import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.junit.Test; import static org.junit.Assert.*; -import org.junit.Rule; +import org.junit.ClassRule; import org.jvnet.hudson.test.JenkinsRule; public class LoggingInvokerTest { - @Rule public JenkinsRule r = new JenkinsRule(); + @ClassRule public static JenkinsRule r = new JenkinsRule(); @Test public void smokes() throws Exception { assertInternalCalls("currentBuild.rawBuild.description = 'XXX'; Jenkins.instance.systemMessage = 'XXX'", false, @@ -49,6 +49,10 @@ public class LoggingInvokerTest { assertInternalCalls("class jenkinsHacks {}; echo(/created ${new jenkinsHacks()}/)", true); } + @Test public void closures() throws Exception { + assertInternalCalls("node {echo 'hello'}", true); + } + private void assertInternalCalls(String script, boolean sandbox, String... calls) throws Exception { WorkflowJob p = r.createProject(WorkflowJob.class); p.setDefinition(new CpsFlowDefinition(script, sandbox)); From 2cf36dd0e083439f8a0ade7073d0e7de5c0ed7fe Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 22 Apr 2019 21:54:40 -0400 Subject: [PATCH 539/932] Do not record builds with no internal calls. --- .../plugins/workflow/cps/CpsFlowExecution.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 9b8f96bb0..50a6ad2a7 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -1974,11 +1974,14 @@ public void autopersist(@Nonnull FlowNode n) throws IOException { if (owner != null) { FlowExecution exec = owner.get(); if (exec instanceof CpsFlowExecution) { - pw.println("Internal calls for " + run + ":"); - for (String call : ((CpsFlowExecution) exec).getInternalCalls()) { - pw.println(" " + call); + Set calls = ((CpsFlowExecution) exec).getInternalCalls(); + if (!calls.isEmpty()) { + pw.println("Internal calls for " + run + ":"); + for (String call : calls) { + pw.println(" " + call); + } + pw.println(); } - pw.println(); } } } From c2e8d0c13ea697482f850ae9ee1bd38fd13df6b0 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 09:52:50 -0400 Subject: [PATCH 540/932] Introduced CpsCallableInvocation.mismatchMessage to make tests more stable, and using a more natural CpsCallableInvocation.invoke syntax. --- .../groovy/cps/impl/ContinuationGroup.java | 25 +-------------- .../cps/impl/CpsCallableInvocation.java | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index e766118e4..6f259c881 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -4,7 +4,6 @@ import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.Logging; import com.cloudbees.groovy.cps.Next; import com.cloudbees.groovy.cps.sandbox.Invoker; import org.codehaus.groovy.runtime.callsite.CallSite; @@ -16,7 +15,6 @@ import java.util.List; import static com.cloudbees.groovy.cps.impl.SourceLocation.*; -import java.io.PrintStream; /** * Base class for defining a series of {@link Continuation} methods that share the same set of contextual values. @@ -61,33 +59,12 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat // if this was a normal function, the method had just executed synchronously return k.receive(v); } catch (CpsCallableInvocation inv) { - if (isMismatch(methodName, inv.methodName)) { - PrintStream ps = Logging.current(); - if (ps != null) { - ps.println("expected to call " + methodName + " but wound up catching " + inv.methodName); - } - } - return inv.invoke(e, loc, k); + return inv.invoke(methodName, e, loc, k); } catch (Throwable t) { return throwException(e, t, loc, new ReferenceStackTrace()); } } - /** @see JENKINS-31314 */ - private static boolean isMismatch(String expected, String caught) { - if (expected.equals(caught)) { - return false; - } - if (expected.startsWith("$")) { - // see TODO comment in Translator w.r.t. overloadsResolved - return false; - } - if (expected.equals("evaluate") && caught.equals("run")) { - return false; - } - return true; - } - /** * Fix up the stack trace of an exception thrown from synchronous code. */ diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index a1352083e..6ca29d830 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -3,7 +3,9 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Logging; import com.cloudbees.groovy.cps.Next; +import java.io.PrintStream; import java.util.List; @@ -47,6 +49,21 @@ public Next invoke(Env caller, SourceLocation loc, Continuation k) { return call.invoke(caller, loc, receiver,arguments,k); } + public Next invoke(String expectedMethodName, Env caller, SourceLocation loc, Continuation k) { + if (isMismatch(expectedMethodName, methodName)) { + PrintStream ps = Logging.current(); + if (ps != null) { + ps.println(mismatchMessage(expectedMethodName, methodName)); + } + } + return invoke(caller, loc, k); + } + + public static String mismatchMessage(String expectedMethodName, String actualMethodName) { + // TODO reference something like https://jenkins.io/redirects/pipeline-cps-method-mismatches/ sending you to a wiki page with commonly attempted idioms and the working equivalents + return "expected to call " + expectedMethodName + " but wound up catching " + actualMethodName; + } + /** * Creates a {@link Block} that performs this invocation and pass the result to the given {@link Continuation}. */ @@ -68,4 +85,19 @@ public String toString() { return "CpsCallableInvocation{methodName=" + methodName + ", call=" + call + ", receiver=" + receiver + ", arguments=" + arguments + '}'; } + /** @see JENKINS-31314 */ + private static boolean isMismatch(String expected, String caught) { + if (expected.equals(caught)) { + return false; + } + if (expected.startsWith("$")) { + // see TODO comment in Translator w.r.t. overloadsResolved + return false; + } + if (expected.equals("evaluate") && caught.equals("run")) { + return false; + } + return true; + } + } From ff73727406d96d8ec304e2cd6b28af14acabec0e Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 10:04:30 -0400 Subject: [PATCH 541/932] Introduced mismatchMessageFragment for use from negative assertions. --- .../cloudbees/groovy/cps/impl/CpsCallableInvocation.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 6ca29d830..4b9e6367f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -61,7 +61,11 @@ public Next invoke(String expectedMethodName, Env caller, SourceLocation loc, Co public static String mismatchMessage(String expectedMethodName, String actualMethodName) { // TODO reference something like https://jenkins.io/redirects/pipeline-cps-method-mismatches/ sending you to a wiki page with commonly attempted idioms and the working equivalents - return "expected to call " + expectedMethodName + " but wound up catching " + actualMethodName; + return mismatchMessageFragment() + expectedMethodName + " but wound up catching " + actualMethodName; + } + + public static String mismatchMessageFragment() { + return "expected to call "; } /** From bf935881bed45541e3a470a2142ea2ea9f7b5314 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 11:39:41 -0400 Subject: [PATCH 542/932] Replacing Logging with a more targeted callback design which is better for testability. --- .../com/cloudbees/groovy/cps/Logging.java | 39 ------------------- .../cps/impl/CpsCallableInvocation.java | 37 +++++++++++------- 2 files changed, 23 insertions(+), 53 deletions(-) delete mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/Logging.java diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Logging.java b/lib/src/main/java/com/cloudbees/groovy/cps/Logging.java deleted file mode 100644 index be8db962f..000000000 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Logging.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2018 CloudBees, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudbees.groovy.cps; - -import java.io.PrintStream; -import javax.annotation.CheckForNull; - -/** - * Contextually-appropriate logging. - */ -public class Logging { - - static final ThreadLocal currentLogger = new ThreadLocal<>(); - - public static void register(@CheckForNull PrintStream ps) { - currentLogger.set(ps); - } - - public static @CheckForNull PrintStream current() { - return currentLogger.get(); - } - - private Logging() {} - -} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 4b9e6367f..12e01a324 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -3,14 +3,13 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.Logging; import com.cloudbees.groovy.cps.Next; -import java.io.PrintStream; import java.util.List; import static java.util.Arrays.*; import java.util.Collections; +import javax.annotation.CheckForNull; /** * When an CPS-interpreted method is invoked, it immediately throws this error @@ -38,8 +37,11 @@ public CpsCallableInvocation(CpsCallable call, Object receiver, Object... argume this("?", call, receiver, arguments); } - public CpsCallableInvocation(String description, CpsCallable call, Object receiver, Object... arguments) { - this.methodName = description; + /** + * @param methodName see {@link #invoke(String, Env, SourceLocation, Continuation)} + */ + public CpsCallableInvocation(String methodName, CpsCallable call, Object receiver, Object... arguments) { + this.methodName = methodName; this.call = call; this.receiver = receiver; this.arguments = arguments != null ? asList(arguments) : Collections.emptyList(); @@ -49,25 +51,32 @@ public Next invoke(Env caller, SourceLocation loc, Continuation k) { return call.invoke(caller, loc, receiver,arguments,k); } + /** + * @param expectedMethodName when not matching that passed to {@link CpsCallableInvocation#CpsCallableInvocation(String, CpsCallable, Object, Object...)}, will use logic from {@link #registerMismatchHandler} + */ public Next invoke(String expectedMethodName, Env caller, SourceLocation loc, Continuation k) { if (isMismatch(expectedMethodName, methodName)) { - PrintStream ps = Logging.current(); - if (ps != null) { - ps.println(mismatchMessage(expectedMethodName, methodName)); + MismatchHandler handler = handlers.get(); + if (handler != null) { + handler.handle(expectedMethodName, methodName); } } return invoke(caller, loc, k); } - - public static String mismatchMessage(String expectedMethodName, String actualMethodName) { - // TODO reference something like https://jenkins.io/redirects/pipeline-cps-method-mismatches/ sending you to a wiki page with commonly attempted idioms and the working equivalents - return mismatchMessageFragment() + expectedMethodName + " but wound up catching " + actualMethodName; - } - public static String mismatchMessageFragment() { - return "expected to call "; + /** @see #registerMismatchHandler */ + @FunctionalInterface + public interface MismatchHandler { + void handle(String expectedMethodName, String actualMethodName); } + private static final ThreadLocal handlers = new ThreadLocal<>(); + + /** @see #invoke(String, Env, SourceLocation, Continuation) */ + public static void registerMismatchHandler(@CheckForNull MismatchHandler handler) { + handlers.set(handler); + } + /** * Creates a {@link Block} that performs this invocation and pass the result to the given {@link Continuation}. */ From 042a943bf1296a5f83906b22bc68c83e1f112b40 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 13:33:36 -0400 Subject: [PATCH 543/932] Now handling Script binding case. --- .../groovy/cps/impl/ContinuationGroup.java | 26 ++++++++++++++----- .../cps/impl/CpsCallableInvocation.java | 25 +++++++++--------- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 6f259c881..ae3e42cec 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -5,16 +5,18 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; +import static com.cloudbees.groovy.cps.impl.SourceLocation.*; import com.cloudbees.groovy.cps.sandbox.Invoker; -import org.codehaus.groovy.runtime.callsite.CallSite; - -import javax.annotation.CheckReturnValue; +import groovy.lang.GroovyCodeSource; +import groovy.lang.GroovyShell; +import groovy.lang.MetaClassImpl; +import groovy.lang.Script; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - -import static com.cloudbees.groovy.cps.impl.SourceLocation.*; +import javax.annotation.CheckReturnValue; +import org.codehaus.groovy.runtime.callsite.CallSite; /** * Base class for defining a series of {@link Continuation} methods that share the same set of contextual values. @@ -41,8 +43,12 @@ protected Next methodCall(Env e, SourceLocation loc, ContinuationPtr k, CallSite /** * Evaluates a function (possibly a workflow function), then pass the result to the given continuation. + * @see MetaClassImpl#invokePropertyOrMissing + * @see GroovyShell#evaluate(GroovyCodeSource) */ protected Next methodCall(final Env e, final SourceLocation loc, final Continuation k, final CallSiteBlock callSite, final Object receiver, final String methodName, final Object... args) { + List expectedMethodNames = new ArrayList<>(2); + expectedMethodNames.add(methodName); try { Caller.record(receiver,methodName,args); @@ -53,13 +59,21 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat Super s = (Super) receiver; v = inv.superCall(s.senderType, s.receiver, methodName, args); } else { + if (receiver instanceof Script) { + if (methodName.equals("evaluate")) { // Script.evaluate → GroovyShell.evaluate → Script.run + expectedMethodNames.add("run"); + } else if (((Script) receiver).getBinding().getVariables().get(methodName) != null) { // like invokePropertyOrMissing + expectedMethodNames.add(/* CLOSURE_CALL_METHOD */"call"); + } + } // TODO: spread v = inv.methodCall(receiver, methodName, args); } // if this was a normal function, the method had just executed synchronously return k.receive(v); } catch (CpsCallableInvocation inv) { - return inv.invoke(methodName, e, loc, k); + inv.checkMismatch(expectedMethodNames); + return inv.invoke(e, loc, k); } catch (Throwable t) { return throwException(e, t, loc, new ReferenceStackTrace()); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 12e01a324..6f1361e78 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -38,7 +38,7 @@ public CpsCallableInvocation(CpsCallable call, Object receiver, Object... argume } /** - * @param methodName see {@link #invoke(String, Env, SourceLocation, Continuation)} + * @param methodName see {@link #checkMismatch} */ public CpsCallableInvocation(String methodName, CpsCallable call, Object receiver, Object... arguments) { this.methodName = methodName; @@ -52,16 +52,20 @@ public Next invoke(Env caller, SourceLocation loc, Continuation k) { } /** - * @param expectedMethodName when not matching that passed to {@link CpsCallableInvocation#CpsCallableInvocation(String, CpsCallable, Object, Object...)}, will use logic from {@link #registerMismatchHandler} + * To be called prior to {@link #invoke}. + * @param expectedMethodNames possible values for {@link #methodName} */ - public Next invoke(String expectedMethodName, Env caller, SourceLocation loc, Continuation k) { - if (isMismatch(expectedMethodName, methodName)) { - MismatchHandler handler = handlers.get(); - if (handler != null) { - handler.handle(expectedMethodName, methodName); + void checkMismatch(List expectedMethodNames) { + assert !expectedMethodNames.isEmpty(); + for (String expectedMethodName : expectedMethodNames) { + if (!isMismatch(expectedMethodName, methodName)) { + return; } } - return invoke(caller, loc, k); + MismatchHandler handler = handlers.get(); + if (handler != null) { + handler.handle(expectedMethodNames.get(0), methodName); + } } /** @see #registerMismatchHandler */ @@ -72,7 +76,7 @@ public interface MismatchHandler { private static final ThreadLocal handlers = new ThreadLocal<>(); - /** @see #invoke(String, Env, SourceLocation, Continuation) */ + /** @see #checkMismatch */ public static void registerMismatchHandler(@CheckForNull MismatchHandler handler) { handlers.set(handler); } @@ -107,9 +111,6 @@ private static boolean isMismatch(String expected, String caught) { // see TODO comment in Translator w.r.t. overloadsResolved return false; } - if (expected.equals("evaluate") && caught.equals("run")) { - return false; - } return true; } From b5a47098ca834e3a65c0ff63d2fe3823f7b37bd5 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 13:38:59 -0400 Subject: [PATCH 544/932] Moving Translator.overloadsResolved handling back into ContinuationGroup. --- .../groovy/cps/impl/ContinuationGroup.java | 4 ++- .../cps/impl/CpsCallableInvocation.java | 25 ++++--------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index ae3e42cec..e59d4228e 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -72,7 +72,9 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat // if this was a normal function, the method had just executed synchronously return k.receive(v); } catch (CpsCallableInvocation inv) { - inv.checkMismatch(expectedMethodNames); + if (!methodName.startsWith("$")) { // see TODO comment in Translator w.r.t. overloadsResolved + inv.checkMismatch(expectedMethodNames); + } return inv.invoke(e, loc, k); } catch (Throwable t) { return throwException(e, t, loc, new ReferenceStackTrace()); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 6f1361e78..fb2f4448e 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -54,18 +54,15 @@ public Next invoke(Env caller, SourceLocation loc, Continuation k) { /** * To be called prior to {@link #invoke}. * @param expectedMethodNames possible values for {@link #methodName} + * @see JENKINS-31314 */ void checkMismatch(List expectedMethodNames) { - assert !expectedMethodNames.isEmpty(); - for (String expectedMethodName : expectedMethodNames) { - if (!isMismatch(expectedMethodName, methodName)) { - return; + if (!expectedMethodNames.contains(methodName)) { + MismatchHandler handler = handlers.get(); + if (handler != null) { + handler.handle(expectedMethodNames.get(0), methodName); } } - MismatchHandler handler = handlers.get(); - if (handler != null) { - handler.handle(expectedMethodNames.get(0), methodName); - } } /** @see #registerMismatchHandler */ @@ -102,16 +99,4 @@ public String toString() { return "CpsCallableInvocation{methodName=" + methodName + ", call=" + call + ", receiver=" + receiver + ", arguments=" + arguments + '}'; } - /** @see JENKINS-31314 */ - private static boolean isMismatch(String expected, String caught) { - if (expected.equals(caught)) { - return false; - } - if (expected.startsWith("$")) { - // see TODO comment in Translator w.r.t. overloadsResolved - return false; - } - return true; - } - } From 176998570a2dcc9d7da7ed165653908e4927f4f9 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 13:45:42 -0400 Subject: [PATCH 545/932] Moving discussion from https://github.com/cloudbees/groovy-cps/pull/85/files#r174587145. --- .../src/main/java/com/cloudbees/groovy/cps/tool/Translator.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 4b0ee3ae7..98d506348 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -390,6 +390,8 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { } else if (overloadsResolved.containsKey(overloadResolved)) { // Private, so delegate to our mangled version. // TODO add a String parameter to each internal helper method for the expected methodName to pass to CpsCallableInvocation. + // (It could be improved to take a parameter for the name under which we expect methodCall to be invoking it. + // Usually just `each`, but might be `$each__java_util_Iterable__groovy_lang_Closure` for the case that one DGM method is delegating to another.) inv = $b.invoke("staticCall") .arg(loc(mt)) .arg($output.dotclass()) From 894dc2dbce4bee2e1657a7342a275be670e5851c Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 13:48:17 -0400 Subject: [PATCH 546/932] Some more comments and formatting. --- .../java/com/cloudbees/groovy/cps/tool/Translator.java | 3 ++- .../java/com/cloudbees/groovy/cps/impl/CpsClosure.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 98d506348..a6618c1c8 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -391,7 +391,8 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { // Private, so delegate to our mangled version. // TODO add a String parameter to each internal helper method for the expected methodName to pass to CpsCallableInvocation. // (It could be improved to take a parameter for the name under which we expect methodCall to be invoking it. - // Usually just `each`, but might be `$each__java_util_Iterable__groovy_lang_Closure` for the case that one DGM method is delegating to another.) + // Usually just `each`, but might be `$each__java_util_Iterable__groovy_lang_Closure` for the case that one DGM method is delegating to another. + // See comment in ContinuationGroup, where we are unable to enforce continuation name mismatches in this case.) inv = $b.invoke("staticCall") .arg(loc(mt)) .arg($output.dotclass()) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java index 69d6a1a09..0504c8595 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsClosure.java @@ -30,17 +30,17 @@ public CpsClosure(Object owner, Object thisObject, List parameters, Bloc // returning CpsCallable lets the caller know that it needs to do CPS evaluation of this closure. @Override public Object call() { - throw new CpsCallableInvocation("call", def,this); + throw new CpsCallableInvocation("call", def, this); } @Override public Object call(Object... args) { - throw new CpsCallableInvocation("call", def,this,args); + throw new CpsCallableInvocation("call", def, this, args); } @Override public Object call(Object arguments) { - throw new CpsCallableInvocation("call", def,this,arguments); + throw new CpsCallableInvocation("call", def, this, arguments); } /** @@ -50,7 +50,7 @@ public Object call(Object arguments) { * {@link CurriedClosure} invokes this method directly (via {@link MetaClassImpl#invokeMethod(Class, Object, String, Object[], boolean, boolean)} */ public Object doCall(Object... args) { - throw new CpsCallableInvocation("call", def,this,args); + throw new CpsCallableInvocation("call", def, this, args); } private static final long serialVersionUID = 1L; From 13e443ff62a5ff8968cfa196b48f66a3d8240fa7 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 14:07:07 -0400 Subject: [PATCH 547/932] Handling CpsBooleanClosureWrapper.callForMap. --- .../java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index e59d4228e..46c09da49 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -65,6 +65,8 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat } else if (((Script) receiver).getBinding().getVariables().get(methodName) != null) { // like invokePropertyOrMissing expectedMethodNames.add(/* CLOSURE_CALL_METHOD */"call"); } + } else if (receiver instanceof CpsBooleanClosureWrapper && methodName.equals("callForMap")) { + expectedMethodNames.add("call"); } // TODO: spread v = inv.methodCall(receiver, methodName, args); From 9c03a8d6dbf0c768ab1890444ac2676c878d369d Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 14:27:14 -0400 Subject: [PATCH 548/932] Helpful to indicate the expected vs. actual receivers, not only method names. --- .../com/cloudbees/groovy/cps/impl/ContinuationGroup.java | 2 +- .../cloudbees/groovy/cps/impl/CpsCallableInvocation.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 46c09da49..baef141e5 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -75,7 +75,7 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat return k.receive(v); } catch (CpsCallableInvocation inv) { if (!methodName.startsWith("$")) { // see TODO comment in Translator w.r.t. overloadsResolved - inv.checkMismatch(expectedMethodNames); + inv.checkMismatch(receiver, expectedMethodNames); } return inv.invoke(e, loc, k); } catch (Throwable t) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index fb2f4448e..aea61066d 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -56,11 +56,11 @@ public Next invoke(Env caller, SourceLocation loc, Continuation k) { * @param expectedMethodNames possible values for {@link #methodName} * @see JENKINS-31314 */ - void checkMismatch(List expectedMethodNames) { + void checkMismatch(Object expectedReceiver, List expectedMethodNames) { if (!expectedMethodNames.contains(methodName)) { MismatchHandler handler = handlers.get(); if (handler != null) { - handler.handle(expectedMethodNames.get(0), methodName); + handler.handle(expectedReceiver, expectedMethodNames.get(0), receiver, methodName); } } } @@ -68,7 +68,7 @@ void checkMismatch(List expectedMethodNames) { /** @see #registerMismatchHandler */ @FunctionalInterface public interface MismatchHandler { - void handle(String expectedMethodName, String actualMethodName); + void handle(Object expectedReceiver, String expectedMethodName, Object actualReceiver, String actualMethodName); } private static final ThreadLocal handlers = new ThreadLocal<>(); From cbea3217fc9059b28bfa1018576b741d7b5a9a50 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 14:34:22 -0400 Subject: [PATCH 549/932] CpsFlowExecutionMemoryTest.loaderReleased turned up a variant of Script.evaluate from a CpsClosure2. --- .../java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index baef141e5..dbe7f12ba 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -67,6 +67,8 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat } } else if (receiver instanceof CpsBooleanClosureWrapper && methodName.equals("callForMap")) { expectedMethodNames.add("call"); + } else if (receiver instanceof CpsClosure && methodName.equals("evaluate")) { // similar to above, but from a call site inside a closure + expectedMethodNames.add("run"); } // TODO: spread v = inv.methodCall(receiver, methodName, args); From 63c635c04bd0ae4b92c0037d7c7b1c2da22ea2c4 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 14:39:37 -0400 Subject: [PATCH 550/932] Handling List/MapWithDefault.get. --- .../com/cloudbees/groovy/cps/impl/ContinuationGroup.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index dbe7f12ba..dff69140f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -9,6 +9,8 @@ import com.cloudbees.groovy.cps.sandbox.Invoker; import groovy.lang.GroovyCodeSource; import groovy.lang.GroovyShell; +import groovy.lang.ListWithDefault; +import groovy.lang.MapWithDefault; import groovy.lang.MetaClassImpl; import groovy.lang.Script; import java.io.Serializable; @@ -45,6 +47,9 @@ protected Next methodCall(Env e, SourceLocation loc, ContinuationPtr k, CallSite * Evaluates a function (possibly a workflow function), then pass the result to the given continuation. * @see MetaClassImpl#invokePropertyOrMissing * @see GroovyShell#evaluate(GroovyCodeSource) + * @see CpsBooleanClosureWrapper#callForMap + * @see ListWithDefault#get + * @see MapWithDefault#get */ protected Next methodCall(final Env e, final SourceLocation loc, final Continuation k, final CallSiteBlock callSite, final Object receiver, final String methodName, final Object... args) { List expectedMethodNames = new ArrayList<>(2); @@ -69,6 +74,8 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat expectedMethodNames.add("call"); } else if (receiver instanceof CpsClosure && methodName.equals("evaluate")) { // similar to above, but from a call site inside a closure expectedMethodNames.add("run"); + } else if ((receiver instanceof ListWithDefault || receiver instanceof MapWithDefault) && methodName.equals("get")) { + expectedMethodNames.add("call"); } // TODO: spread v = inv.methodCall(receiver, methodName, args); From c4b9e79e195fe3ebf089fec2f147369b656e973e Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 15:46:57 -0400 Subject: [PATCH 551/932] Numerous test failures in workflow-cps-global-lib caused by global variables being treated as functions. --- .../cloudbees/groovy/cps/impl/ContinuationGroup.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index dff69140f..c4bd0790f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -54,6 +54,7 @@ protected Next methodCall(Env e, SourceLocation loc, ContinuationPtr k, CallSite protected Next methodCall(final Env e, final SourceLocation loc, final Continuation k, final CallSiteBlock callSite, final Object receiver, final String methodName, final Object... args) { List expectedMethodNames = new ArrayList<>(2); expectedMethodNames.add(methodName); + boolean laxCall = false; try { Caller.record(receiver,methodName,args); @@ -67,9 +68,11 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat if (receiver instanceof Script) { if (methodName.equals("evaluate")) { // Script.evaluate → GroovyShell.evaluate → Script.run expectedMethodNames.add("run"); - } else if (((Script) receiver).getBinding().getVariables().get(methodName) != null) { // like invokePropertyOrMissing - expectedMethodNames.add(/* CLOSURE_CALL_METHOD */"call"); } + // Do not check receiver.binding.variables.containsKey(methodName) like invokePropertyOrMissing: + // CpsScript.invokeMethod e.g. on a UserDefinedGlobalVariable cannot be predicted from here. + expectedMethodNames.add(/* CLOSURE_CALL_METHOD */"call"); + laxCall = true; } else if (receiver instanceof CpsBooleanClosureWrapper && methodName.equals("callForMap")) { expectedMethodNames.add("call"); } else if (receiver instanceof CpsClosure && methodName.equals("evaluate")) { // similar to above, but from a call site inside a closure @@ -84,6 +87,10 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat return k.receive(v); } catch (CpsCallableInvocation inv) { if (!methodName.startsWith("$")) { // see TODO comment in Translator w.r.t. overloadsResolved + if (laxCall && inv.receiver instanceof CpsClosure) { + // Potential false negative from overly lax addition above. + expectedMethodNames.remove("call"); + } inv.checkMismatch(receiver, expectedMethodNames); } return inv.invoke(e, loc, k); From bb887539cd795a0842a32aea94b1034d77dac1f1 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 16:09:28 -0400 Subject: [PATCH 552/932] Was being too lax and getting false positives. --- .../java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index c4bd0790f..c8bd463c7 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -69,10 +69,9 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat if (methodName.equals("evaluate")) { // Script.evaluate → GroovyShell.evaluate → Script.run expectedMethodNames.add("run"); } - // Do not check receiver.binding.variables.containsKey(methodName) like invokePropertyOrMissing: // CpsScript.invokeMethod e.g. on a UserDefinedGlobalVariable cannot be predicted from here. expectedMethodNames.add(/* CLOSURE_CALL_METHOD */"call"); - laxCall = true; + laxCall = !((Script) receiver).getBinding().getVariables().containsKey(methodName); // lax unless like invokePropertyOrMissing } else if (receiver instanceof CpsBooleanClosureWrapper && methodName.equals("callForMap")) { expectedMethodNames.add("call"); } else if (receiver instanceof CpsClosure && methodName.equals("evaluate")) { // similar to above, but from a call site inside a closure From 72edb8ce23378a1a3b303f2303ce82b4651162f4 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 17:01:18 -0400 Subject: [PATCH 553/932] Handling of closure receivers was wrong. --- .../groovy/cps/impl/ContinuationGroup.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index c8bd463c7..bb447fbe8 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -55,6 +55,7 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat List expectedMethodNames = new ArrayList<>(2); expectedMethodNames.add(methodName); boolean laxCall = false; + Object effectiveReceiver = receiver instanceof CpsClosure ? ((CpsClosure) receiver).getOwner() : receiver; try { Caller.record(receiver,methodName,args); @@ -65,18 +66,16 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat Super s = (Super) receiver; v = inv.superCall(s.senderType, s.receiver, methodName, args); } else { - if (receiver instanceof Script) { + if (effectiveReceiver instanceof Script) { if (methodName.equals("evaluate")) { // Script.evaluate → GroovyShell.evaluate → Script.run expectedMethodNames.add("run"); } // CpsScript.invokeMethod e.g. on a UserDefinedGlobalVariable cannot be predicted from here. - expectedMethodNames.add(/* CLOSURE_CALL_METHOD */"call"); - laxCall = !((Script) receiver).getBinding().getVariables().containsKey(methodName); // lax unless like invokePropertyOrMissing - } else if (receiver instanceof CpsBooleanClosureWrapper && methodName.equals("callForMap")) { expectedMethodNames.add("call"); - } else if (receiver instanceof CpsClosure && methodName.equals("evaluate")) { // similar to above, but from a call site inside a closure - expectedMethodNames.add("run"); - } else if ((receiver instanceof ListWithDefault || receiver instanceof MapWithDefault) && methodName.equals("get")) { + laxCall = !((Script) effectiveReceiver).getBinding().getVariables().containsKey(methodName); // lax unless like invokePropertyOrMissing + } else if (effectiveReceiver instanceof CpsBooleanClosureWrapper && methodName.equals("callForMap")) { + expectedMethodNames.add("call"); + } else if ((effectiveReceiver instanceof ListWithDefault || effectiveReceiver instanceof MapWithDefault) && methodName.equals("get")) { expectedMethodNames.add("call"); } // TODO: spread @@ -90,7 +89,7 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat // Potential false negative from overly lax addition above. expectedMethodNames.remove("call"); } - inv.checkMismatch(receiver, expectedMethodNames); + inv.checkMismatch(effectiveReceiver, expectedMethodNames); } return inv.invoke(e, loc, k); } catch (Throwable t) { From 1d00d440688d6320f81c57c00e5320e63fa05727 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 23 Apr 2019 20:26:25 -0400 Subject: [PATCH 554/932] The effective receiver could be deeply nested. --- .../groovy/cps/impl/ContinuationGroup.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index bb447fbe8..9e87c2a1c 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -16,7 +16,9 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; +import java.util.IdentityHashMap; import java.util.List; +import java.util.Map; import javax.annotation.CheckReturnValue; import org.codehaus.groovy.runtime.callsite.CallSite; @@ -55,7 +57,7 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat List expectedMethodNames = new ArrayList<>(2); expectedMethodNames.add(methodName); boolean laxCall = false; - Object effectiveReceiver = receiver instanceof CpsClosure ? ((CpsClosure) receiver).getOwner() : receiver; + Object effectiveReceiver = findEffectiveReceiver(receiver, null); try { Caller.record(receiver,methodName,args); @@ -97,6 +99,20 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat } } + private static Object findEffectiveReceiver(Object receiver, Map encountered) { + if (!(receiver instanceof CpsClosure)) { + return receiver; + } + if (encountered == null) { + encountered = new IdentityHashMap<>(); + } + if (encountered.put(receiver, true) == null) { + return findEffectiveReceiver(((CpsClosure) receiver).getOwner(), encountered); + } else { + return receiver; + } + } + /** * Fix up the stack trace of an exception thrown from synchronous code. */ From bfc4e75038eac238b38c23d2a0f3ce9f6d370cc6 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 25 Apr 2019 12:03:52 -0400 Subject: [PATCH 555/932] [JENKINS-57085] Avoid complex StackTraceElement.fileName values. --- .../main/java/com/cloudbees/groovy/cps/CpsTransformer.java | 4 +++- .../main/java/com/cloudbees/groovy/cps/MethodLocation.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 2064c17b1..9590fbcad 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -284,11 +284,13 @@ CpsFunction ___cps___N() { * @param m Method being transformed. */ protected Expression makeBuilder(MethodNode m) { + String sourceName = sourceUnit.getName(); + sourceName = sourceName.substring(Math.max(sourceName.lastIndexOf('\\'), sourceName.lastIndexOf('/')) + 1); // JENKINS-57085 Expression b = new ConstructorCallExpression(BUIDER_TYPE, new TupleExpression( new ConstructorCallExpression(METHOD_LOCATION_TYPE, new TupleExpression( new ConstantExpression(m.getDeclaringClass().getName()), new ConstantExpression(m.getName()), - new ConstantExpression(sourceUnit.getName()) + new ConstantExpression(sourceName) )) )); b = new MethodCallExpression(b, "withClosureType", diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java index 028982ef9..a1314f6d2 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/MethodLocation.java @@ -22,6 +22,7 @@ public MethodLocation(Class clazz, String methodName) { public MethodLocation(String declaringClass, String methodName, String fileName) { this.declaringClass = declaringClass; this.methodName = methodName; + assert !fileName.contains(":") : "possible JENKINS-57085 violation in " + fileName; this.fileName = fileName; } From ce5f88387c7fdc53eb6666395320f0a8819446e4 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 25 Apr 2019 14:41:09 -0400 Subject: [PATCH 556/932] [maven-release-plugin] prepare release groovy-cps-parent-1.27 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 7ecfdd529..34ad6b0ac 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.27-SNAPSHOT + 1.27 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 049c7b235..32630947c 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.27-SNAPSHOT + 1.27 groovy-cps diff --git a/pom.xml b/pom.xml index c4e6aea9e..cca31f48e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.27-SNAPSHOT + 1.27 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.27 From 774f3e653ef4b88f66e93e9a2f7d7e6fa09f5c59 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 25 Apr 2019 14:41:15 -0400 Subject: [PATCH 557/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 34ad6b0ac..343c2759d 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.27 + 1.28-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 32630947c..72618314f 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.27 + 1.28-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index cca31f48e..2e71b8dc0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.27 + 1.28-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.27 + HEAD From ed7c8e78db671f7a7084320e4add3acfe42b3da0 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Sat, 25 May 2019 15:43:35 -0400 Subject: [PATCH 558/932] Also call checkMismatch when a constructor throws CpsCallableInvocation. --- .../java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index 94f71e2c7..05fea43f6 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import static com.cloudbees.groovy.cps.impl.SourceLocation.UNKNOWN; @@ -95,6 +96,9 @@ private Next dispatchOrArg() { try { v = e.getInvoker().contextualize(FunctionCallBlock.this).constructorCall((Class)lhs,args); } catch (Throwable t) { + if (t instanceof CpsCallableInvocation) { + ((CpsCallableInvocation) t).checkMismatch(lhs, Collections.singletonList(name)); + } return throwException(e, t, loc, new ReferenceStackTrace()); } if (v instanceof Throwable) From 16d01aac873720b67dd6df02079a93b25b7a7528 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Thu, 6 Jun 2019 11:48:50 -0400 Subject: [PATCH 559/932] [maven-release-plugin] prepare release groovy-cps-parent-1.28 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 343c2759d..b4990dcf5 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.28-SNAPSHOT + 1.28 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 72618314f..33c696fd3 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.28-SNAPSHOT + 1.28 groovy-cps diff --git a/pom.xml b/pom.xml index 2e71b8dc0..700e71ece 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.28-SNAPSHOT + 1.28 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.28 From 4fed4a02733b8fa2db3eb741e761f54e62e716f4 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Thu, 6 Jun 2019 11:48:55 -0400 Subject: [PATCH 560/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index b4990dcf5..77e3614db 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.28 + 1.29-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 33c696fd3..8d335cca1 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.28 + 1.29-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 700e71ece..b9fe9cbe8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.28 + 1.29-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.28 + HEAD From 184a4500bb080d64e4afb291e88eab44a6b6e94a Mon Sep 17 00:00:00 2001 From: Stuart Rowe Date: Thu, 20 Jun 2019 00:33:25 -0700 Subject: [PATCH 561/932] Update transformedSuperSuperClass() to be consistent with transformedSuperClass() --- .../groovy/cps/CpsTransformerTest.groovy | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 7cf0f4747..f8f93a83b 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -776,17 +776,22 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { void transformedSuperSuperClass() { assert evalCPS(''' class Foo extends CpsTransformerTest.Base { - public String toString() { - return "x"+super.toString() + public String other() { + return "base" } } class Bar extends Foo { - public String toString() { - return "y"+super.toString() + public String other() { + return "y"+super.other() + } + } + class Baz extends Bar { + public String other() { + return "z"+super.other() } } - new Bar().toString(); - ''')=="yxbase" + new Baz().other(); + ''')=="zybase" } @Test From 2d64a188a8164250cead37d174afad926248560c Mon Sep 17 00:00:00 2001 From: Stuart Rowe Date: Thu, 20 Jun 2019 00:38:51 -0700 Subject: [PATCH 562/932] USe the super class of methodType as the invoking class (sender) of the method on the object (receiver) --- .../java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java index 104b1df24..7b26f2e3f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java @@ -29,7 +29,7 @@ public Object constructorCall(Class lhs, Object[] args) throws Throwable { public Object superCall(Class methodType, Object receiver, String method, Object[] args) throws Throwable { try { MetaClass mc = InvokerHelper.getMetaClass(receiver.getClass()); - return mc.invokeMethod(methodType, receiver, method, args, true, true); + return mc.invokeMethod(methodType.getSuperclass(), receiver, method, args, true, true); } catch (GroovyRuntimeException gre) { throw ScriptBytecodeAdapter.unwrap(gre); } From 60350aa34b50d004ec9b19cc9baffb8e180c75c6 Mon Sep 17 00:00:00 2001 From: Stuart Rowe Date: Thu, 20 Jun 2019 00:40:30 -0700 Subject: [PATCH 563/932] Remove @NotYetImplemented annotation on test case for JENKINS-52395 --- .../groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index f8f93a83b..9adc94a69 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -770,7 +770,6 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { ''')=="ybase" } - @NotYetImplemented @Issue("JENKINS-52395") @Test void transformedSuperSuperClass() { From fde41e239ecde81d5270f9627c8e14b0dd47181c Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 5 Jul 2019 14:21:15 -0400 Subject: [PATCH 564/932] [maven-release-plugin] prepare release groovy-cps-parent-1.29 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 77e3614db..72c6483c4 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.29-SNAPSHOT + 1.29 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 8d335cca1..22c204b93 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.29-SNAPSHOT + 1.29 groovy-cps diff --git a/pom.xml b/pom.xml index b9fe9cbe8..5c79b7796 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.29-SNAPSHOT + 1.29 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.29 From 3224a92215095f7f5dd63138f39fd5a1453eec6c Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 5 Jul 2019 14:21:20 -0400 Subject: [PATCH 565/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 72c6483c4..8c043ff9c 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.29 + 1.30-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 22c204b93..359805937 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.29 + 1.30-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 5c79b7796..5b2e63bdc 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.29 + 1.30-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.29 + HEAD From 0c7e98880b45c46806074f999662433b0e616f11 Mon Sep 17 00:00:00 2001 From: steven-terrana Date: Thu, 18 Jul 2019 13:20:56 -0400 Subject: [PATCH 566/932] add exceptions for metaprogamming to CPS mismatches --- .../groovy/cps/impl/CpsCallableInvocation.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index aea61066d..e63933fe1 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -10,6 +10,7 @@ import static java.util.Arrays.*; import java.util.Collections; import javax.annotation.CheckForNull; +import groovy.lang.MetaClass; /** * When an CPS-interpreted method is invoked, it immediately throws this error @@ -57,10 +58,21 @@ public Next invoke(Env caller, SourceLocation loc, Continuation k) { * @see JENKINS-31314 */ void checkMismatch(Object expectedReceiver, List expectedMethodNames) { + String expectedMethodName = expectedMethodNames.get(0); + // metaclass invokeMethod + if(MetaClass.class.isInstance(expectedReceiver) && expectedMethodName.equals("invokeMethod")){ + return; + } + + // handle method missing + if(methodName.equals("methodMissing")){ + return; + } + if (!expectedMethodNames.contains(methodName)) { MismatchHandler handler = handlers.get(); if (handler != null) { - handler.handle(expectedReceiver, expectedMethodNames.get(0), receiver, methodName); + handler.handle(expectedReceiver, expectedMethodName, receiver, methodName); } } } From 5efd1c4e1198a42d44f17dfa0bbf5daf7071ef8d Mon Sep 17 00:00:00 2001 From: steven-terrana Date: Thu, 18 Jul 2019 19:06:53 -0400 Subject: [PATCH 567/932] Update lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java Co-Authored-By: Jesse Glick --- .../com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index e63933fe1..6b9bbd848 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -60,7 +60,7 @@ public Next invoke(Env caller, SourceLocation loc, Continuation k) { void checkMismatch(Object expectedReceiver, List expectedMethodNames) { String expectedMethodName = expectedMethodNames.get(0); // metaclass invokeMethod - if(MetaClass.class.isInstance(expectedReceiver) && expectedMethodName.equals("invokeMethod")){ + if (expectedReceiver instanceof MetaClass && expectedMethodName.equals("invokeMethod")) { return; } From 9b23eb9db00bb27934e15bd541b00735ce75a395 Mon Sep 17 00:00:00 2001 From: steven-terrana Date: Wed, 24 Jul 2019 11:19:02 -0400 Subject: [PATCH 568/932] remove unnecessary comments --- .../com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 6b9bbd848..dcd10182e 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -59,12 +59,11 @@ public Next invoke(Env caller, SourceLocation loc, Continuation k) { */ void checkMismatch(Object expectedReceiver, List expectedMethodNames) { String expectedMethodName = expectedMethodNames.get(0); - // metaclass invokeMethod + if (expectedReceiver instanceof MetaClass && expectedMethodName.equals("invokeMethod")) { return; } - // handle method missing if(methodName.equals("methodMissing")){ return; } From 10436a56655b2d2e7630e41a5171b1c21966d218 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 31 Jul 2019 14:29:57 -0400 Subject: [PATCH 569/932] [maven-release-plugin] prepare release groovy-cps-parent-1.30 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 8c043ff9c..5393d5c8c 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.30-SNAPSHOT + 1.30 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 359805937..381ccfa88 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.30-SNAPSHOT + 1.30 groovy-cps diff --git a/pom.xml b/pom.xml index 5b2e63bdc..1f64aa106 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.30-SNAPSHOT + 1.30 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.30 From e930c15e010c658690a98631e57a0672f286beab Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Wed, 31 Jul 2019 14:30:03 -0400 Subject: [PATCH 570/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 5393d5c8c..6f8855a28 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.30 + 1.31-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 381ccfa88..0218f820a 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.30 + 1.31-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index 1f64aa106..5b36e57b4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.30 + 1.31-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.30 + HEAD From 369de330b7388a1a3f036b0cde0edd510dc8aeca Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 19 Aug 2019 12:22:45 -0400 Subject: [PATCH 571/932] [FIXED JENKINS-58407] Treat closure fields and map values properly Don't throw a mismatch for cases like `foo.someField()` where `foo` is either an `Object` with a field `someField` that's a closure, or a `Map` with a `Closure` value for the key `someField`. Signed-off-by: Andrew Bayer --- .../cps/impl/CpsCallableInvocation.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index dcd10182e..229f00c97 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -9,8 +9,13 @@ import static java.util.Arrays.*; import java.util.Collections; +import java.util.Map; import javax.annotation.CheckForNull; -import groovy.lang.MetaClass; + +import groovy.lang.Closure; +import groovy.lang.GroovyObject; +import groovy.lang.MetaClass; +import groovy.lang.MetaProperty; /** * When an CPS-interpreted method is invoked, it immediately throws this error @@ -64,6 +69,19 @@ void checkMismatch(Object expectedReceiver, List expectedMethodNames) { return; } + if (expectedReceiver instanceof GroovyObject) { + Object propVal = ((GroovyObject) expectedReceiver).getMetaClass().getProperty(expectedReceiver, expectedMethodName); + if (propVal instanceof Closure) { + return; + } + } + if (expectedReceiver instanceof Map && ((Map) expectedReceiver).containsKey(expectedMethodName)) { + Object mapVal = ((Map) expectedReceiver).get(expectedMethodName); + if (mapVal instanceof Closure) { + return; + } + } + if(methodName.equals("methodMissing")){ return; } From 99c84594d97573d64177335ef31618185daef4ce Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 19 Aug 2019 12:50:49 -0400 Subject: [PATCH 572/932] Ignore MissingPropertyExceptions in mismatch check. Signed-off-by: Andrew Bayer --- .../groovy/cps/impl/CpsCallableInvocation.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 229f00c97..da19dd743 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -16,6 +16,8 @@ import groovy.lang.GroovyObject; import groovy.lang.MetaClass; import groovy.lang.MetaProperty; +import groovy.lang.MissingPropertyException; +import org.codehaus.groovy.runtime.metaclass.MissingPropertyExceptionNoStack; /** * When an CPS-interpreted method is invoked, it immediately throws this error @@ -70,9 +72,13 @@ void checkMismatch(Object expectedReceiver, List expectedMethodNames) { } if (expectedReceiver instanceof GroovyObject) { - Object propVal = ((GroovyObject) expectedReceiver).getMetaClass().getProperty(expectedReceiver, expectedMethodName); - if (propVal instanceof Closure) { - return; + try { + Object propVal = ((GroovyObject) expectedReceiver).getMetaClass().getProperty(expectedReceiver, expectedMethodName); + if (propVal instanceof Closure) { + return; + } + } catch (MissingPropertyException mpe) { + // Do nothing - this just means the property didn't exist. } } if (expectedReceiver instanceof Map && ((Map) expectedReceiver).containsKey(expectedMethodName)) { From 6f1e4b51dfba0a650bb274b51c620d26f343cec9 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 19 Aug 2019 12:54:41 -0400 Subject: [PATCH 573/932] Remove unused imports Signed-off-by: Andrew Bayer --- .../com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index da19dd743..fc92cf65d 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -15,9 +15,7 @@ import groovy.lang.Closure; import groovy.lang.GroovyObject; import groovy.lang.MetaClass; -import groovy.lang.MetaProperty; import groovy.lang.MissingPropertyException; -import org.codehaus.groovy.runtime.metaclass.MissingPropertyExceptionNoStack; /** * When an CPS-interpreted method is invoked, it immediately throws this error From 93c916d482b63bf5ed46a84d56cb934401be2020 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 19 Aug 2019 13:05:58 -0400 Subject: [PATCH 574/932] Only check for closure fields/map values if we're expecting call Signed-off-by: Andrew Bayer --- .../cps/impl/CpsCallableInvocation.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index fc92cf65d..256996535 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -69,20 +69,22 @@ void checkMismatch(Object expectedReceiver, List expectedMethodNames) { return; } - if (expectedReceiver instanceof GroovyObject) { - try { - Object propVal = ((GroovyObject) expectedReceiver).getMetaClass().getProperty(expectedReceiver, expectedMethodName); - if (propVal instanceof Closure) { - return; + if ("call".equals(methodName) && !expectedMethodNames.contains(methodName)) { + if (expectedReceiver instanceof GroovyObject) { + try { + Object propVal = ((GroovyObject) expectedReceiver).getMetaClass().getProperty(expectedReceiver, expectedMethodName); + if (propVal instanceof Closure) { + return; + } + } catch (MissingPropertyException mpe) { + // Do nothing - this just means the property didn't exist. } - } catch (MissingPropertyException mpe) { - // Do nothing - this just means the property didn't exist. } - } - if (expectedReceiver instanceof Map && ((Map) expectedReceiver).containsKey(expectedMethodName)) { - Object mapVal = ((Map) expectedReceiver).get(expectedMethodName); - if (mapVal instanceof Closure) { - return; + if (expectedReceiver instanceof Map && ((Map) expectedReceiver).containsKey(expectedMethodName)) { + Object mapVal = ((Map) expectedReceiver).get(expectedMethodName); + if (mapVal instanceof Closure) { + return; + } } } From 5b8d8b52054f67ab307265155863b601df5f9be4 Mon Sep 17 00:00:00 2001 From: Sergei Parshev Date: Tue, 13 Aug 2019 12:54:27 -0700 Subject: [PATCH 575/932] [JENKINS-58620] GroovyShell.evaluate should be skipped in the mismatch handler --- .../java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index 9e87c2a1c..a45cf11c8 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -75,6 +75,8 @@ protected Next methodCall(final Env e, final SourceLocation loc, final Continuat // CpsScript.invokeMethod e.g. on a UserDefinedGlobalVariable cannot be predicted from here. expectedMethodNames.add("call"); laxCall = !((Script) effectiveReceiver).getBinding().getVariables().containsKey(methodName); // lax unless like invokePropertyOrMissing + } else if (effectiveReceiver instanceof GroovyShell && methodName.equals("evaluate")) { + expectedMethodNames.add("run"); } else if (effectiveReceiver instanceof CpsBooleanClosureWrapper && methodName.equals("callForMap")) { expectedMethodNames.add("call"); } else if ((effectiveReceiver instanceof ListWithDefault || effectiveReceiver instanceof MapWithDefault) && methodName.equals("get")) { From e0c41f6ef8354149052e00e046014ee870821d9a Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 9 Sep 2019 10:16:45 -0400 Subject: [PATCH 576/932] [maven-release-plugin] prepare release groovy-cps-parent-1.31 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 6f8855a28..37467438e 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.31-SNAPSHOT + 1.31 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 0218f820a..474135928 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.31-SNAPSHOT + 1.31 groovy-cps diff --git a/pom.xml b/pom.xml index 5b36e57b4..d0f2a24a2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.31-SNAPSHOT + 1.31 pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + groovy-cps-parent-1.31 From 4916a1f80c5c8b1a1a23c2bf366d98be7e87ab56 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Mon, 9 Sep 2019 10:16:51 -0400 Subject: [PATCH 577/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 37467438e..8118f0593 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.31 + 1.32-SNAPSHOT groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 474135928..76cdfc8c4 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.31 + 1.32-SNAPSHOT groovy-cps diff --git a/pom.xml b/pom.xml index d0f2a24a2..e2c01de36 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.31 + 1.32-SNAPSHOT pom Groovy CPS Execution Parent @@ -22,7 +22,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.31 + HEAD From 41cb4e05eed6a901d0c8a8b0a460111a64c5e179 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 3 Feb 2020 15:30:19 -0500 Subject: [PATCH 578/932] [SECURITY-1710] CPS-transform initial expressions for method parameters --- .mvn/extensions.xml | 7 + .mvn/maven.config | 2 + dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- .../cloudbees/groovy/cps/CpsTransformer.java | 92 +++++++++- .../groovy/cps/CpsTransformer2Test.java | 77 +++++++++ .../cps/sandbox/SandboxInvoker2Test.java | 95 +++++++++++ pom.xml | 160 +++++++++++++++++- 8 files changed, 429 insertions(+), 8 deletions(-) create mode 100644 .mvn/extensions.xml create mode 100644 .mvn/maven.config create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 000000000..5f5104171 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,7 @@ + + + io.jenkins.tools.incrementals + git-changelist-maven-extension + 1.1 + + diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 000000000..2a0299c48 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,2 @@ +-Pconsume-incrementals +-Pmight-produce-incrementals diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 8118f0593..dfbfc742e 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.32-SNAPSHOT + ${revision}${changelist} groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 76cdfc8c4..d3cbbdffe 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.32-SNAPSHOT + ${revision}${changelist} groovy-cps diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 2b35f6a72..4ca3b2bb5 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -123,6 +123,10 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod } this.sourceUnit = source; this.classNode = classNode; + + // Removes all initial expressions for methods and constructors and generates overloads for all variants. + new InitialExpressionExpander().expandInitialExpressions(classNode); + try { for (FieldNode field : new ArrayList<>(classNode.getFields())) { @@ -192,17 +196,22 @@ boolean hasAnnotation(MethodNode node, Class a) { * * From: * + * 
{@code
      * ReturnT foo( T1 arg1, T2 arg2, ...) { ... body ... }
+     * }
* * To: * + * 
{@code
      * private static CpsFunction ___cps___N = ___cps___N();
      *
-     * private static final CpsFunction ___cps___N() { return new
-     * CpsFunction(['arg1','arg2','arg3',...], CPS-transformed-method-body) }
+     * private static final CpsFunction ___cps___N() {
+     *     return new CpsFunction(['arg1','arg2','arg3',...], CPS-transformed-method-body)
+     * }
      *
-     * ReturnT foo( T1 arg1, T2 arg2, ...) { throw new
-     * CpsCallableInvocation(___cps___N, this, new Object[] {arg1, arg2, ...}) }
+     * ReturnT foo( T1 arg1, T2 arg2, ...) {
+     *     throw new CpsCallableInvocation(___cps___N, this, new Object[] {arg1, arg2, ...}) }
+     * }
*/ public void visitMethod(final MethodNode m) { if (!shouldBeTransformed(m)) { @@ -907,6 +916,10 @@ public void run() { Parameter[] paramArray = exp.getParameters(); List typesList = new ArrayList(paramArray.length); List paramsList = new ArrayList(paramArray.length); + // Note: This code currently ignores initial expressions for closure parameters. + // Be careful that any refactoring either maintains the status quo, or transforms these + // initial expressions in such a way that they are correctly intercepted by the sandbox. + // See SandboxInvoker2Test.closureParametersWithInitialExpressions, which is currently ignored. for (Parameter p : paramArray) { typesList.add(new ClassExpression(p.getType())); paramsList.add(new ConstantExpression(p.getName())); @@ -1297,6 +1310,77 @@ public void visitBytecodeExpression(BytecodeExpression expression) { expression.getLineNumber(), expression.getColumnNumber())); } + // Required because the methods we need have protected visibility in Verifier. + private static class InitialExpressionExpander extends Verifier { + private void expandInitialExpressions(ClassNode node) { + super.setClassNode(node); + super.addDefaultParameterMethods(node); + fixupVariableReferencesInGeneratedMethods(node); + } + // Methods generated by Verifier.addDefaultParameterMethods have some VariableExpressions where + // VariableExpression.getAccessedVariable returns null, when it should return the same variable. This causes + // problems in visitVariableExpression, so this method prevents errors by setting the accessed variable to the + // same variable here. The variables we need to fix are always in a cast expression in a method call expression + // in the final statement of the body of the generated method. + private void fixupVariableReferencesInGeneratedMethods(ClassNode node) { + for (MethodNode m : node.getMethods()) { + if (Boolean.TRUE.equals(m.getNodeMetaData(Verifier.DEFAULT_PARAMETER_GENERATED))) { + MethodCallExpression mce = findMethodCallExpressionInLastStatementOfBody(m); + if (mce != null) { + for (Expression arg : ((TupleExpression)mce.getArguments()).getExpressions()) { + if (arg instanceof CastExpression) { + Expression castedExpr = ((CastExpression) arg).getExpression(); + if (castedExpr instanceof VariableExpression) { + VariableExpression varExpr = (VariableExpression) castedExpr; + if (varExpr.getAccessedVariable() == null) { + varExpr.setAccessedVariable(varExpr); + } else { + LOGGER.log(Level.FINE, "Variable {0} in method call arguments already had an initial expression", varExpr); + } + } else { + // The initial expressions are inlined directly into the arguments in the + // MethodCallExpression, so if this isn't a variable expression, we just ignore it. + } + } else { + LOGGER.log(Level.FINE, "Unexpected expression in method call arguments in {0}: {1}", new Object[]{ m, arg }); + } + } + } + } + } + } + private MethodCallExpression findMethodCallExpressionInLastStatementOfBody(MethodNode m) { + if (m.getCode() instanceof BlockStatement) { + List body = ((BlockStatement)m.getCode()).getStatements(); + if (!body.isEmpty()) { + Statement finalStatement = body.get(body.size() - 1); + if (finalStatement instanceof ReturnStatement) { // For methods with return values. + Expression returnExpr = ((ReturnStatement) finalStatement).getExpression(); + if (returnExpr instanceof MethodCallExpression) { + return (MethodCallExpression) returnExpr; + } else { + LOGGER.log(Level.FINE, "Unexpected expression in return statement of {0}: {1}", new Object[]{ m, returnExpr }); + } + } else if (finalStatement instanceof ExpressionStatement) { // For void methods. + Expression expr = ((ExpressionStatement) finalStatement).getExpression(); + if (expr instanceof MethodCallExpression) { + return (MethodCallExpression) expr; + } else { + LOGGER.log(Level.FINE, "Unexpected expression in last statement of {0}: {1}", new Object[]{ m, expr }); + } + } else { + LOGGER.log(Level.FINE, "Unexpected type of last statement of {0}: {1}", new Object[]{ m, finalStatement }); + } + } else { + LOGGER.log(Level.FINE, "Body of {0} is empty", m); + } + } else { + LOGGER.log(Level.FINE, "Body of {0} is not a block statement", m); + } + return null; + } + } + private static final ClassNode OBJECT_TYPE = ClassHelper.makeCached(Object.class); private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(CpsFunction.class); diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java new file mode 100644 index 000000000..eaaa001e3 --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java @@ -0,0 +1,77 @@ +/* + * Copyright 2020 CloudBees, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.cloudbees.groovy.cps; + +import java.util.Arrays; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class CpsTransformer2Test extends AbstractGroovyCpsTest { + + @Test + public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { + assertEquals(Boolean.FALSE, evalCPS( + "def m1() { true }\n" + + "def m2(p = m1()){ false }\n" + + "m2()\n")); + } + + @Test public void methodsWithInitialExpressionsAreExpandedToCorrectOverloads() throws Throwable { + assertEquals(Arrays.asList("abc", "xbc", "xyc", "xyz"), evalCPS( + "def m2(a = 'a', b = 'b', c = 'c') {\n" + + " a + b + c\n" + + "}\n" + + "def r1 = m2()\n" + + "def r2 = m2('x')\n" + + "def r3 = m2('x', 'y')\n" + + "def r4 = m2('x', 'y', 'z')\n" + + "[r1, r2, r3, r4]")); + assertEquals(Arrays.asList("abc", "xbc", "xby"), evalCPS( + "def m2(a = 'a', b, c = 'c') {\n" + + " a + b + c\n" + + "}\n" + + "def r1 = m2('b')\n" + + "def r2 = m2('x', 'b')\n" + + "def r3 = m2('x', 'b', 'y')\n" + + "[r1, r2, r3]")); + } + + @Test public void voidMethodsWithInitialExpressionsAreExpandedToCorrectOverloads() throws Throwable { + assertEquals(Arrays.asList("abc", "xbc", "xyc", "xyz"), evalCPS( + "import groovy.transform.Field\n" + + "@Field def r = []\n" + + "void m2(a = 'a', b = 'b', c = 'c') {\n" + + " r.add(a + b + c)\n" + + "}\n" + + "m2()\n" + + "m2('x')\n" + + "m2('x', 'y')\n" + + "m2('x', 'y', 'z')\n" + + "r")); + assertEquals(Arrays.asList("abc", "xbc", "xby"), evalCPS( + "import groovy.transform.Field\n" + + "@Field def r = []\n" + + "void m2(a = 'a', b, c = 'c') {\n" + + " r.add(a + b + c)\n" + + "}\n" + + "m2('b')\n" + + "m2('x', 'b')\n" + + "m2('x', 'b', 'y')\n" + + "r")); + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java new file mode 100644 index 000000000..2ed41d1ea --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java @@ -0,0 +1,95 @@ +/* + * Copyright 2020 CloudBees, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.cloudbees.groovy.cps.sandbox; + +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.CpsTransformer; +import com.cloudbees.groovy.cps.Envs; +import com.cloudbees.groovy.cps.SandboxCpsTransformer; +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; +import com.cloudbees.groovy.cps.impl.FunctionCallEnv; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.kohsuke.groovy.sandbox.ClassRecorder; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; + +public class SandboxInvoker2Test extends AbstractGroovyCpsTest { + ClassRecorder cr = new ClassRecorder(); + + @Override + protected CpsTransformer createCpsTransformer() { + return new SandboxCpsTransformer(); + } + + @Before public void zeroIota() { + CpsTransformer.iota.set(0); + } + + private Object evalCpsSandbox(String script) throws Throwable { + FunctionCallEnv e = (FunctionCallEnv)Envs.empty(); + e.setInvoker(new SandboxInvoker()); + + cr.register(); + try { + return parseCps(script).invoke(e, null, Continuation.HALT).run().yield.replay(); + } finally { + cr.unregister(); + } + } + + public void assertIntercept(String... expected) { + assertThat(cr.toString().split("\n"), equalTo(expected)); + } + + @Issue("SECURITY-1710") + @Test public void methodParametersWithInitialExpressions() throws Throwable { + evalCpsSandbox("def m(p = System.getProperties()){ true }; m()"); + assertIntercept( + "Script1.super(Script1).setBinding(Binding)", + "Script1.m()", + "System:getProperties()", + "Checker:checkedCast(Class,Properties,Boolean,Boolean,Boolean)", + "Script1.m(Properties)"); + } + + @Test public void constructorParametersWithInitialExpressions() throws Throwable { + evalCpsSandbox( + "class Test {\n" + + " Test(p = System.getProperties()) { }" + + "}\n" + + "new Test()"); + assertIntercept( + "Script1.super(Script1).setBinding(Binding)", + "new Test()", + "System:getProperties()"); + } + + @Ignore("Initial expressions for parameters in CPS-transformed closures are currently ignored") + @Test public void closureParametersWithInitialExpressions() throws Throwable { + // Fails because p is null in the body of the closure. + assertEquals(true, evalCpsSandbox("{ p = System.getProperties() -> p != null }()")); + assertIntercept( + "Script1.super(Script1).setBinding(Binding)", + "CpsClosure.call()", + "System:getProperties()", // Not currently intercepted because it is dropped by the transformer. + "ScriptBytecodeAdapter:compareNotEqual(null,null)"); + } +} diff --git a/pom.xml b/pom.xml index e2c01de36..e58ac5f20 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.32-SNAPSHOT + ${revision}${changelist} pom Groovy CPS Execution Parent @@ -17,12 +17,19 @@ UTF-8 2.4.7 + 1.32 + -SNAPSHOT + + 1.1 + 1.1 + https://repo.jenkins-ci.org/incrementals/ + HEAD scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - HEAD + ${scmTag} @@ -38,4 +45,153 @@ lib + + + + + io.jenkins.tools.incrementals + incrementals-maven-plugin + ${incrementals-plugin.version} + + + org.jenkins-ci.* + io.jenkins.* + + false + false + + + + + + + + + + consume-incrementals + + + incrementals + ${incrementals.url} + + false + + + + + + incrementals + ${incrementals.url} + + false + + + + + + might-produce-incrementals + + + + org.codehaus.mojo + flatten-maven-plugin + 1.0.1 + + true + ${project.build.directory} + ${project.artifactId}-${project.version}.pom + + + + flatten + process-resources + + flatten + + + oss + + + + + + maven-enforcer-plugin + 3.0.0-M2 + + + display-info + + + + [3.5.4,) + 3.5.4+ required to use Incrementals. + + + [${incrementals-enforce-minimum.version},) + + + + + + + + io.jenkins.tools.incrementals + incrementals-enforcer-rules + ${incrementals-plugin.version} + + + + + maven-release-plugin + + incrementals:reincrementalify + + + + + + + produce-incrementals + + + set.changelist + true + + + + + incrementals + ${incrementals.url} + + + + + + maven-source-plugin + 3.0.1 + + + attach-sources + + jar-no-fork + + + + + + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + + + From 7b2523bde903e5a209fa50724a2806c43a3ec243 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 3 Feb 2020 15:36:57 -0500 Subject: [PATCH 579/932] [maven-release-plugin] prepare release groovy-cps-parent-1.32 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index dfbfc742e..7ad6b5104 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - ${revision}${changelist} + 1.32 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index d3cbbdffe..028149799 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - ${revision}${changelist} + 1.32 groovy-cps diff --git a/pom.xml b/pom.xml index e58ac5f20..5b73234e7 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - ${revision}${changelist} + 1.32 pom Groovy CPS Execution Parent @@ -29,7 +29,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - ${scmTag} + groovy-cps-parent-1.32 From 94939d33fab9b04be76b9fbd0477b9807bf1ad32 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 3 Feb 2020 15:37:01 -0500 Subject: [PATCH 580/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 7ad6b5104..dfbfc742e 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.32 + ${revision}${changelist} groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 028149799..d3cbbdffe 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.32 + ${revision}${changelist} groovy-cps diff --git a/pom.xml b/pom.xml index 5b73234e7..1499f3fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.32 + ${revision}${changelist} pom Groovy CPS Execution Parent @@ -17,7 +17,7 @@ UTF-8 2.4.7 - 1.32 + 1.33 -SNAPSHOT 1.1 @@ -29,7 +29,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.32 + ${scmTag} From e55920d6142af8d6c2e0393666b0614d9151eb71 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 28 Apr 2020 14:59:09 -0400 Subject: [PATCH 581/932] [JENKINS-62064] Make assignment expressions evaluate to their RHS --- .../com/cloudbees/groovy/cps/impl/AssignmentBlock.java | 4 ++-- .../com/cloudbees/groovy/cps/CpsTransformer2Test.java | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java index 1a24bba74..1350f7eab 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/AssignmentBlock.java @@ -64,10 +64,10 @@ public Next fixLhs(Object lhs) { } /** - * Just straight assignment from RHS to LHS, then done + * Assign from RHS to LHS and pass RHS to the continuation. */ public Next assignAndDone(Object rhs) { - return lhs.set(rhs,k); // just straight assignment + return lhs.set(rhs, then(new ConstantBlock(rhs), e, k)); } /** diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java index eaaa001e3..eb9803b89 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java @@ -74,4 +74,14 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "m2('x', 'b', 'y')\n" + "r")); } + + @Test public void assignmentExprsEvalToRHS() throws Throwable { + assertEquals(Arrays.asList(1, 1, 1), evalCPS( + "def a = b = c = 1\n" + + "[a, b, c]\n")); + assertEquals(Arrays.asList(2, 3, 4), evalCPS( + "def a = b = c = 1\n" + + "c += b += a += 1\n" + + "[a, b, c]\n")); + } } From d72a8a8683b4906d0981b7761767bfb122956c97 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Thu, 7 May 2020 11:16:13 -0400 Subject: [PATCH 582/932] [JENKINS-57253] Verify usage of break and continue statements during compilation --- .../com/cloudbees/groovy/cps/CpsTransformer.java | 4 ++++ .../groovy/cps/AbstractGroovyCpsTest.groovy | 2 +- .../cloudbees/groovy/cps/CpsTransformer2Test.java | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 4ca3b2bb5..7a047522f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -30,6 +30,7 @@ import org.codehaus.groovy.classgen.Verifier; import org.codehaus.groovy.control.CompilePhase; import org.codehaus.groovy.control.Janitor; +import org.codehaus.groovy.control.LabelVerifier; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.control.customizers.CompilationCustomizer; import org.codehaus.groovy.runtime.powerassert.SourceText; @@ -124,6 +125,9 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod this.sourceUnit = source; this.classNode = classNode; + // Makes sure that break and continue statements are used correctly. + new LabelVerifier(source).visitClass(classNode); + // Removes all initial expressions for methods and constructors and generates overloads for all variants. new InitialExpressionExpander().expandInitialExpressions(classNode); diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index c7eacf666..252f1547a 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -23,7 +23,7 @@ abstract class AbstractGroovyCpsTest extends Assert { */ GroovyShell sh; - def binding = new Binding() + Binding binding = new Binding() @Before void setUp() { diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java index eaaa001e3..fdb93c6a2 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java @@ -18,7 +18,9 @@ import java.util.Arrays; import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; public class CpsTransformer2Test extends AbstractGroovyCpsTest { @@ -74,4 +76,16 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "m2('x', 'b', 'y')\n" + "r")); } + + @Issue("JENKINS-57253") + @Test public void illegalBreakStatement() { + getBinding().setProperty("sentinel", 1); + try { + evalCPSonly("sentinel = 2; break;"); + fail("Execution should fail"); + } catch (Exception e) { + assertThat(e.toString(), containsString("the break statement is only allowed inside loops or switches")); + } + assertEquals("Script should fail during compilation", 1, getBinding().getProperty("sentinel")); + } } From 4dc5316a8ecc01642a0da2584b83fbba95de7214 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 15 Jul 2021 11:29:25 -0400 Subject: [PATCH 583/932] No need to override default `DescriptorByNameOwner.getDescriptorByName` (#444) --- .../java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java index ddefb94a1..b793710d8 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java @@ -393,10 +393,6 @@ private static boolean isSingleList(Map args) { return null; } - @Override public Descriptor getDescriptorByName(String id) { - return Jenkins.get().getDescriptorByName(id); - } - @Restricted(NoExternalUse.class) public Collection getQuasiDescriptors(boolean advanced) { TreeSet t = new TreeSet<>(); From efd979d4b76fdc6a230437262280a60b0d8c0298 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 15 Jul 2021 11:35:29 -0400 Subject: [PATCH 584/932] Adapt to fix in `BindingStep` (#454) --- pom.xml | 5 +---- .../plugins/workflow/cps/DSLTest.java | 22 ++++++++++--------- .../cps/actions/ArgumentsActionImplTest.java | 1 + 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index cd009f511..30f16d6ef 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,6 @@ 8 false 1.32 - 3.7 12.19.0 6.14.8 @@ -78,7 +77,7 @@ io.jenkins.tools.bom bom-2.222.x - 23 + 887.vae9c8ac09ff7 import pom @@ -96,7 +95,6 @@ org.jenkins-ci.plugins.workflow workflow-support - ${workflow-support-plugin.version} org.jenkins-ci.plugins.workflow @@ -135,7 +133,6 @@ org.jenkins-ci.plugins.workflow workflow-support - ${workflow-support-plugin.version} tests test diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java index 3a97aaa24..faab70cae 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java @@ -441,7 +441,7 @@ public void namedSoleParamForStep() throws Exception { @Issue("JENKINS-63254") @Test public void sensitiveVariableInterpolation() throws Exception { - final String credentialsId = "creds"; + final String credentialsId = "creds-sensitiveVariableInterpolation"; final String username = "bob"; final String password = "secr3t"; UsernamePasswordCredentialsImpl c = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, credentialsId, "sample", username, password); @@ -449,7 +449,7 @@ public void namedSoleParamForStep() throws Exception { String shellStep = Functions.isWindows()? "bat" : "sh"; p.setDefinition(new CpsFlowDefinition("" + "node {\n" - + "withCredentials([usernamePassword(credentialsId: 'creds', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {\n" + + "withCredentials([usernamePassword(credentialsId: '" + credentialsId + "', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {\n" + shellStep + " \"echo $PASSWORD\"\n" + "}\n" + "}", true)); @@ -472,14 +472,14 @@ public void namedSoleParamForStep() throws Exception { @Issue("JENKINS-63254") @Test public void sensitiveVariableInterpolationWithMetaStep() throws Exception { - final String credentialsId = "creds"; + final String credentialsId = "creds-sensitiveVariableInterpolationWithMetaStep"; final String username = "bob"; final String password = "secr3t"; UsernamePasswordCredentialsImpl c = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, credentialsId, "sample", username, password); CredentialsProvider.lookupStores(r.jenkins).iterator().next().addCredentials(Domain.global(), c); p.setDefinition(new CpsFlowDefinition("" + "node {\n" - + "withCredentials([usernamePassword(credentialsId: 'creds', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {\n" + + "withCredentials([usernamePassword(credentialsId: '" + credentialsId + "', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {\n" + "archiveArtifacts(\"${PASSWORD}\")" + "}\n" + "}", true)); @@ -496,15 +496,16 @@ public void namedSoleParamForStep() throws Exception { } @Test public void multipleSensitiveVariables() throws Exception { - final String credentialsId = "creds"; + final String credentialsId = "creds-multipleSensitiveVariables"; final String username = "bob"; final String password = "secr3t"; UsernamePasswordCredentialsImpl c = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, credentialsId, "sample", username, password); + c.setUsernameSecret(true); CredentialsProvider.lookupStores(r.jenkins).iterator().next().addCredentials(Domain.global(), c); String shellStep = Functions.isWindows()? "bat" : "sh"; p.setDefinition(new CpsFlowDefinition("" + "node {\n" - + "withCredentials([usernamePassword(credentialsId: 'creds', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {\n" + + "withCredentials([usernamePassword(credentialsId: '" + credentialsId + "', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {\n" + shellStep + " \"echo $PASSWORD $USERNAME $PASSWORD\"\n" + "}\n" + "}", true)); @@ -527,14 +528,14 @@ public void namedSoleParamForStep() throws Exception { @Issue("JENKINS-63254") @Test public void sensitiveVariableInterpolationWithNestedDescribable() throws Exception { - final String credentialsId = "creds"; + final String credentialsId = "creds-sensitiveVariableInterpolationWithNestedDescribable"; final String username = "bob"; final String password = "secr3t"; UsernamePasswordCredentialsImpl c = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, credentialsId, "sample", username, password); CredentialsProvider.lookupStores(r.jenkins).iterator().next().addCredentials(Domain.global(), c); p.setDefinition(new CpsFlowDefinition("" + "node {\n" - + "withCredentials([usernamePassword(credentialsId: 'creds', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {\n" + + "withCredentials([usernamePassword(credentialsId: '" + credentialsId + "', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {\n" + "monomorphWithSymbolStep(monomorphSymbol([firstArg:\"${PASSWORD}\", secondArg:'two']))" + "}\n" + "}", true)); @@ -560,14 +561,15 @@ public void namedSoleParamForStep() throws Exception { @Issue("JENKINS-63254") @Test public void complexSensitiveVariableInterpolationWithNestedDescribable() throws Exception { - final String credentialsId = "creds"; + final String credentialsId = "creds-complexSensitiveVariableInterpolationWithNestedDescribable"; final String username = "bob"; final String password = "secr3t"; UsernamePasswordCredentialsImpl c = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, credentialsId, "sample", username, password); + c.setUsernameSecret(true); CredentialsProvider.lookupStores(r.jenkins).iterator().next().addCredentials(Domain.global(), c); p.setDefinition(new CpsFlowDefinition("" + "node {\n" - + "withCredentials([usernamePassword(credentialsId: 'creds', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {\n" + + "withCredentials([usernamePassword(credentialsId: '" + credentialsId + "', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {\n" + "monomorphListSymbolStep([monomorphSymbol(firstArg: monomorphWithSymbolStep(monomorphSymbol([firstArg: \"innerFirstArgIs${PASSWORD}\", secondArg: \"innerSecondArgIs${USERNAME}\"])), secondArg: \"hereismy${PASSWORD}\"), monomorphSymbol(firstArg: \"${PASSWORD}\", secondArg: \"${USERNAME}\")])" + "}\n" + "}", true)); diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java index d9bb0b733..620f478c8 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java @@ -396,6 +396,7 @@ public void testBasicCredentials() throws Exception { String username = "bob"; String password = "s3cr3t"; UsernamePasswordCredentialsImpl c = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "test", "sample", username, password); + c.setUsernameSecret(true); CredentialsProvider.lookupStores(r.jenkins).iterator().next().addCredentials(Domain.global(), c); WorkflowJob job = r.createProject(WorkflowJob.class); From 70adee57d7c8772c63cf5066057a7f9fe22aa481 Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Thu, 15 Jul 2021 10:13:32 -0600 Subject: [PATCH 585/932] [maven-release-plugin] prepare release workflow-cps-2.93 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 30f16d6ef..72a14f2ca 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ org.jenkins-ci.plugins.workflow workflow-cps - ${revision}${changelist} + 2.93 hpi Pipeline: Groovy https://github.com/jenkinsci/workflow-cps-plugin @@ -47,7 +47,7 @@ scm:git:git://github.com/jenkinsci/${gitHubRepo}.git scm:git:git@github.com:jenkinsci/${gitHubRepo}.git https://github.com/jenkinsci/${gitHubRepo} - ${scmTag} + workflow-cps-2.93 From 8bfac71f39e77c81971dd8a11754ea3f6c95124b Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Thu, 15 Jul 2021 10:13:49 -0600 Subject: [PATCH 586/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 72a14f2ca..5698d1b72 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ org.jenkins-ci.plugins.workflow workflow-cps - 2.93 + ${revision}${changelist} hpi Pipeline: Groovy https://github.com/jenkinsci/workflow-cps-plugin @@ -47,7 +47,7 @@ scm:git:git://github.com/jenkinsci/${gitHubRepo}.git scm:git:git@github.com:jenkinsci/${gitHubRepo}.git https://github.com/jenkinsci/${gitHubRepo} - workflow-cps-2.93 + ${scmTag} @@ -62,7 +62,7 @@ - 2.93 + 2.94 -SNAPSHOT ${project.artifactId}-plugin 2.222.4 From 9d2fcae772e171e69c4aea4328c1b555984983b9 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Fri, 23 Jul 2021 08:54:29 -0700 Subject: [PATCH 587/932] Use java.nio.charset.StandardCharsets where possible --- .../org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 4 ++-- .../jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 608b72e03..0b59e6988 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -145,7 +145,7 @@ import org.acegisecurity.Authentication; import org.acegisecurity.userdetails.UsernameNotFoundException; -import org.apache.commons.io.Charsets; +import java.nio.charset.StandardCharsets; import org.codehaus.groovy.GroovyBugError; import org.jboss.marshalling.reflect.SerializableClassRegistry; @@ -1913,7 +1913,7 @@ public void autopersist(@Nonnull FlowNode n) throws IOException { @Override public void addContents(Container container) { container.add(new Content("nodes/master/pipeline-timings.txt") { @Override public void writeTo(OutputStream outputStream) throws IOException { - PrintWriter pw = new PrintWriter(new OutputStreamWriter(outputStream, Charsets.UTF_8)); + PrintWriter pw = new PrintWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)); for (Job job : Jenkins.get().getAllItems(Job.class)) { // TODO no clear way to tell if this might have Run instanceof FlowExecutionOwner.Executable, so for now just check for FlyweightTask which should exclude AbstractProject if (job instanceof Queue.FlyweightTask) { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java index d037b5f89..4839f7a6b 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java @@ -17,7 +17,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import jenkins.model.Jenkins; -import org.apache.commons.io.Charsets; +import java.nio.charset.StandardCharsets; import org.jenkinsci.plugins.workflow.flow.FlowExecution; import org.jenkinsci.plugins.workflow.flow.FlowExecutionList; import org.kohsuke.stapler.HttpResponses; @@ -105,7 +105,7 @@ public String getThreadDump() { @Override public void addContents(Container container) { container.add(new Content("nodes/master/pipeline-thread-dump.txt") { @Override public void writeTo(OutputStream outputStream) throws IOException { - PrintWriter pw = new PrintWriter(new OutputStreamWriter(outputStream, Charsets.UTF_8)); + PrintWriter pw = new PrintWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)); for (FlowExecution flow : FlowExecutionList.get()) { if (flow instanceof CpsFlowExecution) { pw.println("Build: " + flow.getOwner().getExecutable()); From 3f8a89e070d9f0a44c22ac83f4942f423f87eb29 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 26 Jul 2021 10:50:57 -0400 Subject: [PATCH 588/932] Do not request review from @dwnusbaum on Dependabot PRs --- .github/dependabot.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ce1001384..f9e3770d7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,7 +4,5 @@ updates: # not trust the plugin's tests to catch issues caused by updates. - package-ecosystem: "maven" directory: "/" - reviewers: - - "dwnusbaum" schedule: interval: "daily" From 89c92ec46328c6172cd8e45fabe9beae472cf585 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 13 Sep 2021 11:32:02 -0700 Subject: [PATCH 589/932] Adapting `SubtypeInjectingStepTest`, `ArgumentsActionImplTest`, and `RestartingLoadStepTest` to jenkinsci/jenkins#5425 (#463) --- .../plugins/workflow/SubtypeInjectingStepTest.java | 2 +- .../workflow/cps/actions/ArgumentsActionImplTest.java | 8 ++++---- .../workflow/cps/steps/RestartingLoadStepTest.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepTest.java index 56da37560..d4955d6cf 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepTest.java @@ -39,7 +39,7 @@ public class SubtypeInjectingStepTest { public void contextInjectionOfSubParameters() throws Exception { // see SubtypeInjectingStep WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p"); - p.setDefinition(new CpsFlowDefinition("node('master') { injectSubtypesAsContext() }", false)); + p.setDefinition(new CpsFlowDefinition("node('" + r.jenkins.getSelfLabel().getName() + "') { injectSubtypesAsContext() }", false)); r.assertBuildStatusSuccess(p.scheduleBuild2(0)); } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java index 620f478c8..14e49cc8a 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java @@ -503,7 +503,7 @@ public void testArgumentDescriptions() throws Exception { WorkflowJob job = r.createProject(WorkflowJob.class); job.setDefinition(new CpsFlowDefinition( "echo 'test' \n " + - " node('master') { \n" + + " node('" + r.jenkins.getSelfLabel().getName() + "') { \n" + " retry(3) {\n"+ " if (isUnix()) { \n" + " sh 'whoami' \n" + @@ -535,8 +535,8 @@ public void testArgumentDescriptions() throws Exception { FlowNode nodeNode = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), Predicates.and(Predicates.instanceOf(StepStartNode.class), new NodeStepTypePredicate("node"), FlowScanningUtils.hasActionPredicate(ArgumentsActionImpl.class))); - Assert.assertEquals("master", nodeNode.getPersistentAction(ArgumentsAction.class).getArguments().values().iterator().next()); - Assert.assertEquals("master", ArgumentsAction.getStepArgumentsAsString(nodeNode)); + Assert.assertEquals(r.jenkins.getSelfLabel().getName(), nodeNode.getPersistentAction(ArgumentsAction.class).getArguments().values().iterator().next()); + Assert.assertEquals(r.jenkins.getSelfLabel().getName(), ArgumentsAction.getStepArgumentsAsString(nodeNode)); testDeserialize(run.getExecution()); } @@ -545,7 +545,7 @@ public void testArgumentDescriptions() throws Exception { public void testUnusualStepInstantiations() throws Exception { WorkflowJob job = r.createProject(WorkflowJob.class); job.setDefinition(new CpsFlowDefinition( - " node('master') { \n" + + " node('" + r.jenkins.getSelfLabel().getName() + "') { \n" + " writeFile text: 'hello world', file: 'msg.out'\n" + " step([$class: 'ArtifactArchiver', artifacts: 'msg.out', fingerprint: false])\n "+ " withEnv(['CUSTOM=val']) {\n"+ //Symbol-based, because withEnv is a metastep; TODO huh? no it is not diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java index 4f6fb204b..0dfc1f66b 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java @@ -199,14 +199,14 @@ public void pauseInsideLoad() throws Exception { p.setDefinition(new CpsFlowDefinition("def util\n" + "def config\n" + "def util2\n" + - "node('master') {\n" + + "node('" + story.j.jenkins.getSelfLabel().getName() + "') {\n" + " config = load 'src/org/foo/devops/JenkinsEnvironment.groovy'\n" + " util = load 'src/org/foo/devops/Utility.groovy'\n" + " config.loadProdConfiguration()\n" + "}\n" + "util.isValueExist(\"\")\n" + "semaphore 'wait'\n" + - "node('master') {\n" + + "node('" + story.j.jenkins.getSelfLabel().getName() + "') {\n" + " util2 = load 'src/org/foo/devops/Utility.groovy'\n" + " util = load 'src/org/foo/devops/Utility.groovy'\n" + " assert util.isValueExist('foo') == true\n" + From 9fffbfb7e8aed849d3c3bf4d1f11792b5924ae48 Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Mon, 13 Sep 2021 13:36:01 -0600 Subject: [PATCH 590/932] [maven-release-plugin] prepare release workflow-cps-2.94 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5698d1b72..77ee70eab 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ org.jenkins-ci.plugins.workflow workflow-cps - ${revision}${changelist} + 2.94 hpi Pipeline: Groovy https://github.com/jenkinsci/workflow-cps-plugin @@ -47,7 +47,7 @@ scm:git:git://github.com/jenkinsci/${gitHubRepo}.git scm:git:git@github.com:jenkinsci/${gitHubRepo}.git https://github.com/jenkinsci/${gitHubRepo} - ${scmTag} + workflow-cps-2.94 From ba603b307d7e464f529ebbe9fdb3ee5da82d3c3d Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Mon, 13 Sep 2021 13:36:14 -0600 Subject: [PATCH 591/932] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 77ee70eab..ffa7c6c74 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ org.jenkins-ci.plugins.workflow workflow-cps - 2.94 + ${revision}${changelist} hpi Pipeline: Groovy https://github.com/jenkinsci/workflow-cps-plugin @@ -47,7 +47,7 @@ scm:git:git://github.com/jenkinsci/${gitHubRepo}.git scm:git:git@github.com:jenkinsci/${gitHubRepo}.git https://github.com/jenkinsci/${gitHubRepo} - workflow-cps-2.94 + ${scmTag} @@ -62,7 +62,7 @@ - 2.94 + 2.95 -SNAPSHOT ${project.artifactId}-plugin 2.222.4 From 2c41699427905dc2de650463a3c1872ede68df2d Mon Sep 17 00:00:00 2001 From: offa Date: Wed, 27 Oct 2021 15:04:12 +0200 Subject: [PATCH 592/932] Replace deprecated assertions and star imports --- .../plugins/workflow/cps/BodyReference.java | 2 +- .../workflow/cps/CpsBodyExecution.java | 6 +- .../plugins/workflow/cps/CpsBodyInvoker.java | 3 +- .../workflow/cps/CpsFlowDefinition.java | 2 +- .../workflow/cps/CpsFlowExecution.java | 5 +- .../plugins/workflow/cps/CpsScript.java | 4 +- .../plugins/workflow/cps/CpsStepContext.java | 2 +- .../plugins/workflow/cps/CpsThread.java | 6 +- .../plugins/workflow/cps/CpsThreadGroup.java | 10 +- .../plugins/workflow/cps/CpsVmThreadOnly.java | 3 +- .../jenkinsci/plugins/workflow/cps/DSL.java | 7 +- .../plugins/workflow/cps/GroovySample.java | 1 - .../workflow/cps/persistence/PersistIn.java | 4 +- .../workflow/cps/steps/ParallelStep.java | 2 +- .../cps/view/InterpolatedSecretsAction.java | 11 - .../WorkflowJobNonRestartingTest.java | 3 +- .../workflow/cps/ContextVariableSetTest.java | 4 +- .../workflow/cps/CpsBodyExecutionTest.java | 4 +- .../workflow/cps/CpsFlowDefinition2Test.java | 5 +- .../cps/CpsFlowDefinitionValidatorTest.java | 3 +- .../cps/CpsFlowExecutionMemoryTest.java | 4 +- .../workflow/cps/CpsFlowExecutionTest.java | 7 +- .../cps/CpsScmFlowDefinitionTest.java | 6 +- .../workflow/cps/CpsThreadDumpActionTest.java | 4 +- .../workflow/cps/CpsThreadDumpTest.java | 8 +- .../plugins/workflow/cps/CpsThreadTest.java | 5 +- .../plugins/workflow/cps/DSLTest.java | 56 ++--- .../workflow/cps/SandboxContinuableTest.java | 4 +- .../plugins/workflow/cps/SnippetizerTest.java | 3 +- .../workflow/cps/SnippetizerTester.java | 3 +- .../cps/actions/ArgumentsActionImplTest.java | 197 +++++++++--------- .../workflow/cps/nodes/StepNodeTest.java | 6 +- .../workflow/cps/replay/ReplayActionTest.java | 30 +-- .../workflow/cps/steps/LoadStepTest.java | 1 - .../workflow/cps/steps/ParallelStepTest.java | 4 +- .../cps/steps/RestartingLoadStepTest.java | 4 +- 36 files changed, 241 insertions(+), 188 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/BodyReference.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/BodyReference.java index d5c2de88b..d689670ac 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/BodyReference.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/BodyReference.java @@ -29,7 +29,7 @@ import java.io.Serializable; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; +import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.ANYWHERE; /** * Holder of {@link Closure} for {@link CpsStepContext} diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java index 76abac557..22d53e733 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java @@ -41,10 +41,12 @@ import java.util.logging.Level; import java.util.logging.Logger; -import static java.util.logging.Level.*; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; + +import static java.util.logging.Level.WARNING; +import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.PROGRAM; + import org.jenkinsci.plugins.workflow.graph.FlowNode; import org.jenkinsci.plugins.workflow.graphanalysis.LinearBlockHoppingScanner; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java index 749952c4e..2a0e020bc 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java @@ -38,7 +38,8 @@ import java.util.List; import javax.annotation.Nonnull; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; +import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.NONE; + import org.jenkinsci.plugins.workflow.cps.steps.LoadStep; import org.jenkinsci.plugins.workflow.cps.steps.ParallelStep; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java index 02287b613..ebf62225c 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java @@ -54,7 +54,7 @@ import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval; import org.jenkinsci.plugins.scriptsecurity.scripts.languages.GroovyLanguage; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; +import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.JOB; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.Stapler; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 0b59e6988..9ed7e5de1 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -103,7 +103,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import static com.thoughtworks.xstream.io.ExtendedHierarchicalStreamWriterHelper.*; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyCodeSource; @@ -149,7 +148,9 @@ import org.codehaus.groovy.GroovyBugError; import org.jboss.marshalling.reflect.SerializableClassRegistry; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; +import static com.thoughtworks.xstream.io.ExtendedHierarchicalStreamWriterHelper.startNode; +import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.RUN; + import org.jenkinsci.plugins.workflow.flow.FlowExecutionList; import org.jenkinsci.plugins.workflow.graph.FlowGraphWalker; import org.kohsuke.accmod.restrictions.DoNotUse; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java index 699bb4506..418f26c72 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java @@ -42,7 +42,9 @@ import org.codehaus.groovy.runtime.InvokerInvocationException; import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted; import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; + +import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.PROGRAM; + import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner; /** diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java index 51a64e770..ba44f0115 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java @@ -70,7 +70,7 @@ import org.codehaus.groovy.runtime.InvokerInvocationException; import org.jenkinsci.plugins.workflow.cps.nodes.StepNode; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; +import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.ANYWHERE; /** * {@link StepContext} implementation for CPS. diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java index b0f29b2c1..9ba68deb0 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java @@ -43,9 +43,11 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; -import static java.util.logging.Level.*; import org.jenkinsci.plugins.workflow.cps.persistence.IteratorHack; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; + +import static java.util.logging.Level.FINE; +import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.PROGRAM; + import org.jenkinsci.plugins.workflow.flow.FlowExecution; import org.jenkinsci.plugins.workflow.graph.FlowNode; import org.jenkinsci.plugins.workflow.support.concurrent.Futures; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java index 97d5911c8..c0c1852a9 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java @@ -74,10 +74,14 @@ import java.util.logging.Level; import java.util.logging.Logger; -import static java.util.logging.Level.*; import javax.annotation.CheckForNull; -import static org.jenkinsci.plugins.workflow.cps.CpsFlowExecution.*; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; + +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; +import static org.jenkinsci.plugins.workflow.cps.CpsFlowExecution.PROGRAM_STATE_SERIALIZATION; +import static org.jenkinsci.plugins.workflow.cps.CpsFlowExecution.TimingKind; +import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.PROGRAM; + import org.jenkinsci.plugins.workflow.pickles.Pickle; import org.jenkinsci.plugins.workflow.pickles.PickleFactory; import org.jenkinsci.plugins.workflow.support.pickles.SingleTypedPickleFactory; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmThreadOnly.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmThreadOnly.java index 52093fbbf..1bd728548 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmThreadOnly.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmThreadOnly.java @@ -2,7 +2,8 @@ import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.METHOD; /** * Indicates that the method is only meant to be called by diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java index 789b7eab3..5c747cebc 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java @@ -68,14 +68,17 @@ import org.jenkinsci.plugins.structs.describable.DescribableModel; import org.jenkinsci.plugins.structs.describable.DescribableParameter; import org.jenkinsci.plugins.structs.describable.UninstantiatedDescribable; -import static org.jenkinsci.plugins.workflow.cps.ThreadTaskResult.*; import org.jenkinsci.plugins.workflow.cps.actions.ArgumentsActionImpl; import org.jenkinsci.plugins.workflow.cps.nodes.StepAtomNode; import org.jenkinsci.plugins.workflow.cps.nodes.StepEndNode; import org.jenkinsci.plugins.workflow.cps.nodes.StepStartNode; import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; + +import static org.jenkinsci.plugins.workflow.cps.ThreadTaskResult.resumeWith; +import static org.jenkinsci.plugins.workflow.cps.ThreadTaskResult.suspendWith; +import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.PROGRAM; + import org.jenkinsci.plugins.workflow.cps.steps.LoadStep; import org.jenkinsci.plugins.workflow.cps.steps.ParallelStep; import org.jenkinsci.plugins.workflow.cps.view.InterpolatedSecretsAction; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java index 98b743662..8195dc704 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java @@ -27,7 +27,6 @@ import hudson.Extension; import hudson.ExtensionList; import hudson.ExtensionPoint; -import hudson.model.InvisibleAction; import hudson.model.RootAction; import java.io.IOException; import net.sf.json.JSONArray; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistIn.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistIn.java index b5d1bf12f..906dfca80 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistIn.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistIn.java @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.SOURCE; /** * Indicates that this class gets persisted in the {@code build.xml} as a part of diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java index e9ce49dc0..b56c8f23f 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java @@ -34,7 +34,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; +import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.PROGRAM; /** * CPS-specific {@link Step} implementation that executes multiple closures in parallel. diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java index c2261f68a..03b0ec88a 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java @@ -25,25 +25,14 @@ import hudson.model.Run; import jenkins.model.RunAction2; -import org.jenkinsci.plugins.structs.describable.DescribableModel; -import org.jenkinsci.plugins.structs.describable.DescribableParameter; -import org.jenkinsci.plugins.structs.describable.UninstantiatedDescribable; -import org.jenkinsci.plugins.workflow.actions.ArgumentsAction; -import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner; -import org.jenkinsci.plugins.workflow.graph.FlowNode; -import org.jenkinsci.plugins.workflow.graph.StepNode; -import org.jenkinsci.plugins.workflow.steps.StepDescriptor; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; import javax.annotation.Nonnull; -import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * Action to generate the UI report for watched environment variables diff --git a/src/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java b/src/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java index 57ee2f3e1..8255256f6 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java @@ -36,7 +36,6 @@ import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; -import static org.junit.Assert.*; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -44,6 +43,8 @@ import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.JenkinsRule; +import static org.junit.Assert.assertEquals; + /** * Test of {@link WorkflowJob} that doesn't involve Jenkins restarts. * diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java index be2ca9716..10eb5b121 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java @@ -48,7 +48,9 @@ import org.jenkinsci.plugins.workflow.steps.StepExecutions; import org.junit.ClassRule; import org.junit.Test; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertNotNull; + import org.junit.Rule; import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.Issue; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java index 260f81ed3..c8374b9a8 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java @@ -36,7 +36,9 @@ import org.kohsuke.stapler.DataBoundConstructor; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.iterableWithSize; +import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java index f09aaf4f9..9efa46786 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java @@ -46,8 +46,6 @@ import org.jenkinsci.plugins.workflow.steps.StepExecution; import org.jenkinsci.plugins.workflow.steps.StepExecutions; -import static org.junit.Assert.*; - import org.junit.Assert; import org.junit.Assume; import org.junit.ClassRule; @@ -61,7 +59,10 @@ import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.DataBoundConstructor; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; public class CpsFlowDefinition2Test { diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidatorTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidatorTest.java index c8267a384..f56a57afb 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidatorTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidatorTest.java @@ -24,7 +24,9 @@ package org.jenkinsci.plugins.workflow.cps; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertNull; import hudson.model.Item; import hudson.model.User; @@ -33,7 +35,6 @@ import jenkins.model.Jenkins; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.junit.Test; -import static org.junit.Assert.*; import org.junit.Rule; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionMemoryTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionMemoryTest.java index 32eb7e1ac..31fe68d95 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionMemoryTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionMemoryTest.java @@ -38,7 +38,9 @@ import org.junit.After; import org.junit.ClassRule; import org.junit.Test; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertFalse; + import org.junit.Ignore; import org.junit.Rule; import org.jvnet.hudson.test.BuildWatcher; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java index 87e63d9f7..9b6cfb3ad 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java @@ -61,7 +61,12 @@ import org.jenkinsci.plugins.workflow.support.pickles.TryRepeatedly; import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java index ce5b8e6c6..95ae4c0d8 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java @@ -49,7 +49,11 @@ import org.jenkinsci.plugins.workflow.graph.FlowNode; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import org.junit.Assert; import org.junit.ClassRule; import org.junit.Rule; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpActionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpActionTest.java index fa38bab08..a66bbed98 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpActionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpActionTest.java @@ -24,14 +24,14 @@ package org.jenkinsci.plugins.workflow.cps; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; import hudson.model.queue.QueueTaskFuture; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; import org.junit.Test; -import static org.junit.Assert.*; import org.junit.Rule; import org.jvnet.hudson.test.JenkinsRule; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java index d964b2415..b65051362 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java @@ -11,7 +11,13 @@ import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java index 09f23c447..4d0eefd48 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java @@ -38,7 +38,10 @@ import org.jenkinsci.plugins.workflow.steps.AbstractStepExecutionImpl; import org.jenkinsci.plugins.workflow.steps.AbstractStepImpl; import org.junit.Test; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import org.junit.ClassRule; import org.junit.Rule; import org.jvnet.hudson.test.BuildWatcher; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java index faab70cae..a1c07fa16 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java @@ -42,11 +42,12 @@ import java.util.List; import java.util.Map; import java.util.Set; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import hudson.model.StringParameterDefinition; import hudson.model.StringParameterValue; -import org.hamcrest.MatcherAssert; import org.jenkinsci.plugins.structs.describable.UninstantiatedDescribable; import org.jenkinsci.plugins.workflow.actions.ArgumentsAction; import org.jenkinsci.plugins.workflow.cps.view.InterpolatedSecretsAction; @@ -68,7 +69,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.*; import org.junit.Assert; import org.junit.Before; @@ -459,15 +459,15 @@ public void namedSoleParamForStep() throws Exception { InterpolatedSecretsAction reportAction = run.getAction(InterpolatedSecretsAction.class); Assert.assertNotNull(reportAction); List warnings = reportAction.getWarnings(); - MatcherAssert.assertThat(warnings.size(), is(1)); + assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); - MatcherAssert.assertThat(stepWarning.getStepName(), is(shellStep)); - MatcherAssert.assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); + assertThat(stepWarning.getStepName(), is(shellStep)); + assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate(shellStep)); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); Assert.assertFalse(argAction.isUnmodifiedArguments()); - MatcherAssert.assertThat(argAction.getArguments().values().iterator().next(), is("echo ${PASSWORD}")); + assertThat(argAction.getArguments().values().iterator().next(), is("echo ${PASSWORD}")); } @Issue("JENKINS-63254") @@ -489,10 +489,10 @@ public void namedSoleParamForStep() throws Exception { InterpolatedSecretsAction reportAction = run.getAction(InterpolatedSecretsAction.class); Assert.assertNotNull(reportAction); List warnings = reportAction.getWarnings(); - MatcherAssert.assertThat(warnings.size(), is(1)); + assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); - MatcherAssert.assertThat(stepWarning.getStepName(), is("archiveArtifacts")); - MatcherAssert.assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); + assertThat(stepWarning.getStepName(), is("archiveArtifacts")); + assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); } @Test public void multipleSensitiveVariables() throws Exception { @@ -515,15 +515,15 @@ public void namedSoleParamForStep() throws Exception { InterpolatedSecretsAction reportAction = run.getAction(InterpolatedSecretsAction.class); Assert.assertNotNull(reportAction); List warnings = reportAction.getWarnings(); - MatcherAssert.assertThat(warnings.size(), is(1)); + assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); - MatcherAssert.assertThat(stepWarning.getStepName(), is(shellStep)); - MatcherAssert.assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD", "USERNAME"))); + assertThat(stepWarning.getStepName(), is(shellStep)); + assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD", "USERNAME"))); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate(shellStep)); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); Assert.assertFalse(argAction.isUnmodifiedArguments()); - MatcherAssert.assertThat(argAction.getArguments().values().iterator().next(), is("echo ${PASSWORD} ${USERNAME} ${PASSWORD}")); + assertThat(argAction.getArguments().values().iterator().next(), is("echo ${PASSWORD} ${USERNAME} ${PASSWORD}")); } @Issue("JENKINS-63254") @@ -546,17 +546,17 @@ public void namedSoleParamForStep() throws Exception { InterpolatedSecretsAction reportAction = run.getAction(InterpolatedSecretsAction.class); Assert.assertNotNull(reportAction); List warnings = reportAction.getWarnings(); - MatcherAssert.assertThat(warnings.size(), is(1)); + assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); - MatcherAssert.assertThat(stepWarning.getStepName(), is("monomorphWithSymbolStep")); - MatcherAssert.assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); + assertThat(stepWarning.getStepName(), is("monomorphWithSymbolStep")); + assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate("monomorphWithSymbolStep")); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); Assert.assertFalse(argAction.isUnmodifiedArguments()); Object var = argAction.getArguments().values().iterator().next(); - MatcherAssert.assertThat(var, instanceOf(UninstantiatedDescribable.class)); - MatcherAssert.assertThat(((UninstantiatedDescribable)var).getArguments().toString(), is("{firstArg=${PASSWORD}, secondArg=two}")); + assertThat(var, instanceOf(UninstantiatedDescribable.class)); + assertThat(((UninstantiatedDescribable)var).getArguments().toString(), is("{firstArg=${PASSWORD}, secondArg=two}")); } @Issue("JENKINS-63254") @@ -581,13 +581,13 @@ public void namedSoleParamForStep() throws Exception { InterpolatedSecretsAction reportAction = run.getAction(InterpolatedSecretsAction.class); Assert.assertNotNull(reportAction); List warnings = reportAction.getWarnings(); - MatcherAssert.assertThat(warnings.size(), is(2)); + assertThat(warnings.size(), is(2)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); - MatcherAssert.assertThat(stepWarning.getStepName(), is("monomorphWithSymbolStep")); - MatcherAssert.assertThat(stepWarning.getInterpolatedVariables(), equalTo(Arrays.asList("PASSWORD", "USERNAME"))); + assertThat(stepWarning.getStepName(), is("monomorphWithSymbolStep")); + assertThat(stepWarning.getInterpolatedVariables(), equalTo(Arrays.asList("PASSWORD", "USERNAME"))); InterpolatedSecretsAction.InterpolatedWarnings listStepWarning = warnings.get(1); - MatcherAssert.assertThat(listStepWarning.getStepName(), is("monomorphListSymbolStep")); - MatcherAssert.assertThat(listStepWarning.getInterpolatedVariables(), equalTo(Arrays.asList("PASSWORD", "USERNAME"))); + assertThat(listStepWarning.getStepName(), is("monomorphListSymbolStep")); + assertThat(listStepWarning.getInterpolatedVariables(), equalTo(Arrays.asList("PASSWORD", "USERNAME"))); } @Test public void noBodyError() throws Exception { @@ -629,15 +629,15 @@ public void namedSoleParamForStep() throws Exception { InterpolatedSecretsAction reportAction = run.getAction(InterpolatedSecretsAction.class); Assert.assertNotNull(reportAction); List warnings = reportAction.getWarnings(); - MatcherAssert.assertThat(warnings.size(), is(1)); + assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); - MatcherAssert.assertThat(stepWarning.getStepName(), is(shellStep)); - MatcherAssert.assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); + assertThat(stepWarning.getStepName(), is(shellStep)); + assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate(shellStep)); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); Assert.assertFalse(argAction.isUnmodifiedArguments()); - MatcherAssert.assertThat(argAction.getArguments().values().iterator().next(), is("echo hello ${PASSWORD}")); + assertThat(argAction.getArguments().values().iterator().next(), is("echo hello ${PASSWORD}")); } @Issue("JENKINS-64282") @@ -659,7 +659,7 @@ public void namedSoleParamForStep() throws Exception { FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate(shellStep)); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); Assert.assertTrue(argAction.isUnmodifiedArguments()); - MatcherAssert.assertThat(argAction.getArguments().values().iterator().next(), is("echo hello ")); + assertThat(argAction.getArguments().values().iterator().next(), is("echo hello ")); } public static class CLStep extends Step { diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java index e8874e748..2d9434dba 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java @@ -33,7 +33,9 @@ import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.junit.ClassRule; import org.junit.Test; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; + import org.junit.Rule; import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.Issue; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTest.java index ec3e1401f..802cc41ec 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTest.java @@ -78,7 +78,8 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.NoStaplerConstructorException; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; // TODO these tests would better be moved to the respective plugins diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java index 762fce486..39c3b6349 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java @@ -33,7 +33,8 @@ import org.jenkinsci.plugins.workflow.util.StaplerReferer; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * Test harness to test {@link Snippetizer}. diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java index 14e49cc8a..5b7af0166 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java @@ -13,13 +13,8 @@ import hudson.Functions; import hudson.XmlFile; import hudson.model.Action; -import hudson.model.ParametersAction; -import hudson.model.ParametersDefinitionProperty; -import hudson.model.PasswordParameterDefinition; -import hudson.model.PasswordParameterValue; import hudson.tasks.ArtifactArchiver; import org.apache.commons.lang.RandomStringUtils; -import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.hamcrest.collection.IsMapContaining; import org.jenkinsci.plugins.credentialsbinding.impl.BindingStep; @@ -52,8 +47,20 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.Issue; @@ -115,7 +122,7 @@ private void testDeserialize(FlowExecution execution) throws Exception { for (FlowNode f : nodes) { XmlFile file = (XmlFile)(getFileM.invoke(storage, f.getId())); Object tagObj = file.read(); - Assert.assertNotNull(tagObj); + assertNotNull(tagObj); // Check actions & node in the Tag object, but without getting at the private Tag class Field actionField = tagObj.getClass().getDeclaredField("actions"); @@ -128,28 +135,28 @@ private void testDeserialize(FlowExecution execution) throws Exception { FlowNode deserializedNode = (FlowNode)(nodeField.get(tagObj)); nodeExecutionF.set(deserializedNode, f.getExecution()); - Assert.assertNotNull(deserializedNode); + assertNotNull(deserializedNode); if (f.getActions().size() > 0) { - Assert.assertNotNull(deserializedActions); - Assert.assertEquals(f.getActions().size(), deserializedActions.length); + assertNotNull(deserializedActions); + assertEquals(f.getActions().size(), deserializedActions.length); } ArgumentsAction expectedInfoAction = f.getPersistentAction(ArgumentsAction.class); if (expectedInfoAction != null) { Action deserializedInfoAction = Iterables.getFirst(Iterables.filter(Lists.newArrayList(deserializedActions), Predicates.instanceOf(ArgumentsAction.class)), null); - Assert.assertNotNull(deserializedInfoAction); + assertNotNull(deserializedInfoAction); ArgumentsAction ArgumentsAction = (ArgumentsAction)deserializedInfoAction; // Compare original and deserialized step arguments to see if they match - Assert.assertEquals(ArgumentsAction.getStepArgumentsAsString(f), ArgumentsAction.getStepArgumentsAsString(deserializedNode)); + assertEquals(ArgumentsAction.getStepArgumentsAsString(f), ArgumentsAction.getStepArgumentsAsString(deserializedNode)); Map expectedParams = expectedInfoAction.getArguments(); Map deserializedParams = ArgumentsAction.getArguments(); - Assert.assertEquals(expectedParams.size(), deserializedParams.size()); + assertEquals(expectedParams.size(), deserializedParams.size()); for (String s : expectedParams.keySet()) { Object expectedVal = expectedParams.get(s); Object actualVal = deserializedParams.get(s); if (expectedVal instanceof Comparable) { - Assert.assertEquals(actualVal, expectedVal); + assertEquals(actualVal, expectedVal); } } @@ -164,9 +171,9 @@ public void testStringSafetyTest() throws Exception { passwordBinding.put("mypass", "p4ssw0rd"); Set sensitiveVariables = new HashSet<>(); sensitiveVariables.add("mypass"); - MatcherAssert.assertThat("Input with no variables is safe", ArgumentsActionImpl.replaceSensitiveVariables(input, new EnvVars(), sensitiveVariables), is(input)); - MatcherAssert.assertThat("Input containing bound value is unsafe", ArgumentsActionImpl.replaceSensitiveVariables(input, new EnvVars(passwordBinding), sensitiveVariables), is("I have a secret ${mypass}")); - MatcherAssert.assertThat("EnvVars that do not occur are safe", ArgumentsActionImpl.replaceSensitiveVariables("I have no passwords", new EnvVars(passwordBinding), sensitiveVariables), is("I have no passwords")); + assertThat("Input with no variables is safe", ArgumentsActionImpl.replaceSensitiveVariables(input, new EnvVars(), sensitiveVariables), is(input)); + assertThat("Input containing bound value is unsafe", ArgumentsActionImpl.replaceSensitiveVariables(input, new EnvVars(passwordBinding), sensitiveVariables), is("I have a secret ${mypass}")); + assertThat("EnvVars that do not occur are safe", ArgumentsActionImpl.replaceSensitiveVariables("I have no passwords", new EnvVars(passwordBinding), sensitiveVariables), is("I have no passwords")); } @Test @@ -186,25 +193,25 @@ public void testRecursiveSanitizationOfContent() { String oversizedString = new String (oversized); // Simplest masking of secret and oversized value - Assert.assertEquals("${USERVARIABLE}", impl.sanitizeObjectAndRecordMutation(secretUsername, env)); - Assert.assertFalse(impl.isUnmodifiedArguments()); + assertEquals("${USERVARIABLE}", impl.sanitizeObjectAndRecordMutation(secretUsername, env)); + assertFalse(impl.isUnmodifiedArguments()); impl.isUnmodifiedBySanitization = true; - Assert.assertEquals(ArgumentsAction.NotStoredReason.OVERSIZE_VALUE, impl.sanitizeObjectAndRecordMutation(oversizedString, env)); - Assert.assertFalse(impl.isUnmodifiedArguments()); + assertEquals(ArgumentsAction.NotStoredReason.OVERSIZE_VALUE, impl.sanitizeObjectAndRecordMutation(oversizedString, env)); + assertFalse(impl.isUnmodifiedArguments()); impl.isUnmodifiedBySanitization = true; // Test explosion of Step & UninstantiatedDescribable objects Step mystep = new EchoStep("I have a "+secretUsername); Map singleSanitization = (Map)(impl.sanitizeObjectAndRecordMutation(mystep, env)); - Assert.assertEquals(1, singleSanitization.size()); - Assert.assertEquals("I have a ${USERVARIABLE}", singleSanitization.get("message")); - Assert.assertFalse(impl.isUnmodifiedArguments()); + assertEquals(1, singleSanitization.size()); + assertEquals("I have a ${USERVARIABLE}", singleSanitization.get("message")); + assertFalse(impl.isUnmodifiedArguments()); impl.isUnmodifiedBySanitization = true; singleSanitization = ((UninstantiatedDescribable) (impl.sanitizeObjectAndRecordMutation(mystep.getDescriptor().uninstantiate(mystep), env))).getArguments(); - Assert.assertEquals(1, singleSanitization.size()); - Assert.assertEquals("I have a ${USERVARIABLE}", singleSanitization.get("message")); - Assert.assertFalse(impl.isUnmodifiedArguments()); + assertEquals(1, singleSanitization.size()); + assertEquals("I have a ${USERVARIABLE}", singleSanitization.get("message")); + assertFalse(impl.isUnmodifiedArguments()); impl.isUnmodifiedBySanitization = true; // Maps @@ -212,24 +219,24 @@ public void testRecursiveSanitizationOfContent() { dangerous.put("name", secretUsername); Map sanitizedMap = impl.sanitizeMapAndRecordMutation(dangerous, env); Assert.assertNotEquals(sanitizedMap, dangerous); - Assert.assertEquals("${USERVARIABLE}", sanitizedMap.get("name")); - Assert.assertFalse(impl.isUnmodifiedArguments()); + assertEquals("${USERVARIABLE}", sanitizedMap.get("name")); + assertFalse(impl.isUnmodifiedArguments()); impl.isUnmodifiedBySanitization = true; Map identicalMap = impl.sanitizeMapAndRecordMutation(dangerous, new EnvVars()); // String is no longer dangerous - Assert.assertEquals(identicalMap, dangerous); - Assert.assertTrue(impl.isUnmodifiedArguments()); + assertEquals(identicalMap, dangerous); + assertTrue(impl.isUnmodifiedArguments()); // Lists List unsanitizedList = Arrays.asList("cheese", null, secretUsername); List sanitized = (List)impl.sanitizeListAndRecordMutation(unsanitizedList, env); - Assert.assertEquals(3, sanitized.size()); - Assert.assertFalse(impl.isUnmodifiedArguments()); - Assert.assertEquals("${USERVARIABLE}", sanitized.get(2)); + assertEquals(3, sanitized.size()); + assertFalse(impl.isUnmodifiedArguments()); + assertEquals("${USERVARIABLE}", sanitized.get(2)); impl.isUnmodifiedBySanitization = true; - Assert.assertEquals(unsanitizedList, impl.sanitizeObjectAndRecordMutation(unsanitizedList, new EnvVars())); - Assert.assertEquals(unsanitizedList, impl.sanitizeListAndRecordMutation(unsanitizedList, new EnvVars())); + assertEquals(unsanitizedList, impl.sanitizeObjectAndRecordMutation(unsanitizedList, new EnvVars())); + assertEquals(unsanitizedList, impl.sanitizeListAndRecordMutation(unsanitizedList, new EnvVars())); } @Test @@ -246,11 +253,11 @@ public void testArraySanitization() { ArgumentsActionImpl filtered = new ArgumentsActionImpl(args, env, sensitiveVariables); Map filteredArgs = filtered.getArguments(); - Assert.assertEquals(2, filteredArgs.size()); - Assert.assertThat(filteredArgs, IsMapContaining.hasEntry("ints", ArgumentsAction.NotStoredReason.UNSERIALIZABLE)); - Assert.assertThat(filteredArgs, IsMapContaining.hasKey("strings")); + assertEquals(2, filteredArgs.size()); + assertThat(filteredArgs, IsMapContaining.hasEntry("ints", ArgumentsAction.NotStoredReason.UNSERIALIZABLE)); + assertThat(filteredArgs, IsMapContaining.hasKey("strings")); Object[] contents = (Object[])(filteredArgs.get("strings")); - Assert.assertArrayEquals(new Object[]{"heh", "${USERVARIABLE}", "lumberjack"}, (Object[])(filteredArgs.get("strings"))); + assertArrayEquals(new Object[]{"heh", "${USERVARIABLE}", "lumberjack"}, (Object[])(filteredArgs.get("strings"))); } @Test @@ -273,7 +280,7 @@ public void testMissingDescriptionInsideStage() throws Exception { List nodes = new LinearScanner().filteredNodes(run.getExecution(), new NodeStepTypePredicate("sh")); for (FlowNode f : nodes) { if (ArgumentsAction.getStepArgumentsAsString(f) == null) { - Assert.fail("No arguments action for node: "+f.toString()); + fail("No arguments action for node: "+f.toString()); } } } @@ -293,23 +300,23 @@ public void testBasicCreateAndMask() throws Exception { // Same string, unsanitized ArgumentsActionImpl argumentsActionImpl = new ArgumentsActionImpl(arguments, new EnvVars(), sensitiveVariables); - Assert.assertTrue(argumentsActionImpl.isUnmodifiedArguments()); - Assert.assertEquals(arguments.get("message"), argumentsActionImpl.getArgumentValueOrReason("message")); - Assert.assertEquals(1, argumentsActionImpl.getArguments().size()); - Assert.assertEquals("I have a secret p4ssw0rd", argumentsActionImpl.getArguments().get("message")); + assertTrue(argumentsActionImpl.isUnmodifiedArguments()); + assertEquals(arguments.get("message"), argumentsActionImpl.getArgumentValueOrReason("message")); + assertEquals(1, argumentsActionImpl.getArguments().size()); + assertEquals("I have a secret p4ssw0rd", argumentsActionImpl.getArguments().get("message")); // Test sanitizing arguments now argumentsActionImpl = new ArgumentsActionImpl(arguments, new EnvVars(passwordBinding), sensitiveVariables); - Assert.assertFalse(argumentsActionImpl.isUnmodifiedArguments()); - Assert.assertEquals("I have a secret ${mypass}", argumentsActionImpl.getArgumentValueOrReason("message")); - Assert.assertEquals(1, argumentsActionImpl.getArguments().size()); - Assert.assertEquals("I have a secret ${mypass}", argumentsActionImpl.getArguments().get("message")); + assertFalse(argumentsActionImpl.isUnmodifiedArguments()); + assertEquals("I have a secret ${mypass}", argumentsActionImpl.getArgumentValueOrReason("message")); + assertEquals(1, argumentsActionImpl.getArguments().size()); + assertEquals("I have a secret ${mypass}", argumentsActionImpl.getArguments().get("message")); // Mask oversized values arguments.clear(); arguments.put("text", RandomStringUtils.random(maxSize+1)); argumentsActionImpl = new ArgumentsActionImpl(arguments); - Assert.assertEquals(ArgumentsAction.NotStoredReason.OVERSIZE_VALUE, argumentsActionImpl.getArgumentValueOrReason("text")); + assertEquals(ArgumentsAction.NotStoredReason.OVERSIZE_VALUE, argumentsActionImpl.getArgumentValueOrReason("text")); } @Test @@ -324,8 +331,8 @@ Object writeReplace() { unserializable.put("ex", me); ArgumentsActionImpl impl = new ArgumentsActionImpl(unserializable); - Assert.assertEquals(ArgumentsAction.NotStoredReason.UNSERIALIZABLE, impl.getArgumentValueOrReason("ex")); - Assert.assertFalse("Should show argument removed by sanitization", impl.isUnmodifiedArguments()); + assertEquals(ArgumentsAction.NotStoredReason.UNSERIALIZABLE, impl.getArgumentValueOrReason("ex")); + assertFalse("Should show argument removed by sanitization", impl.isUnmodifiedArguments()); } static class SuperSpecialThing implements Serializable { @@ -356,7 +363,7 @@ public boolean equals(Object ob) { logging.record(ArgumentsActionImpl.class, Level.FINE); ArgumentsActionImpl impl = new ArgumentsActionImpl(Collections.singletonMap("curve", new Fractal())); Map args = impl.getArguments(); - Assert.assertThat(args, IsMapContaining.hasEntry("curve", ArgumentsAction.NotStoredReason.UNSERIALIZABLE)); + assertThat(args, IsMapContaining.hasEntry("curve", ArgumentsAction.NotStoredReason.UNSERIALIZABLE)); } public static final class Fractal extends Curve { @Override public String getDescription() { @@ -376,19 +383,19 @@ public void testAvoidStoringSpecialTypes() throws Exception { ArgumentsActionImpl argsAction = new ArgumentsActionImpl(testMap); Map maskedArgs = argsAction.getArguments(); - Assert.assertThat(maskedArgs, IsMapContaining.hasEntry("maskme", ArgumentsAction.NotStoredReason.UNSERIALIZABLE)); - Assert.assertThat(maskedArgs, IsMapContaining.hasEntry("safe", 5)); + assertThat(maskedArgs, IsMapContaining.hasEntry("maskme", ArgumentsAction.NotStoredReason.UNSERIALIZABLE)); + assertThat(maskedArgs, IsMapContaining.hasEntry("safe", 5)); // Sub-map sanitization Map subMap = (Map)(maskedArgs.get("maskMyMapValue")); - Assert.assertThat(subMap, IsMapContaining.hasEntry("bob", ArgumentsAction.NotStoredReason.UNSERIALIZABLE)); + assertThat(subMap, IsMapContaining.hasEntry("bob", ArgumentsAction.NotStoredReason.UNSERIALIZABLE)); // Nested list masking too! List sublist = (List)(maskedArgs.get("maskAnElement")); - Assert.assertThat(sublist, Matchers.hasItem("cheese")); - Assert.assertThat(sublist, Matchers.hasItems("cheese", ArgumentsAction.NotStoredReason.UNSERIALIZABLE, -8)); + assertThat(sublist, Matchers.hasItem("cheese")); + assertThat(sublist, Matchers.hasItems("cheese", ArgumentsAction.NotStoredReason.UNSERIALIZABLE, -8)); List subSubList = (List)(sublist.get(3)); - Assert.assertThat(subSubList, Matchers.contains("nested", ArgumentsAction.NotStoredReason.UNSERIALIZABLE)); + assertThat(subSubList, Matchers.contains("nested", ArgumentsAction.NotStoredReason.UNSERIALIZABLE)); } @Test @@ -421,21 +428,21 @@ public void testBasicCredentials() throws Exception { List filtered = scanner.filteredNodes(exec, new DescriptorMatchPredicate(BindingStep.DescriptorImpl.class)); // Check the binding step is OK - Assert.assertEquals(8, filtered.size()); + assertEquals(8, filtered.size()); FlowNode node = Collections2.filter(filtered, FlowScanningUtils.hasActionPredicate(ArgumentsActionImpl.class)).iterator().next(); ArgumentsActionImpl act = node.getPersistentAction(ArgumentsActionImpl.class); - Assert.assertNotNull(act.getArgumentValue("bindings")); - Assert.assertNotNull(act.getArguments().get("bindings")); + assertNotNull(act.getArgumentValue("bindings")); + assertNotNull(act.getArguments().get("bindings")); // Test that masking really does mask bound credentials appropriately filtered = scanner.filteredNodes(exec, new DescriptorMatchPredicate(EchoStep.DescriptorImpl.class)); for (FlowNode f : filtered) { act = f.getPersistentAction(ArgumentsActionImpl.class); - MatcherAssert.assertThat((String) act.getArguments().get("message"), allOf(not(containsString("bob")), not(containsString("s3cr3t")))); + assertThat((String) act.getArguments().get("message"), allOf(not(containsString("bob")), not(containsString("s3cr3t")))); } List allStepped = scanner.filteredNodes(run.getExecution().getCurrentHeads(), FlowScanningUtils.hasActionPredicate(ArgumentsActionImpl.class)); - Assert.assertEquals(6, allStepped.size()); // One ArgumentsActionImpl per block or atomic step + assertEquals(6, allStepped.size()); // One ArgumentsActionImpl per block or atomic step testDeserialize(exec); } @@ -455,12 +462,12 @@ public void testSpecialMetastepCases() throws Exception { WorkflowRun run = r.buildAndAssertSuccess(job); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution(), new DescriptorMatchPredicate(StateMetaStep.DescriptorImpl.class)); - Assert.assertNotNull(node); + assertNotNull(node); Map args = ArgumentsAction.getArguments(node); - Assert.assertEquals(2, args.size()); - Assert.assertEquals(true, args.get("moderate")); + assertEquals(2, args.size()); + assertEquals(true, args.get("moderate")); Map stateArgs = (Map)args.get("state"); - Assert.assertTrue("Nested state Describable should only include a class argument or none at all", + assertTrue("Nested state Describable should only include a class argument or none at all", stateArgs.size() <= 1 && Sets.difference(stateArgs.keySet(), new HashSet<>(Arrays.asList("$class"))).size() == 0); // Same metastep but only one arg supplied, shouldn't auto-unwrap the internal step because can take 2 args @@ -474,13 +481,13 @@ public void testSpecialMetastepCases() throws Exception { run = r.buildAndAssertSuccess(job); List nodes = scan.filteredNodes(run.getExecution(), new DescriptorMatchPredicate(StateMetaStep.DescriptorImpl.class)); for (FlowNode n : nodes) { - Assert.assertNotNull(n); + assertNotNull(n); args = ArgumentsAction.getArguments(n); - Assert.assertEquals(1, args.size()); + assertEquals(1, args.size()); Map argsMap = (Map)args; Object stateValue = argsMap.get("state"); if (stateValue instanceof Map) { - Assert.assertEquals("Oregon", ((Map)stateValue).get("$class")); + assertEquals("Oregon", ((Map)stateValue).get("$class")); } } } @@ -520,23 +527,23 @@ public void testArgumentDescriptions() throws Exception { // Argument test FlowNode echoNode = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate("echo")); - Assert.assertEquals("test", echoNode.getPersistentAction(ArgumentsAction.class).getArguments().values().iterator().next()); - Assert.assertEquals("test", ArgumentsAction.getStepArgumentsAsString(echoNode)); + assertEquals("test", echoNode.getPersistentAction(ArgumentsAction.class).getArguments().values().iterator().next()); + assertEquals("test", ArgumentsAction.getStepArgumentsAsString(echoNode)); if (Functions.isWindows()) { FlowNode batchNode = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate("bat")); - Assert.assertEquals("echo %USERNAME%", batchNode.getPersistentAction(ArgumentsAction.class).getArguments().values().iterator().next()); - Assert.assertEquals("echo %USERNAME%", ArgumentsAction.getStepArgumentsAsString(batchNode)); + assertEquals("echo %USERNAME%", batchNode.getPersistentAction(ArgumentsAction.class).getArguments().values().iterator().next()); + assertEquals("echo %USERNAME%", ArgumentsAction.getStepArgumentsAsString(batchNode)); } else { // Unix FlowNode shellNode = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate("sh")); - Assert.assertEquals("whoami", shellNode.getPersistentAction(ArgumentsAction.class).getArguments().values().iterator().next()); - Assert.assertEquals("whoami", ArgumentsAction.getStepArgumentsAsString(shellNode)); + assertEquals("whoami", shellNode.getPersistentAction(ArgumentsAction.class).getArguments().values().iterator().next()); + assertEquals("whoami", ArgumentsAction.getStepArgumentsAsString(shellNode)); } FlowNode nodeNode = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), Predicates.and(Predicates.instanceOf(StepStartNode.class), new NodeStepTypePredicate("node"), FlowScanningUtils.hasActionPredicate(ArgumentsActionImpl.class))); - Assert.assertEquals(r.jenkins.getSelfLabel().getName(), nodeNode.getPersistentAction(ArgumentsAction.class).getArguments().values().iterator().next()); - Assert.assertEquals(r.jenkins.getSelfLabel().getName(), ArgumentsAction.getStepArgumentsAsString(nodeNode)); + assertEquals(r.jenkins.getSelfLabel().getName(), nodeNode.getPersistentAction(ArgumentsAction.class).getArguments().values().iterator().next()); + assertEquals(r.jenkins.getSelfLabel().getName(), ArgumentsAction.getStepArgumentsAsString(nodeNode)); testDeserialize(run.getExecution()); } @@ -559,23 +566,23 @@ public void testUnusualStepInstantiations() throws Exception { FlowNode testNode = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate("writeFile")); ArgumentsAction act = testNode.getPersistentAction(ArgumentsAction.class); - Assert.assertNotNull(act); - Assert.assertEquals("hello world", act.getArgumentValue("text")); - Assert.assertEquals("msg.out", act.getArgumentValue("file")); + assertNotNull(act); + assertEquals("hello world", act.getArgumentValue("text")); + assertEquals("msg.out", act.getArgumentValue("file")); testNode = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate("step")); act = testNode.getPersistentAction(ArgumentsAction.class); - Assert.assertNotNull(act); + assertNotNull(act); Map delegateMap = ((Map)act.getArgumentValue("delegate")); - Assert.assertEquals("msg.out", delegateMap.get("artifacts")); - Assert.assertEquals(Boolean.FALSE, delegateMap.get("fingerprint")); + assertEquals("msg.out", delegateMap.get("artifacts")); + assertEquals(Boolean.FALSE, delegateMap.get("fingerprint")); testNode = run.getExecution().getNode("7"); // Start node for EnvAction act = testNode.getPersistentAction(ArgumentsAction.class); - Assert.assertNotNull(act); - Assert.assertEquals(1, act.getArguments().size()); + assertNotNull(act); + assertEquals(1, act.getArguments().size()); Object ob = act.getArguments().get("overrides"); - Assert.assertEquals("CUSTOM=val", (String)((ArrayList) ob).get(0)); + assertEquals("CUSTOM=val", (String)((ArrayList) ob).get(0)); testDeserialize(run.getExecution()); } @@ -592,15 +599,15 @@ public void testReallyUnusualStepInstantiations() throws Exception { FlowNode testNode = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate("step")); ArgumentsAction act = testNode.getPersistentAction(ArgumentsAction.class); - Assert.assertNotNull(act); + assertNotNull(act); Object delegate = act.getArgumentValue("delegate"); // Test that for a raw Describable we explode it into its arguments Map - Assert.assertThat(delegate, instanceOf(UninstantiatedDescribable.class)); + assertThat(delegate, instanceOf(UninstantiatedDescribable.class)); UninstantiatedDescribable ud = (UninstantiatedDescribable)delegate; Map args = (Map)(((UninstantiatedDescribable)delegate).getArguments()); - Assert.assertThat(args, IsMapContaining.hasEntry("artifacts", "msg.out")); - Assert.assertEquals(ArtifactArchiver.class.getName(), ud.getModel().getType().getName()); + assertThat(args, IsMapContaining.hasEntry("artifacts", "msg.out")); + assertEquals(ArtifactArchiver.class.getName(), ud.getModel().getType().getName()); } @Test public void enumArguments() throws Exception { @@ -619,11 +626,11 @@ public void testReallyUnusualStepInstantiations() throws Exception { ScriptApproval.get().approveSignature("staticField java.time.temporal.ChronoUnit MINUTES"); // TODO add to generic-whitelist WorkflowRun run = r.buildAndAssertSuccess(p); List nodes = new DepthFirstScanner().filteredNodes(run.getExecution(), new NodeStepTypePredicate("nop")); - Assert.assertThat(nodes.get(0).getPersistentAction(ArgumentsAction.class).getArgumentValueOrReason("value"), + assertThat(nodes.get(0).getPersistentAction(ArgumentsAction.class).getArgumentValueOrReason("value"), equalTo(ChronoUnit.MINUTES)); - Assert.assertThat(nodes.get(1).getPersistentAction(ArgumentsAction.class).getArgumentValueOrReason("value"), + assertThat(nodes.get(1).getPersistentAction(ArgumentsAction.class).getArgumentValueOrReason("value"), equalTo(TimeUnit.MINUTES)); - Assert.assertThat(nodes.get(2).getPersistentAction(ArgumentsAction.class).getArgumentValueOrReason("value"), + assertThat(nodes.get(2).getPersistentAction(ArgumentsAction.class).getArgumentValueOrReason("value"), equalTo(NotStoredReason.UNSERIALIZABLE)); } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java index 5eef1aa9d..a657d2877 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java @@ -32,7 +32,6 @@ import java.util.List; import java.util.logging.Level; import org.apache.commons.lang.StringUtils; -import static org.hamcrest.Matchers.*; import org.jenkinsci.plugins.configfiles.buildwrapper.ConfigFileBuildWrapper; import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; import org.jenkinsci.plugins.workflow.graph.FlowNode; @@ -40,7 +39,6 @@ import org.jenkinsci.plugins.workflow.graphanalysis.NodeStepTypePredicate; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; -import static org.junit.Assert.*; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Rule; @@ -50,6 +48,10 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; +import static org.junit.Assert.assertEquals; + public class StepNodeTest { @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher(); diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java index 22b1bdbff..ad5d78a5c 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java @@ -50,12 +50,10 @@ import jenkins.model.Jenkins; import org.apache.commons.io.IOUtils; import org.hamcrest.Matchers; -import static org.hamcrest.Matchers.*; import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; -import static org.junit.Assert.*; import org.junit.Assert; import org.junit.ClassRule; import org.junit.Rule; @@ -67,6 +65,14 @@ import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.RestartableJenkinsRule; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class ReplayActionTest { @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher(); @@ -157,20 +163,20 @@ public class ReplayActionTest { JenkinsRule.WebClient wc = r.createWebClient(); Assert.assertNull(run.asFlowExecutionOwner().getOrNull()); - Assert.assertTrue(canReplay(run, "admin")); - Assert.assertTrue(canReplay(run, "normal")); - Assert.assertTrue(canRebuild(run, "admin")); + assertTrue(canReplay(run, "admin")); + assertTrue(canReplay(run, "normal")); + assertTrue(canRebuild(run, "admin")); Assert.assertNull(run.asFlowExecutionOwner().getOrNull()); // After lazy-load we can do deeper checks easily, and the deep test triggers a full load of the execution - Assert.assertTrue(canReplayDeepTest(run, "admin")); - Assert.assertTrue(canReplayDeepTest(run2, "normal")); + assertTrue(canReplayDeepTest(run, "admin")); + assertTrue(canReplayDeepTest(run2, "normal")); - Assert.assertNotNull(run.asFlowExecutionOwner().getOrNull()); - Assert.assertTrue(canReplay(run, "admin")); - Assert.assertFalse(canReplay(run, "normal")); // Now we know to check if the user can run outside sandbox, and they can't - Assert.assertTrue(canReplay(run2, "normal")); // We can still run stuff inside sandbox - Assert.assertTrue(canRebuild(run, "admin")); + assertNotNull(run.asFlowExecutionOwner().getOrNull()); + assertTrue(canReplay(run, "admin")); + assertFalse(canReplay(run, "normal")); // Now we know to check if the user can run outside sandbox, and they can't + assertTrue(canReplay(run2, "normal")); // We can still run stuff inside sandbox + assertTrue(canRebuild(run, "admin")); }); } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepTest.java index b6f80e070..8e505897b 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepTest.java @@ -8,7 +8,6 @@ import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.junit.ClassRule; -import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.JenkinsRule; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java index b57eef64e..4a41e8fa7 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java @@ -10,7 +10,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import static java.util.Arrays.*; + +import static java.util.Arrays.asList; + import java.util.Comparator; import java.util.List; import java.util.logging.Level; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java index 0dfc1f66b..327f2d844 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java @@ -13,7 +13,9 @@ import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertTrue; + import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; From e6ee6b925ca2703a98144c1e4477528d318c8413 Mon Sep 17 00:00:00 2001 From: offa Date: Wed, 27 Oct 2021 15:04:12 +0200 Subject: [PATCH 593/932] Replace calls to deprecated IOUtils methods --- .../org/jenkinsci/plugins/workflow/cps/GroovySample.java | 4 +++- .../plugins/workflow/cps/replay/ReplayPipelineCommand.java | 4 +++- .../plugins/workflow/cps/replay/ReplayActionTest.java | 5 +++-- .../plugins/workflow/cps/steps/ParallelStepTest.java | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java index 8195dc704..371c6ab4a 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java @@ -29,6 +29,8 @@ import hudson.ExtensionPoint; import hudson.model.RootAction; import java.io.IOException; +import java.nio.charset.Charset; + import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.io.IOUtils; @@ -75,7 +77,7 @@ abstract class Static implements GroovySample { @Override public String script() { try { - return IOUtils.toString(GroovySample.class.getResource("samples/" + name() + ".groovy")); + return IOUtils.toString(GroovySample.class.getResource("samples/" + name() + ".groovy"), Charset.defaultCharset()); } catch (IOException x) { throw new AssertionError(x); } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java index b3ea51cf0..2e9c18e37 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java @@ -30,6 +30,8 @@ import hudson.cli.handlers.GenericItemOptionHandler; import hudson.model.Job; import hudson.model.Run; + +import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; import org.apache.commons.io.IOUtils; @@ -70,7 +72,7 @@ if (!action.isEnabled() || !action.isReplayableSandboxTest()) { throw new AbortException("Not authorized to replay builds of this job"); } - String text = IOUtils.toString(stdin); + String text = IOUtils.toString(stdin, Charset.defaultCharset()); if (script != null) { Map replacementLoadedScripts = new HashMap<>(action.getOriginalLoadedScripts()); if (!replacementLoadedScripts.containsKey(script)) { diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java index ad5d78a5c..9dece31b8 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java @@ -45,6 +45,7 @@ import hudson.security.ACLContext; import hudson.security.Permission; import java.io.File; +import java.nio.charset.Charset; import java.util.Collections; import java.util.List; import jenkins.model.Jenkins; @@ -317,13 +318,13 @@ private static boolean canRebuild(WorkflowRun b, String user) { WorkflowRun b1 = story.j.assertBuildStatusSuccess(p.scheduleBuild2(0)); story.j.assertLogContains("got original text", b1); // s/got/received/ on main script - assertEquals(0, new CLICommandInvoker(story.j, "replay-pipeline").withStdin(IOUtils.toInputStream("node {def t = load 'f.groovy'; echo \"received ${t}\"}")).invokeWithArgs("p").returnCode()); + assertEquals(0, new CLICommandInvoker(story.j, "replay-pipeline").withStdin(IOUtils.toInputStream("node {def t = load 'f.groovy'; echo \"received ${t}\"}", Charset.defaultCharset())).invokeWithArgs("p").returnCode()); story.j.waitUntilNoActivity(); WorkflowRun b2 = p.getLastBuild(); assertEquals(2, b2.getNumber()); story.j.assertLogContains("received original text", b2); // s/original/new/ on auxiliary script, and explicitly asking to replay #1 rather than the latest - assertEquals(0, new CLICommandInvoker(story.j, "replay-pipeline").withStdin(IOUtils.toInputStream("'new text'")).invokeWithArgs("p", "-n", "1", "-s", "Script1").returnCode()); + assertEquals(0, new CLICommandInvoker(story.j, "replay-pipeline").withStdin(IOUtils.toInputStream("'new text'", Charset.defaultCharset())).invokeWithArgs("p", "-n", "1", "-s", "Script1").returnCode()); story.j.waitUntilNoActivity(); WorkflowRun b3 = p.getLastBuild(); assertEquals(3, b3.getNumber()); diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java index 4a41e8fa7..0125078fe 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java @@ -8,6 +8,7 @@ import hudson.model.FreeStyleProject; import hudson.model.Result; import java.io.IOException; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; @@ -340,7 +341,7 @@ public void localMethodCallWithinLotsOfBranches() { @Override public void evaluate() throws Throwable { p = jenkins().createProject(WorkflowJob.class, "demo"); p.setDefinition(new CpsFlowDefinition( - IOUtils.toString(getClass().getResource("localMethodCallWithinLotsOfBranches.groovy")), false)); + IOUtils.toString(getClass().getResource("localMethodCallWithinLotsOfBranches.groovy"), Charset.defaultCharset()), false)); startBuilding().get(); assertBuildCompletedSuccessfully(); From 59cfc35e64c3400d6e50c9a3fd084e48c168b813 Mon Sep 17 00:00:00 2001 From: offa Date: Wed, 27 Oct 2021 15:11:36 +0200 Subject: [PATCH 594/932] Use StandardCharsets --- .../org/jenkinsci/plugins/workflow/cps/GroovySample.java | 4 ++-- .../plugins/workflow/cps/replay/ReplayPipelineCommand.java | 4 ++-- .../plugins/workflow/cps/replay/ReplayActionTest.java | 6 +++--- .../plugins/workflow/cps/steps/ParallelStepTest.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java index 371c6ab4a..1c62af071 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java @@ -29,7 +29,7 @@ import hudson.ExtensionPoint; import hudson.model.RootAction; import java.io.IOException; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -77,7 +77,7 @@ abstract class Static implements GroovySample { @Override public String script() { try { - return IOUtils.toString(GroovySample.class.getResource("samples/" + name() + ".groovy"), Charset.defaultCharset()); + return IOUtils.toString(GroovySample.class.getResource("samples/" + name() + ".groovy"), StandardCharsets.UTF_8); } catch (IOException x) { throw new AssertionError(x); } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java index 2e9c18e37..380401aa0 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java @@ -31,7 +31,7 @@ import hudson.model.Job; import hudson.model.Run; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; import org.apache.commons.io.IOUtils; @@ -72,7 +72,7 @@ if (!action.isEnabled() || !action.isReplayableSandboxTest()) { throw new AbortException("Not authorized to replay builds of this job"); } - String text = IOUtils.toString(stdin, Charset.defaultCharset()); + String text = IOUtils.toString(stdin, StandardCharsets.UTF_8); if (script != null) { Map replacementLoadedScripts = new HashMap<>(action.getOriginalLoadedScripts()); if (!replacementLoadedScripts.containsKey(script)) { diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java index 9dece31b8..e494b82c2 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java @@ -45,7 +45,7 @@ import hudson.security.ACLContext; import hudson.security.Permission; import java.io.File; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; import jenkins.model.Jenkins; @@ -318,13 +318,13 @@ private static boolean canRebuild(WorkflowRun b, String user) { WorkflowRun b1 = story.j.assertBuildStatusSuccess(p.scheduleBuild2(0)); story.j.assertLogContains("got original text", b1); // s/got/received/ on main script - assertEquals(0, new CLICommandInvoker(story.j, "replay-pipeline").withStdin(IOUtils.toInputStream("node {def t = load 'f.groovy'; echo \"received ${t}\"}", Charset.defaultCharset())).invokeWithArgs("p").returnCode()); + assertEquals(0, new CLICommandInvoker(story.j, "replay-pipeline").withStdin(IOUtils.toInputStream("node {def t = load 'f.groovy'; echo \"received ${t}\"}", StandardCharsets.UTF_8)).invokeWithArgs("p").returnCode()); story.j.waitUntilNoActivity(); WorkflowRun b2 = p.getLastBuild(); assertEquals(2, b2.getNumber()); story.j.assertLogContains("received original text", b2); // s/original/new/ on auxiliary script, and explicitly asking to replay #1 rather than the latest - assertEquals(0, new CLICommandInvoker(story.j, "replay-pipeline").withStdin(IOUtils.toInputStream("'new text'", Charset.defaultCharset())).invokeWithArgs("p", "-n", "1", "-s", "Script1").returnCode()); + assertEquals(0, new CLICommandInvoker(story.j, "replay-pipeline").withStdin(IOUtils.toInputStream("'new text'", StandardCharsets.UTF_8)).invokeWithArgs("p", "-n", "1", "-s", "Script1").returnCode()); story.j.waitUntilNoActivity(); WorkflowRun b3 = p.getLastBuild(); assertEquals(3, b3.getNumber()); diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java index 0125078fe..ac6b778e5 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java @@ -8,7 +8,7 @@ import hudson.model.FreeStyleProject; import hudson.model.Result; import java.io.IOException; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -341,7 +341,7 @@ public void localMethodCallWithinLotsOfBranches() { @Override public void evaluate() throws Throwable { p = jenkins().createProject(WorkflowJob.class, "demo"); p.setDefinition(new CpsFlowDefinition( - IOUtils.toString(getClass().getResource("localMethodCallWithinLotsOfBranches.groovy"), Charset.defaultCharset()), false)); + IOUtils.toString(getClass().getResource("localMethodCallWithinLotsOfBranches.groovy"), StandardCharsets.UTF_8), false)); startBuilding().get(); assertBuildCompletedSuccessfully(); From 85db64efd981d28d97d56d9d87635cafb73d35f6 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 3 Nov 2021 15:29:52 -0400 Subject: [PATCH 595/932] Trim `StepExecution.status` to a sane length in stack traces (#470) --- .../org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java index ec09d6921..df4c62d65 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java @@ -30,6 +30,8 @@ public static final class ThreadInfo { private final String headline; private final List stack = new ArrayList<>(); + private static final int MAX_STATUS_LENGTH = 1000; + /** * Given a list of {@link CpsThread}s that share the same {@link FlowHead}, in the order * from outer to inner, reconstruct the thread stack. @@ -48,6 +50,11 @@ private ThreadInfo(List e) { if (d != null) { String status = s.getStatusBounded(3, TimeUnit.SECONDS); if (status != null) { + int len = status.length(); + if (len > MAX_STATUS_LENGTH) { + int half = MAX_STATUS_LENGTH / 2; + status = status.subSequence(0, half) + "…[truncated " + (len - MAX_STATUS_LENGTH) + " chars]…" + status.subSequence(len - half, len); + } stack.add(new StackTraceElement("DSL", d.getFunctionName(), status, -1)); } else { stack.add(new StackTraceElement("DSL", d.getFunctionName(), null, -2)); From 996dc4f90addc17f16849589f853f0974cb3fb4a Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 3 Nov 2021 15:33:47 -0400 Subject: [PATCH 596/932] Pass through `FlowInterruptedException` from `Pickle.rehydrate` (#473) * Pass through `FlowInterruptedException` from `Pickle.rehydrate` * Also suppress an irrelevant `WARNING o.j.p.w.cps.CpsThreadGroup#unexport: double unexport of 1` --- .../org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 2 +- .../java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 0b59e6988..29550d952 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -864,7 +864,7 @@ private void loadProgramFailed(final Throwable problem, SettableFuture Date: Thu, 4 Nov 2021 10:57:26 -0400 Subject: [PATCH 597/932] Incorrect use of `gitHubRepo` (#475) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ffa7c6c74..be38d131d 100644 --- a/pom.xml +++ b/pom.xml @@ -44,9 +44,9 @@ - scm:git:git://github.com/jenkinsci/${gitHubRepo}.git - scm:git:git@github.com:jenkinsci/${gitHubRepo}.git - https://github.com/jenkinsci/${gitHubRepo} + scm:git:git://github.com/${gitHubRepo}.git + scm:git:git@github.com:${gitHubRepo}.git + https://github.com/${gitHubRepo} ${scmTag} @@ -64,7 +64,7 @@ 2.95 -SNAPSHOT - ${project.artifactId}-plugin + jenkinsci/${project.artifactId}-plugin 2.222.4 8 false From ed612afc067a71b26fbed7292b99175517a89c08 Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Thu, 4 Nov 2021 13:37:41 -0600 Subject: [PATCH 598/932] enable cd (#474) --- .github/release-drafter.yml | 2 - .github/workflows/cd.yaml | 60 +++++++++++++++++++++++++++ .github/workflows/release-drafter.yml | 16 ------- .mvn/maven.config | 1 + pom.xml | 5 +-- 5 files changed, 63 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/cd.yaml delete mode 100644 .github/workflows/release-drafter.yml diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 36fb71963..0d0b1c994 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,3 +1 @@ _extends: .github -name-template: v$NEXT_MINOR_VERSION 🌈 -tag-template: workflow-cps-$NEXT_MINOR_VERSION diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml new file mode 100644 index 000000000..6a19fd9bb --- /dev/null +++ b/.github/workflows/cd.yaml @@ -0,0 +1,60 @@ +# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins + +name: cd +on: + workflow_dispatch: + check_run: + types: + - completed + +jobs: + validate: + runs-on: ubuntu-latest + outputs: + should_release: ${{ steps.verify-ci-status.outputs.result == 'success' && steps.interesting-categories.outputs.interesting == 'true' }} + steps: + - name: Verify CI status + uses: jenkins-infra/verify-ci-status-action@v1.2.0 + id: verify-ci-status + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + output_result: true + + - name: Release Drafter + uses: release-drafter/release-drafter@v5 + if: steps.verify-ci-status.outputs.result == 'success' + with: + name: next + tag: next + version: next + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Check interesting categories + uses: jenkins-infra/interesting-category-action@v1.0.0 + id: interesting-categories + if: steps.verify-ci-status.outputs.result == 'success' + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + release: + runs-on: ubuntu-latest + needs: [validate] + if: needs.validate.outputs.should_release == 'true' + steps: + - name: Check out + uses: actions/checkout@v2.3.4 + with: + fetch-depth: 0 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: 8 + - name: Release + uses: jenkins-infra/jenkins-maven-cd-action@v1.2.0 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }} + diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index 832442dd3..000000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Automates creation of Release Drafts using Release Drafter -# More Info: https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc - -on: - push: - branches: - - master - -jobs: - update_release_draft: - runs-on: ubuntu-latest - steps: - # Drafts your next Release notes as Pull Requests are merged into "master" - - uses: release-drafter/release-drafter@v5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.mvn/maven.config b/.mvn/maven.config index 2a0299c48..f7daf60d0 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1,2 +1,3 @@ -Pconsume-incrementals -Pmight-produce-incrementals +-Dchangelist.format=%d.v%s diff --git a/pom.xml b/pom.xml index be38d131d..491849ab5 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ org.jenkins-ci.plugins.workflow workflow-cps - ${revision}${changelist} + ${changelist} hpi Pipeline: Groovy https://github.com/jenkinsci/workflow-cps-plugin @@ -62,8 +62,7 @@ - 2.95 - -SNAPSHOT + 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin 2.222.4 8 From 6baeedc13805d902ff778f8d6ff518730fca6cf9 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 4 Nov 2021 15:52:56 -0400 Subject: [PATCH 599/932] `Jenkinsfile` cleanups (#476) --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 509d344a2..97227bf78 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ -buildPlugin(useAci: false, configurations: [ - [ platform: "linux", jdk: "8", jenkins: null ], - [ platform: "windows", jdk: "8", jenkins: null ], - [ platform: "linux", jdk: "11", jenkins: "2.276", javaLevel: 8 ] +buildPlugin(useContainerAgent: true, configurations: [ + [ platform: "linux", jdk: "8" ], + [ platform: "windows", jdk: "8" ], + [ platform: "linux", jdk: "11", jenkins: "2.276" ] ]) From f18afa1fa06f13893c43c344994a7c6d6390d794 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 9 Nov 2021 08:54:03 -0500 Subject: [PATCH 600/932] No need to override `reuseForks` (#478) --- pom.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 491849ab5..81c2e1bed 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.18 + 4.31 org.jenkins-ci.plugins.workflow @@ -271,13 +271,6 @@ 2.18 - - org.apache.maven.plugins - maven-surefire-plugin - - false - - From 51e539715bb04214dc09425ddcc457f54d3cac16 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 17 Nov 2021 01:54:55 -0500 Subject: [PATCH 601/932] Verifying that a missing `program.dat` causes a comprehensible error (#480) --- .../jenkinsci/plugins/workflow/cps/PersistenceProblemsTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/PersistenceProblemsTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/PersistenceProblemsTest.java index 7567d7e97..bc107a520 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/PersistenceProblemsTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/PersistenceProblemsTest.java @@ -319,6 +319,7 @@ public void inProgressButProgramLoadFailure() throws Exception { WorkflowJob r = j.jenkins.getItemByFullName(DEFAULT_JOBNAME, WorkflowJob.class); WorkflowRun run = r.getBuildByNumber(build[0]); assertCompletedCleanly(run); + j.assertLogContains("FileNotFoundException", run); }); } From b5ed69775f48fb8406f6ddc36fca4886a59db4f4 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 17 Nov 2021 13:25:37 -0800 Subject: [PATCH 602/932] Update Dependabot configuration (#482) --- .github/dependabot.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f9e3770d7..5ee4e4dd9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,3 +1,5 @@ +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + version: 2 updates: # Intentionally not adding automatic NPM updates because I do @@ -5,4 +7,8 @@ updates: - package-ecosystem: "maven" directory: "/" schedule: - interval: "daily" + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From 4f7267a2d290ae234a02339047a4ebcc7ca470d7 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 17 Nov 2021 16:28:56 -0800 Subject: [PATCH 603/932] Remove version from `Jenkinsfile` (#484) --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 97227bf78..b94810a26 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ buildPlugin(useContainerAgent: true, configurations: [ [ platform: "linux", jdk: "8" ], [ platform: "windows", jdk: "8" ], - [ platform: "linux", jdk: "11", jenkins: "2.276" ] + [ platform: "linux", jdk: "11" ] ]) From a01ed3483ebec7e815c2119fcafa194ee266408f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 10:29:12 +1000 Subject: [PATCH 604/932] Bump actions/checkout from 2.3.4 to 2.4.0 (#483) Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.4.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.4...v2.4.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 6a19fd9bb..025fac176 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -43,7 +43,7 @@ jobs: if: needs.validate.outputs.should_release == 'true' steps: - name: Check out - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.4.0 with: fetch-depth: 0 - name: Set up JDK 8 From cc134e5aa59ffe726f8e2309249c9eee503b29b4 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 30 Nov 2021 00:43:53 -0500 Subject: [PATCH 605/932] Ensure compatibility with Guava 31+ (#487) --- .../jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 3 +-- .../plugins/workflow/cps/replay/ReplayActionTest.java | 9 +++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 29550d952..a5bc1a726 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -36,7 +36,6 @@ import com.cloudbees.jenkins.support.api.Container; import com.cloudbees.jenkins.support.api.Content; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; @@ -485,7 +484,7 @@ public String getScript() { } public Map getLoadedScripts() { - return ImmutableMap.copyOf(loadedScripts); + return Collections.unmodifiableMap(new HashMap<>(loadedScripts)); } /** diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java index 22b1bdbff..8e3eef2c9 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java @@ -28,7 +28,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlTextArea; -import com.google.common.collect.ImmutableMap; import hudson.FilePath; import hudson.XmlFile; import hudson.cli.CLICommandInvoker; @@ -46,7 +45,10 @@ import hudson.security.Permission; import java.io.File; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; + import jenkins.model.Jenkins; import org.apache.commons.io.IOUtils; import org.hamcrest.Matchers; @@ -279,9 +281,12 @@ private static boolean canRebuild(WorkflowRun b, String user) { assertThat(diff, not(containsString("first part"))); System.out.println(diff); // Now replay #2, editing all scripts, and restarting in the middle. + Map replayMap = new HashMap<>(); + replayMap.put("Script1", "echo 'new first part'"); + replayMap.put("Script2", "echo 'newer second part'"); WorkflowRun b3 = (WorkflowRun) b2.getAction(ReplayAction.class).run( "node {load 'f1.groovy'}; semaphore 'wait'; node {load 'f2.groovy'}", - ImmutableMap.of("Script1", "echo 'new first part'", "Script2", "echo 'newer second part'")).waitForStart(); + Collections.unmodifiableMap(replayMap)).waitForStart(); SemaphoreStep.waitForStart("wait/3", b3); } }); From 00e79c8113def4fdc7ecd8ef87ae8befbb1e7941 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 30 Nov 2021 22:07:27 +0100 Subject: [PATCH 606/932] style: Let core override icons on newer Jenkins versions (#481) --- .../workflow/cps/CpsThreadDumpAction/index.jelly | 2 +- .../workflow/cps/PauseUnpauseAction/action.jelly | 2 +- src/main/webapp/images/24x24/README.md | 1 - src/main/webapp/images/24x24/pause.png | Bin 785 -> 0 bytes src/main/webapp/images/pause.svg | 4 ++++ 5 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 src/main/webapp/images/24x24/README.md delete mode 100644 src/main/webapp/images/24x24/pause.png create mode 100644 src/main/webapp/images/pause.svg diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly index 5430d6af7..0c2ac9d36 100644 --- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly +++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly @@ -28,7 +28,7 @@ - + diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly index 1cf422aa3..3862473b2 100644 --- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly +++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly @@ -25,5 +25,5 @@ THE SOFTWARE. - + diff --git a/src/main/webapp/images/24x24/README.md b/src/main/webapp/images/24x24/README.md deleted file mode 100644 index ec637d6c2..000000000 --- a/src/main/webapp/images/24x24/README.md +++ /dev/null @@ -1 +0,0 @@ -From `tango-icon-theme-0.8.90.tar.gz`, scaled using `jenkinsci/jenkins/war/images/svg2png`. diff --git a/src/main/webapp/images/24x24/pause.png b/src/main/webapp/images/24x24/pause.png deleted file mode 100644 index 219f6c31025fd5a511b4222772517e6ac6efbe62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 785 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf4nJ zu)P6cM!8Z8Q=p(^iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0vgAVndW zB{``KzNsmhi3$NZiIqu-$=M14iKWGDR5_NGWaJky_#_tOD>x_SB<3dO zr4*%R-k&I?1ym9NQsSInP+63jo>9W!>};SAP@0sJnXKTFpPQJOr{DrKJ~^=@Ge1uu zqokz3N?$*@C>6*rOHIzt&CSm%2DwVV0IVkktVO>nwJ2ZTP|raB*yFuF85kHJdb&7< zcyzuEJew8lC}Dfwym<1R>f+DNL3)uATvPY-YPiNbtXQ^h!X)zvv!?FQ+%YBNqo`Nu z{!ga()wlO8H3`s&&Kiv?f>OAwO;1kv-{pz`R^NH z)9oLV=AUDm?6>@K&i3114<6^Ae6ivL5WUPf^zP%u**0_Uu&p|^dVY9>&NBuE|4m`5 z3pYkwm^|nFa{fLlT%kZ=jo8trSR;4}P1Cj&u z+$)W4^CU@R3*KN*VoGlLxOYZ%TE81>qway7JX%c}eR&^U3ukIE3AT1P98KE4>3q;i zm%xC~hkvtnBuYFpJ0V*yGnGT=niR`6hQJLsbCi68yBgeh*K8FCbh)T2b;NUL{jYyt z%>Dma)O< + + + From 5701009f010c7d964df2505befdca1c86ea4d1f6 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 30 Nov 2021 17:35:01 -0800 Subject: [PATCH 607/932] Reduce usages of Guava (#488) --- .../plugins/workflow/cps/CpsBodyExecution.java | 10 +++++----- .../plugins/workflow/cps/CpsFlowExecution.java | 9 +++++---- .../org/jenkinsci/plugins/workflow/cps/CpsThread.java | 10 +++++----- .../jenkinsci/plugins/workflow/cps/CpsThreadGroup.java | 10 +++++----- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java index 76abac557..06700c28a 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java @@ -10,7 +10,6 @@ import com.cloudbees.groovy.cps.sandbox.SandboxInvoker; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.SettableFuture; import hudson.model.Action; import hudson.model.Result; import hudson.util.Iterators; @@ -35,6 +34,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -201,7 +201,7 @@ public Collection getCurrentExecutions() { return Collections.emptySet(); } } - final SettableFuture> result = SettableFuture.create(); + final CompletableFuture> result = new CompletableFuture<>(); t.getExecution().runInCpsVmThread(new FutureCallback() { @Override public void onSuccess(CpsThreadGroup g) { try { @@ -226,13 +226,13 @@ public Collection getCurrentExecutions() { } } } - result.set(executions); + result.complete(executions); } catch (Exception x) { - result.setException(x); + result.completeExceptionally(x); } } @Override public void onFailure(Throwable t) { - result.setException(t); + result.completeExceptionally(t); } }); try { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index a5bc1a726..ee9da85af 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -134,6 +134,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Set; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; @@ -2005,7 +2006,7 @@ private void checkpoint(boolean shuttingDown) { // Try to ensure we've saved the appropriate things -- the program is the last stumbling block. try { - final SettableFuture myOutcome = SettableFuture.create(); + final CompletableFuture myOutcome = new CompletableFuture<>(); LOGGER.log(Level.FINE, "About to try to checkpoint the program for: {0}", this); if (programPromise != null && programPromise.isDone()) { runInCpsVmThread(new FutureCallback() { @@ -2015,17 +2016,17 @@ public void onSuccess(CpsThreadGroup result) { LOGGER.log(Level.FINE, "Trying to save program for: {0}", CpsFlowExecution.this); result.saveProgramIfPossible(true); LOGGER.log(Level.FINE, "Finished saving program for: {0}", CpsFlowExecution.this); - myOutcome.set(null); + myOutcome.complete(null); } catch (Exception ex) { // Logged at Level.WARNING when we call `myOutcome.get` and it throws an exception. - myOutcome.setException(ex); + myOutcome.completeExceptionally(ex); } } @Override public void onFailure(Throwable t) { // Logged at Level.WARNING when we call `myOutcome.get` and it throws an exception. - myOutcome.setException(t); + myOutcome.completeExceptionally(t); } }); myOutcome.get(30, TimeUnit.SECONDS); diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java index b0f29b2c1..d49462b31 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java @@ -28,7 +28,6 @@ import com.cloudbees.groovy.cps.Outcome; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.SettableFuture; import java.io.IOException; import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn; import org.jenkinsci.plugins.workflow.steps.StepExecution; @@ -39,6 +38,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; @@ -89,7 +89,7 @@ public final class CpsThread implements Serializable { /** * Promise that {@link Continuable#run0(Outcome)} gets eventually invoked with {@link #resumeValue}. */ - private transient SettableFuture promise; + private transient CompletableFuture promise; /** * The head of the flow node graph that this thread is growing. @@ -206,10 +206,10 @@ public StepExecution getStep() { } if (promise!=null) { - if (outcome.isSuccess()) promise.set(outcome.getNormal()); + if (outcome.isSuccess()) promise.complete(outcome.getNormal()); else { try { - promise.setException(outcome.getAbnormal()); + promise.completeExceptionally(outcome.getAbnormal()); } catch (Error e) { if (e==outcome.getAbnormal()) { // SettableFuture tries to rethrow an Error, which we don't want. @@ -286,7 +286,7 @@ public Future resume(Outcome v) { return Futures.immediateFailedFuture(new IllegalStateException("Already resumed with " + resumeValue)); } resumeValue = v; - promise = SettableFuture.create(); + promise = new CompletableFuture<>(); group.scheduleRun(); return promise; } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java index eaeac2a9e..089f5c2f6 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java @@ -27,7 +27,6 @@ import com.cloudbees.groovy.cps.Continuable; import com.cloudbees.groovy.cps.Outcome; import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.SettableFuture; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.MarshallingContext; @@ -65,6 +64,7 @@ import java.util.Map; import java.util.NavigableMap; import java.util.concurrent.Callable; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; @@ -273,7 +273,7 @@ public void unexport(BodyReference ref) { * {@link Future} object that represents when the CPS VM is executed. */ public Future scheduleRun() { - final SettableFuture f = SettableFuture.create(); + final CompletableFuture f = new CompletableFuture<>(); try { runner.submit(new Callable() { @SuppressFBWarnings(value="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", justification="runner.submit() result") @@ -307,7 +307,7 @@ public void run() { // by doing the pause check inside, we make sure that scheduleRun() returns a // future that waits for any previously scheduled tasks to be completed. saveProgramIfPossible(true); - f.set(null); + f.complete(null); return null; } @@ -327,13 +327,13 @@ public void run() { runner.shutdown(); } // the original promise of scheduleRun() is now complete - f.set(null); + f.complete(null); } }); } } catch (RejectedExecutionException x) { // Was shut down by a prior task? - f.setException(x); + f.completeExceptionally(x); } return null; } From fc3007f2488397da3632908fcd7a2b1b11f79e7f Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 1 Dec 2021 19:04:27 -0500 Subject: [PATCH 608/932] Adding test of serial form of `program.dat` including pickles (#489) * Adding test of serial form of `program.dat` including pickles * https://github.com/jenkinsci/jenkins-test-harness/pull/352 released --- Jenkinsfile | 2 +- pom.xml | 13 ++ .../plugins/workflow/cps/SerialFormTest.java | 100 +++++++++++++ .../persistence-workspace/p/running | 0 .../p@tmp/durable-dae459c1/jenkins-log.txt | 133 ++++++++++++++++++ .../p@tmp/durable-dae459c1/jenkins-result.txt | 1 + .../p@tmp/durable-dae459c1/script.sh | 1 + .../persistence/jobs/p/builds/1/build.xml | 50 +++++++ .../persistence/jobs/p/builds/1/log | 10 ++ .../persistence/jobs/p/builds/1/log-index | 4 + .../persistence/jobs/p/builds/1/program.dat | Bin 0 -> 8172 bytes .../jobs/p/builds/1/workflow/2.xml | 12 ++ .../jobs/p/builds/1/workflow/3.xml | 34 +++++ .../jobs/p/builds/1/workflow/4.xml | 16 +++ .../jobs/p/builds/1/workflow/5.xml | 26 ++++ .../persistence/jobs/p/builds/legacyIds | 0 .../persistence/jobs/p/builds/permalinks | 1 + .../persistence/jobs/p/config.xml | 11 ++ .../persistence/jobs/p/nextBuildNumber | 1 + .../persistence/nodes/remote/config.xml | 17 +++ ...lugins.workflow.flow.FlowExecutionList.xml | 7 + ...nkins.slaves.JnlpSlaveAgentProtocol.secret | Bin 0 -> 48 bytes .../persistence/secrets/master.key | 1 + 23 files changed, 439 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/jenkinsci/plugins/workflow/cps/SerialFormTest.java create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p/running create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-log.txt create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-result.txt create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/script.sh create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/build.xml create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log-index create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/program.dat create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/2.xml create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/3.xml create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/4.xml create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/5.xml create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/legacyIds create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/permalinks create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/config.xml create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/nextBuildNumber create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/nodes/remote/config.xml create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/jenkins.slaves.JnlpSlaveAgentProtocol.secret create mode 100644 src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/master.key diff --git a/Jenkinsfile b/Jenkinsfile index b94810a26..0f35d2714 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ buildPlugin(useContainerAgent: true, configurations: [ - [ platform: "linux", jdk: "8" ], + [ platform: "docker", jdk: "8" ], [ platform: "windows", jdk: "8" ], [ platform: "linux", jdk: "11" ] ]) diff --git a/pom.xml b/pom.xml index 81c2e1bed..4b3bdc778 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,7 @@ jenkinsci/${project.artifactId}-plugin 2.222.4 8 + 1661.vca80dbae839b false 1.32 12.19.0 @@ -253,6 +254,18 @@ pipeline-stage-step test + + org.testcontainers + testcontainers + 1.16.2 + test + + + org.slf4j + slf4j-api + + + diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/SerialFormTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/SerialFormTest.java new file mode 100644 index 000000000..abfb7a436 --- /dev/null +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/SerialFormTest.java @@ -0,0 +1,100 @@ +/* + * The MIT License + * + * Copyright 2021 CloudBees, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package org.jenkinsci.plugins.workflow.cps; + +import hudson.model.Node; +import hudson.model.Slave; +import hudson.slaves.SlaveComputer; +import java.net.URL; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import org.jenkinsci.plugins.workflow.job.WorkflowJob; +import org.jenkinsci.plugins.workflow.job.WorkflowRun; +import org.jenkinsci.plugins.workflow.pickles.Pickle; +import org.junit.AfterClass; +import org.junit.Test; +import org.junit.Assume; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.RealJenkinsRule; +import org.jvnet.hudson.test.recipes.LocalData; +import org.testcontainers.DockerClientFactory; +import org.testcontainers.Testcontainers; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.utility.MountableFile; + +/** + * Test compatibility of the format of {@code program.dat} as well as various {@link Pickle}s. + */ +public class SerialFormTest { + + private static final String AGENT_NAME = "remote"; + private static final String AGENT_SECRET = "defebc83e8736659464a172801f43de376f751891e69cb6ece89e856d6cc3b48"; + + private static GenericContainer agentContainer; + + @BeforeClass public static void dockerCheck() throws Exception { + try { + DockerClientFactory.instance().client(); + } catch (Exception x) { + Assume.assumeNoException("does not look like Docker is available", x); + } + } + + @AfterClass public static void terminateContainer() throws Exception { + if (agentContainer != null && agentContainer.isRunning()) { + agentContainer.stop(); + } + } + + @Rule public RealJenkinsRule rr = new RealJenkinsRule(); + + @LocalData + @Test public void persistence() throws Throwable { + rr.startJenkins(); + URL u = rr.getUrl(); + Testcontainers.exposeHostPorts(u.getPort()); + agentContainer = new GenericContainer<>("jenkins/inbound-agent"). + withEnv("JENKINS_URL", new URL(u.getProtocol(), "host.testcontainers.internal", u.getPort(), u.getFile()).toString()). + withEnv("JENKINS_AGENT_NAME", AGENT_NAME). + withEnv("JENKINS_SECRET", AGENT_SECRET). + withEnv("JENKINS_WEB_SOCKET", "true"); + agentContainer.start(); + agentContainer.copyFileToContainer(MountableFile.forClasspathResource(SerialFormTest.class.getName().replace('.', '/') + "/persistence-workspace"), "/home/jenkins/agent/workspace"); + rr.runRemotely(SerialFormTest::_persistence); + } + private static void _persistence(JenkinsRule r) throws Throwable { + Node agent = r.jenkins.getNode(AGENT_NAME); + assertThat(agent, notNullValue()); + assertThat(((SlaveComputer) agent.toComputer()).getJnlpMac(), is(AGENT_SECRET)); + r.waitOnline((Slave) agent); + WorkflowJob p = r.jenkins.getItemByFullName("p", WorkflowJob.class); + WorkflowRun b = p.getBuildByNumber(1); + r.assertBuildStatusSuccess(r.waitForCompletion(b)); + } + +} diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p/running b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p/running new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-log.txt b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-log.txt new file mode 100644 index 000000000..2ff834680 --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-log.txt @@ -0,0 +1,133 @@ ++ touch running ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 ++ [ -f running ] ++ sleep 1 diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-result.txt b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-result.txt new file mode 100644 index 000000000..573541ac9 --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-result.txt @@ -0,0 +1 @@ +0 diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/script.sh b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/script.sh new file mode 100644 index 000000000..aeddacc3d --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/script.sh @@ -0,0 +1 @@ +touch running; while [ -f running ]; do sleep 1; done \ No newline at end of file diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/build.xml b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/build.xml new file mode 100644 index 000000000..a97210dfd --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/build.xml @@ -0,0 +1,50 @@ + + + + + 34 + + + 1 + 1638308102618 + 1638308102633 + 0 + UTF-8 + false + + SUCCESS + + + MAX_SURVIVABILITY + + + flowNode + 71664725 + + + classLoad + 503032612 + + + run + 2013078534 + + + parse + 634788612 + + + saveProgram + 157243273 + + + true + 5 + 1:5 + 2 + false + false + + false + + \ No newline at end of file diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log new file mode 100644 index 000000000..edecede66 --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log @@ -0,0 +1,10 @@ +Started +Running in Durability level: MAX_SURVIVABILITY +ha:////4C4s8GpgRgC7jL1Vc6+MQZUhj5+pxM2y2IilVjG9e5RaAAAAoh+LCAAAAAAAAP9tjTEOwjAQBM8BClpKHuFItIiK1krDC0x8GCfWnbEdkooX8TX+gCESFVvtrLSa5wtWKcKBo5UdUu8otU4GP9jS5Mixv3geZcdn2TIl9igbHBs2eJyx4YwwR1SwULBGaj0nRzbDRnX6rmuvydanHMu2V1A5c4MHCFXMWcf8hSnC9jqYxPTz/BXAFEIGsfuclm8zQVqFvQAAAA==[Pipeline] Start of Pipeline +ha:////4MwOmZDnQUlX3FPa62Hf2kYUe6i49FlqM4oh1HuXCGDxAAAApR+LCAAAAAAAAP9tjTEOwjAUQ3+KOrAycohUghExsUZZOEFIQkgb/d8mKe3EibgadyBQiQlLlmxL1nu+oE4RjhQdby12HpP2vA+jK4lPFLtroIm3dOGaMFGwXNpJkrGnpUrKFhaxClYC1hZ1oOTRZdiIVt1VExS65pxj2Q4CKm8GeAAThZxVzN8yR9jeRpMIf5y/AJj7DGxXvP/86jduZBmjwAAAAA==[Pipeline] node +Running on ha:////4CLaJebQ3Knjt6rAddxf+RuWnS4i436VjAMYkt3tHTz2AAAAnB+LCAAAAAAAAP9b85aBtbiIQTGjNKU4P08vOT+vOD8nVc83PyU1x6OyILUoJzMv2y+/JJUBAhiZGBgqihhk0NSjKDWzXb3RdlLBUSYGJk8GtpzUvPSSDB8G5tKinBIGIZ+sxLJE/ZzEvHT94JKizLx0a6BxUmjGOUNodHsLgAy2EgZB/eT83ILSktQi/aLUXKAafQAiQtsUxgAAAA==remote in /home/jenkins/agent/workspace/p +ha:////4DkY9lqEYg4baTEkb2FhC5+BuwytGxWEN+/Kps71hDEwAAAApR+LCAAAAAAAAP9tjTEOwjAUQ3+KOrAycoh0gA0xsUZZOEFIQkgb/d8mKe3EibgadyBQiQlLlmxL1nu+oE4RjhQdby12HpP2vA+jK4lPFLtroIm3dOGaMFGwXNpJkrGnpUrKFhaxClYC1hZ1oOTRZdiIVt1VExS65pxj2Q4CKm8GeAAThZxVzN8yR9jeRpMIf5y/AJj7DGxXvP/86jfoP95RwAAAAA==[Pipeline] { +ha:////4N75xltGAcmBKGhiYVX84T5NICPl/mFx9RvMgEd8+nJ1AAAAoh+LCAAAAAAAAP9tjTEOAiEURD9rLGwtPQTbaGWsbAmNJ0AWEZb8zwLrbuWJvJp3kLiJlZNMMm+a93rDOic4UbLcG+wdZu14DKOti0+U+lugiXu6ck2YKRguzSSpM+cFJRUDS1gDKwEbgzpQdmgLbIVXD9UGhba9lFS/o4DGdQM8gYlqLiqVL8wJdvexy4Q/z18BzLEA29ce4gdpL1fxvAAAAA==[Pipeline] sh ++ touch running ++ [ -f running ] ++ sleep 1 diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log-index b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log-index new file mode 100644 index 000000000..e8fcd855c --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log-index @@ -0,0 +1,4 @@ +670 3 +998 +1595 5 +1638 diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/program.dat b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/program.dat new file mode 100644 index 0000000000000000000000000000000000000000..c2f7bd86436e1b21026b2d2f214cc7ceb42fe5d8 GIT binary patch literal 8172 zcmeHMYiwj?8J^RgUZ&kED`ONRh3#@%cDlVxx8DwYZZFeq*>2l(W?5V`^~^b6J7;_5 zoa4FlBK$DMC_ls>@`tEdkRTX;5DAI55ZMihtfCSSG+!K0}k!3*_(C7WmOt-Ub zcLt3AJV|@5-}}Ay_j%tDkG5R-@GGNF$COy?vb?Isd8gyeCXWhx&a{2qOuAM$i>u^< ze%}Ts56Q+aBYMt`_>jz>_9l z_e?jSmra4BfXjs1$G0BU=Cx!Pm{xK`^9u(xx1s5U6OSi8_cW;1@fOR`jA2a=9Pg?a zkJD1W;8@1?SmIOr4 z8hIi73d7FXOpE5Z@Bk~nZza55q#Lp z>+|{ol+bJlOU!D4z;)a(J)sBYynxC+R@4^FVptpxi+SNq%uH&YRuqBoe7tOM7Hr{R z$tJh_IJe|Vm2ZY(9BW==0}oVZm+*B_*fs`xvtK#!ZS6?{DPLZ#Ojp^@buC14lrigbHXUOLC^8=&up=d zpQBxPtETJ1_a{6thrFc;vQk7o(oiB5OO@~0*#YI!1l_T>u-W>myTILs#7vn4 z&UL&=*W3W{25(S(VM*`1c3nFx6Vohs2+03F#NvP2(__)MXJ%qri$wrt(PgGx<5p9Twu8VI*n`F%(Vmuo;MTH8~ zK$|UT^5f^dyx;S*CBI#s#!NqW{{9<&_Uk(upTSavD;ne+P?~Ua{kpsRaMrxDm@G4p z(`MmG*H!)gkR5m-!bD~|+K#wQ^wVaaTz9clV-1e#*nXhd!G&5^c*DGAg)+1*m10$i zE-Euw7{GN*JHWo{t3mp7)(Jgbj5)eSb|-;wkYH3hOj|^Glxh*OXu&}(qS&Kkc=fs> zACzCNL9?E3GK6kvo@vhxTAELu)I4KaVjRwc>y~Jb=q|xdvXi{t3vD(1E{~H_Ntt45 z`iz=B%lxZe(e+YTty@jrkZ}KREHIb!Rqi- z;VPjHh00wWJICHz`z!W7yDw$pV8`godWdoD`3$K$wjO$9siYP-MN?1q%hQ14SVFV+ z-TkAMiBG-TP1~_2fdp|8%PL3MJ;0OKtw{!wlqhEBOqbjkK=Y2_@S(=7!w(W2-U1U+ z`2)}-1rwB{sHhPXMWC40;2^^^^Gk@JB`7P6NO0kiBX5ChfmjS~Mh>BflFkjx7*Z)x z3qaO5*O|b#yvg;PS%5!0Xoc;=qPRIqq^S3RI^c5Zh{A4%%sXpHsl$NqBOot1jCiag z=Vkwd0*T{Tmx_PVa3pxD2AU*E2FQxV!~_mv zrk*R5Pva;7!t+8GAXOkrr)5i*iYGS=}Y!U_L7=@VGU2*;D^2|Y$H-z>ikFb z(p^d1I`$`py|1Jc_9AAZj3yTlv#7rN94#-@Z5-&B-Y5j zMn)p^NUlY`yg^8nKn+vW5V2Euw#CQlArWVHC>%Y`Sv8SLfEy543oWUj z5;Ob1^z`<{XC8Q-n2Ph=)#yk)uPuwzMsF1YgiWGg9)Qe{P#{U^E5URPTo94xj{ORUB%P>n_HR1lh^*fL^e-&fo;P};=mdfi9V+3QQ%7nH`jY0$ z2`npCdPE)jA&lE75g*(kp=4E}yT6KF%Tcv%M>VLqepu19DD0_H=2z1sqHJ#qq2U9! zpw@ytKYix(iSONW-`D9aZ+0y$m;qo(pkG}vbjW!^pcZU6ahC7ear88O%N~znV@HXc z98L^sz8JNAVf!X^>VwPG0xRf{DKsH-=oY@Qe}85?H+^_w>cG(G6yMfSaEhX%G+XJ= zW>MMr=FBab!9%%;sp;`U2M01!TAYp+&`@?_eEQJT7{9y_1n%CB4hfhFjvwsp?dj|6T;7t$Z|c9fe_E2?+TplC2bD=& z2>Ylp$1k}lGk#!nJUbonEjKIq2j5nHH$E|xnI4>&I53*w?IN|iv$NBf*(JKW^1FI^ z`trN_dV9Kev2JZ9rJA0n*!6r3Kbx7=iTtFweWsj(9~CWInAGIC$}MSU%Td1(Z1{1?_%FNbWn~nXOdtIXcBx}#Q9*g z&1KQ7kfBVwJqHES%}Sx-eD8;+xROwU{X$LugZO6meprVqS$GYHW3N(}zQta}JgG-v z526P=@;U12tL62tAT&I)G0lhoT$uF9L||%ig!b zY>m_v@aF0ZK$MB=Ov6C*p*KjJ`&I6t^H zcPmL#4LRu8Ci)xx&&Ioq)rsD$C0pet;Ccd0*qV&uxA7%h;=dt6C@##QDy%B3VZb32(ss zlM0dip{mB;A}I#Q>KC-7y!?a4#adIEvcS>)-<+=ck(cV>TD>iXoy*NB+~$AqGueON z@YdLwl$)D+cYEiDh*9ePLZG}TptgQ->^FaS>~AM1>X%`1`fYX&ls{ + + + + 2 + + + + 1638308103597 + + + \ No newline at end of file diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/3.xml b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/3.xml new file mode 100644 index 000000000..750bb2cd2 --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/3.xml @@ -0,0 +1,34 @@ + + + + + 2 + + 3 + org.jenkinsci.plugins.workflow.support.steps.ExecutorStep + + + + + + + label + remote + + + + true + + + 1638308103856 + + + 2 + + + remote + /home/jenkins/agent/workspace/p + + + + \ No newline at end of file diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/4.xml b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/4.xml new file mode 100644 index 000000000..8f2898ba9 --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/4.xml @@ -0,0 +1,16 @@ + + + + + 3 + + 4 + org.jenkinsci.plugins.workflow.support.steps.ExecutorStep + + + + + 1638308104322 + + + \ No newline at end of file diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/5.xml b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/5.xml new file mode 100644 index 000000000..bcabf1c18 --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/5.xml @@ -0,0 +1,26 @@ + + + + + 4 + + 5 + org.jenkinsci.plugins.workflow.steps.durable_task.ShellStep + + + + + + script + touch running; while [ -f running ]; do sleep 1; done + + + + true + + + 1638308104356 + + + + \ No newline at end of file diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/legacyIds b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/legacyIds new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/permalinks b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/permalinks new file mode 100644 index 000000000..48ab9e852 --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/permalinks @@ -0,0 +1 @@ +lastSuccessfulBuild -1 diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/config.xml b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/config.xml new file mode 100644 index 000000000..cdfb4633d --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/config.xml @@ -0,0 +1,11 @@ + + + false + + + + true + + + false + \ No newline at end of file diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/nextBuildNumber b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/nextBuildNumber new file mode 100644 index 000000000..0cfbf0888 --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/nextBuildNumber @@ -0,0 +1 @@ +2 diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/nodes/remote/config.xml b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/nodes/remote/config.xml new file mode 100644 index 000000000..b38e35d27 --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/nodes/remote/config.xml @@ -0,0 +1,17 @@ + + + remote + /home/jenkins/agent + 2 + NORMAL + + + true + remoting + false + + true + + + + \ No newline at end of file diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml new file mode 100644 index 000000000..5cbe3329f --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml @@ -0,0 +1,7 @@ + + + + p + 1 + + \ No newline at end of file diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/jenkins.slaves.JnlpSlaveAgentProtocol.secret b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/jenkins.slaves.JnlpSlaveAgentProtocol.secret new file mode 100644 index 0000000000000000000000000000000000000000..f7415e3b0d1413938b6df6c27858d4b26dced837 GIT binary patch literal 48 zcmV-00MGvjrGPt3<}obYL>1$OWMV`1B6nR~k%#zVQyi6|Z2%6QAn|we-*zD&s!&8~ GaK>r^NELDb literal 0 HcmV?d00001 diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/master.key b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/master.key new file mode 100644 index 000000000..6bad667ce --- /dev/null +++ b/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/master.key @@ -0,0 +1 @@ +de023160e466f84ce8792091eca4f2b76b8ca5a81aa8c7b3819eef35a24c6e4b35d933d1307b0e344d0154cde8438a30ccaf748b04630ef188ffbf1198064aad993519ec802d83573436878ff7dbd8f555283a983b309309142ff46638162302c4a628d0b10488a102d8abb05db5b84f97374ec5daab6fbd33dbd7a44f84bac1 \ No newline at end of file From 89921beccafa6b29e49a217e1c26cb0e9b8e16c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 22:50:55 -0700 Subject: [PATCH 609/932] Bump bom-2.222.x from 23 to 887.vae9c8ac09ff7 (#451) Bumps [bom-2.222.x](https://github.com/jenkinsci/bom) from 23 to 887.vae9c8ac09ff7. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.222.x dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From 29a793dac95ad7a0e144459c4962438567f67cb4 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Fri, 10 Dec 2021 13:50:38 -0800 Subject: [PATCH 610/932] Test case for JENKINS-57253 (#356) --- .../workflow/cps/CpsFlowDefinition2Test.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java index f09aaf4f9..610d05230 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java @@ -45,12 +45,14 @@ import org.jenkinsci.plugins.workflow.steps.StepDescriptor; import org.jenkinsci.plugins.workflow.steps.StepExecution; import org.jenkinsci.plugins.workflow.steps.StepExecutions; +import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; import static org.junit.Assert.*; import org.junit.Assert; import org.junit.Assume; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ErrorCollector; @@ -529,6 +531,24 @@ public void transformedSuperClass() throws Exception { jenkins.assertLogContains("OUTPUT: ybase", r); } + @Ignore("Currently fails due to leaked executor") + @Issue("JENKINS-57253") + @Test + public void unexpectedBreakStatement() throws Exception { + WorkflowJob job = jenkins.createProject(WorkflowJob.class); + job.setDefinition(new CpsFlowDefinition("node {\n" + + " semaphore 'wait'\n" + + " break\n" + + "}\n", true)); + assertEquals(0, jenkins.jenkins.toComputer().countBusy()); + WorkflowRun b = job.scheduleBuild2(0).waitForStart(); + SemaphoreStep.waitForStart("wait/1", b); + assertEquals(1, jenkins.jenkins.toComputer().countBusy()); + SemaphoreStep.success("wait/1", null); + jenkins.assertBuildStatus(Result.FAILURE, jenkins.waitForCompletion(b)); + assertEquals(0, jenkins.jenkins.toComputer().countBusy()); + } + @Issue("SECURITY-1186") @Test public void finalizer() throws Exception { From 8a4a36dffd0730c1c730f5250b48d05757b87f5d Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Thu, 16 Dec 2021 19:06:48 +0100 Subject: [PATCH 611/932] [JENKINS-67380] Detect oversized maps, collections and arrays and truncate (#492) * [JENKINS-67380] Detect oversized maps, collections and arrays and truncate * Keep root structure for arguments * Also count key size * Edits based on Jesse's review * Clarify the implementation --- .../cps/actions/ArgumentsActionImpl.java | 62 +++++++++++-- .../cps/actions/ArgumentsActionImplTest.java | 86 ++++++++++++++++--- 2 files changed, 128 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java index afc392e0d..5fa0b2b58 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java @@ -29,6 +29,7 @@ import hudson.EnvVars; import hudson.model.Describable; import hudson.model.Result; +import java.util.Collection; import jenkins.model.Jenkins; import org.apache.commons.io.output.NullOutputStream; import org.jenkinsci.plugins.structs.describable.DescribableModel; @@ -73,7 +74,7 @@ public class ArgumentsActionImpl extends ArgumentsAction { public ArgumentsActionImpl(@Nonnull Map stepArguments, @CheckForNull EnvVars env, @Nonnull Set sensitiveVariables) { this.sensitiveVariables = new HashSet<>(sensitiveVariables); - arguments = serializationCheck(sanitizeMapAndRecordMutation(stepArguments, env)); + this.arguments = serializationCheck(sanitizeStepArguments(stepArguments, env)); } /** Create a step, sanitizing strings for secured content */ @@ -83,7 +84,7 @@ public ArgumentsActionImpl(@Nonnull Map stepArguments) { /** For testing use only */ ArgumentsActionImpl(@Nonnull Set sensitiveVariables){ - this.isUnmodifiedBySanitization = false; + this.isUnmodifiedBySanitization = true; this.arguments = Collections.emptyMap(); this.sensitiveVariables = sensitiveVariables; } @@ -147,9 +148,14 @@ Object sanitizeListAndRecordMutation(@Nonnull List objects, @CheckForNull EnvVar boolean isMutated = false; List output = new ArrayList(objects.size()); + long size = objects.size(); for (Object o : objects) { Object modded = sanitizeObjectAndRecordMutation(o, variables); - + size += shallowSize(modded); + if (size > MAX_RETAINED_LENGTH) { + this.isUnmodifiedBySanitization = false; + return NotStoredReason.OVERSIZE_VALUE; + } if (modded != o) { // Sanitization stripped out some values, so we need to store the mutated object output.add(modded); @@ -223,7 +229,7 @@ Object sanitizeObjectAndRecordMutation(@CheckForNull Object o, @CheckForNull Env Object modded = tempVal; if (modded instanceof Map) { // Recursive sanitization, oh my! - modded = sanitizeMapAndRecordMutation((Map)modded, vars); + modded = sanitizeMapAndRecordMutation((Map)modded, vars, false); } else if (modded instanceof List) { modded = sanitizeListAndRecordMutation((List) modded, vars); } else if (modded != null && modded.getClass().isArray()) { @@ -295,13 +301,35 @@ Map serializationCheck(@Nonnull Map arguments) { * Goes through {@link #sanitizeObjectAndRecordMutation(Object, EnvVars)} for each value in a map input. */ @Nonnull - Map sanitizeMapAndRecordMutation(@Nonnull Map mapContents, @CheckForNull EnvVars variables) { + Object sanitizeMapAndRecordMutation(@Nonnull Map mapContents, @CheckForNull EnvVars variables) { // Package scoped so we can test it directly + return sanitizeMapAndRecordMutation(mapContents, variables, false); + } + + private Map sanitizeStepArguments(Map stepArguments, EnvVars env) { + // Guaranteed to be a map, the block returning something else is guarded by topLevel == false + return (Map) sanitizeMapAndRecordMutation(stepArguments, env, true); + } + + /** + * Goes through {@link #sanitizeObjectAndRecordMutation(Object, EnvVars)} for each value in a map input. + */ + @Nonnull + private Object sanitizeMapAndRecordMutation(@Nonnull Map mapContents, @CheckForNull EnvVars variables, boolean topLevel) { LinkedHashMap output = new LinkedHashMap<>(mapContents.size()); + long size = mapContents.size(); boolean isMutated = false; for (Map.Entry param : mapContents.entrySet()) { Object modded = sanitizeObjectAndRecordMutation(param.getValue(), variables); + if (!topLevel) { + size += param.getKey().length(); + size += shallowSize(modded); + if (size > MAX_RETAINED_LENGTH) { + this.isUnmodifiedBySanitization = false; + return NotStoredReason.OVERSIZE_VALUE; + } + } if (modded != param.getValue()) { // Sanitization stripped out some values, so we need to store the mutated object output.put(param.getKey(), modded); @@ -311,7 +339,29 @@ Map sanitizeMapAndRecordMutation(@Nonnull Map map } } - return (isMutated) ? output : mapContents; + return isMutated ? output : mapContents; + } + + static long shallowSize(Object o) { + if (o == null) { + return 0; + } + if (o instanceof CharSequence) { + return ((CharSequence) o).length(); + } + if (o instanceof Collection) { + Collection collection = (Collection) o; + return collection.size(); + } + if (o.getClass().isArray()) { + Object[] array = (Object[]) o; + return array.length; + } + if (o instanceof Map) { + Map map = (Map) o; + return map.size(); + } + return 1; } /** Accessor for testing use */ diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java index 14e49cc8a..6dcde7185 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java @@ -13,10 +13,6 @@ import hudson.Functions; import hudson.XmlFile; import hudson.model.Action; -import hudson.model.ParametersAction; -import hudson.model.ParametersDefinitionProperty; -import hudson.model.PasswordParameterDefinition; -import hudson.model.PasswordParameterValue; import hudson.tasks.ArtifactArchiver; import org.apache.commons.lang.RandomStringUtils; import org.hamcrest.MatcherAssert; @@ -181,9 +177,7 @@ public void testRecursiveSanitizationOfContent() { int maxLen = ArgumentsActionImpl.getMaxRetainedLength(); ArgumentsActionImpl impl = new ArgumentsActionImpl(sensitiveVariables); - char[] oversized = new char[maxLen+10]; - Arrays.fill(oversized, 'a'); - String oversizedString = new String (oversized); + String oversizedString = generateStringOfSize(maxLen + 10); // Simplest masking of secret and oversized value Assert.assertEquals("${USERVARIABLE}", impl.sanitizeObjectAndRecordMutation(secretUsername, env)); @@ -210,28 +204,92 @@ public void testRecursiveSanitizationOfContent() { // Maps HashMap dangerous = new HashMap<>(); dangerous.put("name", secretUsername); - Map sanitizedMap = impl.sanitizeMapAndRecordMutation(dangerous, env); - Assert.assertNotEquals(sanitizedMap, dangerous); + Object sanitized = impl.sanitizeMapAndRecordMutation(dangerous, env); + Assert.assertNotEquals(sanitized, dangerous); + assertThat(sanitized, instanceOf(Map.class)); + Map sanitizedMap = (Map) sanitized; Assert.assertEquals("${USERVARIABLE}", sanitizedMap.get("name")); Assert.assertFalse(impl.isUnmodifiedArguments()); impl.isUnmodifiedBySanitization = true; - Map identicalMap = impl.sanitizeMapAndRecordMutation(dangerous, new EnvVars()); // String is no longer dangerous - Assert.assertEquals(identicalMap, dangerous); + Object identical = impl.sanitizeMapAndRecordMutation(dangerous, new EnvVars()); // String is no longer dangerous + Assert.assertEquals(identical, dangerous); Assert.assertTrue(impl.isUnmodifiedArguments()); // Lists List unsanitizedList = Arrays.asList("cheese", null, secretUsername); - List sanitized = (List)impl.sanitizeListAndRecordMutation(unsanitizedList, env); - Assert.assertEquals(3, sanitized.size()); + Object sanitized2 = impl.sanitizeListAndRecordMutation(unsanitizedList, env); + assertThat(sanitized2, instanceOf(List.class)); + List sanitizedList = (List) sanitized2; + Assert.assertEquals(3, sanitizedList.size()); Assert.assertFalse(impl.isUnmodifiedArguments()); - Assert.assertEquals("${USERVARIABLE}", sanitized.get(2)); + Assert.assertEquals("${USERVARIABLE}", sanitizedList.get(2)); impl.isUnmodifiedBySanitization = true; Assert.assertEquals(unsanitizedList, impl.sanitizeObjectAndRecordMutation(unsanitizedList, new EnvVars())); Assert.assertEquals(unsanitizedList, impl.sanitizeListAndRecordMutation(unsanitizedList, new EnvVars())); } + @Test + @Issue("JENKINS-67380") + public void oversizedMap() { + { + // a map with reasonable size should not be truncated + ArgumentsActionImpl impl = new ArgumentsActionImpl(Collections.emptySet()); + Map smallMap = new HashMap<>(); + smallMap.put("key1", generateStringOfSize(ArgumentsActionImpl.getMaxRetainedLength() / 10)); + Object sanitizedSmallMap = impl.sanitizeMapAndRecordMutation(smallMap, null); + Assert.assertEquals(sanitizedSmallMap, smallMap); + Assert.assertTrue(impl.isUnmodifiedArguments()); + impl.isUnmodifiedBySanitization = true; + } + + { + // arguments map keys should be kept, but values should be truncated if too large + Map bigMap = new HashMap<>(); + String bigString = generateStringOfSize(ArgumentsActionImpl.getMaxRetainedLength() + 10); + bigMap.put("key1", bigString); + ArgumentsActionImpl impl = new ArgumentsActionImpl(bigMap, null, Collections.emptySet()); + Assert.assertEquals(ArgumentsAction.NotStoredReason.OVERSIZE_VALUE, impl.getArgumentValueOrReason("key1")); + Assert.assertFalse(impl.isUnmodifiedArguments()); + } + + { + // an arbitrary map should be truncated if it is too large overall + Map bigMap2 = new HashMap<>(); + String bigString2 = generateStringOfSize(ArgumentsActionImpl.getMaxRetainedLength()); + bigMap2.put("key1", bigString2); + ArgumentsActionImpl impl = new ArgumentsActionImpl(Collections.emptySet()); + Object sanitizedBigMap2 = impl.sanitizeMapAndRecordMutation(bigMap2, null); + Assert.assertNotEquals(sanitizedBigMap2, bigMap2); + Assert.assertEquals(ArgumentsAction.NotStoredReason.OVERSIZE_VALUE, sanitizedBigMap2); + Assert.assertFalse(impl.isUnmodifiedArguments()); + impl.isUnmodifiedBySanitization = true; + } + } + + @Test + public void oversizedList() { + ArgumentsActionImpl impl = new ArgumentsActionImpl(Collections.emptySet()); + List unsanitized = Arrays.asList(generateStringOfSize(ArgumentsActionImpl.getMaxRetainedLength())); + Object sanitized = impl.sanitizeListAndRecordMutation(unsanitized, null); + Assert.assertEquals(ArgumentsAction.NotStoredReason.OVERSIZE_VALUE, sanitized); + } + + @Test + public void oversizedArray() { + ArgumentsActionImpl impl = new ArgumentsActionImpl(Collections.emptySet()); + String[] unsanitized = new String[] {generateStringOfSize(ArgumentsActionImpl.getMaxRetainedLength())}; + Object sanitized = impl.sanitizeArrayAndRecordMutation(unsanitized, null); + Assert.assertEquals(ArgumentsAction.NotStoredReason.OVERSIZE_VALUE, sanitized); + } + + private static String generateStringOfSize(int size) { + char[] bigChars = new char[size]; + Arrays.fill(bigChars, 'a'); + return String.valueOf(bigChars); + } + @Test public void testArraySanitization() { EnvVars env = new EnvVars(); From 6ed3b5b01ff16dc4f6f9f4b209dbc21394b13913 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 16 Dec 2021 19:45:01 -0500 Subject: [PATCH 612/932] Avoid printing warnings from `CpsStepContext.completed` (#490) * Avoid printing warnings from `CpsStepContext.completed` * https://github.com/jenkinsci/workflow-cps-plugin/pull/490#issuecomment-985678771 --- .../plugins/workflow/cps/CpsStepContext.java | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java index 51a64e770..a1cf80128 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java @@ -30,6 +30,7 @@ import com.google.common.util.concurrent.SettableFuture; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import groovy.lang.Closure; +import hudson.Main; import hudson.model.Descriptor; import hudson.model.Result; import hudson.util.DaemonThreadFactory; @@ -327,29 +328,35 @@ private void completed(@Nonnull Outcome newOutcome) { whenOutcomeDelivered = new Throwable(); } else { Throwable failure = newOutcome.getAbnormal(); - if (failure instanceof FlowInterruptedException) { - for (CauseOfInterruption cause : ((FlowInterruptedException) failure).getCauses()) { - if (cause instanceof BodyFailed) { - LOGGER.log(Level.FINE, "already completed " + this + " and now received body failure", failure); - // Predictable that the error would be thrown up here; quietly ignore it. - return; - } + Level level; + if (Main.isUnitTest) { + if (failure instanceof FlowInterruptedException && ((FlowInterruptedException) failure).getCauses().stream().anyMatch(BodyFailed.class::isInstance)) { + // Very common and generally uninteresting. + level = Level.FINE; + } else { + // Possibly a minor bug. + level = Level.INFO; } - } - LOGGER.log(Level.WARNING, "already completed " + this, new IllegalStateException("delivered here")); - if (failure != null) { - LOGGER.log(Level.INFO, "new failure", failure); } else { - LOGGER.log(Level.INFO, "new success: {0}", outcome.getNormal()); + // Typically harmless; do not alarm users. + level = Level.FINE; } - if (whenOutcomeDelivered != null) { - LOGGER.log(Level.INFO, "previously delivered here", whenOutcomeDelivered); - } - failure = outcome.getAbnormal(); - if (failure != null) { - LOGGER.log(Level.INFO, "earlier failure", failure); - } else { - LOGGER.log(Level.INFO, "earlier success: {0}", outcome.getNormal()); + if (LOGGER.isLoggable(level)) { + LOGGER.log(level, "already completed " + this, new IllegalStateException("delivered here")); + if (failure != null) { + LOGGER.log(level, "new failure", failure); + } else { + LOGGER.log(level, "new success: {0}", outcome.getNormal()); + } + if (whenOutcomeDelivered != null) { + LOGGER.log(level, "previously delivered here", whenOutcomeDelivered); + } + Throwable earlierFailure = outcome.getAbnormal(); + if (earlierFailure != null) { + LOGGER.log(level, "earlier failure", earlierFailure); + } else { + LOGGER.log(level, "earlier success: {0}", outcome.getNormal()); + } } } } From a0b5bf673f730deb3af74d27523063c105a00d0e Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Thu, 16 Dec 2021 19:35:54 -0800 Subject: [PATCH 613/932] Exclude `javax.servlet:servlet-api` (#493) --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 4b3bdc778..3dead468b 100644 --- a/pom.xml +++ b/pom.xml @@ -191,6 +191,12 @@ org.jenkins-ci.ui ace-editor + + + javax.servlet + servlet-api + + com.cloudbees From a9433432b33c65f58d9e7b4dc4aa83249672eaf7 Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Thu, 16 Dec 2021 21:25:34 -0700 Subject: [PATCH 614/932] remove badges from readme (#494) --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 3dd2a4e75..0b386501c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # Pipeline: Groovy Plugin -[![Jenkins Plugin](https://img.shields.io/jenkins/plugin/v/workflow-cps)](https://plugins.jenkins.io/workflow-cps) -[![Changelog](https://img.shields.io/github/v/tag/jenkinsci/workflow-cps-plugin?label=changelog)](https://github.com/jenkinsci/workflow-cps-plugin/blob/master/CHANGELOG.md) -[![Jenkins Plugin Installs](https://img.shields.io/jenkins/plugin/i/workflow-cps?color=blue)](https://plugins.jenkins.io/workflow-cps) - ## Introduction A key component of the Pipeline plugin suite, this provides the standard execution engine for Pipeline steps, based on a custom [Groovy](http://www.groovy-lang.org/) interpreter that runs inside the Jenkins controller process. From 8a0e784041460ef743c830c2c8cd5b550612345d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jan 2022 00:07:27 +0000 Subject: [PATCH 615/932] Bump git-changelist-maven-extension from 1.2 to 1.3 Bumps [git-changelist-maven-extension](https://github.com/jenkinsci/incrementals-tools) from 1.2 to 1.3. - [Release notes](https://github.com/jenkinsci/incrementals-tools/releases) - [Commits](https://github.com/jenkinsci/incrementals-tools/compare/parent-1.2...parent-1.3) --- updated-dependencies: - dependency-name: io.jenkins.tools.incrementals:git-changelist-maven-extension dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .mvn/extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 43d628161..a65d82e1b 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -2,6 +2,6 @@ io.jenkins.tools.incrementals git-changelist-maven-extension - 1.2 + 1.3 From b968d5c7722e85e0674ad3902a464386a5e455c1 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 10 Jan 2022 21:54:14 -0800 Subject: [PATCH 616/932] EOL JSR 305 (#496) --- .../workflow/cps/ContextVariableSet.java | 2 +- .../workflow/cps/CpsBodyExecution.java | 10 +++--- .../plugins/workflow/cps/CpsBodyInvoker.java | 4 +-- .../workflow/cps/CpsBodySubContext.java | 6 ++-- .../workflow/cps/CpsFlowExecution.java | 28 +++++++-------- .../plugins/workflow/cps/CpsGroovyShell.java | 8 ++--- .../workflow/cps/CpsGroovyShellFactory.java | 4 +-- .../plugins/workflow/cps/CpsScript.java | 2 +- .../plugins/workflow/cps/CpsStepContext.java | 12 +++---- .../plugins/workflow/cps/CpsThread.java | 12 +++---- .../plugins/workflow/cps/CpsThreadDump.java | 4 +-- .../plugins/workflow/cps/CpsThreadGroup.java | 10 +++--- .../workflow/cps/CpsVmExecutorService.java | 2 +- .../jenkinsci/plugins/workflow/cps/DSL.java | 14 ++++---- .../plugins/workflow/cps/EnvActionImpl.java | 4 +-- .../plugins/workflow/cps/FlowHead.java | 6 ++-- .../plugins/workflow/cps/GlobalVariable.java | 14 ++++---- .../workflow/cps/GlobalVariableSet.java | 8 ++--- .../workflow/cps/GroovyShellDecorator.java | 2 +- .../plugins/workflow/cps/Snippetizer.java | 6 ++-- .../plugins/workflow/cps/SnippetizerLink.java | 36 +++++++++---------- .../cps/actions/ArgumentsActionImpl.java | 28 +++++++-------- .../workflow/cps/nodes/StepAtomNode.java | 10 +++--- .../cps/nodes/StepDescriptorCache.java | 2 +- .../cps/replay/OriginalLoadedScripts.java | 4 +-- .../workflow/cps/replay/ReplayAction.java | 12 +++---- .../workflow/cps/replay/ReplayCause.java | 6 ++-- .../cps/replay/ReplayFlowFactoryAction.java | 6 ++-- .../cps/steps/ParallelStepExecution.java | 4 +-- .../cps/view/InterpolatedSecretsAction.java | 6 ++-- .../DynamicEnvironmentExpanderTest.java | 6 ++-- .../plugins/workflow/StepListenerTest.java | 4 +-- .../workflow/TestDurabilityHintProvider.java | 14 ++++---- .../plugins/workflow/WorkflowTest.java | 6 ++-- .../workflow/cps/ContextVariableSetTest.java | 2 +- .../workflow/cps/CpsFlowExecutionTest.java | 2 +- .../cps/DescriptorMatchPredicate.java | 6 ++-- .../workflow/cps/FlowDurabilityTest.java | 4 +-- .../workflow/cps/SnippetizerTester.java | 8 ++--- .../cps/steps/RestartingLoadStepTest.java | 2 +- 40 files changed, 163 insertions(+), 163 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSet.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSet.java index 1275dffb8..03941e195 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSet.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSet.java @@ -36,7 +36,7 @@ import java.util.Set; import java.util.logging.Logger; import java.util.stream.Collectors; -import javax.annotation.concurrent.Immutable; +import net.jcip.annotations.Immutable; import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn; import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.PROGRAM; import org.jenkinsci.plugins.workflow.flow.FlowExecution; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java index 06700c28a..de71aea09 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java @@ -25,7 +25,7 @@ import org.jenkinsci.plugins.workflow.steps.StepContext; import org.jenkinsci.plugins.workflow.steps.StepExecution; -import javax.annotation.concurrent.GuardedBy; +import net.jcip.annotations.GuardedBy; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -42,8 +42,8 @@ import java.util.logging.Logger; import static java.util.logging.Level.*; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; import org.jenkinsci.plugins.workflow.graph.FlowNode; import org.jenkinsci.plugins.workflow.graphanalysis.LinearBlockHoppingScanner; @@ -387,7 +387,7 @@ public Next receive(Object o) { * * @see #addBodyEndFlowNode() */ - private @Nonnull StepStartNode addBodyStartFlowNode(FlowHead head) { + private @NonNull StepStartNode addBodyStartFlowNode(FlowHead head) { CpsFlowExecution.maybeAutoPersistNode(head.get()); StepStartNode start = new StepStartNode(head.getExecution(), context.getStepDescriptor(), head.get()); @@ -402,7 +402,7 @@ public Next receive(Object o) { * * @see #addBodyStartFlowNode(FlowHead) */ - private @Nonnull StepEndNode addBodyEndFlowNode() { + private @NonNull StepEndNode addBodyEndFlowNode() { try { FlowHead head = CpsThread.current().head; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java index 749952c4e..520b3a34d 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; import org.jenkinsci.plugins.workflow.cps.steps.LoadStep; @@ -111,7 +111,7 @@ public CpsBodyInvoker withCallback(BodyExecutionCallback callback) { } @Override - public CpsBodyInvoker withDisplayName(@Nonnull String name) { + public CpsBodyInvoker withDisplayName(@NonNull String name) { this.displayName = name; return this; } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodySubContext.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodySubContext.java index 1f92b1beb..bdab9ab8c 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodySubContext.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodySubContext.java @@ -7,7 +7,7 @@ import org.jenkinsci.plugins.workflow.steps.StepContext; import org.jenkinsci.plugins.workflow.support.DefaultStepContext; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; /** @@ -33,7 +33,7 @@ final class CpsBodySubContext extends DefaultStepContext { this.node = node; } - @Nonnull + @NonNull @Override protected FlowNode getNode() throws IOException { return node; @@ -93,7 +93,7 @@ public ListenableFuture saveState() { return base.saveState(); } - @Nonnull + @NonNull @Override public CpsFlowExecution getExecution() throws IOException { return base.getExecution(); diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index ee9da85af..8836ab696 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -139,9 +139,9 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.concurrent.GuardedBy; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import net.jcip.annotations.GuardedBy; import org.acegisecurity.Authentication; import org.acegisecurity.userdetails.UsernameNotFoundException; @@ -391,7 +391,7 @@ public CpsFlowExecution(String script, FlowExecutionOwner owner) throws IOExcept this(script, false, owner); } - public CpsFlowExecution(@Nonnull String script, boolean sandbox, @Nonnull FlowExecutionOwner owner, @CheckForNull FlowDurabilityHint durabilityHint) throws IOException { + public CpsFlowExecution(@NonNull String script, boolean sandbox, @NonNull FlowExecutionOwner owner, @CheckForNull FlowDurabilityHint durabilityHint) throws IOException { this.owner = owner; this.script = script; this.sandbox = sandbox; @@ -1208,7 +1208,7 @@ public void saveActions(FlowNode node, List actions) throws IOException } /** Stores FlowNode with write deferred */ - void cacheNode(@Nonnull FlowNode node) { + void cacheNode(@NonNull FlowNode node) { try { getStorage().storeNode(node, true); } catch (IOException ioe) { @@ -1218,7 +1218,7 @@ void cacheNode(@Nonnull FlowNode node) { } /** Invoke me to toggle autopersist back on for steps that delay it. */ - public static void maybeAutoPersistNode(@Nonnull FlowNode node) { + public static void maybeAutoPersistNode(@NonNull FlowNode node) { try { FlowExecution exec = node.getExecution(); if (exec instanceof CpsFlowExecution) { @@ -1325,7 +1325,7 @@ private static void cleanUpLoader(ClassLoader loader, Set encounter gcl.clearCache(); } - private static void cleanUpGlobalClassValue(@Nonnull ClassLoader loader) throws Exception { + private static void cleanUpGlobalClassValue(@NonNull ClassLoader loader) throws Exception { Class classInfoC = Class.forName("org.codehaus.groovy.reflection.ClassInfo"); // TODO switch to MethodHandle for speed Field globalClassValueF = classInfoC.getDeclaredField("globalClassValue"); @@ -1376,7 +1376,7 @@ private static void cleanUpGlobalClassValue(@Nonnull ClassLoader loader) throws } } - private static void cleanUpGlobalClassSet(@Nonnull Class clazz) throws Exception { + private static void cleanUpGlobalClassSet(@NonNull Class clazz) throws Exception { Class classInfoC = Class.forName("org.codehaus.groovy.reflection.ClassInfo"); // or just ClassInfo.class, but unclear whether this will always be there Field globalClassSetF = classInfoC.getDeclaredField("globalClassSet"); globalClassSetF.setAccessible(true); @@ -1408,7 +1408,7 @@ private static void cleanUpGlobalClassSet(@Nonnull Class clazz) throws Except } } - private static void cleanUpClassHelperCache(@Nonnull Class clazz) throws Exception { + private static void cleanUpClassHelperCache(@NonNull Class clazz) throws Exception { Field classCacheF = Class.forName("org.codehaus.groovy.ast.ClassHelper$ClassHelperCache").getDeclaredField("classCache"); classCacheF.setAccessible(true); Object classCache = classCacheF.get(null); @@ -1418,7 +1418,7 @@ private static void cleanUpClassHelperCache(@Nonnull Class clazz) throws Exce classCache.getClass().getMethod("remove", Object.class).invoke(classCache, clazz); } - private static void cleanUpObjectStreamClassCaches(@Nonnull Class clazz) throws Exception { + private static void cleanUpObjectStreamClassCaches(@NonNull Class clazz) throws Exception { Class cachesC = Class.forName("java.io.ObjectStreamClass$Caches"); for (String cacheFName : new String[] {"localDescs", "reflectors"}) { Field cacheF = cachesC.getDeclaredField(cacheFName); @@ -1682,7 +1682,7 @@ public void marshal(Object source, HierarchicalStreamWriter w, MarshallingContex } } - private void writeChild(HierarchicalStreamWriter w, MarshallingContext context, String name, @Nonnull T v, Class staticType) { + private void writeChild(HierarchicalStreamWriter w, MarshallingContext context, String name, @NonNull T v, Class staticType) { if (!mapper.shouldSerializeMember(CpsFlowExecution.class,name)) return; startNode(w, name, staticType); @@ -1818,7 +1818,7 @@ public FlowNode getNode(String string) throws IOException { } @Override - public void storeNode(@Nonnull FlowNode n) throws IOException { + public void storeNode(@NonNull FlowNode n) throws IOException { try (Timing t = time(TimingKind.flowNode)) { readWriteLock.writeLock().lock(); try { @@ -1830,7 +1830,7 @@ public void storeNode(@Nonnull FlowNode n) throws IOException { } @Override - public void storeNode(@Nonnull FlowNode n, boolean delayWritingActions) throws IOException { + public void storeNode(@NonNull FlowNode n, boolean delayWritingActions) throws IOException { try (Timing t = time(TimingKind.flowNode)) { readWriteLock.writeLock().lock(); try { @@ -1866,7 +1866,7 @@ public void flushNode(FlowNode node) throws IOException { } @Override - public void autopersist(@Nonnull FlowNode n) throws IOException { + public void autopersist(@NonNull FlowNode n) throws IOException { try (Timing t = time(TimingKind.flowNode)) { readWriteLock.writeLock().lock(); try { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java index 5a9a595fc..909351150 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java @@ -12,8 +12,8 @@ import java.util.Enumeration; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import org.codehaus.groovy.control.CompilationFailedException; import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.CompilerConfiguration; @@ -160,8 +160,8 @@ protected synchronized String generateScriptName() { } static class TimingLoader extends ClassLoader { - private final @Nonnull CpsFlowExecution execution; - TimingLoader(ClassLoader parent, @Nonnull CpsFlowExecution execution) { + private final @NonNull CpsFlowExecution execution; + TimingLoader(ClassLoader parent, @NonNull CpsFlowExecution execution) { super(parent); this.execution = execution; } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java index 45332ea8f..0ef42dddc 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java @@ -10,8 +10,8 @@ import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.GroovySandbox; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java index 699bb4506..8698ac137 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java @@ -34,7 +34,7 @@ import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.CheckForNull; +import edu.umd.cs.findbugs.annotations.CheckForNull; import org.codehaus.groovy.control.CompilationFailedException; import org.codehaus.groovy.runtime.DefaultGroovyMethods; import org.codehaus.groovy.runtime.DefaultGroovyStaticMethods; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java index a1cf80128..4ca277c44 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java @@ -52,9 +52,9 @@ import org.jenkinsci.plugins.workflow.support.DefaultStepContext; import org.jenkinsci.plugins.workflow.support.concurrent.Futures; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.concurrent.GuardedBy; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import net.jcip.annotations.GuardedBy; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; @@ -237,7 +237,7 @@ public String getDisplayName() { return getThread(getThreadGroupSynchronously()); } - private @Nonnull CpsThreadGroup getThreadGroupSynchronously() throws InterruptedException, IOException { + private @NonNull CpsThreadGroup getThreadGroupSynchronously() throws InterruptedException, IOException { if (threadGroup == null) { ListenableFuture pp; CpsFlowExecution flowExecution = getExecution(); @@ -285,7 +285,7 @@ public CpsBodyInvoker newBodyInvoker() { return newBodyInvoker(body, false); } - public @Nonnull CpsBodyInvoker newBodyInvoker(@Nonnull BodyReference body, boolean unexport) { + public @NonNull CpsBodyInvoker newBodyInvoker(@NonNull BodyReference body, boolean unexport) { return new CpsBodyInvoker(this, body, unexport); } @@ -320,7 +320,7 @@ protected T doGet(Class key) throws IOException, InterruptedException { } - private void completed(@Nonnull Outcome newOutcome) { + private void completed(@NonNull Outcome newOutcome) { if (outcome == null) { LOGGER.finer(() -> this + " completed with " + newOutcome); outcome = newOutcome; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java index d49462b31..2edbf1d5a 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java @@ -32,9 +32,9 @@ import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn; import org.jenkinsci.plugins.workflow.steps.StepExecution; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -62,7 +62,7 @@ public final class CpsThread implements Serializable { /** * Owner object. A thread always belong to a {@link CpsThreadGroup} */ - @Nonnull + @NonNull final CpsThreadGroup group; /** @@ -114,7 +114,7 @@ public final class CpsThread implements Serializable { */ private final List> completionHandlers = new ArrayList<>(); - CpsThread(CpsThreadGroup group, int id, @Nonnull Continuable program, FlowHead head, ContextVariableSet contextVariables) { + CpsThread(CpsThreadGroup group, int id, @NonNull Continuable program, FlowHead head, ContextVariableSet contextVariables) { this.group = group; this.id = id; this.program = group.getExecution().isSandbox() ? new SandboxContinuable(program,this) : program; @@ -170,7 +170,7 @@ public StepExecution getStep() { * the point the workflow needs to be dehydrated. */ @SuppressWarnings("rawtypes") - @Nonnull Outcome runNextChunk() { + @NonNull Outcome runNextChunk() { assert program!=null; Outcome outcome; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java index df4c62d65..1253f8651 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java @@ -14,7 +14,7 @@ import java.util.ListIterator; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import org.jenkinsci.plugins.workflow.steps.StepDescriptor; /** @@ -152,7 +152,7 @@ public static CpsThreadDump from(CpsThreadGroup g) { * @param text possibly multiline string */ @SuppressWarnings("serial") - public static @Nonnull CpsThreadDump fromText(@Nonnull final String text) { + public static @NonNull CpsThreadDump fromText(@NonNull final String text) { return CpsThreadDump.from(new Throwable() { @Override public String toString() { return text; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java index 089f5c2f6..fc1f90ab3 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java @@ -50,7 +50,7 @@ import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException; import org.jenkinsci.plugins.workflow.support.pickles.serialization.RiverWriter; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.File; import java.io.IOException; import java.io.Serializable; @@ -75,7 +75,7 @@ import java.util.logging.Logger; import static java.util.logging.Level.*; -import javax.annotation.CheckForNull; +import edu.umd.cs.findbugs.annotations.CheckForNull; import static org.jenkinsci.plugins.workflow.cps.CpsFlowExecution.*; import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; import org.jenkinsci.plugins.workflow.pickles.Pickle; @@ -194,7 +194,7 @@ private void setupTransients() { } @CpsVmThreadOnly - public CpsThread addThread(@Nonnull Continuable program, FlowHead head, ContextVariableSet contextVariables) { + public CpsThread addThread(@NonNull Continuable program, FlowHead head, ContextVariableSet contextVariables) { assertVmThread(); CpsThread t = new CpsThread(this, iota++, program, head, contextVariables); threads.put(t.id, t); @@ -234,7 +234,7 @@ public Iterable getThreads() { } @CpsVmThreadOnly("root") - public @Nonnull BodyReference export(@Nonnull Closure body) { + public @NonNull BodyReference export(@NonNull Closure body) { assertVmThread(); int id = iota++; closures.put(id, body); @@ -243,7 +243,7 @@ public Iterable getThreads() { } @CpsVmThreadOnly("root") - public @Nonnull BodyReference export(@Nonnull final Script body) { + public @NonNull BodyReference export(@NonNull final Script body) { register(body); return export(new Closure(null) { @Override diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java index e96757cbf..eaf650eff 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java @@ -10,7 +10,7 @@ import java.util.concurrent.ExecutorService; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.CheckForNull; +import edu.umd.cs.findbugs.annotations.CheckForNull; import jenkins.model.Jenkins; import jenkins.util.InterceptingExecutorService; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java index 789b7eab3..b337f4466 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java @@ -94,9 +94,9 @@ import org.kohsuke.stapler.ClassDescriptor; import org.kohsuke.stapler.NoStaplerConstructorException; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; /** * Calls {@link Step}s and other DSL objects. @@ -360,7 +360,7 @@ protected Object invokeStep(StepDescriptor d, String name, Object args) { } } - private void logInterpolationWarnings(String stepName, @CheckForNull ArgumentsActionImpl argumentsAction, Set interpolatedStrings, @CheckForNull EnvVars envVars, @Nonnull Set sensitiveVariables, TaskListener listener) throws IOException { + private void logInterpolationWarnings(String stepName, @CheckForNull ArgumentsActionImpl argumentsAction, Set interpolatedStrings, @CheckForNull EnvVars envVars, @NonNull Set sensitiveVariables, TaskListener listener) throws IOException { if (UNSAFE_GROOVY_INTERPOLATION.equals("ignore")) { return; } @@ -541,7 +541,7 @@ static class NamedArgsAndClosure { final List msgs; final Set interpolatedStrings; - private NamedArgsAndClosure(Map namedArgs, Closure body, @Nonnull Set foundInterpolatedStrings) { + private NamedArgsAndClosure(Map namedArgs, Closure body, @NonNull Set foundInterpolatedStrings) { this.namedArgs = new LinkedHashMap<>(preallocatedHashmapCapacity(namedArgs.size())); this.body = body; this.msgs = new ArrayList<>(); @@ -593,7 +593,7 @@ private static Object collectInterpolatedStrings(Object argValue, Set in * Record all instances of interpolated Groovy strings. We can check this collection later to see if sensitive variables were used. * @return {@code v} or an equivalent with all {@link GString}s flattened, including in nested {@link List}s or {@link Map}s */ - private static Object flattenGString(Object v, @Nonnull Set interpolatedStrings) { + private static Object flattenGString(Object v, @NonNull Set interpolatedStrings) { if (v instanceof GString) { String flattened = v.toString(); interpolatedStrings.add(flattened); @@ -665,7 +665,7 @@ static NamedArgsAndClosure parseArgs(Object arg, StepDescriptor d) { * @param interpolatedStrings * The collection of interpolated Groovy strings. */ - static NamedArgsAndClosure parseArgs(Object arg, boolean expectsBlock, String soleArgumentKey, boolean singleRequiredArg, @Nonnull Set interpolatedStrings) { + static NamedArgsAndClosure parseArgs(Object arg, boolean expectsBlock, String soleArgumentKey, boolean singleRequiredArg, @NonNull Set interpolatedStrings) { if (arg instanceof NamedArgsAndClosure) { return (NamedArgsAndClosure) arg; } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java index 9b1304625..48ba5cf65 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java @@ -39,7 +39,7 @@ import java.util.TreeMap; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.RunAction2; import org.jenkinsci.plugins.workflow.flow.FlowCopier; import org.jenkinsci.plugins.workflow.flow.FlowExecution; @@ -154,7 +154,7 @@ private FlowNode getNode() throws IOException { /** * Gets the singleton instance for a given build, creating it on demand. */ - public static @Nonnull EnvActionImpl forRun(@Nonnull Run run) throws IOException { + public static @NonNull EnvActionImpl forRun(@NonNull Run run) throws IOException { synchronized (run) { EnvActionImpl action = run.getAction(EnvActionImpl.class); if (action == null) { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java index d271ae02f..bcb588d55 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java @@ -44,7 +44,7 @@ import org.jenkinsci.plugins.workflow.graph.FlowNode; import org.jenkinsci.plugins.workflow.graph.FlowStartNode; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; /** * Growing tip of the node graph. @@ -130,7 +130,7 @@ void newStartNode(FlowStartNode n) throws IOException { } /** Could be better described as "append to Flow graph" except for parallel cases. */ - void setNewHead(@Nonnull FlowNode v) { + void setNewHead(@NonNull FlowNode v) { if (v == null) { // Because Findbugs isn't 100% at catching cases where this can happen and we really need to fail hard-and-fast throw new IllegalArgumentException("FlowHead.setNewHead called on FlowHead id="+this.id+" with a null FlowNode, execution="+this.execution); @@ -196,7 +196,7 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound // we'll replace this with one of execution.heads() } - @Nonnull + @NonNull private Object readResolve() { execution = CpsFlowExecution.PROGRAM_STATE_SERIALIZATION.get(); if (execution!=null) { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java index f3dea8b80..85c7dee72 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java @@ -32,9 +32,9 @@ import hudson.util.Iterators.FlattenIterator; import jenkins.model.RunAction2; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Iterator; -import javax.annotation.CheckForNull; +import edu.umd.cs.findbugs.annotations.CheckForNull; import org.jenkinsci.plugins.workflow.flow.FlowExecution; import org.jenkinsci.plugins.workflow.steps.Step; @@ -63,7 +63,7 @@ public abstract class GlobalVariable implements ExtensionPoint { * Defines the name of the variable. * @return a Java identifier */ - public abstract @Nonnull String getName(); + public abstract @NonNull String getName(); /** * Gets or creates the singleton value of the variable. @@ -74,7 +74,7 @@ public abstract class GlobalVariable implements ExtensionPoint { * @throws Exception if there was any problem creating it (will be thrown up to the script) * @see CpsScript#getProperty */ - public abstract @Nonnull Object getValue(@Nonnull CpsScript script) throws Exception; + public abstract @NonNull Object getValue(@NonNull CpsScript script) throws Exception; /** * @deprecated use {@link #forRun} instead @@ -87,7 +87,7 @@ public abstract class GlobalVariable implements ExtensionPoint { * @param run see {@link GlobalVariableSet#forRun} * @return a possibly empty list */ - public static @Nonnull Iterable forRun(@CheckForNull final Run run) { + public static @NonNull Iterable forRun(@CheckForNull final Run run) { return new Iterable() { @Override public Iterator iterator() { return new FlattenIterator(ExtensionList.lookup(GlobalVariableSet.class).iterator()) { @@ -104,7 +104,7 @@ public abstract class GlobalVariable implements ExtensionPoint { * @param job see {@link GlobalVariableSet#forJob} * @return a possibly empty list */ - public static @Nonnull Iterable forJob(@CheckForNull final Job job) { + public static @NonNull Iterable forJob(@CheckForNull final Job job) { return new Iterable() { @Override public Iterator iterator() { return new FlattenIterator(ExtensionList.lookup(GlobalVariableSet.class).iterator()) { @@ -122,7 +122,7 @@ public abstract class GlobalVariable implements ExtensionPoint { * @param run see {@link GlobalVariableSet#forRun} * @return the first matching variable, or null if there is none */ - public static @CheckForNull GlobalVariable byName(@Nonnull String name, @CheckForNull Run run) { + public static @CheckForNull GlobalVariable byName(@NonNull String name, @CheckForNull Run run) { for (GlobalVariable var : forRun(run)) { if (var.getName().equals(name)) { return var; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariableSet.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariableSet.java index 370aa3f85..460ab4e4f 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariableSet.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariableSet.java @@ -9,8 +9,8 @@ import hudson.model.Run; import java.util.Collection; import java.util.Iterator; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; @@ -27,7 +27,7 @@ public abstract class GlobalVariableSet implements ExtensionPoint, Iterable forRun(@CheckForNull Run run) { + public /* abstract */ @NonNull Collection forRun(@CheckForNull Run run) { return Lists.newArrayList(iterator()); } @@ -36,7 +36,7 @@ public abstract class GlobalVariableSet implements ExtensionPoint, Iterable forJob(@CheckForNull Job job) { + public @NonNull Collection forJob(@CheckForNull Job job) { return forRun(job != null ? job.getLastSuccessfulBuild() : null); } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyShellDecorator.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyShellDecorator.java index cc0ad957a..9051dd7ed 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyShellDecorator.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyShellDecorator.java @@ -3,7 +3,7 @@ import groovy.lang.GroovyShell; import hudson.ExtensionList; import hudson.ExtensionPoint; -import javax.annotation.CheckForNull; +import edu.umd.cs.findbugs.annotations.CheckForNull; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.customizers.ImportCustomizer; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java index b793710d8..6a9de6a56 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java @@ -45,8 +45,8 @@ import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import javax.lang.model.SourceVersion; import jenkins.model.Jenkins; import jenkins.model.TransientActionFactory; @@ -539,7 +539,7 @@ public HttpResponse doGenerateSnippet(StaplerRequest req, @QueryParameter String /** * Used to generate the list of links on the sidepanel. */ - @Nonnull + @NonNull public List getSnippetizerLinks() { return ExtensionList.lookup(SnippetizerLink.class); } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/SnippetizerLink.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/SnippetizerLink.java index 8f6d3a400..6df1b8a44 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/SnippetizerLink.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/SnippetizerLink.java @@ -31,7 +31,7 @@ import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.net.URI; import java.net.URISyntaxException; @@ -53,14 +53,14 @@ public abstract class SnippetizerLink implements ExtensionPoint { * Get the URL this link should point to, which will be used by {@link #getDisplayUrl()}. If this is not absolute, * {@link #getDisplayUrl()} will link to this within the current context. */ - @Nonnull + @NonNull public abstract String getUrl(); /** * Get the actual URL to use in sidepanel.jelly. If {@link #getUrl()} is not absolute, this will try to get the * current Job context and return a url starting with that job's {@link Job#getUrl()} appended with {@link #getUrl()}. */ - @Nonnull + @NonNull public final String getDisplayUrl() { String u = getUrl(); @@ -106,7 +106,7 @@ public final String getDisplayUrl() { /** * Get the icon information for the link. */ - @Nonnull + @NonNull public String getIcon() { return "icon-help icon-md"; } @@ -114,7 +114,7 @@ public String getIcon() { /** * Get the display name for the link. */ - @Nonnull + @NonNull public abstract String getDisplayName(); /** @@ -127,19 +127,19 @@ public boolean inNewWindow() { @Extension(ordinal = 1000L) public static class GeneratorLink extends SnippetizerLink { @Override - @Nonnull + @NonNull public String getUrl() { return ACTION_URL; } @Override - @Nonnull + @NonNull public String getIcon() { return "icon-gear2 icon-md"; } @Override - @Nonnull + @NonNull public String getDisplayName() { return Messages.SnippetizerLink_GeneratorLink_displayName(); } @@ -148,13 +148,13 @@ public String getDisplayName() { @Extension(ordinal = 900L) public static class StepReferenceLink extends SnippetizerLink { @Override - @Nonnull + @NonNull public String getUrl() { return ACTION_URL + "/html"; } @Override - @Nonnull + @NonNull public String getDisplayName() { return Messages.SnippetizerLink_StepReferenceLink_displayName(); } @@ -163,13 +163,13 @@ public String getDisplayName() { @Extension(ordinal = 800L) public static class GlobalsReferenceLink extends SnippetizerLink { @Override - @Nonnull + @NonNull public String getUrl() { return ACTION_URL + "/globals"; } @Override - @Nonnull + @NonNull public String getDisplayName() { return Messages.SnippetizerLink_GlobalsReferenceLink_displayName(); } @@ -178,13 +178,13 @@ public String getDisplayName() { @Extension(ordinal = 700L) public static class OnlineDocsLink extends SnippetizerLink { @Override - @Nonnull + @NonNull public String getUrl() { return "https://jenkins.io/doc/pipeline/"; } @Override - @Nonnull + @NonNull public String getDisplayName() { return Messages.SnippetizerLink_OnlineDocsLink_displayName(); } @@ -198,13 +198,13 @@ public boolean inNewWindow() { @Extension(ordinal = 600L) public static class ExamplesLink extends SnippetizerLink { - @Nonnull + @NonNull @Override public String getUrl() { return "https://jenkins.io/doc/pipeline/examples/"; } - @Nonnull + @NonNull @Override public String getDisplayName() { return Messages.SnippetizerLink_ExamplesLink_displayName(); @@ -214,13 +214,13 @@ public String getDisplayName() { @Extension(ordinal = 500L) public static class GDSLLink extends SnippetizerLink { @Override - @Nonnull + @NonNull public String getUrl() { return ACTION_URL + "/gdsl"; } @Override - @Nonnull + @NonNull public String getDisplayName() { return Messages.SnippetizerLink_GDSLLink_displayName(); } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java index 5fa0b2b58..f80b1cb7b 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java @@ -39,8 +39,8 @@ import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.reflect.Type; import java.net.URL; import java.util.ArrayList; @@ -72,25 +72,25 @@ public class ArgumentsActionImpl extends ArgumentsAction { private static final Logger LOGGER = Logger.getLogger(ArgumentsActionImpl.class.getName()); - public ArgumentsActionImpl(@Nonnull Map stepArguments, @CheckForNull EnvVars env, @Nonnull Set sensitiveVariables) { + public ArgumentsActionImpl(@NonNull Map stepArguments, @CheckForNull EnvVars env, @NonNull Set sensitiveVariables) { this.sensitiveVariables = new HashSet<>(sensitiveVariables); this.arguments = serializationCheck(sanitizeStepArguments(stepArguments, env)); } /** Create a step, sanitizing strings for secured content */ - public ArgumentsActionImpl(@Nonnull Map stepArguments) { + public ArgumentsActionImpl(@NonNull Map stepArguments) { this(stepArguments, new EnvVars(), Collections.emptySet()); } /** For testing use only */ - ArgumentsActionImpl(@Nonnull Set sensitiveVariables){ + ArgumentsActionImpl(@NonNull Set sensitiveVariables){ this.isUnmodifiedBySanitization = true; this.arguments = Collections.emptyMap(); this.sensitiveVariables = sensitiveVariables; } /** See if sensitive environment variable content is in a string and replace the content with its associated variable name, otherwise return string unmodified*/ - public static String replaceSensitiveVariables(@Nonnull String input, @CheckForNull EnvVars variables, @Nonnull Set sensitiveVariables) { + public static String replaceSensitiveVariables(@NonNull String input, @CheckForNull EnvVars variables, @NonNull Set sensitiveVariables) { if (variables == null || variables.size() == 0 || sensitiveVariables.size() ==0) { return input; } @@ -138,7 +138,7 @@ boolean isStorableType(Object ob) { * Sanitize a list recursively */ @CheckForNull - Object sanitizeListAndRecordMutation(@Nonnull List objects, @CheckForNull EnvVars variables) { + Object sanitizeListAndRecordMutation(@NonNull List objects, @CheckForNull EnvVars variables) { // Package scoped so we can test it directly if (isOversized(objects)) { @@ -170,7 +170,7 @@ Object sanitizeListAndRecordMutation(@Nonnull List objects, @CheckForNull EnvVar /** For object arrays, we sanitize recursively, as with Lists */ @CheckForNull - Object sanitizeArrayAndRecordMutation(@Nonnull Object[] objects, @CheckForNull EnvVars variables) { + Object sanitizeArrayAndRecordMutation(@NonNull Object[] objects, @CheckForNull EnvVars variables) { if (isOversized(objects)) { this.isUnmodifiedBySanitization = false; return NotStoredReason.OVERSIZE_VALUE; @@ -274,7 +274,7 @@ Object sanitizeObjectAndRecordMutation(@CheckForNull Object o, @CheckForNull Env * See JENKINS-50752 for details, but the gist is we need to avoid problems before physical persistence to prevent data loss. * @return Arguments */ - Map serializationCheck(@Nonnull Map arguments) { + Map serializationCheck(@NonNull Map arguments) { boolean isMutated = false; HashMap out = Maps.newHashMapWithExpectedSize(arguments.size()); for (Map.Entry entry : arguments.entrySet()) { @@ -300,8 +300,8 @@ Map serializationCheck(@Nonnull Map arguments) { /** * Goes through {@link #sanitizeObjectAndRecordMutation(Object, EnvVars)} for each value in a map input. */ - @Nonnull - Object sanitizeMapAndRecordMutation(@Nonnull Map mapContents, @CheckForNull EnvVars variables) { + @NonNull + Object sanitizeMapAndRecordMutation(@NonNull Map mapContents, @CheckForNull EnvVars variables) { // Package scoped so we can test it directly return sanitizeMapAndRecordMutation(mapContents, variables, false); } @@ -314,8 +314,8 @@ private Map sanitizeStepArguments(Map stepArgume /** * Goes through {@link #sanitizeObjectAndRecordMutation(Object, EnvVars)} for each value in a map input. */ - @Nonnull - private Object sanitizeMapAndRecordMutation(@Nonnull Map mapContents, @CheckForNull EnvVars variables, boolean topLevel) { + @NonNull + private Object sanitizeMapAndRecordMutation(@NonNull Map mapContents, @CheckForNull EnvVars variables, boolean topLevel) { LinkedHashMap output = new LinkedHashMap<>(mapContents.size()); long size = mapContents.size(); @@ -369,7 +369,7 @@ static int getMaxRetainedLength() { return MAX_RETAINED_LENGTH; } - @Nonnull + @NonNull @Override protected Map getArgumentsInternal() { return arguments == null ? Collections.EMPTY_MAP : arguments; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepAtomNode.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepAtomNode.java index 610190d32..8f30d6737 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepAtomNode.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepAtomNode.java @@ -36,8 +36,8 @@ import java.io.ObjectStreamException; import java.util.Collections; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.Jenkins; import org.jenkinsci.plugins.structs.SymbolLookup; import org.jenkinsci.plugins.structs.describable.DescribableModel; @@ -82,7 +82,7 @@ protected Object readResolve() throws ObjectStreamException { return super.readResolve(); } - static @CheckForNull String effectiveDisplayName(@Nonnull org.jenkinsci.plugins.workflow.graph.StepNode node) { + static @CheckForNull String effectiveDisplayName(@NonNull org.jenkinsci.plugins.workflow.graph.StepNode node) { StepDescriptor d = node.getDescriptor(); if (d == null) { return null; @@ -103,7 +103,7 @@ protected String getTypeDisplayName() { return n != null ? n : descriptorId; } - static @CheckForNull String effectiveFunctionName(@Nonnull org.jenkinsci.plugins.workflow.graph.StepNode node) { + static @CheckForNull String effectiveFunctionName(@NonNull org.jenkinsci.plugins.workflow.graph.StepNode node) { StepDescriptor d = node.getDescriptor(); if (d == null) { return null; @@ -127,7 +127,7 @@ protected String getTypeFunctionName() { /** * @return for example {@code JUnitResultArchiver} given {@code junit '…'} */ - private static @CheckForNull Class getDelegateType(@Nonnull FlowNode node, @Nonnull StepDescriptor d) { + private static @CheckForNull Class getDelegateType(@NonNull FlowNode node, @NonNull StepDescriptor d) { if (d.isMetaStep()) { DescribableParameter p = DescribableModel.of(d.clazz).getFirstRequiredParameter(); if (p != null) { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCache.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCache.java index e6fe8bc6f..a1d761fab 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCache.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCache.java @@ -34,7 +34,7 @@ import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -import javax.annotation.CheckForNull; +import edu.umd.cs.findbugs.annotations.CheckForNull; import java.util.concurrent.ConcurrentHashMap; /** diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/OriginalLoadedScripts.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/OriginalLoadedScripts.java index 11834a6ca..299eccb57 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/OriginalLoadedScripts.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/OriginalLoadedScripts.java @@ -27,7 +27,7 @@ import hudson.ExtensionPoint; import java.util.Collections; import java.util.Map; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution; /** @@ -40,7 +40,7 @@ public abstract class OriginalLoadedScripts implements ExtensionPoint { * @param execution a build * @return a map from Groovy class names to their original texts, as in {@link ReplayAction#replace} */ - public @Nonnull Map loadScripts(@Nonnull CpsFlowExecution execution) { + public @NonNull Map loadScripts(@NonNull CpsFlowExecution execution) { return Collections.emptyMap(); } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java index 0106e85fe..6691f8770 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java @@ -55,8 +55,8 @@ import java.util.TreeMap; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import javax.servlet.ServletException; import hudson.util.HttpResponses; @@ -242,7 +242,7 @@ public void doRebuild(StaplerRequest req, StaplerResponse rsp) throws ServletExc * @param replacementLoadedScripts auxiliary scripts, keyed by class name; replacement for {@link #getOriginalLoadedScripts} * @return a way to wait for the replayed build to complete */ - public @CheckForNull QueueTaskFuture/**/ run(@Nonnull String replacementMainScript, @Nonnull Map replacementLoadedScripts) { + public @CheckForNull QueueTaskFuture/**/ run(@NonNull String replacementMainScript, @NonNull Map replacementLoadedScripts) { Queue.Item item = run2(replacementMainScript, replacementLoadedScripts); return item == null ? null : item.getFuture(); } @@ -254,7 +254,7 @@ public void doRebuild(StaplerRequest req, StaplerResponse rsp) throws ServletExc * @param replacementLoadedScripts auxiliary scripts, keyed by class name; replacement for {@link #getOriginalLoadedScripts} * @return build queue item */ - public @CheckForNull Queue.Item run2(@Nonnull String replacementMainScript, @Nonnull Map replacementLoadedScripts) { + public @CheckForNull Queue.Item run2(@NonNull String replacementMainScript, @NonNull Map replacementLoadedScripts) { List actions = new ArrayList<>(); CpsFlowExecution execution = getExecutionBlocking(); if (execution == null) { @@ -273,7 +273,7 @@ public void doRebuild(StaplerRequest req, StaplerResponse rsp) throws ServletExc * @param execution the associated execution * @return Groovy class names expected to be produced, like {@code Script1} */ - public static @Nonnull Set replacementsIn(@Nonnull CpsFlowExecution execution) throws IOException { + public static @NonNull Set replacementsIn(@NonNull CpsFlowExecution execution) throws IOException { Queue.Executable executable = execution.getOwner().getExecutable(); if (executable instanceof Run) { ReplayFlowFactoryAction action = ((Run) executable).getAction(ReplayFlowFactoryAction.class); @@ -295,7 +295,7 @@ public void doRebuild(StaplerRequest req, StaplerResponse rsp) throws ServletExc * @param clazz an entry possibly in {@link #replacementsIn} * @return the replacement text, or null if no replacement was available for some reason */ - public static @CheckForNull String replace(@Nonnull CpsFlowExecution execution, @Nonnull String clazz) throws IOException { + public static @CheckForNull String replace(@NonNull CpsFlowExecution execution, @NonNull String clazz) throws IOException { Queue.Executable executable = execution.getOwner().getExecutable(); if (executable instanceof Run) { ReplayFlowFactoryAction action = ((Run) executable).getAction(ReplayFlowFactoryAction.class); diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause.java index 199c4b2f7..da315d094 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause.java @@ -28,8 +28,8 @@ import hudson.model.Cause; import hudson.model.Run; import hudson.model.TaskListener; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; /** * Marker that a run is a replay of an earlier one. @@ -39,7 +39,7 @@ public class ReplayCause extends Cause { private final int originalNumber; private transient Run run; - ReplayCause(@Nonnull Run original) { + ReplayCause(@NonNull Run original) { this.originalNumber = original.getNumber(); } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java index 1ec95d428..1a4c497b8 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java @@ -34,8 +34,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.model.Run; import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution; @@ -55,7 +55,7 @@ class ReplayFlowFactoryAction extends InvisibleAction implements CpsFlowFactoryA private final Map replacementLoadedScripts; private transient final boolean sandbox; - ReplayFlowFactoryAction(@Nonnull String replacementMainScript, @Nonnull Map replacementLoadedScripts, boolean sandbox) { + ReplayFlowFactoryAction(@NonNull String replacementMainScript, @NonNull Map replacementLoadedScripts, boolean sandbox) { this.replacementMainScript = replacementMainScript; this.replacementLoadedScripts = new HashMap<>(replacementLoadedScripts); this.sandbox = sandbox; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java index fd12daefa..d0a675fdf 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java @@ -13,7 +13,7 @@ import org.jenkinsci.plugins.workflow.steps.StepContext; import org.jenkinsci.plugins.workflow.steps.StepExecution; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -91,7 +91,7 @@ public String getDisplayName() { return "Branch: " + branchName; } - @Nonnull + @NonNull @Override public String getThreadName() { return branchName; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java index c2261f68a..fc93e2e2f 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java @@ -38,7 +38,7 @@ import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -67,7 +67,7 @@ public String getUrlName() { return null; } - public void record(@Nonnull String stepName, @Nonnull List interpolatedVariables) { + public void record(@NonNull String stepName, @NonNull List interpolatedVariables) { interpolatedWarnings.add(new InterpolatedWarnings(stepName, interpolatedVariables)); } @@ -103,7 +103,7 @@ public static class InterpolatedWarnings { final String stepName; final List interpolatedVariables; - InterpolatedWarnings(@Nonnull String stepName, @Nonnull List interpolatedVariables) { + InterpolatedWarnings(@NonNull String stepName, @NonNull List interpolatedVariables) { this.stepName = stepName; this.interpolatedVariables = interpolatedVariables; } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java b/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java index 09a916baf..a053652d3 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java @@ -34,8 +34,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; import org.jenkinsci.plugins.workflow.graph.FlowNode; import org.jenkinsci.plugins.workflow.job.WorkflowJob; @@ -169,7 +169,7 @@ private static class ExpanderImpl extends EnvironmentExpander { @Override public void buildEnvironmentFor(@CheckForNull StepContext stepContext, - @Nonnull EnvVars envs, + @NonNull EnvVars envs, @CheckForNull TaskListener listener) throws IOException, InterruptedException { FlowNode node = stepContext.get(FlowNode.class); diff --git a/src/test/java/org/jenkinsci/plugins/workflow/StepListenerTest.java b/src/test/java/org/jenkinsci/plugins/workflow/StepListenerTest.java index 82db55820..823509782 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/StepListenerTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/StepListenerTest.java @@ -38,7 +38,7 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; public class StepListenerTest { @ClassRule @@ -62,7 +62,7 @@ public void listener() throws Exception { @TestExtension public static class TestStepListener implements StepListener { @Override - public void notifyOfNewStep(@Nonnull Step s, @Nonnull StepContext context) { + public void notifyOfNewStep(@NonNull Step s, @NonNull StepContext context) { try { TaskListener listener = context.get(TaskListener.class); if (listener == null) { diff --git a/src/test/java/org/jenkinsci/plugins/workflow/TestDurabilityHintProvider.java b/src/test/java/org/jenkinsci/plugins/workflow/TestDurabilityHintProvider.java index 6cad4c94c..317691a43 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/TestDurabilityHintProvider.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/TestDurabilityHintProvider.java @@ -5,8 +5,8 @@ import org.jenkinsci.plugins.workflow.flow.DurabilityHintProvider; import org.jenkinsci.plugins.workflow.flow.FlowDurabilityHint; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.HashMap; import java.util.Map; @@ -22,19 +22,19 @@ public int ordinal() { return -1; } - public void registerHint(@Nonnull Item x, @Nonnull FlowDurabilityHint myHint) { + public void registerHint(@NonNull Item x, @NonNull FlowDurabilityHint myHint) { registerHint(x.getFullName(), myHint); } - public void registerHint(@Nonnull String itemfullName, @Nonnull FlowDurabilityHint myHint) { + public void registerHint(@NonNull String itemfullName, @NonNull FlowDurabilityHint myHint) { hintMapping.put(itemfullName, myHint); } - public boolean removeHint(@Nonnull Item x) { + public boolean removeHint(@NonNull Item x) { return removeHint(x.getFullName()); } - public boolean removeHint(@Nonnull String itemFullName) { + public boolean removeHint(@NonNull String itemFullName) { return hintMapping.remove(itemFullName) != null; } @@ -44,7 +44,7 @@ public Map getMappings() { @CheckForNull @Override - public FlowDurabilityHint suggestFor(@Nonnull Item x) { + public FlowDurabilityHint suggestFor(@NonNull Item x) { return hintMapping.get(x.getFullName()); } } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java b/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java index 4b88df64b..1f0d35f0a 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java @@ -44,8 +44,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import jenkins.model.Jenkins; import jenkins.security.QueueItemAuthenticatorConfiguration; import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval; @@ -366,7 +366,7 @@ public static Slave createSpecialEnvSlave(JenkinsRule rule, String nodeName, @Ch } private static class SpecialEnvSlave extends Slave { private final Map env; - SpecialEnvSlave(File remoteFS, ComputerLauncher launcher, String nodeName, @Nonnull String labels, Map env) throws Descriptor.FormException, IOException { + SpecialEnvSlave(File remoteFS, ComputerLauncher launcher, String nodeName, @NonNull String labels, Map env) throws Descriptor.FormException, IOException { super(nodeName, remoteFS.getAbsolutePath(), launcher); setNumExecutors(1); setLabelString(labels); diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java index be2ca9716..34bf0b0ee 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java @@ -35,7 +35,7 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.CheckForNull; +import edu.umd.cs.findbugs.annotations.CheckForNull; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.jenkinsci.plugins.workflow.log.TaskListenerDecorator; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java index 87e63d9f7..e5fbcd6d8 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java @@ -45,7 +45,7 @@ import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.CheckForNull; +import edu.umd.cs.findbugs.annotations.CheckForNull; import jenkins.model.Jenkins; import org.hamcrest.Matchers; import org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/DescriptorMatchPredicate.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/DescriptorMatchPredicate.java index aa1682853..3d3f629e7 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/DescriptorMatchPredicate.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/DescriptorMatchPredicate.java @@ -29,8 +29,8 @@ import org.jenkinsci.plugins.workflow.graph.FlowNode; import org.jenkinsci.plugins.workflow.steps.StepDescriptor; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; /** * Search predicate for {@link FlowNode}s that have a given descriptor type @@ -38,7 +38,7 @@ public class DescriptorMatchPredicate implements Predicate { final Class myDescriptor; - public DescriptorMatchPredicate(@Nonnull Class descriptorClass) { + public DescriptorMatchPredicate(@NonNull Class descriptorClass) { this.myDescriptor = descriptorClass; } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index 0575a51c2..d80ac37c6 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -47,7 +47,7 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.RestartableJenkinsRule; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.File; import java.io.FileOutputStream; import java.lang.annotation.ElementType; @@ -790,7 +790,7 @@ public void evaluate() throws Throwable { }); } - private static void assertBuildNotHung(@Nonnull RestartableJenkinsRule story, @Nonnull WorkflowRun run, int timeOutMillis) throws Exception { + private static void assertBuildNotHung(@NonNull RestartableJenkinsRule story, @NonNull WorkflowRun run, int timeOutMillis) throws Exception { if (run.isBuilding()) { story.j.waitUntilNoActivityUpTo(timeOutMillis); } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java index 762fce486..fa8d5b857 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java @@ -22,8 +22,8 @@ import org.jenkinsci.plugins.workflow.steps.StepDescriptor; import org.jvnet.hudson.test.JenkinsRule; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.File; import java.io.IOException; import java.net.URL; @@ -59,7 +59,7 @@ public SnippetizerTester(JenkinsRule r) { * @param referer * needed because of {@link StaplerReferer} */ - public void assertGenerateSnippet(@Nonnull String json, @Nonnull String responseText, @CheckForNull String referer) throws Exception { + public void assertGenerateSnippet(@NonNull String json, @NonNull String responseText, @CheckForNull String referer) throws Exception { assertGenerateSnippet(Snippetizer.GENERATE_URL, json, responseText, referer); } @@ -75,7 +75,7 @@ public void assertGenerateSnippet(@Nonnull String json, @Nonnull String response * @param referer * needed because of {@link StaplerReferer} */ - protected void assertGenerateSnippet(@Nonnull String url, @Nonnull String json, @Nonnull String responseText, @CheckForNull String referer) throws Exception { + protected void assertGenerateSnippet(@NonNull String url, @NonNull String json, @NonNull String responseText, @CheckForNull String referer) throws Exception { JenkinsRule.WebClient wc = r.createWebClient(); WebRequest wrs = new WebRequest(new URL(r.getURL(), url), HttpMethod.POST); if (referer != null) { diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java index 0dfc1f66b..6cc38adac 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java @@ -1,6 +1,6 @@ package org.jenkinsci.plugins.workflow.cps.steps; -import javax.annotation.CheckForNull; +import edu.umd.cs.findbugs.annotations.CheckForNull; import javax.inject.Inject; import groovy.lang.GroovyShell; import hudson.FilePath; From 3b64915a660fae6df2ec7e37eb37258e198e11e0 Mon Sep 17 00:00:00 2001 From: offa Date: Tue, 11 Jan 2022 14:49:03 +0100 Subject: [PATCH 617/932] Add *.log to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 084f0345c..8471a3b45 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ node_modules .classpath .project .settings/ +*.log From 0ecd54ee98066278aa3b1ac3bf86a448271d29f4 Mon Sep 17 00:00:00 2001 From: offa Date: Tue, 11 Jan 2022 14:46:59 +0100 Subject: [PATCH 618/932] Replace star imports --- .../workflow/cps/CpsBodyExecution.java | 7 ++--- .../plugins/workflow/cps/CpsThreadGroup.java | 30 +++++++++---------- .../workflow/cps/CpsFlowDefinition2Test.java | 1 + 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java index de71aea09..316213516 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java @@ -19,6 +19,7 @@ import org.jenkinsci.plugins.workflow.cps.nodes.StepEndNode; import org.jenkinsci.plugins.workflow.cps.nodes.StepStartNode; import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn; +import org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext; import org.jenkinsci.plugins.workflow.steps.BodyExecution; import org.jenkinsci.plugins.workflow.steps.BodyExecutionCallback; import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException; @@ -41,10 +42,8 @@ import java.util.logging.Level; import java.util.logging.Logger; -import static java.util.logging.Level.*; import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; import org.jenkinsci.plugins.workflow.graph.FlowNode; import org.jenkinsci.plugins.workflow.graphanalysis.LinearBlockHoppingScanner; @@ -61,7 +60,7 @@ * @author Kohsuke Kawaguchi * @see CpsBodyInvoker#start() */ -@PersistIn(PROGRAM) +@PersistIn(PersistenceContext.PROGRAM) class CpsBodyExecution extends BodyExecution { /** * Thread that's executing the body. @@ -414,7 +413,7 @@ public Next receive(Object o) { return end; } catch (IOException e) { - LOGGER.log(WARNING, "Failed to grow the flow graph", e); + LOGGER.log(Level.WARNING, "Failed to grow the flow graph", e); throw new Error(e); } } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java index fc1f90ab3..21d8b53a0 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java @@ -46,6 +46,7 @@ import jenkins.util.Timer; import org.jenkinsci.plugins.workflow.actions.ErrorAction; import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn; +import org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext; import org.jenkinsci.plugins.workflow.graph.FlowNode; import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException; import org.jenkinsci.plugins.workflow.support.pickles.serialization.RiverWriter; @@ -74,10 +75,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import static java.util.logging.Level.*; import edu.umd.cs.findbugs.annotations.CheckForNull; -import static org.jenkinsci.plugins.workflow.cps.CpsFlowExecution.*; -import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; import org.jenkinsci.plugins.workflow.pickles.Pickle; import org.jenkinsci.plugins.workflow.pickles.PickleFactory; import org.jenkinsci.plugins.workflow.support.pickles.SingleTypedPickleFactory; @@ -91,7 +89,7 @@ * * @author Kohsuke Kawaguchi */ -@PersistIn(PROGRAM) +@PersistIn(PersistenceContext.PROGRAM) @SuppressFBWarnings("SE_BAD_FIELD") // bogus warning about closures public final class CpsThreadGroup implements Serializable { /** @@ -238,7 +236,7 @@ public Iterable getThreads() { assertVmThread(); int id = iota++; closures.put(id, body); - LOGGER.log(FINE, "exporting {0}", id); + LOGGER.log(Level.FINE, "exporting {0}", id); return new StaticBodyReference(id,body); } @@ -258,11 +256,11 @@ public void unexport(BodyReference ref) { assertVmThread(); if (ref==null) return; if (closures.remove(ref.id) != null) { - LOGGER.log(FINE, "unexporting {0}", ref.id); + LOGGER.log(Level.FINE, "unexporting {0}", ref.id); } else if (closures.isEmpty()) { - LOGGER.log(FINE, "cannot unexport {0} but there are no closures at all so perhaps we are still trying to load the program", ref.id); + LOGGER.log(Level.FINE, "cannot unexport {0} but there are no closures at all so perhaps we are still trying to load the program", ref.id); } else { - LOGGER.log(WARNING, "double unexport of {0}", ref.id); + LOGGER.log(Level.WARNING, "double unexport of {0}", ref.id); } } @@ -448,7 +446,7 @@ private boolean run() { scripts.clear(); } if (!closures.isEmpty()) { - LOGGER.log(WARNING, "Stale closures in {0}: {1}", new Object[] {execution, closures.keySet()}); + LOGGER.log(Level.WARNING, "Stale closures in {0}: {1}", new Object[] {execution, closures.keySet()}); closures.clear(); } try { @@ -518,7 +516,7 @@ void saveProgramIfPossible(boolean enteringQuietState) { try { saveProgram(); } catch (IOException x) { - LOGGER.log(WARNING, "program state save failed", x); + LOGGER.log(Level.WARNING, "program state save failed", x); } } } @@ -544,23 +542,23 @@ public void saveProgram(File f) throws IOException { assertVmThread(); - CpsFlowExecution old = PROGRAM_STATE_SERIALIZATION.get(); - PROGRAM_STATE_SERIALIZATION.set(execution); + CpsFlowExecution old = CpsFlowExecution.PROGRAM_STATE_SERIALIZATION.get(); + CpsFlowExecution.PROGRAM_STATE_SERIALIZATION.set(execution); Collection pickleFactories = PickleFactory.all(); if (pickleFactories.isEmpty()) { - LOGGER.log(WARNING, "Skipping save to {0} since Jenkins seems to be either starting up or shutting down", f); + LOGGER.log(Level.WARNING, "Skipping save to {0} since Jenkins seems to be either starting up or shutting down", f); return; } boolean serializedOK = false; - try (CpsFlowExecution.Timing t = execution.time(TimingKind.saveProgram)) { + try (CpsFlowExecution.Timing t = execution.time(CpsFlowExecution.TimingKind.saveProgram)) { try (RiverWriter w = new RiverWriter(tmpFile, execution.getOwner(), pickleFactories)) { w.writeObject(this); } serializedOK = true; Files.move(tmpFile.toPath(), f.toPath(), StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING); - LOGGER.log(FINE, "program state saved"); + LOGGER.log(Level.FINE, "program state saved"); } catch (RuntimeException e) { propagateErrorToWorkflow(e); throw new IOException("Failed to persist "+f,e); @@ -570,7 +568,7 @@ public void saveProgram(File f) throws IOException { } // JENKINS-29656: otherwise just send the I/O error to caller and move on throw new IOException("Failed to persist "+f,e); } finally { - PROGRAM_STATE_SERIALIZATION.set(old); + CpsFlowExecution.PROGRAM_STATE_SERIALIZATION.set(old); Util.deleteFile(tmpFile); } } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java index 135227607..0f4938c45 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java @@ -63,6 +63,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; From 4dc20b2e007b13de18a1d113e0f6b4271b27902d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jan 2022 16:33:44 +0000 Subject: [PATCH 619/932] Bump plugin from 4.31 to 4.33 Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.31 to 4.33. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.31...plugin-4.33) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3dead468b..3599c81c8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.31 + 4.33 org.jenkins-ci.plugins.workflow From 5246543c8d0d1f0e1c4efde046ab95f96c12fb36 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 11 Jan 2022 09:08:43 -0800 Subject: [PATCH 620/932] Bump baseline --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3599c81c8..2552ed2fa 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin - 2.222.4 + 2.249.1 8 1661.vca80dbae839b false @@ -76,8 +76,8 @@ io.jenkins.tools.bom - bom-2.222.x - 887.vae9c8ac09ff7 + bom-2.249.x + 984.vb5eaac999a7e import pom From c71b61b344b55b09f3b0736a4e6ddea56e7292ce Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 11 Jan 2022 09:08:52 -0800 Subject: [PATCH 621/932] Fix Enforcer --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 2552ed2fa..5a9f1f503 100644 --- a/pom.xml +++ b/pom.xml @@ -266,6 +266,11 @@ 1.16.2 test + + + org.apache.commons + commons-compress + org.slf4j slf4j-api From 886676efdd711e126307ec70a539f2fe613151f9 Mon Sep 17 00:00:00 2001 From: Yaroslav Afenkin Date: Wed, 9 Feb 2022 16:45:36 -0500 Subject: [PATCH 622/932] [SECURITY-2443] --- .../workflow/cps/replay/ReplayAction.java | 12 ++++++++++++ .../workflow/cps/replay/ReplayActionTest.java | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java index 6691f8770..1c7c4da9f 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java @@ -35,8 +35,10 @@ import hudson.model.Action; import hudson.model.Cause; import hudson.model.CauseAction; +import hudson.model.Failure; import hudson.model.Item; import hudson.model.ParametersAction; +import hudson.model.PasswordParameterValue; import hudson.model.Queue; import hudson.model.Run; import hudson.model.queue.QueueTaskFuture; @@ -262,12 +264,22 @@ public void doRebuild(StaplerRequest req, StaplerResponse rsp) throws ServletExc } actions.add(new ReplayFlowFactoryAction(replacementMainScript, replacementLoadedScripts, execution.isSandbox())); actions.add(new CauseAction(new Cause.UserIdCause(), new ReplayCause(run))); + + if (hasPasswordParameter(this.run)) { + throw new Failure("Replay is not allowed when password parameters are used."); + } + for (Class c : COPIED_ACTIONS) { actions.addAll(run.getActions(c)); } return ParameterizedJobMixIn.scheduleBuild2(run.getParent(), 0, actions.toArray(new Action[actions.size()])); } + private boolean hasPasswordParameter(Run run) { + ParametersAction pa = run.getAction(ParametersAction.class); + return pa != null && pa.getParameters().stream().anyMatch(PasswordParameterValue.class::isInstance); + } + /** * Finds a set of Groovy class names which are eligible for replacement. * @param execution the associated execution diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java index 8e3eef2c9..7b83aed56 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java @@ -33,9 +33,12 @@ import hudson.cli.CLICommandInvoker; import hudson.init.InitMilestone; import hudson.init.Initializer; +import hudson.model.Failure; import hudson.model.Item; import hudson.model.ParametersAction; import hudson.model.ParametersDefinitionProperty; +import hudson.model.PasswordParameterDefinition; +import hudson.model.PasswordParameterValue; import hudson.model.Run; import hudson.model.StringParameterDefinition; import hudson.model.StringParameterValue; @@ -135,6 +138,21 @@ public class ReplayActionTest { }); } + @Issue("SECURITY-2443") + @Test public void withPasswordParameter() { + story.then(r -> { + WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "p"); + p.addProperty(new ParametersDefinitionProperty(new PasswordParameterDefinition("passwordParam", "top secret", ""))); + p.setDefinition(new CpsFlowDefinition("echo(/passwordParam: ${passwordParam}/)", true)); + WorkflowRun run1 = story.j.assertBuildStatusSuccess(p.scheduleBuild2(0, + new ParametersAction(new PasswordParameterValue("passwordParam", "confidential")))); + + // When we replay a build with password parameter it should fail with access denied exception. + assertThrows(Failure.class, + () -> run1.getAction(ReplayAction.class).run("echo(/Replaying passwordParam: ${passwordParam}/)", Collections.emptyMap()).get()); + }); + } + @Issue("JENKINS-50784") @Test public void lazyLoadExecutionStillReplayable() throws Exception { story.then( r-> { From f7ae7b75a457976853539bff1db52373b85fdb85 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 9 Feb 2022 16:48:07 -0500 Subject: [PATCH 623/932] [SECURITY-2463][SECURITY-2595] --- pom.xml | 17 +++++ .../workflow/cps/CpsScmFlowDefinition.java | 15 +++-- .../jenkinsci/plugins/workflow/cps/DSL.java | 3 +- .../cps/CpsScmFlowDefinitionTest.java | 62 +++++++++++++++++++ 4 files changed, 91 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 5a9f1f503..c4db485b3 100644 --- a/pom.xml +++ b/pom.xml @@ -260,6 +260,17 @@ pipeline-stage-step test + + org.jenkins-ci.plugins + subversion + test + + + org.jenkins-ci.plugins + subversion + tests + test + org.testcontainers testcontainers @@ -277,6 +288,12 @@ + + org.tmatesoft.svnkit + svnkit-cli + 1.10.1 + test + diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java index 5554fc58f..490ef12f5 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java @@ -40,6 +40,7 @@ import hudson.scm.SCM; import hudson.scm.SCMDescriptor; import hudson.slaves.WorkspaceList; +import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -48,6 +49,7 @@ import java.util.List; import jenkins.model.Jenkins; import jenkins.scm.api.SCMFileSystem; +import jenkins.security.HMACConfidentialKey; import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn; import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.JOB; @@ -68,6 +70,8 @@ @PersistIn(JOB) public class CpsScmFlowDefinition extends FlowDefinition { + private static final HMACConfidentialKey CHECKOUT_DIR_KEY = new HMACConfidentialKey(CpsScmFlowDefinition.class, "filePathWithSuffix", 32); + private final SCM scm; private final String scriptPath; private boolean lightweight; @@ -134,7 +138,7 @@ public boolean isLightweight() { if (baseWorkspace == null) { throw new IOException(node.getDisplayName() + " may be offline"); } - dir = getFilePathWithSuffix(baseWorkspace); + dir = getFilePathWithSuffix(baseWorkspace, scm); } else { // should not happen, but just in case: dir = new FilePath(owner.getRootDir()); } @@ -149,6 +153,7 @@ public boolean isLightweight() { delegate.setChangelog(true); FilePath acquiredDir; try (WorkspaceList.Lease lease = computer.getWorkspaceList().acquire(dir)) { + dir.withSuffix("-scm-key.txt").write(scm.getKey(), "UTF-8"); for (int retryCount = Jenkins.get().getScmCheckoutRetryCount(); retryCount >= 0; retryCount--) { try { delegate.checkout(build, dir, listener, node.createLauncher(listener)); @@ -174,8 +179,8 @@ public boolean isLightweight() { } FilePath scriptFile = dir.child(expandedScriptPath); - if (!scriptFile.absolutize().getRemote().replace('\\', '/').startsWith(dir.absolutize().getRemote().replace('\\', '/') + '/')) { // TODO JENKINS-26838 - throw new IOException(scriptFile + " is not inside " + dir); + if (!new File(scriptFile.getRemote()).getCanonicalFile().toPath().startsWith(dir.absolutize().getRemote())) { // TODO JENKINS-26838 + throw new IOException(scriptFile + " references a file that is not inside " + dir); } if (!scriptFile.exists()) { throw new AbortException(scriptFile + " not found"); @@ -190,8 +195,8 @@ public boolean isLightweight() { return exec; } - private FilePath getFilePathWithSuffix(FilePath baseWorkspace) { - return baseWorkspace.withSuffix(getFilePathSuffix() + "script"); + private FilePath getFilePathWithSuffix(FilePath baseWorkspace, SCM scm) { + return baseWorkspace.withSuffix(getFilePathSuffix() + "script").child(CHECKOUT_DIR_KEY.mac(scm.getKey())); } private String getFilePathSuffix() { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java index b337f4466..42bcdb9a9 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java @@ -375,8 +375,9 @@ private void logInterpolationWarnings(String stepName, @CheckForNull ArgumentsAc return; } + final EnvVars nonNullEnvVars = envVars; // Workaround for NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE false positive in lambdas: https://github.com/spotbugs/spotbugs/issues/552. List scanResults = sensitiveVariables.stream() - .filter(e -> !envVars.get(e, "").isEmpty() && interpolatedStrings.stream().anyMatch(g -> g.contains(envVars.get(e)))) + .filter(e -> !nonNullEnvVars.get(e, "").isEmpty() && interpolatedStrings.stream().anyMatch(g -> g.contains(nonNullEnvVars.get(e)))) .collect(Collectors.toList()); if (scanResults != null && !scanResults.isEmpty()) { diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java index ce5b8e6c6..47308c3e1 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java @@ -24,6 +24,7 @@ package org.jenkinsci.plugins.workflow.cps; +import hudson.Functions; import hudson.model.ParametersAction; import hudson.model.ParametersDefinitionProperty; import hudson.model.Result; @@ -35,13 +36,21 @@ import hudson.plugins.git.UserRemoteConfig; import hudson.plugins.git.extensions.GitSCMExtension; import hudson.scm.ChangeLogSet; +import hudson.scm.SubversionSCM; import hudson.triggers.SCMTrigger; +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Collections; import java.util.Iterator; import java.util.List; import jenkins.model.Jenkins; import jenkins.plugins.git.GitSampleRepoRule; import jenkins.plugins.git.GitStep; +import jenkins.scm.impl.subversion.SubversionSampleRepoRule; +import org.apache.commons.io.FileUtils; import org.jenkinsci.plugins.workflow.TestDurabilityHintProvider; import org.jenkinsci.plugins.workflow.actions.WorkspaceAction; import org.jenkinsci.plugins.workflow.flow.FlowDurabilityHint; @@ -59,11 +68,18 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.SingleFileSCM; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.io.FileMatchers.anExistingFile; +import static org.junit.Assume.assumeFalse; + public class CpsScmFlowDefinitionTest { @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher(); @Rule public JenkinsRule r = new JenkinsRule(); @Rule public GitSampleRepoRule sampleRepo = new GitSampleRepoRule(); + @Rule public SubversionSampleRepoRule sampleRepoSvn = new SubversionSampleRepoRule(); @Rule public GitSampleRepoRule invalidRepo = new GitSampleRepoRule(); @Test public void configRoundtrip() throws Exception { @@ -241,4 +257,50 @@ public class CpsScmFlowDefinitionTest { r.assertLogContains("version one", r.assertBuildStatusSuccess(p.scheduleBuild2(0))); r.assertLogContains("version two", r.assertBuildStatusSuccess(p.scheduleBuild2(0, new ParametersAction(new StringParameterValue("SCRIPT_PATH", "otherFlow.groovy"))))); } + + @Issue("SECURITY-2463") + @Test public void checkoutDirectoriesAreNotReusedByDifferentScms() throws Exception { + assumeFalse(Functions.isWindows()); // Checkout hook is not cross-platform. + sampleRepo.init(); + sampleRepo.write("Jenkinsfile", "echo('git library')"); + sampleRepo.git("add", "Jenkinsfile"); + sampleRepo.git("commit", "--message=init"); + sampleRepoSvn.init(); + sampleRepoSvn.write("Jenkinsfile", "echo('subversion library')"); + // Copy .git folder from the Git repo into the SVN repo as data. + File gitDirInSvnRepo = new File(sampleRepoSvn.wc(), ".git"); + FileUtils.copyDirectory(new File(sampleRepo.getRoot(), ".git"), gitDirInSvnRepo); + String jenkinsRootDir = r.jenkins.getRootDir().toString(); + // Add a Git post-checkout hook to the .git folder in the SVN repo. + Files.write(gitDirInSvnRepo.toPath().resolve("hooks/post-checkout"), ("#!/bin/sh\ntouch '" + jenkinsRootDir + "/hook-executed'\n").getBytes(StandardCharsets.UTF_8)); + sampleRepoSvn.svnkit("add", sampleRepoSvn.wc() + "/Jenkinsfile"); + sampleRepoSvn.svnkit("add", sampleRepoSvn.wc() + "/.git"); + sampleRepoSvn.svnkit("propset", "svn:executable", "ON", sampleRepoSvn.wc() + "/.git/hooks/post-checkout"); + sampleRepoSvn.svnkit("commit", "--message=init", sampleRepoSvn.wc()); + // Run a build using the SVN repo. + WorkflowJob p = r.createProject(WorkflowJob.class); + p.setDefinition(new CpsScmFlowDefinition(new SubversionSCM(sampleRepoSvn.trunkUrl()), "Jenkinsfile")); + r.buildAndAssertSuccess(p); + // Run a build using the Git repo. It should be checked out to a different directory than the SVN repo. + p.setDefinition(new CpsScmFlowDefinition(new GitStep(sampleRepo.toString()).createSCM(), "Jenkinsfile")); + WorkflowRun b2 = r.buildAndAssertSuccess(p); + assertThat(new File(r.jenkins.getRootDir(), "hook-executed"), not(anExistingFile())); + } + + @Issue("SECURITY-2595") + @Test + public void scriptPathSymlinksCannotEscapeCheckoutDirectory() throws Exception { + sampleRepo.init(); + Path secrets = Paths.get(sampleRepo.getRoot().getPath(), "Jenkinsfile"); + Files.createSymbolicLink(secrets, Paths.get(r.jenkins.getRootDir() + "/secrets/master.key")); + sampleRepo.git("add", "."); + sampleRepo.git("commit", "-m", "init"); + + WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p"); + GitStep step = new GitStep(sampleRepo.toString()); + p.setDefinition(new CpsScmFlowDefinition(step.createSCM(), "Jenkinsfile")); + WorkflowRun b = r.buildAndAssertStatus(Result.FAILURE, p); + assertThat(b.getExecution(), nullValue()); + r.assertLogContains("Jenkinsfile references a file that is not inside " + r.jenkins.getWorkspaceFor(p), b); + } } From 26522d9fa6ff270eedef6d50887ddcba4d79c87a Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 16 Feb 2022 12:37:23 -0500 Subject: [PATCH 624/932] Update tests for SECURITY-2463 and SECURITY-2595 for compatibility with recent versions of Git plugin and Windows --- .../plugins/workflow/cps/CpsScmFlowDefinitionTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java index 47308c3e1..0b3271c1d 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java @@ -272,7 +272,10 @@ public class CpsScmFlowDefinitionTest { FileUtils.copyDirectory(new File(sampleRepo.getRoot(), ".git"), gitDirInSvnRepo); String jenkinsRootDir = r.jenkins.getRootDir().toString(); // Add a Git post-checkout hook to the .git folder in the SVN repo. - Files.write(gitDirInSvnRepo.toPath().resolve("hooks/post-checkout"), ("#!/bin/sh\ntouch '" + jenkinsRootDir + "/hook-executed'\n").getBytes(StandardCharsets.UTF_8)); + Path postCheckoutHook = gitDirInSvnRepo.toPath().resolve("hooks/post-checkout"); + // Always create hooks directory for compatibility with https://github.com/jenkinsci/git-plugin/pull/1207. + Files.createDirectories(postCheckoutHook.getParent()); + Files.write(postCheckoutHook, ("#!/bin/sh\ntouch '" + jenkinsRootDir + "/hook-executed'\n").getBytes(StandardCharsets.UTF_8)); sampleRepoSvn.svnkit("add", sampleRepoSvn.wc() + "/Jenkinsfile"); sampleRepoSvn.svnkit("add", sampleRepoSvn.wc() + "/.git"); sampleRepoSvn.svnkit("propset", "svn:executable", "ON", sampleRepoSvn.wc() + "/.git/hooks/post-checkout"); @@ -290,6 +293,7 @@ public class CpsScmFlowDefinitionTest { @Issue("SECURITY-2595") @Test public void scriptPathSymlinksCannotEscapeCheckoutDirectory() throws Exception { + assumeFalse(Functions.isWindows()); // On Windows, the symlink is treated as a regular file, so there is no vulnerability, but the error message is different. sampleRepo.init(); Path secrets = Paths.get(sampleRepo.getRoot().getPath(), "Jenkinsfile"); Files.createSymbolicLink(secrets, Paths.get(r.jenkins.getRootDir() + "/secrets/master.key")); From f52643be3f9898bbb58c13593aff02379fc7db5b Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 16 Feb 2022 15:42:02 -0500 Subject: [PATCH 625/932] Canonicalize parent path in CpsScmFlowDefinition.create in case JENKINS_HOME is a symlink --- .../jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java index 490ef12f5..7689348be 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java @@ -179,7 +179,7 @@ public boolean isLightweight() { } FilePath scriptFile = dir.child(expandedScriptPath); - if (!new File(scriptFile.getRemote()).getCanonicalFile().toPath().startsWith(dir.absolutize().getRemote())) { // TODO JENKINS-26838 + if (!new File(scriptFile.getRemote()).getCanonicalFile().toPath().startsWith(new File(dir.getRemote()).getCanonicalPath())) { // TODO JENKINS-26838 throw new IOException(scriptFile + " references a file that is not inside " + dir); } if (!scriptFile.exists()) { From bc0412dc4e6de098921da9326165d3c4f9780ce2 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 3 Mar 2022 00:29:41 -0500 Subject: [PATCH 626/932] Record which `program.dat` is being saved in a thread dump (#510) --- .../org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java index fc1f90ab3..0022dead4 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java @@ -80,6 +80,7 @@ import static org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext.*; import org.jenkinsci.plugins.workflow.pickles.Pickle; import org.jenkinsci.plugins.workflow.pickles.PickleFactory; +import org.jenkinsci.plugins.workflow.support.concurrent.WithThreadName; import org.jenkinsci.plugins.workflow.support.pickles.SingleTypedPickleFactory; import org.jenkinsci.plugins.workflow.support.storage.FlowNodeStorage; @@ -554,7 +555,8 @@ public void saveProgram(File f) throws IOException { } boolean serializedOK = false; - try (CpsFlowExecution.Timing t = execution.time(TimingKind.saveProgram)) { + try (CpsFlowExecution.Timing t = execution.time(TimingKind.saveProgram); + WithThreadName diag = new WithThreadName("saving " + f)) { try (RiverWriter w = new RiverWriter(tmpFile, execution.getOwner(), pickleFactories)) { w.writeObject(this); } From 6098b41bfa7ca77198e71d6412a7a9517500aa19 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 16 Mar 2022 17:38:12 -0700 Subject: [PATCH 627/932] Update plugin parent POM and plugin BOM --- pom.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index c4db485b3..0984fdceb 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.33 + 4.37 org.jenkins-ci.plugins.workflow @@ -64,9 +64,9 @@ 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin - 2.249.1 + 2.332.1 8 - 1661.vca80dbae839b + 2.15.1 false 1.32 12.19.0 @@ -76,8 +76,8 @@ io.jenkins.tools.bom - bom-2.249.x - 984.vb5eaac999a7e + bom-2.332.x + 1198.v387c834fca_1a_ import pom @@ -263,11 +263,13 @@ org.jenkins-ci.plugins subversion + ${subversion-plugin.version} test org.jenkins-ci.plugins subversion + ${subversion-plugin.version} tests test From b669ad2c9dadabc98270739406697f4aaedc90b7 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 16 Mar 2022 18:34:21 -0700 Subject: [PATCH 628/932] CompositeIOException nightmare on Windows --- .../jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index d80ac37c6..bfe0c47f3 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -1,7 +1,10 @@ package org.jenkinsci.plugins.workflow.cps; +import static org.junit.Assume.assumeFalse; + import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import hudson.Functions; import hudson.model.Computer; import hudson.model.Executor; import hudson.model.Item; @@ -702,6 +705,7 @@ public void evaluate() throws Throwable { */ @Test public void testFullyDurableSurvivesDirtyRestart() throws Exception { + assumeFalse("TODO file locking issues on Windows", Functions.isWindows()); final String jobName = "survivesEverything"; final String[] logStart = new String[1]; @@ -763,6 +767,7 @@ public void evaluate() throws Throwable { @Test @Issue("JENKINS-49961") public void testResumeBlockedAddedAfterRunStart() throws Exception { + assumeFalse("TODO file locking issues on Windows", Functions.isWindows()); final String jobName = "survivesEverything"; final List nodesOut = new ArrayList<>(); From 70ac250ced98e7250cb1af3aa283ce0130efe27c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 00:58:09 +0000 Subject: [PATCH 629/932] Bump actions/checkout from 2.4.0 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 025fac176..d1ceb2a66 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -43,7 +43,7 @@ jobs: if: needs.validate.outputs.should_release == 'true' steps: - name: Check out - uses: actions/checkout@v2.4.0 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up JDK 8 From 0a9f78299c3bed29bd50efa1302f6c231bdb75c8 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 18 Mar 2022 10:22:39 -0400 Subject: [PATCH 630/932] Update some JS deps --- .github/dependabot.yml | 1 + package.json | 4 +- yarn.lock | 3260 ++++++++++++++++++++-------------------- 3 files changed, 1600 insertions(+), 1665 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5ee4e4dd9..769057c7d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,7 @@ version: 2 updates: # Intentionally not adding automatic NPM updates because I do # not trust the plugin's tests to catch issues caused by updates. + # TODO or enable, but avoid merging without first doing a local interactive test? - package-ecosystem: "maven" directory: "/" schedule: diff --git a/package.json b/package.json index 7678d623e..eb60f86bc 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "less": "^3.12.2", "less-loader": "^7.0.2", "mini-css-extract-plugin": "^1.2.1", - "postcss": "^8.1.4", + "postcss": "^8.2.13", "postcss-less": "^4.0.0", "postcss-loader": "^4.0.4", "style-loader": "^2.0.0", @@ -42,7 +42,7 @@ "dependencies": { "jenkins-js-modules": "1.3.0", "jquery": "^3.5.1", - "jquery-ui": "^1.12.1", + "jquery-ui": "^1.13.0", "raf": "^3.4.1" }, "browserslist": [ diff --git a/yarn.lock b/yarn.lock index 3386ace6e..8a3932dc0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,356 +2,412 @@ # yarn lockfile v1 +"@ampproject/remapping@^2.1.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34" + dependencies: + "@jridgewell/trace-mapping" "^0.3.0" + "@babel/cli@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.12.1.tgz#e08a0b1cb6fcd4b9eb6a606ba5602c5c0fe24a0c" + version "7.17.6" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.17.6.tgz#169e5935f1795f0b62ded5a2accafeedfe5c5363" dependencies: + "@jridgewell/trace-mapping" "^0.3.4" commander "^4.0.1" convert-source-map "^1.1.0" fs-readdir-recursive "^1.1.0" glob "^7.0.0" - lodash "^4.17.19" make-dir "^2.1.0" slash "^2.0.0" source-map "^0.5.0" optionalDependencies: - "@nicolo-ribaudo/chokidar-2" "^2.1.8" + "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3" chokidar "^3.4.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" dependencies: "@babel/highlight" "^7.10.4" -"@babel/compat-data@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.1.tgz#d7386a689aa0ddf06255005b4b991988021101a0" +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + dependencies: + "@babel/highlight" "^7.16.7" + +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2" "@babel/core@^7.12.3": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8" - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.1" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helpers" "^7.12.1" - "@babel/parser" "^7.12.3" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.7.tgz#f7c28228c83cdf2dbd1b9baa06eaf9df07f0c2f9" + dependencies: + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.17.7" + "@babel/helper-compilation-targets" "^7.17.7" + "@babel/helper-module-transforms" "^7.17.7" + "@babel/helpers" "^7.17.7" + "@babel/parser" "^7.17.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.3" + "@babel/types" "^7.17.0" convert-source-map "^1.7.0" debug "^4.1.0" - gensync "^1.0.0-beta.1" + gensync "^1.0.0-beta.2" json5 "^2.1.2" - lodash "^4.17.19" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" + semver "^6.3.0" -"@babel/generator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468" +"@babel/generator@^7.17.3", "@babel/generator@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.17.0" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3" +"@babel/helper-annotate-as-pure@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.16.7" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3" +"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" dependencies: - "@babel/helper-explode-assignable-expression" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-explode-assignable-expression" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-compilation-targets@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz#310e352888fbdbdd8577be8dfdd2afb9e7adcf50" +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" dependencies: - "@babel/compat-data" "^7.12.1" - "@babel/helper-validator-option" "^7.12.1" - browserslist "^4.12.0" - semver "^5.5.0" + "@babel/compat-data" "^7.17.7" + "@babel/helper-validator-option" "^7.16.7" + browserslist "^4.17.5" + semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e" +"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6": + version "7.17.6" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9" dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-member-expression-to-functions" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" -"@babel/helper-create-regexp-features-plugin@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8" +"@babel/helper-create-regexp-features-plugin@^7.16.7": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-regex" "^7.10.4" - regexpu-core "^4.7.1" + "@babel/helper-annotate-as-pure" "^7.16.7" + regexpu-core "^5.0.1" -"@babel/helper-define-map@^7.10.4": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30" +"@babel/helper-define-polyfill-provider@^0.3.1": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665" dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/types" "^7.10.5" - lodash "^4.17.19" + "@babel/helper-compilation-targets" "^7.13.0" + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/traverse" "^7.13.0" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + semver "^6.1.2" -"@babel/helper-explode-assignable-expression@^7.10.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633" +"@babel/helper-environment-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.16.7" -"@babel/helper-function-name@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" +"@babel/helper-explode-assignable-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" dependencies: - "@babel/helper-get-function-arity" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/types" "^7.16.7" -"@babel/helper-get-function-arity@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" +"@babel/helper-function-name@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" dependencies: - "@babel/types" "^7.10.4" + "@babel/helper-get-function-arity" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-hoist-variables@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e" +"@babel/helper-get-function-arity@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.16.7" -"@babel/helper-member-expression-to-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c" +"@babel/helper-hoist-variables@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.16.7" -"@babel/helper-module-imports@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz#1644c01591a15a2f084dd6d092d9430eb1d1216c" +"@babel/helper-member-expression-to-functions@^7.16.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4" dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.17.0" -"@babel/helper-module-transforms@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" +"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" dependencies: - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-simple-access" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/helper-validator-identifier" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" - lodash "^4.17.19" + "@babel/types" "^7.16.7" -"@babel/helper-optimise-call-expression@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673" +"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd" dependencies: - "@babel/types" "^7.10.4" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-simple-access" "^7.17.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.3" + "@babel/types" "^7.17.0" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - -"@babel/helper-regex@^7.10.4": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0" +"@babel/helper-optimise-call-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" dependencies: - lodash "^4.17.19" + "@babel/types" "^7.16.7" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" -"@babel/helper-remap-async-to-generator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd" +"@babel/helper-remap-async-to-generator@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-wrap-function" "^7.10.4" - "@babel/types" "^7.12.1" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-wrap-function" "^7.16.8" + "@babel/types" "^7.16.8" -"@babel/helper-replace-supers@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz#f15c9cc897439281891e11d5ce12562ac0cf3fa9" +"@babel/helper-replace-supers@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-member-expression-to-functions" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-simple-access@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" +"@babel/helper-simple-access@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.17.0" -"@babel/helper-skip-transparent-expression-wrappers@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf" +"@babel/helper-skip-transparent-expression-wrappers@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.16.0" -"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" +"@babel/helper-split-export-declaration@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" dependencies: - "@babel/types" "^7.11.0" + "@babel/types" "^7.16.7" -"@babel/helper-validator-identifier@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" +"@babel/helper-validator-identifier@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" -"@babel/helper-validator-option@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9" +"@babel/helper-validator-option@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" -"@babel/helper-wrap-function@^7.10.4": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9" +"@babel/helper-wrap-function@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200" dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-function-name" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.8" + "@babel/types" "^7.16.8" -"@babel/helpers@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.1.tgz#8a8261c1d438ec18cb890434df4ec768734c1e79" +"@babel/helpers@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.7.tgz#6fc0a24280fd00026e85424bbfed4650e76d7127" dependencies: - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.3" + "@babel/types" "^7.17.0" -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" +"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7": + version "7.16.10" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-validator-identifier" "^7.16.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.10.4", "@babel/parser@^7.12.1", "@babel/parser@^7.12.3": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.3.tgz#a305415ebe7a6c7023b40b5122a0662d928334cd" +"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.7.tgz#fc19b645a5456c8d6fdb6cecd3c66c0173902800" -"@babel/plugin-proposal-async-generator-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e" +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-remap-async-to-generator" "^7.12.1" - "@babel/plugin-syntax-async-generators" "^7.8.0" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-class-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de" +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/plugin-proposal-optional-chaining" "^7.16.7" -"@babel/plugin-proposal-dynamic-import@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc" +"@babel/plugin-proposal-async-generator-functions@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-dynamic-import" "^7.8.0" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-remap-async-to-generator" "^7.16.8" + "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-export-namespace-from@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4" +"@babel/plugin-proposal-class-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + +"@babel/plugin-proposal-class-static-block@^7.16.7": + version "7.17.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c" + dependencies: + "@babel/helper-create-class-features-plugin" "^7.17.6" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + +"@babel/plugin-proposal-dynamic-import@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" + dependencies: + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + +"@babel/plugin-proposal-export-namespace-from@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" + dependencies: + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c" +"@babel/plugin-proposal-json-strings@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751" +"@babel/plugin-proposal-logical-assignment-operators@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c" +"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz#0e2c6774c4ce48be412119b4d693ac777f7685a6" +"@babel/plugin-proposal-numeric-separator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069" +"@babel/plugin-proposal-object-rest-spread@^7.16.7": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/compat-data" "^7.17.0" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.16.7" -"@babel/plugin-proposal-optional-catch-binding@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942" +"@babel/plugin-proposal-optional-catch-binding@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797" +"@babel/plugin-proposal-optional-chaining@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - "@babel/plugin-syntax-optional-chaining" "^7.8.0" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389" +"@babel/plugin-proposal-private-methods@^7.16.11": + version "7.16.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-class-features-plugin" "^7.16.10" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072" +"@babel/plugin-proposal-private-property-in-object@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-syntax-async-generators@^7.8.0": +"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + +"@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" +"@babel/plugin-syntax-class-properties@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-syntax-dynamic-import@^7.8.0": +"@babel/plugin-syntax-class-static-block@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" dependencies: @@ -363,7 +419,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-json-strings@^7.8.0": +"@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" dependencies: @@ -375,7 +431,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0": +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" dependencies: @@ -387,322 +443,336 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-object-rest-spread@^7.8.0": +"@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-catch-binding@^7.8.0": +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-chaining@^7.8.0": +"@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-top-level-await@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" +"@babel/plugin-syntax-private-property-in-object@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-arrow-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3" +"@babel/plugin-syntax-top-level-await@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-async-to-generator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1" +"@babel/plugin-transform-arrow-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" dependencies: - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-remap-async-to-generator" "^7.12.1" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-block-scoped-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9" +"@babel/plugin-transform-async-to-generator@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-remap-async-to-generator" "^7.16.8" -"@babel/plugin-transform-block-scoping@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1" +"@babel/plugin-transform-block-scoped-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-classes@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6" +"@babel/plugin-transform-block-scoping@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-define-map" "^7.10.4" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" + +"@babel/plugin-transform-classes@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852" +"@babel/plugin-transform-computed-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-destructuring@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847" +"@babel/plugin-transform-destructuring@^7.16.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975" +"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-duplicate-keys@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228" +"@babel/plugin-transform-duplicate-keys@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-exponentiation-operator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0" +"@babel/plugin-transform-exponentiation-operator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-for-of@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa" +"@babel/plugin-transform-for-of@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-function-name@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667" +"@babel/plugin-transform-function-name@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57" +"@babel/plugin-transform-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-member-expression-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad" +"@babel/plugin-transform-member-expression-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-modules-amd@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9" +"@babel/plugin-transform-modules-amd@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648" +"@babel/plugin-transform-modules-commonjs@^7.16.8": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz#d86b217c8e45bb5f2dbc11eefc8eab62cf980d19" dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-simple-access" "^7.12.1" + "@babel/helper-module-transforms" "^7.17.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-simple-access" "^7.17.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086" +"@babel/plugin-transform-modules-systemjs@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" dependencies: - "@babel/helper-hoist-variables" "^7.10.4" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902" +"@babel/plugin-transform-modules-umd@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753" +"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8": + version "7.16.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252" dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" -"@babel/plugin-transform-new-target@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0" +"@babel/plugin-transform-new-target@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-object-super@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e" +"@babel/plugin-transform-object-super@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" -"@babel/plugin-transform-parameters@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d" +"@babel/plugin-transform-parameters@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-property-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd" +"@babel/plugin-transform-property-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-regenerator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753" +"@babel/plugin-transform-regenerator@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8" +"@babel/plugin-transform-reserved-words@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-shorthand-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3" +"@babel/plugin-transform-shorthand-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-spread@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e" +"@babel/plugin-transform-spread@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" -"@babel/plugin-transform-sticky-regex@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf" +"@babel/plugin-transform-sticky-regex@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-regex" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-template-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843" +"@babel/plugin-transform-template-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-typeof-symbol@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a" +"@babel/plugin-transform-typeof-symbol@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-unicode-escapes@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709" +"@babel/plugin-transform-unicode-escapes@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-unicode-regex@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb" +"@babel/plugin-transform-unicode-regex@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/preset-env@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2" - dependencies: - "@babel/compat-data" "^7.12.1" - "@babel/helper-compilation-targets" "^7.12.1" - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-option" "^7.12.1" - "@babel/plugin-proposal-async-generator-functions" "^7.12.1" - "@babel/plugin-proposal-class-properties" "^7.12.1" - "@babel/plugin-proposal-dynamic-import" "^7.12.1" - "@babel/plugin-proposal-export-namespace-from" "^7.12.1" - "@babel/plugin-proposal-json-strings" "^7.12.1" - "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-numeric-separator" "^7.12.1" - "@babel/plugin-proposal-object-rest-spread" "^7.12.1" - "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.1" - "@babel/plugin-proposal-private-methods" "^7.12.1" - "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" - "@babel/plugin-syntax-async-generators" "^7.8.0" - "@babel/plugin-syntax-class-properties" "^7.12.1" - "@babel/plugin-syntax-dynamic-import" "^7.8.0" + version "7.16.11" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982" + dependencies: + "@babel/compat-data" "^7.16.8" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7" + "@babel/plugin-proposal-async-generator-functions" "^7.16.8" + "@babel/plugin-proposal-class-properties" "^7.16.7" + "@babel/plugin-proposal-class-static-block" "^7.16.7" + "@babel/plugin-proposal-dynamic-import" "^7.16.7" + "@babel/plugin-proposal-export-namespace-from" "^7.16.7" + "@babel/plugin-proposal-json-strings" "^7.16.7" + "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7" + "@babel/plugin-proposal-numeric-separator" "^7.16.7" + "@babel/plugin-proposal-object-rest-spread" "^7.16.7" + "@babel/plugin-proposal-optional-catch-binding" "^7.16.7" + "@babel/plugin-proposal-optional-chaining" "^7.16.7" + "@babel/plugin-proposal-private-methods" "^7.16.11" + "@babel/plugin-proposal-private-property-in-object" "^7.16.7" + "@babel/plugin-proposal-unicode-property-regex" "^7.16.7" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" - "@babel/plugin-syntax-optional-chaining" "^7.8.0" - "@babel/plugin-syntax-top-level-await" "^7.12.1" - "@babel/plugin-transform-arrow-functions" "^7.12.1" - "@babel/plugin-transform-async-to-generator" "^7.12.1" - "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.1" - "@babel/plugin-transform-classes" "^7.12.1" - "@babel/plugin-transform-computed-properties" "^7.12.1" - "@babel/plugin-transform-destructuring" "^7.12.1" - "@babel/plugin-transform-dotall-regex" "^7.12.1" - "@babel/plugin-transform-duplicate-keys" "^7.12.1" - "@babel/plugin-transform-exponentiation-operator" "^7.12.1" - "@babel/plugin-transform-for-of" "^7.12.1" - "@babel/plugin-transform-function-name" "^7.12.1" - "@babel/plugin-transform-literals" "^7.12.1" - "@babel/plugin-transform-member-expression-literals" "^7.12.1" - "@babel/plugin-transform-modules-amd" "^7.12.1" - "@babel/plugin-transform-modules-commonjs" "^7.12.1" - "@babel/plugin-transform-modules-systemjs" "^7.12.1" - "@babel/plugin-transform-modules-umd" "^7.12.1" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1" - "@babel/plugin-transform-new-target" "^7.12.1" - "@babel/plugin-transform-object-super" "^7.12.1" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-transform-property-literals" "^7.12.1" - "@babel/plugin-transform-regenerator" "^7.12.1" - "@babel/plugin-transform-reserved-words" "^7.12.1" - "@babel/plugin-transform-shorthand-properties" "^7.12.1" - "@babel/plugin-transform-spread" "^7.12.1" - "@babel/plugin-transform-sticky-regex" "^7.12.1" - "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.1" - "@babel/plugin-transform-unicode-escapes" "^7.12.1" - "@babel/plugin-transform-unicode-regex" "^7.12.1" - "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.1" - core-js-compat "^3.6.2" - semver "^5.5.0" - -"@babel/preset-modules@^0.1.3": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-syntax-top-level-await" "^7.14.5" + "@babel/plugin-transform-arrow-functions" "^7.16.7" + "@babel/plugin-transform-async-to-generator" "^7.16.8" + "@babel/plugin-transform-block-scoped-functions" "^7.16.7" + "@babel/plugin-transform-block-scoping" "^7.16.7" + "@babel/plugin-transform-classes" "^7.16.7" + "@babel/plugin-transform-computed-properties" "^7.16.7" + "@babel/plugin-transform-destructuring" "^7.16.7" + "@babel/plugin-transform-dotall-regex" "^7.16.7" + "@babel/plugin-transform-duplicate-keys" "^7.16.7" + "@babel/plugin-transform-exponentiation-operator" "^7.16.7" + "@babel/plugin-transform-for-of" "^7.16.7" + "@babel/plugin-transform-function-name" "^7.16.7" + "@babel/plugin-transform-literals" "^7.16.7" + "@babel/plugin-transform-member-expression-literals" "^7.16.7" + "@babel/plugin-transform-modules-amd" "^7.16.7" + "@babel/plugin-transform-modules-commonjs" "^7.16.8" + "@babel/plugin-transform-modules-systemjs" "^7.16.7" + "@babel/plugin-transform-modules-umd" "^7.16.7" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8" + "@babel/plugin-transform-new-target" "^7.16.7" + "@babel/plugin-transform-object-super" "^7.16.7" + "@babel/plugin-transform-parameters" "^7.16.7" + "@babel/plugin-transform-property-literals" "^7.16.7" + "@babel/plugin-transform-regenerator" "^7.16.7" + "@babel/plugin-transform-reserved-words" "^7.16.7" + "@babel/plugin-transform-shorthand-properties" "^7.16.7" + "@babel/plugin-transform-spread" "^7.16.7" + "@babel/plugin-transform-sticky-regex" "^7.16.7" + "@babel/plugin-transform-template-literals" "^7.16.7" + "@babel/plugin-transform-typeof-symbol" "^7.16.7" + "@babel/plugin-transform-unicode-escapes" "^7.16.7" + "@babel/plugin-transform-unicode-regex" "^7.16.7" + "@babel/preset-modules" "^0.1.5" + "@babel/types" "^7.16.8" + babel-plugin-polyfill-corejs2 "^0.3.0" + babel-plugin-polyfill-corejs3 "^0.5.0" + babel-plugin-polyfill-regenerator "^0.3.0" + core-js-compat "^3.20.2" + semver "^6.3.0" + +"@babel/preset-modules@^0.1.5": + version "0.1.5" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" @@ -711,121 +781,144 @@ esutils "^2.0.2" "@babel/runtime@^7.8.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740" + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.7.tgz#a5f3328dc41ff39d803f311cfe17703418cf9825" dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.10.4" - "@babel/types" "^7.10.4" - -"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.1.tgz#941395e0c5cc86d5d3e75caa095d3924526f0c1e" - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.1" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.12.1" - "@babel/types" "^7.12.1" +"@babel/template@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" + dependencies: + "@babel/code-frame" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" + +"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" + dependencies: + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.17.3" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/parser" "^7.17.3" + "@babel/types" "^7.17.0" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.19" -"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.4.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.1.tgz#e109d9ab99a8de735be287ee3d6a9947a190c4ae" +"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" dependencies: - "@babel/helper-validator-identifier" "^7.10.4" - lodash "^4.17.19" + "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" -"@eslint/eslintrc@^0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c" +"@discoveryjs/json-ext@^0.5.0": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + +"@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" dependencies: ajv "^6.12.4" debug "^4.1.1" espree "^7.3.0" - globals "^12.1.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" - lodash "^4.17.19" minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@nicolo-ribaudo/chokidar-2@^2.1.8": - version "2.1.8" - resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8.tgz#eef8d9b47e8dc589499f14d656e8d2dd978c3d14" +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" dependencies: - chokidar "2.1.8" + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" -"@types/anymatch@*": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + +"@jridgewell/resolve-uri@^3.0.3": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c" + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.11" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec" + +"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.4": + version "0.3.4" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3": + version "2.1.8-no-fsevents.3" + resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b" "@types/glob@^7.1.1": - version "7.1.3" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" dependencies: "@types/minimatch" "*" "@types/node" "*" -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": + version "7.0.10" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.10.tgz#9b05b7896166cd00e9cbd59864853abf65d9ac23" "@types/minimatch@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" "@types/node@*": - version "14.14.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.5.tgz#e92d3b8f76583efa26c1a63a21c9d3c1143daa29" + version "17.0.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" "@types/parse-json@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" -"@types/tapable@*": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74" +"@types/tapable@^1": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310" "@types/uglify-js@*": - version "3.11.0" - resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.11.0.tgz#2868d405cc45cd9dc3069179052103032c33afbc" + version "3.13.1" + resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea" dependencies: source-map "^0.6.1" "@types/webpack-sources@*": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz#08216ab9be2be2e1499beaebc4d469cec81e82a7" + version "3.2.0" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b" dependencies: "@types/node" "*" "@types/source-list-map" "*" source-map "^0.7.3" "@types/webpack@^4.4.31": - version "4.41.23" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.23.tgz#1925f42a7325be4ae0fce38329f1cc27768fcda7" + version "4.41.32" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.32.tgz#a7bab03b72904070162b2f169415492209e94212" dependencies: - "@types/anymatch" "*" "@types/node" "*" - "@types/tapable" "*" + "@types/tapable" "^1" "@types/uglify-js" "*" "@types/webpack-sources" "*" + anymatch "^3.0.0" source-map "^0.6.0" "@webassemblyjs/ast@1.9.0": @@ -955,15 +1048,19 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" -"@webpack-cli/info@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.0.2.tgz#7ba1a7cfa9efa5b51e76b20ada88ac33b0340ad3" +"@webpack-cli/configtest@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356" + +"@webpack-cli/info@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea" dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.0.1.tgz#28abe7dcb18224ccd4b4e2d37f70e5be66c3d6a9" +"@webpack-cli/serve@^1.6.1": + version "1.6.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe" "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -973,9 +1070,9 @@ version "4.2.2" resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" -acorn-jsx@^5.2.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" +acorn-jsx@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" acorn@^6.4.1: version "6.4.2" @@ -1002,44 +1099,53 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^8.0.1: + version "8.10.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d" + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + ansi-colors@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" -ansi-escapes@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" +ansi-gray@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" dependencies: - type-fest "^0.11.0" + ansi-wrap "0.1.0" ansi-regex@^2.0.0: version "2.1.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" ansi-styles@^2.2.1: version "2.2.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" dependencies: color-convert "^1.9.0" -ansi-styles@^4.1.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" dependencies: color-convert "^2.0.1" +ansi-wrap@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -1047,9 +1153,9 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" +anymatch@^3.0.0, anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -1060,7 +1166,7 @@ aproba@^1.1.1: archy@^1.0.0: version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" argparse@^1.0.7: version "1.0.10" @@ -1068,17 +1174,11 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - dependencies: - arr-flatten "^1.0.1" - arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" -arr-flatten@^1.0.1, arr-flatten@^1.1.0: +arr-flatten@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" @@ -1086,13 +1186,17 @@ arr-union@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" -array-back@^4.0.0, array-back@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.1.tgz#9b80312935a52062e1a233a9c7abeb5481b30e90" - array-differ@^1.0.0: version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" + resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" + +array-each@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" + +array-slice@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" array-union@^1.0.1: version "1.0.2" @@ -1102,23 +1206,20 @@ array-union@^1.0.1: array-uniq@^1.0.1, array-uniq@^1.0.2: version "1.0.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" + resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" -asn1.js@^4.0.0: - version "4.9.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40" +asn1.js@^5.2.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" dependencies: bn.js "^4.0.0" inherits "^2.0.1" minimalistic-assert "^1.0.0" + safer-buffer "^2.1.0" assert@^1.1.1: version "1.5.0" @@ -1131,9 +1232,9 @@ assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" -astral-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" async-each@^1.0.1: version "1.0.3" @@ -1144,25 +1245,23 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" autoprefixer@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.0.1.tgz#e2d9000f84ebd98d77b7bc16f8adb2ff1f7bb946" - integrity sha512-aQo2BDIsoOdemXUAOBpFv4ZQa2DrOtEufarYhtFsK1088Ca0TUwu/aQWf0M3mrILXZ3mTIVn1lR3hPW8acacsw== + version "10.4.4" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.4.tgz#3e85a245b32da876a893d3ac2ea19f01e7ea5a1e" dependencies: - browserslist "^4.14.5" - caniuse-lite "^1.0.30001137" - colorette "^1.2.1" + browserslist "^4.20.2" + caniuse-lite "^1.0.30001317" + fraction.js "^4.2.0" normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss-value-parser "^4.1.0" + picocolors "^1.0.0" + postcss-value-parser "^4.2.0" babel-loader@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" + version "8.2.3" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" dependencies: - find-cache-dir "^2.1.0" + find-cache-dir "^3.3.1" loader-utils "^1.4.0" - mkdirp "^0.5.3" - pify "^4.0.1" + make-dir "^3.1.0" schema-utils "^2.6.5" babel-plugin-dynamic-import-node@^2.3.3: @@ -1171,13 +1270,34 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" -balanced-match@^0.4.1: - version "0.4.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" +babel-plugin-polyfill-corejs2@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5" + dependencies: + "@babel/compat-data" "^7.13.11" + "@babel/helper-define-polyfill-provider" "^0.3.1" + semver "^6.1.1" + +babel-plugin-polyfill-corejs3@^0.5.0: + version "0.5.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72" + dependencies: + "@babel/helper-define-polyfill-provider" "^0.3.1" + core-js-compat "^3.21.0" + +babel-plugin-polyfill-regenerator@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990" + dependencies: + "@babel/helper-define-polyfill-provider" "^0.3.1" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" base64-js@^1.0.2: - version "1.3.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" base@^0.11.1: version "0.11.2" @@ -1193,7 +1313,7 @@ base@^0.11.1: beeper@^1.0.0: version "1.1.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" + resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" big.js@^5.2.2: version "5.2.2" @@ -1204,8 +1324,8 @@ binary-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" binary-extensions@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9" + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" bindings@^1.5.0: version "1.5.0" @@ -1217,25 +1337,21 @@ bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: - version "4.11.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: + version "4.12.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" + +bn.js@^5.0.0, bn.js@^5.1.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" brace-expansion@^1.0.0, brace-expansion@^1.1.7: - version "1.1.7" - resolved "https://repo.jenkins-ci.org/api/npm/npm/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59" + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" dependencies: - balanced-match "^0.4.1" + balanced-match "^1.0.0" concat-map "0.0.1" -braces@^1.8.2: - version "1.8.5" - resolved "https://repo.jenkins-ci.org/api/npm/npm/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - braces@^2.3.1, braces@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" @@ -1257,54 +1373,58 @@ braces@~3.0.2: dependencies: fill-range "^7.0.1" -brorand@^1.0.1: +brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" browserify-aes@^1.0.0, browserify-aes@^1.0.4: - version "1.0.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a" + version "1.2.0" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" dependencies: - buffer-xor "^1.0.2" + buffer-xor "^1.0.3" cipher-base "^1.0.0" create-hash "^1.1.0" - evp_bytestokey "^1.0.0" + evp_bytestokey "^1.0.3" inherits "^2.0.1" + safe-buffer "^5.0.1" browserify-cipher@^1.0.0: - version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a" + version "1.0.1" + resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" dependencies: browserify-aes "^1.0.4" browserify-des "^1.0.0" evp_bytestokey "^1.0.0" browserify-des@^1.0.0: - version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd" + version "1.0.2" + resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c" dependencies: cipher-base "^1.0.1" des.js "^1.0.0" inherits "^2.0.1" + safe-buffer "^5.1.2" -browserify-rsa@^4.0.0: - version "4.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" +browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" dependencies: - bn.js "^4.1.0" + bn.js "^5.0.0" randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.0.4" - resolved "https://repo.jenkins-ci.org/api/npm/npm/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" - dependencies: - bn.js "^4.1.1" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.2" - elliptic "^6.0.0" - inherits "^2.0.1" - parse-asn1 "^5.0.0" + version "4.2.1" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" + dependencies: + bn.js "^5.1.1" + browserify-rsa "^4.0.1" + create-hash "^1.2.0" + create-hmac "^1.1.7" + elliptic "^6.5.3" + inherits "^2.0.4" + parse-asn1 "^5.1.5" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" browserify-zlib@^0.2.0: version "0.2.0" @@ -1312,22 +1432,23 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.8.5: - version "4.14.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015" +browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.20.2: + version "4.20.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" dependencies: - caniuse-lite "^1.0.30001135" - electron-to-chromium "^1.3.571" - escalade "^3.1.0" - node-releases "^1.1.61" + caniuse-lite "^1.0.30001317" + electron-to-chromium "^1.4.84" + escalade "^3.1.1" + node-releases "^2.0.2" + picocolors "^1.0.0" buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" -buffer-xor@^1.0.2: +buffer-xor@^1.0.3: version "1.0.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" + resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" buffer@^4.3.0: version "4.9.2" @@ -1375,22 +1496,24 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" +call-bind@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" -camelcase@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.1.0.tgz#27dc176173725fb0adf8a48b647f4d7871944d78" - integrity sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ== - -caniuse-lite@^1.0.30001135, caniuse-lite@^1.0.30001137: - version "1.0.30001151" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001151.tgz#1ddfde5e6fff02aad7940b4edb7d3ac76b0cb00b" +caniuse-lite@^1.0.30001317: + version "1.0.30001317" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz#0548fb28fd5bc259a70b8c1ffdbe598037666a1b" -chalk@^1.0.0, chalk@^1.1.1: +chalk@^1.0.0: version "1.1.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: ansi-styles "^2.2.1" escape-string-regexp "^1.0.2" @@ -1398,7 +1521,7 @@ chalk@^1.0.0, chalk@^1.1.1: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.4.2: +chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" dependencies: @@ -1407,13 +1530,13 @@ chalk@^2.0.0, chalk@^2.4.2: supports-color "^5.3.0" chalk@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" -chokidar@2.1.8, chokidar@^2.1.8: +chokidar@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" dependencies: @@ -1432,34 +1555,33 @@ chokidar@2.1.8, chokidar@^2.1.8: fsevents "^1.2.7" chokidar@^3.4.0, chokidar@^3.4.1: - version "3.4.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" dependencies: - anymatch "~3.1.1" + anymatch "~3.1.2" braces "~3.0.2" - glob-parent "~5.1.0" + glob-parent "~5.1.2" is-binary-path "~2.1.0" is-glob "~4.0.1" normalize-path "~3.0.0" - readdirp "~3.5.0" + readdirp "~3.6.0" optionalDependencies: - fsevents "~2.1.2" + fsevents "~2.3.2" chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" chrome-trace-event@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" - dependencies: - tslib "^1.9.0" + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: - version "1.0.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07" + version "1.0.4" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" dependencies: inherits "^2.0.1" + safe-buffer "^5.0.1" class-utils@^0.3.5: version "0.3.6" @@ -1473,22 +1595,29 @@ class-utils@^0.3.5: clean-webpack-plugin@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz#a99d8ec34c1c628a4541567aa7b457446460c62b" - integrity sha512-MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A== dependencies: "@types/webpack" "^4.4.31" del "^4.1.1" +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + clone-stats@^0.0.1: version "0.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" clone@^0.2.0: version "0.2.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" + resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" clone@^1.0.0, clone@^1.0.2: - version "1.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" collection-visit@^1.0.0: version "1.0.0" @@ -1517,18 +1646,13 @@ color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" -colorette@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" -command-line-usage@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.0.tgz#f28376a3da3361ff3d36cfd31c3c22c9a64c7cb6" - dependencies: - array-back "^4.0.0" - chalk "^2.4.2" - table-layout "^1.0.0" - typical "^5.2.0" +colorette@^2.0.14: + version "2.0.16" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" commander@^2.20.0: version "2.20.3" @@ -1538,9 +1662,9 @@ commander@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" -commander@^6.0.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75" +commander@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" commondir@^1.0.1: version "1.0.1" @@ -1552,7 +1676,7 @@ component-emitter@^1.2.1: concat-map@0.0.1: version "0.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" concat-stream@^1.5.0: version "1.6.2" @@ -1564,21 +1688,25 @@ concat-stream@^1.5.0: typedarray "^0.0.6" console-browserify@^1.1.0: - version "1.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" - dependencies: - date-now "^0.1.4" + version "1.2.0" + resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" convert-source-map@^1.1.0, convert-source-map@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" dependencies: safe-buffer "~5.1.1" +copy-anything@^2.0.1: + version "2.0.6" + resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480" + dependencies: + is-what "^3.14.1" + copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -1594,21 +1722,20 @@ copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" -core-js-compat@^3.6.2: - version "3.6.5" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c" +core-js-compat@^3.20.2, core-js-compat@^3.21.0: + version "3.21.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82" dependencies: - browserslist "^4.8.5" + browserslist "^4.19.1" semver "7.0.0" core-util-is@~1.0.0: - version "1.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" cosmiconfig@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" - integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== + version "7.0.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" dependencies: "@types/parse-json" "^4.0.0" import-fresh "^3.2.1" @@ -1617,24 +1744,25 @@ cosmiconfig@^7.0.0: yaml "^1.10.0" create-ecdh@^4.0.0: - version "4.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d" + version "4.0.4" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" dependencies: bn.js "^4.1.0" - elliptic "^6.0.0" + elliptic "^6.5.3" -create-hash@^1.1.0, create-hash@^1.1.1, create-hash@^1.1.2: - version "1.1.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd" +create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" dependencies: cipher-base "^1.0.1" inherits "^2.0.1" - ripemd160 "^2.0.0" + md5.js "^1.3.4" + ripemd160 "^2.0.1" sha.js "^2.4.0" -create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: - version "1.1.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06" +create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" dependencies: cipher-base "^1.0.3" create-hash "^1.1.0" @@ -1643,7 +1771,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -cross-spawn@^7.0.0, cross-spawn@^7.0.2: +cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" dependencies: @@ -1668,39 +1796,31 @@ crypto-browserify@^3.11.0: randomfill "^1.0.3" css-loader@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.0.0.tgz#f0a48dfacc3ab9936a05ee16a09e7f313872e117" - integrity sha512-9g35eXRBgjvswyJWoqq/seWp+BOxvUl8IinVNTsUBFFxtwfEYvlmEn6ciyn0liXGbGh5HyJjPGCuobDSfqMIVg== + version "5.2.7" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" dependencies: - camelcase "^6.1.0" - cssesc "^3.0.0" - icss-utils "^5.0.0" + icss-utils "^5.1.0" loader-utils "^2.0.0" - postcss "^8.1.1" + postcss "^8.2.15" postcss-modules-extract-imports "^3.0.0" postcss-modules-local-by-default "^4.0.0" postcss-modules-scope "^3.0.0" postcss-modules-values "^4.0.0" postcss-value-parser "^4.1.0" schema-utils "^3.0.0" - semver "^7.3.2" + semver "^7.3.5" cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== cyclist@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" -date-now@^0.1.4: - version "0.1.4" - resolved "https://repo.jenkins-ci.org/api/npm/npm/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" - dateformat@^2.0.0: - version "2.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17" + version "2.2.0" + resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" debug@^2.2.0, debug@^2.3.3: version "2.6.9" @@ -1709,8 +1829,8 @@ debug@^2.2.0, debug@^2.3.3: ms "2.0.0" debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" dependencies: ms "2.1.2" @@ -1718,17 +1838,13 @@ decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" -deep-extend@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - deep-is@^0.1.3: - version "0.1.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" defaults@^1.0.0: version "1.0.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" dependencies: clone "^1.0.2" @@ -1771,24 +1887,22 @@ del@^4.1.1: deprecated@^0.0.1: version "0.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19" + resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19" des.js@^1.0.0: - version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" + version "1.0.1" + resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" dependencies: inherits "^2.0.1" minimalistic-assert "^1.0.0" -detect-file@^0.1.0: - version "0.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63" - dependencies: - fs-exists-sync "^0.1.0" +detect-file@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" diffie-hellman@^5.0.0: - version "5.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e" + version "5.0.3" + resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" dependencies: bn.js "^4.1.0" miller-rabin "^4.0.0" @@ -1806,7 +1920,7 @@ domain-browser@^1.1.1: duplexer2@0.0.2: version "0.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" dependencies: readable-stream "~1.1.9" @@ -1819,25 +1933,25 @@ duplexify@^3.4.2, duplexify@^3.6.0: readable-stream "^2.0.0" stream-shift "^1.0.0" -electron-to-chromium@^1.3.571: - version "1.3.584" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.584.tgz#506cf7ba5895aafa8241876ab028654b61fd9ceb" +electron-to-chromium@^1.4.84: + version "1.4.87" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.87.tgz#1aeacfa50b2fbf3ecf50a78fbebd8f259d4fe208" -elliptic@^6.0.0: - version "6.4.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" +elliptic@^6.5.3: + version "6.5.4" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" dependencies: - bn.js "^4.4.0" - brorand "^1.0.1" + bn.js "^4.11.9" + brorand "^1.1.0" hash.js "^1.0.0" - hmac-drbg "^1.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.0" + hmac-drbg "^1.0.1" + inherits "^2.0.4" + minimalistic-assert "^1.0.1" + minimalistic-crypto-utils "^1.0.1" -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" emojis-list@^3.0.0: version "3.0.0" @@ -1851,77 +1965,55 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: end-of-stream@~0.1.5: version "0.1.5" - resolved "https://repo.jenkins-ci.org/api/npm/npm/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf" dependencies: once "~1.3.0" -enhanced-resolve@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" +enhanced-resolve@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" dependencies: graceful-fs "^4.1.2" memory-fs "^0.5.0" tapable "^1.0.0" -enquirer@^2.3.4, enquirer@^2.3.5: +enquirer@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" dependencies: ansi-colors "^4.1.1" envinfo@^7.7.3: - version "7.7.3" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc" + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" + version "0.1.8" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" dependencies: prr "~1.0.1" error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== dependencies: is-arrayish "^0.2.1" -es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1: - version "1.18.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.2.2" - is-negative-zero "^2.0.0" - is-regex "^1.1.1" - object-inspect "^1.8.0" - object-keys "^1.1.1" - object.assign "^4.1.1" - string.prototype.trimend "^1.0.1" - string.prototype.trimstart "^1.0.1" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -escalade@^3.1.0: +escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" - resolved "https://repo.jenkins-ci.org/api/npm/npm/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" eslint-plugin-only-warn@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-only-warn/-/eslint-plugin-only-warn-1.0.2.tgz#22bf3ce9f0a8671eecf78757d6eff3fd518be0aa" + version "1.0.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-only-warn/-/eslint-plugin-only-warn-1.0.3.tgz#a75f3a9ded7f03e9808e75ec27f22b644084506e" eslint-scope@^4.0.3: version "4.0.3" @@ -1948,31 +2040,34 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" eslint@^7.12.1: - version "7.12.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.12.1.tgz#bd9a81fa67a6cfd51656cdb88812ce49ccec5801" + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" dependencies: - "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.2.1" + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" + escape-string-regexp "^4.0.0" eslint-scope "^5.1.1" eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" - espree "^7.3.0" - esquery "^1.2.0" + espree "^7.3.1" + esquery "^1.4.0" esutils "^2.0.2" - file-entry-cache "^5.0.1" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" - globals "^12.1.0" + glob-parent "^5.1.2" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -1980,7 +2075,7 @@ eslint@^7.12.1: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.19" + lodash.merge "^4.6.2" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -1989,25 +2084,25 @@ eslint@^7.12.1: semver "^7.2.1" strip-ansi "^6.0.0" strip-json-comments "^3.1.0" - table "^5.2.3" + table "^6.0.9" text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348" +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" dependencies: acorn "^7.4.0" - acorn-jsx "^5.2.0" + acorn-jsx "^5.3.1" eslint-visitor-keys "^1.3.0" esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" -esquery@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" dependencies: estraverse "^5.1.0" @@ -2022,43 +2117,38 @@ estraverse@^4.1.1: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" estraverse@^5.1.0, estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" esutils@^2.0.2: - version "2.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" events@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" -evp_bytestokey@^1.0.0: - version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53" +evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" dependencies: - create-hash "^1.1.1" + md5.js "^1.3.4" + safe-buffer "^5.1.1" -execa@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2" +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" is-stream "^2.0.0" merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" strip-final-newline "^2.0.0" -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://repo.jenkins-ci.org/api/npm/npm/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - dependencies: - is-posix-bracket "^0.1.0" - expand-brackets@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" @@ -2071,17 +2161,11 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expand-range@^1.8.1: - version "1.8.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - dependencies: - fill-range "^2.1.0" - -expand-tilde@^1.2.1, expand-tilde@^1.2.2: - version "1.2.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449" +expand-tilde@^2.0.0, expand-tilde@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" dependencies: - os-homedir "^1.0.1" + homedir-polyfill "^1.0.1" extend-shallow@^2.0.1: version "2.0.1" @@ -2097,14 +2181,8 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: is-extendable "^1.0.1" extend@^3.0.0: - version "3.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" - -extglob@^0.3.1: - version "0.3.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - dependencies: - is-extglob "^1.0.0" + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" extglob@^2.0.4: version "2.0.4" @@ -2120,13 +2198,15 @@ extglob@^2.0.4: to-regex "^3.0.1" fancy-log@^1.1.0: - version "1.3.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948" + version "1.3.3" + resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7" dependencies: - chalk "^1.1.1" + ansi-gray "^0.1.1" + color-support "^1.1.3" + parse-node-version "^1.0.0" time-stamp "^1.0.0" -fast-deep-equal@^3.1.1: +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -2136,36 +2216,26 @@ fast-json-stable-stringify@^2.0.0: fast-levenshtein@^2.0.6: version "2.0.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + +fastest-levenshtein@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" -file-entry-cache@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" dependencies: - flat-cache "^2.0.1" + flat-cache "^3.0.4" file-uri-to-path@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - -fill-range@^2.1.0: - version "2.2.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^1.1.3" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -2189,9 +2259,17 @@ find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" +find-cache-dir@^3.3.1: + version "3.3.2" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + dependencies: + commondir "^1.0.1" + make-dir "^3.0.2" + pkg-dir "^4.1.0" + find-index@^0.1.1: version "0.1.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" + resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" find-up@^3.0.0: version "3.0.0" @@ -2206,46 +2284,43 @@ find-up@^4.0.0: locate-path "^5.0.0" path-exists "^4.0.0" -findup-sync@^0.4.2: - version "0.4.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12" +findup-sync@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" dependencies: - detect-file "^0.1.0" - is-glob "^2.0.1" - micromatch "^2.3.7" - resolve-dir "^0.1.0" + detect-file "^1.0.0" + is-glob "^3.1.0" + micromatch "^3.0.4" + resolve-dir "^1.0.1" fined@^1.0.1: - version "1.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/fined/-/fined-1.0.2.tgz#5b28424b760d7598960b7ef8480dff8ad3660e97" - dependencies: - expand-tilde "^1.2.1" - lodash.assignwith "^4.0.7" - lodash.isempty "^4.2.1" - lodash.isplainobject "^4.0.4" - lodash.isstring "^4.0.1" - lodash.pick "^4.2.1" + version "1.2.0" + resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" + dependencies: + expand-tilde "^2.0.2" + is-plain-object "^2.0.3" + object.defaults "^1.1.0" + object.pick "^1.2.0" parse-filepath "^1.0.1" first-chunk-stream@^1.0.0: version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" + resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" -flagged-respawn@^0.3.2: - version "0.3.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5" +flagged-respawn@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" -flat-cache@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" dependencies: - flatted "^2.0.0" - rimraf "2.6.3" - write "1.0.3" + flatted "^3.1.0" + rimraf "^3.0.2" -flatted@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" +flatted@^3.1.0: + version "3.2.5" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" flush-write-stream@^1.0.0: version "1.1.1" @@ -2256,14 +2331,18 @@ flush-write-stream@^1.0.0: for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" -for-own@^0.1.4: - version "0.1.5" - resolved "https://repo.jenkins-ci.org/api/npm/npm/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" +for-own@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" dependencies: for-in "^1.0.1" +fraction.js@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" + fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -2277,10 +2356,6 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-exists-sync@^0.1.0: - version "0.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - fs-readdir-recursive@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" @@ -2296,7 +2371,7 @@ fs-write-stream-atomic@^1.0.8: fs.realpath@^1.0.0: version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.2.7: version "1.2.13" @@ -2305,9 +2380,9 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@~2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" function-bind@^1.1.1: version "1.1.1" @@ -2319,37 +2394,30 @@ functional-red-black-tree@^1.0.1: gaze@^0.5.1: version "0.5.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f" + resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f" dependencies: globule "~0.1.0" -gensync@^1.0.0-beta.1: - version "1.0.0-beta.1" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" -get-stream@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" +get-intrinsic@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" dependencies: - pump "^3.0.0" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" -glob-base@^0.3.0: - version "0.3.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - dependencies: - is-glob "^2.0.0" - glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" @@ -2357,15 +2425,15 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@^5.0.0, glob-parent@~5.1.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" +glob-parent@^5.1.2, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" dependencies: is-glob "^4.0.1" glob-stream@^3.1.5: version "3.1.18" - resolved "https://repo.jenkins-ci.org/api/npm/npm/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b" + resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b" dependencies: glob "^4.3.1" glob2base "^0.0.12" @@ -2376,19 +2444,19 @@ glob-stream@^3.1.5: glob-watcher@^0.0.6: version "0.0.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b" + resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b" dependencies: gaze "^0.5.1" glob2base@^0.0.12: version "0.0.12" - resolved "https://repo.jenkins-ci.org/api/npm/npm/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" + resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" dependencies: find-index "^0.1.1" glob@^4.3.1: version "4.5.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f" + resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f" dependencies: inflight "^1.0.4" inherits "2" @@ -2396,8 +2464,8 @@ glob@^4.3.1: once "^1.3.0" glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2408,37 +2476,39 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4: glob@~3.1.21: version "3.1.21" - resolved "https://repo.jenkins-ci.org/api/npm/npm/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd" + resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd" dependencies: graceful-fs "~1.2.0" inherits "1" minimatch "~0.2.11" -global-modules@^0.2.3: - version "0.2.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d" +global-modules@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" dependencies: - global-prefix "^0.1.4" - is-windows "^0.2.0" + global-prefix "^1.0.1" + is-windows "^1.0.1" + resolve-dir "^1.0.0" -global-prefix@^0.1.4: - version "0.1.5" - resolved "https://repo.jenkins-ci.org/api/npm/npm/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f" +global-prefix@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" dependencies: - homedir-polyfill "^1.0.0" + expand-tilde "^2.0.2" + homedir-polyfill "^1.0.1" ini "^1.3.4" - is-windows "^0.2.0" - which "^1.2.12" + is-windows "^1.0.1" + which "^1.2.14" globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" +globals@^13.6.0, globals@^13.9.0: + version "13.13.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b" dependencies: - type-fest "^0.8.1" + type-fest "^0.20.2" globby@^6.1.0: version "6.1.0" @@ -2452,35 +2522,35 @@ globby@^6.1.0: globule@~0.1.0: version "0.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5" + resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5" dependencies: glob "~3.1.21" lodash "~1.0.1" minimatch "~0.2.11" glogg@^1.0.0: - version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5" + version "1.0.2" + resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f" dependencies: sparkles "^1.0.0" graceful-fs@^3.0.0: - version "3.0.11" - resolved "https://repo.jenkins-ci.org/api/npm/npm/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818" + version "3.0.12" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz#0034947ce9ed695ec8ab0b854bc919e82b1ffaef" dependencies: - natives "^1.1.0" + natives "^1.1.3" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" graceful-fs@~1.2.0: version "1.2.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364" gulp-util@^3.0.0: version "3.0.8" - resolved "https://repo.jenkins-ci.org/api/npm/npm/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" + resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" dependencies: array-differ "^1.0.0" array-uniq "^1.0.2" @@ -2503,7 +2573,7 @@ gulp-util@^3.0.0: gulp@^3.9.0: version "3.9.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4" + resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4" dependencies: archy "^1.0.0" chalk "^1.0.0" @@ -2521,13 +2591,13 @@ gulp@^3.9.0: gulplog@^1.0.0: version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5" + resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5" dependencies: glogg "^1.0.0" has-ansi@^2.0.0: version "2.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" dependencies: ansi-regex "^2.0.0" @@ -2541,13 +2611,13 @@ has-flag@^4.0.0: has-gulplog@^0.1.0: version "0.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce" + resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce" dependencies: sparkles "^1.0.0" has-symbols@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" has-value@^0.3.1: version "0.3.1" @@ -2582,29 +2652,32 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -hash-base@^2.0.0: - version "2.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1" +hash-base@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" dependencies: - inherits "^2.0.1" + inherits "^2.0.4" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" hash.js@^1.0.0, hash.js@^1.0.3: - version "1.0.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573" + version "1.1.7" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" dependencies: - inherits "^2.0.1" + inherits "^2.0.3" + minimalistic-assert "^1.0.1" -hmac-drbg@^1.0.0: +hmac-drbg@^1.0.1: version "1.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" + resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" dependencies: hash.js "^1.0.3" minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -homedir-polyfill@^1.0.0: - version "1.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc" +homedir-polyfill@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" dependencies: parse-passwd "^1.0.0" @@ -2612,18 +2685,17 @@ https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" -icss-utils@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.0.0.tgz#03ed56c3accd32f9caaf1752ebf64ef12347bb84" - integrity sha512-aF2Cf/CkEZrI/vsu5WI/I+akFgdbwQHVE9YRZxATrhH4PVIe6a3BIjwjEcW+z+jP/hNh+YvM3lAAn1wJQ6opSg== +icss-utils@^5.0.0, icss-utils@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" ieee754@^1.1.4: - version "1.1.8" - resolved "https://repo.jenkins-ci.org/api/npm/npm/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" iferr@^0.1.5: version "0.1.5" @@ -2636,18 +2708,17 @@ ignore@^4.0.6: image-size@~0.5.0: version "0.5.5" resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" - integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= import-fresh@^3.0.0, import-fresh@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" import-local@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -2656,52 +2727,51 @@ imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" -indexes-of@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" - integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= - infer-owner@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" inflight@^1.0.4: version "1.0.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" dependencies: once "^1.3.0" wrappy "1" inherits@1: version "1.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" inherits@2.0.1: version "2.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" ini@^1.3.4: - version "1.3.4" - resolved "https://repo.jenkins-ci.org/api/npm/npm/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" interpret@^1.0.0: - version "1.0.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90" + version "1.4.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" -interpret@^2.0.0: +interpret@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" -is-absolute@^0.2.3: - version "0.2.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb" +is-absolute@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" dependencies: - is-relative "^0.2.1" - is-windows "^0.2.0" + is-relative "^1.0.0" + is-windows "^1.0.1" is-accessor-descriptor@^0.1.6: version "0.1.6" @@ -2718,7 +2788,6 @@ is-accessor-descriptor@^1.0.0: is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= is-binary-path@^1.0.0: version "1.0.1" @@ -2733,16 +2802,12 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-buffer@^1.1.5: - version "1.1.5" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" - -is-callable@^1.1.4, is-callable@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" -is-core-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.0.0.tgz#58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d" +is-core-module@^2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" dependencies: has "^1.0.3" @@ -2756,11 +2821,7 @@ is-data-descriptor@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" dependencies: - kind-of "^6.0.0" - -is-date-object@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" + kind-of "^6.0.0" is-descriptor@^0.1.0: version "0.1.6" @@ -2778,19 +2839,9 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: is-data-descriptor "^1.0.0" kind-of "^6.0.2" -is-dotfile@^1.0.0: - version "1.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d" - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - dependencies: - is-primitive "^2.0.0" - is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" is-extendable@^1.0.1: version "1.0.1" @@ -2798,23 +2849,13 @@ is-extendable@^1.0.1: dependencies: is-plain-object "^2.0.4" -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - is-extglob@^2.1.0, is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - dependencies: - is-extglob "^1.0.0" +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" is-glob@^3.1.0: version "3.1.0" @@ -2823,21 +2864,11 @@ is-glob@^3.1.0: is-extglob "^2.1.0" is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" dependencies: is-extglob "^2.1.1" -is-negative-zero@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" - -is-number@^2.0.2, is-number@^2.1.0: - version "2.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - dependencies: - kind-of "^3.0.2" - is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -2870,51 +2901,31 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - -is-regex@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" - dependencies: - has-symbols "^1.0.1" - -is-relative@^0.2.1: - version "0.2.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5" +is-relative@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" dependencies: - is-unc-path "^0.1.1" + is-unc-path "^1.0.0" is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - -is-symbol@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" - dependencies: - has-symbols "^1.0.1" + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" -is-unc-path@^0.1.1: - version "0.1.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9" +is-unc-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" dependencies: - unc-path-regex "^0.1.0" + unc-path-regex "^0.1.2" is-utf8@^0.2.0: version "0.2.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" -is-windows@^0.2.0: - version "0.2.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" +is-what@^3.14.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1" -is-windows@^1.0.2: +is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -2924,19 +2935,19 @@ is-wsl@^1.1.0: isarray@0.0.1: version "0.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" isexe@^2.0.0: version "2.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" isobject@^2.0.0: version "2.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" dependencies: isarray "1.0.0" @@ -2946,25 +2957,27 @@ isobject@^3.0.0, isobject@^3.0.1: jenkins-js-modules@1.3.0: version "1.3.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/jenkins-js-modules/-/jenkins-js-modules-1.3.0.tgz#d1872a0917a7b4bcae216a598ea7076f874c49be" + resolved "https://registry.yarnpkg.com/jenkins-js-modules/-/jenkins-js-modules-1.3.0.tgz#d1872a0917a7b4bcae216a598ea7076f874c49be" dependencies: window-handle "0.0.6" -jquery-ui@^1.12.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51" +jquery-ui@^1.13.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.1.tgz#d0b7a42e73a04c31bb5706adf86f6f8942f64eaa" + dependencies: + jquery ">=1.8.0 <4.0.0" -jquery@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" +"jquery@>=1.8.0 <4.0.0", jquery@^3.5.1: + version "3.6.0" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" js-yaml@^3.13.1: - version "3.14.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" dependencies: argparse "^1.0.7" esprima "^4.0.0" @@ -2984,12 +2997,15 @@ json-parse-better-errors@^1.0.2: json-parse-even-better-errors@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" @@ -3001,14 +3017,14 @@ json5@^1.0.1: minimist "^1.2.0" json5@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" dependencies: minimist "^1.2.5" kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" dependencies: is-buffer "^1.1.5" @@ -3027,24 +3043,22 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" klona@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0" - integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== + version "2.0.5" + resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" less-loader@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.0.2.tgz#0d73a49ec32a9d3ff12614598e6e2b47fb2a35c4" - integrity sha512-7MKlgjnkCf63E3Lv6w2FvAEgLMx3d/tNBExITcanAq7ys5U8VPWT3F6xcRjYmdNfkoQ9udoVFb1r2azSiTnD6w== + version "7.3.0" + resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.3.0.tgz#f9d6d36d18739d642067a05fb5bd70c8c61317e5" dependencies: klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" less@^3.12.2: - version "3.12.2" - resolved "https://registry.yarnpkg.com/less/-/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4" - integrity sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q== + version "3.13.1" + resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909" dependencies: + copy-anything "^2.0.1" tslib "^1.10.0" optionalDependencies: errno "^0.1.1" @@ -3063,31 +3077,21 @@ levn@^0.4.1: type-check "~0.4.0" liftoff@^2.1.0: - version "2.3.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385" + version "2.5.0" + resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec" dependencies: extend "^3.0.0" - findup-sync "^0.4.2" + findup-sync "^2.0.0" fined "^1.0.1" - flagged-respawn "^0.3.2" - lodash.isplainobject "^4.0.4" - lodash.isstring "^4.0.1" - lodash.mapvalues "^4.4.0" + flagged-respawn "^1.0.0" + is-plain-object "^2.0.4" + object.map "^1.0.0" rechoir "^0.6.2" resolve "^1.1.7" -line-column@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2" - integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI= - dependencies: - isarray "^1.0.0" - isobject "^2.0.0" - lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" loader-runner@^2.4.0: version "2.4.0" @@ -3102,9 +3106,8 @@ loader-utils@^1.2.3, loader-utils@^1.4.0: json5 "^1.0.1" loader-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" - integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + version "2.0.2" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -3125,93 +3128,77 @@ locate-path@^5.0.0: lodash._basecopy@^3.0.0: version "3.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" + resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" lodash._basetostring@^3.0.0: version "3.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" + resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" lodash._basevalues@^3.0.0: version "3.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" + resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" lodash._getnative@^3.0.0: version "3.9.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" + resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" lodash._isiterateecall@^3.0.0: version "3.0.9" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" + resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" lodash._reescape@^3.0.0: version "3.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a" + resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a" lodash._reevaluate@^3.0.0: version "3.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed" + resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed" lodash._reinterpolate@^3.0.0: version "3.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" lodash._root@^3.0.0: version "3.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" + resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" -lodash.assignwith@^4.0.7: - version "4.2.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb" +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" lodash.escape@^3.0.0: version "3.2.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" + resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" dependencies: lodash._root "^3.0.0" lodash.isarguments@^3.0.0: version "3.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" + resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" lodash.isarray@^3.0.0: version "3.0.4" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - -lodash.isempty@^4.2.1: - version "4.4.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" - -lodash.isplainobject@^4.0.4: - version "4.0.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" + resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" lodash.keys@^3.0.0: version "3.1.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" + resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" dependencies: lodash._getnative "^3.0.0" lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash.mapvalues@^4.4.0: - version "4.6.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" - -lodash.pick@^4.2.1: - version "4.4.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" lodash.restparam@^3.0.0: version "3.6.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" + resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" lodash.template@^3.0.0: version "3.6.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f" + resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f" dependencies: lodash._basecopy "^3.0.0" lodash._basetostring "^3.0.0" @@ -3225,22 +3212,22 @@ lodash.template@^3.0.0: lodash.templatesettings@^3.0.0: version "3.1.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5" dependencies: lodash._reinterpolate "^3.0.0" lodash.escape "^3.0.0" -lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" lodash@~1.0.1: version "1.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" lru-cache@2: version "2.7.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" lru-cache@^5.1.1: version "5.1.1" @@ -3248,6 +3235,12 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + dependencies: + yallist "^4.0.0" + make-dir@^2.0.0, make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" @@ -3255,9 +3248,21 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" +make-dir@^3.0.2, make-dir@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + dependencies: + semver "^6.0.0" + +make-iterator@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" + dependencies: + kind-of "^6.0.2" + map-cache@^0.2.0, map-cache@^0.2.2: version "0.2.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" map-visit@^1.0.0: version "1.0.0" @@ -3265,6 +3270,14 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" +md5.js@^1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + safe-buffer "^5.1.2" + memory-fs@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" @@ -3283,25 +3296,7 @@ merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" -micromatch@^2.3.7: - version "2.3.11" - resolved "https://repo.jenkins-ci.org/api/npm/npm/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -micromatch@^3.1.10, micromatch@^3.1.4: +micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" dependencies: @@ -3320,8 +3315,8 @@ micromatch@^3.1.10, micromatch@^3.1.4: to-regex "^3.0.2" miller-rabin@^4.0.0: - version "4.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d" + version "4.0.1" + resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" dependencies: bn.js "^4.0.0" brorand "^1.0.1" @@ -3329,53 +3324,47 @@ miller-rabin@^4.0.0: mime@^1.4.1: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" mini-css-extract-plugin@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.2.1.tgz#30ea7dee632b3002b0c77aeed447790408cb247e" - integrity sha512-G3yw7/TQaPfkuiR73MDcyiqhyP8SnbmLhUbpC76H+wtQxA6wfKhMCQOCb6wnPK0dQbjORAeOILQqEesg4/wF7A== + version "1.6.2" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" dependencies: loader-utils "^2.0.0" schema-utils "^3.0.0" webpack-sources "^1.1.0" -minimalistic-assert@^1.0.0: - version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" +minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" -minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: +minimalistic-crypto-utils@^1.0.1: version "1.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" + resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" minimatch@^2.0.1: version "2.0.10" - resolved "https://repo.jenkins-ci.org/api/npm/npm/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" dependencies: brace-expansion "^1.0.0" minimatch@^3.0.4: - version "3.0.4" - resolved "https://repo.jenkins-ci.org/api/npm/npm/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" dependencies: brace-expansion "^1.1.7" minimatch@~0.2.11: version "0.2.14" - resolved "https://repo.jenkins-ci.org/api/npm/npm/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a" dependencies: lru-cache "2" sigmund "~1.0.0" -minimist@^1.1.0: - version "1.2.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" @@ -3428,18 +3417,17 @@ ms@2.1.2: multipipe@^0.1.2: version "0.1.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" + resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" dependencies: duplexer2 "0.0.2" nan@^2.12.1: - version "2.14.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" -nanoid@^3.1.15: - version "3.1.16" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.16.tgz#b21f0a7d031196faf75314d7c65d36352beeef64" - integrity sha512-+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w== +nanoid@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" nanomatch@^1.2.9: version "1.2.13" @@ -3458,13 +3446,12 @@ nanomatch@^1.2.9: to-regex "^3.0.1" native-request@^1.0.5: - version "1.0.8" - resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" - integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag== - -natives@^1.1.0: version "1.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31" + resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.1.0.tgz#acdb30fe2eefa3e1bc8c54b3a6852e9c5c0d3cb0" + +natives@^1.1.3: + version "1.1.6" + resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb" natural-compare@^1.4.0: version "1.4.0" @@ -3502,13 +3489,13 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-releases@^1.1.61: - version "1.1.64" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.64.tgz#71b4ae988e9b1dd7c1ffce58dd9e561752dfebc5" +node-releases@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" -normalize-path@^2.0.1, normalize-path@^2.1.1: +normalize-path@^2.1.1: version "2.1.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" dependencies: remove-trailing-separator "^1.0.1" @@ -3519,22 +3506,16 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= -npm-run-path@^4.0.0: +npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" dependencies: path-key "^3.0.0" -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= - object-assign@^3.0.0: version "3.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" object-assign@^4.0.1, object-assign@^4.1.1: version "4.1.1" @@ -3548,10 +3529,6 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" - object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -3562,41 +3539,50 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0, object.assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd" +object.assign@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.18.0-next.0" has-symbols "^1.0.1" object-keys "^1.1.1" -object.omit@^2.0.0: - version "2.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" +object.defaults@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" + array-each "^1.0.1" + array-slice "^1.0.0" + for-own "^1.0.0" + isobject "^3.0.0" + +object.map@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" + dependencies: + for-own "^1.0.0" + make-iterator "^1.0.0" -object.pick@^1.3.0: +object.pick@^1.2.0, object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" dependencies: isobject "^3.0.1" -once@^1.3.0, once@^1.3.1, once@~1.3.0: - version "1.3.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: wrappy "1" -once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" +once@~1.3.0: + version "1.3.3" + resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" dependencies: wrappy "1" -onetime@^5.1.0: +onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" dependencies: @@ -3615,7 +3601,7 @@ optionator@^0.9.1: orchestrator@^0.3.0: version "0.3.8" - resolved "https://repo.jenkins-ci.org/api/npm/npm/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e" + resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e" dependencies: end-of-stream "~0.1.5" sequencify "~0.0.7" @@ -3623,15 +3609,15 @@ orchestrator@^0.3.0: ordered-read-streams@^0.1.0: version "0.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126" + resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126" os-browserify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" -os-homedir@^1.0.0, os-homedir@^1.0.1: +os-homedir@^1.0.0: version "1.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" @@ -3677,46 +3663,40 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-asn1@^5.0.0: - version "5.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712" +parse-asn1@^5.0.0, parse-asn1@^5.1.5: + version "5.1.6" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" dependencies: - asn1.js "^4.0.0" + asn1.js "^5.2.0" browserify-aes "^1.0.0" - create-hash "^1.1.0" evp_bytestokey "^1.0.0" pbkdf2 "^3.0.3" + safe-buffer "^5.1.1" parse-filepath@^1.0.1: - version "1.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73" + version "1.0.2" + resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" dependencies: - is-absolute "^0.2.3" + is-absolute "^1.0.0" map-cache "^0.2.0" path-root "^0.1.1" -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://repo.jenkins-ci.org/api/npm/npm/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - parse-json@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" - integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" +parse-node-version@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" + parse-passwd@^1.0.0: version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" + resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" pascalcase@^0.1.1: version "0.1.1" @@ -3740,7 +3720,7 @@ path-exists@^4.0.0: path-is-absolute@^1.0.0: version "1.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" path-is-inside@^1.0.2: version "1.0.2" @@ -3750,28 +3730,27 @@ path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" -path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" path-root-regex@^0.1.0: version "0.1.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" + resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" path-root@^0.1.1: version "0.1.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" + resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" dependencies: path-root-regex "^0.1.0" path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== pbkdf2@^3.0.3: - version "3.0.12" - resolved "https://repo.jenkins-ci.org/api/npm/npm/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2" + version "3.1.2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -3783,9 +3762,13 @@ performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + picomatch@^2.0.4, picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" pify@^2.0.0: version "2.3.0" @@ -3811,7 +3794,7 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" -pkg-dir@^4.2.0: +pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" dependencies: @@ -3822,32 +3805,28 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" postcss-less@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-4.0.0.tgz#88ad544041750023650f249a896930a741506390" - integrity sha512-wKT2JuR3dTBgtQ61HAyqx/uPlYgkf4OTlYcZaqLWjW/hMIIV58d79ab03oilkn7ob84lOd9W1oBB1Pu7bmzUYQ== + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-4.0.1.tgz#73caf5dac056d4b706f4cc136cefeaf4e79067a4" dependencies: postcss "^8.1.2" postcss-loader@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.0.4.tgz#b2d005b52e008a44991cf8123bee207e635eb53e" - integrity sha512-pntA9zIR14drQo84yGTjQJg1m7T0DkXR4vXYHBngiRZdJtEeCrojL6lOpqUanMzG375lIJbT4Yug85zC/AJWGw== + version "4.3.0" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.3.0.tgz#2c4de9657cd4f07af5ab42bd60a673004da1b8cc" dependencies: cosmiconfig "^7.0.0" klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" - semver "^7.3.2" + semver "^7.3.4" postcss-modules-extract-imports@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== postcss-modules-local-by-default@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== dependencies: icss-utils "^5.0.0" postcss-selector-parser "^6.0.2" @@ -3856,53 +3835,41 @@ postcss-modules-local-by-default@^4.0.0: postcss-modules-scope@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== dependencies: postcss-selector-parser "^6.0.4" postcss-modules-values@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== dependencies: icss-utils "^5.0.0" postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" - integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== + version "6.0.9" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f" dependencies: cssesc "^3.0.0" - indexes-of "^1.0.1" - uniq "^1.0.1" util-deprecate "^1.0.2" -postcss-value-parser@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" - integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== +postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" -postcss@^8.1.1, postcss@^8.1.2, postcss@^8.1.4: - version "8.1.4" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.1.4.tgz#356dfef367a70f3d04347f74560c85846e20e4c1" - integrity sha512-LfqcwgMq9LOd8pX7K2+r2HPitlIGC5p6PoZhVELlqhh2YGDVcXKpkCseqan73Hrdik6nBd2OvoDPUaP/oMj9hQ== +postcss@^8.1.2, postcss@^8.2.13, postcss@^8.2.15: + version "8.4.12" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905" dependencies: - colorette "^1.2.1" - line-column "^1.0.2" - nanoid "^3.1.15" - source-map "^0.6.1" + nanoid "^3.3.1" + picocolors "^1.0.0" + source-map-js "^1.0.2" prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" -preserve@^0.2.0: - version "0.2.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - pretty-hrtime@^1.0.0: version "1.0.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" + resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" process-nextick-args@~2.0.0: version "2.0.1" @@ -3910,7 +3877,7 @@ process-nextick-args@~2.0.0: process@^0.11.10: version "0.11.10" - resolved "https://repo.jenkins-ci.org/api/npm/npm/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" progress@^2.0.0: version "2.0.3" @@ -3925,14 +3892,15 @@ prr@~1.0.1: resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" public-encrypt@^4.0.0: - version "4.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6" + version "4.0.3" + resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" dependencies: bn.js "^4.1.0" browserify-rsa "^4.0.0" create-hash "^1.1.0" parse-asn1 "^5.0.0" randombytes "^2.0.1" + safe-buffer "^5.1.2" pump@^2.0.0: version "2.0.1" @@ -3958,11 +3926,11 @@ pumpify@^1.3.3: punycode@1.3.2: version "1.3.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" punycode@^1.2.4: version "1.4.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" punycode@^2.1.0: version "2.1.1" @@ -3970,11 +3938,11 @@ punycode@^2.1.0: querystring-es3@^0.2.0: version "0.2.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" + resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" querystring@0.2.0: version "0.2.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" raf@^3.4.1: version "3.4.1" @@ -3982,18 +3950,7 @@ raf@^3.4.1: dependencies: performance-now "^2.1.0" -randomatic@^1.1.3: - version "1.1.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb" - dependencies: - is-number "^2.0.2" - kind-of "^3.0.2" - -randombytes@^2.0.0: - version "2.0.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec" - -randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" dependencies: @@ -4006,7 +3963,7 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" dependencies: @@ -4020,16 +3977,24 @@ randomfill@^1.0.3: "readable-stream@>=1.0.33-1 <1.1.0-0": version "1.0.34" - resolved "https://repo.jenkins-ci.org/api/npm/npm/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" dependencies: core-util-is "~1.0.0" inherits "~2.0.1" isarray "0.0.1" string_decoder "~0.10.x" +readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readable-stream@~1.1.9: version "1.1.14" - resolved "https://repo.jenkins-ci.org/api/npm/npm/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" dependencies: core-util-is "~1.0.0" inherits "~2.0.1" @@ -4044,41 +4009,37 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" dependencies: picomatch "^2.2.1" rechoir@^0.6.2: version "0.6.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" dependencies: resolve "^1.1.6" rechoir@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca" + version "0.7.1" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" dependencies: resolve "^1.9.0" -reduce-flatten@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27" - -regenerate-unicode-properties@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" +regenerate-unicode-properties@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56" dependencies: - regenerate "^1.4.0" + regenerate "^1.4.2" -regenerate@^1.4.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f" +regenerate@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" regenerator-runtime@^0.13.4: - version "0.13.7" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + version "0.13.9" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" regenerator-transform@^0.14.2: version "0.14.5" @@ -4086,13 +4047,6 @@ regenerator-transform@^0.14.2: dependencies: "@babel/runtime" "^7.8.4" -regex-cache@^0.4.2: - version "0.4.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" - dependencies: - is-equal-shallow "^0.1.3" - is-primitive "^2.0.0" - regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -4101,45 +4055,49 @@ regex-not@^1.0.0, regex-not@^1.0.2: safe-regex "^1.1.0" regexpp@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" -regexpu-core@^4.7.1: - version "4.7.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" +regexpu-core@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3" dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.2.0" - regjsgen "^0.5.1" - regjsparser "^0.6.4" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.2.0" + regenerate "^1.4.2" + regenerate-unicode-properties "^10.0.1" + regjsgen "^0.6.0" + regjsparser "^0.8.2" + unicode-match-property-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.0.0" -regjsgen@^0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" +regjsgen@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" -regjsparser@^0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272" +regjsparser@^0.8.2: + version "0.8.4" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f" dependencies: jsesc "~0.5.0" remove-trailing-separator@^1.0.1: - version "1.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4" + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" repeat-element@^1.1.2: - version "1.1.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" -repeat-string@^1.5.2, repeat-string@^1.6.1: +repeat-string@^1.6.1: version "1.6.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" replace-ext@0.0.1: version "0.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" + +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" resolve-cwd@^3.0.0: version "3.0.0" @@ -4147,12 +4105,12 @@ resolve-cwd@^3.0.0: dependencies: resolve-from "^5.0.0" -resolve-dir@^0.1.0: - version "0.1.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e" +resolve-dir@^1.0.0, resolve-dir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" dependencies: - expand-tilde "^1.2.2" - global-modules "^0.2.3" + expand-tilde "^2.0.0" + global-modules "^1.0.0" resolve-from@^4.0.0: version "4.0.0" @@ -4166,34 +4124,35 @@ resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.9.0: - version "1.18.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130" +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.9.0: + version "1.22.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" dependencies: - is-core-module "^2.0.0" - path-parse "^1.0.6" + is-core-module "^2.8.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" -rimraf@2.6.3: - version "2.6.3" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - dependencies: - glob "^7.1.3" - rimraf@^2.5.4, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" dependencies: glob "^7.1.3" +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + dependencies: + glob "^7.1.3" + ripemd160@^2.0.0, ripemd160@^2.0.1: - version "2.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7" + version "2.0.2" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" dependencies: - hash-base "^2.0.0" + hash-base "^3.0.0" inherits "^2.0.1" run-queue@^1.0.0, run-queue@^1.0.3: @@ -4202,7 +4161,7 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -4216,6 +4175,10 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" +safer-buffer@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" @@ -4233,11 +4196,10 @@ schema-utils@^2.6.5: ajv-keywords "^3.5.2" schema-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" - integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" dependencies: - "@types/json-schema" "^7.0.6" + "@types/json-schema" "^7.0.8" ajv "^6.12.5" ajv-keywords "^3.5.2" @@ -4247,19 +4209,25 @@ semver@7.0.0: semver@^4.1.0: version "4.3.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" + resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" -semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: +semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" -semver@^7.2.1, semver@^7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + +semver@^7.2.1, semver@^7.3.4, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + dependencies: + lru-cache "^6.0.0" sequencify@~0.0.7: version "0.0.7" - resolved "https://repo.jenkins-ci.org/api/npm/npm/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c" + resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c" serialize-javascript@^4.0.0: version "4.0.0" @@ -4278,13 +4246,20 @@ set-value@^2.0.0, set-value@^2.0.1: setimmediate@^1.0.4: version "1.0.5" - resolved "https://repo.jenkins-ci.org/api/npm/npm/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" sha.js@^2.4.0, sha.js@^2.4.8: - version "2.4.8" - resolved "https://repo.jenkins-ci.org/api/npm/npm/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f" + version "2.4.11" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" dependencies: inherits "^2.0.1" + safe-buffer "^5.0.1" + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + dependencies: + kind-of "^6.0.2" shebang-command@^2.0.0: version "2.0.0" @@ -4298,23 +4273,23 @@ shebang-regex@^3.0.0: sigmund@~1.0.0: version "1.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" + resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" -signal-exit@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" +signal-exit@^3.0.3: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" -slice-ansi@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" dependencies: - ansi-styles "^3.2.0" - astral-regex "^1.0.0" - is-fullwidth-code-point "^2.0.0" + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" snapdragon-node@^2.0.1: version "2.1.1" @@ -4347,6 +4322,10 @@ source-list-map@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" +source-map-js@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -4358,15 +4337,15 @@ source-map-resolve@^0.5.0: urix "^0.1.0" source-map-support@~0.5.12: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" dependencies: buffer-from "^1.0.0" source-map "^0.6.0" source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" source-map@^0.5.0, source-map@^0.5.6: version "0.5.7" @@ -4381,8 +4360,8 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" sparkles@^1.0.0: - version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3" + version "1.0.1" + resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -4395,8 +4374,8 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" ssri@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" + version "6.0.2" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" dependencies: figgy-pudding "^3.5.1" @@ -4415,8 +4394,8 @@ stream-browserify@^2.0.1: readable-stream "^2.0.2" stream-consume@~0.1.0: - version "0.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f" + version "0.1.1" + resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48" stream-each@^1.1.0: version "1.2.3" @@ -4439,29 +4418,15 @@ stream-shift@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" -string-width@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - -string.prototype.trimend@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46" - dependencies: - define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - -string.prototype.trimstart@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7" +string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" dependencies: - define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" -string_decoder@^1.0.0: +string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" dependencies: @@ -4469,7 +4434,7 @@ string_decoder@^1.0.0: string_decoder@~0.10.x: version "0.10.31" - resolved "https://repo.jenkins-ci.org/api/npm/npm/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" string_decoder@~1.1.1: version "1.1.1" @@ -4479,25 +4444,19 @@ string_decoder@~1.1.1: strip-ansi@^3.0.0: version "3.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" dependencies: ansi-regex "^2.0.0" -strip-ansi@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - dependencies: - ansi-regex "^4.1.0" - -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" dependencies: - ansi-regex "^5.0.0" + ansi-regex "^5.0.1" strip-bom@^1.0.0: version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794" dependencies: first-chunk-stream "^1.0.0" is-utf8 "^0.2.0" @@ -4513,14 +4472,13 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: style-loader@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c" - integrity sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ== dependencies: loader-utils "^2.0.0" schema-utils "^3.0.0" supports-color@^2.0.0: version "2.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" supports-color@^5.3.0: version "5.5.0" @@ -4534,23 +4492,19 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -table-layout@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.1.tgz#8411181ee951278ad0638aea2f779a9ce42894f9" - dependencies: - array-back "^4.0.1" - deep-extend "~0.6.0" - typical "^5.2.0" - wordwrapjs "^4.0.0" +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" -table@^5.2.3: - version "5.4.6" - resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" +table@^6.0.9: + version "6.8.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" dependencies: - ajv "^6.10.2" - lodash "^4.17.14" - slice-ansi "^2.1.0" - string-width "^3.0.0" + ajv "^8.0.1" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" @@ -4584,27 +4538,27 @@ text-table@^0.2.0: through2@^0.6.1: version "0.6.5" - resolved "https://repo.jenkins-ci.org/api/npm/npm/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" dependencies: readable-stream ">=1.0.33-1 <1.1.0-0" xtend ">=4.0.0 <4.1.0-0" through2@^2.0.0: - version "2.0.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" dependencies: - readable-stream "^2.1.5" + readable-stream "~2.3.6" xtend "~4.0.1" tildify@^1.0.0: version "1.2.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a" + resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a" dependencies: os-homedir "^1.0.0" time-stamp@^1.0.0: version "1.1.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" + resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" timers-browserify@^2.0.4: version "2.0.12" @@ -4648,13 +4602,13 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -tslib@^1.10.0, tslib@^1.9.0: +tslib@^1.10.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" tty-browserify@0.0.0: version "0.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" + resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" @@ -4662,44 +4616,36 @@ type-check@^0.4.0, type-check@~0.4.0: dependencies: prelude-ls "^1.2.1" -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" typedarray@^0.0.6: version "0.0.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typical@^5.0.0, typical@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" - -unc-path-regex@^0.1.0: +unc-path-regex@^0.1.2: version "0.1.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" + resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" +unicode-canonical-property-names-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" +unicode-match-property-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" + unicode-canonical-property-names-ecmascript "^2.0.0" + unicode-property-aliases-ecmascript "^2.0.0" -unicode-match-property-value-ecmascript@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" +unicode-match-property-value-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" -unicode-property-aliases-ecmascript@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" +unicode-property-aliases-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" union-value@^1.0.0: version "1.0.1" @@ -4710,11 +4656,6 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" -uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= - unique-filename@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" @@ -4729,7 +4670,7 @@ unique-slug@^2.0.0: unique-stream@^1.0.0: version "1.0.0" - resolved "https://repo.jenkins-ci.org/api/npm/npm/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b" + resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b" unset-value@^1.0.0: version "1.0.0" @@ -4743,8 +4684,8 @@ upath@^1.1.1: resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" uri-js@^4.2.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" dependencies: punycode "^2.1.0" @@ -4765,15 +4706,15 @@ use@^3.1.0: user-home@^1.1.1: version "1.1.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" + resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" -util-deprecate@^1.0.2, util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" util@0.10.3: version "0.10.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" dependencies: inherits "2.0.1" @@ -4783,19 +4724,19 @@ util@^0.11.0: dependencies: inherits "2.0.3" -v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745" +v8-compile-cache@^2.0.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" v8flags@^2.0.2: version "2.1.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" dependencies: user-home "^1.1.1" vinyl-fs@^0.3.0: version "0.3.14" - resolved "https://repo.jenkins-ci.org/api/npm/npm/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6" + resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6" dependencies: defaults "^1.0.0" glob-stream "^3.1.5" @@ -4808,14 +4749,14 @@ vinyl-fs@^0.3.0: vinyl@^0.4.0: version "0.4.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847" dependencies: clone "^0.2.0" clone-stats "^0.0.1" vinyl@^0.5.0: version "0.5.3" - resolved "https://repo.jenkins-ci.org/api/npm/npm/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde" dependencies: clone "^1.0.0" clone-stats "^0.0.1" @@ -4825,50 +4766,49 @@ vm-browserify@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" -watchpack-chokidar2@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0" +watchpack-chokidar2@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" dependencies: chokidar "^2.1.8" watchpack@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b" + version "1.7.5" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" dependencies: graceful-fs "^4.1.2" neo-async "^2.5.0" optionalDependencies: chokidar "^3.4.1" - watchpack-chokidar2 "^2.0.0" + watchpack-chokidar2 "^2.0.1" webpack-cli@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.1.0.tgz#3a8fe05326015cc92b67abea68e3c320d418b16e" - dependencies: - "@webpack-cli/info" "^1.0.2" - "@webpack-cli/serve" "^1.0.1" - ansi-escapes "^4.3.1" - colorette "^1.2.1" - command-line-usage "^6.1.0" - commander "^6.0.0" - enquirer "^2.3.4" - execa "^4.0.0" + version "4.9.2" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" + dependencies: + "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^1.1.1" + "@webpack-cli/info" "^1.4.1" + "@webpack-cli/serve" "^1.6.1" + colorette "^2.0.14" + commander "^7.0.0" + execa "^5.0.0" + fastest-levenshtein "^1.0.12" import-local "^3.0.2" - interpret "^2.0.0" + interpret "^2.2.0" rechoir "^0.7.0" - v8-compile-cache "^2.1.0" - webpack-merge "^4.2.2" + webpack-merge "^5.7.3" webpack-fix-style-only-entries@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/webpack-fix-style-only-entries/-/webpack-fix-style-only-entries-0.6.0.tgz#193ab04c63cba5c1da92d5ec34a48aa1448a853c" - integrity sha512-9d3S+Y3b90D5OFUxO6bA/o7Ebx0uGWSPoVepvMvMEup7XefqdrDPEDI10tuFhxERD/xkMJAViakE1NPZn9zA+w== + version "0.6.1" + resolved "https://registry.yarnpkg.com/webpack-fix-style-only-entries/-/webpack-fix-style-only-entries-0.6.1.tgz#8e517085cc3426ccd1cb37ff2897b993563a424a" -webpack-merge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" +webpack-merge@^5.7.3: + version "5.8.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" dependencies: - lodash "^4.17.15" + clone-deep "^4.0.1" + wildcard "^2.0.0" webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: version "1.4.3" @@ -4878,8 +4818,8 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: source-map "~0.6.1" webpack@4: - version "4.44.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72" + version "4.46.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" dependencies: "@webassemblyjs/ast" "1.9.0" "@webassemblyjs/helper-module-context" "1.9.0" @@ -4889,7 +4829,7 @@ webpack@4: ajv "^6.10.2" ajv-keywords "^3.4.1" chrome-trace-event "^1.0.2" - enhanced-resolve "^4.3.0" + enhanced-resolve "^4.5.0" eslint-scope "^4.0.3" json-parse-better-errors "^1.0.2" loader-runner "^2.4.0" @@ -4905,9 +4845,9 @@ webpack@4: watchpack "^1.7.4" webpack-sources "^1.4.1" -which@^1.2.12: - version "1.2.14" - resolved "https://repo.jenkins-ci.org/api/npm/npm/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" +which@^1.2.14: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" dependencies: isexe "^2.0.0" @@ -4917,21 +4857,18 @@ which@^2.0.1: dependencies: isexe "^2.0.0" +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + window-handle@0.0.6: version "0.0.6" - resolved "https://repo.jenkins-ci.org/api/npm/npm/window-handle/-/window-handle-0.0.6.tgz#f71cc52f8c21f337ae8785b71c8356e08a263c2e" + resolved "https://registry.yarnpkg.com/window-handle/-/window-handle-0.0.6.tgz#f71cc52f8c21f337ae8785b71c8356e08a263c2e" word-wrap@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" -wordwrapjs@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.0.tgz#9aa9394155993476e831ba8e59fb5795ebde6800" - dependencies: - reduce-flatten "^2.0.0" - typical "^5.0.0" - worker-farm@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" @@ -4940,27 +4877,24 @@ worker-farm@^1.7.0: wrappy@1: version "1.0.2" - resolved "https://repo.jenkins-ci.org/api/npm/npm/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -write@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" - dependencies: - mkdirp "^0.5.1" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1: - version "4.0.1" - resolved "https://repo.jenkins-ci.org/api/npm/npm/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" y18n@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + yaml@^1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" - integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" From 765d763c170f54c080a879539255c87d0f636eb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Mar 2022 13:50:25 +0000 Subject: [PATCH 631/932] Bump config-file-provider from 3.7.0 to 3.9.0 Bumps [config-file-provider](https://github.com/jenkinsci/config-file-provider-plugin) from 3.7.0 to 3.9.0. - [Release notes](https://github.com/jenkinsci/config-file-provider-plugin/releases) - [Commits](https://github.com/jenkinsci/config-file-provider-plugin/compare/config-file-provider-3.7.0...config-file-provider-3.9.0) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:config-file-provider dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0984fdceb..46a1bd465 100644 --- a/pom.xml +++ b/pom.xml @@ -239,7 +239,7 @@ org.jenkins-ci.plugins config-file-provider - 3.7.0 + 3.9.0 test From a33750d7ab12caa060abf549f9c92256dd426579 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 18 Mar 2022 11:53:42 -0400 Subject: [PATCH 632/932] [JENKINS-68071] Make `CpsThreadGroup.paused` `transient` to avoid XStreaming `AtomicBoolean` --- .../plugins/workflow/cps/CpsThreadGroup.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java index 0022dead4..7706ebe41 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java @@ -145,7 +145,12 @@ public final class CpsThreadGroup implements Serializable { * on hold (for example while inspecting a suspicious state or to perform a maintenance * when a failure is predictable.) */ - private /*almost final*/ AtomicBoolean paused = new AtomicBoolean(); + private /*almost final*/ transient AtomicBoolean paused = new AtomicBoolean(); + + /** + * Persistent version of {@link #paused}. + */ + private boolean executionPaused; /** * "Exported" closures that are referenced by live {@link CpsStepContext}s. @@ -183,15 +188,15 @@ private Object readResolve() { script.setBinding(shell.getContext()); } } + if (paused == null) { // introduced and later removed from serial form + paused = new AtomicBoolean(executionPaused); + } return this; } private void setupTransients() { runner = new CpsVmExecutorService(this); pausedByQuietMode = new AtomicBoolean(); - if (paused == null) { // earlier versions did not have this field. - paused = new AtomicBoolean(); - } } @CpsVmThreadOnly @@ -355,6 +360,7 @@ public void run() { */ public Future pause() { paused.set(true); + executionPaused = true; // CPS VM might have a long queue in its task list, so to properly ensure // that the execution has actually suspended, call scheduleRun() excessively return scheduleRun(); @@ -365,6 +371,7 @@ public Future pause() { */ public void unpause() { if (paused.getAndSet(false)) { + executionPaused = false; // some threads might have became executable while we were pausing. scheduleRun(); } else { From 7e5864389f7d03dab8de7d27a51c62fcd4078ecd Mon Sep 17 00:00:00 2001 From: offa Date: Fri, 18 Mar 2022 16:02:01 +0000 Subject: [PATCH 633/932] Use getClientCharset() Co-authored-by: Jesse Glick --- .../plugins/workflow/cps/replay/ReplayPipelineCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java index 380401aa0..53cdc08f5 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java @@ -72,7 +72,7 @@ if (!action.isEnabled() || !action.isReplayableSandboxTest()) { throw new AbortException("Not authorized to replay builds of this job"); } - String text = IOUtils.toString(stdin, StandardCharsets.UTF_8); + String text = IOUtils.toString(stdin, getClientCharset()); if (script != null) { Map replacementLoadedScripts = new HashMap<>(action.getOriginalLoadedScripts()); if (!replacementLoadedScripts.containsKey(script)) { From 3a9301ca97740cb4b87c7a5d27ba8d7367af831f Mon Sep 17 00:00:00 2001 From: offa Date: Fri, 18 Mar 2022 16:02:12 +0000 Subject: [PATCH 634/932] Remove unused import Co-authored-by: Jesse Glick --- .../plugins/workflow/cps/replay/ReplayPipelineCommand.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java index 53cdc08f5..564846ba4 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java @@ -30,8 +30,6 @@ import hudson.cli.handlers.GenericItemOptionHandler; import hudson.model.Job; import hudson.model.Run; - -import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; import org.apache.commons.io.IOUtils; From ec6fa27cd2fb1ec0cdf592dc4ed6694fb2247cfc Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 18 Mar 2022 13:46:43 -0400 Subject: [PATCH 635/932] Ignore calls to `com.cloudbees.groovy.cps.*` --- .../org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java index afa90cf4c..a9369d427 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java @@ -73,6 +73,10 @@ private static boolean isInternal(Class clazz) { // (simply checking whether the class loader can “see”, say, jenkins/model/Jenkins.class // would falsely mark third-party libs bundled in Jenkins plugins) String name = clazz.getName(); + if (name.startsWith("com.cloudbees.groovy.cps.")) { + // Likely synthetic call, as to CpsDefaultGroovyMethods. + return false; + } // acc. to `find …/jenkinsci/*/src/main/java -type f -exec egrep -h '^package ' {} \; | sort | uniq` this is decent return name.contains("jenkins") || name.contains("hudson") || name.contains("cloudbees"); } From ca014d015e2ced83bd0efa9b07010bb389f560e4 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 18 Mar 2022 14:04:43 -0400 Subject: [PATCH 636/932] Test coverage for ec6fa27cd2fb1ec0cdf592dc4ed6694fb2247cfc --- .../org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java index 89b48c47a..7549873ca 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java @@ -50,7 +50,7 @@ public class LoggingInvokerTest { } @Test public void closures() throws Exception { - assertInternalCalls("node {echo 'hello'}", true); + assertInternalCalls("node {echo 'hello'}; [1, 2].collect {it + 1}", true); } private void assertInternalCalls(String script, boolean sandbox, String... calls) throws Exception { From 02c22d045163298258c416683052c174dfdf6921 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 18 Mar 2022 14:25:46 -0400 Subject: [PATCH 637/932] Test coverage for `constructorCall`; `superCall` perhaps unused --- .../org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java | 2 +- .../jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java index a9369d427..193c042a9 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java @@ -109,7 +109,7 @@ private void maybeRecord(Class clazz, Supplier message) { } @Override public Object superCall(Class senderType, Object receiver, String method, Object[] args) throws Throwable { - maybeRecord(senderType, () -> senderType.getName() + "."); + maybeRecord(senderType, () -> senderType.getName() + method); return delegate.superCall(senderType, receiver, method, args); } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java index 7549873ca..8afb75f76 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/LoggingInvokerTest.java @@ -53,6 +53,13 @@ public class LoggingInvokerTest { assertInternalCalls("node {echo 'hello'}; [1, 2].collect {it + 1}", true); } + @Test public void specialCalls() throws Exception { + assertInternalCalls("new InterruptedBuildAction([])", false, + "jenkins.model.InterruptedBuildAction."); + // TODO all of the receivers are of X from GroovyClassLoader so not recorded here: + assertInternalCalls("class X extends hudson.lifecycle.Lifecycle {void onReady() {super.onReady()}}; new X().getHudsonWar(); new X().onReady()", false); + } + private void assertInternalCalls(String script, boolean sandbox, String... calls) throws Exception { WorkflowJob p = r.createProject(WorkflowJob.class); p.setDefinition(new CpsFlowDefinition(script, sandbox)); From d2b156452aba46d8bf80134a4a74c9dcdc8c2ce3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Mar 2022 18:57:56 +0000 Subject: [PATCH 638/932] Bump testcontainers from 1.16.2 to 1.16.3 Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.16.2 to 1.16.3. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.16.2...1.16.3) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 46a1bd465..b212927b6 100644 --- a/pom.xml +++ b/pom.xml @@ -276,7 +276,7 @@ org.testcontainers testcontainers - 1.16.2 + 1.16.3 test From a473dcddc941e66777cfd7c712a05100461e6339 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sun, 20 Mar 2022 13:09:31 -0700 Subject: [PATCH 639/932] Update plugin parent POM and BOM (#517) --- pom.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b212927b6..c38ef3791 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.37 + 4.38 org.jenkins-ci.plugins.workflow @@ -66,7 +66,6 @@ jenkinsci/${project.artifactId}-plugin 2.332.1 8 - 2.15.1 false 1.32 12.19.0 @@ -77,7 +76,7 @@ io.jenkins.tools.bom bom-2.332.x - 1198.v387c834fca_1a_ + 1210.vcd41f6657f03 import pom @@ -263,13 +262,11 @@ org.jenkins-ci.plugins subversion - ${subversion-plugin.version} test org.jenkins-ci.plugins subversion - ${subversion-plugin.version} tests test From d0a8f6a1c2631aecac324ba574a22d4a55425463 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 23 Mar 2022 06:05:05 -0700 Subject: [PATCH 640/932] [JENKINS-68092] Serialization of `java.util.concurrent` data structure in Pipeline: Groovy (#518) --- .../plugins/workflow/cps/CpsThreadGroup.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java index 22f0d148b..a5f844547 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java @@ -101,6 +101,11 @@ public final class CpsThreadGroup implements Serializable { */ private /*almost final*/ transient CpsFlowExecution execution; + /** + * Persistent version of {@link #runtimeThreads}. + */ + private volatile Map threads; + /** * All the member threads by their {@link CpsThread#id}. * @@ -108,7 +113,7 @@ public final class CpsThreadGroup implements Serializable { * and iteration through {@link CpsThreadDump#from(CpsThreadGroup)} may occur on other threads * (e.g. non-blocking steps, thread dumps from the UI). */ - private final NavigableMap threads = new ConcurrentSkipListMap<>(); + private transient NavigableMap runtimeThreads; /** * Unique thread ID generator. @@ -178,6 +183,7 @@ private Object readResolve() { execution = CpsFlowExecution.PROGRAM_STATE_SERIALIZATION.get(); setupTransients(); assert execution!=null; + runtimeThreads.putAll(threads); if (/* compatibility: the field will be null in old programs */ scripts != null && !scripts.isEmpty()) { GroovyShell shell = execution.getShell(); // Take the canonical bindings from the main script and relink that object with that of the shell and all other loaded scripts which kept the same bindings. @@ -193,15 +199,21 @@ private Object readResolve() { } private void setupTransients() { + runtimeThreads = new ConcurrentSkipListMap<>(); runner = new CpsVmExecutorService(this); pausedByQuietMode = new AtomicBoolean(); } + private Object writeReplace() { + threads = new HashMap<>(runtimeThreads); + return this; + } + @CpsVmThreadOnly public CpsThread addThread(@NonNull Continuable program, FlowHead head, ContextVariableSet contextVariables) { assertVmThread(); CpsThread t = new CpsThread(this, iota++, program, head, contextVariables); - threads.put(t.id, t); + runtimeThreads.put(t.id, t); return t; } @@ -223,9 +235,9 @@ private void assertVmThread() { * null if the thread has finished executing. */ public CpsThread getThread(int id) { - CpsThread thread = threads.get(id); + CpsThread thread = runtimeThreads.get(id); if (thread == null && LOGGER.isLoggable(Level.FINE)) { - LOGGER.log(Level.FINE, "no thread " + id + " among " + threads.keySet(), new IllegalStateException()); + LOGGER.log(Level.FINE, "no thread " + id + " among " + runtimeThreads.keySet(), new IllegalStateException()); } return thread; } @@ -234,7 +246,7 @@ public CpsThread getThread(int id) { * Returns an unmodifiable snapshot of all threads in the thread group. */ public Iterable getThreads() { - return threads.values(); + return runtimeThreads.values(); } @CpsVmThreadOnly("root") @@ -327,7 +339,7 @@ public void run() { // ensures that everything submitted in front of us has finished. runner.submit(new Runnable() { public void run() { - if (threads.isEmpty()) { + if (runtimeThreads.isEmpty()) { runner.shutdown(); } // the original promise of scheduleRun() is now complete @@ -403,7 +415,7 @@ private boolean run() { boolean stillRunnable = false; // TODO: maybe instead of running all the thread, run just one thread in round robin - for (CpsThread t : threads.values().toArray(new CpsThread[threads.size()])) { + for (CpsThread t : runtimeThreads.values().toArray(new CpsThread[runtimeThreads.size()])) { if (t.isRunnable()) { Outcome o = t.runNextChunk(); if (o.isFailure()) { @@ -426,9 +438,9 @@ private boolean run() { LOGGER.fine("completed " + t); t.fireCompletionHandlers(o); // do this after ErrorAction is set above - threads.remove(t.id); + runtimeThreads.remove(t.id); t.cleanUp(); - if (threads.isEmpty()) { + if (runtimeThreads.isEmpty()) { execution.onProgramEnd(o); try { this.execution.saveOwner(); @@ -620,7 +632,7 @@ private void propagateErrorToWorkflow(Throwable t) { // as that's the ony more likely to have caused the problem. // TODO: when we start tracking which thread is just waiting for the body, then // that information would help. or maybe we should just remember the thread that has run the last time - Map.Entry lastEntry = threads.lastEntry(); + Map.Entry lastEntry = runtimeThreads.lastEntry(); if (lastEntry != null) { lastEntry.getValue().resume(new Outcome(null,t)); } else { From 9977c912fc454fa83632ea9ddfcd08e474847827 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 24 Mar 2022 11:21:27 -0400 Subject: [PATCH 641/932] Forgot `.` between class and method names in `superCall` Co-authored-by: Devin Nusbaum --- .../java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java index 193c042a9..fb2c71976 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/LoggingInvoker.java @@ -109,7 +109,7 @@ private void maybeRecord(Class clazz, Supplier message) { } @Override public Object superCall(Class senderType, Object receiver, String method, Object[] args) throws Throwable { - maybeRecord(senderType, () -> senderType.getName() + method); + maybeRecord(senderType, () -> senderType.getName() + "." + method); return delegate.superCall(senderType, receiver, method, args); } From 547b4947c161a46c4d1e113da9e81ddd411adbc3 Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Wed, 30 Mar 2022 12:11:09 +0200 Subject: [PATCH 642/932] Use a concurrent map to manage timings When using a large number of concurrent steps, writing timings back can become a contention point as it locks the CpsFlowExecution object. Replaced the timings implementation by a concurrent map and make sure all operations are atomic. --- .../workflow/cps/CpsFlowExecution.java | 45 +++++++------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 52216a030..1c59036c1 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -92,6 +92,7 @@ import java.util.NavigableMap; import java.util.Stack; import java.util.TreeMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -384,8 +385,7 @@ enum TimingKind { } /** accumulated time in ns of a given {@link TimingKind#name}; {@link String} key for pretty XStream form */ - @GuardedBy("this") - @CheckForNull Map timings; + @NonNull Map timings = new ConcurrentHashMap<>(); @Deprecated public CpsFlowExecution(String script, FlowExecutionOwner owner) throws IOException { @@ -413,6 +413,10 @@ public CpsFlowExecution(String script, boolean sandbox, FlowExecutionOwner owner private Object readResolve() { if (loadedScripts==null) loadedScripts = new HashMap<>(); // field added later + // Convert timings to concurrent hash map + if (!(timings instanceof ConcurrentHashMap)) { + timings = timings == null ? new ConcurrentHashMap<>() : new ConcurrentHashMap<>(timings); + } return this; } @@ -424,16 +428,7 @@ private Timing(TimingKind kind) { start = System.nanoTime(); } @Override public void close() { - synchronized (CpsFlowExecution.this) { - if (timings == null) { - timings = new HashMap<>(); - } - Long orig = timings.get(kind.name()); - if (orig == null) { - orig = 0L; - } - timings.put(kind.name(), orig + System.nanoTime() - start); - } + timings.merge(kind.name(), System.nanoTime() - start, Long::sum); } } @@ -448,12 +443,10 @@ Timing time(TimingKind kind) { static final Logger TIMING_LOGGER = Logger.getLogger(CpsFlowExecution.class.getName() + ".timing"); - synchronized void logTimings() { - if (timings != null && TIMING_LOGGER.isLoggable(Level.FINE)) { + void logTimings() { + if (TIMING_LOGGER.isLoggable(Level.FINE)) { Map formatted = new TreeMap<>(); - for (Map.Entry entry : timings.entrySet()) { - formatted.put(entry.getKey(), entry.getValue() / 1000 / 1000 + "ms"); - } + timings.forEach((k, v) -> formatted.put(k, v / 1000 / 1000 + "ms")); TIMING_LOGGER.log(Level.FINE, "timings for {0}: {1}", new Object[] {owner, formatted}); } } @@ -1643,11 +1636,7 @@ public void marshal(Object source, HierarchicalStreamWriter w, MarshallingContex if (e.durabilityHint != null) { writeChild(w, context, "durabilityHint", e.durabilityHint, FlowDurabilityHint.class); } - synchronized (e) { - if (e.timings != null) { - writeChild(w, context, "timings", e.timings, Map.class); - } - } + writeChild(w, context, "timings", e.timings, Map.class); writeChild(w, context, "sandbox", e.sandbox, Boolean.class); if (e.user != null) { writeChild(w, context, "user", e.user, String.class); @@ -1931,14 +1920,10 @@ public void autopersist(@NonNull FlowNode n) throws IOException { continue; } if (exec instanceof CpsFlowExecution) { - Map timings = ((CpsFlowExecution) exec).timings; - if (timings != null) { - pw.println("Timings for " + run + ":"); - for (Map.Entry entry : new TreeMap<>(timings).entrySet()) { - pw.println(" " + entry.getKey() + "\t" + entry.getValue() / 1000 / 1000 + "ms"); - } - pw.println(); - } + Map sortedTimings = new TreeMap<>(((CpsFlowExecution) exec).timings); + pw.println("Timings for " + run + ":"); + sortedTimings.forEach((k, v) -> pw.println(" " + k + "\t" + v / 1000 / 1000 + "ms")); + pw.println(); } } } From fc580de14301a4535538493d2ba60a1ebc7a8cde Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Wed, 30 Mar 2022 14:29:35 +0200 Subject: [PATCH 643/932] Fix spotbugs issue --- .../org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 1c59036c1..71d4aec5b 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -410,6 +410,7 @@ public CpsFlowExecution(String script, boolean sandbox, FlowExecutionOwner owner /** * Perform post-deserialization state resurrection that handles version evolution */ + @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", justification = "Could be null if deserialized from old version") private Object readResolve() { if (loadedScripts==null) loadedScripts = new HashMap<>(); // field added later From 25a686933b98c8f64ba3dba77ae6441096fc45c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 00:52:49 +0000 Subject: [PATCH 644/932] Bump actions/setup-java from 2 to 3 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2 to 3. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index d1ceb2a66..6ca08545a 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -47,7 +47,7 @@ jobs: with: fetch-depth: 0 - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'adopt' java-version: 8 From 3f09155513c1c8ed3727ec16220701bee0c31a9c Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 20 Apr 2022 22:22:43 -0700 Subject: [PATCH 645/932] Update plugin parent POM and BOM (#527) --- pom.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index c38ef3791..f7557e82c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.38 + 4.40 org.jenkins-ci.plugins.workflow @@ -44,7 +44,7 @@ - scm:git:git://github.com/${gitHubRepo}.git + scm:git:https://github.com/${gitHubRepo}.git scm:git:git@github.com:${gitHubRepo}.git https://github.com/${gitHubRepo} ${scmTag} @@ -65,7 +65,6 @@ 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin 2.332.1 - 8 false 1.32 12.19.0 @@ -76,7 +75,7 @@ io.jenkins.tools.bom bom-2.332.x - 1210.vcd41f6657f03 + 1289.v5c4b_1c43511b_ import pom @@ -114,7 +113,6 @@ org.jenkins-ci.plugins support-core - 2.43 true From 39abe5c49a65d94ef91aacb18720620cfb27fff0 Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Mon, 25 Apr 2022 17:53:55 -0600 Subject: [PATCH 646/932] Migrate from readResolve to unmarshal (#528) * check for null timings field * migrate readResolve to unmarshal * add note about using (un)marshal instead of readResolve --- .../workflow/cps/CpsFlowExecution.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 71d4aec5b..153a31c76 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -407,20 +407,6 @@ public CpsFlowExecution(String script, boolean sandbox, FlowExecutionOwner owner this(script, sandbox, owner, null); } - /** - * Perform post-deserialization state resurrection that handles version evolution - */ - @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", justification = "Could be null if deserialized from old version") - private Object readResolve() { - if (loadedScripts==null) - loadedScripts = new HashMap<>(); // field added later - // Convert timings to concurrent hash map - if (!(timings instanceof ConcurrentHashMap)) { - timings = timings == null ? new ConcurrentHashMap<>() : new ConcurrentHashMap<>(timings); - } - return this; - } - class Timing implements AutoCloseable { private final TimingKind kind; private final long start; @@ -428,7 +414,13 @@ private Timing(TimingKind kind) { this.kind = kind; start = System.nanoTime(); } + + @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE") @Override public void close() { + // it is possible for timings to be null if an old build (< v2686.v7c37e0578401) is being loaded from a saved state + if (timings == null) { + timings = new ConcurrentHashMap<>(); + } timings.merge(kind.name(), System.nanoTime() - start, Long::sum); } } @@ -1612,6 +1604,8 @@ public void pause(final boolean v) throws IOException { // the execution in Groovy CPS should hold that lock (or worse, hold that lock in the runNextChunk method) // so that the execution gets suspended while we are getting serialized + // Note: XStream ignores readResolve and writeReplace methods on types with custom Converter implementations, so use marshal and unmarshal instead. + public static final class ConverterImpl implements Converter { private final ReflectionProvider ref; private final Mapper mapper; @@ -1685,7 +1679,7 @@ private void writeChild(HierarchicalStreamWriter w, MarshallingContext conte w.endNode(); } - @SuppressFBWarnings(value = "BX_UNBOXING_IMMEDIATELY_REBOXED", justification = "Nastiness with the impl") + @SuppressFBWarnings(value = {"BX_UNBOXING_IMMEDIATELY_REBOXED", "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"}, justification = "Nastiness with the impl and timings variable could be null if deserialized from old version") public Object unmarshal(HierarchicalStreamReader reader, final UnmarshallingContext context) { CpsFlowExecution result; @@ -1752,6 +1746,13 @@ public Object unmarshal(HierarchicalStreamReader reader, final UnmarshallingCont reader.moveUp(); } + if (result.loadedScripts == null) { + result.loadedScripts = new HashMap<>(); // field added later + } + // Convert timings to concurrent hash map + if (!(result.timings instanceof ConcurrentHashMap)) { + result.timings = result.timings == null ? new ConcurrentHashMap<>() : new ConcurrentHashMap<>(result.timings); + } return result; } catch (Exception ex) { LOGGER.log(Level.SEVERE, "Failed to even load the FlowExecution", ex); From 434009a31bf1ab2aae028c02fe2c4b41dd7c9af9 Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Tue, 26 Apr 2022 11:15:24 -0600 Subject: [PATCH 647/932] remove unnecessary comment (#529) --- .../org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 153a31c76..7266927f9 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -415,12 +415,7 @@ private Timing(TimingKind kind) { start = System.nanoTime(); } - @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE") @Override public void close() { - // it is possible for timings to be null if an old build (< v2686.v7c37e0578401) is being loaded from a saved state - if (timings == null) { - timings = new ConcurrentHashMap<>(); - } timings.merge(kind.name(), System.nanoTime() - start, Long::sum); } } From 6bd4e8bf837ba1df4394efdd003c70bb1b9ac33f Mon Sep 17 00:00:00 2001 From: Yaroslav Afenkin Date: Wed, 4 May 2022 15:04:19 -0400 Subject: [PATCH 648/932] [SECURITY-2450] --- pom.xml | 2 + .../workflow/cps/CpsFlowDefinition.java | 37 ++++- .../cps/CpsFlowDefinition/config.jelly | 1 + .../workflow/cps/CpsFlowDefinition2Test.java | 152 +++++++++++++++++- .../cps/CpsFlowDefinitionRJRTest.java | 24 +++ 5 files changed, 211 insertions(+), 5 deletions(-) create mode 100644 src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java diff --git a/pom.xml b/pom.xml index f7557e82c..711c9d72a 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,7 @@ org.jenkins-ci.plugins script-security + 1172.v35f6a_0b_8207e org.jenkins-ci.plugins @@ -148,6 +149,7 @@ org.jenkins-ci.plugins.workflow workflow-job test + 1181.va_25d15548158 org.jenkins-ci.plugins.workflow diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java index ebf62225c..e69bfb32c 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java @@ -24,6 +24,7 @@ package org.jenkinsci.plugins.workflow.cps; +import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.Action; import hudson.model.Item; @@ -33,6 +34,8 @@ import hudson.model.TaskListener; import hudson.util.FormValidation; import hudson.util.StreamTaskListener; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn; import org.jenkinsci.plugins.workflow.flow.DurabilityHintProvider; import org.jenkinsci.plugins.workflow.flow.FlowDefinition; @@ -80,7 +83,8 @@ public CpsFlowDefinition(String script) { @DataBoundConstructor public CpsFlowDefinition(String script, boolean sandbox) { StaplerRequest req = Stapler.getCurrentRequest(); - this.script = sandbox ? script : ScriptApproval.get().configuring(script, GroovyLanguage.get(), ApprovalContext.create().withCurrentUser().withItemAsKey(req != null ? req.findAncestorObject(Item.class) : null)); + this.script = sandbox ? script : ScriptApproval.get().configuring(script, GroovyLanguage.get(), + ApprovalContext.create().withCurrentUser().withItemAsKey(req != null ? req.findAncestorObject(Item.class) : null), req == null); this.sandbox = sandbox; } @@ -123,14 +127,41 @@ public CpsFlowExecution create(FlowExecutionOwner owner, TaskListener listener, @Extension public static class DescriptorImpl extends FlowDefinitionDescriptor { + /* In order to fix SECURITY-2450 without causing significant UX regressions, we decided to continue to + * automatically approve scripts on save if the script was modified by an administrator. To make this possible, + * we added a new hidden input field to the config.jelly to track the pre-save version of the script. Since + * CpsFlowDefinition calls ScriptApproval.configuring in its @DataBoundConstructor, the normal way to handle + * things would be to add an oldScript parameter to the constructor and perform the relevant logic there. + * + * However, that would have compatibility implications for tools like JobDSL, since @DataBoundConstructor + * parameters are required. We cannot use a @DataBoundSetter with a corresponding field and getter to trivially + * make oldScript optional, because we would need to call ScriptApproval.configuring after all + * @DataBoundSetters have been invoked (rather than in the @DataBoundConstructor), which is why we use Descriptor.newInstance. + */ + @Override + public FlowDefinition newInstance(@NonNull StaplerRequest req, @NonNull JSONObject formData) throws FormException { + CpsFlowDefinition cpsFlowDefinition = (CpsFlowDefinition) super.newInstance(req, formData); + if (!cpsFlowDefinition.sandbox && formData.get("oldScript") != null) { + String oldScript = formData.getString("oldScript"); + boolean approveIfAdmin = !StringUtils.equals(oldScript, cpsFlowDefinition.script); + if (approveIfAdmin) { + ScriptApproval.get().configuring(cpsFlowDefinition.script, GroovyLanguage.get(), + ApprovalContext.create().withCurrentUser().withItemAsKey(req.findAncestorObject(Item.class)), true); + } + } + return cpsFlowDefinition; + } + @Override public String getDisplayName() { return "Pipeline script"; } @RequirePOST - public FormValidation doCheckScript(@QueryParameter String value, @QueryParameter boolean sandbox) { - return sandbox ? FormValidation.ok() : ScriptApproval.get().checking(value, GroovyLanguage.get()); + public FormValidation doCheckScript(@QueryParameter String value, @QueryParameter String oldScript, + @QueryParameter boolean sandbox) { + return sandbox ? FormValidation.ok() : + ScriptApproval.get().checking(value, GroovyLanguage.get(), !StringUtils.equals(oldScript, value)); } @RequirePOST diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly index 1e0ef0360..c075a1fd2 100644 --- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly +++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly @@ -24,6 +24,7 @@ --> + diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java index 0f4938c45..aac0bcafb 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java @@ -25,19 +25,29 @@ package org.jenkinsci.plugins.workflow.cps; import com.cloudbees.groovy.cps.CpsTransformer; +import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlInput; +import com.gargoylesoftware.htmlunit.html.HtmlTextArea; import hudson.Functions; import hudson.model.Computer; import hudson.model.Describable; import hudson.model.Executor; +import hudson.model.Item; import hudson.model.Result; import java.io.Serializable; import java.util.Collections; +import java.util.List; import java.util.Set; import java.util.logging.Level; + +import hudson.security.Permission; import jenkins.model.Jenkins; import org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException; +import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval; +import org.jenkinsci.plugins.scriptsecurity.scripts.languages.GroovyLanguage; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.jenkinsci.plugins.workflow.steps.Step; @@ -58,13 +68,16 @@ import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; +import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.DataBoundConstructor; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; public class CpsFlowDefinition2Test { @@ -89,7 +102,7 @@ public void endlessRecursion() throws Exception { WorkflowRun r = jenkins.assertBuildStatus(Result.FAILURE, job.scheduleBuild2(0).get()); jenkins.assertLogContains("look for unbounded recursion", r); - Assert.assertTrue("No queued FlyWeightTask for job should remain after failure", jenkins.jenkins.getQueue().isEmpty()); + assertTrue("No queued FlyWeightTask for job should remain after failure", jenkins.jenkins.getQueue().isEmpty()); for (Computer c : jenkins.jenkins.getComputers()) { for (Executor ex : c.getExecutors()) { @@ -117,7 +130,7 @@ public void endlessRecursionNonCPS() throws Exception { // Should have failed with error about excessive recursion depth WorkflowRun r = jenkins.assertBuildStatus(Result.FAILURE, job.scheduleBuild2(0).get()); - Assert.assertTrue("No queued FlyWeightTask for job should remain after failure", jenkins.jenkins.getQueue().isEmpty()); + assertTrue("No queued FlyWeightTask for job should remain after failure", jenkins.jenkins.getQueue().isEmpty()); for (Computer c : jenkins.jenkins.getComputers()) { for (Executor ex : c.getExecutors()) { @@ -852,6 +865,141 @@ public void scriptInitializerCallsCpsTransformedMethod() throws Exception { assertNull(Jenkins.get().getDescription()); } + @Issue("SECURITY-2450") + @Test + public void cpsScriptNonAdminConfiguration() throws Exception { + jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); + + MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); + mockStrategy.grant(Jenkins.READ).everywhere().to("devel"); + for (Permission p : Item.PERMISSIONS.getPermissions()) { + mockStrategy.grant(p).everywhere().to("devel"); + } + jenkins.jenkins.setAuthorizationStrategy(mockStrategy); + + JenkinsRule.WebClient wcDevel = jenkins.createWebClient(); + wcDevel.login("devel"); + + WorkflowJob p = jenkins.createProject(WorkflowJob.class); + + HtmlForm config = wcDevel.getPage(p, "configure").getFormByName("config"); + List scripts = config.getTextAreasByName("_.script"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlTextArea script = scripts.get(scripts.size() - 1); + String groovy = "echo 'hi from cpsScriptNonAdminConfiguration'"; + script.setText(groovy); + + List sandboxes = config.getInputsByName("_.sandbox"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); + assertTrue(sandbox.isChecked()); + sandbox.setChecked(false); + + jenkins.submit(config); + + assertEquals(1, ScriptApproval.get().getPendingScripts().size()); + assertFalse(ScriptApproval.get().isScriptApproved(groovy, GroovyLanguage.get())); + } + + @Issue("SECURITY-2450") + @Test + public void cpsScriptAdminConfiguration() throws Exception { + jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); + + MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); + mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); + for (Permission p : Item.PERMISSIONS.getPermissions()) { + mockStrategy.grant(p).everywhere().to("admin"); + } + jenkins.jenkins.setAuthorizationStrategy(mockStrategy); + + JenkinsRule.WebClient admin = jenkins.createWebClient(); + admin.login("admin"); + + WorkflowJob p = jenkins.createProject(WorkflowJob.class); + + HtmlForm config = admin.getPage(p, "configure").getFormByName("config"); + List scripts = config.getTextAreasByName("_.script"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlTextArea script = scripts.get(scripts.size() - 1); + String groovy = "echo 'hi from cpsScriptAdminConfiguration'"; + script.setText(groovy); + + List sandboxes = config.getInputsByName("_.sandbox"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); + assertTrue(sandbox.isChecked()); + sandbox.setChecked(false); + + jenkins.submit(config); + + assertTrue(ScriptApproval.get().isScriptApproved(groovy, GroovyLanguage.get())); + } + + @Issue("SECURITY-2450") + @Test + public void cpsScriptAdminModification() throws Exception { + jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); + + MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); + mockStrategy.grant(Jenkins.READ).everywhere().to("devel"); + mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); + for (Permission p : Item.PERMISSIONS.getPermissions()) { + mockStrategy.grant(p).everywhere().to("devel"); + mockStrategy.grant(p).everywhere().to("admin"); + } + jenkins.jenkins.setAuthorizationStrategy(mockStrategy); + + JenkinsRule.WebClient wc = jenkins.createWebClient(); + wc.login("devel"); + + WorkflowJob p = jenkins.createProject(WorkflowJob.class); + String userGroovy = "echo 'hi from devel'"; + String adminGroovy = "echo 'hi from admin'"; + + // initial configuration by user, script ends up in pending + { + HtmlForm config = wc.getPage(p, "configure").getFormByName("config"); + List scripts = config.getTextAreasByName("_.script"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlTextArea script = scripts.get(scripts.size() - 1); + script.setText(userGroovy); + + List sandboxes = config.getInputsByName("_.sandbox"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); + assertTrue(sandbox.isChecked()); + sandbox.setChecked(false); + + jenkins.submit(config); + + assertFalse(ScriptApproval.get().isScriptApproved(userGroovy, GroovyLanguage.get())); + } + + wc.login("admin"); + + // modification by admin, script gets approved automatically + { + HtmlForm config = wc.getPage(p, "configure").getFormByName("config"); + List scripts = config.getTextAreasByName("_.script"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlTextArea script = scripts.get(scripts.size() - 1); + script.setText(adminGroovy); + + List sandboxes = config.getInputsByName("_.sandbox"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); + assertFalse(sandbox.isChecked()); + + jenkins.submit(config); + + // script content was modified by admin, so it should be approved upon save + // the one that had been submitted by the user previously stays in pending + assertTrue(ScriptApproval.get().isScriptApproved(adminGroovy, GroovyLanguage.get())); + assertFalse(ScriptApproval.get().isScriptApproved(userGroovy, GroovyLanguage.get())); + } + } + public static class UnsafeParameterStep extends Step implements Serializable { private final UnsafeDescribable val; @DataBoundConstructor diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java new file mode 100644 index 000000000..f1ef48d35 --- /dev/null +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java @@ -0,0 +1,24 @@ +package org.jenkinsci.plugins.workflow.cps; + +import org.jenkinsci.plugins.workflow.job.WorkflowJob; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.RealJenkinsRule; + +public class CpsFlowDefinitionRJRTest { + + @Rule + public RealJenkinsRule rjr = new RealJenkinsRule(); + + @Test + public void smokes() throws Throwable { + rjr.then(CpsFlowDefinitionRJRTest::doesItSmoke); + } + + private static void doesItSmoke(JenkinsRule r) throws Exception { + WorkflowJob p = r.createProject(WorkflowJob.class, "p"); + p.setDefinition(new CpsFlowDefinition("print Jenkins.get().getRootDir().toString()", false)); + r.assertBuildStatusSuccess(p.scheduleBuild2(0)); + } +} From 76a7681702f42d65f77bbaa5463f146876ea62db Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 4 May 2022 15:04:53 -0400 Subject: [PATCH 649/932] [SECURITY-359] --- .../workflow/cps/CpsGroovyShellFactory.java | 2 +- .../cps/GroovySourceFileAllowlist.java | 225 ++++++++++++++++++ .../default-allowlist | 53 +++++ .../workflow/cps/CpsFlowExecutionTest.java | 65 ++++- 4 files changed, 343 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java create mode 100644 src/main/resources/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist/default-allowlist diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java index 0ef42dddc..bd1007631 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java @@ -111,7 +111,7 @@ private ImportCustomizer makeImportCustomizer() { private ClassLoader makeClassLoader() { ClassLoader cl = Jenkins.get().getPluginManager().uberClassLoader; - return GroovySandbox.createSecureClassLoader(cl); + return new GroovySourceFileAllowlist.ClassLoaderImpl(execution, GroovySandbox.createSecureClassLoader(cl)); } public CpsGroovyShell build() { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java new file mode 100644 index 000000000..7bca1d4f7 --- /dev/null +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java @@ -0,0 +1,225 @@ +/* + * The MIT License + * + * Copyright 2022 CloudBees, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package org.jenkinsci.plugins.workflow.cps; + +import edu.umd.cs.findbugs.annotations.CheckForNull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import hudson.Extension; +import hudson.ExtensionList; +import hudson.ExtensionPoint; +import hudson.Main; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import jenkins.util.SystemProperties; +import org.apache.commons.lang.StringUtils; + +/** + * Determines what Groovy source files can be loaded in Pipelines. + * + * In Pipeline, the standard behavior of {@code GroovyClassLoader} would allow Groovy source files from core or plugins + * to be loaded as long as they are somewhere on the classpath. This includes things like Groovy views, which are not + * intended to be available to pipelines. When these files are loaded, they are loaded by the trusted + * {@link CpsGroovyShell} and are not sandbox-transformed, which means that allowing arbitrary Groovy source files to + * be loaded is potentially unsafe. + * + * {@link ClassLoaderImpl} blocks all Groovy source files from being loaded by default unless they are allowed by an + * implementation of this extension point. + */ +public abstract class GroovySourceFileAllowlist implements ExtensionPoint { + private static final Logger LOGGER = Logger.getLogger(GroovySourceFileAllowlist.class.getName()); + private static final String DISABLED_PROPERTY = GroovySourceFileAllowlist.class.getName() + ".DISABLED"; + @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "Non-final for script console access") + static boolean DISABLED = SystemProperties.getBoolean(DISABLED_PROPERTY); + + /** + * Checks whether a given Groovy source file is allowed to be loaded by {@link CpsFlowExecution#getTrustedShell}. + * + * @param groovySourceFileUrl the absolute URL to the Groovy source file as returned by {@link ClassLoader#getResource} + * @return {@code true} if the Groovy source file may be loaded, {@code false} otherwise + */ + public abstract boolean isAllowed(String groovySourceFileUrl); + + public static List all() { + return ExtensionList.lookup(GroovySourceFileAllowlist.class); + } + + /** + * {@link ClassLoader} that acts normally except for returning {@code null} from {@link #getResource} and + * {@link #getResources} when looking up Groovy source files if the files are not allowed by + * {@link GroovySourceFileAllowlist}. + */ + static class ClassLoaderImpl extends ClassLoader { + private static final String LOG_MESSAGE_TEMPLATE = + "Preventing {0} from being loaded without sandbox protection in {1}. " + + "To allow access to this file, add any suffix of its URL to the system property ‘" + + DefaultAllowlist.ALLOWED_SOURCE_FILES_PROPERTY + "’ (use commas to separate multiple files). If you " + + "want to allow any Groovy file on the Jenkins classpath to be accessed, you may set the system " + + "property ‘" + DISABLED_PROPERTY + "’ to true."; + + private final String owner; + + public ClassLoaderImpl(@CheckForNull CpsFlowExecution execution, ClassLoader parent) { + super(parent); + this.owner = describeOwner(execution); + } + + private static String describeOwner(@CheckForNull CpsFlowExecution execution) { + if (execution != null) { + try { + return execution.getOwner().getExecutable().toString(); + } catch (IOException e) { + // Not significant in this context. + } + } + return "unknown"; + } + + @Override + public URL getResource(String name) { + URL url = super.getResource(name); + if (DISABLED || url == null || !endsWithIgnoreCase(name, ".groovy") || isAllowed(url)) { + return url; + } + // Note: This message gets printed twice because of https://github.com/apache/groovy/blob/41b990d0a20e442f29247f0e04cbed900f3dcad4/src/main/org/codehaus/groovy/control/ClassNodeResolver.java#L184-L186. + LOGGER.log(Level.WARNING, LOG_MESSAGE_TEMPLATE, new Object[] { url, owner }); + return null; + } + + @Override + public Enumeration getResources(String name) throws IOException { + Enumeration urls = super.getResources(name); + if (DISABLED || !urls.hasMoreElements() || !endsWithIgnoreCase(name, ".groovy")) { + return urls; + } + List filteredUrls = new ArrayList<>(); + while (urls.hasMoreElements()) { + URL url = urls.nextElement(); + if (isAllowed(url)) { + filteredUrls.add(url); + } else { + LOGGER.log(Level.WARNING, LOG_MESSAGE_TEMPLATE, new Object[] { url, owner }); + } + } + return Collections.enumeration(filteredUrls); + } + + private static boolean isAllowed(URL url) { + String urlString = url.toString(); + for (GroovySourceFileAllowlist allowlist : GroovySourceFileAllowlist.all()) { + if (allowlist.isAllowed(urlString)) { + return true; + } + } + return false; + } + + private static boolean endsWithIgnoreCase(String value, String suffix) { + int suffixLength = suffix.length(); + return value.regionMatches(true, value.length() - suffixLength, suffix, 0, suffixLength); + } + } + + /** + * Allows Groovy source files used to implement DSLs in plugins that were created before + * {@link GroovySourceFileAllowlist} was introduced. + */ + @Extension + public static class DefaultAllowlist extends GroovySourceFileAllowlist { + private static final Logger LOGGER = Logger.getLogger(DefaultAllowlist.class.getName()); + private static final String ALLOWED_SOURCE_FILES_PROPERTY = DefaultAllowlist.class.getCanonicalName() + ".ALLOWED_SOURCE_FILES"; + /** + * A list containing suffixes of known-good Groovy source file URLs that need to be accessible to Pipeline code. + */ + /* Note: Actual ClassLoader resource URLs depend on environmental factors such as webroot settings and whether + * we are currently testing one of the plugins in the list, so default-allowlist only contains the path + * component of the resource URLs, and we allow any resource URL that ends with one of the entries in the list. + * + * We could try to load the exact URLs at runtime, but then we would have to account for dynamic plugin loading + * (especially when a new Jenkins controller is initialized) and the fact that workflow-cps is always a + * dependency of these plugins. + */ + static final List ALLOWED_SOURCE_FILES = new ArrayList<>(); + + public DefaultAllowlist() throws IOException { + // We load custom entries first to improve performance in case .groovy is used for the property. + String propertyValue = SystemProperties.getString(ALLOWED_SOURCE_FILES_PROPERTY, ""); + for (String groovyFile : propertyValue.split(",")) { + groovyFile = StringUtils.trimToNull(groovyFile); + if (groovyFile != null) { + if (groovyFile.endsWith(".groovy")) { + ALLOWED_SOURCE_FILES.add(groovyFile); + LOGGER.log(Level.INFO, "Allowing Pipelines to access {0}", groovyFile); + } else { + LOGGER.log(Level.WARNING, "Ignoring invalid Groovy source file: {0}", groovyFile); + } + } + } + loadDefaultAllowlist(ALLOWED_SOURCE_FILES); + // Some plugins use test-specific Groovy DSLs. + if (Main.isUnitTest) { + ALLOWED_SOURCE_FILES.addAll(Arrays.asList( + // pipeline-model-definition + "/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelAndOtherFieldAgentScript.groovy", + "/org/jenkinsci/plugins/pipeline/modeldefinition/parser/GlobalStageNameTestConditionalScript.groovy" + )); + } + } + + private static void loadDefaultAllowlist(List allowlist) throws IOException { + try (InputStream is = GroovySourceFileAllowlist.class.getResourceAsStream("GroovySourceFileAllowlist/default-allowlist"); + BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));) { + String line; + while ((line = reader.readLine()) != null) { + line = line.trim(); + if (!line.isEmpty() && !line.startsWith("#")) { + allowlist.add(line); + } + } + } + } + + @Override + public boolean isAllowed(String groovySourceFileUrl) { + for (String sourceFile : ALLOWED_SOURCE_FILES) { + if (groovySourceFileUrl.endsWith(sourceFile)) { + return true; + } + } + return false; + } + } + +} diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist/default-allowlist b/src/main/resources/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist/default-allowlist new file mode 100644 index 000000000..132684793 --- /dev/null +++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist/default-allowlist @@ -0,0 +1,53 @@ +# This list is ordered from most popular to least popular plugin to minimize performance impact. +# pipeline-model-definition +/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/AnyScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/NoneScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AbstractChangelogConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllOfConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyOfConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/BranchConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangeLogConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangeRequestConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ChangeSetConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/EnvironmentConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/EqualsConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/ExpressionConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/IsRestartedRunConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/NotConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/TagConditionalScript.groovy +/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/TriggeredByConditionalScript.groovy +# pipeline-model-extensions +/org/jenkinsci/plugins/pipeline/modeldefinition/agent/CheckoutScript.groovy +# docker-workflow +/org/jenkinsci/plugins/docker/workflow/Docker.groovy +/org/jenkinsci/plugins/docker/workflow/declarative/AbstractDockerPipelineScript.groovy +/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipelineFromDockerfileScript.groovy +/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipelineScript.groovy +# kubernetes +/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgentScript.groovy +# amazon-ecs +/com/cloudbees/jenkins/plugins/amazonecs/pipeline/ECSDeclarativeAgentScript.groovy +# workflow-remote-loader: +/org/jenkinsci/plugins/workflow/remoteloader/FileLoaderDSL/FileLoaderDSLImpl.groovy +# confluence-publisher +/com/myyearbook/hudson/plugins/confluence/publishConfluence.groovy +# openshift-client +/com/openshift/jenkins/plugins/OpenShiftDSL.groovy +# ownership: +/org/jenkinsci/plugins/ownership/model/workflow/OwnershipGlobalVariable/Impl.groovy +# templating-engine: +/org/boozallen/plugins/jte/init/primitives/hooks/AnnotatedMethod.groovy +/org/boozallen/plugins/jte/init/primitives/hooks/Hooks.groovy +# datetime-constraint +/org/jenkinsci/plugins/curfew/Checkpoint.groovy +/org/jenkinsci/plugins/curfew/Curfew.groovy +# redis-notifier +/com/tsoft/jenkins/plugin/RedisClient.groovy +# alauda-pipeline +/io/alauda/jenkins/plugins/pipeline/AlaudaDSL.groovy +# alauda-devops-pipeline +/com/alauda/jenkins/plugins/AlaudaDevopsDSL.groovy +/com/alauda/jenkins/plugins/AlaudaPlatformDSL.groovy +/com/alauda/jenkins/plugins/StorageDSL.groovy diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java index abe831d59..bfd7a5c2c 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java @@ -50,6 +50,7 @@ import org.hamcrest.Matchers; import org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException; import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted; +import org.jenkinsci.plugins.workflow.cps.GroovySourceFileAllowlist.DefaultAllowlist; import org.jenkinsci.plugins.workflow.flow.FlowExecution; import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner; import org.jenkinsci.plugins.workflow.job.WorkflowJob; @@ -61,6 +62,8 @@ import org.jenkinsci.plugins.workflow.support.pickles.TryRepeatedly; import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.hasItem; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -71,6 +74,7 @@ import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.BuildWatcher; +import org.jvnet.hudson.test.FlagRule; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsSessionRule; @@ -83,6 +87,10 @@ public class CpsFlowExecutionTest { @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher(); @Rule public JenkinsSessionRule sessions = new JenkinsSessionRule(); @Rule public LoggerRule logger = new LoggerRule(); + @Rule public FlagRule secretField = new FlagRule<>(() -> CpsFlowExecutionTest.SECRET, v -> CpsFlowExecutionTest.SECRET = v); + // We intentionally avoid using the static fields so that tests can call setProperty before the classes are initialized. + @Rule public FlagRule groovySourceFileAllowlistDisabled = FlagRule.systemProperty("org.jenkinsci.plugins.workflow.cps.GroovySourceFileAllowlist.DISABLED"); + @Rule public FlagRule groovySourceFileAllowlistFiles = FlagRule.systemProperty("org.jenkinsci.plugins.workflow.cps.GroovySourceFileAllowlist.DefaultAllowlist.ALLOWED_SOURCE_FILES"); @Test public void getCurrentExecutions() throws Throwable { sessions.then(r -> { @@ -441,7 +449,6 @@ public void configureShell(@CheckForNull CpsFlowExecution context, GroovyShell s } private void trustedShell(final boolean pos) throws Throwable { - SECRET = false; sessions.then(r -> { WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p"); p.setDefinition(new CpsFlowDefinition("new foo().attempt()", true)); @@ -464,4 +471,60 @@ private void trustedShell(final boolean pos) throws Throwable { * This field shouldn't be visible to regular script. */ public static boolean SECRET; + + @Issue("SECURITY-359") + @Test public void groovySourcesCannotBeUsedByDefault() throws Throwable { + logger.record(GroovySourceFileAllowlist.class, Level.INFO).capture(100); + sessions.then(r -> { + WorkflowJob p = r.createProject(WorkflowJob.class); + p.setDefinition(new CpsFlowDefinition( + "new hudson.model.View.main()", true)); + WorkflowRun b = r.buildAndAssertStatus(Result.FAILURE, p); + r.assertLogContains("unable to resolve class hudson.model.View.main", b); + assertThat(logger.getMessages(), hasItem(containsString("/hudson/model/View/main.groovy from being loaded without sandbox protection in " + b))); + }); + } + + @Issue("SECURITY-359") + @Test public void groovySourcesCanBeUsedIfAllowlistIsDisabled() throws Throwable { + System.setProperty("org.jenkinsci.plugins.workflow.cps.GroovySourceFileAllowlist.DISABLED", "true"); + sessions.then(r -> { + WorkflowJob p = r.createProject(WorkflowJob.class); + p.setDefinition(new CpsFlowDefinition( + "new hudson.model.View.main()", true)); + WorkflowRun b = r.buildAndAssertSuccess(p); + }); + } + + @Issue("SECURITY-359") + @Test public void groovySourcesCanBeUsedIfAddedToSystemProperty() throws Throwable { + System.setProperty("org.jenkinsci.plugins.workflow.cps.GroovySourceFileAllowlist.DefaultAllowlist.ALLOWED_SOURCE_FILES", "/just/an/example.groovy,/hudson/model/View/main.groovy"); + logger.record(DefaultAllowlist.class, Level.INFO).capture(100); + sessions.then(r -> { + WorkflowJob p = r.createProject(WorkflowJob.class); + p.setDefinition(new CpsFlowDefinition( + "new hudson.model.View.main()", true)); + WorkflowRun b = r.buildAndAssertSuccess(p); + assertThat(logger.getMessages(), hasItem(containsString("Allowing Pipelines to access /hudson/model/View/main.groovy"))); + }); + } + + @Issue("SECURITY-359") + @Test public void groovySourcesCanBeUsedIfAllowed() throws Throwable { + sessions.then(r -> { + WorkflowJob p = r.createProject(WorkflowJob.class); + p.setDefinition(new CpsFlowDefinition( + "(new trusted.foo()).attempt()", true)); + WorkflowRun b = r.buildAndAssertSuccess(p); + assertTrue(SECRET); + }); + } + + @TestExtension("groovySourcesCanBeUsedIfAllowed") + public static class TestAllowlist extends GroovySourceFileAllowlist { + @Override + public boolean isAllowed(String groovyResourceUrl) { + return groovyResourceUrl.endsWith("/trusted/foo.groovy"); + } + } } From c469c883e32a18adcd6ac5b5973fb9c7d054f660 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 May 2022 01:23:06 +0000 Subject: [PATCH 650/932] Bump jenkins-infra/jenkins-maven-cd-action from 1.2.0 to 1.3.0 Bumps [jenkins-infra/jenkins-maven-cd-action](https://github.com/jenkins-infra/jenkins-maven-cd-action) from 1.2.0 to 1.3.0. - [Release notes](https://github.com/jenkins-infra/jenkins-maven-cd-action/releases) - [Commits](https://github.com/jenkins-infra/jenkins-maven-cd-action/compare/v1.2.0...v1.3.0) --- updated-dependencies: - dependency-name: jenkins-infra/jenkins-maven-cd-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index d1ceb2a66..e08b3eb63 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -52,7 +52,7 @@ jobs: distribution: 'adopt' java-version: 8 - name: Release - uses: jenkins-infra/jenkins-maven-cd-action@v1.2.0 + uses: jenkins-infra/jenkins-maven-cd-action@v1.3.0 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} From 76b089ccd026b68012b0deb30c217395f7ca7dc2 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 9 May 2022 15:04:58 -0400 Subject: [PATCH 651/932] [SECURITY-359] --- .../plugins/workflow/cps/GroovySourceFileAllowlist.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java index 7bca1d4f7..4a2343592 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java @@ -193,7 +193,8 @@ public DefaultAllowlist() throws IOException { ALLOWED_SOURCE_FILES.addAll(Arrays.asList( // pipeline-model-definition "/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelAndOtherFieldAgentScript.groovy", - "/org/jenkinsci/plugins/pipeline/modeldefinition/parser/GlobalStageNameTestConditionalScript.groovy" + "/org/jenkinsci/plugins/pipeline/modeldefinition/parser/GlobalStageNameTestConditionalScript.groovy", + "/org/jenkinsci/plugins/pipeline/modeldefinition/parser/GlobalStepCountTestConditionalScript.groovy" )); } } From cc26e435e4a85ea9f8d822ee1899bb3a25242016 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 11 May 2022 15:55:20 -0400 Subject: [PATCH 652/932] =?UTF-8?q?Defer=20being=20=E2=80=9Cready=20to=20r?= =?UTF-8?q?un=E2=80=9D=20until=20`StepExecution.onResume`s=20complete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + .../workflow/cps/CpsFlowExecution.java | 41 ++++++++++++++----- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index f7557e82c..7305780ce 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,7 @@ org.jenkins-ci.plugins.workflow workflow-api + 1154.v8fb_a_08707266 org.jenkins-ci.plugins.workflow diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 7266927f9..df2fef68d 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -276,6 +276,13 @@ public class CpsFlowExecution extends FlowExecution implements BlockableResume { boolean resumeBlocked = false; + /** + * Whether {@link CpsThreadGroup#isPaused} when loaded from disk. + * @see #loadProgramAsync + * @see #afterStepExecutionsResumed + */ + private boolean pausedWhenLoaded; + /** Subdirectory string where we store {@link FlowNode}s */ private String storageDir = null; @@ -774,17 +781,8 @@ public void onSuccess(Unmarshaller u) { try { CpsThreadGroup g = (CpsThreadGroup) u.readObject(); result.set(g); - try { - if (g.isPaused()) { - owner.getListener().getLogger().println("Still paused"); - } else { - owner.getListener().getLogger().println("Ready to run at " + new Date()); - // In case we last paused execution due to Jenkins.isQuietingDown, make sure we do something after we restart. - g.scheduleRun(); - } - } catch (IOException x) { - LOGGER.log(Level.WARNING, null, x); - } + pausedWhenLoaded = g.isPaused(); + g.pause(); } catch (Throwable t) { onFailure(t); } finally { @@ -870,6 +868,27 @@ void croak(Throwable t) { } } + @Override protected void afterStepExecutionsResumed() { + runInCpsVmThread(new FutureCallback() { + @Override public void onSuccess(CpsThreadGroup g) { + try { + if (pausedWhenLoaded) { + owner.getListener().getLogger().println("Still paused"); + } else { + owner.getListener().getLogger().println("Ready to run at " + new Date()); + // In case we last paused execution due to Jenkins.isQuietingDown, make sure we do something after we restart. + g.unpause(); + } + } catch (IOException x) { + LOGGER.log(Level.WARNING, null, x); + } + } + @Override public void onFailure(Throwable t) { + LOGGER.log(Level.WARNING, "could not resume " + this, t); + } + }); + } + /** * Where we store {@link CpsThreadGroup}. */ From a688ac3d8fd05ee3391f3bf9067cbc56d267e44c Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 11 May 2022 16:35:02 -0400 Subject: [PATCH 653/932] Mark `pausedWhenLoaded` as `transient` Co-authored-by: Devin Nusbaum --- .../org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index df2fef68d..4457ee975 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -281,7 +281,7 @@ public class CpsFlowExecution extends FlowExecution implements BlockableResume { * @see #loadProgramAsync * @see #afterStepExecutionsResumed */ - private boolean pausedWhenLoaded; + private transient boolean pausedWhenLoaded; /** Subdirectory string where we store {@link FlowNode}s */ private String storageDir = null; From d17e71cf48f819842304f670ab4c8f47308a551f Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 11 May 2022 17:26:12 -0400 Subject: [PATCH 654/932] Never print warnings from `CpsStepContext.completed`, but use `addSuppressed` --- .../plugins/workflow/cps/CpsStepContext.java | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java index bcdbe5dae..411c25496 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java @@ -328,36 +328,26 @@ private void completed(@NonNull Outcome newOutcome) { whenOutcomeDelivered = new Throwable(); } else { Throwable failure = newOutcome.getAbnormal(); - Level level; - if (Main.isUnitTest) { - if (failure instanceof FlowInterruptedException && ((FlowInterruptedException) failure).getCauses().stream().anyMatch(BodyFailed.class::isInstance)) { - // Very common and generally uninteresting. - level = Level.FINE; - } else { - // Possibly a minor bug. - level = Level.INFO; - } - } else { - // Typically harmless; do not alarm users. - level = Level.FINE; - } - if (LOGGER.isLoggable(level)) { - LOGGER.log(level, "already completed " + this, new IllegalStateException("delivered here")); + Throwable earlierFailure = outcome.getAbnormal(); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.log(Level.FINE, "already completed " + this, new IllegalStateException("delivered here")); if (failure != null) { - LOGGER.log(level, "new failure", failure); + LOGGER.log(Level.FINE, "new failure", failure); } else { - LOGGER.log(level, "new success: {0}", outcome.getNormal()); + LOGGER.log(Level.FINE, "new success: {0}", outcome.getNormal()); } if (whenOutcomeDelivered != null) { - LOGGER.log(level, "previously delivered here", whenOutcomeDelivered); + LOGGER.log(Level.FINE, "previously delivered here", whenOutcomeDelivered); } - Throwable earlierFailure = outcome.getAbnormal(); if (earlierFailure != null) { - LOGGER.log(level, "earlier failure", earlierFailure); + LOGGER.log(Level.FINE, "earlier failure", earlierFailure); } else { - LOGGER.log(level, "earlier success: {0}", outcome.getNormal()); + LOGGER.log(Level.FINE, "earlier success: {0}", outcome.getNormal()); } } + if (failure != null && earlierFailure != null) { + earlierFailure.addSuppressed(failure); + } } } From 5174401a9a601e5bac3112de54ff4cd46f91f1bc Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 12 May 2022 09:06:01 -0400 Subject: [PATCH 655/932] =?UTF-8?q?AdoptOpenJDK=20=E2=86=92=20Temurin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 6ca08545a..b6c6f08fb 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -49,7 +49,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v3 with: - distribution: 'adopt' + distribution: temurin java-version: 8 - name: Release uses: jenkins-infra/jenkins-maven-cd-action@v1.2.0 From c3ba165984d043125ad6b7ef34b945def3d5bce4 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 13 May 2022 09:27:33 -0400 Subject: [PATCH 656/932] `BuildTriggerStepRestartTest.restartBetweenJobs` turned up a race condition in `pausedWhenLoaded` --- .../org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index df2fef68d..94ef7c1df 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -878,6 +878,7 @@ void croak(Throwable t) { owner.getListener().getLogger().println("Ready to run at " + new Date()); // In case we last paused execution due to Jenkins.isQuietingDown, make sure we do something after we restart. g.unpause(); + g.saveProgramIfPossible(false); // ensure pausedWhenLoaded=false is persisted } } catch (IOException x) { LOGGER.log(Level.WARNING, null, x); From 9b36ea8ac10bfd7abb3be2b175dafd21682e7833 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 00:50:58 +0000 Subject: [PATCH 657/932] Bump jenkins-infra/interesting-category-action from 1.0.0 to 1.1.0 Bumps [jenkins-infra/interesting-category-action](https://github.com/jenkins-infra/interesting-category-action) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/jenkins-infra/interesting-category-action/releases) - [Commits](https://github.com/jenkins-infra/interesting-category-action/compare/v1.0.0...v1.1.0) --- updated-dependencies: - dependency-name: jenkins-infra/interesting-category-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 1ff58dc9e..cca37322c 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -31,7 +31,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Check interesting categories - uses: jenkins-infra/interesting-category-action@v1.0.0 + uses: jenkins-infra/interesting-category-action@v1.1.0 id: interesting-categories if: steps.verify-ci-status.outputs.result == 'success' with: From de95488a6ecb61db51f9cf1be70a1a97c1a64b6e Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 19 May 2022 17:08:21 -0400 Subject: [PATCH 658/932] Avoid creating cycles with `Throwable.addSuppressed` --- .../jenkinsci/plugins/workflow/cps/CpsStepContext.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java index 411c25496..04d034484 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java @@ -30,7 +30,6 @@ import com.google.common.util.concurrent.SettableFuture; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import groovy.lang.Closure; -import hudson.Main; import hudson.model.Descriptor; import hudson.model.Result; import hudson.util.DaemonThreadFactory; @@ -66,6 +65,7 @@ import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.stream.Stream; import jenkins.model.CauseOfInterruption; import jenkins.util.ContextResettingExecutorService; import org.codehaus.groovy.runtime.InvokerInvocationException; @@ -345,12 +345,16 @@ private void completed(@NonNull Outcome newOutcome) { LOGGER.log(Level.FINE, "earlier success: {0}", outcome.getNormal()); } } - if (failure != null && earlierFailure != null) { + if (failure != null && earlierFailure != null && !refersTo(failure, earlierFailure)) { earlierFailure.addSuppressed(failure); } } } + private static boolean refersTo(Throwable t1, Throwable t2) { + return t1 == t2 || t1.getCause() != null && refersTo(t1.getCause(), t2) || Stream.of(t1.getSuppressed()).anyMatch(t3 -> refersTo(t3, t2)); + } + /** * When this step context has completed execution (successful or otherwise), plan the next action. */ From 0b3523c8c6629398baea87aa272aac0d95bc1da9 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 19 May 2022 18:00:39 -0400 Subject: [PATCH 659/932] Bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0ff290db..5b8ceee0f 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ org.jenkins-ci.plugins.workflow workflow-api - 1154.v8fb_a_08707266 + 1159.va_643c5f893e9 org.jenkins-ci.plugins.workflow From 8bf3c8cb97a0096b9a4c859e02878d2737e0b027 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 19 May 2022 18:05:52 -0400 Subject: [PATCH 660/932] Have to also bump the BOM --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b8ceee0f..dfe2208b9 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ io.jenkins.tools.bom bom-2.332.x - 1289.v5c4b_1c43511b_ + 1382.v7d694476f340 import pom From 72bd535b191743f822abd7aeea7c721b43cbfde7 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 20 May 2022 12:27:39 -0400 Subject: [PATCH 661/932] Call `CpsVmExecutorService.shutdown` from `CpsFlowExecution.suspendAll` --- .../jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 9 +++++++++ .../jenkinsci/plugins/workflow/cps/CpsStepContext.java | 5 +---- .../jenkinsci/plugins/workflow/cps/CpsThreadGroup.java | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 7266927f9..c1f2604d0 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -1584,6 +1584,15 @@ public void pause(final boolean v) throws IOException { } } cpsExec.checkpoint(true); + cpsExec.runInCpsVmThread(new FutureCallback() { + @Override public void onSuccess(CpsThreadGroup g) { + LOGGER.fine(() -> "shutting down CPS VM threadin for " + cpsExec); + g.shutdown(); + } + @Override public void onFailure(Throwable t) { + LOGGER.log(Level.WARNING, null, t); + } + }); } } catch (Exception ex) { LOGGER.log(Level.WARNING, "Error persisting Pipeline execution at shutdown: "+((CpsFlowExecution) execution).owner, ex); diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java index bcdbe5dae..34a33eb94 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java @@ -436,12 +436,9 @@ public void onSuccess(CpsThreadGroup g) { } outcome = new Outcome(null, new AlreadyCompleted()); } - - /** - * Program state failed to load. - */ @Override public void onFailure(Throwable t) { + LOGGER.log(Level.WARNING, "Failed to proceed after " + CpsStepContext.this, t); } }); } catch (IOException x) { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java index a5f844547..57c5f4dae 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java @@ -640,6 +640,10 @@ private void propagateErrorToWorkflow(Throwable t) { } } + void shutdown() { + runner.shutdown(); + } + private static final Logger LOGGER = Logger.getLogger(CpsThreadGroup.class.getName()); private static final long serialVersionUID = 1L; From 960a3f736534085a9939c5939fc3d020b5b8b374 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 20 May 2022 13:14:46 -0400 Subject: [PATCH 662/932] `logTimings` was being incorrectly called on a running build during Jenkins shutdown --- .../jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java index eaf650eff..47298495c 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java @@ -166,7 +166,7 @@ private void tearDown(ThreadContext context) { cpsThreadGroup.busy = false; context.restore(); CpsFlowExecution execution = cpsThreadGroup.getExecution(); - if (isShutdown()) { + if (isShutdown() && /* build completed, not just after suspendAll */!cpsThreadGroup.getThreads().iterator().hasNext()) { execution.logTimings(); } CpsCallableInvocation.registerMismatchHandler(null); From 908999b786fc715e918704f08d9d5bff5f493fdc Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 23 May 2022 20:31:34 -0700 Subject: [PATCH 663/932] [JENKINS-63766] Work around JDK-8231454 --- .../workflow/cps/CpsFlowExecution.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 7266927f9..54c550019 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -52,6 +52,7 @@ import hudson.model.Action; import hudson.model.Result; import hudson.util.Iterators; +import io.jenkins.lib.versionnumber.JavaSpecificationVersion; import jenkins.model.CauseOfInterruption; import jenkins.model.Jenkins; import org.jboss.marshalling.Unmarshaller; @@ -1298,6 +1299,7 @@ private static void cleanUpLoader(ClassLoader loader, Set encounter if (encounteredClasses.add(clazz)) { LOGGER.log(Level.FINER, "found {0}", clazz.getName()); Introspector.flushFromCaches(clazz); + cleanUpClassInfoCache(clazz); cleanUpGlobalClassSet(clazz); cleanUpClassHelperCache(clazz); cleanUpObjectStreamClassCaches(clazz); @@ -1358,6 +1360,44 @@ private static void cleanUpGlobalClassValue(@NonNull ClassLoader loader) throws } } + private static void cleanUpClassInfoCache(Class clazz) { + JavaSpecificationVersion current = JavaSpecificationVersion.forCurrentJVM(); + if (current.isNewerThan(new JavaSpecificationVersion("1.8")) + && current.isOlderThan(new JavaSpecificationVersion("17"))) { + try { + // TODO Work around JDK-8231454. + Class classInfoC = Class.forName("com.sun.beans.introspect.ClassInfo"); + Field cacheF = classInfoC.getDeclaredField("CACHE"); + try { + cacheF.setAccessible(true); + } catch (RuntimeException e) { // TOOD Java 9+ InaccessibleObjectException + /* + * Not running with "--add-opens java.desktop/com.sun.beans.introspect=ALL-UNNAMED". + * Until core adds this to its --add-opens configuration, and until that core + * change is widely adopted, avoid unnecessary log spam and return early. + */ + if (LOGGER.isLoggable(Level.FINER)) { + LOGGER.log(Level.FINER, "Failed to clean up " + clazz.getName() + " from ClassInfo#CACHE. A metaspace leak may have occurred.", e); + } + return; + } + Object cache = cacheF.get(null); + Class cacheC = Class.forName("com.sun.beans.util.Cache"); + if (LOGGER.isLoggable(Level.FINER)) { + LOGGER.log(Level.FINER, "Cleaning up " + clazz.getName() + " from ClassInfo#CACHE."); + } + Method removeM = cacheC.getMethod("remove", Object.class); + removeM.invoke(cache, clazz); + } catch (ReflectiveOperationException e) { + /* + * Should never happen, but if it does, ensure the failure is isolated to this + * method and does not prevent other cleanup logic from executing. + */ + LOGGER.log(Level.WARNING, "Failed to clean up " + clazz.getName() + " from ClassInfo#CACHE. A metaspace leak may have occurred.", e); + } + } + } + private static void cleanUpGlobalClassSet(@NonNull Class clazz) throws Exception { Class classInfoC = Class.forName("org.codehaus.groovy.reflection.ClassInfo"); // or just ClassInfo.class, but unclear whether this will always be there Field globalClassSetF = classInfoC.getDeclaredField("globalClassSet"); From 87594188464e29e1711119cb7c28d66aaa4de5fb Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 23 May 2022 20:56:09 -0700 Subject: [PATCH 664/932] JDK 16 contains the fix --- .../org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 54c550019..c6753c69a 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -1363,7 +1363,7 @@ private static void cleanUpGlobalClassValue(@NonNull ClassLoader loader) throws private static void cleanUpClassInfoCache(Class clazz) { JavaSpecificationVersion current = JavaSpecificationVersion.forCurrentJVM(); if (current.isNewerThan(new JavaSpecificationVersion("1.8")) - && current.isOlderThan(new JavaSpecificationVersion("17"))) { + && current.isOlderThan(new JavaSpecificationVersion("16"))) { try { // TODO Work around JDK-8231454. Class classInfoC = Class.forName("com.sun.beans.introspect.ClassInfo"); From 24207859720d0336175d920bfa2f2e539400928d Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 23 May 2022 22:00:01 -0700 Subject: [PATCH 665/932] Adapt to JDK-8277072 --- .../plugins/workflow/cps/CpsFlowExecution.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index c6753c69a..3d7e81bfc 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -1445,13 +1445,16 @@ private static void cleanUpObjectStreamClassCaches(@NonNull Class clazz) thro for (String cacheFName : new String[] {"localDescs", "reflectors"}) { Field cacheF = cachesC.getDeclaredField(cacheFName); cacheF.setAccessible(true); - ConcurrentMap>, ?> cache = (ConcurrentMap) cacheF.get(null); - Iterator>, ?>> iterator = cache.entrySet().iterator(); - while (iterator.hasNext()) { - if (iterator.next().getKey().get() == clazz) { - iterator.remove(); - LOGGER.log(Level.FINER, "cleaning up {0} from ObjectStreamClass.Caches.{1}", new Object[] {clazz.getName(), cacheFName}); - break; + Object cache = cacheF.get(null); + if (cache instanceof ConcurrentMap) { + // Prior to JDK-8277072 + Iterator>, ?>> iterator = ((ConcurrentMap) cache).entrySet().iterator(); + while (iterator.hasNext()) { + if (iterator.next().getKey().get() == clazz) { + iterator.remove(); + LOGGER.log(Level.FINER, "cleaning up {0} from ObjectStreamClass.Caches.{1}", new Object[]{clazz.getName(), cacheFName}); + break; + } } } } From 5934d66303703fc4c1f5f2c502209de5e217994d Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 24 May 2022 12:10:49 -0700 Subject: [PATCH 666/932] Update src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java Co-authored-by: Jesse Glick --- .../org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 3d7e81bfc..18c43ad30 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -1370,7 +1370,7 @@ private static void cleanUpClassInfoCache(Class clazz) { Field cacheF = classInfoC.getDeclaredField("CACHE"); try { cacheF.setAccessible(true); - } catch (RuntimeException e) { // TOOD Java 9+ InaccessibleObjectException + } catch (RuntimeException e) { // TODO Java 9+ InaccessibleObjectException /* * Not running with "--add-opens java.desktop/com.sun.beans.introspect=ALL-UNNAMED". * Until core adds this to its --add-opens configuration, and until that core From d6763c1272bfeff977f6f1b979406398c9c7bf2c Mon Sep 17 00:00:00 2001 From: Yaroslav Afenkin Date: Thu, 26 May 2022 13:00:24 +0300 Subject: [PATCH 667/932] [JENKINS-68610] Re-enable admin auto approval when job config submitted via CLI and REST --- .../workflow/cps/CpsFlowDefinition.java | 2 +- .../workflow/cps/CpsFlowDefinition2Test.java | 89 ++++++++++++++++++- 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java index e69bfb32c..7f8ff700f 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java @@ -90,7 +90,7 @@ public CpsFlowDefinition(String script, boolean sandbox) { private Object readResolve() { if (!sandbox) { - ScriptApproval.get().configuring(script, GroovyLanguage.get(), ApprovalContext.create()); + ScriptApproval.get().configuring(script, GroovyLanguage.get(), ApprovalContext.create(), true); } return this; } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java index aac0bcafb..fa4435b81 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java @@ -25,15 +25,21 @@ package org.jenkinsci.plugins.workflow.cps; import com.cloudbees.groovy.cps.CpsTransformer; +import com.gargoylesoftware.htmlunit.HttpMethod; +import com.gargoylesoftware.htmlunit.WebRequest; import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlInput; import com.gargoylesoftware.htmlunit.html.HtmlTextArea; import hudson.Functions; +import hudson.cli.CLICommand; +import hudson.cli.CLICommandInvoker; +import hudson.cli.UpdateJobCommand; import hudson.model.Computer; import hudson.model.Describable; import hudson.model.Executor; import hudson.model.Item; +import hudson.model.Job; import hudson.model.Result; import java.io.Serializable; import java.util.Collections; @@ -42,9 +48,11 @@ import java.util.logging.Level; +import hudson.model.User; import hudson.security.Permission; import jenkins.model.Jenkins; +import org.apache.tools.ant.filters.StringInputStream; import org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException; import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval; import org.jenkinsci.plugins.scriptsecurity.scripts.languages.GroovyLanguage; @@ -57,7 +65,6 @@ import org.jenkinsci.plugins.workflow.steps.StepExecutions; import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; -import org.junit.Assert; import org.junit.Assume; import org.junit.ClassRule; import org.junit.Ignore; @@ -897,7 +904,6 @@ public void cpsScriptNonAdminConfiguration() throws Exception { jenkins.submit(config); - assertEquals(1, ScriptApproval.get().getPendingScripts().size()); assertFalse(ScriptApproval.get().isScriptApproved(groovy, GroovyLanguage.get())); } @@ -1000,6 +1006,85 @@ public void cpsScriptAdminModification() throws Exception { } } + @Test + public void cpsScriptSubmissionViaCli() throws Exception { + jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); + + MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); + mockStrategy.grant(Jenkins.READ, Job.CONFIGURE).everywhere().to("devel"); + mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); + for (Permission p : Item.PERMISSIONS.getPermissions()) { + mockStrategy.grant(p).everywhere().to("devel"); + mockStrategy.grant(p).everywhere().to("admin"); + } + jenkins.jenkins.setAuthorizationStrategy(mockStrategy); + + WorkflowJob p = jenkins.createProject(WorkflowJob.class, "prj"); + String preconfiguredScript = "echo preconfigured"; + ScriptApproval.get().preapprove(preconfiguredScript, GroovyLanguage.get()); + p.setDefinition(new CpsFlowDefinition(preconfiguredScript, false)); + + JenkinsRule.WebClient wc = jenkins.createWebClient(); + wc.login("admin"); + String configDotXml = p.getUrl() + "config.xml"; + String xml = wc.goTo(configDotXml, "application/xml").getWebResponse().getContentAsString(); + + CLICommand cmd = new UpdateJobCommand(); + cmd.setTransportAuth2(User.getById("admin", true).impersonate2()); + String viaCliScript = "echo configured via CLI"; + assertThat(new CLICommandInvoker(jenkins, cmd).withStdin(new StringInputStream(xml.replace(preconfiguredScript, viaCliScript))).invokeWithArgs(p.getName()), CLICommandInvoker.Matcher.succeededSilently()); + assertEquals(viaCliScript, ((CpsFlowDefinition)p.getDefinition()).getScript()); + assertTrue(ScriptApproval.get().isScriptApproved(viaCliScript, GroovyLanguage.get())); + + // now with non-admin user, script should end up in pending + cmd.setTransportAuth2(User.getById("devel", true).impersonate2()); + String viaCliByDevelScript = "echo configured via CLI by devel"; + assertThat(new CLICommandInvoker(jenkins, cmd).withStdin(new StringInputStream(xml.replace(preconfiguredScript, viaCliByDevelScript))).invokeWithArgs(p.getName()), CLICommandInvoker.Matcher.succeededSilently()); + assertEquals(viaCliByDevelScript, ((CpsFlowDefinition)p.getDefinition()).getScript()); + assertFalse(ScriptApproval.get().isScriptApproved(viaCliByDevelScript, GroovyLanguage.get())); + wc.close(); + } + + @Test + public void cpsScriptSubmissionViaRest() throws Exception { + jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); + + MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); + mockStrategy.grant(Jenkins.READ, Job.CONFIGURE).everywhere().to("devel"); + mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); + for (Permission p : Item.PERMISSIONS.getPermissions()) { + mockStrategy.grant(p).everywhere().to("devel"); + mockStrategy.grant(p).everywhere().to("admin"); + } + jenkins.jenkins.setAuthorizationStrategy(mockStrategy); + + WorkflowJob p = jenkins.createProject(WorkflowJob.class); + String preconfiguredScript = "echo preconfigured"; + ScriptApproval.get().preapprove(preconfiguredScript, GroovyLanguage.get()); + p.setDefinition(new CpsFlowDefinition(preconfiguredScript, false)); + + JenkinsRule.WebClient wc = jenkins.createWebClient(); + wc.login("admin"); + String configDotXmlUrl = p.getUrl() + "config.xml"; + String xml = wc.goTo(configDotXmlUrl, "application/xml").getWebResponse().getContentAsString(); + + WebRequest req = new WebRequest(wc.createCrumbedUrl(configDotXmlUrl), HttpMethod.POST); + req.setEncodingType(null); + String configuredViaRestScript = "echo configured via REST"; + req.setRequestBody(xml.replace(preconfiguredScript, configuredViaRestScript)); + wc.getPage(req); + assertEquals(configuredViaRestScript, ((CpsFlowDefinition)p.getDefinition()).getScript()); + assertTrue(ScriptApproval.get().isScriptApproved(configuredViaRestScript, GroovyLanguage.get())); + + wc.login("devel"); + String configuredViaRestByNonAdmin = "echo configured via REST by devel"; + req.setRequestBody(xml.replace(preconfiguredScript, configuredViaRestByNonAdmin)); + wc.getPage(req); + assertEquals(configuredViaRestByNonAdmin, ((CpsFlowDefinition)p.getDefinition()).getScript()); + assertFalse(ScriptApproval.get().isScriptApproved(configuredViaRestByNonAdmin, GroovyLanguage.get())); + wc.close(); + } + public static class UnsafeParameterStep extends Step implements Serializable { private final UnsafeDescribable val; @DataBoundConstructor From 71dd22bc5aa28d6fb7a6c7e72af50ec25dfb90ed Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Thu, 26 May 2022 11:51:08 -0400 Subject: [PATCH 668/932] [JENKINS-45327] Pickle EnvActionImpl to prevent multiple instances from existing after resumption (#539) * [JENKINS-45327] Pickle EnvActionImpl to prevent multiple instances from existing after resumption * [JENKINS-45327] Simplify impl and test based on review feedback --- .../plugins/workflow/cps/EnvActionImpl.java | 34 +++++++++++++++++-- .../workflow/cps/CpsFlowExecutionTest.java | 21 ++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java index 48ba5cf65..57a74e847 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java @@ -24,6 +24,8 @@ package org.jenkinsci.plugins.workflow.cps; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import groovy.lang.GroovyObjectSupport; import hudson.EnvVars; import hudson.Extension; @@ -32,7 +34,6 @@ import hudson.model.TaskListener; import hudson.util.LogTaskListener; import java.io.IOException; -import java.io.Serializable; import java.util.Collection; import java.util.Collections; import java.util.Map; @@ -40,20 +41,23 @@ import java.util.logging.Level; import java.util.logging.Logger; import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.model.Queue; import jenkins.model.RunAction2; import org.jenkinsci.plugins.workflow.flow.FlowCopier; import org.jenkinsci.plugins.workflow.flow.FlowExecution; import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner; import org.jenkinsci.plugins.workflow.graph.FlowNode; +import org.jenkinsci.plugins.workflow.pickles.Pickle; import org.jenkinsci.plugins.workflow.steps.EnvironmentExpander; import org.jenkinsci.plugins.workflow.support.actions.EnvironmentAction; +import org.jenkinsci.plugins.workflow.support.pickles.SingleTypedPickleFactory; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; @ExportedBean -public class EnvActionImpl extends GroovyObjectSupport implements EnvironmentAction.IncludingOverrides, Serializable, RunAction2 { +public class EnvActionImpl extends GroovyObjectSupport implements EnvironmentAction.IncludingOverrides, RunAction2 { private static final Logger LOGGER = Logger.getLogger(EnvActionImpl.class.getName()); private static final long serialVersionUID = 1; @@ -199,4 +203,30 @@ public Collection getEnvironmentContributors() { } + @Extension public static class EnvActionImplPickleFactory extends SingleTypedPickleFactory { + @Override + protected Pickle pickle(EnvActionImpl object) { + return new EnvActionImplPickle(); + } + } + + /** + * Prevents multiple instances of {@link EnvActionImpl} from existing for a single Pipeline after a Jenkins restart + * in case {@code env} is serialized into the program. + */ + private static class EnvActionImplPickle extends Pickle { + @Override + public ListenableFuture rehydrate(FlowExecutionOwner owner) { + try { + Queue.Executable executable = owner.getExecutable(); + if (executable instanceof Run) { + return Futures.immediateFuture(EnvActionImpl.forRun((Run)executable)); + } else { + return Futures.immediateFailedFuture(new IllegalStateException("Invalid executable: " + executable)); + } + } catch (IOException e) { + return Futures.immediateFailedFuture(e); + } + } + } } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java index bfd7a5c2c..e76c20b19 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java @@ -63,6 +63,7 @@ import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -527,4 +528,24 @@ public boolean isAllowed(String groovyResourceUrl) { return groovyResourceUrl.endsWith("/trusted/foo.groovy"); } } + + @Issue("JENKINS-45327") + @Test public void envActionImplPickle() throws Throwable { + sessions.then(r -> { + WorkflowJob p = r.createProject(WorkflowJob.class, "p"); + p.setDefinition(new CpsFlowDefinition( + "def e = env\n" + + "semaphore('wait')\n" + // An instance of EnvActionImpl is part of the program's state at this point. + "e.foo = 'bar'\n", true)); // Without EnvActionImplPickle, this throws an NPE in EnvActionImpl.setProperty because owner is null. + WorkflowRun b = p.scheduleBuild2(0).waitForStart(); + SemaphoreStep.waitForStart("wait/1", b); + }); + sessions.then(r -> { + WorkflowJob p = r.jenkins.getItemByFullName("p", WorkflowJob.class); + WorkflowRun b = p.getLastBuild(); + SemaphoreStep.success("wait/1", null); + r.assertBuildStatus(Result.SUCCESS, r.waitForCompletion(b)); + assertThat(EnvActionImpl.forRun(b).getEnvironment().get("foo"), equalTo("bar")); + }); + } } From 37088767ee9d5571e3dc786bf1955ed65f845d42 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 3 Jun 2022 10:35:46 -0400 Subject: [PATCH 669/932] https://github.com/jenkinsci/workflow-api-plugin/pull/221 released --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dfe2208b9..d8276914d 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ org.jenkins-ci.plugins.workflow workflow-api - 1159.va_643c5f893e9 + 1162.va_1e49062a_00e org.jenkins-ci.plugins.workflow From 69020e85afb3860b5ca1d95668f476a9ec281eec Mon Sep 17 00:00:00 2001 From: Joseph Petersen Date: Tue, 14 Jun 2022 23:36:26 +0200 Subject: [PATCH 670/932] chore: use jenkins infra maven cd reusable workflow --- .github/workflows/cd.yaml | 55 ++++----------------------------------- 1 file changed, 5 insertions(+), 50 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index cca37322c..0279984d7 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -8,53 +8,8 @@ on: - completed jobs: - validate: - runs-on: ubuntu-latest - outputs: - should_release: ${{ steps.verify-ci-status.outputs.result == 'success' && steps.interesting-categories.outputs.interesting == 'true' }} - steps: - - name: Verify CI status - uses: jenkins-infra/verify-ci-status-action@v1.2.0 - id: verify-ci-status - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - output_result: true - - - name: Release Drafter - uses: release-drafter/release-drafter@v5 - if: steps.verify-ci-status.outputs.result == 'success' - with: - name: next - tag: next - version: next - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Check interesting categories - uses: jenkins-infra/interesting-category-action@v1.1.0 - id: interesting-categories - if: steps.verify-ci-status.outputs.result == 'success' - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - release: - runs-on: ubuntu-latest - needs: [validate] - if: needs.validate.outputs.should_release == 'true' - steps: - - name: Check out - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Set up JDK 8 - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 8 - - name: Release - uses: jenkins-infra/jenkins-maven-cd-action@v1.3.0 - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }} - + maven-cd: + uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1 + secrets: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }} From 8b98ec0d72ae0698275453f9dfac9eabc8299566 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 28 Jun 2022 16:47:58 -0400 Subject: [PATCH 671/932] [JENKINS-68417] Use `Supplier` overloads to avoid leaks from `LogRecord.parameters` --- .../plugins/workflow/cps/CpsFlowExecution.java | 10 +++++----- .../org/jenkinsci/plugins/workflow/cps/CpsThread.java | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index da5ef8c52..05209bdf7 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -1304,20 +1304,20 @@ private static void cleanUpLoader(ClassLoader loader, Set encounter return; } if (!(loader instanceof GroovyClassLoader)) { - LOGGER.log(Level.FINER, "ignoring {0}", loader); + LOGGER.finer(() -> "ignoring " + loader); return; } if (!encounteredLoaders.add(loader)) { return; } cleanUpLoader(loader.getParent(), encounteredLoaders, encounteredClasses); - LOGGER.log(Level.FINER, "found {0}", String.valueOf(loader)); + LOGGER.finer(() -> "found " + loader); SerializableClassRegistry.getInstance().release(loader); cleanUpGlobalClassValue(loader); GroovyClassLoader gcl = (GroovyClassLoader) loader; for (Class clazz : gcl.getLoadedClasses()) { if (encounteredClasses.add(clazz)) { - LOGGER.log(Level.FINER, "found {0}", clazz.getName()); + LOGGER.finer(() -> "found " + clazz.getName()); Introspector.flushFromCaches(clazz); cleanUpClassInfoCache(clazz); cleanUpGlobalClassSet(clazz); @@ -1370,11 +1370,11 @@ private static void cleanUpGlobalClassValue(@NonNull ClassLoader loader) throws if (encounteredLoader != loader) { it.remove(); if (LOGGER.isLoggable(Level.FINEST)) { - LOGGER.log(Level.FINEST, "ignoring {0} with loader {1}", new Object[] {klazz, /* do not hold from LogRecord */String.valueOf(encounteredLoader)}); + LOGGER.finest(() -> "ignoring " + klazz + " with loader " + encounteredLoader); } } } - LOGGER.log(Level.FINE, "cleaning up {0} associated with {1}", new Object[] {toRemove.toString(), loader.toString()}); + LOGGER.fine(() -> "cleaning up " + toRemove + " associated with " + loader); for (Class klazz : toRemove) { removeM.invoke(map, klazz); } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java index adae6895c..b83e6d33c 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java @@ -181,14 +181,15 @@ public StepExecution getStep() { CURRENT.set(this); try (Timeout timeout = Timeout.limit(5, TimeUnit.MINUTES)) { - LOGGER.log(FINE, "runNextChunk on {0}", resumeValue); + LOGGER.fine(() -> "runNextChunk on " + resumeValue); final Outcome o = resumeValue; resumeValue = null; outcome = program.run0(o, CATEGORIES); if (outcome.getAbnormal() != null) { LOGGER.log(FINE, "ran and produced error", outcome.getAbnormal()); } else { - LOGGER.log(FINE, "ran and produced {0}", outcome); + Outcome _outcome = outcome; + LOGGER.fine(() -> "ran and produced " + _outcome); } if (outcome.getNormal() instanceof ThreadTask) { From e913f4806ce95dae8397c5715440944391f77b9d Mon Sep 17 00:00:00 2001 From: Bartosz Nowak <9051964+DuMaM@users.noreply.github> Date: Wed, 29 Jun 2022 20:16:51 +0000 Subject: [PATCH 672/932] Update pause icon to use symbol api --- src/main/resources/images/symbols/pause.svg | 1 + .../plugins/workflow/cps/PauseUnpauseAction/action.jelly | 2 +- src/main/webapp/images/pause.svg | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/images/symbols/pause.svg delete mode 100644 src/main/webapp/images/pause.svg diff --git a/src/main/resources/images/symbols/pause.svg b/src/main/resources/images/symbols/pause.svg new file mode 100644 index 000000000..136aa293f --- /dev/null +++ b/src/main/resources/images/symbols/pause.svg @@ -0,0 +1 @@ +Pause \ No newline at end of file diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly index 3862473b2..a0eb07386 100644 --- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly +++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly @@ -25,5 +25,5 @@ THE SOFTWARE. - + diff --git a/src/main/webapp/images/pause.svg b/src/main/webapp/images/pause.svg deleted file mode 100644 index 6f885fc87..000000000 --- a/src/main/webapp/images/pause.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - From 9306b761ae2d912f3edbb265fe5b736052be2f3f Mon Sep 17 00:00:00 2001 From: Bartosz Nowak <9051964+DuMaM@users.noreply.github> Date: Wed, 29 Jun 2022 21:46:05 +0000 Subject: [PATCH 673/932] Update redo symbol --- .../org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java | 2 +- src/main/resources/symbols/images/redo.svg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/symbols/images/redo.svg diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java index 1c7c4da9f..5fa2453c0 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java @@ -102,7 +102,7 @@ private ReplayAction(Run run) { } @Override public String getIconFileName() { - return isEnabled() || isRebuildEnabled() ? "redo.png" : null; + return isEnabled() || isRebuildEnabled() ? "symbol-redo plugin-workflow-cps" : null; } @Override public String getUrlName() { diff --git a/src/main/resources/symbols/images/redo.svg b/src/main/resources/symbols/images/redo.svg new file mode 100644 index 000000000..7aabd95cb --- /dev/null +++ b/src/main/resources/symbols/images/redo.svg @@ -0,0 +1 @@ +Arrow Redo \ No newline at end of file From 4f857c6907fe525962a2408f3b751f66ddabb79c Mon Sep 17 00:00:00 2001 From: Bartosz Nowak <9051964+DuMaM@users.noreply.github> Date: Wed, 29 Jun 2022 21:46:19 +0000 Subject: [PATCH 674/932] Update gear symbol --- .../jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java index 4839f7a6b..91a451b2f 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java @@ -38,7 +38,7 @@ public final class CpsThreadDumpAction implements Action { @Override public String getIconFileName() { - return "gear.png"; + return "symbol-settings"; } @Override @@ -50,7 +50,7 @@ public String getDisplayName() { public String getUrlName() { return "threadDump"; } - + public String getParentUrl() throws IOException { return execution.getOwner().getUrl(); } From e8070d6c45d3e932e201071f11d2b8d29902392c Mon Sep 17 00:00:00 2001 From: Bartosz Nowak <9051964+DuMaM@users.noreply.github> Date: Wed, 29 Jun 2022 21:54:58 +0000 Subject: [PATCH 675/932] Move icon around --- src/main/resources/{symbols/images => images/symbols}/redo.svg | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/{symbols/images => images/symbols}/redo.svg (100%) diff --git a/src/main/resources/symbols/images/redo.svg b/src/main/resources/images/symbols/redo.svg similarity index 100% rename from src/main/resources/symbols/images/redo.svg rename to src/main/resources/images/symbols/redo.svg From 67735abca7fe2cfc0147da2170276d35b6b5469a Mon Sep 17 00:00:00 2001 From: Bartosz Nowak <9051964+DuMaM@users.noreply.github> Date: Wed, 29 Jun 2022 22:04:57 +0000 Subject: [PATCH 676/932] Change Thread Dump icon to more fitting one Gear icon is overused around Jenkins --- .../org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java index 91a451b2f..3e3eb808a 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java @@ -38,7 +38,7 @@ public final class CpsThreadDumpAction implements Action { @Override public String getIconFileName() { - return "symbol-settings"; + return "symbol-analytics"; } @Override From 34a580e7e221d07bf0410f8c2227c6aba27eb13d Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Thu, 30 Jun 2022 13:36:28 -0400 Subject: [PATCH 677/932] Update groovy-sandbox to latest release and groovy to version used by Jenkins core --- lib/pom.xml | 2 +- .../groovy/cps/sandbox/SandboxInvokerTest.groovy | 8 +++++++- pom.xml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/pom.xml b/lib/pom.xml index d3cbbdffe..c49ba5b51 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -105,7 +105,7 @@ - 1.21 + 1.27 diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index 5c085987d..e229b9853 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -151,10 +151,16 @@ new GStringImpl(Object[],String[]) def untrusted = this; untrusted.binding.setVariable("trusted", trusted.csh.parse("def foo(x) { return [new java.awt.Point(1,x),untrusted.bar()] }")); - trusted.binding.setVariable("untrusted",untrusted.csh.parse("def bar() { return new File('foo') }")); + cr.register() // untrusted.csh.parse instantiates the sandbox-transformed script, so a GroovyInterceptor must be registered when it runs. + try { + trusted.binding.setVariable("untrusted",untrusted.csh.parse("def bar() { return new File('foo') }")); + } finally { + cr.unregister(); + } assert [new Point(1,4),new File("foo")]==evalCpsSandbox("trusted.foo(4)"); assertIntercept(""" +Script1.super(Script1).setBinding(Binding) Script2.super(Script2).setBinding(Binding) Script2.trusted Script1.foo(Integer) diff --git a/pom.xml b/pom.xml index 1499f3fbe..811acc439 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.4.7 + 2.4.21 1.33 -SNAPSHOT From b2587c0a8c3ea7039c14de247231e68b80b429d8 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Thu, 30 Jun 2022 14:09:20 -0400 Subject: [PATCH 678/932] Cast the RHS of logical operators to boolean --- .../com/cloudbees/groovy/cps/impl/LogicalOpBlock.java | 10 ++++++++-- .../com/cloudbees/groovy/cps/CpsTransformerTest.groovy | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java index 859153816..ee810c142 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java @@ -38,17 +38,23 @@ public Next decide(Object lhs) { boolean v = DefaultTypeTransformation.castToBoolean(lhs); if (and) { if (!v) return k.receive(false); // false && ... - else return then(rhs,e,k); + else return then(rhs,e,castRhs); } else { if (v) return k.receive(true); // true || ... - else return then(rhs,e,k); + else return then(rhs,e,castRhs); } } + public Next castRhs(Object rhs) { + boolean v = DefaultTypeTransformation.castToBoolean(rhs); + return k.receive(v); + } + private static final long serialVersionUID = 1L; } static final ContinuationPtr decide = new ContinuationPtr(ContinuationImpl.class,"decide"); + static final ContinuationPtr castRhs = new ContinuationPtr(ContinuationImpl.class,"castRhs"); private static final long serialVersionUID = 1L; } diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 9adc94a69..c5530121c 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -438,6 +438,8 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { assert evalCPS("true && (false || false)") == false; assert evalCPS("true && (true || false)") == true; assert evalCPS("false && (true || false)") == false; + assert evalCPS("false || 'rhs of || must be cast to boolean'") == true; + assert evalCPS("true && 'rhs of && must be cast to boolean'") == true; assert evalCPS(''' x = [0, 0, 0, 0] def set(index) { From 8bc624cd1c11da76a5e31c4da80f04d1ccf4cc63 Mon Sep 17 00:00:00 2001 From: Yaroslav Afenkin Date: Wed, 6 Jul 2022 17:40:10 +0300 Subject: [PATCH 679/932] Move script approval related tests to a separate test class --- .../workflow/cps/CpsFlowDefinition2Test.java | 213 --------------- .../workflow/cps/CpsFlowDefinitionTest.java | 252 ++++++++++++++++++ 2 files changed, 252 insertions(+), 213 deletions(-) create mode 100644 src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java index fa4435b81..959c33110 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java @@ -872,219 +872,6 @@ public void scriptInitializerCallsCpsTransformedMethod() throws Exception { assertNull(Jenkins.get().getDescription()); } - @Issue("SECURITY-2450") - @Test - public void cpsScriptNonAdminConfiguration() throws Exception { - jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); - - MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); - mockStrategy.grant(Jenkins.READ).everywhere().to("devel"); - for (Permission p : Item.PERMISSIONS.getPermissions()) { - mockStrategy.grant(p).everywhere().to("devel"); - } - jenkins.jenkins.setAuthorizationStrategy(mockStrategy); - - JenkinsRule.WebClient wcDevel = jenkins.createWebClient(); - wcDevel.login("devel"); - - WorkflowJob p = jenkins.createProject(WorkflowJob.class); - - HtmlForm config = wcDevel.getPage(p, "configure").getFormByName("config"); - List scripts = config.getTextAreasByName("_.script"); - // Get the last one, because previous ones might be from Lockable Resources during PCT. - HtmlTextArea script = scripts.get(scripts.size() - 1); - String groovy = "echo 'hi from cpsScriptNonAdminConfiguration'"; - script.setText(groovy); - - List sandboxes = config.getInputsByName("_.sandbox"); - // Get the last one, because previous ones might be from Lockable Resources during PCT. - HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); - assertTrue(sandbox.isChecked()); - sandbox.setChecked(false); - - jenkins.submit(config); - - assertFalse(ScriptApproval.get().isScriptApproved(groovy, GroovyLanguage.get())); - } - - @Issue("SECURITY-2450") - @Test - public void cpsScriptAdminConfiguration() throws Exception { - jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); - - MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); - mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); - for (Permission p : Item.PERMISSIONS.getPermissions()) { - mockStrategy.grant(p).everywhere().to("admin"); - } - jenkins.jenkins.setAuthorizationStrategy(mockStrategy); - - JenkinsRule.WebClient admin = jenkins.createWebClient(); - admin.login("admin"); - - WorkflowJob p = jenkins.createProject(WorkflowJob.class); - - HtmlForm config = admin.getPage(p, "configure").getFormByName("config"); - List scripts = config.getTextAreasByName("_.script"); - // Get the last one, because previous ones might be from Lockable Resources during PCT. - HtmlTextArea script = scripts.get(scripts.size() - 1); - String groovy = "echo 'hi from cpsScriptAdminConfiguration'"; - script.setText(groovy); - - List sandboxes = config.getInputsByName("_.sandbox"); - // Get the last one, because previous ones might be from Lockable Resources during PCT. - HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); - assertTrue(sandbox.isChecked()); - sandbox.setChecked(false); - - jenkins.submit(config); - - assertTrue(ScriptApproval.get().isScriptApproved(groovy, GroovyLanguage.get())); - } - - @Issue("SECURITY-2450") - @Test - public void cpsScriptAdminModification() throws Exception { - jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); - - MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); - mockStrategy.grant(Jenkins.READ).everywhere().to("devel"); - mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); - for (Permission p : Item.PERMISSIONS.getPermissions()) { - mockStrategy.grant(p).everywhere().to("devel"); - mockStrategy.grant(p).everywhere().to("admin"); - } - jenkins.jenkins.setAuthorizationStrategy(mockStrategy); - - JenkinsRule.WebClient wc = jenkins.createWebClient(); - wc.login("devel"); - - WorkflowJob p = jenkins.createProject(WorkflowJob.class); - String userGroovy = "echo 'hi from devel'"; - String adminGroovy = "echo 'hi from admin'"; - - // initial configuration by user, script ends up in pending - { - HtmlForm config = wc.getPage(p, "configure").getFormByName("config"); - List scripts = config.getTextAreasByName("_.script"); - // Get the last one, because previous ones might be from Lockable Resources during PCT. - HtmlTextArea script = scripts.get(scripts.size() - 1); - script.setText(userGroovy); - - List sandboxes = config.getInputsByName("_.sandbox"); - // Get the last one, because previous ones might be from Lockable Resources during PCT. - HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); - assertTrue(sandbox.isChecked()); - sandbox.setChecked(false); - - jenkins.submit(config); - - assertFalse(ScriptApproval.get().isScriptApproved(userGroovy, GroovyLanguage.get())); - } - - wc.login("admin"); - - // modification by admin, script gets approved automatically - { - HtmlForm config = wc.getPage(p, "configure").getFormByName("config"); - List scripts = config.getTextAreasByName("_.script"); - // Get the last one, because previous ones might be from Lockable Resources during PCT. - HtmlTextArea script = scripts.get(scripts.size() - 1); - script.setText(adminGroovy); - - List sandboxes = config.getInputsByName("_.sandbox"); - // Get the last one, because previous ones might be from Lockable Resources during PCT. - HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); - assertFalse(sandbox.isChecked()); - - jenkins.submit(config); - - // script content was modified by admin, so it should be approved upon save - // the one that had been submitted by the user previously stays in pending - assertTrue(ScriptApproval.get().isScriptApproved(adminGroovy, GroovyLanguage.get())); - assertFalse(ScriptApproval.get().isScriptApproved(userGroovy, GroovyLanguage.get())); - } - } - - @Test - public void cpsScriptSubmissionViaCli() throws Exception { - jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); - - MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); - mockStrategy.grant(Jenkins.READ, Job.CONFIGURE).everywhere().to("devel"); - mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); - for (Permission p : Item.PERMISSIONS.getPermissions()) { - mockStrategy.grant(p).everywhere().to("devel"); - mockStrategy.grant(p).everywhere().to("admin"); - } - jenkins.jenkins.setAuthorizationStrategy(mockStrategy); - - WorkflowJob p = jenkins.createProject(WorkflowJob.class, "prj"); - String preconfiguredScript = "echo preconfigured"; - ScriptApproval.get().preapprove(preconfiguredScript, GroovyLanguage.get()); - p.setDefinition(new CpsFlowDefinition(preconfiguredScript, false)); - - JenkinsRule.WebClient wc = jenkins.createWebClient(); - wc.login("admin"); - String configDotXml = p.getUrl() + "config.xml"; - String xml = wc.goTo(configDotXml, "application/xml").getWebResponse().getContentAsString(); - - CLICommand cmd = new UpdateJobCommand(); - cmd.setTransportAuth2(User.getById("admin", true).impersonate2()); - String viaCliScript = "echo configured via CLI"; - assertThat(new CLICommandInvoker(jenkins, cmd).withStdin(new StringInputStream(xml.replace(preconfiguredScript, viaCliScript))).invokeWithArgs(p.getName()), CLICommandInvoker.Matcher.succeededSilently()); - assertEquals(viaCliScript, ((CpsFlowDefinition)p.getDefinition()).getScript()); - assertTrue(ScriptApproval.get().isScriptApproved(viaCliScript, GroovyLanguage.get())); - - // now with non-admin user, script should end up in pending - cmd.setTransportAuth2(User.getById("devel", true).impersonate2()); - String viaCliByDevelScript = "echo configured via CLI by devel"; - assertThat(new CLICommandInvoker(jenkins, cmd).withStdin(new StringInputStream(xml.replace(preconfiguredScript, viaCliByDevelScript))).invokeWithArgs(p.getName()), CLICommandInvoker.Matcher.succeededSilently()); - assertEquals(viaCliByDevelScript, ((CpsFlowDefinition)p.getDefinition()).getScript()); - assertFalse(ScriptApproval.get().isScriptApproved(viaCliByDevelScript, GroovyLanguage.get())); - wc.close(); - } - - @Test - public void cpsScriptSubmissionViaRest() throws Exception { - jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); - - MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); - mockStrategy.grant(Jenkins.READ, Job.CONFIGURE).everywhere().to("devel"); - mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); - for (Permission p : Item.PERMISSIONS.getPermissions()) { - mockStrategy.grant(p).everywhere().to("devel"); - mockStrategy.grant(p).everywhere().to("admin"); - } - jenkins.jenkins.setAuthorizationStrategy(mockStrategy); - - WorkflowJob p = jenkins.createProject(WorkflowJob.class); - String preconfiguredScript = "echo preconfigured"; - ScriptApproval.get().preapprove(preconfiguredScript, GroovyLanguage.get()); - p.setDefinition(new CpsFlowDefinition(preconfiguredScript, false)); - - JenkinsRule.WebClient wc = jenkins.createWebClient(); - wc.login("admin"); - String configDotXmlUrl = p.getUrl() + "config.xml"; - String xml = wc.goTo(configDotXmlUrl, "application/xml").getWebResponse().getContentAsString(); - - WebRequest req = new WebRequest(wc.createCrumbedUrl(configDotXmlUrl), HttpMethod.POST); - req.setEncodingType(null); - String configuredViaRestScript = "echo configured via REST"; - req.setRequestBody(xml.replace(preconfiguredScript, configuredViaRestScript)); - wc.getPage(req); - assertEquals(configuredViaRestScript, ((CpsFlowDefinition)p.getDefinition()).getScript()); - assertTrue(ScriptApproval.get().isScriptApproved(configuredViaRestScript, GroovyLanguage.get())); - - wc.login("devel"); - String configuredViaRestByNonAdmin = "echo configured via REST by devel"; - req.setRequestBody(xml.replace(preconfiguredScript, configuredViaRestByNonAdmin)); - wc.getPage(req); - assertEquals(configuredViaRestByNonAdmin, ((CpsFlowDefinition)p.getDefinition()).getScript()); - assertFalse(ScriptApproval.get().isScriptApproved(configuredViaRestByNonAdmin, GroovyLanguage.get())); - wc.close(); - } - public static class UnsafeParameterStep extends Step implements Serializable { private final UnsafeDescribable val; @DataBoundConstructor diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java new file mode 100644 index 000000000..8510d4243 --- /dev/null +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java @@ -0,0 +1,252 @@ +package org.jenkinsci.plugins.workflow.cps; + +import com.gargoylesoftware.htmlunit.HttpMethod; +import com.gargoylesoftware.htmlunit.WebRequest; +import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlInput; +import com.gargoylesoftware.htmlunit.html.HtmlTextArea; +import hudson.cli.CLICommand; +import hudson.cli.CLICommandInvoker; +import hudson.cli.UpdateJobCommand; +import hudson.model.Item; +import hudson.model.Job; +import hudson.model.User; +import hudson.security.Permission; +import jenkins.model.Jenkins; +import org.apache.tools.ant.filters.StringInputStream; +import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval; +import org.jenkinsci.plugins.scriptsecurity.scripts.languages.GroovyLanguage; +import org.jenkinsci.plugins.workflow.job.WorkflowJob; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.MockAuthorizationStrategy; + +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +public class CpsFlowDefinitionTest { + + @Rule public JenkinsRule jenkins = new JenkinsRule(); + + @Issue("SECURITY-2450") + @Test + public void cpsScriptNonAdminConfiguration() throws Exception { + jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); + + MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); + mockStrategy.grant(Jenkins.READ).everywhere().to("devel"); + for (Permission p : Item.PERMISSIONS.getPermissions()) { + mockStrategy.grant(p).everywhere().to("devel"); + } + jenkins.jenkins.setAuthorizationStrategy(mockStrategy); + + JenkinsRule.WebClient wcDevel = jenkins.createWebClient(); + wcDevel.login("devel"); + + WorkflowJob p = jenkins.createProject(WorkflowJob.class); + + HtmlForm config = wcDevel.getPage(p, "configure").getFormByName("config"); + List scripts = config.getTextAreasByName("_.script"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlTextArea script = scripts.get(scripts.size() - 1); + String groovy = "echo 'hi from cpsScriptNonAdminConfiguration'"; + script.setText(groovy); + + List sandboxes = config.getInputsByName("_.sandbox"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); + assertTrue(sandbox.isChecked()); + sandbox.setChecked(false); + + jenkins.submit(config); + assertEquals(1, ScriptApproval.get().getPendingScripts().size()); + assertFalse(ScriptApproval.get().isScriptApproved(groovy, GroovyLanguage.get())); + } + + @Issue("SECURITY-2450") + @Test + public void cpsScriptAdminConfiguration() throws Exception { + jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); + + MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); + mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); + for (Permission p : Item.PERMISSIONS.getPermissions()) { + mockStrategy.grant(p).everywhere().to("admin"); + } + jenkins.jenkins.setAuthorizationStrategy(mockStrategy); + + JenkinsRule.WebClient admin = jenkins.createWebClient(); + admin.login("admin"); + + WorkflowJob p = jenkins.createProject(WorkflowJob.class); + + HtmlForm config = admin.getPage(p, "configure").getFormByName("config"); + List scripts = config.getTextAreasByName("_.script"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlTextArea script = scripts.get(scripts.size() - 1); + String groovy = "echo 'hi from cpsScriptAdminConfiguration'"; + script.setText(groovy); + + List sandboxes = config.getInputsByName("_.sandbox"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); + assertTrue(sandbox.isChecked()); + sandbox.setChecked(false); + + jenkins.submit(config); + + assertTrue(ScriptApproval.get().isScriptApproved(groovy, GroovyLanguage.get())); + } + + @Issue("SECURITY-2450") + @Test + public void cpsScriptAdminModification() throws Exception { + jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); + + MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); + mockStrategy.grant(Jenkins.READ).everywhere().to("devel"); + mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); + for (Permission p : Item.PERMISSIONS.getPermissions()) { + mockStrategy.grant(p).everywhere().to("devel"); + mockStrategy.grant(p).everywhere().to("admin"); + } + jenkins.jenkins.setAuthorizationStrategy(mockStrategy); + + JenkinsRule.WebClient wc = jenkins.createWebClient(); + wc.login("devel"); + + WorkflowJob p = jenkins.createProject(WorkflowJob.class); + String userGroovy = "echo 'hi from devel'"; + String adminGroovy = "echo 'hi from admin'"; + + // initial configuration by user, script ends up in pending + { + HtmlForm config = wc.getPage(p, "configure").getFormByName("config"); + List scripts = config.getTextAreasByName("_.script"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlTextArea script = scripts.get(scripts.size() - 1); + script.setText(userGroovy); + + List sandboxes = config.getInputsByName("_.sandbox"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); + assertTrue(sandbox.isChecked()); + sandbox.setChecked(false); + + jenkins.submit(config); + + assertEquals(1, ScriptApproval.get().getPendingScripts().size()); + + assertFalse(ScriptApproval.get().isScriptApproved(userGroovy, GroovyLanguage.get())); + } + + wc.login("admin"); + + // modification by admin, script gets approved automatically + { + HtmlForm config = wc.getPage(p, "configure").getFormByName("config"); + List scripts = config.getTextAreasByName("_.script"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlTextArea script = scripts.get(scripts.size() - 1); + script.setText(adminGroovy); + + List sandboxes = config.getInputsByName("_.sandbox"); + // Get the last one, because previous ones might be from Lockable Resources during PCT. + HtmlCheckBoxInput sandbox = (HtmlCheckBoxInput) sandboxes.get(sandboxes.size() - 1); + assertFalse(sandbox.isChecked()); + + jenkins.submit(config); + + // script content was modified by admin, so it should be approved upon save + // the one that had been submitted by the user previously stays in pending + assertTrue(ScriptApproval.get().isScriptApproved(adminGroovy, GroovyLanguage.get())); + assertFalse(ScriptApproval.get().isScriptApproved(userGroovy, GroovyLanguage.get())); + } + } + + @Test + public void cpsScriptSubmissionViaCli() throws Exception { + jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); + + MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); + mockStrategy.grant(Jenkins.READ, Job.CONFIGURE).everywhere().to("devel"); + mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); + for (Permission p : Item.PERMISSIONS.getPermissions()) { + mockStrategy.grant(p).everywhere().to("devel"); + mockStrategy.grant(p).everywhere().to("admin"); + } + jenkins.jenkins.setAuthorizationStrategy(mockStrategy); + + WorkflowJob p = jenkins.createProject(WorkflowJob.class, "prj"); + String preconfiguredScript = "echo preconfigured"; + ScriptApproval.get().preapprove(preconfiguredScript, GroovyLanguage.get()); + p.setDefinition(new CpsFlowDefinition(preconfiguredScript, false)); + + JenkinsRule.WebClient wc = jenkins.createWebClient(); + wc.login("admin"); + String configDotXml = p.getUrl() + "config.xml"; + String xml = wc.goTo(configDotXml, "application/xml").getWebResponse().getContentAsString(); + + CLICommand cmd = new UpdateJobCommand(); + cmd.setTransportAuth2(User.getById("admin", true).impersonate2()); + String viaCliScript = "echo configured via CLI"; + assertThat(new CLICommandInvoker(jenkins, cmd).withStdin(new StringInputStream(xml.replace(preconfiguredScript, viaCliScript))).invokeWithArgs(p.getName()), CLICommandInvoker.Matcher.succeededSilently()); + assertEquals(viaCliScript, ((CpsFlowDefinition)p.getDefinition()).getScript()); + assertTrue(ScriptApproval.get().isScriptApproved(viaCliScript, GroovyLanguage.get())); + + // now with non-admin user, script should end up in pending + cmd.setTransportAuth2(User.getById("devel", true).impersonate2()); + String viaCliByDevelScript = "echo configured via CLI by devel"; + assertThat(new CLICommandInvoker(jenkins, cmd).withStdin(new StringInputStream(xml.replace(preconfiguredScript, viaCliByDevelScript))).invokeWithArgs(p.getName()), CLICommandInvoker.Matcher.succeededSilently()); + assertEquals(viaCliByDevelScript, ((CpsFlowDefinition)p.getDefinition()).getScript()); + assertFalse(ScriptApproval.get().isScriptApproved(viaCliByDevelScript, GroovyLanguage.get())); + wc.close(); + } + + @Test + public void cpsScriptSubmissionViaRest() throws Exception { + jenkins.jenkins.setSecurityRealm(jenkins.createDummySecurityRealm()); + + MockAuthorizationStrategy mockStrategy = new MockAuthorizationStrategy(); + mockStrategy.grant(Jenkins.READ, Job.CONFIGURE).everywhere().to("devel"); + mockStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin"); + for (Permission p : Item.PERMISSIONS.getPermissions()) { + mockStrategy.grant(p).everywhere().to("devel"); + mockStrategy.grant(p).everywhere().to("admin"); + } + jenkins.jenkins.setAuthorizationStrategy(mockStrategy); + + WorkflowJob p = jenkins.createProject(WorkflowJob.class); + String preconfiguredScript = "echo preconfigured"; + ScriptApproval.get().preapprove(preconfiguredScript, GroovyLanguage.get()); + p.setDefinition(new CpsFlowDefinition(preconfiguredScript, false)); + + JenkinsRule.WebClient wc = jenkins.createWebClient(); + wc.login("admin"); + String configDotXmlUrl = p.getUrl() + "config.xml"; + String xml = wc.goTo(configDotXmlUrl, "application/xml").getWebResponse().getContentAsString(); + + WebRequest req = new WebRequest(wc.createCrumbedUrl(configDotXmlUrl), HttpMethod.POST); + req.setEncodingType(null); + String configuredViaRestScript = "echo configured via REST"; + req.setRequestBody(xml.replace(preconfiguredScript, configuredViaRestScript)); + wc.getPage(req); + assertEquals(configuredViaRestScript, ((CpsFlowDefinition)p.getDefinition()).getScript()); + assertTrue(ScriptApproval.get().isScriptApproved(configuredViaRestScript, GroovyLanguage.get())); + + wc.login("devel"); + String configuredViaRestByNonAdmin = "echo configured via REST by devel"; + req.setRequestBody(xml.replace(preconfiguredScript, configuredViaRestByNonAdmin)); + wc.getPage(req); + assertEquals(configuredViaRestByNonAdmin, ((CpsFlowDefinition)p.getDefinition()).getScript()); + assertFalse(ScriptApproval.get().isScriptApproved(configuredViaRestByNonAdmin, GroovyLanguage.get())); + wc.close(); + } +} From 86c32f192d2bd809fe81077652831201a06f2a20 Mon Sep 17 00:00:00 2001 From: Yaroslav Afenkin Date: Wed, 6 Jul 2022 17:42:18 +0300 Subject: [PATCH 680/932] Remove unused imports from CpsFlowDefinition2Test --- .../workflow/cps/CpsFlowDefinition2Test.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java index 959c33110..b3fec23af 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java @@ -25,37 +25,20 @@ package org.jenkinsci.plugins.workflow.cps; import com.cloudbees.groovy.cps.CpsTransformer; -import com.gargoylesoftware.htmlunit.HttpMethod; -import com.gargoylesoftware.htmlunit.WebRequest; -import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlInput; -import com.gargoylesoftware.htmlunit.html.HtmlTextArea; import hudson.Functions; -import hudson.cli.CLICommand; -import hudson.cli.CLICommandInvoker; -import hudson.cli.UpdateJobCommand; import hudson.model.Computer; import hudson.model.Describable; import hudson.model.Executor; -import hudson.model.Item; -import hudson.model.Job; import hudson.model.Result; import java.io.Serializable; import java.util.Collections; -import java.util.List; import java.util.Set; import java.util.logging.Level; -import hudson.model.User; -import hudson.security.Permission; import jenkins.model.Jenkins; -import org.apache.tools.ant.filters.StringInputStream; import org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException; -import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval; -import org.jenkinsci.plugins.scriptsecurity.scripts.languages.GroovyLanguage; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.jenkinsci.plugins.workflow.steps.Step; @@ -75,14 +58,12 @@ import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.LoggerRule; -import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.DataBoundConstructor; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; From f2b8be7a0cf92acec1f4cd8ec04312a3fbf06340 Mon Sep 17 00:00:00 2001 From: Yaroslav Afenkin Date: Wed, 6 Jul 2022 18:39:15 +0300 Subject: [PATCH 681/932] Add license info to CpsFlowDefinitionTest --- .../workflow/cps/CpsFlowDefinitionTest.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java index 8510d4243..c31ed97ee 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java @@ -1,3 +1,27 @@ +/* + * The MIT License + * + * Copyright 2022 CloudBees, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + package org.jenkinsci.plugins.workflow.cps; import com.gargoylesoftware.htmlunit.HttpMethod; From 1356b9fbed466b3d0d6464dbe5f8e1233ce68ab4 Mon Sep 17 00:00:00 2001 From: Bartosz Nowak <9051964+DuMaM@users.noreply.github.com> Date: Wed, 6 Jul 2022 20:19:32 +0200 Subject: [PATCH 682/932] Bump baseline to minimal required one --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d8276914d..fb4a40965 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin - 2.332.1 + 2.346.1 false 1.32 12.19.0 @@ -74,7 +74,7 @@ io.jenkins.tools.bom - bom-2.332.x + bom-2.346.x 1382.v7d694476f340 import pom From 3708eff86919550b8e3e2cbe883140e5e1a8878c Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 11 Jul 2022 13:47:13 -0400 Subject: [PATCH 683/932] BOM updates --- pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index fb4a40965..29d4ad236 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ io.jenkins.tools.bom bom-2.346.x - 1382.v7d694476f340 + 1472.vb_65d893c9a_b_6 import pom @@ -89,7 +89,6 @@ org.jenkins-ci.plugins.workflow workflow-api - 1162.va_1e49062a_00e org.jenkins-ci.plugins.workflow @@ -102,7 +101,6 @@ org.jenkins-ci.plugins script-security - 1172.v35f6a_0b_8207e org.jenkins-ci.plugins @@ -150,7 +148,6 @@ org.jenkins-ci.plugins.workflow workflow-job test - 1181.va_25d15548158 org.jenkins-ci.plugins.workflow @@ -239,7 +236,6 @@ org.jenkins-ci.plugins config-file-provider - 3.9.0 test From de21ee06b8ec490f0f5dbfa4036bbe5f2b72e9c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 10 Apr 2022 16:34:23 +0000 Subject: [PATCH 684/932] Bump minimist from 1.2.5 to 1.2.6 Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8a3932dc0..bf114f862 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3365,8 +3365,8 @@ minimatch@~0.2.11: sigmund "~1.0.0" minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" mississippi@^3.0.0: version "3.0.0" From 9e50dbe3e4bb40210b2ca9c2b4a70d2e3204b7de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 00:08:18 +0000 Subject: [PATCH 685/932] Bump testcontainers from 1.16.3 to 1.17.3 Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.16.3 to 1.17.3. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.16.3...1.17.3) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29d4ad236..926c89377 100644 --- a/pom.xml +++ b/pom.xml @@ -270,7 +270,7 @@ org.testcontainers testcontainers - 1.16.3 + 1.17.3 test From 3791e57ad9b6e7c22c25509f70e0390ed1f9340c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 00:09:46 +0000 Subject: [PATCH 686/932] Bump plugin from 4.40 to 4.42 Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.40 to 4.42. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.40...plugin-4.42) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 926c89377..260049da0 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.40 + 4.42 org.jenkins-ci.plugins.workflow From 5f77179585ebf8801c2812612622ff53c362229f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 15:52:51 +0000 Subject: [PATCH 687/932] Bump bom-2.346.x from 1472.vb_65d893c9a_b_6 to 1478.v81d3dc4f9a_43 Bumps [bom-2.346.x](https://github.com/jenkinsci/bom) from 1472.vb_65d893c9a_b_6 to 1478.v81d3dc4f9a_43. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.346.x dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 260049da0..ec4e942b2 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ io.jenkins.tools.bom bom-2.346.x - 1472.vb_65d893c9a_b_6 + 1478.v81d3dc4f9a_43 import pom From 5dc45657200ead776a13e302222cfdcf3d231057 Mon Sep 17 00:00:00 2001 From: Riliane Date: Wed, 20 Jul 2022 17:17:25 +0300 Subject: [PATCH 688/932] BEE-15265 avoid race condition causing flake --- .../org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index bfe0c47f3..9ce0f999c 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -777,7 +777,8 @@ public void evaluate() throws Throwable { WorkflowRun run = createAndRunSleeperJob(story.j.jenkins, jobName, FlowDurabilityHint.MAX_SURVIVABILITY, false); FlowExecution exec = run.getExecution(); if (exec instanceof CpsFlowExecution) { - assert ((CpsFlowExecution) exec).getStorage().isPersistedFully(); + ((CpsFlowExecution) exec).waitForSuspension(); // till done writing head node ID into build.xml + assert ((CpsFlowExecution) exec).getStorage().isPersistedFully(); // single node xmls written } nodesOut.addAll(new DepthFirstScanner().allNodes(run.getExecution())); nodesOut.sort(FlowScanningUtils.ID_ORDER_COMPARATOR); From 87b648138d6bdf3fbc1de8f03156f4c720c3be15 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 21 Jul 2022 17:44:41 -0400 Subject: [PATCH 689/932] [JENKINS-49707] Implement `BodyExecution.cancel(Throwable)` --- pom.xml | 1 + .../plugins/workflow/cps/CpsBodyExecution.java | 14 +++++--------- .../plugins/workflow/cps/steps/ParallelStep.java | 3 ++- .../workflow/cps/steps/ParallelStepExecution.java | 7 ------- .../plugins/workflow/cps/CpsBodyExecutionTest.java | 3 ++- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index ec4e942b2..ead550886 100644 --- a/pom.xml +++ b/pom.xml @@ -85,6 +85,7 @@ org.jenkins-ci.plugins.workflow workflow-step-api + 999999-SNAPSHOT org.jenkins-ci.plugins.workflow diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java index 316213516..585134ac7 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java @@ -11,9 +11,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.FutureCallback; import hudson.model.Action; -import hudson.model.Result; import hudson.util.Iterators; -import jenkins.model.CauseOfInterruption; import org.jenkinsci.plugins.workflow.actions.BodyInvocationAction; import org.jenkinsci.plugins.workflow.actions.ErrorAction; import org.jenkinsci.plugins.workflow.cps.nodes.StepEndNode; @@ -22,14 +20,12 @@ import org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext; import org.jenkinsci.plugins.workflow.steps.BodyExecution; import org.jenkinsci.plugins.workflow.steps.BodyExecutionCallback; -import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException; import org.jenkinsci.plugins.workflow.steps.StepContext; import org.jenkinsci.plugins.workflow.steps.StepExecution; import net.jcip.annotations.GuardedBy; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; @@ -72,7 +68,7 @@ class CpsBodyExecution extends BodyExecution { * Set to non-null if the body execution is stopped. */ @GuardedBy("this") - private FlowInterruptedException stopped; + private Throwable stopped; private final List callbacks; @@ -243,13 +239,12 @@ public Collection getCurrentExecutions() { } @Override - public boolean cancel(final CauseOfInterruption... causes) { + public boolean cancel(Throwable error) { // 'stopped' and 'thread' are updated atomically CpsThread t; synchronized (this) { if (isDone()) return false; // already complete - // TODO should perhaps rather override cancel(Throwable) and make this overload just delegate to that one - stopped = new FlowInterruptedException(Result.ABORTED, causes); + stopped = error; t = this.thread; } @@ -276,7 +271,8 @@ public void onSuccess(CpsThreadGroup g) { @Override public void onFailure(Throwable t) { - LOGGER.log(Level.WARNING, "could not cancel " + context + " with " + Arrays.toString(causes), t); + t.addSuppressed(error); + LOGGER.log(Level.WARNING, "could not cancel " + context, t); } }); } else { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java index b56c8f23f..76b1257a3 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java @@ -148,7 +148,8 @@ private void checkAllDone(boolean stepFailed) { if (stepFailed && handler.failFast && ! handler.isStopSent()) { handler.stopSent(); try { - handler.stepExecution.stop(new FailFastCause(name)); + // TODO consider actualInterruption=false + handler.stepExecution.stop(new FlowInterruptedException(Result.ABORTED, true, new FailFastCause(name))); } catch (Exception ignored) { // ignored. diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java index d0a675fdf..eedb8c807 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java @@ -2,7 +2,6 @@ import groovy.lang.Closure; import hudson.model.TaskListener; -import jenkins.model.CauseOfInterruption; import org.jenkinsci.plugins.workflow.actions.LabelAction; import org.jenkinsci.plugins.workflow.actions.ThreadNameAction; import org.jenkinsci.plugins.workflow.cps.CpsStepContext; @@ -69,12 +68,6 @@ public void stop(Throwable cause) throws Exception { } } - void stop(CauseOfInterruption... causes) { - for (BodyExecution body : bodies) { - body.cancel(causes); - } - } - private static final long serialVersionUID = 1L; @PersistIn(FLOW_NODE) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java index c8374b9a8..20f9074ad 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java @@ -39,6 +39,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.iterableWithSize; import static org.hamcrest.Matchers.not; +import org.jenkinsci.plugins.workflow.steps.FlowInterruptedException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -172,7 +173,7 @@ public boolean start() throws Exception { assertThat(currentExecutions2, iterableWithSize(1)); assertEquals(semaphores, Sets.union(Sets.newLinkedHashSet(currentExecutions1), Sets.newLinkedHashSet(currentExecutions2))); assertEquals(semaphores, Sets.newLinkedHashSet(execs[0].body.getCurrentExecutions())); // the top-level one - execs[0].body.cancel(); + execs[0].body.cancel(new FlowInterruptedException(Result.ABORTED, true)); SemaphoreStep.success("c/1", null); jenkins.assertBuildStatus(Result.ABORTED, jenkins.waitForCompletion(b)); }); From 86a1155959d1b4eebaec2992c7af2514581dcfd8 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 22 Jul 2022 08:39:05 -0400 Subject: [PATCH 690/932] Incremental deployment --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ead550886..ade938148 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ org.jenkins-ci.plugins.workflow workflow-step-api - 999999-SNAPSHOT + 628.v1c57e2f35a_c7 org.jenkins-ci.plugins.workflow From b466d705c4a233abbbcb556f63c4310ea4da6a82 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 22 Jul 2022 10:20:34 -0400 Subject: [PATCH 691/932] SpotBugs --- .../plugins/workflow/cps/steps/ParallelStep.java | 9 ++------- .../workflow/cps/steps/ParallelStepExecution.java | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java index 76b1257a3..25f556c4a 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java @@ -147,13 +147,8 @@ private void checkAllDone(boolean stepFailed) { // some of the results are not yet ready if (stepFailed && handler.failFast && ! handler.isStopSent()) { handler.stopSent(); - try { - // TODO consider actualInterruption=false - handler.stepExecution.stop(new FlowInterruptedException(Result.ABORTED, true, new FailFastCause(name))); - } - catch (Exception ignored) { - // ignored. - } + // TODO consider actualInterruption=false + handler.stepExecution.stop(new FlowInterruptedException(Result.ABORTED, true, new FailFastCause(name))); } return; } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java index eedb8c807..a6111ae1c 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java @@ -61,7 +61,7 @@ public boolean start() throws Exception { } @Override - public void stop(Throwable cause) throws Exception { + public void stop(Throwable cause) { // Despite suggestion in JENKINS-26148, super.stop does not work here, even accounting for the direct call from checkAllDone. for (BodyExecution body : bodies) { body.cancel(cause); From 639b8596734802355e3f250a30361cae3c5101b6 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 22 Jul 2022 11:25:36 -0400 Subject: [PATCH 692/932] A couple of test flakes --- .../jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java | 3 ++- .../jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java index e76c20b19..c8796a3f2 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java @@ -366,7 +366,8 @@ private static List stepNames(ListenableFuture> exec while (logger.getRecords().isEmpty()) { Thread.sleep(100); // apparently a race condition between CpsVmExecutorService.tearDown and WorkflowRun.finish } - assertThat(logger.getRecords(), Matchers.hasSize(Matchers.equalTo(1))); + // TODO https://github.com/jenkinsci/workflow-cps-plugin/pull/570#issuecomment-1192679404 message can be duplicated + assertThat(logger.getRecords(), Matchers.not(Matchers.empty())); assertEquals(CpsFlowExecution.TimingKind.values().length, ((CpsFlowExecution) b.getExecution()).timings.keySet().size()); }); } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index bfe0c47f3..057e29821 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -65,6 +65,7 @@ import java.util.Random; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.junit.Assume; /** * Tests implementations designed to verify handling of the flow durability levels and persistence of pipeline state. @@ -260,7 +261,8 @@ static void verifySafelyResumed(JenkinsRule rule, WorkflowRun run, boolean isSem Assert.assertEquals(1, heads.size()); FlowNode node = heads.get(0); String name = node.getDisplayFunctionName(); - Assert.assertTrue("Head node not a semaphore step or sleep: "+name, "semaphore".equals(name) || "sleep".equals(name)); + // TODO https://github.com/jenkinsci/workflow-cps-plugin/pull/570#issuecomment-1192679404 Head node not a semaphore step or sleep: { + Assume.assumeTrue("Head node not a semaphore step or sleep: "+name, "semaphore".equals(name) || "sleep".equals(name)); if (!isSemaphore) { Assert.assertNotNull(node.getPersistentAction(TimingAction.class)); Assert.assertNotNull(node.getPersistentAction(ArgumentsAction.class)); From 18bfc468e3976964a79448aa6ee0158673d7392e Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 22 Jul 2022 13:00:04 -0400 Subject: [PATCH 693/932] https://github.com/jenkinsci/workflow-step-api-plugin/pull/124 released --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ade938148..ae8adbc69 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ org.jenkins-ci.plugins.workflow workflow-step-api - 628.v1c57e2f35a_c7 + 639.v6eca_cd8c04a_a_ org.jenkins-ci.plugins.workflow From 7a6cf23b34e569bbb41487055d51c28b74eccd4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 00:12:47 +0000 Subject: [PATCH 694/932] Bump plugin from 4.42 to 4.43.1 Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.42 to 4.43.1. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.42...plugin-4.43.1) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec4e942b2..462c6d2ae 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.42 + 4.43.1 org.jenkins-ci.plugins.workflow From 30ae3c760cbcfa87218dd95cc997ef34ccb36347 Mon Sep 17 00:00:00 2001 From: Riliane Date: Mon, 25 Jul 2022 15:57:42 +0300 Subject: [PATCH 695/932] resolve flakes similar to previous --- .../org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index 9ce0f999c..cfef6963b 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -716,6 +716,7 @@ public void evaluate() throws Throwable { WorkflowRun run = createAndRunSleeperJob(story.j.jenkins, jobName, FlowDurabilityHint.MAX_SURVIVABILITY, false); FlowExecution exec = run.getExecution(); if (exec instanceof CpsFlowExecution) { + ((CpsFlowExecution) exec).waitForSuspension(); // till done writing head node ID into build.xml assert ((CpsFlowExecution) exec).getStorage().isPersistedFully(); } logStart[0] = JenkinsRule.getLog(run); @@ -745,6 +746,7 @@ public void evaluate() throws Throwable { FlowExecution exec = run.getExecution(); Assert.assertTrue(((CpsFlowExecution) exec).isResumeBlocked()); if (exec instanceof CpsFlowExecution) { + ((CpsFlowExecution) exec).waitForSuspension(); // till done writing head node ID into build.xml assert ((CpsFlowExecution) exec).getStorage().isPersistedFully(); } Assert.assertFalse(((CpsFlowExecution) exec).getProgramDataFile().exists()); From 6312a7d01cc9543a528047f97ce18692f98ce633 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 25 Jul 2022 14:09:00 -0400 Subject: [PATCH 696/932] Deprecating `waitForSuspension` --- .../plugins/workflow/cps/CpsFlowExecution.java | 2 ++ .../plugins/workflow/SerializationTest.java | 1 - .../plugins/workflow/SingleJobTestBase.java | 14 ++------------ .../jenkinsci/plugins/workflow/WorkflowTest.java | 4 ---- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 05209bdf7..aaab608c7 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -962,7 +962,9 @@ public void onFailure(Throwable t) { /** * Waits for the workflow to move into the SUSPENDED state. + * @deprecated Use some other idiom, code {@link SemaphoreStep}. */ + @Deprecated public void waitForSuspension() throws InterruptedException, ExecutionException { if (programPromise==null) return; // the execution has already finished and we are not loading program state anymore diff --git a/src/test/java/org/jenkinsci/plugins/workflow/SerializationTest.java b/src/test/java/org/jenkinsci/plugins/workflow/SerializationTest.java index 573ab7ce1..d0289c4f5 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/SerializationTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/SerializationTest.java @@ -132,7 +132,6 @@ public boolean start() throws Exception { story.addStep(new Statement() { @Override public void evaluate() throws Throwable { rebuildContext(story.j); - assertThatWorkflowIsSuspended(); SemaphoreStep.success("wait/1", null); story.j.assertBuildStatusSuccess(story.j.waitForCompletion(b)); } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java b/src/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java index 8237e2146..484596dd4 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java @@ -31,6 +31,7 @@ import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; +import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; import org.junit.Assert; import org.junit.ClassRule; import org.junit.Rule; @@ -70,18 +71,6 @@ public void rebuildContext(JenkinsRule j) throws Exception { e = (CpsFlowExecution) b.getExecution(); } - /** - * Asserts that {@link #e} is in the suspended state and has nothing more to execute. - */ - public void assertThatWorkflowIsSuspended() throws Exception { - assertThatWorkflowIsSuspended(b, e); - } - - public void assertThatWorkflowIsSuspended(WorkflowRun b, CpsFlowExecution e) throws Exception { - e.waitForSuspension(); // it should be in the suspended state - assert b.isBuilding(); - } - /** @deprecated use {@link JenkinsRule#waitForCompletion} instead */ public void waitForWorkflowToComplete() throws Exception { do { @@ -89,6 +78,7 @@ public void waitForWorkflowToComplete() throws Exception { } while (!e.isComplete()); } + /** @deprecated Use some other idiom, like {@link SemaphoreStep}. */ public void waitForWorkflowToSuspend() throws Exception { waitForWorkflowToSuspend(e); } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java b/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java index 1f0d35f0a..44700a353 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java @@ -96,7 +96,6 @@ public void evaluate() throws Throwable { @Override public void evaluate() throws Throwable { rebuildContext(story.j); - assertThatWorkflowIsSuspended(); for (int i = 0; i < 600 && !Queue.getInstance().isEmpty(); i++) { Thread.sleep(100); } @@ -141,7 +140,6 @@ private void liveness() { story.addStep(new Statement() { @Override public void evaluate() throws Throwable { rebuildContext(story.j); - assertThatWorkflowIsSuspended(); // resume execution and cause the retry to invoke the body again SemaphoreStep.success("wait/1", null); @@ -177,7 +175,6 @@ private void liveness() { @Override public void evaluate() throws Throwable { assertEquals(JenkinsRule.DummySecurityRealm.class, jenkins().getSecurityRealm().getClass()); rebuildContext(story.j); - assertThatWorkflowIsSuspended(); story.j.waitForMessage("again running as someone", b); CheckAuth.finish(true); story.j.assertLogContains("finally running as someone", story.j.assertBuildStatusSuccess(story.j.waitForCompletion(b))); @@ -319,7 +316,6 @@ public void onNewHead(FlowNode node) { story.addStep(new Statement() { @Override public void evaluate() throws Throwable { rebuildContext(story.j); - assertThatWorkflowIsSuspended(); SemaphoreStep.success("env/1", null); story.j.assertBuildStatusSuccess(story.j.waitForCompletion(b)); story.j.assertLogContains("tag=jenkins-demo-1 PERMACHINE=set", b); From 16bddb90b05737b20f8168bc22757f18e84d9d13 Mon Sep 17 00:00:00 2001 From: donghui <977675308@qq.com> Date: Mon, 1 Aug 2022 11:13:27 +0800 Subject: [PATCH 697/932] Add missing parentheses --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0b386501c..23630591a 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,14 @@ Pipeline Groovy script code such as ```groovy retry(3) { -for (int i = 0; i < 10; i++) { - branches["branch${i}"] = { - node { - retry(3) { - checkout scm + for (int i = 0; i < 10; i++) { + branches["branch${i}"] = { + node { + retry(3) { + checkout scm + } + sh 'make world' } - sh 'make world' } } } From 5f7474a4c8f2639cf9eb65975982d1b400fe303a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 00:08:16 +0000 Subject: [PATCH 698/932] Bump plugin from 4.43.1 to 4.45 Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.43.1 to 4.45. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.43.1...plugin-4.45) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e984fb5cc..0f84b40ea 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.43.1 + 4.45 org.jenkins-ci.plugins.workflow From 7f7a070673a012cbe38ec2600fb598a1bf8e159c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 00:03:54 +0000 Subject: [PATCH 699/932] Bump git-changelist-maven-extension from 1.3 to 1.4 Bumps [git-changelist-maven-extension](https://github.com/jenkinsci/incrementals-tools) from 1.3 to 1.4. - [Release notes](https://github.com/jenkinsci/incrementals-tools/releases) - [Commits](https://github.com/jenkinsci/incrementals-tools/compare/parent-1.3...parent-1.4) --- updated-dependencies: - dependency-name: io.jenkins.tools.incrementals:git-changelist-maven-extension dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .mvn/extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index a65d82e1b..9ac2968bc 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -2,6 +2,6 @@ io.jenkins.tools.incrementals git-changelist-maven-extension - 1.3 + 1.4 From a913f06671eae7b780359bc95cea076083e26196 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 1 Aug 2022 16:24:03 -0400 Subject: [PATCH 700/932] :facepalm: --- .../org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index aaab608c7..a7de06534 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -962,7 +962,7 @@ public void onFailure(Throwable t) { /** * Waits for the workflow to move into the SUSPENDED state. - * @deprecated Use some other idiom, code {@link SemaphoreStep}. + * @deprecated Use some other idiom, like {@code SemaphoreStep}. */ @Deprecated public void waitForSuspension() throws InterruptedException, ExecutionException { From 4e9060044ff1dc0a9b5b84ba96c338bea4d2f293 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 20:28:11 +0000 Subject: [PATCH 701/932] Bump svnkit-cli from 1.10.1 to 1.10.7 Bumps svnkit-cli from 1.10.1 to 1.10.7. --- updated-dependencies: - dependency-name: org.tmatesoft.svnkit:svnkit-cli dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f84b40ea..40fcd2d18 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.tmatesoft.svnkit svnkit-cli - 1.10.1 + 1.10.7 test From 23bdce9f9686a409d8ff7317bfac2d22801e67bd Mon Sep 17 00:00:00 2001 From: Riliane Date: Wed, 3 Aug 2022 13:30:57 +0300 Subject: [PATCH 702/932] stop checking nodes altogether after a dirty shutdown --- .../workflow/cps/FlowDurabilityTest.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index cfef6963b..17cce8a5b 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -250,6 +250,20 @@ static void verifySucceededCleanly(Jenkins j, WorkflowRun run) throws Exception assertHasTimingAction(run.getExecution()); } + /** A minimal check of resuming the job with no node checks, in case of a dirty shutdown. + * Currently dirty shutdowns have the potential to lose the head node ID if they happen at the moment of writing + * it to build.xml + */ + static void verifyDirtyResumed(JenkinsRule rule, WorkflowRun run, String logStart) throws Exception { + assert run.isBuilding(); + assertHasTimingAction(run.getExecution()); + rule.waitForCompletion(run); + Assert.assertEquals(Result.SUCCESS, run.getResult()); + verifyCompletedCleanly(rule.jenkins, run); + //no checking nodes + rule.assertLogContains(logStart, run); + } + /** If it's a {@link SemaphoreStep} we test less rigorously because that blocks async GraphListeners. */ static void verifySafelyResumed(JenkinsRule rule, WorkflowRun run, boolean isSemaphore, String logStart) throws Exception { assert run.isBuilding(); @@ -716,7 +730,6 @@ public void evaluate() throws Throwable { WorkflowRun run = createAndRunSleeperJob(story.j.jenkins, jobName, FlowDurabilityHint.MAX_SURVIVABILITY, false); FlowExecution exec = run.getExecution(); if (exec instanceof CpsFlowExecution) { - ((CpsFlowExecution) exec).waitForSuspension(); // till done writing head node ID into build.xml assert ((CpsFlowExecution) exec).getStorage().isPersistedFully(); } logStart[0] = JenkinsRule.getLog(run); @@ -727,7 +740,7 @@ public void evaluate() throws Throwable { @Override public void evaluate() throws Throwable { WorkflowRun run = story.j.jenkins.getItemByFullName(jobName, WorkflowJob.class).getLastBuild(); - verifySafelyResumed(story.j, run, false, logStart[0]); + verifyDirtyResumed(story.j, run, logStart[0]); } }); } @@ -746,7 +759,6 @@ public void evaluate() throws Throwable { FlowExecution exec = run.getExecution(); Assert.assertTrue(((CpsFlowExecution) exec).isResumeBlocked()); if (exec instanceof CpsFlowExecution) { - ((CpsFlowExecution) exec).waitForSuspension(); // till done writing head node ID into build.xml assert ((CpsFlowExecution) exec).getStorage().isPersistedFully(); } Assert.assertFalse(((CpsFlowExecution) exec).getProgramDataFile().exists()); @@ -761,7 +773,6 @@ public void evaluate() throws Throwable { public void evaluate() throws Throwable { WorkflowRun run = story.j.jenkins.getItemByFullName(jobName, WorkflowJob.class).getLastBuild(); verifyFailedCleanly(story.j.jenkins, run); - assertIncludesNodes(nodesOut, run); } }); } @@ -779,7 +790,6 @@ public void evaluate() throws Throwable { WorkflowRun run = createAndRunSleeperJob(story.j.jenkins, jobName, FlowDurabilityHint.MAX_SURVIVABILITY, false); FlowExecution exec = run.getExecution(); if (exec instanceof CpsFlowExecution) { - ((CpsFlowExecution) exec).waitForSuspension(); // till done writing head node ID into build.xml assert ((CpsFlowExecution) exec).getStorage().isPersistedFully(); // single node xmls written } nodesOut.addAll(new DepthFirstScanner().allNodes(run.getExecution())); @@ -793,7 +803,6 @@ public void evaluate() throws Throwable { public void evaluate() throws Throwable { WorkflowRun run = story.j.jenkins.getItemByFullName(jobName, WorkflowJob.class).getLastBuild(); verifyFailedCleanly(story.j.jenkins, run); - assertIncludesNodes(nodesOut, run); } }); } From 37b9011380f5a2b8ad97f4128954ff7e7b9c5bb0 Mon Sep 17 00:00:00 2001 From: Riliane Date: Fri, 5 Aug 2022 15:52:17 +0300 Subject: [PATCH 703/932] final changes --- .../jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index ea6effa74..6d119ca37 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -255,8 +255,7 @@ static void verifySucceededCleanly(Jenkins j, WorkflowRun run) throws Exception * Currently dirty shutdowns have the potential to lose the head node ID if they happen at the moment of writing * it to build.xml */ - static void verifyDirtyResumed(JenkinsRule rule, WorkflowRun run, String logStart) throws Exception { - assert run.isBuilding(); + private static void verifyDirtyResumed(JenkinsRule rule, WorkflowRun run, String logStart) throws Exception { assertHasTimingAction(run.getExecution()); rule.waitForCompletion(run); Assert.assertEquals(Result.SUCCESS, run.getResult()); @@ -266,8 +265,8 @@ static void verifyDirtyResumed(JenkinsRule rule, WorkflowRun run, String logStar } /** If it's a {@link SemaphoreStep} we test less rigorously because that blocks async GraphListeners. */ - static void verifySafelyResumed(JenkinsRule rule, WorkflowRun run, boolean isSemaphore, String logStart) throws Exception { - assert run.isBuilding(); + private static void verifySafelyResumed(JenkinsRule rule, WorkflowRun run, boolean isSemaphore, String logStart) throws Exception { + Assert.assertTrue(run.isBuilding()); FlowExecution exec = run.getExecution(); // Assert that we have the appropriate flow graph entries From 7108ce8558ac2be63916a37ed50d0646d7a12dc0 Mon Sep 17 00:00:00 2001 From: Riliane Date: Thu, 18 Aug 2022 13:56:37 +0200 Subject: [PATCH 704/932] catch a NPE, log the build.xml --- .../workflow/cps/FlowDurabilityTest.java | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index bfe0c47f3..8cddba8d6 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -45,14 +45,11 @@ import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import org.jvnet.hudson.test.BuildWatcher; -import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.RestartableJenkinsRule; +import org.jvnet.hudson.test.*; import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.File; -import java.io.FileOutputStream; + +import java.io.*; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -65,6 +62,8 @@ import java.util.Random; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Tests implementations designed to verify handling of the flow durability levels and persistence of pipeline state. @@ -88,6 +87,11 @@ public class FlowDurabilityTest { @Rule public TimedRepeatRule repeater = new TimedRepeatRule(); + @Rule + public LoggerRule logging = new LoggerRule(); + + private Logger log = Logger.getLogger(FlowDurabilityTest.class.getName()); + // Used in Race-condition/persistence fuzzing where we need to run repeatedly static class TimedRepeatRule implements TestRule { @@ -556,6 +560,7 @@ public void evaluate() throws Throwable { */ @Test public void testDurableAgainstCleanRestartFailsWithDirtyShutdown() throws Exception { + logging.record( hudson.model.RunMap.class, Level.WARNING).capture(200); final String[] logStart = new String[1]; story.addStepWithDirtyShutdown(new Statement() { @Override @@ -570,7 +575,20 @@ public void evaluate() throws Throwable { @Override public void evaluate() throws Throwable { WorkflowRun run = story.j.jenkins.getItemByFullName("durableAgainstClean", WorkflowJob.class).getLastBuild(); - verifyFailedCleanly(story.j.jenkins, run); + try { + verifyFailedCleanly(story.j.jenkins, run); + } catch (NullPointerException e) { + File buildXml = new File (story.j.jenkins.getRootDir() + "/jobs/durableAgainstClean/builds/1/build.xml"); + BufferedReader in = new BufferedReader(new FileReader(buildXml)); + String line = in.readLine(); + while(line != null) + { + log.warning(line); + line = in.readLine(); + } + in.close(); + throw e; + } story.j.assertLogContains(logStart[0], run); } }); From b546a01fa73fa2c4e21f4c47dc72aefc3c2f8314 Mon Sep 17 00:00:00 2001 From: Riliane Date: Wed, 24 Aug 2022 11:34:16 +0200 Subject: [PATCH 705/932] log it another way, add start and end of the log --- .../plugins/workflow/cps/FlowDurabilityTest.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index b399c1140..64afc2348 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -589,10 +589,24 @@ public void evaluate() throws Throwable { story.addStep(new Statement() { @Override public void evaluate() throws Throwable { + if (logging.getMessages().stream().anyMatch(msg -> msg.contains("could not load") && msg.contains("jobs/durableAgainstClean/builds/1"))){ + log.warning("Found a message in LoggerRule - trying to log the build.xml"); + File buildXml = new File (story.j.jenkins.getRootDir() + "/jobs/durableAgainstClean/builds/1/build.xml"); + BufferedReader in = new BufferedReader(new FileReader(buildXml)); + String line = in.readLine(); + while(line != null) + { + log.warning(line); + line = in.readLine(); + } + in.close(); + log.warning("Done logging the build.xml"); + } WorkflowRun run = story.j.jenkins.getItemByFullName("durableAgainstClean", WorkflowJob.class).getLastBuild(); try { verifyFailedCleanly(story.j.jenkins, run); } catch (NullPointerException e) { + log.warning("Caught NPE - trying to log the build.xml"); File buildXml = new File (story.j.jenkins.getRootDir() + "/jobs/durableAgainstClean/builds/1/build.xml"); BufferedReader in = new BufferedReader(new FileReader(buildXml)); String line = in.readLine(); @@ -602,6 +616,7 @@ public void evaluate() throws Throwable { line = in.readLine(); } in.close(); + log.warning("Done logging the build.xml"); throw e; } story.j.assertLogContains(logStart[0], run); From 4b452b8f071cf954a951883e16b22c58185597ad Mon Sep 17 00:00:00 2001 From: Riliane Date: Thu, 25 Aug 2022 15:43:04 +0200 Subject: [PATCH 706/932] remove logging. accept run turning to null as a pass --- .../workflow/cps/FlowDurabilityTest.java | 37 +------------------ 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index 64afc2348..d99812c38 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -88,11 +88,6 @@ public class FlowDurabilityTest { @Rule public TimedRepeatRule repeater = new TimedRepeatRule(); - @Rule - public LoggerRule logging = new LoggerRule(); - - private Logger log = Logger.getLogger(FlowDurabilityTest.class.getName()); - // Used in Race-condition/persistence fuzzing where we need to run repeatedly static class TimedRepeatRule implements TestRule { @@ -575,7 +570,6 @@ public void evaluate() throws Throwable { */ @Test public void testDurableAgainstCleanRestartFailsWithDirtyShutdown() throws Exception { - logging.record( hudson.model.RunMap.class, Level.WARNING).capture(200); final String[] logStart = new String[1]; story.addStepWithDirtyShutdown(new Statement() { @Override @@ -589,36 +583,9 @@ public void evaluate() throws Throwable { story.addStep(new Statement() { @Override public void evaluate() throws Throwable { - if (logging.getMessages().stream().anyMatch(msg -> msg.contains("could not load") && msg.contains("jobs/durableAgainstClean/builds/1"))){ - log.warning("Found a message in LoggerRule - trying to log the build.xml"); - File buildXml = new File (story.j.jenkins.getRootDir() + "/jobs/durableAgainstClean/builds/1/build.xml"); - BufferedReader in = new BufferedReader(new FileReader(buildXml)); - String line = in.readLine(); - while(line != null) - { - log.warning(line); - line = in.readLine(); - } - in.close(); - log.warning("Done logging the build.xml"); - } WorkflowRun run = story.j.jenkins.getItemByFullName("durableAgainstClean", WorkflowJob.class).getLastBuild(); - try { - verifyFailedCleanly(story.j.jenkins, run); - } catch (NullPointerException e) { - log.warning("Caught NPE - trying to log the build.xml"); - File buildXml = new File (story.j.jenkins.getRootDir() + "/jobs/durableAgainstClean/builds/1/build.xml"); - BufferedReader in = new BufferedReader(new FileReader(buildXml)); - String line = in.readLine(); - while(line != null) - { - log.warning(line); - line = in.readLine(); - } - in.close(); - log.warning("Done logging the build.xml"); - throw e; - } + if (run == null) { return; } //there is a small chance due to non atomic write that build.xml will be empty and the run won't load at all + verifyFailedCleanly(story.j.jenkins, run); story.j.assertLogContains(logStart[0], run); } }); From 64c57ebca7413c37b89d08f96db6800fb90e4938 Mon Sep 17 00:00:00 2001 From: Riliane Date: Thu, 25 Aug 2022 15:45:09 +0200 Subject: [PATCH 707/932] unused import --- .../org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index d99812c38..6a8b1ad50 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -63,8 +63,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.junit.Assume; -import java.util.logging.Level; -import java.util.logging.Logger; /** * Tests implementations designed to verify handling of the flow durability levels and persistence of pipeline state. From 207d2ef647817becff5c7eb94f3d22272d370400 Mon Sep 17 00:00:00 2001 From: Riliane Date: Thu, 25 Aug 2022 15:49:35 +0200 Subject: [PATCH 708/932] restore specific imports --- .../plugins/workflow/cps/FlowDurabilityTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index 6a8b1ad50..06a7f5932 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -45,11 +45,15 @@ import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import org.jvnet.hudson.test.*; +import org.jvnet.hudson.test.BuildWatcher; +import org.jvnet.hudson.test.Issue; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.RestartableJenkinsRule; import edu.umd.cs.findbugs.annotations.NonNull; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; From bb16392f3d6a5669f5e7bfc9081aa4f2b51232e4 Mon Sep 17 00:00:00 2001 From: Riliane Date: Thu, 25 Aug 2022 15:53:32 +0200 Subject: [PATCH 709/932] space --- .../org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index 06a7f5932..d1efc4d5a 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -51,7 +51,6 @@ import org.jvnet.hudson.test.RestartableJenkinsRule; import edu.umd.cs.findbugs.annotations.NonNull; - import java.io.File; import java.io.FileOutputStream; import java.lang.annotation.ElementType; From 73c7b6138987c6d9ba87c8749f7b3e76dfdb768e Mon Sep 17 00:00:00 2001 From: Riliane Date: Fri, 26 Aug 2022 14:45:42 +0200 Subject: [PATCH 710/932] same check for failsWithBogusStorageFile --- .../org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index d1efc4d5a..1db7a6996 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -617,6 +617,7 @@ public void evaluate() throws Throwable { @Override public void evaluate() throws Throwable { WorkflowRun run = story.j.jenkins.getItemByFullName("durableAgainstClean", WorkflowJob.class).getLastBuild(); + if (run == null) { return; } //there is a small chance due to non atomic write that build.xml will be empty and the run won't load at all verifyFailedCleanly(story.j.jenkins, run); story.j.assertLogContains(logStart[0], run); } From 881d1527d0d864dfb064b464319624e66b872bd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 00:08:59 +0000 Subject: [PATCH 711/932] Bump svnkit-cli from 1.10.7 to 1.10.8 Bumps svnkit-cli from 1.10.7 to 1.10.8. --- updated-dependencies: - dependency-name: org.tmatesoft.svnkit:svnkit-cli dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40fcd2d18..4dc65dbb1 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.tmatesoft.svnkit svnkit-cli - 1.10.7 + 1.10.8 test From 79f7b50efd66ed95d32f1c8e43a6e076835bb2b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 00:09:10 +0000 Subject: [PATCH 712/932] Bump bom-2.346.x from 1478.v81d3dc4f9a_43 to 1607.va_c1576527071 Bumps [bom-2.346.x](https://github.com/jenkinsci/bom) from 1478.v81d3dc4f9a_43 to 1607.va_c1576527071. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.346.x dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40fcd2d18..8ed7b89af 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ io.jenkins.tools.bom bom-2.346.x - 1478.v81d3dc4f9a_43 + 1607.va_c1576527071 import pom From 696dbf774828ba0b9811c27817520b13b5a61f45 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 19 Sep 2022 09:28:15 +0200 Subject: [PATCH 713/932] build: Update webpack, babel, npm and node (#581) --- package.json | 13 +- pom.xml | 4 +- yarn.lock | 3756 +++++++++++--------------------------------------- 3 files changed, 842 insertions(+), 2931 deletions(-) diff --git a/package.json b/package.json index eb60f86bc..ce666ff1b 100644 --- a/package.json +++ b/package.json @@ -18,16 +18,15 @@ }, "readme": "../README.md", "devDependencies": { - "@babel/cli": "^7.12.1", - "@babel/core": "^7.12.3", - "@babel/preset-env": "^7.12.1", + "@babel/cli": "^7.18.10", + "@babel/core": "^7.18.10", + "@babel/preset-env": "^7.18.10", "autoprefixer": "^10.0.1", "babel-loader": "^8.1.0", "clean-webpack-plugin": "^3.0.0", "css-loader": "^5.0.0", "eslint": "^7.12.1", "eslint-plugin-only-warn": "^1.0.2", - "gulp": "^3.9.0", "less": "^3.12.2", "less-loader": "^7.0.2", "mini-css-extract-plugin": "^1.2.1", @@ -35,9 +34,9 @@ "postcss-less": "^4.0.0", "postcss-loader": "^4.0.4", "style-loader": "^2.0.0", - "webpack": "4", - "webpack-cli": "^4.1.0", - "webpack-fix-style-only-entries": "^0.6.0" + "webpack": "5.74.0", + "webpack-cli": "^4.10.0", + "webpack-fix-style-only-entries": "^0.6.1" }, "dependencies": { "jenkins-js-modules": "1.3.0", diff --git a/pom.xml b/pom.xml index 40fcd2d18..7fcbe5cd5 100644 --- a/pom.xml +++ b/pom.xml @@ -67,8 +67,8 @@ 2.346.1 false 1.32 - 12.19.0 - 6.14.8 + 16.17.0 + 8.18.0 diff --git a/yarn.lock b/yarn.lock index bf114f862..65ca6184f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8,18 +8,17 @@ dependencies: "@jridgewell/trace-mapping" "^0.3.0" -"@babel/cli@^7.12.1": - version "7.17.6" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.17.6.tgz#169e5935f1795f0b62ded5a2accafeedfe5c5363" +"@babel/cli@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.18.10.tgz#4211adfc45ffa7d4f3cee6b60bb92e9fe68fe56a" dependencies: - "@jridgewell/trace-mapping" "^0.3.4" + "@jridgewell/trace-mapping" "^0.3.8" commander "^4.0.1" convert-source-map "^1.1.0" fs-readdir-recursive "^1.1.0" - glob "^7.0.0" + glob "^7.2.0" make-dir "^2.1.0" slash "^2.0.0" - source-map "^0.5.0" optionalDependencies: "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3" chokidar "^3.4.0" @@ -30,364 +29,359 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" dependencies: - "@babel/highlight" "^7.16.7" + "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2" +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.13.tgz#6aff7b350a1e8c3e40b029e46cbe78e24a913483" -"@babel/core@^7.12.3": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.7.tgz#f7c28228c83cdf2dbd1b9baa06eaf9df07f0c2f9" +"@babel/core@^7.18.10": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.13.tgz#9be8c44512751b05094a4d3ab05fc53a47ce00ac" dependencies: "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.7" - "@babel/helper-compilation-targets" "^7.17.7" - "@babel/helper-module-transforms" "^7.17.7" - "@babel/helpers" "^7.17.7" - "@babel/parser" "^7.17.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.18.13" + "@babel/helper-compilation-targets" "^7.18.9" + "@babel/helper-module-transforms" "^7.18.9" + "@babel/helpers" "^7.18.9" + "@babel/parser" "^7.18.13" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.18.13" + "@babel/types" "^7.18.13" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.1.2" + json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.17.3", "@babel/generator@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" +"@babel/generator@^7.18.13": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212" dependencies: - "@babel/types" "^7.17.0" + "@babel/types" "^7.18.13" + "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" - source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" +"@babel/helper-annotate-as-pure@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" +"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb" dependencies: - "@babel/helper-explode-assignable-expression" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/helper-explode-assignable-expression" "^7.18.6" + "@babel/types" "^7.18.9" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf" dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.17.5" + "@babel/compat-data" "^7.18.8" + "@babel/helper-validator-option" "^7.18.6" + browserslist "^4.20.2" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6": - version "7.17.6" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9" - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-member-expression-to-functions" "^7.16.7" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/helper-replace-supers" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - -"@babel/helper-create-regexp-features-plugin@^7.16.7": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - regexpu-core "^5.0.1" - -"@babel/helper-define-polyfill-provider@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665" - dependencies: - "@babel/helper-compilation-targets" "^7.13.0" - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/traverse" "^7.13.0" +"@babel/helper-create-class-features-plugin@^7.18.6": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.13.tgz#63e771187bd06d234f95fdf8bd5f8b6429de6298" + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-split-export-declaration" "^7.18.6" + +"@babel/helper-create-regexp-features-plugin@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz#3e35f4e04acbbf25f1b3534a657610a000543d3c" + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + regexpu-core "^5.1.0" + +"@babel/helper-define-polyfill-provider@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073" + dependencies: + "@babel/helper-compilation-targets" "^7.17.7" + "@babel/helper-plugin-utils" "^7.16.7" debug "^4.1.1" lodash.debounce "^4.0.8" resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-environment-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" +"@babel/helper-environment-visitor@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + +"@babel/helper-explode-assignable-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@babel/helper-explode-assignable-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" +"@babel/helper-function-name@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0" dependencies: - "@babel/types" "^7.16.7" + "@babel/template" "^7.18.6" + "@babel/types" "^7.18.9" -"@babel/helper-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" +"@babel/helper-hoist-variables@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" dependencies: - "@babel/helper-get-function-arity" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@babel/helper-get-function-arity@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" +"@babel/helper-member-expression-to-functions@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.9" -"@babel/helper-hoist-variables@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" +"@babel/helper-module-imports@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@babel/helper-member-expression-to-functions@^7.16.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4" +"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712" dependencies: - "@babel/types" "^7.17.0" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.18.6" + "@babel/template" "^7.18.6" + "@babel/traverse" "^7.18.9" + "@babel/types" "^7.18.9" -"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" +"@babel/helper-optimise-call-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd" - dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-simple-access" "^7.17.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" - -"@babel/helper-optimise-call-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" - -"@babel/helper-remap-async-to-generator@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-wrap-function" "^7.16.8" - "@babel/types" "^7.16.8" - -"@babel/helper-replace-supers@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" - dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-member-expression-to-functions" "^7.16.7" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/traverse" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-simple-access@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f" + +"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-wrap-function" "^7.18.9" + "@babel/types" "^7.18.9" + +"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6" + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/traverse" "^7.18.9" + "@babel/types" "^7.18.9" + +"@babel/helper-simple-access@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea" dependencies: - "@babel/types" "^7.17.0" + "@babel/types" "^7.18.6" -"@babel/helper-skip-transparent-expression-wrappers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" +"@babel/helper-skip-transparent-expression-wrappers@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818" dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.18.9" -"@babel/helper-split-export-declaration@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" +"@babel/helper-split-export-declaration@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" + +"@babel/helper-string-parser@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56" -"@babel/helper-validator-identifier@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" +"@babel/helper-validator-identifier@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076" -"@babel/helper-validator-option@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" +"@babel/helper-validator-option@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" -"@babel/helper-wrap-function@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200" +"@babel/helper-wrap-function@^7.18.9": + version "7.18.11" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz#bff23ace436e3f6aefb61f85ffae2291c80ed1fb" dependencies: - "@babel/helper-function-name" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.16.8" - "@babel/types" "^7.16.8" + "@babel/helper-function-name" "^7.18.9" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.18.11" + "@babel/types" "^7.18.10" -"@babel/helpers@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.7.tgz#6fc0a24280fd00026e85424bbfed4650e76d7127" +"@babel/helpers@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9" dependencies: - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" + "@babel/template" "^7.18.6" + "@babel/traverse" "^7.18.9" + "@babel/types" "^7.18.9" -"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7": - version "7.16.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" +"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" dependencies: - "@babel/helper-validator-identifier" "^7.16.7" + "@babel/helper-validator-identifier" "^7.18.6" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.7.tgz#fc19b645a5456c8d6fdb6cecd3c66c0173902800" +"@babel/parser@^7.18.10", "@babel/parser@^7.18.13": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4" -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" + "@babel/plugin-proposal-optional-chaining" "^7.18.9" -"@babel/plugin-proposal-async-generator-functions@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" +"@babel/plugin-proposal-async-generator-functions@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-remap-async-to-generator" "^7.16.8" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-remap-async-to-generator" "^7.18.9" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" +"@babel/plugin-proposal-class-properties@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-class-static-block@^7.16.7": - version "7.17.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c" +"@babel/plugin-proposal-class-static-block@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020" dependencies: - "@babel/helper-create-class-features-plugin" "^7.17.6" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-proposal-dynamic-import@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" +"@babel/plugin-proposal-dynamic-import@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" +"@babel/plugin-proposal-export-namespace-from@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" +"@babel/plugin-proposal-json-strings@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" +"@babel/plugin-proposal-logical-assignment-operators@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" +"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" +"@babel/plugin-proposal-numeric-separator@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.16.7": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390" +"@babel/plugin-proposal-object-rest-spread@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7" dependencies: - "@babel/compat-data" "^7.17.0" - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/compat-data" "^7.18.8" + "@babel/helper-compilation-targets" "^7.18.9" + "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.16.7" + "@babel/plugin-transform-parameters" "^7.18.8" -"@babel/plugin-proposal-optional-catch-binding@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" +"@babel/plugin-proposal-optional-catch-binding@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" +"@babel/plugin-proposal-optional-chaining@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.16.11": - version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" +"@babel/plugin-proposal-private-methods@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea" dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.10" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-private-property-in-object@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" +"@babel/plugin-proposal-private-property-in-object@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503" dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-create-class-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" +"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e" dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -419,6 +413,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-syntax-import-assertions@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz#cd6190500a4fa2fe31990a963ffab4b63e4505e4" + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" @@ -473,254 +473,257 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-arrow-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" +"@babel/plugin-transform-arrow-functions@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-async-to-generator@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" +"@babel/plugin-transform-async-to-generator@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615" dependencies: - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-remap-async-to-generator" "^7.16.8" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-remap-async-to-generator" "^7.18.6" -"@babel/plugin-transform-block-scoped-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" +"@babel/plugin-transform-block-scoped-functions@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-block-scoping@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" +"@babel/plugin-transform-block-scoping@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-classes@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" +"@babel/plugin-transform-classes@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz#90818efc5b9746879b869d5ce83eb2aa48bbc3da" dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-replace-supers" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.18.9" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-split-export-declaration" "^7.18.6" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" +"@babel/plugin-transform-computed-properties@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-destructuring@^7.16.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1" +"@babel/plugin-transform-destructuring@^7.18.9": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" +"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8" dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-duplicate-keys@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" +"@babel/plugin-transform-duplicate-keys@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-exponentiation-operator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" +"@babel/plugin-transform-exponentiation-operator@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd" dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-for-of@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" +"@babel/plugin-transform-for-of@^7.18.8": + version "7.18.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" +"@babel/plugin-transform-function-name@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0" dependencies: - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-compilation-targets" "^7.18.9" + "@babel/helper-function-name" "^7.18.9" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" +"@babel/plugin-transform-literals@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-member-expression-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" +"@babel/plugin-transform-member-expression-literals@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-modules-amd@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" +"@babel/plugin-transform-modules-amd@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz#8c91f8c5115d2202f277549848874027d7172d21" dependencies: - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-module-transforms" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.16.8": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz#d86b217c8e45bb5f2dbc11eefc8eab62cf980d19" +"@babel/plugin-transform-modules-commonjs@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883" dependencies: - "@babel/helper-module-transforms" "^7.17.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-simple-access" "^7.17.7" + "@babel/helper-module-transforms" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-simple-access" "^7.18.6" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" +"@babel/plugin-transform-modules-systemjs@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz#545df284a7ac6a05125e3e405e536c5853099a06" dependencies: - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-module-transforms" "^7.18.9" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-validator-identifier" "^7.18.6" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" +"@babel/plugin-transform-modules-umd@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9" dependencies: - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-module-transforms" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252" +"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d" dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-new-target@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" +"@babel/plugin-transform-new-target@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-object-super@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" +"@babel/plugin-transform-object-super@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-replace-supers" "^7.18.6" -"@babel/plugin-transform-parameters@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f" +"@babel/plugin-transform-parameters@^7.18.8": + version "7.18.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-property-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" +"@babel/plugin-transform-property-literals@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-regenerator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" +"@babel/plugin-transform-regenerator@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73" dependencies: - regenerator-transform "^0.14.2" + "@babel/helper-plugin-utils" "^7.18.6" + regenerator-transform "^0.15.0" -"@babel/plugin-transform-reserved-words@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" +"@babel/plugin-transform-reserved-words@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-shorthand-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" +"@babel/plugin-transform-shorthand-properties@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-spread@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" +"@babel/plugin-transform-spread@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" -"@babel/plugin-transform-sticky-regex@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" +"@babel/plugin-transform-sticky-regex@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-template-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" +"@babel/plugin-transform-template-literals@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-typeof-symbol@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" +"@babel/plugin-transform-typeof-symbol@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-unicode-escapes@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" +"@babel/plugin-transform-unicode-escapes@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246" dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-unicode-regex@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" +"@babel/plugin-transform-unicode-regex@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca" dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/preset-env@^7.12.1": - version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982" +"@babel/preset-env@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4" dependencies: - "@babel/compat-data" "^7.16.8" - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-validator-option" "^7.16.7" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7" - "@babel/plugin-proposal-async-generator-functions" "^7.16.8" - "@babel/plugin-proposal-class-properties" "^7.16.7" - "@babel/plugin-proposal-class-static-block" "^7.16.7" - "@babel/plugin-proposal-dynamic-import" "^7.16.7" - "@babel/plugin-proposal-export-namespace-from" "^7.16.7" - "@babel/plugin-proposal-json-strings" "^7.16.7" - "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7" - "@babel/plugin-proposal-numeric-separator" "^7.16.7" - "@babel/plugin-proposal-object-rest-spread" "^7.16.7" - "@babel/plugin-proposal-optional-catch-binding" "^7.16.7" - "@babel/plugin-proposal-optional-chaining" "^7.16.7" - "@babel/plugin-proposal-private-methods" "^7.16.11" - "@babel/plugin-proposal-private-property-in-object" "^7.16.7" - "@babel/plugin-proposal-unicode-property-regex" "^7.16.7" + "@babel/compat-data" "^7.18.8" + "@babel/helper-compilation-targets" "^7.18.9" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-validator-option" "^7.18.6" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9" + "@babel/plugin-proposal-async-generator-functions" "^7.18.10" + "@babel/plugin-proposal-class-properties" "^7.18.6" + "@babel/plugin-proposal-class-static-block" "^7.18.6" + "@babel/plugin-proposal-dynamic-import" "^7.18.6" + "@babel/plugin-proposal-export-namespace-from" "^7.18.9" + "@babel/plugin-proposal-json-strings" "^7.18.6" + "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" + "@babel/plugin-proposal-numeric-separator" "^7.18.6" + "@babel/plugin-proposal-object-rest-spread" "^7.18.9" + "@babel/plugin-proposal-optional-catch-binding" "^7.18.6" + "@babel/plugin-proposal-optional-chaining" "^7.18.9" + "@babel/plugin-proposal-private-methods" "^7.18.6" + "@babel/plugin-proposal-private-property-in-object" "^7.18.6" + "@babel/plugin-proposal-unicode-property-regex" "^7.18.6" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-syntax-import-assertions" "^7.18.6" "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" @@ -730,44 +733,44 @@ "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.16.7" - "@babel/plugin-transform-async-to-generator" "^7.16.8" - "@babel/plugin-transform-block-scoped-functions" "^7.16.7" - "@babel/plugin-transform-block-scoping" "^7.16.7" - "@babel/plugin-transform-classes" "^7.16.7" - "@babel/plugin-transform-computed-properties" "^7.16.7" - "@babel/plugin-transform-destructuring" "^7.16.7" - "@babel/plugin-transform-dotall-regex" "^7.16.7" - "@babel/plugin-transform-duplicate-keys" "^7.16.7" - "@babel/plugin-transform-exponentiation-operator" "^7.16.7" - "@babel/plugin-transform-for-of" "^7.16.7" - "@babel/plugin-transform-function-name" "^7.16.7" - "@babel/plugin-transform-literals" "^7.16.7" - "@babel/plugin-transform-member-expression-literals" "^7.16.7" - "@babel/plugin-transform-modules-amd" "^7.16.7" - "@babel/plugin-transform-modules-commonjs" "^7.16.8" - "@babel/plugin-transform-modules-systemjs" "^7.16.7" - "@babel/plugin-transform-modules-umd" "^7.16.7" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8" - "@babel/plugin-transform-new-target" "^7.16.7" - "@babel/plugin-transform-object-super" "^7.16.7" - "@babel/plugin-transform-parameters" "^7.16.7" - "@babel/plugin-transform-property-literals" "^7.16.7" - "@babel/plugin-transform-regenerator" "^7.16.7" - "@babel/plugin-transform-reserved-words" "^7.16.7" - "@babel/plugin-transform-shorthand-properties" "^7.16.7" - "@babel/plugin-transform-spread" "^7.16.7" - "@babel/plugin-transform-sticky-regex" "^7.16.7" - "@babel/plugin-transform-template-literals" "^7.16.7" - "@babel/plugin-transform-typeof-symbol" "^7.16.7" - "@babel/plugin-transform-unicode-escapes" "^7.16.7" - "@babel/plugin-transform-unicode-regex" "^7.16.7" + "@babel/plugin-transform-arrow-functions" "^7.18.6" + "@babel/plugin-transform-async-to-generator" "^7.18.6" + "@babel/plugin-transform-block-scoped-functions" "^7.18.6" + "@babel/plugin-transform-block-scoping" "^7.18.9" + "@babel/plugin-transform-classes" "^7.18.9" + "@babel/plugin-transform-computed-properties" "^7.18.9" + "@babel/plugin-transform-destructuring" "^7.18.9" + "@babel/plugin-transform-dotall-regex" "^7.18.6" + "@babel/plugin-transform-duplicate-keys" "^7.18.9" + "@babel/plugin-transform-exponentiation-operator" "^7.18.6" + "@babel/plugin-transform-for-of" "^7.18.8" + "@babel/plugin-transform-function-name" "^7.18.9" + "@babel/plugin-transform-literals" "^7.18.9" + "@babel/plugin-transform-member-expression-literals" "^7.18.6" + "@babel/plugin-transform-modules-amd" "^7.18.6" + "@babel/plugin-transform-modules-commonjs" "^7.18.6" + "@babel/plugin-transform-modules-systemjs" "^7.18.9" + "@babel/plugin-transform-modules-umd" "^7.18.6" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6" + "@babel/plugin-transform-new-target" "^7.18.6" + "@babel/plugin-transform-object-super" "^7.18.6" + "@babel/plugin-transform-parameters" "^7.18.8" + "@babel/plugin-transform-property-literals" "^7.18.6" + "@babel/plugin-transform-regenerator" "^7.18.6" + "@babel/plugin-transform-reserved-words" "^7.18.6" + "@babel/plugin-transform-shorthand-properties" "^7.18.6" + "@babel/plugin-transform-spread" "^7.18.9" + "@babel/plugin-transform-sticky-regex" "^7.18.6" + "@babel/plugin-transform-template-literals" "^7.18.9" + "@babel/plugin-transform-typeof-symbol" "^7.18.9" + "@babel/plugin-transform-unicode-escapes" "^7.18.10" + "@babel/plugin-transform-unicode-regex" "^7.18.6" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.16.8" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.5.0" - babel-plugin-polyfill-regenerator "^0.3.0" - core-js-compat "^3.20.2" + "@babel/types" "^7.18.10" + babel-plugin-polyfill-corejs2 "^0.3.2" + babel-plugin-polyfill-corejs3 "^0.5.3" + babel-plugin-polyfill-regenerator "^0.4.0" + core-js-compat "^3.22.1" semver "^6.3.0" "@babel/preset-modules@^0.1.5": @@ -786,34 +789,35 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/parser" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.3" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.3" - "@babel/types" "^7.17.0" +"@babel/template@^7.18.10", "@babel/template@^7.18.6": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.18.10" + "@babel/types" "^7.18.10" + +"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.13", "@babel/traverse@^7.18.9": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68" + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.18.13" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.18.9" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.18.13" + "@babel/types" "^7.18.13" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" +"@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.4.4": + version "7.18.13" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a" dependencies: - "@babel/helper-validator-identifier" "^7.16.7" + "@babel/helper-string-parser" "^7.18.10" + "@babel/helper-validator-identifier" "^7.18.6" to-fast-properties "^2.0.0" "@discoveryjs/json-ext@^0.5.0": @@ -846,17 +850,36 @@ version "1.2.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/resolve-uri@^3.0.3": version "3.0.5" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c" +"@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + +"@jridgewell/source-map@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.11" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec" -"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.4": - version "0.3.4" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" +"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.8", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.15" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774" dependencies: "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" @@ -865,6 +888,24 @@ version "2.1.8-no-fsevents.3" resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b" +"@types/eslint-scope@^3.7.3": + version "3.7.4" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "8.4.6" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.6.tgz#7976f054c1bccfcf514bff0564c0c41df5c08207" + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^0.0.51": + version "0.0.51" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" + "@types/glob@^7.1.1": version "7.2.0" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" @@ -872,7 +913,7 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": +"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": version "7.0.10" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.10.tgz#9b05b7896166cd00e9cbd59864853abf65d9ac23" @@ -921,146 +962,125 @@ anymatch "^3.0.0" source-map "^0.6.0" -"@webassemblyjs/ast@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" +"@webassemblyjs/ast@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" dependencies: - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/wast-parser" "1.9.0" - -"@webassemblyjs/floating-point-hex-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" - -"@webassemblyjs/helper-api-error@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" + "@webassemblyjs/helper-numbers" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" -"@webassemblyjs/helper-buffer@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" +"@webassemblyjs/floating-point-hex-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" -"@webassemblyjs/helper-code-frame@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" - dependencies: - "@webassemblyjs/wast-printer" "1.9.0" +"@webassemblyjs/helper-api-error@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" -"@webassemblyjs/helper-fsm@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" +"@webassemblyjs/helper-buffer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" -"@webassemblyjs/helper-module-context@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" +"@webassemblyjs/helper-numbers@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" dependencies: - "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/floating-point-hex-parser" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@xtuc/long" "4.2.2" -"@webassemblyjs/helper-wasm-bytecode@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" +"@webassemblyjs/helper-wasm-bytecode@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" -"@webassemblyjs/helper-wasm-section@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" +"@webassemblyjs/helper-wasm-section@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" -"@webassemblyjs/ieee754@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" +"@webassemblyjs/ieee754@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" +"@webassemblyjs/leb128@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" - -"@webassemblyjs/wasm-edit@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/helper-wasm-section" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - "@webassemblyjs/wasm-opt" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - "@webassemblyjs/wast-printer" "1.9.0" - -"@webassemblyjs/wasm-gen@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/ieee754" "1.9.0" - "@webassemblyjs/leb128" "1.9.0" - "@webassemblyjs/utf8" "1.9.0" - -"@webassemblyjs/wasm-opt@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - -"@webassemblyjs/wasm-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-api-error" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/ieee754" "1.9.0" - "@webassemblyjs/leb128" "1.9.0" - "@webassemblyjs/utf8" "1.9.0" - -"@webassemblyjs/wast-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/floating-point-hex-parser" "1.9.0" - "@webassemblyjs/helper-api-error" "1.9.0" - "@webassemblyjs/helper-code-frame" "1.9.0" - "@webassemblyjs/helper-fsm" "1.9.0" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/wast-printer@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/wast-parser" "1.9.0" +"@webassemblyjs/utf8@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + +"@webassemblyjs/wasm-edit@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/helper-wasm-section" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-opt" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + "@webassemblyjs/wast-printer" "1.11.1" + +"@webassemblyjs/wasm-gen@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wasm-opt@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + +"@webassemblyjs/wasm-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wast-printer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" + dependencies: + "@webassemblyjs/ast" "1.11.1" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356" +"@webpack-cli/configtest@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" -"@webpack-cli/info@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea" +"@webpack-cli/info@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe" +"@webpack-cli/serve@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -1070,27 +1090,27 @@ version "4.2.2" resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" +acorn-import-assertions@^1.7.6: + version "1.8.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + acorn-jsx@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" -acorn@^6.4.1: - version "6.4.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" - acorn@^7.4.0: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" -ajv-errors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" +acorn@^8.5.0, acorn@^8.7.1: + version "8.8.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" -ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: +ajv-keywords@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" dependencies: @@ -1112,24 +1132,10 @@ ansi-colors@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" -ansi-gray@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" - dependencies: - ansi-wrap "0.1.0" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -1142,17 +1148,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -ansi-wrap@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" - -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - anymatch@^3.0.0, anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" @@ -1160,90 +1155,26 @@ anymatch@^3.0.0, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -aproba@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -archy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" - argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" dependencies: sprintf-js "~1.0.2" -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - -array-differ@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" - -array-each@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" - -array-slice@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" - array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" dependencies: array-uniq "^1.0.1" -array-uniq@^1.0.1, array-uniq@^1.0.2: +array-uniq@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - -asn1.js@^5.2.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" - dependencies: - bn.js "^4.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - safer-buffer "^2.1.0" - -assert@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" - dependencies: - object-assign "^4.1.1" - util "0.10.3" - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" -async-each@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" - -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - autoprefixer@^10.0.1: version "10.4.4" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.4.tgz#3e85a245b32da876a893d3ac2ea19f01e7ea5a1e" @@ -1270,169 +1201,53 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" -babel-plugin-polyfill-corejs2@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5" +babel-plugin-polyfill-corejs2@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d" dependencies: - "@babel/compat-data" "^7.13.11" - "@babel/helper-define-polyfill-provider" "^0.3.1" + "@babel/compat-data" "^7.17.7" + "@babel/helper-define-polyfill-provider" "^0.3.2" semver "^6.1.1" -babel-plugin-polyfill-corejs3@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72" +babel-plugin-polyfill-corejs3@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7" dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.1" + "@babel/helper-define-polyfill-provider" "^0.3.2" core-js-compat "^3.21.0" -babel-plugin-polyfill-regenerator@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990" +babel-plugin-polyfill-regenerator@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe" dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.1" + "@babel/helper-define-polyfill-provider" "^0.3.2" balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" -base64-js@^1.0.2: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -beeper@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" -binary-extensions@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" - binary-extensions@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" -bindings@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" - dependencies: - file-uri-to-path "1.0.0" - -bluebird@^3.5.5: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: - version "4.12.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" - -bn.js@^5.0.0, bn.js@^5.1.1: - version "5.2.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" - -brace-expansion@^1.0.0, brace-expansion@^1.1.7: +brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" dependencies: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^2.3.1, braces@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" dependencies: fill-range "^7.0.1" -brorand@^1.0.1, brorand@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - -browserify-aes@^1.0.0, browserify-aes@^1.0.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" - dependencies: - buffer-xor "^1.0.3" - cipher-base "^1.0.0" - create-hash "^1.1.0" - evp_bytestokey "^1.0.3" - inherits "^2.0.1" - safe-buffer "^5.0.1" - -browserify-cipher@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" - dependencies: - browserify-aes "^1.0.4" - browserify-des "^1.0.0" - evp_bytestokey "^1.0.0" - -browserify-des@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c" - dependencies: - cipher-base "^1.0.1" - des.js "^1.0.0" - inherits "^2.0.1" - safe-buffer "^5.1.2" - -browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" - dependencies: - bn.js "^5.0.0" - randombytes "^2.0.1" - -browserify-sign@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" - dependencies: - bn.js "^5.1.1" - browserify-rsa "^4.0.1" - create-hash "^1.2.0" - create-hmac "^1.1.7" - elliptic "^6.5.3" - inherits "^2.0.4" - parse-asn1 "^5.1.5" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" - -browserify-zlib@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" - dependencies: - pako "~1.0.5" - -browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.20.2: +browserslist@^4.14.5, browserslist@^4.20.2: version "4.20.2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" dependencies: @@ -1442,60 +1257,19 @@ browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.20.2: node-releases "^2.0.2" picocolors "^1.0.0" +browserslist@^4.21.3: + version "4.21.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" + dependencies: + caniuse-lite "^1.0.30001370" + electron-to-chromium "^1.4.202" + node-releases "^2.0.6" + update-browserslist-db "^1.0.5" + buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" -buffer-xor@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - -buffer@^4.3.0: - version "4.9.2" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - -builtin-status-codes@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - -cacache@^12.0.2: - version "12.0.4" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" - dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" - glob "^7.1.4" - graceful-fs "^4.1.15" - infer-owner "^1.0.3" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" - unique-filename "^1.1.1" - y18n "^4.0.0" - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - call-bind@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -1511,15 +1285,9 @@ caniuse-lite@^1.0.30001317: version "1.0.30001317" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz#0548fb28fd5bc259a70b8c1ffdbe598037666a1b" -chalk@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" +caniuse-lite@^1.0.30001370: + version "1.0.30001382" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001382.tgz#4d37f0d0b6fffb826c8e5e1c0f4bf8ce592db949" chalk@^2.0.0: version "2.4.2" @@ -1536,25 +1304,7 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chokidar@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" - dependencies: - anymatch "^2.0.0" - async-each "^1.0.1" - braces "^2.3.2" - glob-parent "^3.1.0" - inherits "^2.0.3" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^3.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.2.1" - upath "^1.1.1" - optionalDependencies: - fsevents "^1.2.7" - -chokidar@^3.4.0, chokidar@^3.4.1: +chokidar@^3.4.0: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" dependencies: @@ -1568,30 +1318,10 @@ chokidar@^3.4.0, chokidar@^3.4.1: optionalDependencies: fsevents "~2.3.2" -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - chrome-trace-event@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" -cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - clean-webpack-plugin@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz#a99d8ec34c1c628a4541567aa7b457446460c62b" @@ -1607,25 +1337,6 @@ clone-deep@^4.0.1: kind-of "^6.0.2" shallow-clone "^3.0.0" -clone-stats@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" - -clone@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" - -clone@^1.0.0, clone@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -1646,10 +1357,6 @@ color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" -color-support@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" - colorette@^2.0.14: version "2.0.16" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" @@ -1670,31 +1377,10 @@ commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" -component-emitter@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@^1.5.0: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -console-browserify@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" - -constants-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" - convert-source-map@^1.1.0, convert-source-map@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" @@ -1707,32 +1393,13 @@ copy-anything@^2.0.1: dependencies: is-what "^3.14.1" -copy-concurrently@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" - dependencies: - aproba "^1.1.1" - fs-write-stream-atomic "^1.0.8" - iferr "^0.1.5" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.0" - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - -core-js-compat@^3.20.2, core-js-compat@^3.21.0: - version "3.21.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82" +core-js-compat@^3.21.0, core-js-compat@^3.22.1: + version "3.24.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.24.1.tgz#d1af84a17e18dfdd401ee39da9996f9a7ba887de" dependencies: - browserslist "^4.19.1" + browserslist "^4.21.3" semver "7.0.0" -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - cosmiconfig@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" @@ -1743,34 +1410,6 @@ cosmiconfig@^7.0.0: path-type "^4.0.0" yaml "^1.10.0" -create-ecdh@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" - dependencies: - bn.js "^4.1.0" - elliptic "^6.5.3" - -create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" - dependencies: - cipher-base "^1.0.1" - inherits "^2.0.1" - md5.js "^1.3.4" - ripemd160 "^2.0.1" - sha.js "^2.4.0" - -create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" - dependencies: - cipher-base "^1.0.3" - create-hash "^1.1.0" - inherits "^2.0.1" - ripemd160 "^2.0.0" - safe-buffer "^5.0.1" - sha.js "^2.4.8" - cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -1779,22 +1418,6 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -crypto-browserify@^3.11.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" - dependencies: - browserify-cipher "^1.0.0" - browserify-sign "^4.0.0" - create-ecdh "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.0" - diffie-hellman "^5.0.0" - inherits "^2.0.1" - pbkdf2 "^3.0.3" - public-encrypt "^4.0.0" - randombytes "^2.0.0" - randomfill "^1.0.3" - css-loader@^5.0.0: version "5.2.7" resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" @@ -1814,65 +1437,22 @@ cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" -cyclist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" - -dateformat@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" - -debug@^2.2.0, debug@^2.3.3: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" dependencies: ms "2.1.2" -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - deep-is@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" -defaults@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" - dependencies: - clone "^1.0.2" - define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" dependencies: object-keys "^1.0.12" -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - del@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" @@ -1885,70 +1465,20 @@ del@^4.1.1: pify "^4.0.1" rimraf "^2.6.3" -deprecated@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19" - -des.js@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" - dependencies: - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - -detect-file@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" - -diffie-hellman@^5.0.0: - version "5.0.3" - resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" - dependencies: - bn.js "^4.1.0" - miller-rabin "^4.0.0" - randombytes "^2.0.0" - doctrine@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" dependencies: esutils "^2.0.2" -domain-browser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" - -duplexer2@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" - dependencies: - readable-stream "~1.1.9" - -duplexify@^3.4.2, duplexify@^3.6.0: - version "3.7.1" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" - dependencies: - end-of-stream "^1.0.0" - inherits "^2.0.1" - readable-stream "^2.0.0" - stream-shift "^1.0.0" +electron-to-chromium@^1.4.202: + version "1.4.226" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.226.tgz#837ea1d19b8305a913cd5f31d135681c4b6d63b1" electron-to-chromium@^1.4.84: version "1.4.87" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.87.tgz#1aeacfa50b2fbf3ecf50a78fbebd8f259d4fe208" -elliptic@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" - dependencies: - bn.js "^4.11.9" - brorand "^1.1.0" - hash.js "^1.0.0" - hmac-drbg "^1.0.1" - inherits "^2.0.4" - minimalistic-assert "^1.0.1" - minimalistic-crypto-utils "^1.0.1" - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -1957,25 +1487,12 @@ emojis-list@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" -end-of-stream@^1.0.0, end-of-stream@^1.1.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - dependencies: - once "^1.4.0" - -end-of-stream@~0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf" +enhanced-resolve@^5.10.0: + version "5.10.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6" dependencies: - once "~1.3.0" - -enhanced-resolve@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.5.0" - tapable "^1.0.0" + graceful-fs "^4.2.4" + tapable "^2.2.0" enquirer@^2.3.5: version "2.3.6" @@ -1987,7 +1504,7 @@ envinfo@^7.7.3: version "7.8.1" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" -errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: +errno@^0.1.1: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" dependencies: @@ -1999,11 +1516,15 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +es-module-lexer@^0.9.0: + version "0.9.3" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -2015,14 +1536,7 @@ eslint-plugin-only-warn@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/eslint-plugin-only-warn/-/eslint-plugin-only-warn-1.0.3.tgz#a75f3a9ded7f03e9808e75ec27f22b644084506e" -eslint-scope@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - -eslint-scope@^5.1.1: +eslint-scope@5.1.1, eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" dependencies: @@ -2106,7 +1620,7 @@ esquery@^1.4.0: dependencies: estraverse "^5.1.0" -esrecurse@^4.1.0, esrecurse@^4.3.0: +esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" dependencies: @@ -2124,88 +1638,10 @@ esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" -events@^3.0.0: +events@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" -evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" - dependencies: - md5.js "^1.3.4" - safe-buffer "^5.1.1" - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -expand-tilde@^2.0.0, expand-tilde@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" - dependencies: - homedir-polyfill "^1.0.1" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -fancy-log@^1.1.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7" - dependencies: - ansi-gray "^0.1.1" - color-support "^1.1.3" - parse-node-version "^1.0.0" - time-stamp "^1.0.0" - fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -2222,43 +1658,18 @@ fastest-levenshtein@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" -figgy-pudding@^3.5.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" - file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" dependencies: flat-cache "^3.0.4" -file-uri-to-path@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" dependencies: to-regex-range "^5.0.1" -find-cache-dir@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" - dependencies: - commondir "^1.0.1" - make-dir "^2.0.0" - pkg-dir "^3.0.0" - find-cache-dir@^3.3.1: version "3.3.2" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" @@ -2267,16 +1678,6 @@ find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" -find-index@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" - -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - dependencies: - locate-path "^3.0.0" - find-up@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -2284,33 +1685,6 @@ find-up@^4.0.0: locate-path "^5.0.0" path-exists "^4.0.0" -findup-sync@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" - dependencies: - detect-file "^1.0.0" - is-glob "^3.1.0" - micromatch "^3.0.4" - resolve-dir "^1.0.1" - -fined@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" - dependencies: - expand-tilde "^2.0.2" - is-plain-object "^2.0.3" - object.defaults "^1.1.0" - object.pick "^1.2.0" - parse-filepath "^1.0.1" - -first-chunk-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" - -flagged-respawn@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" - flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -2322,64 +1696,18 @@ flatted@^3.1.0: version "3.2.5" resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" -flush-write-stream@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" - dependencies: - inherits "^2.0.3" - readable-stream "^2.3.6" - -for-in@^1.0.1, for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - dependencies: - for-in "^1.0.1" - fraction.js@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - dependencies: - map-cache "^0.2.2" - -from2@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.0" - fs-readdir-recursive@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" -fs-write-stream-atomic@^1.0.8: - version "1.0.10" - resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" - dependencies: - graceful-fs "^4.1.2" - iferr "^0.1.5" - imurmurhash "^0.1.4" - readable-stream "1 || 2" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" -fsevents@^1.2.7: - version "1.2.13" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" - dependencies: - bindings "^1.5.0" - nan "^2.12.1" - fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" @@ -2392,12 +1720,6 @@ functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" -gaze@^0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f" - dependencies: - globule "~0.1.0" - gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" @@ -2410,96 +1732,27 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" dependencies: is-glob "^4.0.1" -glob-stream@^3.1.5: - version "3.1.18" - resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b" - dependencies: - glob "^4.3.1" - glob2base "^0.0.12" - minimatch "^2.0.1" - ordered-read-streams "^0.1.0" - through2 "^0.6.1" - unique-stream "^1.0.0" - -glob-watcher@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b" - dependencies: - gaze "^0.5.1" - -glob2base@^0.0.12: - version "0.0.12" - resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" - dependencies: - find-index "^0.1.1" - -glob@^4.3.1: - version "4.5.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f" - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "^2.0.1" - once "^1.3.0" +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" -glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" +glob@^7.0.3, glob@^7.1.3, glob@^7.2.0: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^3.1.1" once "^1.3.0" path-is-absolute "^1.0.0" -glob@~3.1.21: - version "3.1.21" - resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd" - dependencies: - graceful-fs "~1.2.0" - inherits "1" - minimatch "~0.2.11" - -global-modules@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" - dependencies: - global-prefix "^1.0.1" - is-windows "^1.0.1" - resolve-dir "^1.0.0" - -global-prefix@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" - dependencies: - expand-tilde "^2.0.2" - homedir-polyfill "^1.0.1" - ini "^1.3.4" - is-windows "^1.0.1" - which "^1.2.14" - globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -2520,87 +1773,10 @@ globby@^6.1.0: pify "^2.0.0" pinkie-promise "^2.0.0" -globule@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5" - dependencies: - glob "~3.1.21" - lodash "~1.0.1" - minimatch "~0.2.11" - -glogg@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f" - dependencies: - sparkles "^1.0.0" - -graceful-fs@^3.0.0: - version "3.0.12" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz#0034947ce9ed695ec8ab0b854bc919e82b1ffaef" - dependencies: - natives "^1.1.3" - -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2: +graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9: version "4.2.9" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" -graceful-fs@~1.2.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364" - -gulp-util@^3.0.0: - version "3.0.8" - resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" - dependencies: - array-differ "^1.0.0" - array-uniq "^1.0.2" - beeper "^1.0.0" - chalk "^1.0.0" - dateformat "^2.0.0" - fancy-log "^1.1.0" - gulplog "^1.0.0" - has-gulplog "^0.1.0" - lodash._reescape "^3.0.0" - lodash._reevaluate "^3.0.0" - lodash._reinterpolate "^3.0.0" - lodash.template "^3.0.0" - minimist "^1.1.0" - multipipe "^0.1.2" - object-assign "^3.0.0" - replace-ext "0.0.1" - through2 "^2.0.0" - vinyl "^0.5.0" - -gulp@^3.9.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4" - dependencies: - archy "^1.0.0" - chalk "^1.0.0" - deprecated "^0.0.1" - gulp-util "^3.0.0" - interpret "^1.0.0" - liftoff "^2.1.0" - minimist "^1.1.0" - orchestrator "^0.3.0" - pretty-hrtime "^1.0.0" - semver "^4.1.0" - tildify "^1.0.0" - v8flags "^2.0.2" - vinyl-fs "^0.3.0" - -gulplog@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5" - dependencies: - glogg "^1.0.0" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -2609,98 +1785,20 @@ has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" -has-gulplog@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce" - dependencies: - sparkles "^1.0.0" - has-symbols@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" dependencies: function-bind "^1.1.1" -hash-base@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" - dependencies: - inherits "^2.0.4" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" - -hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" - dependencies: - inherits "^2.0.3" - minimalistic-assert "^1.0.1" - -hmac-drbg@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" - dependencies: - hash.js "^1.0.3" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.1" - -homedir-polyfill@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" - dependencies: - parse-passwd "^1.0.0" - -https-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" -ieee754@^1.1.4: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - -iferr@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" - ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -2727,10 +1825,6 @@ imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" -infer-owner@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -2738,118 +1832,31 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b" - -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: +inherits@2: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -ini@^1.3.4: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - -interpret@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" - interpret@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" -is-absolute@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" - dependencies: - is-relative "^1.0.0" - is-windows "^1.0.1" - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - dependencies: - kind-of "^6.0.0" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - dependencies: - binary-extensions "^1.0.0" - is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" dependencies: binary-extensions "^2.0.0" -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - is-core-module@^2.8.1: version "2.8.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" dependencies: has "^1.0.3" -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - dependencies: - kind-of "^6.0.0" - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^2.1.0, is-extglob@^2.1.1: +is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -2857,24 +1864,12 @@ is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - dependencies: - is-extglob "^2.1.0" - is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" dependencies: is-extglob "^2.1.1" -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - dependencies: - kind-of "^3.0.2" - is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -2895,63 +1890,21 @@ is-path-inside@^2.1.0: dependencies: path-is-inside "^1.0.2" -is-plain-object@^2.0.3, is-plain-object@^2.0.4: +is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" dependencies: isobject "^3.0.1" -is-relative@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" - dependencies: - is-unc-path "^1.0.0" - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - -is-unc-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" - dependencies: - unc-path-regex "^0.1.2" - -is-utf8@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - is-what@^3.14.1: version "3.14.1" resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1" -is-windows@^1.0.1, is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - -is-wsl@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - -isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: +isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" @@ -2961,6 +1914,14 @@ jenkins-js-modules@1.3.0: dependencies: window-handle "0.0.6" +jest-worker@^27.4.5: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + jquery-ui@^1.13.0: version "1.13.1" resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.1.tgz#d0b7a42e73a04c31bb5706adf86f6f8942f64eaa" @@ -2990,11 +1951,7 @@ jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" -json-parse-better-errors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - -json-parse-even-better-errors@^2.3.0: +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" @@ -3016,29 +1973,11 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - dependencies: - minimist "^1.2.5" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" +json5@^2.1.2, json5@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" -kind-of@^6.0.0, kind-of@^6.0.2: +kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" @@ -3076,28 +2015,15 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -liftoff@^2.1.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec" - dependencies: - extend "^3.0.0" - findup-sync "^2.0.0" - fined "^1.0.1" - flagged-respawn "^1.0.0" - is-plain-object "^2.0.4" - object.map "^1.0.0" - rechoir "^0.6.2" - resolve "^1.1.7" - lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" -loader-runner@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" +loader-runner@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" -loader-utils@^1.2.3, loader-utils@^1.4.0: +loader-utils@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" dependencies: @@ -3113,135 +2039,31 @@ loader-utils@^2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" dependencies: p-locate "^4.1.0" -lodash._basecopy@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" - -lodash._basetostring@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" - -lodash._basevalues@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" - -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - -lodash._isiterateecall@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" - -lodash._reescape@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a" - -lodash._reevaluate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed" - -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - -lodash._root@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" -lodash.escape@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" - dependencies: - lodash._root "^3.0.0" - -lodash.isarguments@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - -lodash.keys@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" -lodash.restparam@^3.0.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - -lodash.template@^3.0.0: - version "3.6.2" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f" - dependencies: - lodash._basecopy "^3.0.0" - lodash._basetostring "^3.0.0" - lodash._basevalues "^3.0.0" - lodash._isiterateecall "^3.0.0" - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - lodash.keys "^3.0.0" - lodash.restparam "^3.0.0" - lodash.templatesettings "^3.0.0" - -lodash.templatesettings@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5" - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" -lodash@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" - -lru-cache@2: - version "2.7.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" - -lru-cache@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" - dependencies: - yallist "^3.0.2" - lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" dependencies: yallist "^4.0.0" -make-dir@^2.0.0, make-dir@^2.1.0: +make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" dependencies: @@ -3254,81 +2076,24 @@ make-dir@^3.0.2, make-dir@^3.1.0: dependencies: semver "^6.0.0" -make-iterator@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" - dependencies: - kind-of "^6.0.2" - -map-cache@^0.2.0, map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - dependencies: - object-visit "^1.0.0" - -md5.js@^1.3.4: - version "1.3.5" - resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - safe-buffer "^5.1.2" - -memory-fs@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -memory-fs@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c" - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" -micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" -miller-rabin@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" +mime-types@^2.1.27: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" dependencies: - bn.js "^4.0.0" - brorand "^1.0.1" + mime-db "1.52.0" mime@^1.4.1: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - mini-css-extract-plugin@^1.2.1: version "1.6.2" resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" @@ -3337,167 +2102,43 @@ mini-css-extract-plugin@^1.2.1: schema-utils "^3.0.0" webpack-sources "^1.1.0" -minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - -minimalistic-crypto-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - -minimatch@^2.0.1: - version "2.0.10" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" - dependencies: - brace-expansion "^1.0.0" - -minimatch@^3.0.4: +minimatch@^3.0.4, minimatch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" dependencies: brace-expansion "^1.1.7" -minimatch@~0.2.11: - version "0.2.14" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a" - dependencies: - lru-cache "2" - sigmund "~1.0.0" - -minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.2.0: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" -mississippi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" - dependencies: - concat-stream "^1.5.0" - duplexify "^3.4.2" - end-of-stream "^1.1.0" - flush-write-stream "^1.0.0" - from2 "^2.1.0" - parallel-transform "^1.1.0" - pump "^3.0.0" - pumpify "^1.3.3" - stream-each "^1.1.0" - through2 "^2.0.0" - -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - dependencies: - minimist "^1.2.5" - -move-concurrently@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" - dependencies: - aproba "^1.1.1" - copy-concurrently "^1.0.0" - fs-write-stream-atomic "^1.0.8" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.3" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" -multipipe@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" - dependencies: - duplexer2 "0.0.2" - -nan@^2.12.1: - version "2.15.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" - nanoid@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - native-request@^1.0.5: version "1.1.0" resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.1.0.tgz#acdb30fe2eefa3e1bc8c54b3a6852e9c5c0d3cb0" -natives@^1.1.3: - version "1.1.6" - resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb" - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" -neo-async@^2.5.0, neo-async@^2.6.1: +neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" -node-libs-browser@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^3.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.1" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.11.0" - vm-browserify "^1.0.1" - node-releases@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" -normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" +node-releases@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -3507,38 +2148,14 @@ normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - dependencies: - path-key "^3.0.0" - -object-assign@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" - -object-assign@^4.0.1, object-assign@^4.1.1: +object-assign@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - dependencies: - isobject "^3.0.0" - object.assign@^4.1.0: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" @@ -3548,46 +2165,12 @@ object.assign@^4.1.0: has-symbols "^1.0.1" object-keys "^1.1.1" -object.defaults@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" - dependencies: - array-each "^1.0.1" - array-slice "^1.0.0" - for-own "^1.0.0" - isobject "^3.0.0" - -object.map@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" - dependencies: - for-own "^1.0.0" - make-iterator "^1.0.0" - -object.pick@^1.2.0, object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - dependencies: - isobject "^3.0.1" - -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: wrappy "1" -once@~1.3.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" - dependencies: - wrappy "1" - -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - dependencies: - mimic-fn "^2.1.0" - optionator@^0.9.1: version "0.9.1" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" @@ -3599,38 +2182,12 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -orchestrator@^0.3.0: - version "0.3.8" - resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e" - dependencies: - end-of-stream "~0.1.5" - sequencify "~0.0.7" - stream-consume "~0.1.0" - -ordered-read-streams@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126" - -os-browserify@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -p-limit@^2.0.0, p-limit@^2.2.0: +p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" dependencies: p-try "^2.0.0" -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - dependencies: - p-limit "^2.0.0" - p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -3645,42 +2202,12 @@ p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" -pako@~1.0.5: - version "1.0.11" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" - -parallel-transform@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc" - dependencies: - cyclist "^1.0.1" - inherits "^2.0.3" - readable-stream "^2.1.5" - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" dependencies: callsites "^3.0.0" -parse-asn1@^5.0.0, parse-asn1@^5.1.5: - version "5.1.6" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" - dependencies: - asn1.js "^5.2.0" - browserify-aes "^1.0.0" - evp_bytestokey "^1.0.0" - pbkdf2 "^3.0.3" - safe-buffer "^5.1.1" - -parse-filepath@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" - dependencies: - is-absolute "^1.0.0" - map-cache "^0.2.0" - path-root "^0.1.1" - parse-json@^5.0.0: version "5.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" @@ -3690,30 +2217,6 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-node-version@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" - -parse-passwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - -path-browserify@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - path-exists@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" @@ -3726,7 +2229,7 @@ path-is-inside@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" -path-key@^3.0.0, path-key@^3.1.0: +path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" @@ -3734,30 +2237,10 @@ path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" -path-root-regex@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" - -path-root@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" - dependencies: - path-root-regex "^0.1.0" - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" -pbkdf2@^3.0.3: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" - dependencies: - create-hash "^1.1.2" - create-hmac "^1.1.4" - ripemd160 "^2.0.1" - safe-buffer "^5.0.1" - sha.js "^2.4.8" - performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -3788,22 +2271,12 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" -pkg-dir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" - dependencies: - find-up "^3.0.0" - pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" dependencies: find-up "^4.0.0" -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - postcss-less@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-4.0.1.tgz#73caf5dac056d4b706f4cc136cefeaf4e79067a4" @@ -3867,160 +2340,36 @@ prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" -pretty-hrtime@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - -process@^0.11.10: - version "0.11.10" - resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - progress@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" -public-encrypt@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" - dependencies: - bn.js "^4.1.0" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - parse-asn1 "^5.0.0" - randombytes "^2.0.1" - safe-buffer "^5.1.2" - -pump@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pumpify@^1.3.3: - version "1.5.1" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" - dependencies: - duplexify "^3.6.0" - inherits "^2.0.3" - pump "^2.0.0" - -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - -punycode@^1.2.4: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" -querystring-es3@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - raf@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" dependencies: performance-now "^2.1.0" -randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: +randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" dependencies: safe-buffer "^5.1.0" -randomfill@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" - dependencies: - randombytes "^2.0.5" - safe-buffer "^5.1.0" - -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -"readable-stream@>=1.0.33-1 <1.1.0-0": - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readdirp@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" - dependencies: - graceful-fs "^4.1.11" - micromatch "^3.1.10" - readable-stream "^2.0.2" - readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" dependencies: picomatch "^2.2.1" -rechoir@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" - dependencies: - resolve "^1.1.6" - rechoir@^0.7.0: version "0.7.1" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" @@ -4041,26 +2390,19 @@ regenerator-runtime@^0.13.4: version "0.13.9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" -regenerator-transform@^0.14.2: - version "0.14.5" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" +regenerator-transform@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" dependencies: "@babel/runtime" "^7.8.4" -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - regexpp@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" -regexpu-core@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3" +regexpu-core@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d" dependencies: regenerate "^1.4.2" regenerate-unicode-properties "^10.0.1" @@ -4079,22 +2421,6 @@ regjsparser@^0.8.2: dependencies: jsesc "~0.5.0" -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeat-element@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -replace-ext@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" - require-from-string@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" @@ -4105,13 +2431,6 @@ resolve-cwd@^3.0.0: dependencies: resolve-from "^5.0.0" -resolve-dir@^1.0.0, resolve-dir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" - dependencies: - expand-tilde "^2.0.0" - global-modules "^1.0.0" - resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -4120,11 +2439,7 @@ resolve-from@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.9.0: +resolve@^1.14.2, resolve@^1.9.0: version "1.22.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" dependencies: @@ -4132,11 +2447,7 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.9.0: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - -rimraf@^2.5.4, rimraf@^2.6.3: +rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" dependencies: @@ -4148,45 +2459,10 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" -ripemd160@^2.0.0, ripemd160@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - -run-queue@^1.0.0, run-queue@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" - dependencies: - aproba "^1.1.1" - -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - -safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@^5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - dependencies: - ret "~0.1.10" - -safer-buffer@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - -schema-utils@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" - dependencies: - ajv "^6.1.0" - ajv-errors "^1.0.0" - ajv-keywords "^3.1.0" - schema-utils@^2.6.5: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" @@ -4195,7 +2471,7 @@ schema-utils@^2.6.5: ajv "^6.12.4" ajv-keywords "^3.5.2" -schema-utils@^3.0.0: +schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" dependencies: @@ -4207,10 +2483,6 @@ semver@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" -semver@^4.1.0: - version "4.3.6" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" - semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -4225,36 +2497,12 @@ semver@^7.2.1, semver@^7.3.4, semver@^7.3.5: dependencies: lru-cache "^6.0.0" -sequencify@~0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c" - -serialize-javascript@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" +serialize-javascript@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" dependencies: randombytes "^2.1.0" -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setimmediate@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - -sha.js@^2.4.0, sha.js@^2.4.8: - version "2.4.11" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - shallow-clone@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" @@ -4271,14 +2519,6 @@ shebang-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" -sigmund@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" - -signal-exit@^3.0.3: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" @@ -4291,33 +2531,6 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - source-list-map@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" @@ -4326,31 +2539,13 @@ source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" -source-map-resolve@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-support@~0.5.12: +source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" dependencies: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-url@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" - -source-map@^0.5.0, source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -4359,65 +2554,10 @@ source-map@^0.7.3: version "0.7.3" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" -sparkles@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - dependencies: - extend-shallow "^3.0.0" - sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" -ssri@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" - dependencies: - figgy-pudding "^3.5.1" - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -stream-browserify@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - -stream-consume@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.1.tgz#d3bdb598c2bd0ae82b8cac7ac50b1107a7996c48" - -stream-each@^1.1.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" - dependencies: - end-of-stream "^1.1.0" - stream-shift "^1.0.0" - -stream-http@^2.7.2: - version "2.8.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.6" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - -stream-shift@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" - string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -4426,45 +2566,12 @@ string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string_decoder@^1.0.0, string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" dependencies: ansi-regex "^5.0.1" -strip-bom@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794" - dependencies: - first-chunk-stream "^1.0.0" - is-utf8 "^0.2.0" - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" @@ -4476,10 +2583,6 @@ style-loader@^2.0.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -4492,6 +2595,12 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + dependencies: + has-flag "^4.0.0" + supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" @@ -4506,110 +2615,47 @@ table@^6.0.9: string-width "^4.2.3" strip-ansi "^6.0.1" -tapable@^1.0.0, tapable@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" +tapable@^2.1.1, tapable@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" -terser-webpack-plugin@^1.4.3: - version "1.4.5" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" +terser-webpack-plugin@^5.1.3: + version "5.3.5" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.5.tgz#f7d82286031f915a4f8fb81af4bd35d2e3c011bc" dependencies: - cacache "^12.0.2" - find-cache-dir "^2.1.0" - is-wsl "^1.1.0" - schema-utils "^1.0.0" - serialize-javascript "^4.0.0" - source-map "^0.6.1" - terser "^4.1.2" - webpack-sources "^1.4.0" - worker-farm "^1.7.0" + "@jridgewell/trace-mapping" "^0.3.14" + jest-worker "^27.4.5" + schema-utils "^3.1.1" + serialize-javascript "^6.0.0" + terser "^5.14.1" -terser@^4.1.2: - version "4.8.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" +terser@^5.14.1: + version "5.14.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" dependencies: + "@jridgewell/source-map" "^0.3.2" + acorn "^8.5.0" commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" + source-map-support "~0.5.20" text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" -through2@^0.6.1: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - -through2@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - -tildify@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a" - dependencies: - os-homedir "^1.0.0" - -time-stamp@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3" - -timers-browserify@^2.0.4: - version "2.0.12" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" - dependencies: - setimmediate "^1.0.4" - -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" dependencies: is-number "^7.0.0" -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - tslib@^1.10.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -4620,14 +2666,6 @@ type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - -unc-path-regex@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" @@ -4647,41 +2685,12 @@ unicode-property-aliases-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" -union-value@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - -unique-filename@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - dependencies: - unique-slug "^2.0.0" - -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - dependencies: - imurmurhash "^0.1.4" - -unique-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b" - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" +update-browserslist-db@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38" dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -upath@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" + escalade "^3.1.1" + picocolors "^1.0.0" uri-js@^4.2.2: version "4.4.1" @@ -4689,117 +2698,39 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - dependencies: - punycode "1.3.2" - querystring "0.2.0" - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - -user-home@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" - -util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: +util-deprecate@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" -util@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - dependencies: - inherits "2.0.1" - -util@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" - dependencies: - inherits "2.0.3" - v8-compile-cache@^2.0.3: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" -v8flags@^2.0.2: - version "2.1.1" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" - dependencies: - user-home "^1.1.1" - -vinyl-fs@^0.3.0: - version "0.3.14" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6" - dependencies: - defaults "^1.0.0" - glob-stream "^3.1.5" - glob-watcher "^0.0.6" - graceful-fs "^3.0.0" - mkdirp "^0.5.0" - strip-bom "^1.0.0" - through2 "^0.6.1" - vinyl "^0.4.0" - -vinyl@^0.4.0: - version "0.4.6" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847" - dependencies: - clone "^0.2.0" - clone-stats "^0.0.1" - -vinyl@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde" - dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" - -vm-browserify@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" - -watchpack-chokidar2@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" - dependencies: - chokidar "^2.1.8" - -watchpack@^1.7.4: - version "1.7.5" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" +watchpack@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" dependencies: + glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" - neo-async "^2.5.0" - optionalDependencies: - chokidar "^3.4.1" - watchpack-chokidar2 "^2.0.1" -webpack-cli@^4.1.0: - version "4.9.2" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" +webpack-cli@^4.10.0: + version "4.10.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.1.1" - "@webpack-cli/info" "^1.4.1" - "@webpack-cli/serve" "^1.6.1" + "@webpack-cli/configtest" "^1.2.0" + "@webpack-cli/info" "^1.5.0" + "@webpack-cli/serve" "^1.7.0" colorette "^2.0.14" commander "^7.0.0" - execa "^5.0.0" + cross-spawn "^7.0.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" interpret "^2.2.0" rechoir "^0.7.0" webpack-merge "^5.7.3" -webpack-fix-style-only-entries@^0.6.0: +webpack-fix-style-only-entries@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/webpack-fix-style-only-entries/-/webpack-fix-style-only-entries-0.6.1.tgz#8e517085cc3426ccd1cb37ff2897b993563a424a" @@ -4810,46 +2741,45 @@ webpack-merge@^5.7.3: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: +webpack-sources@^1.1.0: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" dependencies: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@4: - version "4.46.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/wasm-edit" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - acorn "^6.4.1" - ajv "^6.10.2" - ajv-keywords "^3.4.1" +webpack-sources@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" + +webpack@5.74.0: + version "5.74.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980" + dependencies: + "@types/eslint-scope" "^3.7.3" + "@types/estree" "^0.0.51" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/wasm-edit" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + acorn "^8.7.1" + acorn-import-assertions "^1.7.6" + browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^4.5.0" - eslint-scope "^4.0.3" - json-parse-better-errors "^1.0.2" - loader-runner "^2.4.0" - loader-utils "^1.2.3" - memory-fs "^0.4.1" - micromatch "^3.1.10" - mkdirp "^0.5.3" - neo-async "^2.6.1" - node-libs-browser "^2.2.1" - schema-utils "^1.0.0" - tapable "^1.1.3" - terser-webpack-plugin "^1.4.3" - watchpack "^1.7.4" - webpack-sources "^1.4.1" - -which@^1.2.14: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - dependencies: - isexe "^2.0.0" + enhanced-resolve "^5.10.0" + es-module-lexer "^0.9.0" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.9" + json-parse-even-better-errors "^2.3.1" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.1.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.3" + watchpack "^2.4.0" + webpack-sources "^3.2.3" which@^2.0.1: version "2.0.2" @@ -4869,28 +2799,10 @@ word-wrap@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" -worker-farm@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" - dependencies: - errno "~0.1.7" - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - -y18n@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" - -yallist@^3.0.2: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" From 7f62b7d6f28db1f3762e0e588109c6d67b84e9b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 08:22:51 +0000 Subject: [PATCH 714/932] Bump plugin from 4.45 to 4.47 (#586) Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.45 to 4.47. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.45...plugin-4.47) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Olivier Lamy --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f008946d..8d9fac9ed 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.45 + 4.47 org.jenkins-ci.plugins.workflow From 8fa62451990da94b13ac3d7e06ffa99786724342 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 09:39:13 +0000 Subject: [PATCH 715/932] Bump jquery-ui from 1.13.1 to 1.13.2 (#567) Bumps [jquery-ui](https://github.com/jquery/jquery-ui) from 1.13.1 to 1.13.2. - [Release notes](https://github.com/jquery/jquery-ui/releases) - [Commits](https://github.com/jquery/jquery-ui/compare/1.13.1...1.13.2) --- updated-dependencies: - dependency-name: jquery-ui dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Olivier Lamy --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index ce666ff1b..ed9f88922 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "dependencies": { "jenkins-js-modules": "1.3.0", "jquery": "^3.5.1", - "jquery-ui": "^1.13.0", + "jquery-ui": "^1.13.2", "raf": "^3.4.1" }, "browserslist": [ diff --git a/yarn.lock b/yarn.lock index 65ca6184f..9cc395ed8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1922,9 +1922,9 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" -jquery-ui@^1.13.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.1.tgz#d0b7a42e73a04c31bb5706adf86f6f8942f64eaa" +jquery-ui@^1.13.2: + version "1.13.2" + resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034" dependencies: jquery ">=1.8.0 <4.0.0" From b5553812d4a1184b037b4f3d589d579bb41d3851 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Thu, 22 Sep 2022 16:44:09 -0400 Subject: [PATCH 716/932] [JENKINS-68849] Restore EnvActionImpl.metaClass during deserialization to prevent NPEs in Declarative when conditions in Pipelines resumed after a Jenkins restart --- .../org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java | 6 ++++++ .../plugins/workflow/cps/CpsFlowExecutionTest.java | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java index 57a74e847..be05ac34d 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java @@ -155,6 +155,12 @@ private FlowNode getNode() throws IOException { owner = r; } + private Object readResolve() { + // We need to restore the transient MetaClass field when this class is deserialized by XStream to prevent NPEs in Groovy code that calls methods on this class. + setMetaClass(null); + return this; + } + /** * Gets the singleton instance for a given build, creating it on demand. */ diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java index c8796a3f2..8d90bcf9a 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java @@ -530,14 +530,15 @@ public boolean isAllowed(String groovyResourceUrl) { } } - @Issue("JENKINS-45327") + @Issue({ "JENKINS-45327", "JENKINS-68849" }) @Test public void envActionImplPickle() throws Throwable { sessions.then(r -> { WorkflowJob p = r.createProject(WorkflowJob.class, "p"); p.setDefinition(new CpsFlowDefinition( "def e = env\n" + "semaphore('wait')\n" + // An instance of EnvActionImpl is part of the program's state at this point. - "e.foo = 'bar'\n", true)); // Without EnvActionImplPickle, this throws an NPE in EnvActionImpl.setProperty because owner is null. + "e.foo = 'bar'\n" + // Without EnvActionImplPickle, this throws an NPE in EnvActionImpl.setProperty because owner is null. + "env.getProperty('foo')\n", true)); // Without EnvActionImpl.readResolve, this throws an NPE in PogoMetaClassSite.call WorkflowRun b = p.scheduleBuild2(0).waitForStart(); SemaphoreStep.waitForStart("wait/1", b); }); From d252824b4eb911930e8040084974178d27cf91fc Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Fri, 23 Sep 2022 19:11:58 +0200 Subject: [PATCH 717/932] feat: Switch to ionicons api (#582) --- pom.xml | 5 +++++ .../jenkinsci/plugins/workflow/cps/replay/ReplayAction.java | 2 +- src/main/resources/images/symbols/pause.svg | 1 - src/main/resources/images/symbols/redo.svg | 1 - .../plugins/workflow/cps/PauseUnpauseAction/action.jelly | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 src/main/resources/images/symbols/pause.svg delete mode 100644 src/main/resources/images/symbols/redo.svg diff --git a/pom.xml b/pom.xml index 8d9fac9ed..04f572997 100644 --- a/pom.xml +++ b/pom.xml @@ -87,6 +87,11 @@ workflow-step-api 639.v6eca_cd8c04a_a_ + + io.jenkins.plugins + ionicons-api + 19.v744f3b_2b_b_e4e + org.jenkins-ci.plugins.workflow workflow-api diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java index 5fa2453c0..5030cf3ce 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java @@ -102,7 +102,7 @@ private ReplayAction(Run run) { } @Override public String getIconFileName() { - return isEnabled() || isRebuildEnabled() ? "symbol-redo plugin-workflow-cps" : null; + return isEnabled() || isRebuildEnabled() ? "symbol-arrow-redo-outline plugin-ionicons-api" : null; } @Override public String getUrlName() { diff --git a/src/main/resources/images/symbols/pause.svg b/src/main/resources/images/symbols/pause.svg deleted file mode 100644 index 136aa293f..000000000 --- a/src/main/resources/images/symbols/pause.svg +++ /dev/null @@ -1 +0,0 @@ -Pause \ No newline at end of file diff --git a/src/main/resources/images/symbols/redo.svg b/src/main/resources/images/symbols/redo.svg deleted file mode 100644 index 7aabd95cb..000000000 --- a/src/main/resources/images/symbols/redo.svg +++ /dev/null @@ -1 +0,0 @@ -Arrow Redo \ No newline at end of file diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly index a0eb07386..e4c18b6b4 100644 --- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly +++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly @@ -25,5 +25,5 @@ THE SOFTWARE. - + From 5ea628154bc2ca2b42bda738e5a8b2dde008280f Mon Sep 17 00:00:00 2001 From: Carroll Chiou Date: Thu, 29 Sep 2022 08:21:36 -0600 Subject: [PATCH 718/932] [JENKINS-55287] update exception warning for failure to load flow node (#589) * update exception warning for failure to load flow node * check durability first * update error message --- .../jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index bb8783c77..73af9a206 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -676,7 +676,14 @@ protected synchronized void initializeStorage() throws IOException { h.setForDeserialize(storage.getNode(entry.getValue())); heads.put(h.getId(), h); } else { - throw new IOException("Tried to load head FlowNodes for execution "+this.owner+" but FlowNode was not found in storage for head id:FlowNodeId "+entry.getKey()+":"+entry.getValue()); + FlowDurabilityHint durabilitySetting = getDurabilityHint(); + if (durabilitySetting != FlowDurabilityHint.MAX_SURVIVABILITY) { + throw new AbortException("Cannot resume build because FlowNode " + entry.getValue() + " for FlowHead " + entry.getKey() + " could not be loaded. " + + "This is expected to happen when using the " + durabilitySetting + " durability setting and Jenkins is not shut down cleanly. " + + "Consider investigating to understand if Jenkins was not shut down cleanly or switching to the MAX_SURVIVABILITY durability setting which should prevent this issue in most cases."); + } else { + throw new AbortException("Cannot resume build because FlowNode " + entry.getValue() + " for FlowHead " + entry.getKey() + " could not be loaded."); + } } } headsSerial = null; From 880312403fe6aed9ae752b435d95c382b66803c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 00:07:06 +0000 Subject: [PATCH 719/932] Bump plugin from 4.47 to 4.48 Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.47 to 4.48. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.47...plugin-4.48) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 04f572997..7d83884a9 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.47 + 4.48 org.jenkins-ci.plugins.workflow From 2c253512b7733ea8e90b5bedcfce5a13ffe2e65e Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 3 Oct 2022 15:51:36 -0400 Subject: [PATCH 720/932] Update dgm-builder to be able to build and run against Java 9+ --- dgm-builder/pom.xml | 5 ----- .../com/cloudbees/groovy/cps/tool/Driver.java | 20 +++++++++---------- .../cloudbees/groovy/cps/tool/Translator.java | 11 +++++----- lib/pom.xml | 4 ++++ .../groovy/cps/CpsTransformerTest.groovy | 2 +- pom.xml | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index dfbfc742e..4a9973d7a 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -76,11 +76,6 @@ - - org.kohsuke.sorcerer - sorcerer-javac - 0.10 - org.kohsuke.codemodel codemodel diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java index 78321b921..c03b20137 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java @@ -1,10 +1,6 @@ package com.cloudbees.groovy.cps.tool; import com.sun.codemodel.writer.FileCodeWriter; -import com.sun.tools.javac.api.JavacTool; -import com.sun.tools.javac.file.JavacFileManager; -import com.sun.tools.javac.file.RelativePath.RelativeDirectory; -import com.sun.tools.javac.file.ZipArchive; import groovy.lang.GroovyShell; import hudson.remoting.Which; @@ -13,13 +9,14 @@ import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; +import javax.tools.ToolProvider; import java.io.File; import java.nio.charset.Charset; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Locale; -import java.util.zip.ZipFile; import static java.util.Arrays.*; @@ -29,7 +26,7 @@ public static void main(String[] args) throws Exception { } public void run(File dir) throws Exception { - JavaCompiler javac = JavacTool.create(); + JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); DiagnosticListener errorListener = createErrorListener(); try (StandardJavaFileManager fileManager = javac.getStandardFileManager(errorListener, Locale.getDefault(), Charset.defaultCharset())) { @@ -45,10 +42,13 @@ public void run(File dir) throws Exception { "StringGroovyMethods"); List src = new ArrayList<>(); - ZipArchive a = new ZipArchive((JavacFileManager) fileManager, new ZipFile(groovySrcJar)); - - for (String name : fileNames) { - src.add(a.getFileObject(new RelativeDirectory("org/codehaus/groovy/runtime"),name+".java")); + for (JavaFileObject jfo : fileManager.list(StandardLocation.CLASS_PATH, "org.codehaus.groovy.runtime", Collections.singleton(JavaFileObject.Kind.SOURCE), true)) { + for (String name : fileNames) { + if (jfo.toUri().toString().endsWith("/org/codehaus/groovy/runtime/" + name + ".java")) { + src.add(jfo); + break; + } + } } // annotation processing appears to cause the source files to be reparsed diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index a6618c1c8..9880cb56f 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -95,7 +95,7 @@ import java.util.Optional; import java.util.Set; import java.util.TreeMap; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; @@ -153,12 +153,13 @@ public Translator(CompilationTask task) throws IOException { $Builder = codeModel.ref("com.cloudbees.groovy.cps.Builder"); $CatchExpression = codeModel.ref("com.cloudbees.groovy.cps.CatchExpression"); + this.parsed = javac.parse(); + trees = Trees.instance(javac); elements = javac.getElements(); types = javac.getTypes(); closureType = types.getDeclaredType(elements.getTypeElement(Closure.class.getName())); - this.parsed = javac.parse(); javac.analyze(); } @@ -182,8 +183,8 @@ public void translate(String fqcn, String outfqcn, String sourceJarName) throws CompilationUnitTree dgmCut = getDefaultGroovyMethodCompilationUnitTree(parsed, fqcn); overloadsResolved.clear(); - ClassSymbol dgm = (ClassSymbol) elements.getTypeElement(fqcn); - dgm.accept(new ElementScanner7() { + TypeElement dgm = elements.getTypeElement(fqcn); + new ElementScanner7() { @Override public Void visitExecutable(ExecutableElement e, Void __) { if (translatable.contains(fqcn + "." + e)) { @@ -193,7 +194,7 @@ public Void visitExecutable(ExecutableElement e, Void __) { // TODO else if it is public and has a Closure argument, translate to a form that just throws UnsupportedOperationException when called in CPS mode return null; } - },null); + }.visitType(dgm, null); // TODO verify that we actually found everything listed in translatables overloadsResolved.forEach((overloadResolved, e) -> { try { diff --git a/lib/pom.xml b/lib/pom.xml index d3cbbdffe..95e33d996 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -45,6 +45,10 @@ ${project.build.directory}/generated-sources/dgm java + + --add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + --add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED + --add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -jar ${com.cloudbees:groovy-cps-dgm-builder:jar:jar-with-dependencies} ${project.build.directory}/generated-sources/dgm diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index 9adc94a69..ab7bb45d2 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -186,7 +186,7 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { } catch(StringIndexOutOfBoundsException e) { return e.message; } - """)=="String index out of range: -2" + """)=="begin 5, end 3, length 3" } /** diff --git a/pom.xml b/pom.xml index 1499f3fbe..811acc439 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.4.7 + 2.4.21 1.33 -SNAPSHOT From 3f0928b84c126f3ceb1b5fdc728fc6de6a826d96 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 4 Oct 2022 14:52:51 -0400 Subject: [PATCH 721/932] Only use the public APIs of the java.compiler and jdk.compiler modules --- .../cloudbees/groovy/cps/tool/Translator.java | 133 ++++++++++-------- lib/pom.xml | 4 - 2 files changed, 72 insertions(+), 65 deletions(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 9880cb56f..503af4a1e 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -55,14 +55,7 @@ import com.sun.source.util.JavacTask; import com.sun.source.util.SimpleTreeVisitor; import com.sun.source.util.Trees; -import com.sun.tools.javac.code.Symbol; -import com.sun.tools.javac.code.Symbol.ClassSymbol; -import com.sun.tools.javac.code.Symbol.TypeVariableSymbol; -import com.sun.tools.javac.code.Symbol.VarSymbol; -import com.sun.tools.javac.code.Types.DefaultSymbolVisitor; -import com.sun.tools.javac.tree.JCTree; -import com.sun.tools.javac.tree.JCTree.JCFieldAccess; -import com.sun.tools.javac.tree.JCTree.JCIdent; +import com.sun.source.util.TreePath; import groovy.lang.Closure; import javax.lang.model.element.Element; @@ -341,13 +334,14 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { // in which case, we need to use that translated method, not the original. So check if the expression // is an identifier, that it's not the class we're in the process of translating, and if it's one // of the other known translated classes. - if (mst.getExpression() instanceof JCIdent && - !((JCIdent)mst.getExpression()).sym.toString().equals(fqcn) && - otherTranslated.containsKey(((JCIdent)mst.getExpression()).sym.toString())) { + Element mstExpr = getElement(mst.getExpression()); + if (mst.getExpression() instanceof IdentifierTree && + !mstExpr.toString().equals(fqcn) && + otherTranslated.containsKey(mstExpr.toString())) { inv = $b.invoke("functionCall") .arg(loc(mt)) .arg($b.invoke("constant").arg( - otherTranslated.get(((JCIdent)mst.getExpression()).sym.toString()).dotclass())) + otherTranslated.get(mstExpr.toString()).dotclass())) .arg(n(mst.getIdentifier())); } else { @@ -357,26 +351,28 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { .arg(n(mst.getIdentifier())); } } else - if (ms instanceof JCIdent) { + if (ms instanceof IdentifierTree) { // invocation without object selection, like foo(bar,zot) - JCIdent it = (JCIdent) ms; - if (!it.sym.owner.toString().equals(fqcn)) { - if (otherTranslated.containsKey(it.sym.owner.toString())) { + IdentifierTree it = (IdentifierTree) ms; + Element mse = getElement(ms); + Element owner = mse.getEnclosingElement(); + if (!owner.toString().equals(fqcn)) { + if (otherTranslated.containsKey(owner.toString())) { // static import from transformed class inv = $b.invoke("functionCall") .arg(loc(mt)) - .arg($b.invoke("constant").arg(otherTranslated.get(it.sym.owner.toString()).dotclass())) + .arg($b.invoke("constant").arg(otherTranslated.get(owner.toString()).dotclass())) .arg(n(it)); } else { // static import from non-transformed class inv = $b.invoke("functionCall") .arg(loc(mt)) - .arg($b.invoke("constant").arg(t(it.sym.owner.type).dotclass())) + .arg($b.invoke("constant").arg(t(owner.asType()).dotclass())) .arg(n(it)); } } else { // invocation on this class - String overloadResolved = mangledName((Symbol.MethodSymbol) it.sym); + String overloadResolved = mangledName((ExecutableElement) mse); Optional callSite = elements.getTypeElement(fqcn).getEnclosedElements().stream().filter(e -> e.getKind() == ElementKind.METHOD && mangledName((ExecutableElement) e).equals(overloadResolved) ).findAny(); @@ -386,7 +382,7 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { // Delegate to the standard version. inv = $b.invoke("staticCall") .arg(loc(mt)) - .arg(t(it.sym.owner.type).dotclass()) + .arg(t(owner.asType()).dotclass()) .arg(n(e)); } else if (overloadsResolved.containsKey(overloadResolved)) { // Private, so delegate to our mangled version. @@ -418,30 +414,26 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { public JExpression visitVariable(VariableTree vt, Void __) { return $b.invoke("declareVariable") .arg(loc(vt)) - .arg(cpsTypeTranslation(erasure(vt))) + .arg(cpsTypeTranslation(erasure(getPath(vt)))) .arg(n(vt)) .arg(visit(vt.getInitializer())); } @Override public JExpression visitIdentifier(IdentifierTree it, Void __) { - JCIdent idt = (JCIdent) it; - return idt.sym.accept(new DefaultSymbolVisitor() { - @Override - public JExpression visitClassSymbol(ClassSymbol cs, Void __) { - return $b.invoke("constant").arg(t(cs.asType()).dotclass()); - } - - @Override - public JExpression visitVarSymbol(VarSymbol s, Void __) { - return $b.invoke("localVariable").arg(n(s.name)); - } + Element ite = getElement(it); + switch (ite.getKind()) { + case CLASS: + case INTERFACE: + return $b.invoke("constant").arg(t(ite.asType()).dotclass()); + case EXCEPTION_PARAMETER: + case LOCAL_VARIABLE: + case PARAMETER: + return $b.invoke("localVariable").arg(n(it.getName())); + default: + throw new UnsupportedOperationException(it + " (kind " + ite.getKind() + ")"); - @Override - public JExpression visitSymbol(Symbol s, Void __) { - throw new UnsupportedOperationException(s.toString()); - } - }, __); + } } @Override @@ -472,7 +464,7 @@ public JExpression visitTypeCast(TypeCastTree tt, Void __) { return $b.invoke("cast") .arg(loc(tt)) .arg(visit(tt.getExpression())) - .arg(erasure(tt.getType()).dotclass()) + .arg(erasure(getPath(tt.getType())).dotclass()) .arg(JExpr.lit(false)); } @@ -495,7 +487,7 @@ public JExpression visitNewClass(NewClassTree nt, Void __) { return $b.invoke("new_").tap(inv -> { inv.arg(loc(nt)); - inv.arg(cpsTypeTranslation(t(((JCTree) nt).type))); + inv.arg(cpsTypeTranslation(t(getElement(nt.getIdentifier()).asType()))); nt.getArguments().forEach( et -> inv.arg(visit(et)) ); }); } @@ -589,7 +581,7 @@ public JExpression visitNewArray(NewArrayTree nt, Void __) { } else { return $b.invoke("newArray").tap(inv -> { inv.arg(loc(nt)); - inv.arg(t(nt.getType()).dotclass()); + inv.arg(t(getPath(nt.getType())).dotclass()); nt.getDimensions().forEach(d -> inv.arg(visit(d))); }); } @@ -610,7 +602,7 @@ public JExpression visitEnhancedForLoop(EnhancedForLoopTree et, Void __) { return $b.invoke("forInLoop") .arg(loc(et)) .arg(JExpr._null()) - .arg(erasure(et.getVariable()).dotclass()) + .arg(erasure(getPath(et.getVariable())).dotclass()) .arg(n(et.getVariable())) .arg(visit(et.getExpression())) .arg(visit(et.getStatement())); @@ -643,7 +635,7 @@ public JExpression visitInstanceOf(InstanceOfTree it, Void __) { return $b.invoke("instanceOf") .arg(loc(it)) .arg(visit(it.getExpression())) - .arg($b.invoke("constant").arg(t(it.getType()).dotclass())); + .arg($b.invoke("constant").arg(t(getPath(it.getType())).dotclass())); } @Override @@ -677,7 +669,7 @@ public JExpression visitTry(TryTree tt, Void __) { .tap(inv -> tt.getCatches().forEach(ct -> JExpr._new($CatchExpression) - .arg(t(ct.getParameter()).dotclass()) + .arg(t(trees.getPath(cut, ct.getParameter())).dotclass()) .arg(n(ct.getParameter())) .arg(visit(ct.getBlock()))) ); @@ -687,6 +679,14 @@ public JExpression visitTry(TryTree tt, Void __) { protected JExpression defaultAction(Tree node, Void aVoid) { throw new UnsupportedOperationException(node.toString()); } + + private TreePath getPath(Tree node) { + return trees.getPath(cut, node); + } + + private Element getElement(Tree node) { + return trees.getElement(getPath(node)); + } }, null)); JVar $f = m.body().decl($CpsFunction, "f", f); @@ -715,15 +715,15 @@ private CompilationUnitTree getDefaultGroovyMethodCompilationUnitTree(Iterable { + private final CompilationUnitTree cut; + + private TypeTranslator(CompilationUnitTree cut) { + this.cut = cut; + } + protected JType visit(Tree t) { return visit(t,null); } @@ -894,8 +902,7 @@ public JType visitParameterizedType(ParameterizedTypeTree pt, Void __) { @Override public JType visitIdentifier(IdentifierTree it, Void __) { - JCIdent idt = (JCIdent) it; - return codeModel.ref(idt.sym.toString()); + return codeModel.ref(getElement(it).toString()); } @Override @@ -913,7 +920,7 @@ public JType visitArrayType(ArrayTypeTree at, Void __) { */ @Override public JType visitMemberSelect(MemberSelectTree mt, Void __) { - return t(((JCFieldAccess)mt).type); + return t(getElement(mt).asType()); } @Override @@ -927,5 +934,9 @@ public JType visitWildcard(WildcardTree wt, Void __) { protected JType defaultAction(Tree node, Void __) { throw new UnsupportedOperationException(node.toString()); } + + private Element getElement(Tree node) { + return trees.getElement(trees.getPath(cut, node)); + } } } diff --git a/lib/pom.xml b/lib/pom.xml index 95e33d996..d3cbbdffe 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -45,10 +45,6 @@ ${project.build.directory}/generated-sources/dgm java - - --add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED - --add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED - --add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -jar ${com.cloudbees:groovy-cps-dgm-builder:jar:jar-with-dependencies} ${project.build.directory}/generated-sources/dgm From b99b9a3bb861e81dd3d675c504abe3a0f1b67ba6 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 4 Oct 2022 15:21:39 -0400 Subject: [PATCH 722/932] Check kind enums instead of using instanceof as recommended for Element and TypeMirror --- .../java/com/cloudbees/groovy/cps/tool/Translator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 503af4a1e..7d77dfe0d 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -328,14 +328,14 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { ExpressionTree ms = mt.getMethodSelect(); JInvocation inv; - if (ms instanceof MemberSelectTree) { + if (ms.getKind() == Tree.Kind.MEMBER_SELECT) { MemberSelectTree mst = (MemberSelectTree) ms; // If this is a call to a static method on another class, it may be an already-translated method, // in which case, we need to use that translated method, not the original. So check if the expression // is an identifier, that it's not the class we're in the process of translating, and if it's one // of the other known translated classes. Element mstExpr = getElement(mst.getExpression()); - if (mst.getExpression() instanceof IdentifierTree && + if (mst.getExpression().getKind() == Tree.Kind.IDENTIFIER && !mstExpr.toString().equals(fqcn) && otherTranslated.containsKey(mstExpr.toString())) { inv = $b.invoke("functionCall") @@ -351,7 +351,7 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { .arg(n(mst.getIdentifier())); } } else - if (ms instanceof IdentifierTree) { + if (ms.getKind() == Tree.Kind.IDENTIFIER) { // invocation without object selection, like foo(bar,zot) IdentifierTree it = (IdentifierTree) ms; Element mse = getElement(ms); @@ -565,7 +565,7 @@ public JExpression visitAssignment(AssignmentTree at, Void __) { */ @Override public JExpression visitArrayType(ArrayTypeTree at, Void __) { - if (at.getType() instanceof IdentifierTree) { + if (at.getType().getKind() == Tree.Kind.IDENTIFIER) { return visitIdentifier((IdentifierTree) at.getType(), __); } else { return defaultAction(at, __); @@ -745,7 +745,7 @@ public JType visitIdentifier(IdentifierTree it, Void __) { return codeModel.ref(ite.toString()); case TYPE_PARAMETER: TypeMirror type = ite.asType(); - if (type instanceof TypeVariable) { + if (type.getKind() == TypeKind.TYPEVAR) { return t(((TypeVariable)type).getUpperBound()); } return codeModel.ref(Object.class); From 500fa5368f1ec75196f594e877a90c977ff58bc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 00:03:43 +0000 Subject: [PATCH 723/932] Bump testcontainers from 1.17.3 to 1.17.5 Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.17.3 to 1.17.5. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.3...1.17.5) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 04f572997..42b720c74 100644 --- a/pom.xml +++ b/pom.xml @@ -276,7 +276,7 @@ org.testcontainers testcontainers - 1.17.3 + 1.17.5 test From 819cc9be597121a2bf88b7669323aa6caa502f72 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Fri, 14 Oct 2022 14:58:19 -0400 Subject: [PATCH 724/932] [SECURITY-2824] --- lib/pom.xml | 6 +- .../com/cloudbees/groovy/cps/Builder.java | 26 ++- .../com/cloudbees/groovy/cps/Continuable.java | 3 + .../cloudbees/groovy/cps/CpsTransformer.java | 164 ++++++++---------- .../groovy/cps/SandboxCpsTransformer.java | 63 ------- .../groovy/cps/impl/AssertBlock.java | 11 +- .../cloudbees/groovy/cps/impl/CastBlock.java | 74 ++++++++ .../groovy/cps/impl/ContinuationGroup.java | 40 +++++ .../cps/impl/CpsCallableInvocation.java | 15 ++ .../groovy/cps/impl/DoWhileBlock.java | 18 +- .../cloudbees/groovy/cps/impl/ElvisBlock.java | 13 +- .../groovy/cps/impl/ForLoopBlock.java | 17 +- .../cloudbees/groovy/cps/impl/IfBlock.java | 5 +- .../groovy/cps/impl/LocalVariableBlock.java | 4 +- .../groovy/cps/impl/LogicalOpBlock.java | 23 +-- .../groovy/cps/impl/NewArrayBlock.java | 3 +- .../cloudbees/groovy/cps/impl/NotBlock.java | 34 +++- .../cloudbees/groovy/cps/impl/WhileBlock.java | 17 +- .../groovy/cps/sandbox/DefaultInvoker.java | 8 + .../cloudbees/groovy/cps/sandbox/Invoker.java | 2 + .../groovy/cps/sandbox/SandboxInvoker.java | 4 + .../groovy/cps/ContinuableTest.groovy | 35 +++- .../groovy/cps/CpsTransformerTest.groovy | 1 - .../cps/impl/FunctionCallBlockTest.groovy | 5 +- .../cps/sandbox/SandboxInvokerTest.groovy | 12 -- .../com/cloudbees/groovy/cps/BasicTest.java | 13 +- .../groovy/cps/CpsTransformer2Test.java | 102 +++++++++++ .../groovy/cps/impl/NotBlockTest.java | 41 +++++ .../cps/sandbox/SandboxInvoker2Test.java | 121 ++++++++++++- .../cloudbees/groovy/cps/impl/notBlock.dat | Bin 0 -> 2370 bytes 30 files changed, 622 insertions(+), 258 deletions(-) create mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/impl/NotBlockTest.java create mode 100644 lib/src/test/resources/com/cloudbees/groovy/cps/impl/notBlock.dat diff --git a/lib/pom.xml b/lib/pom.xml index c49ba5b51..674adc50a 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -16,8 +16,8 @@ maven-compiler-plugin - 1.7 - 1.7 + 1.8 + 1.8 @@ -105,7 +105,7 @@ - 1.27 + 1.30 diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java index e158a9683..26ba365f1 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -7,6 +7,7 @@ import com.cloudbees.groovy.cps.impl.BlockScopedBlock; import com.cloudbees.groovy.cps.impl.BreakBlock; import com.cloudbees.groovy.cps.impl.CallSiteBlock; +import com.cloudbees.groovy.cps.impl.CastBlock; import com.cloudbees.groovy.cps.impl.ClosureBlock; import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.ContinueBlock; @@ -49,8 +50,6 @@ import static com.cloudbees.groovy.cps.Block.*; import static java.util.Arrays.*; -import org.codehaus.groovy.ast.expr.CastExpression; -import org.kohsuke.groovy.sandbox.impl.Checker; /** * Builder pattern for constructing {@link Block}s into a tree. @@ -239,6 +238,7 @@ public Block javaThis_() { /** * Assignment operator to a local variable, such as {@code x += 3} */ + // TODO: I think this is only used in tests. public Block localVariableAssignOp(int line, String name, String operator, Block rhs) { return setLocalVariable(line, name, functionCall(line, localVariable(line, name), operator, rhs)); } @@ -581,31 +581,29 @@ public Block postfixDec(int line, LValueBlock body) { * Cast to type. * * @param coerce - * True for {@code exp as type} cast. false for {@code (type)exp} cast. + * If true, the cast will use ScriptBytecodeAdapter.asType. If false, it will use ScriptBytecodeAdapter.castToType. + * Both methods are very willing to coerce their values to other types, so the name is a bit misleading. + * Generally speaking, Groovy will use coerce=true for casts using the "as" operator, whereas coerce=false will + * be used in all other cases, such as Java-syntax casts and implicit casts inserted by the Groovy runtime. */ public Block cast(int line, Block block, Class type, boolean coerce) { - return staticCall(line,ScriptBytecodeAdapter.class, - coerce ? "asType" : "castToType", - block,constant(type)); + return new CastBlock(loc(line), block, type, false, coerce, false); } /** - * @deprecated Just for compatibility with old scripts; prefer {@link #sandboxCastOrCoerce} + * @deprecated Just for compatibility with old scripts; prefer {@link #cast} */ @Deprecated public Block sandboxCast(int line, Block block, Class type, boolean ignoreAutoboxing, boolean strict) { - return sandboxCastOrCoerce(line, block, type, ignoreAutoboxing, true, strict); + return cast(line, block, type, true); } /** - * Cast to type when {@link CastExpression#isCoerce} from {@link SandboxCpsTransformer}. + * @deprecated Just for compatibility with old scripts; prefer {@link #cast} */ - // TODO should ideally be defined in some sandbox-specific subtype of Builder + @Deprecated public Block sandboxCastOrCoerce(int line, Block block, Class type, boolean ignoreAutoboxing, boolean coerce, boolean strict) { - return staticCall(line, Checker.class, - "checkedCast", - constant(type), block, - constant(ignoreAutoboxing), constant(coerce), constant(strict)); + return cast(line, block, type, coerce); } public Block instanceOf(int line, Block value, Block type) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java index de4a6c0eb..92a4b71ff 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -121,7 +121,10 @@ private static Next wrap(Script s, Env env, Continuation k) { * Creates a shallow copy of {@link Continuable}. The copy shares * all the local variables of the original {@link Continuable}, and * point to the exact same point of the program. + * + * @deprecated Shallow clones break in various cases, see {@code ContinuableTest.fork}. */ + @Deprecated public Continuable fork() { return new Continuable(this); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 7a047522f..2aec12d3f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -37,6 +37,8 @@ import org.codehaus.groovy.syntax.SyntaxException; import org.codehaus.groovy.syntax.Token; import static org.codehaus.groovy.syntax.Types.*; +import org.kohsuke.groovy.sandbox.SandboxTransformer; +import org.kohsuke.groovy.sandbox.SandboxTransformer.InitialExpressionExpander; /** * Performs CPS transformation of Groovy methods. @@ -129,7 +131,7 @@ public void call(SourceUnit source, GeneratorContext context, ClassNode classNod new LabelVerifier(source).visitClass(classNode); // Removes all initial expressions for methods and constructors and generates overloads for all variants. - new InitialExpressionExpander().expandInitialExpressions(classNode); + new InitialExpressionExpander().expandInitialExpressions(source, classNode); try { @@ -819,12 +821,21 @@ public void run() { } protected void getMultipleAssignmentValueOrCast(final VariableExpression varExp, final Expression rhs, final Expression index) { - makeNode("array", new Runnable() { + makeNode("cast", new Runnable() { @Override public void run() { - loc(rhs); - visit(rhs); - makeNode("constant", index); + loc(varExp); + makeNode("array", new Runnable() { + @Override + public void run() { + loc(rhs); + visit(rhs); + makeNode("constant", index); + } + }); + literal(varExp.getType()); + literal(false); + // TODO what about ignoreAutoboxing & strict? } }); } @@ -837,21 +848,35 @@ public void run() { public void visitBinaryExpression(final BinaryExpression exp) { String name = BINARY_OP_TO_BUILDER_METHOD.get(exp.getOperation().getType()); if (name != null) { - if (name.equals("assign") && - exp.getLeftExpression() instanceof TupleExpression) { - multipleAssignment(exp, + if (name.equals("assign")) { + if (exp.getLeftExpression() instanceof TupleExpression) { + multipleAssignment(exp, (TupleExpression)exp.getLeftExpression(), exp.getRightExpression()); - } else { - makeNode(name, new Runnable() { - @Override - public void run() { - loc(exp); - visit(exp.getLeftExpression()); - visit(exp.getRightExpression()); - } - }); + return; + } else if (exp.getLeftExpression() instanceof VariableExpression || exp.getLeftExpression() instanceof FieldExpression) { + final Expression lhs = exp.getLeftExpression(); + makeNode(name, new Runnable() { + @Override + public void run() { + loc(exp); + visit(lhs); + visitAssignmentOrCast(lhs.getType(), exp.getRightExpression()); + } + }); + return; + } + // LHS here can be PropertyExpression or AttributeExpression, and their casts + // are handled dynamically at runtime in SandboxInterceptor. } + makeNode(name, new Runnable() { + @Override + public void run() { + loc(exp); + visit(exp.getLeftExpression()); + visit(exp.getRightExpression()); + } + }); return; } @@ -1039,6 +1064,10 @@ public void run() { @Override public void visitFieldExpression(final FieldExpression exp) { + // Seems to only be used for compiler-generated constructs inside of synthetic constructors, such as + // assignments to enum constant fields in enum classes and assignment to the this$0 field used to store an + // instance of the outer class in inner classes. Since CpsTransformer ignores constructors, I think that this + // method is unused. final FieldNode f = exp.getField(); if (f.isStatic()) { makeNode("staticField", new Runnable() { @@ -1119,6 +1148,7 @@ public void run() { }); } } else if ("this".equals(exp.getName())) { + // DN: Groovy allows you to use `this` in static methods and blocks to refer to the current class. /* Kohsuke: TODO: I don't really understand the 'true' block of the code, so I'm missing something if (controller.isStaticMethod() || (!controller.getCompileStack().isImplicitThis() && controller.isStaticContext())) { if (controller.isInClosure()) classNode = controller.getOutermostClass(); @@ -1163,6 +1193,16 @@ public void run() { } }); + } else if (exp.getRightExpression() instanceof EmptyExpression) { + // def x; + makeNode("declareVariable", new Runnable() { + @Override + public void run() { + VariableExpression v = exp.getVariableExpression(); + literal(v.getType()); + literal(v.getName()); + } + }); } else { // def x=v; makeNode("declareVariable", new Runnable() { @@ -1172,14 +1212,27 @@ public void run() { loc(exp); literal(v.getType()); literal(v.getName()); - visitAssignmentOrCast(v, exp.getRightExpression()); + visitAssignmentOrCast(v.getType(), exp.getRightExpression()); } }); } } - protected void visitAssignmentOrCast(final VariableExpression varExp, final Expression rhs) { - visit(rhs); // this will not produce anything if this is EmptyExpression + protected void visitAssignmentOrCast(ClassNode type, final Expression rhs) { + if (SandboxTransformer.isKnownSafeCast(type, rhs)) { + visit(rhs); + return; + } + makeNode("cast", new Runnable() { + @Override + public void run() { + loc(rhs); + visit(rhs); + literal(type); + literal(false); + // TODO what about ignoreAutoboxing & strict? + } + }); } @Override @@ -1314,77 +1367,6 @@ public void visitBytecodeExpression(BytecodeExpression expression) { expression.getLineNumber(), expression.getColumnNumber())); } - // Required because the methods we need have protected visibility in Verifier. - private static class InitialExpressionExpander extends Verifier { - private void expandInitialExpressions(ClassNode node) { - super.setClassNode(node); - super.addDefaultParameterMethods(node); - fixupVariableReferencesInGeneratedMethods(node); - } - // Methods generated by Verifier.addDefaultParameterMethods have some VariableExpressions where - // VariableExpression.getAccessedVariable returns null, when it should return the same variable. This causes - // problems in visitVariableExpression, so this method prevents errors by setting the accessed variable to the - // same variable here. The variables we need to fix are always in a cast expression in a method call expression - // in the final statement of the body of the generated method. - private void fixupVariableReferencesInGeneratedMethods(ClassNode node) { - for (MethodNode m : node.getMethods()) { - if (Boolean.TRUE.equals(m.getNodeMetaData(Verifier.DEFAULT_PARAMETER_GENERATED))) { - MethodCallExpression mce = findMethodCallExpressionInLastStatementOfBody(m); - if (mce != null) { - for (Expression arg : ((TupleExpression)mce.getArguments()).getExpressions()) { - if (arg instanceof CastExpression) { - Expression castedExpr = ((CastExpression) arg).getExpression(); - if (castedExpr instanceof VariableExpression) { - VariableExpression varExpr = (VariableExpression) castedExpr; - if (varExpr.getAccessedVariable() == null) { - varExpr.setAccessedVariable(varExpr); - } else { - LOGGER.log(Level.FINE, "Variable {0} in method call arguments already had an initial expression", varExpr); - } - } else { - // The initial expressions are inlined directly into the arguments in the - // MethodCallExpression, so if this isn't a variable expression, we just ignore it. - } - } else { - LOGGER.log(Level.FINE, "Unexpected expression in method call arguments in {0}: {1}", new Object[]{ m, arg }); - } - } - } - } - } - } - private MethodCallExpression findMethodCallExpressionInLastStatementOfBody(MethodNode m) { - if (m.getCode() instanceof BlockStatement) { - List body = ((BlockStatement)m.getCode()).getStatements(); - if (!body.isEmpty()) { - Statement finalStatement = body.get(body.size() - 1); - if (finalStatement instanceof ReturnStatement) { // For methods with return values. - Expression returnExpr = ((ReturnStatement) finalStatement).getExpression(); - if (returnExpr instanceof MethodCallExpression) { - return (MethodCallExpression) returnExpr; - } else { - LOGGER.log(Level.FINE, "Unexpected expression in return statement of {0}: {1}", new Object[]{ m, returnExpr }); - } - } else if (finalStatement instanceof ExpressionStatement) { // For void methods. - Expression expr = ((ExpressionStatement) finalStatement).getExpression(); - if (expr instanceof MethodCallExpression) { - return (MethodCallExpression) expr; - } else { - LOGGER.log(Level.FINE, "Unexpected expression in last statement of {0}: {1}", new Object[]{ m, expr }); - } - } else { - LOGGER.log(Level.FINE, "Unexpected type of last statement of {0}: {1}", new Object[]{ m, finalStatement }); - } - } else { - LOGGER.log(Level.FINE, "Body of {0} is empty", m); - } - } else { - LOGGER.log(Level.FINE, "Body of {0} is not a block statement", m); - } - return null; - } - } - private static final ClassNode OBJECT_TYPE = ClassHelper.makeCached(Object.class); private static final ClassNode FUNCTION_TYPE = ClassHelper.makeCached(CpsFunction.class); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java index c195b34b0..2de5a7014 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/SandboxCpsTransformer.java @@ -5,9 +5,6 @@ import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.FieldNode; import org.codehaus.groovy.ast.MethodNode; -import org.codehaus.groovy.ast.expr.CastExpression; -import org.codehaus.groovy.ast.expr.Expression; -import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.Statement; import org.codehaus.groovy.classgen.GeneratorContext; import org.codehaus.groovy.control.SourceUnit; @@ -73,66 +70,6 @@ public void visitMethod(MethodNode m) { super.visitMethod(m); } - @Override - public void visitCastExpression(final CastExpression exp) { - makeNode("sandboxCastOrCoerce", new Runnable() { - @Override - public void run() { - loc(exp); - visit(exp.getExpression()); - literal(exp.getType()); - literal(exp.isIgnoringAutoboxing()); - literal(exp.isCoerce()); - literal(exp.isStrict()); - } - }); - } - - @Override - protected void visitAssignmentOrCast(final VariableExpression varExp, final Expression rhs) { - if (SandboxTransformer.mightBePositionalArgumentConstructor(varExp)) { - makeNode("sandboxCastOrCoerce", new Runnable() { - @Override - public void run() { - loc(varExp); - visit(rhs); - literal(varExp.getType()); - literal(false); - literal(true); - literal(false); - } - }); - } else { - super.visitAssignmentOrCast(varExp, rhs); - } - } - - @Override - protected void getMultipleAssignmentValueOrCast(final VariableExpression varExp, final Expression rhs, final Expression index) { - if (SandboxTransformer.mightBePositionalArgumentConstructor(varExp)) { - makeNode("sandboxCastOrCoerce", new Runnable() { - @Override - public void run() { - loc(varExp); - makeNode("array", new Runnable() { - @Override - public void run() { - loc(rhs); - visit(rhs); - makeNode("constant", index); - } - }); - literal(varExp.getType()); - literal(false); - literal(true); - literal(false); - } - }); - } else { - super.getMultipleAssignmentValueOrCast(varExp, rhs, index); - } - } - @Override protected Class getTrustTag() { return Untrusted.class; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java index 0586f546a..291ef5fd1 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/AssertBlock.java @@ -5,7 +5,6 @@ import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; /** * assert exp : msg; @@ -36,10 +35,12 @@ class ContinuationImpl extends ContinuationGroup { } public Next jump(Object cond) { - if (DefaultTypeTransformation.castToBoolean(cond)) - return k.receive(null); - else - return then(msg, e, fail); + return castToBoolean(cond, e, b -> { + if (b) + return k.receive(null); + else + return then(msg, e, fail); + }); } public Next fail(Object msg) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java new file mode 100644 index 000000000..f4ee32423 --- /dev/null +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java @@ -0,0 +1,74 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; +import java.util.Collections; +import org.codehaus.groovy.runtime.InvokerInvocationException; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; + +public class CastBlock implements Block { + private final SourceLocation loc; + private final Block valueExp; + private final Class type; + private final boolean ignoreAutoboxing; + private final boolean coerce; + private final boolean strict; + + public CastBlock(SourceLocation loc, Block valueExp, Class type, boolean ignoreAutoboxing, boolean coerce, boolean strict) { + this.loc = loc; + this.valueExp = valueExp; + this.type = type; + this.ignoreAutoboxing = ignoreAutoboxing; + this.coerce = coerce; + this.strict = strict; + } + + @Override + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e, k).then(valueExp, e, cast); + } + + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next cast(Object value) { + try { + return k.receive(e.getInvoker().cast(value, type, ignoreAutoboxing, coerce, strict)); + } catch (CpsCallableInvocation inv) { + // Implementations of asType and other methods used by the Groovy stdlib should be @NonCPS, but we + // just log a warning and invoke the callable anyway to maintain the existing behavior. + inv.checkMismatch(ScriptBytecodeAdapter.class, Collections.singletonList(coerce ? "asType" : "castToType")); + return inv.invoke(e, loc, k); + } catch (Throwable t) { + if (t instanceof InvokerInvocationException) { + // DefaultTypeTransformation calls asBoolean via InvokerHelper, which wraps all thrown exceptions + // in InvokerInvocationException. CpsCallableInvocation in this context has always resulted in + // "Unexpected exception in CPS VM thread", so there is no need to attempt to recover by invoking + // the callable. + Throwable cause = t.getCause(); + if (cause instanceof CpsCallableInvocation) { + CpsCallableInvocation inv = (CpsCallableInvocation)cause; + inv.checkMismatch(ScriptBytecodeAdapter.class, Collections.singletonList(coerce ? "asType" : "castToType")); + String classAndMethod = inv.getClassAndMethodForDisplay(); + t = new IllegalStateException(classAndMethod + " must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/"); + } + } + return throwException(e, t, loc, new ReferenceStackTrace()); + } + } + + private static final long serialVersionUID = 1L; + } + + static final ContinuationPtr cast = new ContinuationPtr(ContinuationImpl.class, "cast"); + + private static final long serialVersionUID = 1L; +} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index a45cf11c8..d44e2341b 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -16,10 +16,14 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; +import java.util.function.Function; import javax.annotation.CheckReturnValue; +import org.codehaus.groovy.runtime.InvokerInvocationException; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.callsite.CallSite; /** @@ -207,5 +211,41 @@ protected Next throwException(Env e, Throwable t, SourceLocation loc, ReferenceS return e.getExceptionHandler(t.getClass()).receive(t); } + /** + * Casts the result of the given value to a Boolean using {@link Invoker#cast}. + * + * @param value + * The value to cast + * @param e + * {@link Env} whose {@link Invoker} will be used to perform the cast + * @param fn + * The {@link Next}-returning function that the resulting boolean will be applied to + */ + protected Next castToBoolean(Object value, Env e, Function fn) { + try { + Object result = e.getInvoker().cast(value, Boolean.class, false, false, false); + // Invoker.cast with coerce=false uses DefaultTypeTransformation.castToType, which may return null, as + // opposed to DefaultTypeTransformation.castToBoolean which we are trying to mimic. + boolean b = Boolean.TRUE.equals(result); + return fn.apply(b); + } catch (Throwable t) { + // It should not be possible to receive a top-level CpsCallableInvocation here. + if (t instanceof InvokerInvocationException) { + // DefaultTypeTransformation calls asBoolean via InvokerHelper, which wraps all thrown exceptions + // in InvokerInvocationException. CpsCallableInvocation in this context has always resulted in + // "Unexpected exception in CPS VM thread", so there is no need to attempt to recover by invoking + // the callable. + Throwable cause = t.getCause(); + if (cause instanceof CpsCallableInvocation) { + CpsCallableInvocation inv = (CpsCallableInvocation)cause; + inv.checkMismatch(ScriptBytecodeAdapter.class, Collections.singletonList("castToType")); + String classAndMethod = inv.getClassAndMethodForDisplay(); + t = new IllegalStateException(classAndMethod + " must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/"); + } + } + return throwException(e, t, null, new ReferenceStackTrace()); + } + } + private static final long serialVersionUID = 1L; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 256996535..9b2ed8000 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -100,6 +100,21 @@ void checkMismatch(Object expectedReceiver, List expectedMethodNames) { } } + String getClassAndMethodForDisplay() { + String clazz = className(receiver); + return (clazz == null ? "" : clazz + ".") + methodName; + } + + private static String className(Object receiver) { + if (receiver == null) { + return null; + } else if (receiver instanceof Class) { + return ((Class) receiver).getName(); + } else { + return receiver.getClass().getName(); + } + } + /** @see #registerMismatchHandler */ @FunctionalInterface public interface MismatchHandler { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java index e756ec938..358f4e1f3 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java @@ -4,7 +4,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; +import java.util.function.Function; /** * do { ... } while ( ... ); @@ -44,13 +44,15 @@ public Next loopHead(Object _) { } public Next loopCond(Object cond) { - if (DefaultTypeTransformation.castToBoolean(cond)) { - // loop - return top(); - } else { - // exit loop - return loopEnd.receive(null); - } + return castToBoolean(cond, e, b -> { + if (b) { + // loop + return top(); + } else { + // exit loop + return loopEnd.receive(null); + } + }); } private static final long serialVersionUID = 1L; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java index b22a5d966..2b03d901a 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ElvisBlock.java @@ -4,7 +4,6 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; /** * x ?: y @@ -34,11 +33,13 @@ class ContinuationImpl extends ContinuationGroup { } public Next jump(Object cond) { - if (DefaultTypeTransformation.castToBoolean(cond)) { - return k.receive(cond); - } else { - return then(falseExp, e, k); - } + return castToBoolean(cond, e, b -> { + if (b) { + return k.receive(cond); + } else { + return then(falseExp, e, k); + } + }); } private static final long serialVersionUID = 1L; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java index 4bc35c67b..22966ee5d 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java @@ -4,7 +4,6 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; /** * for (e1; e2; e3) { ... body ... } @@ -42,13 +41,15 @@ public Next loopHead(Object _) { } public Next loopCond(Object cond) { - if (DefaultTypeTransformation.castToBoolean(cond)) { - // loop - return then(body,e,increment); - } else { - // exit loop - return loopEnd.receive(null); - } + return castToBoolean(cond, e, b -> { + if (b) { + // loop + return then(body,e,increment); + } else { + // exit loop + return loopEnd.receive(null); + } + }); } public Next increment(Object _) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java index 473fe4003..cb52efc70 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java @@ -4,7 +4,6 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; /** * if (...) { ... } else { ... } @@ -34,7 +33,9 @@ class ContinuationImpl extends ContinuationGroup { } public Next jump(Object cond) { - return then(DefaultTypeTransformation.castToBoolean(cond) ? then : els,e,k); + return castToBoolean(cond, e, b -> { + return then(b ? then : els, e, k); + }); } private static final long serialVersionUID = 1L; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java index d7c7c4540..2597738d5 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java @@ -5,7 +5,6 @@ import com.cloudbees.groovy.cps.LValue; import com.cloudbees.groovy.cps.LValueBlock; import com.cloudbees.groovy.cps.Next; -import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; /** * Access to local variables and method parameters. @@ -42,7 +41,8 @@ public Next get(Continuation k) { public Next set(Object v, Continuation k) { Class type = e.getLocalVariableType(name); try { - e.setLocalVariable(name, (type == null) ? v : ScriptBytecodeAdapter.castToType(v, type)); + // Implicit casts always have coerce = false. For now we do not do anything with ignoreAutoboxing and strict. + e.setLocalVariable(name, (type == null) ? v : e.getInvoker().cast(v, type, false, false, false)); } catch (Throwable t) { return throwException(e, t, loc, new ReferenceStackTrace()); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java index ee810c142..c6515c210 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java @@ -4,7 +4,6 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; /** * Logical operator ({@code &&} and {@code ||}) @@ -35,19 +34,21 @@ class ContinuationImpl extends ContinuationGroup { } public Next decide(Object lhs) { - boolean v = DefaultTypeTransformation.castToBoolean(lhs); - if (and) { - if (!v) return k.receive(false); // false && ... - else return then(rhs,e,castRhs); - } else { - if (v) return k.receive(true); // true || ... - else return then(rhs,e,castRhs); - } + return castToBoolean(lhs, e, v -> { + if (and) { + if (!v) return k.receive(false); // false && ... + else return then(rhs,e,castRhs); + } else { + if (v) return k.receive(true); // true || ... + else return then(rhs,e,castRhs); + } + }); } public Next castRhs(Object rhs) { - boolean v = DefaultTypeTransformation.castToBoolean(rhs); - return k.receive(v); + return castToBoolean(rhs, e, v -> { + return k.receive(v); + }); } private static final long serialVersionUID = 1L; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java index ee6a6f9e2..2ee6ac1f2 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NewArrayBlock.java @@ -4,7 +4,6 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import java.lang.reflect.Array; @@ -42,7 +41,7 @@ class ContinuationImpl extends ContinuationGroup { public Next fixArg(Object v) { try { - dimensions[idx++] = (Integer)ScriptBytecodeAdapter.castToType(v,int.class); + dimensions[idx++] = (Integer)e.getInvoker().cast(v, int.class, false, false, false); } catch (Throwable t) { return throwException(e, t, loc, new ReferenceStackTrace()); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java index 6606f305c..bc1776e7c 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java @@ -18,14 +18,40 @@ public NotBlock(Block b) { this.b = b; } - public Next eval(Env e, final Continuation k) { - return b.eval(e,new Continuation() { + @Override + public Next eval(final Env e, final Continuation k) { + // Only exists to maintain compatibility with classes serialized before ContinuationImpl was introduced. + Continuation backwardsCompatibility = new Continuation() { + private static final long serialVersionUID = -7345620782904277090L; public Next receive(Object o) { - boolean b = DefaultTypeTransformation.booleanUnbox(o); + // "e" is null in deserialized instances of this class, so we cannot use `e.getInvoker().cast(...)`. + // That said, there are no known security issues with boolean casts, so this should be fine. + boolean b = DefaultTypeTransformation.castToBoolean(o); return k.receive(!b); } - }); + }; + return new ContinuationImpl(e, k).then(b, e, cast); } + class ContinuationImpl extends ContinuationGroup { + final Continuation k; + final Env e; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next cast(Object o) { + return castToBoolean(o, e, b -> { + return k.receive(!b); + }); + } + + private static final long serialVersionUID = 1L; + } + + static final ContinuationPtr cast = new ContinuationPtr(ContinuationImpl.class,"cast"); + private static final long serialVersionUID = 1L; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java index b42423211..86ee13ce8 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java @@ -4,7 +4,6 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; /** * while(...) { ... } @@ -40,13 +39,15 @@ public Next loopHead(Object _) { } public Next loopCond(Object cond) { - if (DefaultTypeTransformation.castToBoolean(cond)) { - // loop - return then(body,e,loopHead); - } else { - // exit loop - return loopEnd.receive(null); - } + return castToBoolean(cond, e, b -> { + if (b) { + // loop + return then(body,e,loopHead); + } else { + // exit loop + return loopEnd.receive(null); + } + }); } private static final long serialVersionUID = 1L; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java index 7b26f2e3f..e46a085a7 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/DefaultInvoker.java @@ -65,6 +65,14 @@ public Object methodPointer(Object lhs, String name) { return new MethodClosure(lhs, name); } + @Override + public Object cast(Object value, Class type, boolean ignoreAutoboxing, boolean coerce, boolean strict) throws Throwable { + // TODO: What should we do with ignoreAutoboxing and strict? + return coerce + ? ScriptBytecodeAdapter.asType(value, type) + : ScriptBytecodeAdapter.castToType(value, type); + } + public Invoker contextualize(CallSiteBlock tags) { return this; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java index 61e0f2a41..cfa902df7 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/Invoker.java @@ -56,6 +56,8 @@ public interface Invoker extends Serializable { Object methodPointer(Object lhs, String name); + Object cast(Object value, Class type, boolean ignoreAutoboxing, boolean coerce, boolean strict) throws Throwable; + /** * Returns a child {@link Invoker} used to make a call on behalf of the given {@link CallSiteBlock}. */ diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java index 2ea12ef72..7d5390d1b 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker.java @@ -53,6 +53,10 @@ public Object methodPointer(Object lhs, String name) { return new SandboxedMethodClosure(lhs, name); } + @Override + public Object cast(Object value, Class type, boolean ignoreAutoboxing, boolean coerce, boolean strict) throws Throwable { + return Checker.checkedCast(type, value, ignoreAutoboxing, coerce, strict); + } public Invoker contextualize(CallSiteBlock tags) { if (tags.getTags().contains(Untrusted.INSTANCE)) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index ae75b5397..0f1dc55a7 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -24,13 +24,40 @@ class ContinuableTest extends AbstractGroovyCpsTest { def v = c.run(null); assert v==2 : "Continuable.suspend(x+1) returns the control back to us"; + assert c.isResumable() : "Continuable is resumable because it has 'return x+1' to execute." + assert c.run(3)==4 : "We resume continuable, then the control comes back from the return statement" + + assert !c.isResumable() : "We've run the program till the end, so it's no longer resumable" + } + + @Test + void fork() { + def s = csh.parse("""\n\ + def addOne(def x) { x + 1 }; + int x = 1; + x = addOne(Continuable.suspend(x+1)) + return x+1; + """) + + def c = new Continuable(s); + assert c.isResumable() + + def v = c.run(null); + assert v==2 : "Continuable.suspend(x+1) returns the control back to us"; + def c2 = c.fork() - for (d in [c,c2]) { - assert d.isResumable() : "Continuable is resumable because it has 'return x+1' to execute." - assert d.run(3)==4 : "We resume continuable, then the control comes back from the return statement" + assert c.isResumable() : "Continuable is resumable because it has 'return x+1' to execute." + assert c.run(2)==4 : "We resume continuable, then the control comes back from the return statement" + assert !c.isResumable() : "We've run the program till the end, so it's no longer resumable" - assert !d.isResumable() : "We've run the program till the end, so it's no longer resumable" + assert c2.isResumable() : "Continuable is resumable because it has 'return x+1' to execute." + try { + assert c2.run(2)==4 : "We resume continuable, then the control comes back from the return statement" + fail("should have thrown exception"); + } catch (ArrayIndexOutOfBoundsException e) { + // Since c2 is a shallow clone, the FunctionCallBlock for addOne(Continuable.suspend(x+1)) has already + // evaluated its arguments, so when we try to run it again, we get an error. } } diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy index c5530121c..1781c98f3 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy @@ -131,7 +131,6 @@ class CpsTransformerTest extends AbstractGroovyCpsTest { @Test void constructorList() { File f = ['/parent', 'name']; - println(f); assert evalCPS('''\ File f = ['/parent', 'name'] return f diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy index cd5783512..c99cdbb73 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy @@ -32,9 +32,8 @@ class FunctionCallBlockTest extends AbstractGroovyCpsTest { } def stuff = getThing(); """) == "cheese"; // Fails if we don't throw an exception, also fails if we run more than 10k steps. - } catch (StackOverflowError soe) { - println "PASSED: expected exception thrown for endlessly recursive function, see trace below"; - soe.printStackTrace(); + } catch (Throwable t) { + assert t.toString() == "java.lang.StackOverflowError: Excessively nested closures/functions at Script1.getThing(Script1.groovy:4) - look for unbounded recursion - call depth: 1025"; } } diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy index e229b9853..81f345c5c 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy @@ -113,10 +113,7 @@ ScriptBytecodeAdapter:findRegex(String,String) Matcher.matches() Script1.cpsMatcherMethod(String) ScriptBytecodeAdapter:findRegex(String,String) -Checker:checkedCast(Class,Matcher,Boolean,Boolean,Boolean) Matcher.matches() -ScriptBytecodeAdapter:asType(ArrayList,Class) -ScriptBytecodeAdapter:asType(ArrayList,Class) new GStringImpl(Object[],String[]) ''') } @@ -322,26 +319,21 @@ ScriptBytecodeAdapter:compareEqual(Double,Integer) assert (Locale.getDefault() as Instance).country != null assert Locale.getDefault().getCountry() != null ''') - // TODO recording Checker.checkedCast is undesirable, but how to avoid it? assertIntercept(''' Script1.super(Script1).setBinding(Binding) -Checker:checkedCast(Class,Class,Boolean,Boolean,Boolean) Locale:getAvailableLocales() Class1_groovyProxy.getAvailableLocales() ScriptBytecodeAdapter:compareNotEqual(Locale[],null) -Checker:checkedCast(Class,Class,Boolean,Boolean,Boolean) Locale:getAvailableLocales() Class1_groovyProxy.availableLocales ScriptBytecodeAdapter:compareNotEqual(Locale[],null) Locale:getAvailableLocales() ScriptBytecodeAdapter:compareNotEqual(Locale[],null) Locale:getDefault() -Checker:checkedCast(Class,Locale,Boolean,Boolean,Boolean) Locale.getCountry() Locale2_groovyProxy.getCountry() ScriptBytecodeAdapter:compareNotEqual(String,null) Locale:getDefault() -Checker:checkedCast(Class,Locale,Boolean,Boolean,Boolean) Locale.getCountry() Locale2_groovyProxy.country ScriptBytecodeAdapter:compareNotEqual(String,null) @@ -388,11 +380,9 @@ SandboxInvokerTest$Base.noArg() Script1.runit(SandboxedMethodClosure) SandboxedMethodClosure.call() SandboxInvokerTest$Base.noArg() -Checker:checkedCast(Class,CpsClosure,Boolean,Boolean,Boolean) Script1.runit(CpsClosure) CpsClosure.call() SandboxInvokerTest$Base.noArg() -Checker:checkedCast(Class,SandboxedMethodClosure,Boolean,Boolean,Boolean) Script1.runit(SandboxedMethodClosure) SandboxedMethodClosure.call() SandboxInvokerTest$Base.noArg() @@ -447,10 +437,8 @@ return a + b + c + d ''') assertIntercept(''' Script1.super(Script1).setBinding(Binding) -Checker:checkedCast(Class,Class,Boolean,Boolean,Boolean) Locale:getAvailableLocales() Locale:getDefault() -Checker:checkedCast(Class,Locale,Boolean,Boolean,Boolean) Locale.getCountry() ArrayList[Integer] ArrayList[Integer] diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index a48604a40..9c57a7570 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -3,17 +3,18 @@ import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.CpsFunction; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; -import org.junit.Assert; import org.junit.Test; import java.lang.reflect.InvocationTargetException; import static java.util.Arrays.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; /** * @author Kohsuke Kawaguchi */ -public class BasicTest extends Assert { +public class BasicTest { Builder b = new Builder(MethodLocation.UNKNOWN); // useful fragment of expressions @@ -24,11 +25,11 @@ public class BasicTest extends Assert { /** * Evaluates the given body and return the yielded value. */ - private T run(Block... bodies) { + private Object run(Block... bodies) { try { Env e = Envs.empty(); Next p = new Next(b.block(bodies), e, Continuation.HALT); - return (T) p.run().yield.wrapReplay(); + return p.run().yield.wrapReplay(); } catch (InvocationTargetException x) { throw new AssertionError(x); } @@ -165,10 +166,10 @@ public InstantiationTest(int x) { public void newInstance() { InstantiationTest v; - v = run(b.new_(0, InstantiationTest.class, b.constant(3))); + v = (InstantiationTest)run(b.new_(0, InstantiationTest.class, b.constant(3))); assertEquals(3, v.v); - v = run(b.new_(0, InstantiationTest.class, b.constant(3), b.constant(4))); + v = (InstantiationTest)run(b.new_(0, InstantiationTest.class, b.constant(3), b.constant(4))); assertEquals(7, v.v); } diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java index fdb93c6a2..5958ccbf1 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java @@ -17,6 +17,8 @@ package com.cloudbees.groovy.cps; import java.util.Arrays; +import java.util.Collections; +import org.junit.Ignore; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -88,4 +90,104 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { } assertEquals("Script should fail during compilation", 1, getBinding().getProperty("sentinel")); } + + @Ignore("groovy-cps does not cast method return values to the declared type") + @Test public void methodReturnValuesShouldBeCastToDeclaredReturnType() throws Throwable { + assertEquals(true, evalCPS( + "Boolean castToBoolean(def o) { o }\n" + + "castToBoolean(123)\n")); + } + + @Test public void castToTypeShouldBeUsedForImplicitCasts() throws Throwable { + assertEquals(Arrays.asList("toString", "toString", "toString", "asType"), evalCPS( + "class Test {\n" + + " def auditLog = []\n" + + " @NonCPS\n" + + " def asType(Class c) {\n" + + " auditLog.add('asType')\n" + + " 'Test.asType'\n" + + " }\n" + + " @NonCPS\n" + + " String toString() {\n" + + " auditLog.add('toString')\n" + + " 'Test.toString'\n" + + " }\n" + + "}\n" + + "Test t = new Test()\n" + + "String variable = t\n" + + "String[] array = [t]\n" + + "(String)t\n" + + "t as String\n" + // This is the only cast that should call asType. + "t.auditLog\n")); + } + + @Test public void castRelatedMethodsShouldBeNonCps() throws Throwable { + // asType CPS (supported (to the extent possible) for compatibility with existing code) + assertEquals(Arrays.asList(false, "asType class java.lang.Boolean"), evalCPS( + "class Test {\n" + + " def auditLog = []\n" + + " def asType(Class c) {\n" + + " auditLog.add('asType ' + c)\n" + + " false\n" + + " }\n" + + "}\n" + + "def t = new Test()\n" + + "[t as Boolean, t.auditLog[0]]")); + // asType NonCPS (preferred) + assertEquals(Collections.singletonList("asType class java.lang.Boolean"), evalCPS( + "class Test {\n" + + " def auditLog = []\n" + + " @NonCPS\n" + + " def asType(Class c) {\n" + + " auditLog.add('asType ' + c)\n" + + " null\n" + + " }\n" + + "}\n" + + "def t = new Test()\n" + + "t as Boolean\n" + + "t.auditLog")); + // asBoolean CPS (has never worked, still does not work) + try { + evalCPS( + "class Test {\n" + + " def auditLog = []\n" + + " def asBoolean() {\n" + + " auditLog.add('asBoolean')\n" + + " }\n" + + "}\n" + + "def t = new Test()\n" + + "(Boolean)t\n" + + "t.auditLog"); + fail("Should have thrown an exception"); + } catch (Throwable t) { + assertEquals("java.lang.IllegalStateException: Test.asBoolean must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/", t.toString()); + } + // asBoolean NonCPS (required) + assertEquals(Collections.singletonList("asBoolean"), evalCPS( + "class Test {\n" + + " def auditLog = []\n" + + " @NonCPS\n" + + " def asBoolean() {\n" + + " auditLog.add('asBoolean')\n" + + " }\n" + + "}\n" + + "def t = new Test()\n" + + "(Boolean)t\n" + + "t.auditLog")); + } + + @Test + public void enums() throws Throwable { + assertEquals("FIRST", evalCPS( + "enum EnumTest { FIRST, SECOND }; EnumTest.FIRST.toString()")); + assertEquals("FIRST", evalCPS( + "enum EnumTest { FIRST(), SECOND(); EnumTest() { } }; EnumTest.FIRST.toString()")); + } + + @Test + public void anonymousClass() throws Throwable { + assertEquals(6, evalCPS( + "def o = new Object() { def plusOne(x) { x + 1 } }\n" + + "o.plusOne(5)")); + } } diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/NotBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/NotBlockTest.java new file mode 100644 index 000000000..b1d1a3596 --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/NotBlockTest.java @@ -0,0 +1,41 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; +import com.cloudbees.groovy.cps.Continuable; +import com.cloudbees.groovy.cps.ObjectInputStreamWithLoader; +import com.cloudbees.groovy.cps.Outcome; +import groovy.lang.Script; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.util.Collections; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.equalTo; + +public class NotBlockTest extends AbstractGroovyCpsTest { + + @Test + public void serialFormBackwardsCompatibility() throws Throwable { + // notBlock.dat was created before NotBlock$ContinuationImpl was created. + /* + Script s = getCsh().parse("!Continuable.suspend('suspended')"); + Continuable c = new Continuable(s); + assertThat(c.run0(new Outcome(null, null), Collections.emptyList()).replay(), equalTo((Object)"suspended")); + FileOutputStream baos = new FileOutputStream("notBlock.dat"); + new ObjectOutputStream(baos).writeObject(c); + */ + // We need to define a script class in the current JVM with a serialVersionUID that matches the serialized class. + Script s = getCsh().parse( + "class Script1 extends SerializableScript {\n" + + " private static final long serialVersionUID = -2376309021360195963\n" + + " public Object run() { throw new RuntimeException('unused') }\n" + + "}\n"); + Continuable c; + try (InputStream is = NotBlockTest.class.getResourceAsStream("notBlock.dat"); + ObjectInputStream ois = new ObjectInputStreamWithLoader(is, getCsh().getClassLoader())) { + c = (Continuable)ois.readObject(); + } + assertTrue(c.isResumable()); + assertThat(c.run0(new Outcome(false, null), Collections.emptyList()).replay(), equalTo(true)); + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java index 2ed41d1ea..f79a3d5a4 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java @@ -22,16 +22,20 @@ import com.cloudbees.groovy.cps.SandboxCpsTransformer; import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; import com.cloudbees.groovy.cps.impl.FunctionCallEnv; +import java.io.File; +import static org.hamcrest.CoreMatchers.equalTo; import org.junit.Before; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ErrorCollector; import org.jvnet.hudson.test.Issue; import org.kohsuke.groovy.sandbox.ClassRecorder; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; - public class SandboxInvoker2Test extends AbstractGroovyCpsTest { + @Rule + public ErrorCollector ec = new ErrorCollector(); + ClassRecorder cr = new ClassRecorder(); @Override @@ -47,6 +51,7 @@ private Object evalCpsSandbox(String script) throws Throwable { FunctionCallEnv e = (FunctionCallEnv)Envs.empty(); e.setInvoker(new SandboxInvoker()); + cr.reset(); cr.register(); try { return parseCps(script).invoke(e, null, Continuation.HALT).run().yield.replay(); @@ -56,7 +61,12 @@ private Object evalCpsSandbox(String script) throws Throwable { } public void assertIntercept(String... expected) { - assertThat(cr.toString().split("\n"), equalTo(expected)); + ec.checkThat(cr.toString().split("\n"), equalTo(expected)); + } + + public void assertIntercept(String script, Object expectedValue, String... expected) throws Throwable { + ec.checkThat(evalCpsSandbox(script), equalTo(expectedValue)); + assertIntercept(expected); } @Issue("SECURITY-1710") @@ -66,7 +76,6 @@ public void assertIntercept(String... expected) { "Script1.super(Script1).setBinding(Binding)", "Script1.m()", "System:getProperties()", - "Checker:checkedCast(Class,Properties,Boolean,Boolean,Boolean)", "Script1.m(Properties)"); } @@ -92,4 +101,106 @@ public void assertIntercept(String... expected) { "System:getProperties()", // Not currently intercepted because it is dropped by the transformer. "ScriptBytecodeAdapter:compareNotEqual(null,null)"); } + + @Issue("SECURITY-2824") + @Test public void sandboxInterceptsImplicitCastsVariableAssignment() throws Throwable { + assertEquals(new File("secret.key"), evalCpsSandbox( + "File file\n" + // DeclarationExpression + "file = ['secret.key']\n " + // BinaryExpression + "file")); + assertIntercept( + "Script1.super(Script1).setBinding(Binding)", + "new File(String)"); + } + + @Issue("SECURITY-2824") + @Test + public void sandboxInterceptsImplicitCastsArrayAssignment() throws Throwable { + // Regular Groovy casts the rhs of array assignments to match the component type of the array, but the + // sandbox does not do this (with or without the CPS transformation). Ideally the sandbox would have the same + // behavior as regular Groovy, but the current behavior is safe, which is good enough. + try { + evalCpsSandbox( + "File[] files = [null]\n" + + "files[0] = ['secret.key']\n " + + "files[0]"); + fail("The sandbox must intercept unsafe array element assignments"); + } catch (Throwable t) { + assertEquals("java.lang.ArrayStoreException: java.util.ArrayList", t.toString()); + } + } + + @Issue("SECURITY-2824") + @Test public void sandboxInterceptsImplicitCastsInitialParameterExpressions() throws Throwable { + assertIntercept( + "def method(File file = ['secret.key']) { file }; method()", + new File("secret.key"), + "Script1.super(Script1).setBinding(Binding)", + "Script1.method()", + "new File(String)", + "Script1.method(File)"); + // The CPS transformation currently ignores Closure parameter initial expressions. + assertIntercept( + "({ File file = ['secret.key'] -> file })()", + (Object)null, + "Script2.super(Script2).setBinding(Binding)", + "CpsClosure.call()"); + // "new File(String)" This should also be intercepted if initial expressions are supported + assertIntercept( + "class Test {\n" + + " def x\n" + + " Test(File file = ['secret.key']) {\n" + + " x = file\n" + + " }\n" + + "}\n" + + "new Test().x", + new File("secret.key"), + "Script3.super(Script3).setBinding(Binding)", + "new Test()", + "new File(String)", + "Test.x"); + } + + @Issue("SECURITY-2824") + @Test public void sandboxInterceptsImplicitCastsFields() throws Throwable { + assertIntercept( + "class Test {\n" + + " File file = ['secret.key']\n" + + "}\n" + + "new Test().file", + new File("secret.key"), + "Script1.super(Script1).setBinding(Binding)", + "new Test()", + "new File(String)", + "Test.file"); + assertIntercept( + "@groovy.transform.Field File file = ['secret.key']\n" + + "file", + new File("secret.key"), + "new File(String)", + "Script2.super(Script2).setBinding(Binding)", + "Script2.file"); + } + + @Issue("SECURITY-2824") + @Test public void sandboxInterceptsArrayCastsRecursively() throws Throwable { + assertIntercept( + "([['secret.key']] as File[])[0]", + new File("secret.key"), + "Script1.super(Script1).setBinding(Binding)", + "new File(String)", + "File[][Integer]"); + } + + @Test public void sandboxInterceptsBooleanCasts() throws Throwable { + assertIntercept("if ([:]) { true } else { false }", + false, + "Script1.super(Script1).setBinding(Binding)", + "LinkedHashMap.asBoolean()"); + assertIntercept("if (['a' : 1]) { true } else { false }", + true, + "Script2.super(Script2).setBinding(Binding)", + "LinkedHashMap.asBoolean()"); + } + } diff --git a/lib/src/test/resources/com/cloudbees/groovy/cps/impl/notBlock.dat b/lib/src/test/resources/com/cloudbees/groovy/cps/impl/notBlock.dat new file mode 100644 index 0000000000000000000000000000000000000000..4c404f5349aead584a7e33863b0bde2e99135cc1 GIT binary patch literal 2370 zcmai0&u<$=6n<;RcG5OYfKmi4QK?KD0(dDx2oWSGZlXrorbv#ENH{Rwo!DEicZS)w z?wSL)^5Y-izyXAW#3dKR8C1j#35jw*fRH$HsCwnXg*UUiSzB}+AH3_G_v3r-ecxLj z+=E)Apy`TX%MC>Abvch(Jtf3w+;U~qYKsv4FlOC=L;A5QP<6oK2rCY`*@td+>SmLh zy%CPq9a!)~$9a;{h49 zhm{%#7D2dJ3Sru#$WFDK^tc-^<%hj?z#^LAgA;`6pgy2B%nsRSpTJlh>!)ui(P$pl>LV zjHlxj4693~c!-7~SsV3zjXGpWEeg9dct(}h6~52n05irEtpy{hwNn2{0XDC)0MC5$ z>(}?retw|>sq2c?bxTW$mIV>ns4r@63?+_9TW`I1>elX`fB&4DKTw!oWl^6jYK=d> z|KapIcdAg?B$5f{Z88^y+JXh_6Px=Y@DlmzYX-A*bDpjg3@n5>?E4W_pHK9!+E*Vh zT>0mg&NXX_9j<&9`0wczlv2RNrkK^Ns7DHvjvo%VmtlS3_V(M$!R>!5VC}+j=DH-d z>&oLQ(eqfzK!O3etb-k+2Y6K{@!?rHUp6{NYW6dOlPb8-9#fB*88?|%BI{tJcL1B)R% zv^TN7u6J*cY$!-fN;XB`|7DzOIS0GLdg})#UTPfNJ^zK#7Xj7_wwzvhgdG(}$i1RM z(lSu?wB`5Dp3eD`4}SB$UHnl_<~w3v(h7-?g(;_tl+;ws&Y1p5Oz!f-W*{s?aU^-@ zanHQOULNV$g8o`eAJ8(-O!UJu=3y?vsZDVrGka6#8!1>eqtbsyT4}xvmcAr1nF>@j TYM!H$iq3M*kgY9K(yjgnu6gH8 literal 0 HcmV?d00001 From 4bf4693be6097069a4efabc4525f199fa2adb780 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Fri, 14 Oct 2022 15:00:47 -0400 Subject: [PATCH 725/932] [maven-release-plugin] prepare release groovy-cps-parent-1.34 --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index dfbfc742e..d509b6fec 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - ${revision}${changelist} + 1.34 groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 674adc50a..6a082fd7d 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - ${revision}${changelist} + 1.34 groovy-cps diff --git a/pom.xml b/pom.xml index 811acc439..ecf8e044c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - ${revision}${changelist} + 1.34 pom Groovy CPS Execution Parent @@ -29,7 +29,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - ${scmTag} + groovy-cps-parent-1.34 From 0d52388fba89a31a4522b99e2fe8214e2f3b19a6 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Fri, 14 Oct 2022 15:00:50 -0400 Subject: [PATCH 726/932] [maven-release-plugin] prepare for next development iteration --- dgm-builder/pom.xml | 2 +- lib/pom.xml | 2 +- pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index d509b6fec..dfbfc742e 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.34 + ${revision}${changelist} groovy-cps-dgm-builder diff --git a/lib/pom.xml b/lib/pom.xml index 6a082fd7d..674adc50a 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -4,7 +4,7 @@ com.cloudbees groovy-cps-parent - 1.34 + ${revision}${changelist} groovy-cps diff --git a/pom.xml b/pom.xml index ecf8e044c..31fc21236 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ groovy-cps-parent - 1.34 + ${revision}${changelist} pom Groovy CPS Execution Parent @@ -17,7 +17,7 @@ UTF-8 2.4.21 - 1.33 + 1.35 -SNAPSHOT 1.1 @@ -29,7 +29,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git - groovy-cps-parent-1.34 + ${scmTag} From 1af77ffcc773ffac4eb49956168b9778dca9a3b6 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Fri, 14 Oct 2022 15:36:18 -0400 Subject: [PATCH 727/932] [SECURITY-2824] --- pom.xml | 3 +- .../plugins/workflow/cps/CpsGroovyShell.java | 4 +- .../plugins/workflow/cps/CpsScript.java | 6 +- .../cps/GroovyClassLoaderWhitelist.java | 65 ++++++++++++++-- .../workflow/cps/CpsFlowDefinition2Test.java | 78 ++++++++++++++++++- .../plugins/workflow/cps/CpsScriptTest.java | 34 ++++++++ .../cps/CpsVmExecutorServiceTest.java | 8 ++ 7 files changed, 185 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 04f572997..7618e1692 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ jenkinsci/${project.artifactId}-plugin 2.346.1 false - 1.32 + 1.34 16.17.0 8.18.0 @@ -107,6 +107,7 @@ org.jenkins-ci.plugins script-security + 1184.v85d16b_d851b_3 org.jenkins-ci.plugins diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java index 909351150..65540c17f 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java @@ -139,10 +139,10 @@ private Script doParse(GroovyCodeSource codeSource) throws CompilationFailedExce try (GroovySandbox.Scope scope = sandbox.enter()) { if (execution != null) { try (CpsFlowExecution.Timing t = execution.time(CpsFlowExecution.TimingKind.parse)) { - return super.parse(codeSource); + return scope.parse(CpsGroovyShell.this, codeSource); } } else { - return super.parse(codeSource); + return scope.parse(CpsGroovyShell.this, codeSource); } } } diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java index ef92bf411..d13da5073 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java @@ -190,7 +190,11 @@ public Object evaluate(File file) throws CompilationFailedException, IOException @Override public void run(File file, String[] arguments) throws CompilationFailedException, IOException { - $getShell().run(file,arguments); + // GroovyShell.run has a bunch of weird cases related to JUnit and other stuff that we cannot safely support + // without a lot of extra work, so we just approximate its behavior. Regardless, I assume that this method is + // essentially unused since it takes a File and it is not allowed by CpsWhitelist (unlike evaluate). + $getShell().getContext().setProperty("args", arguments); + evaluate(file); } /** diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyClassLoaderWhitelist.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyClassLoaderWhitelist.java index 0f6da8c99..b789cbb71 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyClassLoaderWhitelist.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyClassLoaderWhitelist.java @@ -4,6 +4,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.Collection; import org.jenkinsci.plugins.scriptsecurity.sandbox.Whitelist; @@ -41,35 +42,85 @@ private boolean permits(Class declaringClass) { } @Override public boolean permitsMethod(Method method, Object receiver, Object[] args) { - return permits(method.getDeclaringClass()) || delegate.permitsMethod(method, receiver, args); + return permits(method.getDeclaringClass()) && !isIllegalSyntheticMethod(method) || delegate.permitsMethod(method, receiver, args); } @Override public boolean permitsConstructor(Constructor constructor, Object[] args) { - return permits(constructor.getDeclaringClass()) || delegate.permitsConstructor(constructor, args); + return permits(constructor.getDeclaringClass()) && !isIllegalSyntheticConstructor(constructor) || delegate.permitsConstructor(constructor, args); } @Override public boolean permitsStaticMethod(Method method, Object[] args) { - return permits(method.getDeclaringClass()) || delegate.permitsStaticMethod(method, args); + return permits(method.getDeclaringClass()) && !isIllegalSyntheticMethod(method) || delegate.permitsStaticMethod(method, args); } @Override public boolean permitsFieldGet(Field field, Object receiver) { - return permits(field.getDeclaringClass()) || delegate.permitsFieldGet(field, receiver); + return permits(field.getDeclaringClass()) && !isIllegalSyntheticField(field) || delegate.permitsFieldGet(field, receiver); } @Override public boolean permitsFieldSet(Field field, Object receiver, Object value) { - return permits(field.getDeclaringClass()) || delegate.permitsFieldSet(field, receiver, value); + return permits(field.getDeclaringClass()) && !isIllegalSyntheticField(field) || delegate.permitsFieldSet(field, receiver, value); } @Override public boolean permitsStaticFieldGet(Field field) { - return permits(field.getDeclaringClass()) || delegate.permitsStaticFieldGet(field); + return permits(field.getDeclaringClass()) && !isIllegalSyntheticField(field) || delegate.permitsStaticFieldGet(field); } @Override public boolean permitsStaticFieldSet(Field field, Object value) { - return permits(field.getDeclaringClass()) || delegate.permitsStaticFieldSet(field, value); + return permits(field.getDeclaringClass()) && !isIllegalSyntheticField(field) || delegate.permitsStaticFieldSet(field, value); } @Override public String toString() { return super.toString() + "[" + delegate + "]"; } + /** + * Checks whether a given field was created by the Groovy compiler and should be inaccessible even if it is + * declared by a class defined by one of the specified class loaders. + */ + private static boolean isIllegalSyntheticField(Field field) { + if (!field.isSynthetic()) { + return false; + } + Class declaringClass = field.getDeclaringClass(); + Class enclosingClass = declaringClass.getEnclosingClass(); + if (field.getType() == enclosingClass && field.getName().startsWith("this$")) { + // Synthetic field added to inner classes to reference the outer class. + return false; + } else if (declaringClass.isEnum() && Modifier.isStatic(field.getModifiers()) && field.getName().equals("$VALUES")) { + // Synthetic field added to enum classes to hold the enum constants. + return false; + } + return true; + } + + /** + * Checks whether a given method was created by the Groovy compiler and should be inaccessible even if it is + * declared by a class defined by one of the specified class loaders. + */ + private static boolean isIllegalSyntheticMethod(Method method) { + if (!method.isSynthetic()) { + return false; + } else if (Modifier.isStatic(method.getModifiers()) && method.getDeclaringClass().isEnum() && method.getName().equals("$INIT")) { + // Synthetic method added to enum classes used to initialize the enum constants. + return false; + } + return true; + } + + /** + * Checks whether a given constructor was created by the Groovy compiler (or groovy-sandbox) and + * should be inaccessible even if it is declared by a class defined by the specified class loader. + */ + private static boolean isIllegalSyntheticConstructor(Constructor constructor) { + if (!constructor.isSynthetic()) { + return false; + } + Class declaringClass = constructor.getDeclaringClass(); + Class enclosingClass = declaringClass.getEnclosingClass(); + if (enclosingClass != null && constructor.getParameters().length > 0 && constructor.getParameterTypes()[0] == enclosingClass) { + // Synthetic constructor added by Groovy to anonymous classes. + return false; + } + return true; + } } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java index b3fec23af..26144838e 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java @@ -33,7 +33,6 @@ import java.io.Serializable; import java.util.Collections; import java.util.Set; - import java.util.logging.Level; import jenkins.model.Jenkins; @@ -257,7 +256,7 @@ public void traitsSandbox() throws Exception { WorkflowRun b = job.scheduleBuild2(0).get(); assertNull(jenkins.jenkins.getSystemMessage()); jenkins.assertBuildStatus(Result.FAILURE, b); - jenkins.assertLogContains("org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException: Scripts not permitted to use staticMethod jenkins.model.Jenkins getInstance", b); + jenkins.assertLogContains("org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException: Scripts not permitted to use method groovy.lang.GroovyObject invokeMethod java.lang.String java.lang.Object (org.jenkinsci.plugins.workflow.cps.CpsClosure2 getInstance)", b); return null; }); // Some safe idioms: @@ -853,6 +852,81 @@ public void scriptInitializerCallsCpsTransformedMethod() throws Exception { assertNull(Jenkins.get().getDescription()); } + @Issue("SECURITY-2824") + @Test public void blockCastsPropertiesAndAttributes() throws Exception { + // Instance property + WorkflowJob p = jenkins.createProject(WorkflowJob.class); + p.setDefinition(new CpsFlowDefinition( + "class Test {\n" + + " File file\n" + + "}\n" + + "def t = new Test()\n" + + "t.file = ['secret.key']\n", true)); + WorkflowRun b = jenkins.buildAndAssertStatus(Result.FAILURE, p); + jenkins.assertLogContains("Scripts not permitted to use new java.io.File java.lang.String", b); + // Static property + p.setDefinition(new CpsFlowDefinition( + "class Test {\n" + + " static File file\n" + + "}\n" + + "Test.file = ['secret.key']\n", true)); + b = jenkins.buildAndAssertStatus(Result.FAILURE, p); + jenkins.assertLogContains("Scripts not permitted to use new java.io.File java.lang.String", b); + // Instance attribute + p.setDefinition(new CpsFlowDefinition( + "class Test {\n" + + " File file\n" + + "}\n" + + "def t = new Test()\n" + + "t.@file = ['secret.key']\n", true)); + b = jenkins.buildAndAssertStatus(Result.FAILURE, p); + jenkins.assertLogContains("Scripts not permitted to use new java.io.File java.lang.String", b); + // Static attribute + p.setDefinition(new CpsFlowDefinition( + "class Test {\n" + + " static File file\n" + + "}\n" + + "Test.@file = ['secret.key']\n", true)); + b = jenkins.buildAndAssertStatus(Result.FAILURE, p); + jenkins.assertLogContains("Scripts not permitted to use new java.io.File java.lang.String", b); + } + + @Issue("JENKINS-33023") + @Test public void groovyEnums() throws Exception { + WorkflowJob p = jenkins.createProject(WorkflowJob.class); + p.setDefinition(new CpsFlowDefinition( + "enum Thing {\n" + + " ONE, TWO\n" + + " Thing() { }\n" + + "}\n" + + "Thing.ONE\n", true)); + WorkflowRun b = jenkins.buildAndAssertSuccess(p); + p.setDefinition(new CpsFlowDefinition( + "enum Thing {\n" + + " ONE, TWO\n" + + "}\n" + + "Thing.ONE\n", true)); + // Seems undesirable, but this is the current behavior. Requires new java.util.LinkedHashMap and staticMethod ImmutableASTTransformation checkPropNames. + b = jenkins.buildAndAssertStatus(Result.FAILURE, p); + jenkins.assertLogContains("Scripts not permitted to use new java.util.LinkedHashMap", b); + } + + @Test public void blockSyntheticFieldsAndMethods() throws Throwable { + WorkflowJob p = jenkins.createProject(WorkflowJob.class); + p.setDefinition(new CpsFlowDefinition("$getStaticMetaClass()", true)); + WorkflowRun b = jenkins.buildAndAssertStatus(Result.FAILURE, p); + jenkins.assertLogContains("Scripts not permitted to use method WorkflowScript $getStaticMetaClass", b); + p.setDefinition(new CpsFlowDefinition("getClass().$getCallSiteArray()", true)); + b = jenkins.buildAndAssertStatus(Result.FAILURE, p); + jenkins.assertLogContains("Scripts not permitted to use staticMethod WorkflowScript $getCallSiteArray", b); + p.setDefinition(new CpsFlowDefinition("class Test { }; new Test().metaClass", true)); + b = jenkins.buildAndAssertStatus(Result.FAILURE, p); + jenkins.assertLogContains("Scripts not permitted to use method groovy.lang.GroovyObject getMetaClass", b); + p.setDefinition(new CpsFlowDefinition("class Test { }; new Test().@metaClass", true)); + b = jenkins.buildAndAssertStatus(Result.FAILURE, p); + jenkins.assertLogContains("Scripts not permitted to use field Test metaClass", b); + } + public static class UnsafeParameterStep extends Step implements Serializable { private final UnsafeDescribable val; @DataBoundConstructor diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScriptTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScriptTest.java index 591b815d4..3d94dbd22 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScriptTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScriptTest.java @@ -1,16 +1,20 @@ package org.jenkinsci.plugins.workflow.cps; import hudson.model.Result; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.BiFunction; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.junit.ClassRule; import org.junit.Test; +import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; public class CpsScriptTest { + @ClassRule public static BuildWatcher watcher = new BuildWatcher(); @ClassRule public static JenkinsRule r = new JenkinsRule(); /** @@ -50,4 +54,34 @@ public void evaluateShallSandbox() throws Exception { r.buildAndAssertSuccess(p); } + @Issue("SECURITY-2428") + @Test public void blockImplicitCastingInEvaluate() throws Exception { + AtomicInteger counter = new AtomicInteger(); + BiFunction embeddedScript = (decl, main) -> "" + + "class Test" + counter.incrementAndGet() + " {\\n" + + " " + decl + "\\n" + + " Object map\\n" + + " @NonCPS public void main(String[] args) { " + main + " }\\n" + + "}\\n"; + WorkflowJob p = r.createProject(WorkflowJob.class); + p.setDefinition(new CpsFlowDefinition( + "list = ['secret.key']\n" + + "map = [:]\n" + + "evaluate('" + embeddedScript.apply("File list", "map.file = list") + "')\n" + + "file = map.file\n" + + "evaluate('" + embeddedScript.apply("String[] file", "map.lines = file") + "')\n" + + "for (String line in map.lines) { echo(line) }\n", true)); + WorkflowRun b = r.buildAndAssertStatus(Result.FAILURE, p); + r.assertLogContains("Scripts not permitted to use new java.io.File java.lang.String", b); + } + + @Test public void blockRun() throws Exception { + WorkflowJob p = r.createProject(WorkflowJob.class); + p.setDefinition(new CpsFlowDefinition("run(null, ['test'] as String[])\n", true)); + WorkflowRun b = r.buildAndAssertStatus(Result.FAILURE, p); + // The existence of CpsScript.run leads me to believe that it was intended to be allowed by CpsWhitelist, but + // that is not currently the case, and I see no reason to start allowing it at this point. + r.assertLogContains("Scripts not permitted to use method groovy.lang.Script run java.io.File java.lang.String[]", b); + } + } diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorServiceTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorServiceTest.java index 44f4bff02..ef089e539 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorServiceTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorServiceTest.java @@ -204,4 +204,12 @@ public class CpsVmExecutorServiceTest { r.assertLogNotContains(CpsVmExecutorService.mismatchMessage("java.util.LinkedHashMap", "action", "org.jenkinsci.plugins.workflow.cps.CpsClosure2", "call"), b); } + @Test public void wrongCatcherAsBoolean() throws Exception { + p.setDefinition(new CpsFlowDefinition("class C { def asBoolean() { 'never used' } }; if (new C()) { println('casted') } else { println('see what') }", true)); + WorkflowRun b = r.buildAndAssertStatus(Result.FAILURE, p); + r.assertLogContains(CpsVmExecutorService.mismatchMessage("org.codehaus.groovy.runtime.ScriptBytecodeAdapter", "castToType", "C", "asBoolean"), b); + r.assertLogContains("java.lang.IllegalStateException: C.asBoolean must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/", b); + r.assertLogNotContains("see what", b); + } + } From 2c6a59fec6ebb467693586d102bd87dcccb9c82f Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 17 Oct 2022 10:20:59 -0400 Subject: [PATCH 728/932] Robustness of `CpsFlowExecution.getNode` --- .../plugins/workflow/cps/CpsFlowExecution.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 73af9a206..45597ea28 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -1200,6 +1200,9 @@ public void onFailure(Throwable t) { @Override public FlowNode getNode(String id) throws IOException { + if (storage == null) { + throw new IOException("storage not yet loaded"); + } return storage.getNode(id); } @@ -1211,11 +1214,19 @@ public Result getResult() { return result; } + @Override public List loadActions(FlowNode node) throws IOException { + if (storage == null) { + throw new IOException("storage not yet loaded"); + } return storage.loadActions(node); } + @Override public void saveActions(FlowNode node, List actions) throws IOException { + if (storage == null) { + throw new IOException("storage not yet loaded"); + } storage.saveActions(node, actions); } From 20a2c5b46769ffd523b5a89a0dc184715eef6a1c Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 17 Oct 2022 22:50:33 -0400 Subject: [PATCH 729/932] Add `CODEOWNERS` (#595) --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..d6a36fe59 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @jenkinsci/workflow-cps-plugin-developers From 9849734ca2e71fe9a911f431f1f14698c1427017 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 19 Oct 2022 12:25:26 -0400 Subject: [PATCH 730/932] Delete unused com.cloudbees.groovy.cps.green package --- .../com/cloudbees/groovy/cps/green/Cond.java | 27 --- .../groovy/cps/green/GreenThread.java | 198 ------------------ .../groovy/cps/green/GreenThreadState.java | 152 -------------- .../groovy/cps/green/GreenWorld.java | 153 -------------- .../cloudbees/groovy/cps/green/Monitor.java | 25 --- .../groovy/cps/green/ThreadTask.java | 33 --- .../groovy/cps/green/package-info.java | 6 - .../groovy/cps/AbstractGroovyCpsTest.groovy | 3 +- .../groovy/cps/green/GreenThreadTest.groovy | 24 --- 9 files changed, 1 insertion(+), 620 deletions(-) delete mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/green/Cond.java delete mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java delete mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java delete mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java delete mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/green/Monitor.java delete mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/green/ThreadTask.java delete mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/green/package-info.java delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/green/Cond.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/Cond.java deleted file mode 100644 index cd1cec6a9..000000000 --- a/lib/src/main/java/com/cloudbees/groovy/cps/green/Cond.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cloudbees.groovy.cps.green; - -/** - * Condition that blocks {@link GreenThreadState} from running. - * - * The target object of the monitor is kept in {@link GreenThreadState#wait} - * - * @author Kohsuke Kawaguchi - */ -enum Cond { - /** - * Trying to acquire a monitor. - * Equivalent of monitor_enter JVM bytecode. - */ - MONITOR_ENTER, - /** - * Temporarily released a monitor and waiting to be notified. - * Equivalent of {@link Object#wait()} - */ - WAIT, - /** - * The thread was notified after waiting, and trying to reacquire a monitor. - * - * Unlike {@link #MONITOR_ENTER}, when a lock is acquired this will not add a new {@link Monitor}. - */ - NOTIFIED -} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java deleted file mode 100644 index 25eb003ee..000000000 --- a/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThread.java +++ /dev/null @@ -1,198 +0,0 @@ -package com.cloudbees.groovy.cps.green; - -import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.Continuable; -import com.cloudbees.groovy.cps.impl.ConstantBlock; -import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; -import com.cloudbees.groovy.cps.Outcome; -import com.cloudbees.groovy.cps.impl.ThrowBlock; - -/** - * Represents a green thread. - * - * @author Kohsuke Kawaguchi - */ -public abstract class GreenThread implements Runnable { - public GreenThread() { - } - - /** - * Creates a new green thread that executes the given closure. - */ - public void start() { - Block b; - try { - run(); - - // closure had run synchronously. - b = Block.NOOP; - } catch (CpsCallableInvocation inv) { - // this will create a thread, and resume with the newly created thread - b = inv.asBlock(); - } catch (Throwable t) { - // closure had run synchronously and failed - b = new ThrowBlock(new ConstantBlock(t)); - } - - final Block bb = b; - invoke(new ThreadTask() { - public Result eval(GreenWorld w) { - w = w.withNewThread(new GreenThreadState(GreenThread.this,bb)); - return new Result(w, new Outcome(GreenThread.this,null), false); - } - }); - - // thus the code will never reach here - throw new AssertionError(); - } - - /** - * Executes the task and make its result available back to the caller. - * - * Bogus return type is just for a convenience - */ - private static void invoke(ThreadTask task) { - Continuable.suspend(task); - - // the code will never reach here - throw new AssertionError(); - } - - private GreenThreadState stateAt(GreenWorld d) { - return d.resolveThreadState(this); - } - - public boolean isAlive() { - invoke(new ThreadTask() { - public Result eval(GreenWorld w) { - return new Result(w, new Outcome(!stateAt(w).isDead(),null), false); - } - }); - throw new AssertionError(); - } - -// public boolean isDead() { -// return invoke(new ThreadTask() { -// public Boolean eval(GreenWorld w) { -// return stateAt(w).isDead(); -// } -// }); -// } - -// // TODO: this is not very useful because it doesn't block for the completion -// public Object getResult() throws InvocationTargetException { -// Continuable.suspend(new ThreadTask() { -// public Object eval(GreenWorld w) throws Throwable { -// return w.resolveThreadState(id).getResult().replay(); -// } -// }); -// -// // the code will never reach here -// throw new AssertionError(); -// } - - public static GreenThread currentThread() { - invoke(new ThreadTask() { - public Result eval(GreenWorld w) { - return new Result(w, new Outcome(w.currentThread().g,null), false); - } - }); - throw new AssertionError(); - } - - public static void monitorEnter(final Object o) { - invoke(new ThreadTask() { - public Result eval(GreenWorld w) { - return new Result(trans(w),null,false); - } - public GreenWorld trans(GreenWorld d) { - GreenThreadState cur = d.currentThread(); - for (GreenThreadState t : d.threads) { - if (t!=cur && t.hasMonitor(o)) { - // someone else has lock, so we need to wait - return d.with(cur.withCond(Cond.MONITOR_ENTER, o)); - } - } - // no one else has a lock, so we acquire the lock and move on - return d.with(cur.pushMonitor(o)); - } - }); - throw new AssertionError(); - } - - public static void monitorLeave() { - invoke(new ThreadTask() { - public Result eval(GreenWorld w) { - GreenThreadState cur = w.currentThread(); - final Object o = cur.monitor.o; - - // the current thread will release the monitor. - cur=cur.popMonitor(); - w = w.with(cur); - - if (!cur.hasMonitor(o)) { - // this thread has fully released a monitor. - // if another thread is waiting for this monitor, he gets one right away - OUTER: - for (GreenThreadState t : w.threads) { - if (t.wait==o) { - switch(t.cond) { - case MONITOR_ENTER: - // acquire a new monitor - w = w.with(t.withCond(null,null).pushMonitor(o)); - break OUTER; - case NOTIFIED: - // reacquire a monitor - w = w.with(t.withCond(null,null)); - break OUTER; - } - } - } - } - - return new Result(w,null,false); - } - }); - throw new AssertionError(); - } - - public static void wait(final Object o) { - invoke(new ThreadTask() { - public Result eval(GreenWorld w) { - GreenThreadState cur = w.currentThread(); - - if (!cur.hasMonitor(o)) - throw new IllegalStateException("Thread doesn't have a lock of "+o); - - // wait for the notification to arrive - w = w.with(cur.withCond(Cond.WAIT, o)); - - return new Result(w,null,false); - } - }); - throw new AssertionError(); - } - - public static void notify(final Object o, final boolean all) { - invoke(new ThreadTask() { - public Result eval(GreenWorld w) { - GreenThreadState cur = w.currentThread(); - - if (!cur.hasMonitor(o)) - throw new IllegalStateException("Thread doesn't have a lock of "+o); - - // let other waiting threads come back to life - for (GreenThreadState t : w.threads) { - if (t.wait==o) { - w = w.with(t.withCond(Cond.NOTIFIED, o)); - if (!all) - break; - } - } - - return new Result(w,null,false); - } - }); - throw new AssertionError(); - } -} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java deleted file mode 100644 index 926be4c3e..000000000 --- a/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenThreadState.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.cloudbees.groovy.cps.green; - -import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.Continuable; -import com.cloudbees.groovy.cps.Continuation; -import com.cloudbees.groovy.cps.Envs; -import com.cloudbees.groovy.cps.Next; -import com.cloudbees.groovy.cps.Outcome; - -import java.io.Serializable; - -import static com.cloudbees.groovy.cps.Continuation.*; - -/** - * Current state of a green thread. - * - *

- * When we fork {@link Continuable}, we want to fork all threads, so this object is immutable, - * and every time a thread moves forward, a new object gets created. - * - * @author Kohsuke Kawaguchi - */ -final class GreenThreadState implements Serializable { - /** - * Remaining computation to execute on this thread. - * The equivalent of a program counter. - */ - final Next n; - - /** - * Unique ID among other {@link GreenThreadState}s in {@link GreenWorld} - */ - final GreenThread g; - - final Monitor monitor; - - /** - * Meaning of the {@link #wait} field. - */ - final Cond cond; - - /** - * Monitor that's causing us to block. - */ - final Object wait; - - private GreenThreadState(GreenThread g, Next n, Monitor monitor, Cond cond, Object wait) { - this.g = g; - this.n = n; - this.monitor = monitor; - this.cond = cond; - this.wait = wait; - - // either both must be null or both must be non-null - assert (cond==null) == (wait==null); - } - - private GreenThreadState(GreenThread g, Next n) { - this(g,n,null,null,null); - } - - /** - * Creates a brand-new thread that evaluates 'b'. - */ - GreenThreadState(GreenThread g, Block b) { - // TODO: allow the caller to pass a value - this(g,new Next(b, Envs.empty(), HALT)); - } - - /** - * Creates a {@link GreenThreadState} that's already dead. - */ - GreenThreadState(GreenThread g, Outcome v) { - this(g,new Next(null,HALT,v)); - } - -// methods for changing one state at a time - GreenThreadState with(Next n) { - return new GreenThreadState(g,n,monitor,cond,wait); - } - - GreenThreadState with(Monitor monitor) { - return new GreenThreadState(g,n,monitor,cond,wait); - } - - GreenThreadState withCond(Cond cond, Object o) { - return new GreenThreadState(g,n,monitor,cond,o); - } - - GreenThreadState pushMonitor(Object o) { - return with(new Monitor(monitor,o)); - } - - GreenThreadState popMonitor() { - return with(monitor.next); - } - - - /** - * Can this thread be scheduled for execution, or does it need to sleep (relative to other green threads)? - * - * Note that if a whole {@link Continuable} is suspended, the thread is considered still runnable. - */ - boolean isRunnable() { - return cond==null; - } - - /** - * Does this thread still have something to execute? - * If it is dead, n.yield contains the outcome of the thread. - */ - public boolean isDead() { - return n.k== Continuation.HALT && n.e==null; - } - - public Outcome getResult() { - if (isDead()) return n.yield; - else throw new IllegalStateException("Green thread is still running"); - } - - /** - * Runs one step in this thread and returns a new state. - */ - /*package*/ GreenThreadState tick(Object o) { - return resumeFrom(new Outcome(o,null)); - } - - /*package*/ GreenThreadState resumeFrom(Outcome o) { - return with(o.resumeFrom(n.e, n.k)); - } - - /*package*/ GreenThreadState step() { - return with(n.step()); - } - - /** - * Does this thread already own the monitor of 'o'? - */ - boolean hasMonitor(Object o) { - if (wait==o && (cond==Cond.WAIT || cond==Cond.NOTIFIED)) { - // this thread owns the monitor but it is released temporarily - return false; - } - - for (Monitor m = monitor; m!=null; m=m.next) - if (m.o==o) - return true; - return false; - } - - private static final long serialVersionUID = 1L; -} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java deleted file mode 100644 index 208cc9cf8..000000000 --- a/lib/src/main/java/com/cloudbees/groovy/cps/green/GreenWorld.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.cloudbees.groovy.cps.green; - -import com.cloudbees.groovy.cps.Block; -import com.cloudbees.groovy.cps.Continuable; -import com.cloudbees.groovy.cps.Continuation; -import com.cloudbees.groovy.cps.Env; -import com.cloudbees.groovy.cps.Next; -import com.cloudbees.groovy.cps.Outcome; -import com.cloudbees.groovy.cps.impl.ProxyEnv; - -import java.io.Serializable; - -/** - * Immutable representation of the combined states of all {@link GreenThreadState}s. - * - * The whole thing has to be immutable because cloning {@link Continuable} is just shallow-copying its variables. - * - * @author Kohsuke Kawaguchi - */ -class GreenWorld implements Serializable { - final GreenThreadState[] threads; - private final int cur; - private final Env e; - - public GreenWorld(int cur, GreenThreadState... threads) { - this.threads = threads; - this.cur = cur; - this.e = new ProxyEnv(currentThread().n.e); - } - - GreenThreadState currentThread() { - return threads[cur]; - } - - GreenWorld withNewThread(GreenThreadState s) { - GreenThreadState[] a = new GreenThreadState[threads.length+1]; - System.arraycopy(threads,0,a,0, threads.length); - a[threads.length] = s; - return new GreenWorld(cur,a); - } - - /** - * Updates the thread state. If the thread is dead, it'll be removed. - */ - GreenWorld with(GreenThreadState s) { - int idx = -1; - for (int i = 0; i < threads.length; i++) { - if (threads[i].g==s.g) { - threads[i] = s; - idx = i; - break; - } - } - if (idx==-1) - throw new IllegalStateException("No such thread: "+s.g); - - GreenWorld d; - if (s.isDead()) { - GreenThreadState[] a = new GreenThreadState[threads.length-1]; - System.arraycopy(threads,0,a,0,idx); - System.arraycopy(threads,idx+1,a,cur, threads.length-idx); - - d = new GreenWorld(idx { - /** - * Next state of the world - */ - final GreenWorld w; - /** - * value to be yielded or returned from suspension. - */ - final Outcome value; - /** - * Should {@link #value} be yielded to the caller of {@link Continuable#run(Object)} (true) - * or should we immediately return from {@link Continuable#suspend(Object)}? (false) - */ - final boolean suspend; - - Result(GreenWorld w, Outcome value, boolean suspend) { - this.w = w; - this.value = value; - this.suspend = suspend; - } -} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/green/package-info.java b/lib/src/main/java/com/cloudbees/groovy/cps/green/package-info.java deleted file mode 100644 index 40b50497b..000000000 --- a/lib/src/main/java/com/cloudbees/groovy/cps/green/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Green thread support. - * - * Threads will cooperatively context switch among themselves. - */ -package com.cloudbees.groovy.cps.green; diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy index 252f1547a..e54fecaf4 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy @@ -1,6 +1,5 @@ package com.cloudbees.groovy.cps -import com.cloudbees.groovy.cps.green.GreenThread import com.cloudbees.groovy.cps.impl.CpsCallableInvocation import org.codehaus.groovy.control.CompilerConfiguration import org.codehaus.groovy.control.customizers.ImportCustomizer @@ -28,7 +27,7 @@ abstract class AbstractGroovyCpsTest extends Assert { @Before void setUp() { def imports = new ImportCustomizer() - .addStarImports([CpsTransformerTest.class, GreenThread.class, getClass()]*.package*.name as String[]) + .addStarImports([CpsTransformerTest.class, getClass()]*.package*.name as String[]) def cc = new CompilerConfiguration() cc.addCompilationCustomizers(imports) diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy deleted file mode 100644 index fe30e587a..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/green/GreenThreadTest.groovy +++ /dev/null @@ -1,24 +0,0 @@ -package com.cloudbees.groovy.cps.green - -import com.cloudbees.groovy.cps.AbstractGroovyCpsTest -import groovy.transform.NotYetImplemented -import org.junit.Test - -/** - * - * - * @author Kohsuke Kawaguchi - */ -class GreenThreadTest extends AbstractGroovyCpsTest { - @Test @NotYetImplemented // TODO: still a work in progress - void thread() { - assert evalCPS(""" - GreenWorld.startThread { - int x=0; - for (int i=0; i<100; i++) - x+=i; - return x; - } - """)==[foo:"hello",bar:6,zot:null]; - } -} From 6420ea566dd5c2e8f046693d4cbe2186ee2769bf Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 19 Oct 2022 12:26:47 -0400 Subject: [PATCH 731/932] Delete unused and broken Continuable.fork method --- .../com/cloudbees/groovy/cps/Continuable.java | 12 ------- .../groovy/cps/ContinuableTest.groovy | 31 ------------------- 2 files changed, 43 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 92a4b71ff..5f1f5ecbe 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -117,18 +117,6 @@ private static Next wrap(Script s, Env env, Continuation k) { } } - /** - * Creates a shallow copy of {@link Continuable}. The copy shares - * all the local variables of the original {@link Continuable}, and - * point to the exact same point of the program. - * - * @deprecated Shallow clones break in various cases, see {@code ContinuableTest.fork}. - */ - @Deprecated - public Continuable fork() { - return new Continuable(this); - } - /** * Prints the stack trace into the given writer, much like {@link Throwable#printStackTrace(PrintWriter)} */ diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 0f1dc55a7..3f59c1327 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -30,37 +30,6 @@ class ContinuableTest extends AbstractGroovyCpsTest { assert !c.isResumable() : "We've run the program till the end, so it's no longer resumable" } - @Test - void fork() { - def s = csh.parse("""\n\ - def addOne(def x) { x + 1 }; - int x = 1; - x = addOne(Continuable.suspend(x+1)) - return x+1; - """) - - def c = new Continuable(s); - assert c.isResumable() - - def v = c.run(null); - assert v==2 : "Continuable.suspend(x+1) returns the control back to us"; - - def c2 = c.fork() - - assert c.isResumable() : "Continuable is resumable because it has 'return x+1' to execute." - assert c.run(2)==4 : "We resume continuable, then the control comes back from the return statement" - assert !c.isResumable() : "We've run the program till the end, so it's no longer resumable" - - assert c2.isResumable() : "Continuable is resumable because it has 'return x+1' to execute." - try { - assert c2.run(2)==4 : "We resume continuable, then the control comes back from the return statement" - fail("should have thrown exception"); - } catch (ArrayIndexOutOfBoundsException e) { - // Since c2 is a shallow clone, the FunctionCallBlock for addOne(Continuable.suspend(x+1)) has already - // evaluated its arguments, so when we try to run it again, we get an error. - } - } - @Test void serializeComplexContinuable() { def s = csh.parse(""" From 15e728eae40ee9442f089a95af18d8781c0d0b05 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 19 Oct 2022 12:28:05 -0400 Subject: [PATCH 732/932] Remove unused Continuable.superInterrupt method --- .../com/cloudbees/groovy/cps/Continuable.java | 27 ----------------- .../groovy/cps/ContinuableTest.groovy | 29 ------------------- 2 files changed, 56 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 5f1f5ecbe..21a755699 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -46,8 +46,6 @@ public class Continuable implements Serializable { */ private Continuation k; - private volatile Throwable interrupt; - public Continuable(Continuable src) { this.e = src.e; this.k = src.k; @@ -157,11 +155,6 @@ public Outcome call() { Next n = cn.resumeFrom(e,k); while(n.yield==null) { - if (interrupt!=null) { - // TODO: correctly reporting a source location requires every block to have the line number - n = new Next(new ThrowBlock(UNKNOWN, new ConstantBlock(interrupt), true),n.e,n.k); - interrupt = null; - } n = n.step(); } @@ -173,26 +166,6 @@ public Outcome call() { }); } - /** - * Sets a super-interrupt. - * - *

- * A super interrupt works like {@link Thread#interrupt()} that throws - * {@link InterruptedException}. It lets other threads interrupt the execution - * of {@link Continuable} by making it throw an exception. - * - *

- * Unlike {@link InterruptedException}, which only gets thrown in specific - * known locations, such as {@link Object#wait()}, this "super interruption" - * gets thrown at any point in the execution, even during {@code while(true) ;} kind of loop. - * - *

- * The - */ - public void superInterrupt(Throwable t) { - this.interrupt = t; - } - /** * Checks if this {@link Continuable} is pointing at the end of the program which cannot * be resumed. diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy index 3f59c1327..824193695 100644 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ b/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy @@ -267,33 +267,4 @@ Script1.run(Script1.groovy:17) assert r == 1+2 +16+32 +64+128; } - - @Test - public void superInterrupt() { - def s = csh.parse(""" - def infiniteLoop() { - while (true) - ; // infinite loop - } - infiniteLoop(); // line 6 - """); - - def ex = new RuntimeException("Yippie!"); - - def c= new Continuable(s); - new Thread({ -> - Thread.sleep(100); - c.superInterrupt(ex); - }).start(); - - def o = c.run0(new Outcome(null,null)); - assert o.abnormal==ex; - - StringWriter sw = new StringWriter(); - o.abnormal.printStackTrace(new PrintWriter(sw)); - // TODO: right now we cannot capture the exact location of the execution that the exception was thrown from. - // see Continuable.run0 for details -// assert sw.toString().contains("Script1.infiniteLoop"); - assert sw.toString().contains("Script1.run(Script1.groovy:6)"); - } } From ca79d4068cf1df6f6fbe79b77e1d82576431115f Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 19 Oct 2022 12:31:48 -0400 Subject: [PATCH 733/932] Remove unused Continuable.jump and Continuable.prepend methods and ConcatenatedContinuation class --- .../groovy/cps/ConcatenatedContinuation.java | 72 ------------------- .../com/cloudbees/groovy/cps/Continuable.java | 58 --------------- 2 files changed, 130 deletions(-) delete mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java b/lib/src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java deleted file mode 100644 index f2532783a..000000000 --- a/lib/src/main/java/com/cloudbees/groovy/cps/ConcatenatedContinuation.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.cloudbees.groovy.cps; - -import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; -import com.cloudbees.groovy.cps.impl.SourceLocation; -import com.google.common.base.Function; -import com.google.common.base.Functions; -import groovy.lang.Script; - -import java.io.Serializable; - -/** - * Combines two {@link Continuation}s into one. - * - * Essentially, take two functions 'first', and 'then', and creates a new function - * - * 

- * concat(x) := then(first(x))
- *
- * - *

- * Note that this is useful but expensive. If you control how the 'first' Continuation - * gets created, you should try to have 'then' incorporated into it during its creation, - * such as {@link Continuable#Continuable(Script, Env, Continuation)} or via - * {@link CpsCallableInvocation#invoke(Env, SourceLocation, Continuation)}. - * - * @author Kohsuke Kawaguchi - */ -public class ConcatenatedContinuation implements Continuation { - private final Continuation first; - private final Function f; - private final Continuable then; - - public ConcatenatedContinuation(Continuation first, Function mapper, Continuable then) { - this.first = first; - this.f = mapper; - this.then = then; - } - - public ConcatenatedContinuation(Continuation first, Continuable then) { - this(first, Idem.INSTANCE, then); - } - - public Next receive(Object o) { - Next n = first.receive(o); - - ConcatenatedContinuation concat = new ConcatenatedContinuation(n.k, f, then); - - if (n.yield!=null) { - if (n.k==Continuation.HALT) { - // the first part is done - Outcome out = f.apply(n.yield); - return out.resumeFrom(then); - } - return new Next(n.e, concat, n.yield); - } else return new Next(n.f, n.e, concat); - } - - private static final long serialVersionUID = 1L; - - private static final class Idem implements Function, Serializable { - public T apply(T input) { - return input; - } - - private Object readResolve() { - return INSTANCE; - } - - private static final long serialVersionUID = 1L; - private static final Idem INSTANCE = new Idem(); - } -} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java index 21a755699..a1d006966 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -205,64 +205,6 @@ public List getStackTrace() { return r; } - /** - * Ignore whatever that we've been doing, and jumps the execution to the given continuation. - * - *

- * Aside from the obvious use case of completely overwriting the state of {@link Continuable}, - * more interesting case is - * - * Sets aside the current continuation aside, schedule the evaluation of the given block in the given environment, - * then when done pass the result to the given {@link Continuation}. - * - * A common pattern is for that {@link Continuation} to then resume executing the current execution that was set - * aside. - * - * 

-     * Continuable c = ...;
-     *
-     * final Continuable pausePoint = new Continuable(c); // set aside what we were doing
-     * c.jump(bodyOfNewThread,env,new Continuation() {
-     *      public Next receive(Object o) {
-     *          // o is the result of evaluating bodyOfNewThread (the failure will go to the handler specified by 'env')
-     *          doSomethingWith(c);
-     *
-     *          if (...) {// maybe you want to yield this value, then resume from the pause point?
-     *              return Next.yield0(new Outcome(o,null),pausePoint);
-     *          }
-     *          if (...) {// maybe you want to keep going by immediately resuming from the pause point with 'o'
-     *              return Next.go0(new Outcome(o,null),pausePoint);
-     *          }
-     *
-     *          // maybe you want to halt the execution by returning
-     *          return Next.terminate0(new Outcome(o,null));
-     *      }
-     * });
-     *
-     * c.run(...); // this will start executing from 'bodyOfNewThread'
-     *
-     *
- */ - public void jump(Continuable c) { - this.e = c.e; - this.k = c.k; - } - - /** - * Set aside what we are executing, and instead resume the next execution from the point - * the given 'Continuable' points to. - * - * But when that's done, instead of completing the computation, come back to executing what we set aside. - */ - public void prepend(Continuable c, Function mapper) { - // set aside where we are - Continuable here = new Continuable(this); - - // run 'c', then when it's done, come back to 'here' - this.e = c.e; - this.k = new ConcatenatedContinuation(c.k, mapper, here); - } - /*package*/ Env getE() { return e; } From e9349a8ad13e5d945f61ae9a657c5da96e881d81 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 21 Oct 2022 12:15:48 -0400 Subject: [PATCH 734/932] Also be more robust in `getFirstHead` --- .../plugins/workflow/cps/CpsFlowExecution.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 45597ea28..40473e4c2 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -1273,8 +1273,8 @@ synchronized void onProgramEnd(Outcome outcome) { // shrink everything into a single new head try { - if (heads != null) { - FlowHead first = getFirstHead(); + FlowHead first = getFirstHead(); + if (first != null) { first.setNewHead(head); done = true; // After setting the final head heads.clear(); @@ -1500,9 +1500,15 @@ private static void cleanUpObjectStreamClassCaches(@NonNull Class clazz) thro } } - synchronized FlowHead getFirstHead() { - assert !heads.isEmpty(); - return heads.firstEntry().getValue(); + synchronized @CheckForNull FlowHead getFirstHead() { + if (heads == null) { + return null; + } + Entry firstEntry = heads.firstEntry(); + if (firstEntry == null) { + return null; + } + return firstEntry.getValue(); } List getListenersToRun() { From ef4a96867ab1bcae6570b49e72ce7a9978c13ccb Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Fri, 21 Oct 2022 18:19:35 -0400 Subject: [PATCH 735/932] Migrate all Groovy test source files to Java --- .../groovy/cps/AbstractGroovyCpsTest.groovy | 78 -- .../groovy/cps/ContinuableTest.groovy | 270 ----- .../cps/CpsDefaultGroovyMethodsTest.groovy | 353 ------ .../cps/CpsStringGroovyMethodsTest.groovy | 101 -- .../groovy/cps/CpsTransformerTest.groovy | 1059 ----------------- .../cloudbees/groovy/cps/SafepointTest.groovy | 65 - .../cps/impl/FunctionCallBlockTest.groovy | 73 -- .../groovy/cps/impl/MapBlockTest.groovy | 24 - .../cps/impl/PropertyAccessBlockTest.groovy | 51 - .../groovy/cps/impl/SwitchBlockTest.groovy | 279 ----- .../groovy/cps/impl/ThrowBlockTest.groovy | 45 - .../groovy/cps/impl/TryCatchBlockTest.groovy | 224 ---- .../cps/sandbox/SandboxInvokerTest.groovy | 503 -------- .../groovy/cps/AbstractGroovyCpsTest.java | 106 ++ .../cloudbees/groovy/cps/ContinuableTest.java | 261 ++++ .../cps/CpsDefaultGroovyMethodsTest.java | 374 ++++++ .../cps/CpsStringGroovyMethodsTest.java | 68 ++ .../groovy/cps/CpsTransformer2Test.java | 2 +- .../groovy/cps/CpsTransformerTest.java | 960 +++++++++++++++ .../cloudbees/groovy/cps/SafepointTest.java | 53 + .../cps/impl/FunctionCallBlockTest.java | 77 ++ .../groovy/cps/impl/MapBlockTest.java | 25 + .../cps/impl/PropertyAccessBlockTest.java | 49 + .../groovy/cps/impl/SwitchBlockTest.java | 265 +++++ .../groovy/cps/impl/ThrowBlockTest.java | 50 + .../groovy/cps/impl/TryCatchBlockTest.java | 211 ++++ .../cps/sandbox/SandboxInvoker2Test.java | 14 +- .../cps/sandbox/SandboxInvokerTest.java | 478 ++++++++ lib/src/test/java/foo.groovy | 37 - 29 files changed, 2987 insertions(+), 3168 deletions(-) delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/SafepointTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy delete mode 100644 lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/ContinuableTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/SafepointTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/impl/MapBlockTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/impl/SwitchBlockTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java create mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java delete mode 100644 lib/src/test/java/foo.groovy diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy deleted file mode 100644 index e54fecaf4..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.groovy +++ /dev/null @@ -1,78 +0,0 @@ -package com.cloudbees.groovy.cps - -import com.cloudbees.groovy.cps.impl.CpsCallableInvocation -import org.codehaus.groovy.control.CompilerConfiguration -import org.codehaus.groovy.control.customizers.ImportCustomizer -import org.junit.Assert -import org.junit.Before - -/** - * - * - * @author Kohsuke Kawaguchi - */ -abstract class AbstractGroovyCpsTest extends Assert { - /** - * CPS-transforming shelll - */ - GroovyShell csh; - - /** - * Default groovy shell - */ - GroovyShell sh; - - Binding binding = new Binding() - - @Before - void setUp() { - def imports = new ImportCustomizer() - .addStarImports([CpsTransformerTest.class, getClass()]*.package*.name as String[]) - - def cc = new CompilerConfiguration() - cc.addCompilationCustomizers(imports) - cc.addCompilationCustomizers(createCpsTransformer()) - cc.scriptBaseClass = SerializableScript.class.name - csh = new GroovyShell(binding,cc); - - cc = new CompilerConfiguration() - cc.addCompilationCustomizers(imports) - sh = new GroovyShell(binding,cc); - } - - protected CpsTransformer createCpsTransformer() { - return new CpsTransformer() - } - - Object evalCPS(String script) { - Object resultInCps = evalCPSonly(script) - assert resultInCps==sh.evaluate(script); // make sure that regular non-CPS execution reports the same result - return resultInCps; - } - - Object evalCPSonly(String script) { - return parseCps(script).invoke(null, null, Continuation.HALT).run(10000).replay() - } - - CpsCallableInvocation parseCps(String script) { - Script s = csh.parse(script) - try { - s.run(); - fail "Expecting CPS transformation" - } catch (CpsCallableInvocation inv) { - return inv; - } - } - - public T roundtripSerialization(T cx) { - def baos = new ByteArrayOutputStream() - - new ObjectOutputStream(baos).writeObject(cx); - - def ois = new ObjectInputStreamWithLoader( - new ByteArrayInputStream(baos.toByteArray()), - csh.classLoader) - - return ois.readObject() - } -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy deleted file mode 100644 index 824193695..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/ContinuableTest.groovy +++ /dev/null @@ -1,270 +0,0 @@ -package com.cloudbees.groovy.cps - -import org.junit.Test - -import java.lang.reflect.InvocationTargetException - -/** - * - * - * @author Kohsuke Kawaguchi - */ -class ContinuableTest extends AbstractGroovyCpsTest { - @Test - void resumeAndSuspend() { - def s = csh.parse(""" - int x = 1; - x = Continuable.suspend(x+1) - return x+1; - """) - - def c = new Continuable(s); - assert c.isResumable() - - def v = c.run(null); - assert v==2 : "Continuable.suspend(x+1) returns the control back to us"; - - assert c.isResumable() : "Continuable is resumable because it has 'return x+1' to execute." - assert c.run(3)==4 : "We resume continuable, then the control comes back from the return statement" - - assert !c.isResumable() : "We've run the program till the end, so it's no longer resumable" - } - - @Test - void serializeComplexContinuable() { - def s = csh.parse(""" - def foo(int x) { - return Continuable.suspend(x); - } - - def plus3(int x) { - return x+3; - } - - try { - for (int x=0; x<1; x++) { - while (true) { - y = plus3(foo(5)) - break; - } - } - } catch (ClassCastException e) { - y = e; - } - return y; - """) - - def c = new Continuable(s); - assert c.run(null)==5 : "suspension within a subroutine"; - - c = roundtripSerialization(c); // at this point there's a fairly non-trivial Continuation, so try to serialize it - - assert c.isResumable() - assert c.run(6)==9; - } - - @Test - void howComeBindingIsSerializable() { - def s = csh.parse(""" - Continuable.suspend(42); - return value; -"""); - s.setProperty("value",15); - def c = new Continuable(s); - assert c.run(null)==42; - - c = roundtripSerialization(c); - - assert c.isResumable() - assert c.run(null)==15; - } - - @Test - void suspend_at_the_end_should_still_count_as_resumable() { - def s = csh.parse(""" - Continuable.suspend(5); - """); - def c = new Continuable(s); - assert c.run(null)==5; - assert c.isResumable() - c.run(null) - assert !c.isResumable() - } - - /** - * Exception not handled in script will be thrown from Continuable.run - */ - @Test - void unhandled_exception() { - def s = csh.parse(""" - throw new ${ContinuableTest.class.name}.HelloException() - """) - def c = new Continuable(s) - try { - c.run(null) - fail("should have thrown exception") - } catch (InvocationTargetException e) { - assert !c.isResumable() - assert e.cause instanceof HelloException - } - } - - public static class HelloException extends Exception {} - - /** - * Object passed to {@link Continuable#suspend(Object)} isn't accessible when Continuable - * resumes, so it shouldn't be a part of the persisted object graph. - */ - @Test - void yieldObjectShouldNotBeInObjectGraph() { - def s = csh.parse(""" - Continuable.suspend(new ContinuableTest.ThisObjectIsNotSerializable()); - """); - def c = new Continuable(s); - def r = c.run(null) - assert r instanceof ThisObjectIsNotSerializable; - - c = roundtripSerialization(c); - - assert c.isResumable() - assert c.run(42)==42; - } - - public static class ThisObjectIsNotSerializable {} - - /** - * Tests {@link Continuable#getStackTrace()}. - */ - @Test - void stackTrace() { - def s = csh.parse(""" - - def x(i,v) { - if (i>0) - y(i-1,v); // line 5 - else - Continuable.suspend(v); // line 7 - } - - def y(i,v) { - if (i>0) - x(i-1,v); // line 12 - else - Continuable.suspend(v); // line 14 - } - - x(5,3); // line 17 - """) - - def c = new Continuable(s); - - // stack trace is empty if it hasn't been started - assert c.stackTrace.isEmpty() - - def v = c.run(null); - assert v==3 - - assert c.stackTrace.join("\n")==""" -Script1.y(Script1.groovy:14) -Script1.x(Script1.groovy:5) -Script1.y(Script1.groovy:12) -Script1.x(Script1.groovy:5) -Script1.y(Script1.groovy:12) -Script1.x(Script1.groovy:5) -Script1.run(Script1.groovy:17) -""".trim() - - c.run(null) - - // stack trace is empty if there's nothing more to execute - assert c.stackTrace.isEmpty() - } - - /** - * Triggers the use of {@link org.codehaus.groovy.ast.expr.StaticMethodCallExpression} - */ - @Test - public void staticMethod1() { - def s = csh.parse("import static java.lang.Class.forName; forName('java.lang.Integer')") - def c = new Continuable(s); - def r = c.run(null) - assert r==Integer.class - } - - /** - * Static method call expression with two arguments - */ - @Test - public void staticMethod2() { - def s = csh.parse("import static java.lang.Integer.toString; toString(31,16)") - def c = new Continuable(s); - def r = c.run(null) - assert r=="1f" - } - - /** - * Static method call expression with no arguments - */ - @Test - public void staticMethod0() { - def s = csh.parse("import static com.cloudbees.groovy.cps.ContinuableTest.StaticMethodHost.methodWithNoArgs; methodWithNoArgs()") - def c = new Continuable(s); - def r = c.run(null) - assert r=="hello" - } - - public static class StaticMethodHost { - public static String methodWithNoArgs() { - return "hello"; - } - } - - /** - * Start running one Continuable, interrupt that and run something else, then come back to it. - * - */ - @Test - public void concatenate() { - def s = csh.parse(""" - def plus2(i) { return i+2; } - - def i=1; - x = Continuable.suspend("pause1"); // this will jump to another script and then come back - return plus2(i+x); - """) - - // let the script run to the suspend point - def c = new Continuable(s); - assert c.run(null)=="pause1"; - - def s2 = csh.parse(""" - return 16+Continuable.suspend("pause2")+32; - """) - - // now create a new Continuable that evaluates s2 first, then come back to where we paused in 'c' - c = new Continuable(s2,null,new Continuation() { - final Continuable pause = c; - @Override - Next receive(Object o) { - // when s2 is done, hand off the value to pause1 to resume execution from there - return Next.go0(new Outcome(o+64,null),pause); - } - }); - - // the point of all this trouble is that once the new 'c' is created, the rest of the code - // doesn't have to know that the new Continuable is a composite of two Continuables. - - - - assert c.run(null)=="pause2"; - - // s2 evaluates, then the result goes back to pause1 after +64 adjustment above - // and the whole thing completes - def r = c.run(128); - - assert !c.isResumable(); // it should have been completed - - assert r == 1+2 +16+32 +64+128; - } - -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy deleted file mode 100644 index f249db51d..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.groovy +++ /dev/null @@ -1,353 +0,0 @@ -package com.cloudbees.groovy.cps - -import org.junit.Test -import org.junit.runner.RunWith -import org.junit.runners.Parameterized - -@RunWith(Parameterized.class) -class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { - private String testName - private String testCode - private Object testResult - - CpsDefaultGroovyMethodsTest(String testName, String testCode, Object testResult) { - this.testName = testName - this.testCode = testCode - this.testResult = testResult - } - - @Parameterized.Parameters(name="{0}") - public static Iterable generateParameters() { - // First element is the name of the test - // Second element is the code to eval - // Third element is expected result - def rawTests = [ - // .any - ["any", "return [0, 1, 2].any { i -> i == 1 }", true], - ["anyMapKV", "return [a: 0, b: 1, c: 2].any { k, v -> v == 1 }", true], - ["anyMapEntry", "return [a: 0, b: 1, c: 2].any { e -> e.value == 1 }", true], - ["anyFalse", "return [0, 1, 2].any { i -> i > 2 }", false], - - // TODO: asType? - - // .collect - ["collectList", "return [1, 2, 3].collect { it * 2 }", [2, 4, 6]], - ["collectListIntoExistingList", "def existing = [2]\n" + - "return [2, 3, 4].collect(existing) { it * 2 }", [2, 4, 6, 8]], - ["collectListIntoExistingSet", "return [2, 3, 4].collect([2] as HashSet) { it * 2 }", - [2, 4, 6, 8] as HashSet], - ["collectSet", "return ([1, 2, 3] as HashSet).collect { it * 2 }", [2, 4, 6]], - ["collectSetIntoExistingList", "def existing = [2]\n" + - "return ([2, 3, 4] as HashSet).collect(existing) { it * 2 }", [2, 4, 6, 8]], - ["collectSetIntoExistingSet", "return ([2, 3, 4] as HashSet).collect([2] as HashSet) { it * 2 }", - [2, 4, 6, 8] as HashSet], - ["collectMapKV", "def m = [a: 1, b: 2, c: 3];\n" + - "return m.collect { k, v -> v }", [1, 2, 3]], - ["collectMapEntry", "def m = [a: 1, b: 2, c: 3];\n" + - "return m.collect { e -> e.value }", [1, 2, 3]], - ["collectMapKVIntoExistingList", "def m = [a: 2, b: 3, c: 4];\n" + - "return m.collect([1]) { k, v -> v }", [1, 2, 3, 4]], - ["collectMapEntryIntoExistingList", "def m = [a: 2, b: 3, c: 4];\n" + - "return m.collect([1]) { e -> e.value }", [1, 2, 3, 4]], - ["collectMapKVIntoExistingSet", "def m = [a: 2, b: 3, c: 4];\n" + - "return m.collect([1] as HashSet) { k, v -> v }", [1, 2, 3, 4] as HashSet], - ["collectMapEntryIntoExistingSet", "def m = [a: 2, b: 3, c: 4];\n" + - "return m.collect([1] as HashSet) { e -> e.value }", [1, 2, 3, 4] as HashSet], - - // .collectEntries - ["collectEntriesKV", "def m = [a: 1, b: 2, c: 3]\n" + - "return m.collectEntries { k, v -> [(k): v * 2] }", [a: 2, b: 4, c: 6]], - ["collectEntriesEntry", "def m = [a: 1, b: 2, c: 3]\n" + - "return m.collectEntries { e -> [(e.key): e.value * 2] }", [a: 2, b: 4, c: 6]], - ["collectEntriesIntoExistingMapKV", "def m = [b: 2, c: 3]\n" + - "return m.collectEntries([a: 2]) { k, v -> [(k): v * 2] }", [a: 2, b: 4, c: 6]], - ["collectEntriesIntoExistingMapEntry", "def m = [b: 2, c: 3]\n" + - "return m.collectEntries([a: 2]) { e -> [(e.key): e.value * 2] }", [a: 2, b: 4, c: 6]], - ["collectEntriesArray", "return ([1, 2, 3] as Integer[]).collectEntries { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]], - ["collectEntriesArrayExistingMap", "return ([2, 3] as Integer[]).collectEntries([1: 2]) { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]], - ["collectEntriesList", "return [1, 2, 3].collectEntries { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]], - ["collectEntriesListExistingMap", "return [2, 3].collectEntries([1: 2]) { i -> [(i): i * 2] }", [1: 2, 2: 4, 3: 6]], - - // .collectMany - ["collectMany", "(0..5).collectMany { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]], - ["collectManyExistingList", "(1..5).collectMany([0,0]) { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]], - ["collectManyArray", "([0, 1, 2, 3, 4, 5] as Integer[]).collectMany { [it, 2*it ]}", [0,0,1,2,2,4,3,6,4,8,5,10]], - ["collectManyMapKV", "[a:0,b:1,c:2].collectMany { k,v -> [v, 2*v ]}", [0,0,1,2,2,4]], - ["collectManyMapKVExistingList", "[b:1,c:2].collectMany([0,0]) { k,v -> [v, 2*v ]}", [0,0,1,2,2,4]], - ["collectManyMapEntry", "[a:0,b:1,c:2].collectMany { e -> [e.value, 2*e.value ]}", [0,0,1,2,2,4]], - ["collectManyMapEntryExistingList", "[b:1,c:2].collectMany([0,0]) { e -> [e.value, 2*e.value ]}", [0,0,1,2,2,4]], - - // .collectNested - ["collectNested", "[[0,1,2],[3,4]].collectNested { i -> i * 2 }", [[0,2,4],[6,8]]], - ["collectNestedExistingList", "[[0,1,2],[3,4]].collectNested(['test']) { i -> i * 2 }", ['test', [0,2,4],[6,8]]], - - // .combinations - // TODO { x, y -> x*y } does not work as CpsTransformer apparently does not grok how to deconstruct array arguments - ["combinations", "[[2, 3],[4, 5, 6]].combinations { xy -> xy[0] * xy[1] }", [8, 12, 10, 15, 12, 18]], - - // .count - ["countList", "[1, 2, 3].count { i -> i > 1 }", 2], - ["countArray", "([1, 2, 3] as Integer[]).count { i -> i > 1 }", 2], - ["countMapKV", "[a: 1, b: 2, c: 3].count { k, v -> v > 1 }", 2], - ["countMapEntry", "[a: 1, b: 2, c: 3].count { e -> e.value > 1 }", 2], - - // .countBy - ["countByList", "['aaa', 'bbb', 'cc'].countBy { i -> i.length() }", [3:2, 2:1]], - ["countByArray", "(['aaa', 'bbb', 'cc'] as String[]).countBy { i -> i.length() }", [3:2, 2:1]], - ["countByMapKV", "[a: 'aaa', b: 'bbb', c: 'cc'].countBy { k, v -> v.length() }", [3:2, 2:1]], - ["countByMapEntry", "[a: 'aaa', b: 'bbb', c: 'cc'].countBy { e -> e.value.length() }", [3:2, 2:1]], - - // TODO: downto - - /* TODO: Waiting for dropWhile support - // .dropWhile - ["dropWhileList", "[1, 2, 3].dropWhile { i -> i < 2 }", [2, 3]], - ["dropWhileSet", "([1, 2, 3] as HashSet).dropWhile { i -> i < 2 }", [2, 3] as HashSet], - ["dropWhileSortedSet", "([1, 2, 3] as TreeSet).dropWhile { i -> i < 2 }", [2, 3] as TreeSet], - ["dropWhileMapKV", "[a: 1, b: 2, c: 3].dropWhile { k, v -> v < 2 }", [b: 2, c: 3]], - ["dropWhileMapEntry", "[a: 1, b: 2, c: 3].dropWhile { e -> e.value < 2 }", [b: 2, c: 3]], - */ - - // .each - ["each", "def x = 100; (0..10).each { y -> x+=y }; return x", 155], - ["eachArray", "def x = 10;\n" + - "([1, 2, 3] as Integer[]).each { y -> x+=y; }\n" + - "return x;", 16], - ["eachMapKV", "def x = 100\n" + - "def m = [a: 1, b: 2, c: 3];\n" + - "m.each { k, v -> x += v }\n" + - "return x;", 106], - ["eachMapEntry", "def x = 100\n" + - "def m = [a: 1, b: 2, c: 3];\n" + - "m.each { e -> x += e.value }\n" + - "return x;", 106], - ["eachSet", "def x = 100\n" + - "([1,2,3] as HashSet).each { y -> x += y }\n" + - "return x", 106], - ["eachSortedSet", "def x = 100\n" + - "([1,2,3] as TreeSet).each { y -> x += y }\n" + - "return x", 106], - - // TODO: eachByte - - // TODO: eachCombination - - // .eachPermutation - ["eachPermutation", "def l = [] as Set; ['a', 'b', 'c'].eachPermutation { i -> l << i }; return l", - [['a', 'b', 'c'], ['a', 'c', 'b'], ['b', 'a', 'c'], ['b', 'c', 'a'], ['c', 'a', 'b'], ['c', 'b', 'a']] as Set], - - // .eachWithIndex - ["eachWithIndex", "def x = 100; (0..10).eachWithIndex { y, i -> x+=y; x+=i }; return x", 210], - ["eachWithIndexArray", "def x = 10;\n" + - "([1, 2, 3] as Integer[]).eachWithIndex { y, i -> x+=y; x+=i }\n" + - "return x;", 19], - ["eachWithIndexMapKV", "def x = 100\n" + - "def m = [a: 1, b: 2, c: 3];\n" + - "m.eachWithIndex { k, v, i -> x += v; x+=i}\n" + - "return x;", 109], - ["eachWithIndexMapEntry", "def x = 100\n" + - "def m = [a: 1, b: 2, c: 3];\n" + - "m.eachWithIndex { e, i -> x += e.value; x+=i }\n" + - "return x;", 109], - ["eachWithIndexSet", "def x = 100\n" + - "([1,2,3] as HashSet).eachWithIndex { y, i -> x += y; x+=i }\n" + - "return x", 109], - ["eachWithIndexSortedSet", "def x = 100\n" + - "([1,2,3] as TreeSet).eachWithIndex { y, i -> x += y; x+=i }\n" + - "return x", 109], - - // .every - ["every", "return [0, 1, 2].every { i -> i < 3 }", true], - ["everyMapKV", "return [a: 0, b: 1, c: 2].every { k, v -> v < 3 }", true], - ["everyMapEntry", "return [a: 0, b: 1, c: 2].every { e -> e.value < 3 }", true], - ["everyFalse", "return [0, 1, 2].every { i -> i < 2 }", false], - - // .find - ["findList", "[1, 2, 3].find { i -> i == 2 }", 2], - ["findArray", "([1, 2, 3] as Integer[]).find { i -> i == 2 }", 2], - ["findMapKV", "[a: 1, b: 2, c: 3].find { k, v -> v == 2 }", [b: 2].entrySet().iterator().next()], - ["findMapEntry", "[a: 1, b: 2, c: 3].find { e -> e.value == 2 }", [b: 2].entrySet().iterator().next()], - - // .findAll - ["findAllList", "[1, 2, 3].findAll { i -> i > 1 }", [2, 3]], - ["findAllArray", "([1, 2, 3] as Integer[]).findAll { i -> i > 1 }", [2, 3]], - ["findAllSet", "([1, 2, 3] as HashSet).findAll { i -> i > 1 }", [2, 3] as HashSet], - ["findAllMapKV", "[a: 1, b: 2, c: 3].findAll { k, v -> v > 1 }", [b: 2, c: 3]], - ["findAllMapEntry", "[a: 1, b: 2, c: 3].findAll { e -> e.value > 1 }", [b: 2, c: 3]], - - // .findIndexOf - ["findIndexOf", "[1, 2, 3].findIndexOf { i -> i == 2 }", 1], - - // .findIndexValues - ["findIndexValues", "[0, 0, 1, 1, 2, 2].findIndexValues { i -> i == 1 }", [2, 3]], - - // .findLastIndexOf - ["findLastIndexOf", "[0, 0, 1, 1, 2, 2].findLastIndexOf { i -> i == 1 }", 3], - - // .findResult - ["findResultList", "[1, 2, 3].findResult { i -> if (i > 2) { return 'I found ' + i } }", "I found 3"], - ["findResultListDefault", "[1, 2, 3].findResult('default') { i -> if (i > 3) { return 'I found ' + i } }", "default"], - ["findResultMapKV", "[a: 1, b: 2, c: 3].findResult { k, v -> if (v > 2) { return 'I found ' + v } }", "I found 3"], - ["findResultMapKVDefault", "[a: 1, b: 2, c: 3].findResult('default') { k, v -> if (v > 3) { return 'I found ' + v } }", "default"], - ["findResultMapEntry", "[a: 1, b: 2, c: 3].findResult { e -> if (e.value > 2) { return 'I found ' + e.value } }", "I found 3"], - ["findResultMapEntryDefault", "[a: 1, b: 2, c: 3].findResult('default') { e -> if (e.value > 3) { return 'I found ' + e.value } }", "default"], - - // .findResults - ["findResultsList", "[1, 2, 3].findResults { i -> if (i > 1) { return 'I found ' + i } }", ["I found 2", "I found 3"]], - ["findResultsMapKV", "[a: 1, b: 2, c: 3].findResults { k, v -> if (v > 1) { return 'I found ' + v } }", ["I found 2", "I found 3"]], - ["findResultsMapEntry", "[a: 1, b: 2, c: 3].findResults { e -> if (e.value > 1) { return 'I found ' + e.value } }", ["I found 2", "I found 3"]], - - // .flatten - ["flatten", "[[0, 1], 'ab', 2].flatten { i -> def ans = i.iterator().toList(); ans != [i] ? ans : i }", - [0, 1, 'a', 'b', 2]], - - // .groupBy - ["groupByList", "[1, 'a', 2, 'b', 3.5, 4.6].groupBy { i -> i.class.simpleName }", - [Integer: [1, 2], String: ["a", "b"], BigDecimal: [3.5, 4.6]]], - ["groupByListMultipleCriteria", "[1, 'a', 2, 'b', 3.5, 4.6].groupBy({ i -> i.class.simpleName }, { it.class == Integer ? 'integer' : 'non-integer' })", - [Integer: ['integer': [1, 2]], String: ['non-integer': ["a", "b"]], BigDecimal: ['non-integer': [3.5, 4.6]]]], - ["groupByArray", "([1, 'a', 2, 'b', 3.5, 4.6] as Object[]).groupBy { i -> i.class.simpleName }", - [Integer: [1, 2], String: ["a", "b"], BigDecimal: [3.5, 4.6]]], - ["groupByArrayMultipleCriteria", "([1, 'a', 2, 'b', 3.5, 4.6] as Object[]).groupBy({ i -> i.class.simpleName }, { it.class == Integer ? 'integer' : 'non-integer' })", - [Integer: ['integer': [1, 2]], String: ['non-integer': ["a", "b"]], BigDecimal: ['non-integer': [3.5, 4.6]]]], - ["groupByMapKV", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy { k, v -> v.class.simpleName }", - [Integer: [1: 1, 3: 2], String: [2: "a", 4: "b"], BigDecimal: [5: 3.5, 6: 4.6]]], - ["groupByMapKVMultipleCriteria", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy({ k, v -> v.class.simpleName }, { k, v -> v.class == Integer ? 'integer' : 'non-integer' })", - [Integer: ['integer': [1: 1, 3: 2]], String: ['non-integer': [2: "a", 4: "b"]], BigDecimal: ['non-integer': [5: 3.5, 6: 4.6]]]], - ["groupByMapEntry", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy { e -> e.value.class.simpleName }", - [Integer: [1: 1, 3: 2], String: [2: "a", 4: "b"], BigDecimal: [5: 3.5, 6: 4.6]]], - ["groupByMapEntryMultipleCriteria", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy({ e -> e.value.class.simpleName }, { e -> e.value.class == Integer ? 'integer' : 'non-integer' })", - [Integer: ['integer': [1: 1, 3: 2]], String: ['non-integer': [2: "a", 4: "b"]], BigDecimal: ['non-integer': [5: 3.5, 6: 4.6]]]], - - // .groupEntriesBy - ["groupEntriesByMapKV", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupEntriesBy { k, v -> v.class.simpleName }", - [Integer: [1: 1, 3: 2].entrySet().toList(), String: [2: "a", 4: "b"].entrySet().toList(), BigDecimal: [5: 3.5, 6: 4.6].entrySet().toList()]], - ["groupEntriesByMapEntry", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupEntriesBy { e -> e.value.class.simpleName }", - [Integer: [1: 1, 3: 2].entrySet().toList(), String: [2: "a", 4: "b"].entrySet().toList(), BigDecimal: [5: 3.5, 6: 4.6].entrySet().toList()]], - - // TODO: identity - - // .inject - ["injectList", "[1, 2, 3].inject(4) { c, i -> c + i }", 10], - ["injectListNoInitialValue", "[1, 2, 3].inject { c, i -> c + i }", 6], - ["injectArray", "([1, 2, 3] as Integer[]).inject(4) { c, i -> c + i }", 10], - ["injectArrayNoInitialValue", "([1, 2, 3] as Integer[]).inject { c, i -> c + i }", 6], - ["injectMapKV", "[a: 1, b: 2, c: 3].inject(4) { c, k, v -> c + v }", 10], - ["injectMapEntry", "[a: 1, b: 2, c: 3].inject(4) { c, e -> c + e.value }", 10], - - // .max - ["maxList", "[42, 35, 17, 100].max {i -> i.toString().toList().collect {it.toInteger()}.sum() }", 35], - ["maxArray", "([42, 35, 17, 100] as Integer[]).max { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 35], - /* TODO ClosureComparator - ["maxMap", "[a: 42, b: 35, c: 17, d: 100].max { first, second -> first.value.toString().toList().collect {it.toInteger()}.sum() <=> second.value.toString().toList().collect {it.toInteger()}.sum() }", [b: 35].entrySet().iterator().next()], - */ - - // TODO: metaClass - - // .min - ["minList", "[42, 35, 17, 100].min { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 100], - ["minArray", "([42, 35, 17, 100] as Integer[]).min { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 100], - /* TODO ClosureComparator - ["minMap", "[a: 42, b: 35, c: 17, d: 100].min { first, second -> first.value.toString().toList().collect {it.toInteger()}.sum() <=> second.value.toString().toList().collect {it.toInteger()}.sum() }", [d: 100].entrySet().iterator().next()], - */ - - // .permutations - ["permutations", "[1, 2, 3].permutations { i -> i.collect { v -> v * 2 } } as Set", [[2, 4, 6], [2, 6, 4], [4, 2, 6], [4, 6, 2], [6, 2, 4], [6, 4, 2]] as Set], - - // TODO: print and println? - - // .removeAll - ["removeAll", "def l = [1, 2, 3]; l.removeAll { i -> i == 2 }; return l", [1, 3]], - - // .retainAll - ["retainAll", "def l = [1, 2, 3, 4]; l.retainAll { i -> i % 2 == 0 }; return l", [2, 4]], - - // .reverseEach - ["reverseEachList", "def r = ''; ['a', 'b', 'c'].reverseEach { i -> r += i }; return r", "cba"], - ["reverseEachArray", "def r = ''; (['a', 'b', 'c'] as String[]).reverseEach { i -> r += i }; return r", "cba"], - ["reverseEachMapKV", "def r = ''; ['a': 1, 'b': 2, 'c': 3].reverseEach { k, v -> r += k }; return r", "cba"], - ["reverseEachMapEntry", "def r = ''; ['a': 1, 'b': 2, 'c': 3].reverseEach { e -> r += e.key }; return r", "cba"], - - /* TODO would need to translate OrderBy and ClosureComparator - // .sort - ["sortList", "[3, 1, -2, -4].sort { i -> i * i }", [1, -2, 3, -4]], - ["sortArray", "([3, 1, -2, -4] as Integer[]).sort { i -> i * i }", [1, -2, 3, -4]], - ["sortMapEntryByKey", "[a: 3, c: 1, b: -2, d: -4].sort { e -> e.key }", [a: 3, b: -2, c: 1, d: -4]], - ["sortMapEntryByValue", "[a: 3, c: 1, b: -2, d: -4].sort { e -> e.value }", [d: -4, b: -2, c: 1, a: 3]], - */ - - // .split - ["splitList", "[1, 2, 3, 4].split { i -> i % 2 == 0 }", [[2, 4], [1, 3]]], - ["splitSet", "([1, 2, 3, 4] as HashSet).split { i -> i % 2 == 0 }", [[2, 4] as HashSet, [1, 3] as HashSet]], - - // TODO: step? - - // .sum - ["sumList", "['a', 'bb', 'ccc'].sum { i -> i.length() }", 6], - ["sumListInitialValue", "['a', 'bb', 'ccc'].sum(4) { i -> i.length() }", 10], - ["sumArray", "(['a', 'bb', 'ccc'] as String[]).sum { i -> i.length() }", 6], - ["sumArrayInitialValue", "(['a', 'bb', 'ccc'] as String[]).sum(4) { i -> i.length() }", 10], - - /* TODO: waiting for takeWhile support - // .takeWhile - ["takeWhileList", "[1, 2, 3].takeWhile { i -> i < 3 }", [1, 2]], - ["takeWhileSet", "([1, 2, 3] as HashSet).takeWhile { i -> i < 3 }", [1, 2] as HashSet], - ["takeWhileSortedSet", "([1, 2, 3] as TreeSet).takeWhile { i -> i < 3 }", [1, 2] as TreeSet], - ["takeWhileMapKV", "[a: 1, b: 2, c: 3].takeWhile { k, v -> v < 3 }", [a: 1, b: 2]], - ["takeWhileMapEntry", "[a: 1, b: 2, c: 3].takeWhile { e -> e.value < 3 }", [a: 1, b: 2]], - */ - - // TODO: times - - /* TODO as above - // .toSorted - ["toSortedList", "[3, 1, -2, -4].toSorted { i -> i * i }", [1, -2, 3, -4]], - ["toSortedArray", "([3, 1, -2, -4] as Integer[]).toSorted { i -> i * i }", [1, -2, 3, -4]], - ["toSortedMapEntryByKey", "[a: 3, c: 1, b: -2, d: -4].toSorted { e -> e.key }", [a: 3, b: -2, c: 1, d: -4]], - ["toSortedMapEntryByValue", "[a: 3, c: 1, b: -2, d: -4].toSorted { e -> e.value }", [d: -4, b: -2, c: 1, a: 3]], - */ - - /* TODO: waiting for toUnique support - // .toUnique - ["toUniqueList", "[1, 2, -2, 3].toUnique { i -> i * i }", [1, 2, 3]], - ["toUniqueArray", "([1, 2, -2, 3] as Integer[]).toUnique { i -> i * i }", [1, 2, 3]], - ["toUniqueSet", "([1, 2, -2, 3] as HashSet).toUnique { i -> i * i }", [1, 2, 3] as HashSet], - */ - - /* TODO also relies on OrderBy & ClosureComparator - // .unique - ["uniqueList", "[1, 2, -2, 3].unique { i -> i * i }", [1, 2, 3]], - ["uniqueSet", "([1, 2, -2, 3] as HashSet).unique { i -> i * i }.collect { it.abs() } as HashSet", [1, 2, 3] as HashSet], - */ - - // TODO: use? - - // TODO: with? - - // .withDefault - ["withDefaultList", "[].withDefault { i -> i * 2 }.get(1)", 2], - ["withDefaultMap", "[:].withDefault { k -> k * 2 }.get(1)", 2], - - ] - - assertEquals("Duplicate test names", [], rawTests.countBy { it[0] }.grep { it.value > 1}.collect { it.key }) - - return rawTests.collect { it.toArray() } - } - - @Test - void cps() { - assert evalCPS(testCode) == testResult - } - - @Test - void sync() { - assert evalCPS(""" -@NonCPS -def someMethod() { - ${testCode} -} -someMethod() -""") == testResult - } -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy deleted file mode 100644 index 367665e49..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.groovy +++ /dev/null @@ -1,101 +0,0 @@ -package com.cloudbees.groovy.cps - -import org.junit.Ignore -import org.junit.Test - - -class CpsStringGroovyMethodsTest extends AbstractGroovyCpsTest { - @Test - void eachMatch() { - evalCPSAndSync(''' -int matchCount = 0 -"foobarfoooobar".eachMatch(~/foo/) { matchCount++ } -return matchCount -''', 2) - - evalCPSAndSync(''' -int matchCount = 0 -"foobarfoooobar".eachMatch('foo') { matchCount++ } -return matchCount -''', 2) - } - - @Test - void find() { - evalCPSAndSync(''' -return "foobar".find("oob") { it.reverse() } -''', "raboof") - - evalCPSAndSync(''' -return "foobar".find(~/oob/) { it.reverse() } -''', "raboof") - } - - @Test - void findAll() { - evalCPSAndSync(''' -return "foobarfoobarfoo".findAll("foo") { it.reverse() } -''', ['oof', 'oof', 'oof']) - - evalCPSAndSync(''' -return "foobarfoobarfoo".findAll(~/foo/) { it.reverse() } -''', ['oof', 'oof', 'oof']) - } - - @Test - void replaceAll() { - evalCPSAndSync(''' -return "foobarfoobarfoo".replaceAll("foo") { it.reverse() } -''', "oofbaroofbaroof") - - evalCPSAndSync(''' -return "foobarfoobarfoo".replaceAll(~/foo/) { it.reverse() } -''', "oofbaroofbaroof") - } - - @Test - void replaceFirst() { - evalCPSAndSync(''' -return "foobarfoobarfoo".replaceFirst("foo") { it.reverse() } -''', "oofbarfoobarfoo") - - evalCPSAndSync(''' -return "foobarfoobarfoo".replaceFirst(~/foo/) { it.reverse() } -''', "oofbarfoobarfoo") - } - - @Ignore("Waiting for StringGroovyMethods.LineIterable translation") - @Test - void splitEachLine() { - evalCPSAndSync(''' -return """ -abc|def -ghi|jkl -mno|pqr -""".splitEachLine("|") { it.reverse() } -''', "bob") - } - - @Test - void takeWhile() { - evalCPSAndSync(''' -return "Groovy".takeWhile{ it != 'v' } -''', "Groo") - - evalCPSAndSync(''' -def ovyStr = 'ovy' -return "Gro${ovyStr}".takeWhile{ it != "v" } -''', "Groo") - } - - private void evalCPSAndSync(String script, Object value) { - evalCPS(script) == value - evalCPS(""" -@NonCPS -def someMethod() { - ${script} -} -someMethod() -""") == value - } -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy deleted file mode 100644 index 1781c98f3..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/CpsTransformerTest.groovy +++ /dev/null @@ -1,1059 +0,0 @@ -package com.cloudbees.groovy.cps - -import com.cloudbees.groovy.cps.impl.CpsCallableInvocation -import groovy.transform.NotYetImplemented -import org.codehaus.groovy.control.MultipleCompilationErrorsException -import org.junit.Ignore -import org.junit.Test -import org.jvnet.hudson.test.Issue - -/** - * - * - * @author Kohsuke Kawaguchi - */ -class CpsTransformerTest extends AbstractGroovyCpsTest { - @Test - void helloWorld() { - assert evalCPS("'hello world'.length()")==11 - } - - @Test - void comparison() { - for(int i in [1,2,3]) { - for (int j in [1,2,3]) { - assert evalCPS("${i} < ${j}") == (i ${j}") == (i>j); - assert evalCPS("${i} >= ${j}")== (i>=j); - } - } - } - - @Test - void forInLoop() { - assert evalCPS("x=0; for (i in [1,2,3,4,5]) x+=i; return x;")==15; - } - - @Test - void variableAssignment() { - assert evalCPS("x=3; x+=2; return x;")==5; - } - - @Test - void localVariable() { - assert evalCPS("int x=3; x+=2; return x;")==5; - } - - @Test - void increment() { - assert evalCPS(""" - x=0; - y = x++; - z = ++x; - return x+"."+y+"."+z; - """)=="2.0.2"; - } - - @Test - void decrement() { - assert evalCPS(""" - x=5; - y = x--; - z = --x; - return x+"."+y+"."+z; - """)=="3.5.3"; - } - - @Test - void break_() { - assert evalCPS(""" - x=0; - int i=0; - for (i=0; i<5; i+=1) { - break; - x+=1; - } - return i+x; - """)==0; - } - - @Test - void globalBreak_() { - assert evalCPS(""" - x=0; - int i=0; - int j=0; - - I: - for (i=0; i<5; i+=1) { - J: - for (j=0; j<5; j+=1) { - break I; - x+=1; - } - x+=1; - } - return i+"."+j+"."+x; - """)=="0.0.0"; - } - - @Test - void functionCall() { - assert evalCPS(""" - int i=1; - i.plus(2) - """)==3; - } - - @Test - void functionCall0arg() { - assert evalCPS(""" - 123.toString() - """)=="123"; - } - - @Test - void constructorCall() { - assert evalCPS(""" - new String("abc"+"def") - """)=="abcdef"; - } - - @Test - void constructorCall0arg() { - assert evalCPS(""" - new String() - """)==""; - } - - @Issue('https://github.com/cloudbees/groovy-cps/issues/31') - @Test - void constructorList() { - File f = ['/parent', 'name']; - assert evalCPS('''\ - File f = ['/parent', 'name'] - return f - '''.stripIndent()) == new File('/parent', 'name') - - // Test the closure env - assert evalCPS('''\ - def close = {String parent, String name -> [parent, name] as File} - return close('/parent', 'name') - '''.stripIndent()) == new File('/parent', 'name') - } - - @Test - void workflowCallingWorkflow() { - assert evalCPS(""" - def fib(int x) { - if (x==0) return 0; - if (x==1) return 1; - x = fib(x-1)+fib(x-2); // assignment to make sure x is treated as local variable - return x; - } - fib(10); - """)==55 - } - - @Test void typeCoercion() { - assert evalCPS(''' - interface I { - Locale[] getAvailableLocales() - } - try { - (Locale as I).getAvailableLocales() - } catch (e) { - e.toString() - } -''') == Locale.availableLocales - } - - /** - * - */ - @Test - void exceptionFromNonCpsCodeShouldBeCaughtByCatchBlockInCpsCode() { - assert evalCPS(""" - def foo() { - "abc".substring(5); // will caught exception - return "fail"; - } - - try { - return foo(); - } catch(StringIndexOutOfBoundsException e) { - return e.message; - } - """)=="String index out of range: -2" - } - - /** - * while loop that evaluates to false and doesn't go through the body - */ - @Test - void whileLoop() { - assert evalCPS(""" - int x=1; - while (false) { - x++; - } - return x; - """)==1 - } - - /** - * while loop that goes through several iterations. - */ - @Test - void whileLoop5() { - assert evalCPS(""" - int x=1; - while (x<5) { - x++; - } - return x; - """)==5 - } - - /** - * do-while loop that evaluates to false immediately - */ - @Test - @NotYetImplemented - void doWhileLoop() { - assert evalCPS(""" - int x=1; - do { - x++; - } while (false); - return x; - """)==2 - } - - /** - * do/while loop that goes through several iterations. - */ - @Test - @NotYetImplemented - void dowhileLoop5() { - assert evalCPS(""" - int x=1; - do { - x++; - } while (x<5); - return x; - """)==5 - } - - @Test - void helloClosure() { - assert evalCPS(""" - x = { -> 5 } - return x(); - """)==5 - } - - @Test - void closureShouldCaptureLiveVariables() { - assert evalCPS(""" - def c1,c2; - - { -> - def x = 0; - c1 = { return x; } - c2 = { v -> x=v; } - }(); - - r = ""+c1(); - c2(3); - r += "."+c1(); - c2(5); - r += "."+c1(); - - return r; - """)=="0.3.5" - } - - @Test - void closureHasImplicitItVariable() { - assert evalCPS(""" - c = { it+1 } - - c(3); - """)==4 - } - - /** - * A common pattern of using closure as a configuration block requires - * a library to set a delegate. - */ - @Test - void closureDelegateProperty() { - assert evalCPS(""" - def config(c) { - def map = [:]; - c.resolveStrategy = Closure.DELEGATE_FIRST; - c.delegate = map; - c(); - return map; - } - - def x = config { - foo = 3; - bar = 'xyz'; - zot = bar; - fog = containsKey('foo'); - } - - return [x.foo, x.bar, x.zot, x.fog].join('-'); - """)=="3-xyz-xyz-true" - } - - @Test - void serialization() { - CpsCallableInvocation s = parseCps(""" - def plus3(int x) { - return x+3; - } - - for (int x=0; x<10; x++) {// meaningless code to cram as much coding construct as possible - try { - while (false) - ; - } catch(Exception e) { - ; - } - } - 1+plus3(3*2) - """) - def cx = new Continuable(s.invoke(null, null, Continuation.HALT)) - cx = roundtripSerialization(cx) - assert 10==cx.run(null) - } - - @Test - void assertion() { - // when assertion passes - assert evalCPS(""" - assert true - assert true : "message" - return 3; - """)==3 - - try { - evalCPS(""" - assert 1+2 == ((4)); - """) - fail(); - } catch (AssertionError e) { - assert e.message.contains("1+2 == ((4))") - } - - try { - evalCPS(""" - assert (1+2) == 4 : "with message"; - """) - fail(); - } catch (AssertionError e) { - assert e.message=="with message. Expression: assert (1+2) == 4 : \"with message\"" - } - } - - @Test - void unaryOps() { - assert evalCPS(""" - def x = 5; - def y = -x; - def z = +x; - - return y+z; -""")==0; - } - - @Test - void not() { - assert evalCPS(""" - def x = true; - def y = !x; - def z = !y; - - return "y="+y+",z="+z; -""")=="y=false,z=true"; - } - - @Test - void bitwiseNegative() { - assert evalCPS(""" - int x = 32; - return ~x; -""")==-33; - } - - @Test - void gstring() { - assert evalCPS(''' - def x = "foo"; - return "hello ${1+3}=${x}"; -''')=="hello 4=foo"; - } - - @Issue('https://github.com/cloudbees/groovy-cps/issues/15') - @Test - void gstringWithStringWriterClosure() { - String script = ''' - String text = 'Foobar'; - String result = """${ w -> w << text}""".toString(); - return result; - '''.stripIndent(); - assert evalCPSonly(script).getClass() == java.lang.String.class; - assert evalCPS(script) == 'Foobar'; - } - - @Test - void ternaryOp() { - assert evalCPS(''' - return true ? 5 : null.makeCall(); -''')==5; - } - - @Test - void ternaryOp2() { - assert evalCPS("false ? bogus.noSuchCall() : 'zot'")=='zot'; - } - - @Test - void ternaryOp3() { - assert evalCPS("def x = 'ok'; def y = null; [x ?: 1, y ?: 2]") == ['ok', 2] - } - - @Test - void elvisOp() { - assert evalCPS("def x=0; return ++x ?: -1")==1; - assert evalCPS("def x=0; return x++ ?: -1")==-1; - } - - @Test void logicalOp() { - assert evalCPS("true && (false || false)") == false; - assert evalCPS("true && (true || false)") == true; - assert evalCPS("false && (true || false)") == false; - assert evalCPS("false || 'rhs of || must be cast to boolean'") == true; - assert evalCPS("true && 'rhs of && must be cast to boolean'") == true; - assert evalCPS(''' - x = [0, 0, 0, 0] - def set(index) { - x[index - 1] = index - true - } - def r = [ - true && set(1), - false && set(2), - true || set(3), - false || set(4) - ] - "${r} ${x}" - ''') == "[true, false, true, true] [1, 0, 0, 4]" - } - - @Test - void range() { - assert evalCPS("def x=5; return (0..x)") == (0..5); - assert evalCPS("def x=5; return (0.. - [0,1,2,3,4].each { y -> - assert evalCPS("def x=${x}; x&=${y}; return x;")== (x&y); - assert evalCPS("def x=${x}; x|=${y}; return x;")== (x|y); - assert evalCPS("def x=${x}; x^=${y}; return x;")== (x^y); - } - } - } - - @Test - void attributeSet() { - assert evalCPS("new java.awt.Point(1,2).@x") == 1; - } - - @Test - void attributeGet() { - assert evalCPS("def p = new java.awt.Point(1,2); p.@x+=5; p.@x") == 6; - } - - @Test - void multidimensionalArrayInstantiation() { - assert evalCPS(""" - def x = new int[3][4]; - int z = 0; - for (int i=0; i> 1")==5/2 as int; - assert evalCPS("x=5; x>>=1; x")==5/2 as int; - assert evalCPS("-1>>>1")==2147483647; - assert evalCPS("x=-1; x>>>=1; x")==2147483647; - - assert evalCPS("x=[]; x<<'hello'; x<<'world'; x")==["hello","world"]; - } - - @Test - void inOperator() { - assert evalCPS("3 in [1,2,3]"); - assert evalCPS("'ascii' in String.class"); - assert !evalCPS("6 in [1,2,3]"); - assert !evalCPS("'ascii' in URL.class"); - } - - @Test - void regexpOperator() { - assert evalCPS("('cheesecheese' =~ 'cheese') as boolean") - assert evalCPS("('cheesecheese' =~ /cheese/) as boolean") - assert !evalCPS("('cheese' =~ /ham/) as boolean") - - assert evalCPS("('2009' ==~ /\\d+/) as boolean") - assert !evalCPS("('holla' ==~ /\\d+/) as boolean") - } - - @Issue("JENKINS-32062") - @Test - void arrayPassedToMethod() { - assert evalCPS('def m(x) {x.size()}; def a = [1, 2]; a.size() + m(a)') == 4 // control case - assert evalCPS('def m(x) {x.size()}; def a = [1, 2].toArray(); a.length + m(Arrays.asList(a))') == 4 // workaround #1 - assert evalCPS('@NonCPS def m(x) {x.length}; def a = [1, 2].toArray(); a.length + m(a)') == 4 // workaround #2 - assert evalCPS('def m(x) {x.length}; def a = [1, 2].toArray(); a.length + m(a)') == 4 // formerly: groovy.lang.MissingPropertyException: No such property: length for class: java.lang.Integer - } - - @Issue("JENKINS-27893") - @Test - void varArgs() { - assert evalCPS('def fn(String... args) { args.size() }; fn("one string")') == 1; - } - - @Issue("JENKINS-28277") - @Test - void currying() { - assert evalCPS('def nCopies = { int n, String str -> str*n }; def twice=nCopies.curry(2); twice("foo")') == "foofoo"; - } - - @Issue("JENKINS-28277") - @Test - void ncurrying_native_closure() { - assert evalCPS(''' - @NonCPS - def makeNativeClosure() { - Collections.&binarySearch - } - def catSearcher = makeNativeClosure().ncurry(1,"cat") - - return [ - catSearcher(['ant','bee','dog']), - catSearcher(['ant','bee','cat']) - ] - ''') == [-3,2]; - } - - @Test - void fieldDirect() { - assert evalCPS('class C {private int x = 33}; new C().x') == 33 - } - - @Issue("JENKINS-31484") - @Test - void fieldViaGetter() { - assert evalCPS('class C {private int x = 33; int getX() {2 * this.@x}}; new C().x') == 66 - assert evalCPS('class C {private int x = 33; int getX() {2 * x}}; new C().x') == 66 - } - - @Issue("JENKINS-31484") - @Ignore("Currently throws StackOverflowError") - @Test - void fieldViaGetterWithThis() { - assert evalCPS('class C {private int x = 33; int getX() {2 * this.x}}; new C().x') == 66 - } - - @Issue("JENKINS-31484") - @Test - void fieldViaSetter() { - assert evalCPS('class C {private int x = 0; int getX() {2 * x}; void setX(int x) {this.@x = x / 3}}; C c = new C(); c.x = 33; c.x') == 22 - assert evalCPS('class C {private int x = 0; int getX() {2 * x}; void setX(int x) {this.x = x / 3}}; C c = new C(); c.x = 33; c.x') == 22 - } - - @Test - void nonField() { - assert evalCPS('class C extends HashMap {def read() {x * 2}; def write(x) {this.x = x / 3}}; C c = new C(); c.write(33); c.read()') == 22 - } - - @Test - void method_pointer() { - // method pointer to a native static method - assert evalCPS(''' - def add = CpsTransformerTest.&add - return [ add(1,2), add(3,4) ] - ''') == [3,7] - - // method pointer to a native instance method - assert evalCPS(''' - def contains = "foobar".&contains - return [ contains('oo'), contains('xyz') ] - ''') == [true,false] - - // method pointer to a CPS transformed method - assert evalCPS(''' - class X { - int z; - X(int z) { this.z = z; } - int add(int x, int y) { x+y+z } - } - - def adder = (new X(1)).&add; - def plus1 = adder.curry(10) - - return [ adder(100,1000), plus1(10000) ] - ''') == [1101, 10011] - } - - public static int add(int a, int b) { return a+b; } - - @Issue('https://github.com/cloudbees/groovy-cps/issues/26') - @Test - void interfaceDeclaration() { - assert evalCPS(''' - interface Strategy { - Closure process(Object event) - } - return true - ''') == true; - } - - @Issue('https://github.com/cloudbees/groovy-cps/issues/26') - @Test - void emptyInterfaceDeclaration() { - assert evalCPS(''' - interface Empty {} - return true - ''') == true; - } - - @Issue("JENKINS-44280") - @NotYetImplemented - @Test - void overloadedMethods() { - assert evalCPS(''' - public String bar(List l) { - return bar((Iterable)l) - } - - public String bar(Iterable l) { - return "iterable" - } - - List s = ["a", "b"] - - return bar(s) - ''') == "iterable" - } - - @Issue("JENKINS-44280") - @NotYetImplemented - @Test - void overloadedMethodsWithRawTypes() { - assert evalCPS(''' - public String bar(List l) { - return bar((Iterable)l) - } - - public String bar(Iterable l) { - return "iterable" - } - - List s = ["a", "b"] - - return bar(s) - ''') == "iterable" - } - - @Issue("JENKINS-44280") - @NotYetImplemented - @Test - void overloadedStaticMethods() { - assert evalCPS(''' - public static String bar(List l) { - return bar((Iterable)l) - } - - public static String bar(Iterable l) { - return "iterable" - } - - List s = ["a", "b"] - - return bar(s) - ''') == "iterable" - } - - public static class Base { - @Override - String toString() { - return "base"; - } - } - - @Test - void superClass() { - assert evalCPS(''' - class Foo extends CpsTransformerTest.Base { - public String toString() { - return "x"+super.toString(); - } - } - new Foo().toString(); - ''')=="xbase" - } - - @Issue("JENKINS-45982") - @Test - void transformedSuperClass() { - assert evalCPS(''' - class Foo extends CpsTransformerTest.Base { - public String other() { - return "base" - } - } - class Bar extends Foo { - public String other() { - return "y"+super.other() - } - } - new Bar().other(); - ''')=="ybase" - } - - @Issue("JENKINS-52395") - @Test - void transformedSuperSuperClass() { - assert evalCPS(''' - class Foo extends CpsTransformerTest.Base { - public String other() { - return "base" - } - } - class Bar extends Foo { - public String other() { - return "y"+super.other() - } - } - class Baz extends Bar { - public String other() { - return "z"+super.other() - } - } - new Baz().other(); - ''')=="zybase" - } - - @Test - @Issue("https://github.com/cloudbees/groovy-cps/issues/42") - void abstractMethod() { - assert evalCPS(''' - abstract class Foo { - abstract int val() - } - Foo foo = new Foo() {int val() {123}} - foo.val() - ''') == 123 - } - - @Issue('https://github.com/cloudbees/groovy-cps/issues/28') - @Test - @NotYetImplemented - void rehydrateClosure() { - assert evalCPS(''' - class MyStrategy { - Closure process() { - return { - speak() - } - } - } - String speak() { - 'from Script instance' - } - Closure closure = new MyStrategy().process() - closure.rehydrate(this, this, this).call() - ''') == 'from Script instance'; - } - - @Issue("https://github.com/cloudbees/groovy-cps/issues/16") - @Test - @NotYetImplemented - void category() { - assert evalCPS(''' - class BarCategory { - static String up(String text) { - text.toUpperCase() - } - } - return use(BarCategory) { - 'foo'.up() - }; - ''') == 'FOO'; - } - - @Issue("JENKINS-38268") - @Test - void lexicalScope() { - assert evalCPS(''' -def a = [id: 'a', count: 0] -def b = [id: 'b', count: 0] - -def toRun = [a, b].collect { thing -> return { thing.count = thing.count + 1 } } - -toRun.each { arg -> arg() } - -return [a.count, b.count] -''') == [1, 1] - } - - @Issue("SECURITY-567") - @Test - void methodPointer() { - assert evalCPS(''' -def b = new CpsTransformerTest.Base() - -return (b.&toString)() + (String.getClass().&getSimpleName)() -''') == "baseClass" - } - - @Issue("JENKINS-32213") - @Test - void allClassesSerializable() { - evalCPSonly('class C {}; def c = new C(); assert c instanceof Serializable') - evalCPSonly('class C implements Serializable {}; def c = new C(); assert c instanceof Serializable') - evalCPSonly(''' -@NonCPS -def notSerializable() { - def r = new Runnable() { - @Override - public void run() {} - } - return r instanceof Serializable -} - -return notSerializable() -''') == false - } - - @Issue("JENKINS-44027") - @Test - void multipleAssignment() { - assert evalCPS(''' -def (a, b) = ['first', 'second'] -def c, d -(c, d) = ['third', 'fourth'] - -return a + b + c + d -''') == 'firstsecondthirdfourth' - } - - @Issue("JENKINS-44027") - @Test - void nonArrayLikeMultipleAssignment() { - assert evalCPS(''' -try { - def (a,b) = 4 - return false -} catch (Exception e) { - return e instanceof MissingMethodException -} -''') == true - } - - @Issue("JENKINS-44027") - @Test - void arrayLikeMultipleAssignment() { - assert evalCPS(''' -def (a,b) = "what" -return a + b -''') == "wh" - } - - @Issue("JENKINS-44027") - @Test - void mismatchedSizeMultipleAssignment() { - assert evalCPS(''' -def (a, b) = ['first', 'second', 'third'] -def (c, d) = ['fourth'] -return [a, b, c, d].join(' ') -''') == "first second fourth null" - } - - @Issue("JENKINS-47363") - @Test - void excessiveListElements() { - def l1 = 0..249 - def s1 = l1.join(",\n") - assert evalCPS(""" -def b = [${s1}] -return b.size() -""") == 250 - - def l2 = 0..250 - def s2 = l2.join(",\n") - try { - assert evalCPS(""" -def b = [${s2}] -return b.size() -""") == 251 - } catch (Exception e) { - assert e instanceof MultipleCompilationErrorsException - assert e.message.contains('List expressions can only contain up to 250 elements') - } - } - - @Issue("JENKINS-47363") - @Test - void excessiveMapElements() { - def l1 = 0..124 - def s1 = l1.collect { "${it}:${it}" }.join(",\n") - assert evalCPS(""" -def b = [${s1}] -return b.size() -""") == 125 - def l2 = 0..125 - def s2 = l2.collect { "${it}:${it}" }.join(",\n") - try { - assert evalCPS(""" -def b = [${s2}] -return b.size() -""") == 126 - } catch (Exception e) { - assert e instanceof MultipleCompilationErrorsException - assert e.message.contains('Map expressions can only contain up to 125 entries') - } - } - - @Issue("JENKINS-49679") - @Test - void multipleAssignmentRunsMethodOnce() { - assert evalCPS(''' -alreadyRun = false - -def getAandB() { - if (!alreadyRun) { - alreadyRun = true - return ['first', 'second'] - } else { - return ['bad', 'worse'] - } -} - -def (a, b) = getAandB() -def c, d -(c, d) = ['third', 'fourth'] - -return a + b + c + d -''') == 'firstsecondthirdfourth' - } - - @Test - void mapEntryInBadContext() { - try { - assert evalCPS(''' -return [[a: "a"], [b: "b"][c: "c"]]''') == "hi" - } catch (Exception e) { - assert e instanceof MultipleCompilationErrorsException - assert e.message.contains('Unsupported map entry expression for CPS transformation in this context') - } - } - - @Test - void spreadMethodCall() { - try { - assert evalCPS(''' -return ["a", "b", "c"]*.hashCode()''') == "hi" - } catch (Exception e) { - assert e instanceof MultipleCompilationErrorsException - assert e.message.contains('spread not yet supported for CPS transformation') - } - } - - @Test - void synchronizedStatement() { - try { - assert evalCPS(''' -synchronized(this) { return 1 }''') == "hi" - } catch (Exception e) { - assert e instanceof MultipleCompilationErrorsException - assert e.message.contains('synchronized is unsupported for CPS transformation') - } - } - - @Test - void spreadExpression() { - try { - assert evalCPS(''' -def x = [1, 2, 3] -return [*x, 4, 5] -''') == "hi" - } catch (Exception e) { - assert e instanceof MultipleCompilationErrorsException - assert e.message.contains('spread not yet supported for CPS transformation') - } - } - - @Test - void spreadMapExpression() { - try { - assert evalCPS(''' -def x = [a: 1, b: 2, c: 3] -return [*:x, d: 4, e: 5] -''') == "hi" - } catch (Exception e) { - assert e instanceof MultipleCompilationErrorsException - assert e.message.contains('spread map not yet supported for CPS transformation') - } - } -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/SafepointTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/SafepointTest.groovy deleted file mode 100644 index 27aec64fd..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/SafepointTest.groovy +++ /dev/null @@ -1,65 +0,0 @@ -package com.cloudbees.groovy.cps - -import groovy.transform.NotYetImplemented -import org.junit.Test - -/** - * Make sure that a safepoint covers all the infinite loops. - * - * @author Kohsuke Kawaguchi - */ -class SafepointTest extends AbstractGroovyCpsTest { - @Override - protected CpsTransformer createCpsTransformer() { - def t = super.createCpsTransformer() - t.configuration = new TransformerConfiguration().withSafepoint(SafepointTest.class,"safepoint") - return t - } - - @Test - void whileLoop() { - assert evalCPSonly(''' - while (true) ; - ''') == SAFEPOINT - } - - @NotYetImplemented // Groovy doesn't support do-while - @Test - void doWhileLoop() { - assert evalCPSonly(''' - do {} while (true) ; - ''') == SAFEPOINT - } - - @Test - void forLoop() { - assert evalCPSonly(''' - for (;;) {} - ''') == SAFEPOINT - } - - @Test - void recursion() { - assert evalCPSonly(''' - def foo() { foo(); } - foo() - ''') == SAFEPOINT - } - - @Test - void closure() { - assert evalCPSonly(''' - def x = { -> } - x() - ''') == SAFEPOINT - } - - /** - * Gets invoked at the safepoint. - */ - public static void safepoint() { - Continuable.suspend(SAFEPOINT) - } - - private static final Object SAFEPOINT = "Yo!" -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy deleted file mode 100644 index c99cdbb73..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.groovy +++ /dev/null @@ -1,73 +0,0 @@ -package com.cloudbees.groovy.cps.impl - -import com.cloudbees.groovy.cps.AbstractGroovyCpsTest -import com.cloudbees.groovy.cps.Continuation -import org.junit.Test - -import javax.naming.NamingException - -/** - * - * - * @author Kohsuke Kawaguchi - */ -class FunctionCallBlockTest extends AbstractGroovyCpsTest { - /** - * Synchronous code we call from test that throws an exception - */ - public static void someSyncCode(int i) { - if (i>0) - someSyncCode(i-1); - else - throw new NamingException(); - } - - @Test - void infiniteRecursion() { - try { - assert evalCPSonly(""" - def thing = null; - def getThing() { - return thing == null; - } - def stuff = getThing(); - """) == "cheese"; // Fails if we don't throw an exception, also fails if we run more than 10k steps. - } catch (Throwable t) { - assert t.toString() == "java.lang.StackOverflowError: Excessively nested closures/functions at Script1.getThing(Script1.groovy:4) - look for unbounded recursion - call depth: 1025"; - } - } - - @Test - void stackTraceFixup() { - List elements = evalCPSonly(""" - - def x() { - y(); // line 4 - } - - def y() { - FunctionCallBlockTest.someSyncCode(3); // line 8 - } - try { - x(); // line 11 - } catch (Exception e) { - return e.stackTrace; - } - """) - -// println elements; - - def trace = elements.join("\n") - - // should include the transformed CPS part - assert trace.contains(""" -Script1.y(Script1.groovy:8) -Script1.x(Script1.groovy:4) -Script1.run(Script1.groovy:11) -___cps.transform___(Native Method) -com.cloudbees.groovy.cps.impl.ContinuationGroup.methodCall"""); - - // should include the call stack of some sync code - assert trace.contains("com.cloudbees.groovy.cps.impl.FunctionCallBlockTest.someSyncCode(FunctionCallBlockTest.groovy:") - } -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy deleted file mode 100644 index b76aec360..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/MapBlockTest.groovy +++ /dev/null @@ -1,24 +0,0 @@ -package com.cloudbees.groovy.cps.impl; - -import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; -import org.junit.Test; - -/** - * @author Kohsuke Kawaguchi - */ -public class MapBlockTest extends AbstractGroovyCpsTest { - @Test - void mapLiteral() { - assert evalCPS(""" - def x=[foo:"hello", bar:2+2+2, zot:null]; - return x; - """)==[foo:"hello",bar:6,zot:null]; - } - - @Test - void empty() { - assert evalCPS(""" - return [:] - """)==[:] - } -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy deleted file mode 100644 index 8f9cb9147..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.groovy +++ /dev/null @@ -1,51 +0,0 @@ -package com.cloudbees.groovy.cps.impl - -import com.cloudbees.groovy.cps.AbstractGroovyCpsTest -import com.cloudbees.groovy.cps.Continuable -import com.cloudbees.groovy.cps.Continuation -import org.junit.Test - -/** - * - * - * @author Kohsuke Kawaguchi - */ -class PropertyAccessBlockTest extends AbstractGroovyCpsTest { - @Test - void asyncExecutionOfPropertyGet() { - def inv = parseCps(""" - class Foo { - Object getAlpha() { - return Continuable.suspend('suspended'); - } - } - return new Foo().alpha; - """) - - def c = new Continuable(inv.invoke(null, null, Continuation.HALT)) - assert 'suspended'==c.run(null) // should have suspended - assert 5 == c.run(5); // when resume, the getter should return - } - - @Test - void asyncExecutionOfPropertySet() { - def inv = parseCps(""" - class Foo { - private int x = 3; - void setAlpha(int x) { - this.x = Continuable.suspend(x); - } - int getAlpha() { - return x; - } - } - def f = new Foo() - f.alpha += 7; - return f.alpha; - """) - - def c = new Continuable(inv.invoke(null, null, Continuation.HALT)) - assert 10==c.run(null) // should have suspended - assert 13 == c.run(13); // when resume, we should see that as the final value. - } -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy deleted file mode 100644 index 79ba6bb33..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/SwitchBlockTest.groovy +++ /dev/null @@ -1,279 +0,0 @@ -package com.cloudbees.groovy.cps.impl - -import com.cloudbees.groovy.cps.AbstractGroovyCpsTest -import groovy.transform.NotYetImplemented -import org.junit.Test - -import javax.naming.NamingException - -/** - * Tests for switch/case - * - * @author Kohsuke Kawaguchi - */ -class SwitchBlockTest extends AbstractGroovyCpsTest { - @Test - void basic() { - assert evalCPS(""" - def x = 2; - def y; - switch (x) { - case 1: - y = "one"; - break; - case 2: - y = "two"; - break; - case 3: - y = "three"; - break; - } - return y; - """)=="two"; - } - - /** - * Null in the switch expression. - */ - @Test - void nullSwitchExp() { - assert evalCPS(""" - def x = null; - def y = 'zero'; - switch (x) { - case 1: - y = "one"; - break; - case 2: - y = "two"; - break; - case 3: - y = "three"; - break; - } - return y; - """)=="zero"; - } - - /** - * Null in the case expression. - */ - @Test - void nullInCaseExp() { - assert evalCPS(""" - def x = null; - def y = 'zero'; - switch (x) { - case 1: - y = "one"; - break; - case null: - y = "null!"; - break; - case 3: - y = "three"; - break; - } - return y; - """)=="null!"; - } - - /** - * Exception in the switch expression. - */ - @Test - void exceptionInSwitchExp() { - assert evalCPS(""" - def foo() { - throw new javax.naming.NamingException(); - } - - try { - switch (foo()) { - case 1: - y = "one"; - break; - case 2: - y = "two!"; - break; - } - return null; - } catch (e) { - return e.class; - } - """)==NamingException.class; - } - - /** - * Exception in the case expression. - */ - @Test - void exceptionInCaseExp() { - assert evalCPS(""" - def foo() { - throw new javax.naming.NamingException(); - } - - try { - switch (5) { - case 1: - y = "one"; - break; - case foo(): - y = "two"; - break; - case 3: - y = "three"; - break; - } - return null; - } catch (e) { - return e.class; - } - """)==NamingException.class; - } - - @Test - void isCase() { - assert evalCPS(""" - def x = 5; - switch (x) { - case 1: - y = "one"; - break; - case [2,4,6,8]: - y = "even"; - break; - case [3,5,7,9]: - y = "odd"; - break; - } - return y; - """)=="odd"; - } - - /** - * Two matching case statements. - */ - @Test - void twoMatchingCases() { - assert evalCPS(""" - def x = 2; - def y; - switch (x) { - case 1: - y = "one"; - break; - case 2: - y = "two"; - break; - case 2: - y = "TWO"; - break; - case 3: - y = "three"; - break; - } - return y; - """)=="two"; - } - - /** - * Matches to the default clause - */ - @Test - void defaultClause() { - assert evalCPS(""" - def x = 5; - def y; - switch (x) { - case 1: - y = "one"; - break; - default: - y = "other"; - break; - case 2: - y = "two"; - break; - case 3: - y = "three"; - break; - } - return y; - """)=="other"; - } - - /** - * Matches to nothing - */ - @Test - void noMatch() { - assert evalCPS(""" - def x = 5; - def y = "initial"; - switch (x) { - case 1: - y = "one"; - break; - case 2: - y = "two"; - break; - case 3: - y = "three"; - break; - } - return y; - """)=="initial"; - } - - /** - * Case match and fall through the rest. - */ - @Test - void fallthrough() { - assert evalCPS(""" - def x = 1; - def y = ""; - switch (x) { - case 1: - y += "one"; - // fall through - case 2: - y += "two"; - // fall through - case 3: - y += "three"; - // fall through - } - return y; - """)=="onetwothree"; - } - - /** - * Default match and fall through - */ - @Test - @NotYetImplemented // Groovy doesn't handle this correctly - void fallthroughWithDefault() { - assert evalCPS(""" - def x = 9; - def y = ""; - switch (x) { - default: - y += "other"; - // fall through - case 1: - y += "one"; - // fall through - case 2: - y += "two"; - // fall through - case 3: - y += "three"; - // fall through - } - return y; - """)=="otheronetwothree"; - } -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy deleted file mode 100644 index 1a2cc7144..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/ThrowBlockTest.groovy +++ /dev/null @@ -1,45 +0,0 @@ -package com.cloudbees.groovy.cps.impl - -import com.cloudbees.groovy.cps.AbstractGroovyCpsTest -import com.cloudbees.groovy.cps.Continuable -import org.junit.Test - -/** - * - * - * @author Kohsuke Kawaguchi - */ -class ThrowBlockTest extends AbstractGroovyCpsTest { - @Test - void stackTraceFixup() { - List elements = evalCPSonly(""" - - def x() { - y(); // line 4 - } - - def y() { - throw new javax.naming.NamingException(); // line 8 - } - try { - x(); // line 11 - } catch (Exception e) { - return e.stackTrace; - } - """) - -// println elements; - - assert elements.subList(0,3).join("\n")==""" -Script1.y(Script1.groovy:8) -Script1.x(Script1.groovy:4) -Script1.run(Script1.groovy:11) - """.trim(); - - assert elements[3] == Continuable.SEPARATOR_STACK_ELEMENT - - def rest = elements.subList(4,elements.size()).join("\n"); - assert rest.contains(FunctionCallBlock.class.name) - assert rest.contains("java.lang.reflect.Constructor.newInstance") - } -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy deleted file mode 100644 index 2f29c9a56..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.groovy +++ /dev/null @@ -1,224 +0,0 @@ -package com.cloudbees.groovy.cps.impl - -import com.cloudbees.groovy.cps.AbstractGroovyCpsTest -import com.cloudbees.groovy.cps.Continuable -import org.junit.Test - -/** - * TODO: tests to write - * - catch order priority - * - * @author Kohsuke Kawaguchi - */ -class TryCatchBlockTest extends AbstractGroovyCpsTest { - @Test - void stackTraceFixup() { - List elements = evalCPSonly(""" - - def x() { - y(); // line 4 - } - - def y() { - throw new javax.naming.NamingException(); // line 8 - } - try { - x(); // line 11 - } catch (Exception e) { - return e.stackTrace; - } - """) - -// println elements; - - assert elements.subList(0,3).join("\n")==""" -Script1.y(Script1.groovy:8) -Script1.x(Script1.groovy:4) -Script1.run(Script1.groovy:11) - """.trim(); - - assert elements[3] == Continuable.SEPARATOR_STACK_ELEMENT - - def rest = elements.subList(4,elements.size()).join("\n"); - assert rest.contains(FunctionCallBlock.class.name) - assert rest.contains("java.lang.reflect.Constructor.newInstance") - } - - /** - * Try block with finally clause completing normally. - */ - @Test - void tryAndFinally_NormalCompletion() { - def x = evalCPS(""" - a = ""; - try { - a += "1"; - } catch (Exception e) { - a += "2"; - } finally { - a += "3"; - } - return a; -""") - assert x=="13"; - } - - @Test - void tryWithoutFinally_NormalCompletion() { - def x = evalCPS(""" - a = ""; - try { - a += "1"; - } catch (Exception e) { - a += "2"; - } - return a; -""") - assert x=="1"; - } - - @Test - void tryAndFinally_AbnormalTermination() { - def x = evalCPS(""" - a = ""; - try { - a += "1"; - throw new Exception("foo"); - a += "2"; - } catch (Exception e) { - a += e.message + "2"; - } finally { - a += "3"; - } - return a; -""") - assert x=="1foo23"; - } - - @Test - void tryAndFinally_BreakInside() { - def x = evalCPS(""" - a = ""; - while (true) { - a += "0" - try { - a += "1"; - break; - a += "2"; - } catch (Exception e) { - a += "3"; - } finally { - a += "4"; - } - a += "5"; - } - return a; -""") - assert x=="014"; - } - - @Test - void tryAndFinally_ContinueInside() { - def x = evalCPS(""" - a = ""; - a += "0" - for (int i=0; i<2; i++) { - a += "1" - try { - a += "2"; - continue; - a += "3"; - } catch (Exception e) { - a += "4"; - } finally { - a += "5"; - } - a += "6"; - } - return a; -""") - assert x=="0125125"; - } - - /** - * Groovy interpreter seems to have a bug in running the finally block when an exception is thrown - * from the catch block, so not using "evalCPS". - */ - @Test - void tryAndFinally_RethrowAndFinallyBlock() { - def x = evalCPSonly(""" - a = ""; - try { - try { - a += "1"; - throw new Exception("foo"); - a += "2"; - } catch (Exception e) { - a += "3"; - throw new RuntimeException(); - a += "4"; - } catch (RuntimeException e) { - a += "6"; - } finally { - a += "5"; - } - } catch (Exception e) { - ; - } - return a; -""") - assert x=="135"; - } - - @Test - void tryAndFinally_returnFromFinally() { - def x = evalCPS(""" - a = ""; - try { - a += "1"; - throw new Exception("foo"); - a += "2"; - } finally { - a += "3"; - return a; - } -""") - assert x=="13"; - } - - @Test - void tryAndFinally_returnFromCatch() { - def x = evalCPS(""" - a = ""; - try { - a += "1"; - throw new Exception("foo"); - a += "2"; - } catch (Exception e) { - a += "3"; - return a; - } finally { - a += "4"; - } -""") - assert x=="13"; - } - - @Test - void tryAndFinally_returnFromCatch2() { - def x = evalCPSonly(""" - a = new StringBuilder(); - try { - a.append("1"); - throw new Exception("foo"); - a.append("2"); - } catch (Exception e) { - a.append("3"); - return a; - } finally { - a.append("4"); - } -""") - assert x.toString()=="134"; - } -} diff --git a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy b/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy deleted file mode 100644 index 81f345c5c..000000000 --- a/lib/src/test/groovy/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.groovy +++ /dev/null @@ -1,503 +0,0 @@ -package com.cloudbees.groovy.cps.sandbox - -import com.cloudbees.groovy.cps.* -import com.cloudbees.groovy.cps.impl.FunctionCallEnv -import groovy.transform.NotYetImplemented -import org.codehaus.groovy.runtime.ProxyGeneratorAdapter -import org.junit.Before -import org.junit.Test -import org.jvnet.hudson.test.Issue -import org.kohsuke.groovy.sandbox.ClassRecorder - -import java.awt.Point -import org.codehaus.groovy.control.MultipleCompilationErrorsException - -import static org.hamcrest.CoreMatchers.containsString -import static org.hamcrest.CoreMatchers.equalTo -import static org.hamcrest.CoreMatchers.instanceOf - -/** - * @author Kohsuke Kawaguchi - */ -public class SandboxInvokerTest extends AbstractGroovyCpsTest { - def cr = new ClassRecorder() - - @Override - protected CpsTransformer createCpsTransformer() { - new SandboxCpsTransformer() - } - - @Before public void zeroIota() { - CpsTransformer.iota.set(0) - } - - /** - * Covers all the intercepted operations. - */ - @Test - public void basic() { - evalCpsSandbox(""" - import java.awt.Point; - - def p = new Point(1,3); // constructor - assert p.equals(p) // method call - assert 4 == p.x+p.y; // property get - p.x = 5; // property set - assert 5 == p.@x; // attribute get - p.@x = 6; // attribute set - - def a = new int[3]; - a[1] = a[0]+7; // array get & set - assert a[1]==7; - """) - - assertIntercept(""" -Script1.super(Script1).setBinding(Binding) -new Point(Integer,Integer) -Point.equals(Point) -Point.x -Point.y -Double.plus(Double) -ScriptBytecodeAdapter:compareEqual(Integer,Double) -Point.x=Integer -Point.@x -ScriptBytecodeAdapter:compareEqual(Integer,Integer) -Point.@x=Integer -int[][Integer] -Integer.plus(Integer) -int[][Integer]=Integer -int[][Integer] -ScriptBytecodeAdapter:compareEqual(Integer,Integer) -""" -) - } - - @Test - public void mixtureOfNonTransformation() { - assert 3==evalCpsSandbox(""" - @NonCPS - def length(x) { - return x.length(); - } - - return length("foo") -""") - assertIntercept(''' -Script1.super(Script1).setBinding(Binding) -Script1.length(String) -String.length() -''') - } - - @Issue("JENKINS-46088") - @Test - void matcherTypeAssignment() { - assert "falsefalse" == evalCpsSandbox(''' - @NonCPS - def nonCPSMatcherMethod(String x) { - java.util.regex.Matcher m = x =~ /bla/ - return m.matches() - } - - def cpsMatcherMethod(String x) { - java.util.regex.Matcher m = x =~ /bla/ - return m.matches() - } - - return "${nonCPSMatcherMethod('foo')}${cpsMatcherMethod('foo')}" -''') - assertIntercept(''' -Script1.super(Script1).setBinding(Binding) -Script1.nonCPSMatcherMethod(String) -ScriptBytecodeAdapter:findRegex(String,String) -Matcher.matches() -Script1.cpsMatcherMethod(String) -ScriptBytecodeAdapter:findRegex(String,String) -Matcher.matches() -new GStringImpl(Object[],String[]) -''') - } - - private Object evalCpsSandbox(String script) { - FunctionCallEnv e = Envs.empty(); - e.invoker = new SandboxInvoker(); - - cr.register() - try { - return parseCps(script).invoke(e, null, Continuation.HALT).run().yield.replay() - } finally { - cr.unregister() - } - } - - def assertIntercept(String... expected) { - assertEquals(expected.join("\n").trim(), cr.toString().trim()) - } - - class TrustedCpsCompiler extends AbstractGroovyCpsTest { - } - - /** - * Untrusted code -> trusted code -> untrusted code. - */ - @Test - public void mixingTrustedAndUntrusted() { - def trusted = new TrustedCpsCompiler(); - trusted.setUp(); - - def untrusted = this; - - untrusted.binding.setVariable("trusted", trusted.csh.parse("def foo(x) { return [new java.awt.Point(1,x),untrusted.bar()] }")); - cr.register() // untrusted.csh.parse instantiates the sandbox-transformed script, so a GroovyInterceptor must be registered when it runs. - try { - trusted.binding.setVariable("untrusted",untrusted.csh.parse("def bar() { return new File('foo') }")); - } finally { - cr.unregister(); - } - - assert [new Point(1,4),new File("foo")]==evalCpsSandbox("trusted.foo(4)"); - assertIntercept(""" -Script1.super(Script1).setBinding(Binding) -Script2.super(Script2).setBinding(Binding) -Script2.trusted -Script1.foo(Integer) -new File(String) -""") - } - - - public static class Base { - @Override - String toString() { - return "base"; - } - - String multipleArgs(String first, String second) { - return "Hello, " + first + " " + second; - } - - String noArg() { - return "No argument" - } - - String oneArg(String first) { - return "Just one arg: " + first - } - - public static String staticMultipleArgs(String first, String second) { - return "Hello, " + first + " " + second; - } - - public static String staticNoArg() { - return "No argument" - } - - public static String staticOneArg(String first) { - return "Just one arg: " + first - } - } - @Test - void superClass() { - assert evalCpsSandbox(''' - class Foo extends SandboxInvokerTest.Base { - public String toString() { - return "x"+super.toString(); - } - } - class Bar extends Foo {} - new Bar().toString(); - ''')=="xbase" - - assertIntercept(''' -Script1.super(Script1).setBinding(Binding) -new Bar() -new Foo() -new SandboxInvokerTest$Base() -Bar.toString() -Bar.super(Foo).toString() -String.plus(String) -''') - } - - @Issue("JENKINS-45982") - @Test - void transformedSuperClass() { - assert evalCpsSandbox(''' - class Foo extends SandboxInvokerTest.Base { - public String other() { - return "base" - } - } - class Bar extends Foo { - public String other() { - return "y"+super.other() - } - } - new Bar().other(); - ''')=="ybase" - - // TODO: add assertIntercept once this can actually work and we know the call tree. - } - - @Issue("SECURITY-551") - @Test public void constructors() { - evalCpsSandbox(''' - import java.awt.Point; - class C { - Point p - C() { - p = new Point(1, 3) - } - } - assert new C().p.y == 3 - ''') - assertIntercept(''' -Script1.super(Script1).setBinding(Binding) -new C() -new Point(Integer,Integer) -C.p -Point.y -ScriptBytecodeAdapter:compareEqual(Double,Integer) -''') - } - - @Issue("SECURITY-551") - @Test public void fields() { - evalCpsSandbox(''' - import java.awt.Point; - class C { - Point p = new Point(1, 3) - } - assert new C().p.y == 3 - ''') - assertIntercept(''' -Script1.super(Script1).setBinding(Binding) -new C() -new Point(Integer,Integer) -C.p -Point.y -ScriptBytecodeAdapter:compareEqual(Double,Integer) -''') - } - - @Issue("SECURITY-551") - @Test public void initializers() { - evalCpsSandbox(''' - import java.awt.Point; - class C { - Point p - { - p = new Point(1, 3) - } - } - assert new C().p.y == 3 - ''') - assertIntercept(''' -Script1.super(Script1).setBinding(Binding) -new C() -new Point(Integer,Integer) -C.p -Point.y -ScriptBytecodeAdapter:compareEqual(Double,Integer) -''') - } - - @Issue("SECURITY-566") - @Test public void typeCoercion() { - ProxyGeneratorAdapter.pxyCounter.set(0); // make sure *_groovyProxy names are predictable - evalCpsSandbox(''' - interface Static { - Locale[] getAvailableLocales() - } - interface Instance { - String getCountry() - } - assert (Locale as Static).getAvailableLocales() != null - assert (Locale as Static).availableLocales != null - assert Locale.getAvailableLocales() != null - assert (Locale.getDefault() as Instance).getCountry() != null - assert (Locale.getDefault() as Instance).country != null - assert Locale.getDefault().getCountry() != null - ''') - assertIntercept(''' -Script1.super(Script1).setBinding(Binding) -Locale:getAvailableLocales() -Class1_groovyProxy.getAvailableLocales() -ScriptBytecodeAdapter:compareNotEqual(Locale[],null) -Locale:getAvailableLocales() -Class1_groovyProxy.availableLocales -ScriptBytecodeAdapter:compareNotEqual(Locale[],null) -Locale:getAvailableLocales() -ScriptBytecodeAdapter:compareNotEqual(Locale[],null) -Locale:getDefault() -Locale.getCountry() -Locale2_groovyProxy.getCountry() -ScriptBytecodeAdapter:compareNotEqual(String,null) -Locale:getDefault() -Locale.getCountry() -Locale2_groovyProxy.country -ScriptBytecodeAdapter:compareNotEqual(String,null) -Locale:getDefault() -Locale.getCountry() -ScriptBytecodeAdapter:compareNotEqual(String,null) -''') - } - - @Issue("SECURITY-567") - @Test - void methodPointers() { - evalCpsSandbox(''' -import java.util.concurrent.Callable -def b = new SandboxInvokerTest.Base() -(b.&noArg)() -(b.&multipleArgs)('Kohsuke', 'Kawaguchi') -(b.&oneArg)('Something') -['Something'].each(b.&oneArg) -Callable c = b.&noArg -c() -def runit(Callable c) {c()} -runit({-> b.noArg()}) -runit(b.&noArg) -runit({-> b.noArg()} as Callable) -runit(b.&noArg as Callable) -''') - assertIntercept(''' -Script1.super(Script1).setBinding(Binding) -new SandboxInvokerTest$Base() -SandboxedMethodClosure.call() -SandboxInvokerTest$Base.noArg() -SandboxedMethodClosure.call(String,String) -SandboxInvokerTest$Base.multipleArgs(String,String) -SandboxedMethodClosure.call(String) -SandboxInvokerTest$Base.oneArg(String) -ArrayList.each(SandboxedMethodClosure) -SandboxInvokerTest$Base.oneArg(String) -SandboxedMethodClosure.call() -SandboxInvokerTest$Base.noArg() -Script1.runit(CpsClosure) -CpsClosure.call() -SandboxInvokerTest$Base.noArg() -Script1.runit(SandboxedMethodClosure) -SandboxedMethodClosure.call() -SandboxInvokerTest$Base.noArg() -Script1.runit(CpsClosure) -CpsClosure.call() -SandboxInvokerTest$Base.noArg() -Script1.runit(SandboxedMethodClosure) -SandboxedMethodClosure.call() -SandboxInvokerTest$Base.noArg() -''') - } - - @Issue("SECURITY-567") - @Test - void methodPointersStatic() { - evalCpsSandbox(''' -(SandboxInvokerTest.Base.&staticMultipleArgs)('Kohsuke', 'Kawaguchi') -(SandboxInvokerTest.Base.&staticNoArg)() -(SandboxInvokerTest.Base.&staticOneArg)('Something') -''') - assertIntercept(''' -Script1.super(Script1).setBinding(Binding) -SandboxedMethodClosure.call(String,String) -SandboxInvokerTest$Base:staticMultipleArgs(String,String) -SandboxedMethodClosure.call() -SandboxInvokerTest$Base:staticNoArg() -SandboxedMethodClosure.call(String) -SandboxInvokerTest$Base:staticOneArg(String) -''') - } - - @Issue("JENKINS-45575") - @Test - void sandboxedMultipleAssignment() { - assert evalCpsSandbox(''' -def (a, b) = ['first', 'second'] -def c, d -(c, d) = ['third', 'fourth'] - -return a + b + c + d -''') == 'firstsecondthirdfourth' - } - - @Issue("JENKINS-45575") - @Test - void typeCoercionMultipleAssignment() { - ProxyGeneratorAdapter.pxyCounter.set(0); // make sure *_groovyProxy names are predictable - evalCpsSandbox(''' - interface Static { - Locale[] getAvailableLocales() - } - interface Instance { - String getCountry() - } - def (a, b) = [Locale as Static, Locale.getDefault() as Instance] - assert a.getAvailableLocales() != null - assert b.country != null -''') - assertIntercept(''' -Script1.super(Script1).setBinding(Binding) -Locale:getAvailableLocales() -Locale:getDefault() -Locale.getCountry() -ArrayList[Integer] -ArrayList[Integer] -Class1_groovyProxy.getAvailableLocales() -ScriptBytecodeAdapter:compareNotEqual(Locale[],null) -Locale2_groovyProxy.country -ScriptBytecodeAdapter:compareNotEqual(String,null) -''') - } - - @Issue("JENKINS-49679") - @Test - void sandboxedMultipleAssignmentRunsMethodOnce() { - assert evalCpsSandbox(''' -alreadyRun = false - -def getAandB() { - if (!alreadyRun) { - alreadyRun = true - return ['first', 'second'] - } else { - return ['bad', 'worse'] - } -} - -def (a, b) = getAandB() -def c, d -(c, d) = ['third', 'fourth'] - -return a + b + c + d -''') == 'firstsecondthirdfourth' - } - - @Issue("SECURITY-1186") - @Test - void finalizerForbidden() { - try { - evalCpsSandbox('class Test { @Override public void finalize() { } }; null'); - fail("Finalizers should be rejected"); - } catch (MultipleCompilationErrorsException e) { - assertThat(e.getErrorCollector().getErrorCount(), equalTo(1)); - Exception innerE = e.getErrorCollector().getException(0); - assertThat(innerE, instanceOf(SecurityException.class)); - assertThat(innerE.getMessage(), containsString("Object.finalize()")); - } - } - - @Issue("SECURITY-1186") - @Test - void nonCpsfinalizerForbidden() { - try { - evalCpsSandbox('class Test { @Override @NonCPS public void finalize() { } }; null'); - fail("Finalizers should be rejected"); - } catch (MultipleCompilationErrorsException e) { - assertThat(e.getErrorCollector().getErrorCount(), equalTo(1)); - Exception innerE = e.getErrorCollector().getException(0); - assertThat(innerE, instanceOf(SecurityException.class)); - assertThat(innerE.getMessage(), containsString("Object.finalize()")); - } - } - -} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java new file mode 100644 index 000000000..35d9cafbd --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java @@ -0,0 +1,106 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; +import groovy.lang.Binding; +import groovy.lang.GroovyShell; +import groovy.lang.Script; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; +import org.codehaus.groovy.control.CompilerConfiguration; +import org.codehaus.groovy.control.customizers.ImportCustomizer; +import static org.hamcrest.CoreMatchers.equalTo; +import org.junit.Assert; +import org.junit.Before; +import org.kohsuke.groovy.sandbox.impl.GroovyCallSiteSelector; + +/** + * + * + * @author Kohsuke Kawaguchi + */ +public abstract class AbstractGroovyCpsTest extends Assert { + /** + * CPS-transforming shelll + */ + private GroovyShell csh; + + /** + * Default groovy shell + */ + private GroovyShell sh; + + private Binding binding = new Binding(); + + @Before + public void setUp() { + ImportCustomizer imports = new ImportCustomizer(); + imports.addStarImports("com.cloudbees.groovy.cps", getClass().getPackage().getName()); + + CompilerConfiguration cc = new CompilerConfiguration(); + cc.addCompilationCustomizers(imports); + cc.addCompilationCustomizers(createCpsTransformer()); + cc.setScriptBaseClass(SerializableScript.class.getName()); + csh = new GroovyShell(binding,cc); + + cc = new CompilerConfiguration(); + cc.addCompilationCustomizers(imports); + sh = new GroovyShell(binding,cc); + } + + public GroovyShell getCsh() { + return csh; + } + + public Binding getBinding() { + return binding; + } + + protected CpsTransformer createCpsTransformer() { + return new CpsTransformer(); + } + + public void assertEvaluate(Object expectedResult, String script) throws Throwable { + Object actualCps = evalCPSonly(script); + String actualCpsType = GroovyCallSiteSelector.getName(actualCps); + String expectedType = GroovyCallSiteSelector.getName(expectedResult); + assertThat("CPS-transformed result (" + actualCpsType + ") does not match expected result (" + expectedType + ")", actualCps, equalTo(expectedResult)); + Object actualNonCps = sh.evaluate(script); + String actualNonCpsType = GroovyCallSiteSelector.getName(actualNonCps); + assertThat("Non-CPS-transformed result (" + actualNonCpsType + ") does not match expected result (" + expectedType + ")", actualNonCps, equalTo(expectedResult)); + } + + public Object evalCPS(String script) throws Throwable { + Object resultInCps = evalCPSonly(script); + assertThat(resultInCps, equalTo(sh.evaluate(script))); // make sure that regular non-CPS execution reports the same result + return resultInCps; + } + + public Object evalCPSonly(String script) throws Throwable { + return parseCps(script).invoke(null, null, Continuation.HALT).run(10000).replay(); + } + + public CpsCallableInvocation parseCps(String script) { + Script s = csh.parse(script); + try { + s.run(); + fail("Expecting CPS transformation"); + } catch (CpsCallableInvocation inv) { + return inv; + } + throw new AssertionError("Expecting CpsCallableInvocation"); + } + + public T roundtripSerialization(T cx) throws ClassNotFoundException, IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + new ObjectOutputStream(baos).writeObject(cx); + + ObjectInputStreamWithLoader ois = new ObjectInputStreamWithLoader( + new ByteArrayInputStream(baos.toByteArray()), + csh.getClassLoader()); + + return (T)ois.readObject(); + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/ContinuableTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/ContinuableTest.java new file mode 100644 index 000000000..a3f045fe8 --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/ContinuableTest.java @@ -0,0 +1,261 @@ +package com.cloudbees.groovy.cps; + +import groovy.lang.Script; +import org.junit.Test; + +import java.lang.reflect.InvocationTargetException; +import java.util.stream.Collectors; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.CoreMatchers.instanceOf; + +/** + * + * + * @author Kohsuke Kawaguchi + */ +public class ContinuableTest extends AbstractGroovyCpsTest { + @Test + public void resumeAndSuspend() throws Throwable { + Script s = getCsh().parse( + "int x = 1;\n" + + "x = Continuable.suspend(x+1)\n" + + "return x+1;\n"); + + Continuable c = new Continuable(s); + assertTrue(c.isResumable()); + + Object v = c.run(null); + assertEquals("Continuable.suspend(x+1) returns the control back to us", 2, v); + + assertTrue("Continuable is resumable because it has 'return x+1' to execute.", c.isResumable()); + assertEquals("We resume continuable, then the control comes back from the return statement", 4, c.run(3)); + + assertFalse("We've run the program till the end, so it's no longer resumable", c.isResumable()); + } + + @Test + public void serializeComplexContinuable() throws Throwable { + Script s = getCsh().parse( + "def foo(int x) {\n" + + " return Continuable.suspend(x);\n" + + "}\n" + + "def plus3(int x) {\n" + + " return x+3;\n" + + "}\n" + + "try {\n" + + " for (int x=0; x<1; x++) {\n" + + " while (true) {\n" + + " y = plus3(foo(5))\n" + + " break;\n" + + " }\n" + + " }\n" + + "} catch (ClassCastException e) {\n" + + " y = e;\n" + + "}\n" + + "return y;\n"); + + Continuable c = new Continuable(s); + assertEquals("suspension within a subroutine", 5, c.run(null)); + + c = roundtripSerialization(c); // at this point there's a fairly non-trivial Continuation, so try to serialize it + + assertTrue(c.isResumable()); + assertEquals(9, c.run(6)); + } + + @Test + public void howComeBindingIsSerializable() throws Throwable { + Script s = getCsh().parse( + "Continuable.suspend(42);\n" + + "return value;\n"); + s.setProperty("value",15); + Continuable c = new Continuable(s); + assertEquals(42, c.run(null)); + + c = roundtripSerialization(c); + + assertTrue(c.isResumable()); + assertEquals(15, c.run(null)); + } + + @Test + public void suspend_at_the_end_should_still_count_as_resumable() throws Throwable { + Script s = getCsh().parse("Continuable.suspend(5);"); + Continuable c = new Continuable(s); + assertEquals(5, c.run(null)); + assertTrue(c.isResumable()); + c.run(null); + assertFalse(c.isResumable()); + } + + /** + * Exception not handled in script will be thrown from Continuable.run + */ + @Test + public void unhandled_exception() throws Throwable { + Script s = getCsh().parse("throw new " + ContinuableTest.class.getName() + ".HelloException()"); + Continuable c = new Continuable(s); + try { + c.run(null); + fail("should have thrown exception"); + } catch (InvocationTargetException e) { + assertFalse(c.isResumable()); + assertThat(e.getCause(), instanceOf(HelloException.class)); + } + } + + public static class HelloException extends Exception {} + + /** + * Object passed to {@link Continuable#suspend(Object)} isn't accessible when Continuable + * resumes, so it shouldn't be a part of the persisted object graph. + */ + @Test + public void yieldObjectShouldNotBeInObjectGraph() throws Throwable { + Script s = getCsh().parse("Continuable.suspend(new ContinuableTest.ThisObjectIsNotSerializable());"); + Continuable c = new Continuable(s); + Object r = c.run(null); + assertThat(r, instanceOf(ThisObjectIsNotSerializable.class)); + + c = roundtripSerialization(c); + + assertTrue(c.isResumable()); + assertEquals(42, c.run(42)); + } + + public static class ThisObjectIsNotSerializable {} + + /** + * Tests {@link Continuable#getStackTrace()}. + */ + @Test + public void stackTrace() throws Throwable { + Script s = getCsh().parse( + "\n" + + "\n" + + "def x(i,v) {\n" + + " if (i>0)\n" + + " y(i-1,v);\n" + // line 5 + " else\n" + + " Continuable.suspend(v);\n" + // line 7 + "}\n" + + "\n" + + "def y(i,v) {\n" + + " if (i>0)\n" + + " x(i-1,v);\n" + // line 12 + " else\n" + + " Continuable.suspend(v);\n" + // line 14 + "}\n" + + "\n" + + "x(5,3); // line 17\n"); + + Continuable c = new Continuable(s); + + // stack trace is empty if it hasn't been started + assertTrue(c.getStackTrace().isEmpty()); + + Object v = c.run(null); + assertEquals(3, v); + + assertThat(c.getStackTrace().stream().map(Object::toString).collect(Collectors.toList()), + hasItems( + containsString("Script1.y(Script1.groovy:14)"), + containsString("Script1.x(Script1.groovy:5)"), + containsString("Script1.y(Script1.groovy:12)"), + containsString("Script1.x(Script1.groovy:5)"), + containsString("Script1.y(Script1.groovy:12)"), + containsString("Script1.x(Script1.groovy:5)"), + containsString("Script1.run(Script1.groovy:17)"))); + + c.run(null); + + // stack trace is empty if there's nothing more to execute + assertTrue(c.getStackTrace().isEmpty()); + } + + /** + * Triggers the use of {@link org.codehaus.groovy.ast.expr.StaticMethodCallExpression} + */ + @Test + public void staticMethod1() throws Throwable { + Script s = getCsh().parse("import static java.lang.Class.forName; forName('java.lang.Integer')"); + Continuable c = new Continuable(s); + Object r = c.run(null); + assertEquals(Integer.class, r); + } + + /** + * Static method call expression with two arguments + */ + @Test + public void staticMethod2() throws Throwable { + Script s = getCsh().parse("import static java.lang.Integer.toString; toString(31,16)"); + Continuable c = new Continuable(s); + Object r = c.run(null); + assertEquals("1f", r); + } + + /** + * Static method call expression with no arguments + */ + @Test + public void staticMethod0() throws Throwable { + Script s = getCsh().parse("import static com.cloudbees.groovy.cps.ContinuableTest.StaticMethodHost.methodWithNoArgs; methodWithNoArgs()"); + Continuable c = new Continuable(s); + Object r = c.run(null); + assertEquals("hello", r); + } + + public static class StaticMethodHost { + public static String methodWithNoArgs() { + return "hello"; + } + } + + /** + * Start running one Continuable, interrupt that and run something else, then come back to it. + * + */ + @Test + public void concatenate() throws Throwable { + Script s = getCsh().parse( + "def plus2(i) { return i+2; }\n" + + "def i=1;\n" + + "x = Continuable.suspend('pause1');\n" + // this will jump to another script and then come back + "return plus2(i+x);\n"); + + // let the script run to the suspend point + Continuable c = new Continuable(s); + assertEquals("pause1", c.run(null)); + + Script s2 = getCsh().parse("return 16+Continuable.suspend('pause2')+32;"); + + // now create a new Continuable that evaluates s2 first, then come back to where we paused in 'c' + final Continuable pause = c; + c = new Continuable(s2,null,new Continuation() { + @Override + public Next receive(Object o) { + // when s2 is done, hand off the value to pause1 to resume execution from there + return Next.go0(new Outcome((int)o+64,null),pause); + } + }); + + // the point of all this trouble is that once the new 'c' is created, the rest of the code + // doesn't have to know that the new Continuable is a composite of two Continuables. + + + + assertEquals("pause2", c.run(null)); + + // s2 evaluates, then the result goes back to pause1 after +64 adjustment above + // and the whole thing completes + Object r = c.run(128); + + assertFalse(c.isResumable()); // it should have been completed + + assertEquals(1+2 +16+32 +64+128, r); + } + +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java new file mode 100644 index 000000000..68b1f8d2a --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java @@ -0,0 +1,374 @@ +package com.cloudbees.groovy.cps; + +import java.math.BigDecimal; +import java.util.AbstractMap; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import org.codehaus.groovy.runtime.InvokerHelper; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import static java.util.Arrays.asList; + + +@RunWith(Parameterized.class) +public class CpsDefaultGroovyMethodsTest extends AbstractGroovyCpsTest { + private String testName; + private String testCode; + private Object testResult; + + public CpsDefaultGroovyMethodsTest(String testName, String testCode, Object testResult) { + this.testName = testName; + this.testCode = testCode; + this.testResult = testResult; + } + + @Parameterized.Parameters(name="{0}") + public static Iterable generateParameters() { + // First element is the name of the test + // Second element is the code to eval + // Third element is expected result + List> rawTests = asList( + // .any + asList("any", "return [0, 1, 2].any { i -> i == 1 }", true), + asList("anyMapKV", "return [a: 0, b: 1, c: 2].any { k, v -> v == 1 }", true), + asList("anyMapEntry", "return [a: 0, b: 1, c: 2].any { e -> e.value == 1 }", true), + asList("anyFalse", "return [0, 1, 2].any { i -> i > 2 }", false), + + // TODO: asType? + + // .collect + asList("collectList", "return [1, 2, 3].collect { it * 2 }", asList(2, 4, 6)), + asList("collectListIntoExistingList", "def existing = [2]\n" + + "return [2, 3, 4].collect(existing) { it * 2 }", asList(2, 4, 6, 8)), + asList("collectListIntoExistingSet", "return [2, 3, 4].collect([2] as HashSet) { it * 2 }", + set(2, 4, 6, 8)), + asList("collectSet", "return ([1, 2, 3] as HashSet).collect { it * 2 }", asList(2, 4, 6)), + asList("collectSetIntoExistingList", "def existing = [2]\n" + + "return ([2, 3, 4] as HashSet).collect(existing) { it * 2 }", asList(2, 4, 6, 8)), + asList("collectSetIntoExistingSet", "return ([2, 3, 4] as HashSet).collect([2] as HashSet) { it * 2 }", + set(2, 4, 6, 8)), + asList("collectMapKV", "def m = [a: 1, b: 2, c: 3];\n" + + "return m.collect { k, v -> v }", asList(1, 2, 3)), + asList("collectMapEntry", "def m = [a: 1, b: 2, c: 3];\n" + + "return m.collect { e -> e.value }", asList(1, 2, 3)), + asList("collectMapKVIntoExistingList", "def m = [a: 2, b: 3, c: 4];\n" + + "return m.collect([1]) { k, v -> v }", asList(1, 2, 3, 4)), + asList("collectMapEntryIntoExistingList", "def m = [a: 2, b: 3, c: 4];\n" + + "return m.collect([1]) { e -> e.value }", asList(1, 2, 3, 4)), + asList("collectMapKVIntoExistingSet", "def m = [a: 2, b: 3, c: 4];\n" + + "return m.collect([1] as HashSet) { k, v -> v }", set(1, 2, 3, 4)), + asList("collectMapEntryIntoExistingSet", "def m = [a: 2, b: 3, c: 4];\n" + + "return m.collect([1] as HashSet) { e -> e.value }", set(1, 2, 3, 4)), + + // .collectEntries + asList("collectEntriesKV", "def m = [a: 1, b: 2, c: 3]\n" + + "return m.collectEntries { k, v -> [(k): v * 2] }", map("a", 2, "b", 4, "c", 6)), + asList("collectEntriesEntry", "def m = [a: 1, b: 2, c: 3]\n" + + "return m.collectEntries { e -> [(e.key): e.value * 2] }", map("a", 2, "b", 4, "c", 6)), + asList("collectEntriesIntoExistingMapKV", "def m = [b: 2, c: 3]\n" + + "return m.collectEntries([a: 2]) { k, v -> [(k): v * 2] }", map("a", 2, "b", 4, "c", 6)), + asList("collectEntriesIntoExistingMapEntry", "def m = [b: 2, c: 3]\n" + + "return m.collectEntries([a: 2]) { e -> [(e.key): e.value * 2] }", map("a", 2, "b", 4, "c", 6)), + asList("collectEntriesArray", "return ([1, 2, 3] as Integer[]).collectEntries { i -> [(i): i * 2] }", map(1, 2, 2, 4, 3, 6)), + asList("collectEntriesArrayExistingMap", "return ([2, 3] as Integer[]).collectEntries([1: 2]) { i -> [(i): i * 2] }", map(1, 2, 2, 4, 3, 6)), + asList("collectEntriesList", "return [1, 2, 3].collectEntries { i -> [(i): i * 2] }", map(1, 2, 2, 4, 3, 6)), + asList("collectEntriesListExistingMap", "return [2, 3].collectEntries([1: 2]) { i -> [(i): i * 2] }", map(1, 2, 2, 4, 3, 6)), + + // .collectMany + asList("collectMany", "(0..5).collectMany { [it, 2*it ]}", asList(0,0,1,2,2,4,3,6,4,8,5,10)), + asList("collectManyExistingList", "(1..5).collectMany([0,0]) { [it, 2*it ]}", asList(0,0,1,2,2,4,3,6,4,8,5,10)), + asList("collectManyArray", "([0, 1, 2, 3, 4, 5] as Integer[]).collectMany { [it, 2*it ]}", asList(0,0,1,2,2,4,3,6,4,8,5,10)), + asList("collectManyMapKV", "[a:0,b:1,c:2].collectMany { k,v -> [v, 2*v ]}", asList(0,0,1,2,2,4)), + asList("collectManyMapKVExistingList", "[b:1,c:2].collectMany([0,0]) { k,v -> [v, 2*v ]}", asList(0,0,1,2,2,4)), + asList("collectManyMapEntry", "[a:0,b:1,c:2].collectMany { e -> [e.value, 2*e.value ]}", asList(0,0,1,2,2,4)), + asList("collectManyMapEntryExistingList", "[b:1,c:2].collectMany([0,0]) { e -> [e.value, 2*e.value ]}", asList(0,0,1,2,2,4)), + + // .collectNested + asList("collectNested", "[[0,1,2],[3,4]].collectNested { i -> i * 2 }", asList(asList(0,2,4),asList(6,8))), + asList("collectNestedExistingList", "[[0,1,2],[3,4]].collectNested(['test']) { i -> i * 2 }", asList("test", asList(0,2,4),asList(6,8))), + + // .combinations + // TODO { x, y -> x*y } does not work as CpsTransformer apparently does not grok how to deconstruct array arguments + asList("combinations", "[[2, 3],[4, 5, 6]].combinations { xy -> xy[0] * xy[1] }", asList(8, 12, 10, 15, 12, 18)), + + // .count + asList("countList", "[1, 2, 3].count { i -> i > 1 }", 2), + asList("countArray", "([1, 2, 3] as Integer[]).count { i -> i > 1 }", 2), + asList("countMapKV", "[a: 1, b: 2, c: 3].count { k, v -> v > 1 }", 2), + asList("countMapEntry", "[a: 1, b: 2, c: 3].count { e -> e.value > 1 }", 2), + + // .countBy + asList("countByList", "['aaa', 'bbb', 'cc'].countBy { i -> i.length() }", map(3, 2, 2, 1)), + asList("countByArray", "(['aaa', 'bbb', 'cc'] as String[]).countBy { i -> i.length() }", map(3, 2, 2, 1)), + asList("countByMapKV", "[a: 'aaa', b: 'bbb', c: 'cc'].countBy { k, v -> v.length() }", map(3, 2, 2, 1)), + asList("countByMapEntry", "[a: 'aaa', b: 'bbb', c: 'cc'].countBy { e -> e.value.length() }", map(3, 2, 2, 1)), + + // TODO: downto + + /* TODO: Waiting for dropWhile support + // .dropWhile + asList("dropWhileList", "[1, 2, 3].dropWhile { i -> i < 2 }", asList(2, 3)), + asList("dropWhileSet", "([1, 2, 3) as HashSet].dropWhile { i -> i < 2 }", asList(2, 3) as HashSet), + asList("dropWhileSortedSet", "([1, 2, 3) as TreeSet].dropWhile { i -> i < 2 }", asList(2, 3) as TreeSet), + asList("dropWhileMapKV", "[a: 1, b: 2, c: 3].dropWhile { k, v -> v < 2 }", [b: 2, c: 3]), + asList("dropWhileMapEntry", "[a: 1, b: 2, c: 3].dropWhile { e -> e.value < 2 }", [b: 2, c: 3]), + */ + + // .each + asList("each", "def x = 100; (0..10).each { y -> x+=y }; return x", 155), + asList("eachArray", "def x = 10;\n" + + "([1, 2, 3] as Integer[]).each { y -> x+=y; }\n" + + "return x;", 16), + asList("eachMapKV", "def x = 100\n" + + "def m = [a: 1, b: 2, c: 3];\n" + + "m.each { k, v -> x += v }\n" + + "return x;", 106), + asList("eachMapEntry", "def x = 100\n" + + "def m = [a: 1, b: 2, c: 3];\n" + + "m.each { e -> x += e.value }\n" + + "return x;", 106), + asList("eachSet", "def x = 100\n" + + "([1,2,3] as HashSet).each { y -> x += y }\n" + + "return x", 106), + asList("eachSortedSet", "def x = 100\n" + + "([1,2,3] as TreeSet).each { y -> x += y }\n" + + "return x", 106), + + // TODO: eachByte + + // TODO: eachCombination + + // .eachPermutation + asList("eachPermutation", "def l = [] as Set; ['a', 'b', 'c'].eachPermutation { i -> l << i }; return l", + set(asList("a", "b", "c"), asList("a", "c", "b"), asList("b", "a", "c"), asList("b", "c", "a"), asList("c", "a", "b"), asList("c", "b", "a"))), + + // .eachWithIndex + asList("eachWithIndex", "def x = 100; (0..10).eachWithIndex { y, i -> x+=y; x+=i }; return x", 210), + asList("eachWithIndexArray", "def x = 10;\n" + + "([1, 2, 3] as Integer[]).eachWithIndex { y, i -> x+=y; x+=i }\n" + + "return x;", 19), + asList("eachWithIndexMapKV", "def x = 100\n" + + "def m = [a: 1, b: 2, c: 3];\n" + + "m.eachWithIndex { k, v, i -> x += v; x+=i}\n" + + "return x;", 109), + asList("eachWithIndexMapEntry", "def x = 100\n" + + "def m = [a: 1, b: 2, c: 3];\n" + + "m.eachWithIndex { e, i -> x += e.value; x+=i }\n" + + "return x;", 109), + asList("eachWithIndexSet", "def x = 100\n" + + "([1,2,3] as HashSet).eachWithIndex { y, i -> x += y; x+=i }\n" + + "return x", 109), + asList("eachWithIndexSortedSet", "def x = 100\n" + + "([1,2,3] as TreeSet).eachWithIndex { y, i -> x += y; x+=i }\n" + + "return x", 109), + + // .every + asList("every", "return [0, 1, 2].every { i -> i < 3 }", true), + asList("everyMapKV", "return [a: 0, b: 1, c: 2].every { k, v -> v < 3 }", true), + asList("everyMapEntry", "return [a: 0, b: 1, c: 2].every { e -> e.value < 3 }", true), + asList("everyFalse", "return [0, 1, 2].every { i -> i < 2 }", false), + + // .find + asList("findList", "[1, 2, 3].find { i -> i == 2 }", 2), + asList("findArray", "([1, 2, 3] as Integer[]).find { i -> i == 2 }", 2), + asList("findMapKV", "[a: 1, b: 2, c: 3].find { k, v -> v == 2 }", map("b", 2).entrySet().iterator().next()), + asList("findMapEntry", "[a: 1, b: 2, c: 3].find { e -> e.value == 2 }", map("b", 2).entrySet().iterator().next()), + + // .findAll + asList("findAllList", "[1, 2, 3].findAll { i -> i > 1 }", asList(2, 3)), + asList("findAllArray", "([1, 2, 3] as Integer[]).findAll { i -> i > 1 }", asList(2, 3)), + asList("findAllSet", "([1, 2, 3] as HashSet).findAll { i -> i > 1 }", set(2, 3)), + asList("findAllMapKV", "[a: 1, b: 2, c: 3].findAll { k, v -> v > 1 }", map("b", 2, "c", 3)), + asList("findAllMapEntry", "[a: 1, b: 2, c: 3].findAll { e -> e.value > 1 }", map("b", 2, "c", 3)), + + // .findIndexOf + asList("findIndexOf", "[1, 2, 3].findIndexOf { i -> i == 2 }", 1), + + // .findIndexValues + asList("findIndexValues", "[0, 0, 1, 1, 2, 2].findIndexValues { i -> i == 1 }", asList(2L, 3L)), + + // .findLastIndexOf + asList("findLastIndexOf", "[0, 0, 1, 1, 2, 2].findLastIndexOf { i -> i == 1 }", 3), + + // .findResult + asList("findResultList", "[1, 2, 3].findResult { i -> if (i > 2) { return 'I found ' + i } }", "I found 3"), + asList("findResultListDefault", "[1, 2, 3].findResult('default') { i -> if (i > 3) { return 'I found ' + i } }", "default"), + asList("findResultMapKV", "[a: 1, b: 2, c: 3].findResult { k, v -> if (v > 2) { return 'I found ' + v } }", "I found 3"), + asList("findResultMapKVDefault", "[a: 1, b: 2, c: 3].findResult('default') { k, v -> if (v > 3) { return 'I found ' + v } }", "default"), + asList("findResultMapEntry", "[a: 1, b: 2, c: 3].findResult { e -> if (e.value > 2) { return 'I found ' + e.value } }", "I found 3"), + asList("findResultMapEntryDefault", "[a: 1, b: 2, c: 3].findResult('default') { e -> if (e.value > 3) { return 'I found ' + e.value } }", "default"), + + // .findResults + asList("findResultsList", "[1, 2, 3].findResults { i -> if (i > 1) { return 'I found ' + i } }", asList("I found 2", "I found 3")), + asList("findResultsMapKV", "[a: 1, b: 2, c: 3].findResults { k, v -> if (v > 1) { return 'I found ' + v } }", asList("I found 2", "I found 3")), + asList("findResultsMapEntry", "[a: 1, b: 2, c: 3].findResults { e -> if (e.value > 1) { return 'I found ' + e.value } }", asList("I found 2", "I found 3")), + + // .flatten + asList("flatten", "[[0, 1], 'ab', 2].flatten { i -> def ans = i.iterator().toList(); ans != [i] ? ans : i }", + asList(0, 1, "a", "b", 2)), + + // .groupBy + asList("groupByList", "[1, 'a', 2, 'b', 3.5, 4.6].groupBy { i -> i.class.simpleName }", + map("Integer", asList(1, 2), "String", asList("a", "b"), "BigDecimal", asList(new BigDecimal("3.5"), new BigDecimal("4.6")))), + asList("groupByListMultipleCriteria", "[1, 'a', 2, 'b', 3.5, 4.6].groupBy({ i -> i.class.simpleName }, { it.class == Integer ? 'integer' : 'non-integer' })", + map("Integer", map("integer", asList(1, 2)), "String", map("non-integer", asList("a", "b")), "BigDecimal", map("non-integer", asList(new BigDecimal("3.5"), new BigDecimal("4.6"))))), + asList("groupByArray", "([1, 'a', 2, 'b', 3.5, 4.6] as Object[]).groupBy { i -> i.class.simpleName }", + map("Integer", asList(1, 2), "String", asList("a", "b"), "BigDecimal", asList(new BigDecimal("3.5"), new BigDecimal("4.6")))), + asList("groupByArrayMultipleCriteria", "([1, 'a', 2, 'b', 3.5, 4.6] as Object[]).groupBy({ i -> i.class.simpleName }, { it.class == Integer ? 'integer' : 'non-integer' })", + map("Integer", map("integer", asList(1, 2)), "String", map("non-integer", asList("a", "b")), "BigDecimal", map("non-integer", asList(new BigDecimal("3.5"), new BigDecimal("4.6"))))), + asList("groupByMapKV", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy { k, v -> v.class.simpleName }", + map("Integer", map(1, 1, 3, 2), "String", map(2, "a", 4, "b"), "BigDecimal", map(5, new BigDecimal("3.5"), 6, new BigDecimal("4.6")))), + asList("groupByMapKVMultipleCriteria", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy({ k, v -> v.class.simpleName }, { k, v -> v.class == Integer ? 'integer' : 'non-integer' })", + map("Integer", map("integer", map(1, 1, 3, 2)), "String", map("non-integer", map(2, "a", 4, "b")), "BigDecimal", map("non-integer", map(5, new BigDecimal("3.5"), 6, new BigDecimal("4.6"))))), + asList("groupByMapEntry", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy { e -> e.value.class.simpleName }", + map("Integer", map(1, 1, 3, 2), "String", map(2, "a", 4, "b"), "BigDecimal", map(5, new BigDecimal("3.5"), 6, new BigDecimal("4.6")))), + asList("groupByMapEntryMultipleCriteria", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupBy({ e -> e.value.class.simpleName }, { e -> e.value.class == Integer ? 'integer' : 'non-integer' })", + map("Integer", map("integer", map(1, 1, 3, 2)), "String", map("non-integer", map(2, "a", 4, "b")), "BigDecimal", map("non-integer", map(5, new BigDecimal("3.5"), 6, new BigDecimal("4.6"))))), + + // .groupEntriesBy + asList("groupEntriesByMapKV", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupEntriesBy { k, v -> v.class.simpleName }", + map("Integer", asList(mapEntry(1, 1), mapEntry(3, 2)), "String", asList(mapEntry(2, "a"), mapEntry(4, "b")), "BigDecimal", asList(mapEntry(5, new BigDecimal("3.5")), mapEntry(6, new BigDecimal("4.6"))))), + asList("groupEntriesByMapEntry", "[1: 1, 2: 'a', 3: 2, 4: 'b', 5: 3.5, 6: 4.6].groupEntriesBy { e -> e.value.class.simpleName }", + map("Integer", asList(mapEntry(1, 1), mapEntry(3, 2)), "String", asList(mapEntry(2, "a"), mapEntry(4, "b")), "BigDecimal", asList(mapEntry(5, new BigDecimal("3.5")), mapEntry(6, new BigDecimal("4.6"))))), + + // TODO: identity + + // .inject + asList("injectList", "[1, 2, 3].inject(4) { c, i -> c + i }", 10), + asList("injectListNoInitialValue", "[1, 2, 3].inject { c, i -> c + i }", 6), + asList("injectArray", "([1, 2, 3] as Integer[]).inject(4) { c, i -> c + i }", 10), + asList("injectArrayNoInitialValue", "([1, 2, 3] as Integer[]).inject { c, i -> c + i }", 6), + asList("injectMapKV", "[a: 1, b: 2, c: 3].inject(4) { c, k, v -> c + v }", 10), + asList("injectMapEntry", "[a: 1, b: 2, c: 3].inject(4) { c, e -> c + e.value }", 10), + + // .max + asList("maxList", "[42, 35, 17, 100].max {i -> i.toString().toList().collect {it.toInteger()}.sum() }", 35), + asList("maxArray", "([42, 35, 17, 100] as Integer[]).max { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 35), + /* TODO ClosureComparator + asList("maxMap", "[a: 42, b: 35, c: 17, d: 100].max { first, second -> first.value.toString().toList().collect {it.toInteger()}.sum() <=> second.value.toString().toList().collect {it.toInteger()}.sum() }", [b: 35].entrySet().iterator().next()), + */ + + // TODO: metaClass + + // .min + asList("minList", "[42, 35, 17, 100].min { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 100), + asList("minArray", "([42, 35, 17, 100] as Integer[]).min { i -> i.toString().toList().collect {it.toInteger()}.sum() }", 100), + /* TODO ClosureComparator + asList("minMap", "[a: 42, b: 35, c: 17, d: 100].min { first, second -> first.value.toString().toList().collect {it.toInteger()}.sum() <=> second.value.toString().toList().collect {it.toInteger()}.sum() }", [d: 100].entrySet().iterator().next()), + */ + + // .permutations + asList("permutations", "[1, 2, 3].permutations { i -> i.collect { v -> v * 2 } } as Set", set(asList(2, 4, 6), asList(2, 6, 4), asList(4, 2, 6), asList(4, 6, 2), asList(6, 2, 4), asList(6, 4, 2))), + + // TODO: print and println? + + // .removeAll + asList("removeAll", "def l = [1, 2, 3]; l.removeAll { i -> i == 2 }; return l", asList(1, 3)), + + // .retainAll + asList("retainAll", "def l = [1, 2, 3, 4]; l.retainAll { i -> i % 2 == 0 }; return l", asList(2, 4)), + + // .reverseEach + asList("reverseEachList", "def r = ''; ['a', 'b', 'c'].reverseEach { i -> r += i }; return r", "cba"), + asList("reverseEachArray", "def r = ''; (['a', 'b', 'c'] as String[]).reverseEach { i -> r += i }; return r", "cba"), + asList("reverseEachMapKV", "def r = ''; ['a': 1, 'b': 2, 'c': 3].reverseEach { k, v -> r += k }; return r", "cba"), + asList("reverseEachMapEntry", "def r = ''; ['a': 1, 'b': 2, 'c': 3].reverseEach { e -> r += e.key }; return r", "cba"), + + /* TODO would need to translate OrderBy and ClosureComparator + // .sort + asList("sortList", "[3, 1, -2, -4].sort { i -> i * i }", [1, -2, 3, -4]), + asList("sortArray", "([3, 1, -2, -4] as Integer[]).sort { i -> i * i }", [1, -2, 3, -4]), + asList("sortMapEntryByKey", "[a: 3, c: 1, b: -2, d: -4].sort { e -> e.key }", [a: 3, b: -2, c: 1, d: -4]), + asList("sortMapEntryByValue", "[a: 3, c: 1, b: -2, d: -4].sort { e -> e.value }", [d: -4, b: -2, c: 1, a: 3]), + */ + + // .split + asList("splitList", "[1, 2, 3, 4].split { i -> i % 2 == 0 }", asList(asList(2, 4), asList(1, 3))), + asList("splitSet", "([1, 2, 3, 4] as HashSet).split { i -> i % 2 == 0 }", asList(set(2, 4), set(1, 3))), + + // TODO: step? + + // .sum + asList("sumList", "['a', 'bb', 'ccc'].sum { i -> i.length() }", 6), + asList("sumListInitialValue", "['a', 'bb', 'ccc'].sum(4) { i -> i.length() }", 10), + asList("sumArray", "(['a', 'bb', 'ccc'] as String[]).sum { i -> i.length() }", 6), + asList("sumArrayInitialValue", "(['a', 'bb', 'ccc'] as String[]).sum(4) { i -> i.length() }", 10), + + /* TODO: waiting for takeWhile support + // .takeWhile + asList("takeWhileList", "[1, 2, 3].takeWhile { i -> i < 3 }", asList(1, 2)), + asList("takeWhileSet", "([1, 2, 3) as HashSet].takeWhile { i -> i < 3 }", asList(1, 2) as HashSet), + asList("takeWhileSortedSet", "([1, 2, 3) as TreeSet].takeWhile { i -> i < 3 }", asList(1, 2) as TreeSet), + asList("takeWhileMapKV", "[a: 1, b: 2, c: 3].takeWhile { k, v -> v < 3 }", [a: 1, b: 2]), + asList("takeWhileMapEntry", "[a: 1, b: 2, c: 3].takeWhile { e -> e.value < 3 }", [a: 1, b: 2]), + */ + + // TODO: times + + /* TODO as above + // .toSorted + asList("toSortedList", "[3, 1, -2, -4].toSorted { i -> i * i }", [1, -2, 3, -4]), + asList("toSortedArray", "([3, 1, -2, -4] as Integer[]).toSorted { i -> i * i }", [1, -2, 3, -4]), + asList("toSortedMapEntryByKey", "[a: 3, c: 1, b: -2, d: -4].toSorted { e -> e.key }", [a: 3, b: -2, c: 1, d: -4]), + asList("toSortedMapEntryByValue", "[a: 3, c: 1, b: -2, d: -4].toSorted { e -> e.value }", [d: -4, b: -2, c: 1, a: 3]), + */ + + /* TODO: waiting for toUnique support + // .toUnique + asList("toUniqueList", "[1, 2, -2, 3].toUnique { i -> i * i }", asList(1, 2, 3)), + asList("toUniqueArray", "([1, 2, -2, 3] as Integer[]).toUnique { i -> i * i }", asList(1, 2, 3)), + asList("toUniqueSet", "([1, 2, -2, 3] as HashSet).toUnique { i -> i * i }", asList(1, 2, 3) as HashSet), + */ + + /* TODO also relies on OrderBy & ClosureComparator + // .unique + asList("uniqueList", "[1, 2, -2, 3].unique { i -> i * i }", asList(1, 2, 3)), + asList("uniqueSet", "([1, 2, -2, 3] as HashSet).unique { i -> i * i }.collect { it.abs() } as HashSet", asList(1, 2, 3) as HashSet), + */ + + // TODO: use? + + // TODO: with? + + // .withDefault + asList("withDefaultList", "[].withDefault { i -> i * 2 }.get(1)", 2), + asList("withDefaultMap", "[:].withDefault { k -> k * 2 }.get(1)", 2) + + ); + + assertEquals("Duplicate test names", Collections.emptyList(), rawTests.stream() + .collect(Collectors.groupingBy(l -> l.get(0))) + .entrySet() + .stream() + .filter(e -> e.getValue().size() > 1) + .map(Map.Entry::getKey) + .collect(Collectors.toList())); + + return rawTests.stream().map(Collection::toArray).collect(Collectors.toList()); + } + + @Test + public void sync() throws Throwable { + assertEvaluate(testResult, testCode); + } + + private static Map map(Object... values) { + return InvokerHelper.createMap(values); + } + + private static Map.Entry mapEntry(A key, B value) { + return new AbstractMap.SimpleImmutableEntry<>(key, value); + } + + private static Set set(Object... values) { + return new HashSet<>(asList(values)); + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.java new file mode 100644 index 000000000..9084abcbc --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.java @@ -0,0 +1,68 @@ +package com.cloudbees.groovy.cps; + +import java.util.Arrays; +import org.junit.Ignore; +import org.junit.Test; + + +public class CpsStringGroovyMethodsTest extends AbstractGroovyCpsTest { + @Test + public void eachMatch() throws Throwable { + assertEvaluate(2, + "int matchCount = 0\n" + + "'foobarfoooobar'.eachMatch(~/foo/) { matchCount++ }\n" + + "return matchCount\n"); + + assertEvaluate(2, + "int matchCount = 0\n" + + "'foobarfoooobar'.eachMatch('foo') { matchCount++ }\n" + + "return matchCount\n"); + } + + @Test + public void find() throws Throwable { + assertEvaluate("boo", "return 'foobar'.find('oob') { it.reverse() }"); + assertEvaluate("boo", "return 'foobar'.find(~/oob/) { it.reverse() }"); + } + + @Test + public void findAll() throws Throwable { + assertEvaluate(Arrays.asList("oof", "oof", "oof"), + "'foobarfoobarfoo'.findAll('foo') { it.reverse() }"); + assertEvaluate(Arrays.asList("oof", "oof", "oof"), + "'foobarfoobarfoo'.findAll(~/foo/) { it.reverse() }"); + } + + @Test + public void replaceAll() throws Throwable { + assertEvaluate("oofbaroofbaroof", + "'foobarfoobarfoo'.replaceAll('foo') { it.reverse() }"); + assertEvaluate("oofbaroofbaroof", + "'foobarfoobarfoo'.replaceAll(~/foo/) { it.reverse() }"); + } + + @Test + public void replaceFirst() throws Throwable { + assertEvaluate("oofbarfoobarfoo", + "'foobarfoobarfoo'.replaceFirst('foo') { it.reverse() }"); + assertEvaluate("oofbarfoobarfoo", + "'foobarfoobarfoo'.replaceFirst(~/foo/) { it.reverse() }"); + } + + @Ignore("Waiting for StringGroovyMethods.LineIterable translation") + @Test + public void splitEachLine() throws Throwable { + assertEvaluate("bob", + "return '''\n" + + " abc|def\n" + + " ghi|jkl\n" + + " mno|pqr\n" + + "'''.splitEachLine('|') { it.reverse() }\n"); + } + + @Test + public void takeWhile() throws Throwable { + assertEvaluate("Groo", "'Groovy'.takeWhile{ it != 'v' }"); + assertEvaluate("Groo", "def ovyStr = 'ovy'; /Gro${ovyStr}/.takeWhile{ it != 'v' }"); + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java index 5958ccbf1..a3d9ff080 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java @@ -80,7 +80,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { } @Issue("JENKINS-57253") - @Test public void illegalBreakStatement() { + @Test public void illegalBreakStatement() throws Throwable { getBinding().setProperty("sentinel", 1); try { evalCPSonly("sentinel = 2; break;"); diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java new file mode 100644 index 000000000..47adfd05b --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java @@ -0,0 +1,960 @@ +package com.cloudbees.groovy.cps; + +import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; +import groovy.lang.IntRange; +import java.io.File; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.Locale; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import org.codehaus.groovy.control.MultipleCompilationErrorsException; +import org.junit.Ignore; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.instanceOf; + +/** + * + * + * @author Kohsuke Kawaguchi + */ +public class CpsTransformerTest extends AbstractGroovyCpsTest { + + @Test + public void helloWorld() throws Throwable { + assertEvaluate(11, "'hello world'.length()"); + } + + @Test + public void comparison() throws Throwable { + for(int i : new int[] { 1, 2, 3 }) { + for (int j : new int[] { 1, 2, 3 }) { + assertEvaluate(i < j, i + " < " + j); + assertEvaluate(i <= j, i + " <= " + j); + assertEvaluate(i > j, i + " > " + j); + assertEvaluate(i >= j, i + " >=" + j); + } + } + } + + @Test + public void forInLoop() throws Throwable { + assertEvaluate(15, "x=0; for (i in [1,2,3,4,5]) x+=i; return x;"); + } + + @Test + public void variableAssignment() throws Throwable { + assertEvaluate(5, "x=3; x+=2; return x;"); + } + + @Test + public void localVariable() throws Throwable { + assertEvaluate(5, "int x=3; x+=2; return x;"); + } + + @Test + public void increment() throws Throwable { + assertEvaluate("2.0.2", + "x=0;\n" + + "y = x++;\n" + + "z = ++x;\n" + + "return x+'.'+y+'.'+z;\n"); + } + + @Test + public void decrement() throws Throwable { + assertEvaluate("3.5.3", + "x=5;\n" + + "y = x--;\n" + + "z = --x;\n" + + "return x+'.'+y+'.'+z;\n"); + } + + @Test + public void break_() throws Throwable { + assertEvaluate(0, + "x=0;\n" + + "int i=0;\n" + + "for (i=0; i<5; i+=1) {\n" + + " break;\n" + + " x+=1;\n" + + "}\n" + + "return i+x;\n"); + } + + @Test + public void globalBreak_() throws Throwable { + assertEvaluate("0.0.0", + "x=0;\n" + + "int i=0;\n" + + "int j=0;\n" + + "I:\n" + + "for (i=0; i<5; i+=1) {\n" + + " J:\n" + + " for (j=0; j<5; j+=1) {\n" + + " break I;\n" + + " x+=1;\n" + + " }\n" + + " x+=1;\n" + + "}\n" + + "return i+'.'+j+'.'+x;\n"); + } + + @Test + public void functionCall() throws Throwable { + assertEvaluate(3, + "int i=1;\n" + + "i.plus(2)"); + } + + @Test + public void functionCall0arg() throws Throwable { + assertEvaluate("123", "123.toString()"); + } + + @Test + public void constructorCall() throws Throwable { + assertEvaluate("abcdef", "new String('abc'+'def')"); + } + + @Test + public void constructorCall0arg() throws Throwable { + assertEvaluate("", "new String()"); + } + + @Issue("https://github.com/cloudbees/groovy-cps/issues/31") + @Test + public void constructorList() throws Throwable { + assertEvaluate(new File("/parent", "name"), + "File f = ['/parent', 'name']\n" + + "return f"); + + // Test the closure env + assertEvaluate(new File("/parent", "name"), + "def close = {String parent, String name -> [parent, name] as File}\n" + + "return close('/parent', 'name')\n"); + } + + @Test + public void workflowCallingWorkflow() throws Throwable { + assertEvaluate(55, + "def fib(int x) {\n" + + " if (x==0) return 0;\n" + + " if (x==1) return 1;\n" + + " x = fib(x-1)+fib(x-2);\n" + // assignment to make sure x is treated as local variable + " return x;\n" + + "}\n" + + "fib(10);\n"); + } + + @Test public void typeCoercion() throws Throwable { + assertEvaluate(Locale.getAvailableLocales(), + "interface I {\n" + + " Locale[] getAvailableLocales()\n" + + "}\n" + + "try {\n" + + " (Locale as I).getAvailableLocales()\n" + + "} catch (e) {\n" + + " e.toString()\n" + + "}\n"); + } + + /** + * + */ + @Test + public void exceptionFromNonCpsCodeShouldBeCaughtByCatchBlockInCpsCode() throws Throwable { + assertEvaluate("String index out of range: -2", + "def foo() {\n" + + " 'abc'.substring(5);\n" + // will caught exception + " return 'fail';\n" + + "}\n" + + "try {\n" + + " return foo();\n" + + "} catch(StringIndexOutOfBoundsException e) {\n" + + " return e.message;\n" + + "}\n"); + } + + /** + * while loop that evaluates to false and doesn't go through the body + */ + @Test + public void whileLoop() throws Throwable { + assertEvaluate(1, + "int x=1;\n" + + "while (false) {\n" + + " x++;\n" + + "}\n" + + "return x;\n"); + } + + /** + * while loop that goes through several iterations. + */ + @Test + public void whileLoop5() throws Throwable { + assertEvaluate(5, + "int x=1;\n" + + "while (x<5) {\n" + + " x++;\n" + + "}\n" + + "return x;\n"); + } + + /** + * do-while loop that evaluates to false immediately + */ + @Test + @Ignore("Groovy 2.x does not support do-while loops") + public void doWhileLoop() throws Throwable { + assertEvaluate(2, + "int x=1;\n" + + "do {\n" + + " x++;\n" + + "} while (false);\n" + + "return x;\n"); + } + + /** + * do/while loop that goes through several iterations. + */ + @Test + @Ignore("Groovy 2.x does not support do-while loops") + public void dowhileLoop5() throws Throwable { + assertEvaluate(5, + "int x=1;\n" + + "do {\n" + + " x++;\n" + + "} while (x<5);\n" + + "return x;\n"); + } + + @Test + public void helloClosure() throws Throwable { + assertEvaluate(5, + "x = { -> 5 }\n" + + "return x();\n"); + } + + @Test + public void closureShouldCaptureLiveVariables() throws Throwable { + assertEvaluate("0.3.5", + "def c1,c2;\n" + + "{ ->\n" + + " def x = 0;\n" + + " c1 = { return x; }\n" + + " c2 = { v -> x=v; }\n" + + "}();\n" + + "r = ''+c1();\n" + + "c2(3);\n" + + "r += '.'+c1();\n" + + "c2(5);\n" + + "r += '.'+c1();\n" + + "return r;\n"); + } + + @Test + public void closureHasImplicitItVariable() throws Throwable { + assertEvaluate(4, + "c = { it+1 }\n" + + "c(3);\n"); + } + + /** + * A common pattern of using closure as a configuration block requires + * a library to set a delegate. + */ + @Test + public void closureDelegateProperty() throws Throwable { + assertEvaluate("3-xyz-xyz-true", + "def config(c) {\n" + + " def map = [:];\n" + + " c.resolveStrategy = Closure.DELEGATE_FIRST;\n" + + " c.delegate = map;\n" + + " c();\n" + + " return map;\n" + + "}\n" + + "def x = config {\n" + + " foo = 3;\n" + + " bar = 'xyz';\n" + + " zot = bar;\n" + + " fog = containsKey('foo');\n" + + "}\n" + + "return [x.foo, x.bar, x.zot, x.fog].join('-');\n"); + } + + @Test + public void serialization() throws Throwable { + CpsCallableInvocation s = parseCps( + "def plus3(int x) {\n" + + " return x+3;\n" + + "}\n" + + "for (int x=0; x<10; x++) {\n" + // meaningless code to cram as much coding construct as possible + " try {\n" + + " while (false)\n" + + " ;\n" + + " } catch(Exception e) {\n" + + " ;\n" + + " }\n" + + "}\n" + + "1+plus3(3*2)\n"); + Continuable cx = new Continuable(s.invoke(null, null, Continuation.HALT)); + cx = roundtripSerialization(cx); + assertEquals(10, cx.run(null)); + } + + @Test + public void assertion() throws Throwable { + // when assertion passes + assertEvaluate(3, + "assert true\n" + + "assert true : 'message'\n" + + "return 3;\n"); + + try { + evalCPS("assert 1+2 == ((4));"); + fail(); + } catch (AssertionError e) { + assertThat(e.getMessage(), containsString("1+2 == ((4))")); + } + + try { + evalCPS("assert (1+2) == 4 : 'with message';"); + fail(); + } catch (AssertionError e) { + assertThat(e.getMessage(), containsString("with message. Expression: assert (1+2) == 4 : 'with message'")); + } + } + + @Test + public void unaryOps() throws Throwable { + assertEvaluate(0, + "def x = 5;\n" + + "def y = -x;\n" + + "def z = +x;\n" + + "return y+z;\n"); + } + + @Test + public void not() throws Throwable { + assertEvaluate("y=false,z=true", + "def x = true;\n" + + "def y = !x;\n" + + "def z = !y;\n" + + "return 'y='+y+',z='+z;\n"); + } + + @Test + public void bitwiseNegative() throws Throwable { + assertEvaluate(-33, + "int x = 32;\n" + + "return ~x;\n"); + } + + @Test + public void gstring() throws Throwable { + assertEvaluate("hello 4=foo", + "def x = 'foo';\n" + + "return \"hello ${1+3}=${x}\".toString()\n"); + } + + @Issue("https://github.com/cloudbees/groovy-cps/issues/15") + @Test + public void gstringWithStringWriterClosure() throws Throwable { + String script = + "String text = 'Foobar';\n" + + "String result = /${ w -> w << text}/.toString();\n" + + "return result;\n"; + assertEvaluate("Foobar", script); + } + + @Test + public void ternaryOp() throws Throwable { + assertEvaluate(5, "return true ? 5 : null.makeCall();"); + } + + @Test + public void ternaryOp2() throws Throwable { + assertEvaluate("zot", "false ? bogus.noSuchCall() : 'zot'"); + } + + @Test + public void ternaryOp3() throws Throwable { + assertEvaluate(Arrays.asList("ok", 2), "def x = 'ok'; def y = null; [x ?: 1, y ?: 2]"); + } + + @Test + public void elvisOp() throws Throwable { + assertEvaluate(1, "def x=0; return ++x ?: -1"); + assertEvaluate(-1, "def x=0; return x++ ?: -1"); + } + + @Test public void logicalOp() throws Throwable { + assertEvaluate(false, "true && (false || false)"); + assertEvaluate(true, "true && (true || false)"); + assertEvaluate(false, "false && (true || false)"); + assertEvaluate(true, "false || 'rhs of || must be cast to boolean'"); + assertEvaluate(true, "true && 'rhs of && must be cast to boolean'"); + assertEvaluate("[true, false, true, true] [1, 0, 0, 4]", + "x = [0, 0, 0, 0]\n" + + "def set(index) {\n" + + " x[index - 1] = index\n" + + " true\n" + + "}\n" + + "def r = [\n" + + " true && set(1),\n" + + " false && set(2),\n" + + " true || set(3),\n" + + " false || set(4)\n" + + "]\n" + + "\"${r} ${x}\".toString()\n"); + } + + @Test + public void range() throws Throwable { + assertEvaluate(new IntRange(true, 0, 5), "def x=5; return (0..x)"); + assertEvaluate(new IntRange(false, 0, 5), "def x=5; return (0..> 1"); + assertEvaluate(5 / 2, "x=5; x>>=1; x"); + assertEvaluate(2147483647, "-1>>>1"); + assertEvaluate(2147483647, "x=-1; x>>>=1; x"); + + assertEvaluate(Arrays.asList("hello", "world"), "x=[]; x<<'hello'; x<<'world'; x"); + } + + @Test + public void inOperator() throws Throwable { + assertEvaluate(true, "3 in [1,2,3]"); + assertEvaluate(true, "'ascii' in String.class"); + assertEvaluate(false, "6 in [1,2,3]"); + assertEvaluate(false, "'ascii' in URL.class"); + } + + @Test + public void regexpOperator() throws Throwable { + assertEvaluate(true, "('cheesecheese' =~ 'cheese') as boolean"); + assertEvaluate(true, "('cheesecheese' =~ /cheese/) as boolean"); + assertEvaluate(false, "('cheese' =~ /ham/) as boolean"); + + assertEvaluate(true, "('2009' ==~ /\\d+/) as boolean"); + assertEvaluate(false, "('holla' ==~ /\\d+/) as boolean"); + } + + @Issue("JENKINS-32062") + @Test + public void arrayPassedToMethod() throws Throwable { + assertEvaluate(4, "def m(x) {x.size()}; def a = [1, 2]; a.size() + m(a)"); // control case + assertEvaluate(4, "def m(x) {x.size()}; def a = [1, 2].toArray(); a.length + m(Arrays.asList(a))"); // workaround #1 + assertEvaluate(4, "@NonCPS def m(x) {x.length}; def a = [1, 2].toArray(); a.length + m(a)"); // workaround #2 + assertEvaluate(4, "def m(x) {x.length}; def a = [1, 2].toArray(); a.length + m(a)"); // formerly: groovy.lang.MissingPropertyException: No such property: length for class: java.lang.Integer + } + + @Issue("JENKINS-27893") + @Test + public void varArgs() throws Throwable { + assertEvaluate(1, "def fn(String... args) { args.size() }; fn('one string')"); + } + + @Issue("JENKINS-28277") + @Test + public void currying() throws Throwable { + assertEvaluate("foofoo", "def nCopies = { int n, String str -> str*n }; def twice=nCopies.curry(2); twice('foo')"); + } + + @Issue("JENKINS-28277") + @Test + public void ncurrying_native_closure() throws Throwable { + assertEvaluate(Arrays.asList(-3, 2), + "@NonCPS\n" + + "def makeNativeClosure() {\n" + + " Collections.&binarySearch\n" + + "}\n" + + "def catSearcher = makeNativeClosure().ncurry(1,'cat')\n" + + "return [\n" + + " catSearcher(['ant','bee','dog']),\n" + + " catSearcher(['ant','bee','cat'])\n" + + "]\n"); + } + + @Test + public void fieldDirect() throws Throwable { + assertEvaluate(33, "class C {private int x = 33}; new C().x"); + } + + @Issue("JENKINS-31484") + @Test + public void fieldViaGetter() throws Throwable { + assertEvaluate(66, "class C {private int x = 33; int getX() {2 * this.@x}}; new C().x"); + assertEvaluate(66, "class C {private int x = 33; int getX() {2 * x}}; new C().x"); + } + + @Issue("JENKINS-31484") + @Ignore("Currently throws StackOverflowError") + @Test + public void fieldViaGetterWithThis() throws Throwable { + assertEvaluate(66, "class C {private int x = 33; int getX() {2 * this.x}}; new C().x"); + } + + @Issue("JENKINS-31484") + @Test + public void fieldViaSetter() throws Throwable { + assertEvaluate(22, "class C {private int x = 0; int getX() {2 * x}; void setX(int x) {this.@x = x / 3}}; C c = new C(); c.x = 33; c.x"); + assertEvaluate(22, "class C {private int x = 0; int getX() {2 * x}; void setX(int x) {this.x = x / 3}}; C c = new C(); c.x = 33; c.x"); + } + + @Test + public void nonField() throws Throwable { + assertEvaluate(new BigDecimal("22"), "class C extends HashMap {def read() {x * 2}; def write(x) {this.x = x / 3}}; C c = new C(); c.write(33); c.read()"); + } + + @Test + public void method_pointer() throws Throwable { + // method pointer to a native static method + assertEvaluate(Arrays.asList(3, 7), + "def add = CpsTransformerTest.&add\n" + + "return [ add(1,2), add(3,4) ]\n"); + + // method pointer to a native instance method + assertEvaluate(Arrays.asList(true, false), + "def contains = 'foobar'.&contains\n" + + "return [ contains('oo'), contains('xyz') ]\n"); + + // method pointer to a CPS transformed method + assertEvaluate(Arrays.asList(1101, 10011), + "class X {\n" + + " int z;\n" + + " X(int z) { this.z = z; }\n" + + " int add(int x, int y) { x+y+z }\n" + + "}\n" + + "def adder = (new X(1)).&add;\n" + + "def plus1 = adder.curry(10)\n" + + "return [ adder(100,1000), plus1(10000) ]\n"); + } + + public static int add(int a, int b) { return a+b; } + + @Issue("https://github.com/cloudbees/groovy-cps/issues/26") + @Test + public void interfaceDeclaration() throws Throwable { + assertEvaluate(true, + "interface Strategy {\n" + + " Closure process(Object event)\n" + + "}\n" + + "return true\n"); + } + + @Issue("https://github.com/cloudbees/groovy-cps/issues/26") + @Test + public void emptyInterfaceDeclaration() throws Throwable { + assertEvaluate(true, + "interface Empty {}\n" + + "return true\n"); + } + + @Issue("JENKINS-44280") + @Ignore + @Test + public void overloadedMethods() throws Throwable { + assertEvaluate("iterable", + "public String bar(List l) {\n" + + " return bar((Iterable)l)\n" + + "}\n" + + "public String bar(Iterable l) {\n" + + " return 'iterable'\n" + + "}\n" + + "List s = ['a', 'b']\n" + + "return bar(s)\n"); + } + + @Issue("JENKINS-44280") + @Ignore + @Test + public void overloadedMethodsWithRawTypes() throws Throwable { + assertEvaluate("iterable", + "public String bar(List l) {\n" + + " return bar((Iterable)l)\n" + + "}\n" + + "public String bar(Iterable l) {\n" + + " return 'iterable'\n" + + "}\n" + + "List s = ['a', 'b']\n" + + "return bar(s)\n"); + } + + @Issue("JENKINS-44280") + @Ignore + @Test + public void overloadedStaticMethods() throws Throwable { + assertEvaluate("iterable", + "public static String bar(List l) {\n" + + " return bar((Iterable)l)\n" + + "}\n" + + "public static String bar(Iterable l) {\n" + + " return 'iterable'\n" + + "}\n" + + "List s = ['a', 'b']\n" + + "return bar(s)\n"); + } + + public static class Base { + @Override + public String toString() { + return "base"; + } + } + + @Test + public void superClass() throws Throwable { + assertEvaluate("xbase", + "class Foo extends CpsTransformerTest.Base {\n" + + " public String toString() {\n" + + " return 'x'+super.toString();\n" + + " }\n" + + "}\n" + + "new Foo().toString();\n"); + } + + @Issue("JENKINS-45982") + @Test + public void transformedSuperClass() throws Throwable { + assertEvaluate("ybase", + "class Foo extends CpsTransformerTest.Base {\n" + + " public String other() {\n" + + " return 'base'\n" + + " }\n" + + "}\n" + + "class Bar extends Foo {\n" + + " public String other() {\n" + + " return 'y'+super.other()\n" + + " }\n" + + "}\n" + + "new Bar().other();\n"); + } + + @Issue("JENKINS-52395") + @Test + public void transformedSuperSuperClass() throws Throwable { + assertEvaluate("zybase", + "class Foo extends CpsTransformerTest.Base {\n" + + " public String other() {\n" + + " return 'base'\n" + + " }\n" + + "}\n" + + "class Bar extends Foo {\n" + + " public String other() {\n" + + " return 'y'+super.other()\n" + + " }\n" + + "}\n" + + "class Baz extends Bar {\n" + + " public String other() {\n" + + " return 'z'+super.other()\n" + + " }\n" + + "}\n" + + "new Baz().other();\n"); + } + + @Test + @Issue("https://github.com/cloudbees/groovy-cps/issues/42") + public void abstractMethod() throws Throwable { + assertEvaluate(123, + "abstract class Foo {\n" + + " abstract int val()\n" + + "}\n" + + "Foo foo = new Foo() {int val() {123}}\n" + + "foo.val()\n"); + } + + @Issue("https://github.com/cloudbees/groovy-cps/issues/28") + @Test + @Ignore + public void rehydrateClosure() throws Throwable { + assertEvaluate("from Script instance", + "class MyStrategy {\n" + + " Closure process() {\n" + + " return {\n" + + " speak()\n" + + " }\n" + + " }\n" + + "}\n" + + "String speak() {\n" + + " 'from Script instance'\n" + + "}\n" + + "Closure closure = new MyStrategy().process()\n" + + "closure.rehydrate(this, this, this).call()\n"); + } + + @Issue("https://github.com/cloudbees/groovy-cps/issues/16") + @Test + @Ignore + public void category() throws Throwable { + assertEvaluate("FOO", + "class BarCategory {\n" + + " static String up(String text) {\n" + + " text.toUpperCase()\n" + + " }\n" + + "}\n" + + "return use(BarCategory) {\n" + + " 'foo'.up()\n" + + "};\n"); + } + + @Issue("JENKINS-38268") + @Test + public void lexicalScope() throws Throwable { + assertEvaluate(Arrays.asList(1, 1), + "def a = [id: 'a', count: 0]\n" + + "def b = [id: 'b', count: 0]\n" + + "def toRun = [a, b].collect { thing -> return { thing.count = thing.count + 1 } }\n" + + "toRun.each { arg -> arg() }\n" + + "return [a.count, b.count]\n"); + } + + @Issue("SECURITY-567") + @Test + public void methodPointer() throws Throwable { + assertEvaluate("baseClass", + "def b = new CpsTransformerTest.Base()\n" + + "return (b.&toString)() + (String.getClass().&getSimpleName)()\n"); + } + + @Issue("JENKINS-32213") + @Test + public void allClassesSerializable() throws Throwable { + evalCPSonly("class C {}; def c = new C(); assert c instanceof Serializable"); + evalCPSonly("class C implements Serializable {}; def c = new C(); assert c instanceof Serializable"); + assertTrue((boolean)evalCPSonly( + "@NonCPS\n" + + "def anonymousClass() {\n" + + " def r = new Runnable() {\n" + + " @Override\n" + + " public void run() {}\n" + + " }\n" + + " return r instanceof Serializable\n" + + "}\n" + + "return anonymousClass()\n")); + } + + @Issue("JENKINS-44027") + @Test + public void multipleAssignment() throws Throwable { + assertEvaluate("firstsecondthirdfourth", + "def (a, b) = ['first', 'second']\n" + + "def c, d\n" + + "(c, d) = ['third', 'fourth']\n" + + "return a + b + c + d\n"); + } + + @Issue("JENKINS-44027") + @Test + public void nonArrayLikeMultipleAssignment() throws Throwable { + assertEvaluate(true, + "try {\n" + + " def (a,b) = 4\n" + + " return false\n" + + "} catch (Exception e) {\n" + + " return e instanceof MissingMethodException\n" + + "}\n"); + } + + @Issue("JENKINS-44027") + @Test + public void arrayLikeMultipleAssignment() throws Throwable { + assertEvaluate("wh", + "def (a,b) = 'what'\n" + + "return a + b\n"); + } + + @Issue("JENKINS-44027") + @Test + public void mismatchedSizeMultipleAssignment() throws Throwable { + assertEvaluate("first second fourth null", + "def (a, b) = ['first', 'second', 'third']\n" + + "def (c, d) = ['fourth']\n" + + "return [a, b, c, d].join(' ')\n"); + } + + @Issue("JENKINS-47363") + @Test + public void excessiveListElements() throws Throwable { + String s1 = IntStream.range(0, 250).boxed().map(Object::toString).collect(Collectors.joining(",\n")); + assertEvaluate(250, + "def b = [" + s1 + "]\n" + + "return b.size()\n"); + + String s2 = IntStream.range(0, 251).boxed().map(Object::toString).collect(Collectors.joining(",\n")); + try { + assertEvaluate(251, + "def b = [" + s2 + "]\n" + + "return b.size()\n"); + } catch (Exception e) { + assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); + assertThat(e.getMessage(), containsString("List expressions can only contain up to 250 elements")); + } + } + + @Issue("JENKINS-47363") + @Test + public void excessiveMapElements() throws Throwable { + String s1 = IntStream.range(0, 125).boxed().map(i -> i + ":" + i).collect(Collectors.joining(",\n")); + assertEvaluate(125, + "def b = [" + s1 + "]\n" + + "return b.size()\n"); + String s2 = IntStream.range(0, 126).boxed().map(i -> i + ":" + i).collect(Collectors.joining(",\n")); + try { + assertEvaluate(126, + "def b = [" + s2 + "]\n" + + "return b.size()\n"); + } catch (Exception e) { + assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); + assertThat(e.getMessage(), containsString("Map expressions can only contain up to 125 entries")); + } + } + + @Issue("JENKINS-49679") + @Test + public void multipleAssignmentRunsMethodOnce() throws Throwable { + assertEvaluate("firstsecondthirdfourth", + "alreadyRun = false\n" + + "def getAandB() {\n" + + " if (!alreadyRun) {\n" + + " alreadyRun = true\n" + + " return ['first', 'second']\n" + + " } else {\n" + + " return ['bad', 'worse']\n" + + " }\n" + + "}\n" + + "def (a, b) = getAandB()\n" + + "def c, d\n" + + "(c, d) = ['third', 'fourth']\n" + + "return a + b + c + d\n"); + } + + @Test + public void mapEntryInBadContext() throws Throwable { + try { + evalCPSonly("return [[a: 'a'], [b: 'b'][c: 'c']]"); + } catch (Exception e) { + assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); + assertThat(e.getMessage(), containsString("Unsupported map entry expression for CPS transformation in this context")); + } + } + + @Test + public void spreadMethodCall() throws Throwable { + try { + evalCPSonly("return ['a', 'b', 'c']*.hashCode()"); + } catch (Exception e) { + assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); + assertThat(e.getMessage(), containsString("spread not yet supported for CPS transformation")); + } + } + + @Test + public void synchronizedStatement() throws Throwable { + try { + evalCPSonly("synchronized(this) { return 1 }"); + } catch (Exception e) { + assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); + assertThat(e.getMessage(), containsString("synchronized is unsupported for CPS transformation")); + } + } + + @Test + public void spreadExpression() throws Throwable { + try { + evalCPSonly( + "def x = [1, 2, 3]\n" + + "return [*x, 4, 5]\n"); + } catch (Exception e) { + assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); + assertThat(e.getMessage(), containsString("spread not yet supported for CPS transformation")); + } + } + + @Test + public void spreadMapExpression() throws Throwable { + try { + evalCPSonly( + "def x = [a: 1, b: 2, c: 3]\n" + + "return [*:x, d: 4, e: 5]\n"); + } catch (Exception e) { + assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); + assertThat(e.getMessage(), containsString("spread map not yet supported for CPS transformation")); + } + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/SafepointTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/SafepointTest.java new file mode 100644 index 000000000..f719a295a --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/SafepointTest.java @@ -0,0 +1,53 @@ +package com.cloudbees.groovy.cps; + +import org.junit.Ignore; +import org.junit.Test; + +/** + * Make sure that a safepoint covers all the infinite loops. + * + * @author Kohsuke Kawaguchi + */ +public class SafepointTest extends AbstractGroovyCpsTest { + @Override + protected CpsTransformer createCpsTransformer() { + CpsTransformer t = super.createCpsTransformer(); + t.setConfiguration(new TransformerConfiguration().withSafepoint(SafepointTest.class, "safepoint")); + return t; + } + + @Test + public void whileLoop() throws Throwable { + assertEquals(SAFEPOINT, evalCPSonly("while (true) ;")); + } + + @Ignore("Groovy 2.x doesn't support do-while loops") + @Test + public void doWhileLoop() throws Throwable { + assertEquals(SAFEPOINT, evalCPSonly("do { } while (true) ;")); + } + + @Test + public void forLoop() throws Throwable { + assertEquals(SAFEPOINT, evalCPSonly("for (;;) { }")); + } + + @Test + public void recursion() throws Throwable { + assertEquals(SAFEPOINT, evalCPSonly("def foo() { foo() }; foo();")); + } + + @Test + public void closure() throws Throwable { + assertEquals(SAFEPOINT, evalCPSonly("def x = { -> }; x();")); + } + + /** + * Gets invoked at the safepoint. + */ + public static void safepoint() { + Continuable.suspend(SAFEPOINT); + } + + private static final Object SAFEPOINT = "Yo!"; +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java new file mode 100644 index 000000000..a99a63ad4 --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java @@ -0,0 +1,77 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import javax.naming.NamingException; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.hasItems; + +/** + * + * + * @author Kohsuke Kawaguchi + */ +public class FunctionCallBlockTest extends AbstractGroovyCpsTest { + /** + * Synchronous code we call from test that throws an exception + */ + public static void someSyncCode(int i) throws Exception { + if (i>0) + someSyncCode(i-1); + else + throw new NamingException(); + } + + @Test + public void infiniteRecursion() { + try { + evalCPSonly( + "def thing = null\n" + + "def getThing() {\n" + + " return thing == null\n" + + "}\n" + + "def stuff = getThing()\n"); + fail("Should have thrown an exception"); + } catch (Throwable t) { + assertThat(t.toString(), equalTo("java.lang.StackOverflowError: Excessively nested closures/functions at Script1.getThing(Script1.groovy:3) - look for unbounded recursion - call depth: 1025")); + } + } + + @Test + public void stackTraceFixup() throws Throwable { + List elements = Arrays.asList((StackTraceElement[]) evalCPSonly( + "\n" + + "\n" + + "def x() {\n" + + " y()\n" + // line 4 + "}\n" + + "\n" + + "def y() {\n" + + " FunctionCallBlockTest.someSyncCode(3)\n" + // line 8 + "}\n" + + "try {\n" + + " x()\n" + // line 11 + "} catch (Exception e) {\n" + + " return e.stackTrace\n" + + "}\n")); + + List traces = elements.stream().map(Object::toString).collect(Collectors.toList()); + + // should include the transformed CPS part + assertThat(traces, hasItems( + containsString("Script1.y(Script1.groovy:8)"), + containsString("Script1.x(Script1.groovy:4)"), + containsString("Script1.run(Script1.groovy:11)"), + containsString("___cps.transform___(Native Method)"), + containsString("com.cloudbees.groovy.cps.impl.ContinuationGroup.methodCall"))); + + // should include the call stack of some sync code + assertThat(traces, hasItem(containsString("com.cloudbees.groovy.cps.impl.FunctionCallBlockTest.someSyncCode(FunctionCallBlockTest.java:"))); + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/MapBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/MapBlockTest.java new file mode 100644 index 000000000..c8ecc0430 --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/MapBlockTest.java @@ -0,0 +1,25 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; +import java.util.Collections; +import org.codehaus.groovy.runtime.InvokerHelper; +import org.junit.Test; + +/** + * @author Kohsuke Kawaguchi + */ +public class MapBlockTest extends AbstractGroovyCpsTest { + @Test + public void mapLiteral() throws Throwable { + + assertEvaluate( + InvokerHelper.createMap(new Object[] { "foo", "hello", "bar", 6, "zot", null }), + "def x=[foo:'hello', bar:2+2+2, zot:null]\n" + + "return x\n"); + } + + @Test + public void empty() throws Throwable { + assertEvaluate(Collections.emptyMap(), "return [:]"); + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.java new file mode 100644 index 000000000..3c5817b5f --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.java @@ -0,0 +1,49 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; +import com.cloudbees.groovy.cps.Continuable; +import com.cloudbees.groovy.cps.Continuation; +import org.junit.Test; + +/** + * + * + * @author Kohsuke Kawaguchi + */ +public class PropertyAccessBlockTest extends AbstractGroovyCpsTest { + @Test + public void asyncExecutionOfPropertyGet() throws Throwable { + CpsCallableInvocation inv = parseCps( + "class Foo {\n" + + " Object getAlpha() {\n" + + " return Continuable.suspend('suspended')\n" + + " }\n" + + "}\n" + + "return new Foo().alpha\n"); + + Continuable c = new Continuable(inv.invoke(null, null, Continuation.HALT)); + assertEquals("suspended", c.run(null)); // should have suspended + assertEquals(5, c.run(5)); // when resume, the getter should return + } + + @Test + public void asyncExecutionOfPropertySet() throws Throwable { + CpsCallableInvocation inv = parseCps( + "class Foo {\n" + + " private int x = 3\n" + + " void setAlpha(int x) {\n" + + " this.x = Continuable.suspend(x)\n" + + " }\n" + + " int getAlpha() {\n" + + " return x\n" + + " }\n" + + "}\n" + + "def f = new Foo()\n" + + "f.alpha += 7\n" + + "return f.alpha\n"); + + Continuable c = new Continuable(inv.invoke(null, null, Continuation.HALT)); + assertEquals(10, c.run(null)); // should have suspended + assertEquals(13, c.run(13)); // when resume, we should see that as the final value. + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/SwitchBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/SwitchBlockTest.java new file mode 100644 index 000000000..80b193088 --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/SwitchBlockTest.java @@ -0,0 +1,265 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; +import javax.naming.NamingException; +import org.junit.Ignore; +import org.junit.Test; + +/** + * Tests for switch/case + * + * @author Kohsuke Kawaguchi + */ +public class SwitchBlockTest extends AbstractGroovyCpsTest { + @Test + public void basic() throws Throwable { + assertEvaluate("two", + "def x = 2\n" + + "def y\n" + + "switch (x) {\n" + + "case 1:\n" + + " y = 'one'\n" + + " break\n" + + "case 2:\n" + + " y = 'two'\n" + + " break\n" + + "case 3:\n" + + " y = 'three'\n" + + " break\n" + + "}\n" + + "return y\n"); + } + + /** + * Null in the switch expression. + */ + @Test + public void nullSwitchExp() throws Throwable { + assertEvaluate("zero", + "def x = null\n" + + "def y = 'zero'\n" + + "switch (x) {\n" + + "case 1:\n" + + " y = 'one'\n" + + " break\n" + + "case 2:\n" + + " y = 'two'\n" + + " break\n" + + "case 3:\n" + + " y = 'three'\n" + + " break\n" + + "}\n" + + "return y\n"); + } + + /** + * Null in the case expression. + */ + @Test + public void nullInCaseExp() throws Throwable { + assertEvaluate("null!", + "def x = null\n" + + "def y = 'zero'\n" + + "switch (x) {\n" + + "case 1:\n" + + " y = 'one'\n" + + " break\n" + + "case null:\n" + + " y = 'null!'\n" + + " break\n" + + "case 3:\n" + + " y = 'three'\n" + + " break\n" + + "}\n" + + "return y\n"); + } + + /** + * Exception in the switch expression. + */ + @Test + public void exceptionInSwitchExp() throws Throwable { + assertEvaluate(NamingException.class, + "def foo() {\n" + + " throw new javax.naming.NamingException();\n" + + "}\n" + + "try {\n" + + " switch (foo()) {\n" + + " case 1:\n" + + " y = 'one';\n" + + " break;\n" + + " case 2:\n" + + " y = 'two!';\n" + + " break;\n" + + " }\n" + + " return null;\n" + + "} catch (e) {\n" + + " return e.class;\n" + + "}\n"); + } + + /** + * Exception in the case expression. + */ + @Test + public void exceptionInCaseExp() throws Throwable { + assertEvaluate(NamingException.class, + "def foo() {\n" + + " throw new javax.naming.NamingException();\n" + + "}\n" + + "try {\n" + + " switch (5) {\n" + + " case 1:\n" + + " y = 'one';\n" + + " break;\n" + + " case foo():\n" + + " y = 'two';\n" + + " break;\n" + + " case 3:\n" + + " y = 'three';\n" + + " break;\n" + + " }\n" + + " return null;\n" + + "} catch (e) {\n" + + " return e.class;\n" + + "}\n"); + } + + @Test + public void isCase() throws Throwable { + assertEvaluate("odd", + "def x = 5;\n" + + "switch (x) {\n" + + "case 1:\n" + + " y = 'one';\n" + + " break;\n" + + "case [2,4,6,8]:\n" + + " y = 'even';\n" + + " break;\n" + + "case [3,5,7,9]:\n" + + " y = 'odd';\n" + + " break;\n" + + "}\n" + + "return y;\n"); + } + + /** + * Two matching case statements. + */ + @Test + public void twoMatchingCases() throws Throwable { + assertEvaluate("two", + "def x = 2;\n" + + "def y;\n" + + "switch (x) {\n" + + "case 1:\n" + + " y = 'one';\n" + + " break;\n" + + "case 2:\n" + + " y = 'two';\n" + + " break;\n" + + "case 2:\n" + + " y = 'TWO';\n" + + " break;\n" + + "case 3:\n" + + " y = 'three';\n" + + " break;\n" + + "}\n" + + "return y;\n"); + } + + /** + * Matches to the default clause + */ + @Test + public void defaultClause() throws Throwable { + assertEvaluate("other", + "def x = 5;\n" + + "def y;\n" + + "switch (x) {\n" + + "case 1:\n" + + " y = 'one';\n" + + " break;\n" + + "default:\n" + + " y = 'other';\n" + + " break;\n" + + "case 2:\n" + + " y = 'two';\n" + + " break;\n" + + "case 3:\n" + + " y = 'three';\n" + + " break;\n" + + "}\n" + + "return y;\n"); + } + + /** + * Matches to nothing + */ + @Test + public void noMatch() throws Throwable { + assertEvaluate("initial", + "def x = 5;\n" + + "def y = 'initial';\n" + + "switch (x) {\n" + + "case 1:\n" + + " y = 'one';\n" + + " break;\n" + + "case 2:\n" + + " y = 'two';\n" + + " break;\n" + + "case 3:\n" + + " y = 'three';\n" + + " break;\n" + + "}\n" + + "return y;\n"); + } + + /** + * Case match and fall through the rest. + */ + @Test + public void fallthrough() throws Throwable { + assertEvaluate("onetwothree", + "def x = 1;\n" + + "def y = '';\n" + + "switch (x) {\n" + + "case 1:\n" + + " y += 'one';\n" + + " // fall through\n" + + "case 2:\n" + + " y += 'two';\n" + + " // fall through\n" + + "case 3:\n" + + " y += 'three';\n" + + " // fall through\n" + + "}\n" + + "return y;\n"); + } + + /** + * Default match and fall through + */ + @Test + @Ignore("Groovy doesn't handle this correctly") + public void fallthroughWithDefault() throws Throwable { + assertEvaluate("otheronetwothree", + "def x = 9;\n" + + "def y = '';\n" + + "switch (x) {\n" + + "default:\n" + + " y += 'other';\n" + + " // fall through\n" + + "case 1:\n" + + " y += 'one';\n" + + " // fall through\n" + + "case 2:\n" + + " y += 'two';\n" + + " // fall through\n" + + "case 3:\n" + + " y += 'three';\n" + + " // fall through\n" + + "}\n" + + "return y;\n"); + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java new file mode 100644 index 000000000..38459384b --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java @@ -0,0 +1,50 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; +import com.cloudbees.groovy.cps.Continuable; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.hasItems; + +/** + * + * + * @author Kohsuke Kawaguchi + */ +public class ThrowBlockTest extends AbstractGroovyCpsTest { + @Test + public void stackTraceFixup() throws Throwable { + List elements = Arrays.asList((StackTraceElement[]) evalCPSonly( + "\n" + + "\n" + + "def x() {\n" + + " y();\n" + // line 4 + "}\n" + + "\n" + + "def y() {\n" + + " throw new javax.naming.NamingException();\n" + // line 8 + "}\n" + + "try {\n" + + " x();\n" + // line 11 + "} catch (Exception e) {\n" + + " return e.stackTrace;\n" + + "}\n")); + + assertThat(elements.subList(0, 3).stream().map(Object::toString).collect(Collectors.toList()), hasItems( + "Script1.y(Script1.groovy:8)", + "Script1.x(Script1.groovy:4)", + "Script1.run(Script1.groovy:11)")); + + assertThat(elements.get(3), equalTo(Continuable.SEPARATOR_STACK_ELEMENT)); + + List rest = elements.subList(4,elements.size()).stream().map(Object::toString).collect(Collectors.toList()); + assertThat(rest, hasItem(containsString(FunctionCallBlock.class.getName()))); + assertThat(rest, hasItem(containsString("java.lang.reflect.Constructor.newInstance"))); + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java new file mode 100644 index 000000000..61595e38b --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java @@ -0,0 +1,211 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; +import com.cloudbees.groovy.cps.Continuable; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.hasItems; + +/** + * TODO: tests to write + * - catch order priority + * + * @author Kohsuke Kawaguchi + */ +public class TryCatchBlockTest extends AbstractGroovyCpsTest { + @Test + public void stackTraceFixup() throws Throwable { + List elements = Arrays.asList((StackTraceElement[]) evalCPSonly( + "\n" + + "\n" + + "def x() {\n" + + " y();\n" + // line 4 + "}\n" + + "\n" + + "def y() {\n" + + " throw new javax.naming.NamingException();\n" + // line 8 + "}\n" + + "try {\n" + + " x();\n" + // line 11 + "} catch (Exception e) {\n" + + " return e.stackTrace;\n" + + "}\n")); + + assertThat(elements.subList(0, 3).stream().map(Object::toString).collect(Collectors.toList()), hasItems( + "Script1.y(Script1.groovy:8)", + "Script1.x(Script1.groovy:4)", + "Script1.run(Script1.groovy:11)")); + + assertThat(elements.get(3), equalTo(Continuable.SEPARATOR_STACK_ELEMENT)); + + List rest = elements.subList(4, elements.size()).stream().map(Object::toString).collect(Collectors.toList()); + assertThat(rest, hasItem(containsString(FunctionCallBlock.class.getName()))); + assertThat(rest, hasItem(containsString("java.lang.reflect.Constructor.newInstance"))); + } + + /** + * Try block with finally clause completing normally. + */ + @Test + public void tryAndFinally_NormalCompletion() throws Throwable { + assertEvaluate("13", + "a = '';\n" + + "try {\n" + + " a += '1';\n" + + "} catch (Exception e) {\n" + + " a += '2';\n" + + "} finally {\n" + + " a += '3';\n" + + "}\n" + + "return a;\n"); + } + + @Test + public void tryWithoutFinally_NormalCompletion() throws Throwable { + assertEvaluate("1", + "a = '';\n" + + "try {\n" + + " a += '1';\n" + + "} catch (Exception e) {\n" + + " a += '2';\n" + + "}\n" + + "return a;\n"); + } + + @Test + public void tryAndFinally_AbnormalTermination() throws Throwable { + assertEvaluate("1foo23", + "a = '';\n" + + "try {\n" + + " a += '1';\n" + + " throw new Exception('foo');\n" + + " a += '2';\n" + + "} catch (Exception e) {\n" + + " a += e.message + '2';\n" + + "} finally {\n" + + " a += '3';\n" + + "}\n" + + "return a;\n"); + } + + @Test + public void tryAndFinally_BreakInside() throws Throwable { + assertEvaluate("014", + "a = '';\n" + + "while (true) {\n" + + " a += '0'\n" + + " try {\n" + + " a += '1';\n" + + " break;\n" + + " a += '2';\n" + + " } catch (Exception e) {\n" + + " a += '3';\n" + + " } finally {\n" + + " a += '4';\n" + + " }\n" + + " a += '5';\n" + + "}\n" + + "return a;\n"); + } + + @Test + public void tryAndFinally_ContinueInside() throws Throwable { + assertEvaluate("0125125", + "a = '';\n" + + "a += '0'\n" + + "for (int i=0; i<2; i++) {\n" + + " a += '1'\n" + + " try {\n" + + " a += '2';\n" + + " continue;\n" + + " a += '3';\n" + + " } catch (Exception e) {\n" + + " a += '4';\n" + + " } finally {\n" + + " a += '5';\n" + + " }\n" + + " a += '6';\n" + + "}\n" + + "return a;\n"); + } + + /** + * Groovy interpreter seems to have a bug in running the finally block when an exception is thrown + * from the catch block, so not using "evalCPS". + */ + @Test + public void tryAndFinally_RethrowAndFinallyBlock() throws Throwable { + assertEvaluate("135", + "a = '';\n" + + "try {\n" + + " try {\n" + + " a += '1';\n" + + " throw new Exception('foo');\n" + + " a += '2';\n" + + " } catch (Exception e) {\n" + + " a += '3';\n" + + " throw new RuntimeException();\n" + + " a += '4';\n" + + " } catch (RuntimeException e) {\n" + + " a += '6';\n" + + " } finally {\n" + + " a += '5';\n" + + " }\n" + + "} catch (Exception e) {\n" + + " ;\n" + + "}\n" + + "return a;\n"); + } + + @Test + public void tryAndFinally_returnFromFinally() throws Throwable { + assertEvaluate("13", + "a = '';\n" + + "try {\n" + + " a += '1';\n" + + " throw new Exception('foo');\n" + + " a += '2';\n" + + "} finally {\n" + + " a += '3';\n" + + " return a;\n" + + "}\n"); + } + + @Test + public void tryAndFinally_returnFromCatch() throws Throwable { + assertEvaluate("13", + "a = '';\n" + + "try {\n" + + " a += '1';\n" + + " throw new Exception('foo');\n" + + " a += '2';\n" + + "} catch (Exception e) {\n" + + " a += '3';\n" + + " return a;\n" + + "} finally {\n" + + " a += '4';\n" + + "}\n"); + } + + @Test + public void tryAndFinally_returnFromCatch2() throws Throwable { + assertEquals("134", evalCPSonly( + "a = new StringBuilder();\n" + + "try {\n" + + " a.append('1');\n" + + " throw new Exception('foo');\n" + + " a.append('2');\n" + + "} catch (Exception e) {\n" + + " a.append('3');\n" + + " return a;\n" + + "} finally {\n" + + " a.append('4');\n" + + "}\n").toString()); + } +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java index f79a3d5a4..2be49807f 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java @@ -31,6 +31,7 @@ import org.junit.rules.ErrorCollector; import org.jvnet.hudson.test.Issue; import org.kohsuke.groovy.sandbox.ClassRecorder; +import org.kohsuke.groovy.sandbox.impl.GroovyCallSiteSelector; public class SandboxInvoker2Test extends AbstractGroovyCpsTest { @Rule @@ -47,7 +48,7 @@ protected CpsTransformer createCpsTransformer() { CpsTransformer.iota.set(0); } - private Object evalCpsSandbox(String script) throws Throwable { + protected Object evalCpsSandbox(String script) throws Throwable { FunctionCallEnv e = (FunctionCallEnv)Envs.empty(); e.setInvoker(new SandboxInvoker()); @@ -60,13 +61,16 @@ private Object evalCpsSandbox(String script) throws Throwable { } } - public void assertIntercept(String... expected) { + private void assertIntercept(String... expected) { ec.checkThat(cr.toString().split("\n"), equalTo(expected)); } - public void assertIntercept(String script, Object expectedValue, String... expected) throws Throwable { - ec.checkThat(evalCpsSandbox(script), equalTo(expectedValue)); - assertIntercept(expected); + public void assertIntercept(String script, Object expectedResult, String... expectedInterceptions) throws Throwable { + Object actualResult = evalCpsSandbox(script); + String actualCpsType = GroovyCallSiteSelector.getName(actualResult); + String expectedType = GroovyCallSiteSelector.getName(expectedResult); + ec.checkThat("CPS and sandbox-transformed result (" + actualCpsType + ") does not match expected result (" + expectedType + ")", actualResult, equalTo(expectedResult)); + assertIntercept(expectedInterceptions); } @Issue("SECURITY-1710") diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java new file mode 100644 index 000000000..144d54224 --- /dev/null +++ b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java @@ -0,0 +1,478 @@ +package com.cloudbees.groovy.cps.sandbox; + +import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; +import java.awt.Point; +import java.io.File; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicLong; +import org.codehaus.groovy.control.MultipleCompilationErrorsException; +import org.codehaus.groovy.runtime.ProxyGeneratorAdapter; +import org.junit.Test; +import org.jvnet.hudson.test.Issue; +import org.kohsuke.groovy.sandbox.ClassRecorder; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.instanceOf; + +/** + * @author Kohsuke Kawaguchi + */ +public class SandboxInvokerTest extends SandboxInvoker2Test { + ClassRecorder cr = new ClassRecorder(); + + /** + * Covers all the intercepted operations. + */ + @Test + public void basic() throws Throwable { + assertIntercept( + "import java.awt.Point;\n" + + "\n" + + "def p = new Point(1,3);\n" + // constructor + "assert p.equals(p)\n" + // method call + "assert 4 == p.x+p.y;\n" + // property get + "p.x = 5;\n" + // property set + "assert 5 == p.@x;\n" + // attribute get + "p.@x = 6;\n" + // attribute set + "\n" + + "def a = new int[3];\n" + + "a[1] = a[0]+7;\n" + // array get & set + "assert a[1]==7;\n", + null, + "Script1.super(Script1).setBinding(Binding)", + "new Point(Integer,Integer)", + "Point.equals(Point)", + "Point.x", + "Point.y", + "Double.plus(Double)", + "ScriptBytecodeAdapter:compareEqual(Integer,Double)", + "Point.x=Integer", + "Point.@x", + "ScriptBytecodeAdapter:compareEqual(Integer,Integer)", + "Point.@x=Integer", + "int[][Integer]", + "Integer.plus(Integer)", + "int[][Integer]=Integer", + "int[][Integer]", + "ScriptBytecodeAdapter:compareEqual(Integer,Integer)"); + } + + @Test + public void mixtureOfNonTransformation() throws Throwable { + assertIntercept( + "@NonCPS\n" + + "def length(x) {\n" + + " return x.length();\n" + + "}\n" + + "return length('foo')\n", + 3, + "Script1.super(Script1).setBinding(Binding)", + "Script1.length(String)", + "String.length()"); + } + + @Issue("JENKINS-46088") + @Test + public void matcherTypeAssignment() throws Throwable { + assertIntercept( + "@NonCPS\n" + + "def nonCPSMatcherMethod(String x) {\n" + + " java.util.regex.Matcher m = x =~ /bla/\n" + + " return m.matches()\n" + + "}\n" + + "def cpsMatcherMethod(String x) {\n" + + " java.util.regex.Matcher m = x =~ /bla/\n" + + " return m.matches()\n" + + "}\n" + + "return \"${nonCPSMatcherMethod('foo')}${cpsMatcherMethod('foo')}\".toString()\n", + "falsefalse", + "Script1.super(Script1).setBinding(Binding)", + "Script1.nonCPSMatcherMethod(String)", + "ScriptBytecodeAdapter:findRegex(String,String)", + "Matcher.matches()", + "Script1.cpsMatcherMethod(String)", + "ScriptBytecodeAdapter:findRegex(String,String)", + "Matcher.matches()", + "new GStringImpl(Object[],String[])", + "GStringImpl.toString()"); + } + + static class TrustedCpsCompiler extends AbstractGroovyCpsTest { + } + + /** + * Untrusted code -> trusted code -> untrusted code. + */ + @Test + public void mixingTrustedAndUntrusted() throws Throwable { + TrustedCpsCompiler trusted = new TrustedCpsCompiler(); + trusted.setUp(); + + SandboxInvokerTest untrusted = this; + + untrusted.getBinding().setVariable("trusted", trusted.getCsh().parse("def foo(x) { return [new java.awt.Point(1,x),untrusted.bar()] }")); + cr.register(); // untrusted.csh.parse instantiates the sandbox-transformed script, so a GroovyInterceptor must be registered when it runs. + try { + trusted.getBinding().setVariable("untrusted",untrusted.getCsh().parse("def bar() { return new File('foo') }")); + } finally { + cr.unregister(); + } + + assertIntercept( + "trusted.foo(4)", + Arrays.asList(new Point(1, 4), new File("foo")), + //"Script1.super(Script1).setBinding(Binding)", + "Script2.super(Script2).setBinding(Binding)", + "Script2.trusted", + "Script1.foo(Integer)", + "new File(String)"); + } + + + public static class Base { + @Override + public String toString() { + return "base"; + } + + String multipleArgs(String first, String second) { + return "Hello, " + first + " " + second; + } + + String noArg() { + return "No argument"; + } + + String oneArg(String first) { + return "Just one arg: " + first; + } + + public static String staticMultipleArgs(String first, String second) { + return "Hello, " + first + " " + second; + } + + public static String staticNoArg() { + return "No argument"; + } + + public static String staticOneArg(String first) { + return "Just one arg: " + first; + } + } + @Test + public void superClass() throws Throwable { + assertIntercept( + "class Foo extends SandboxInvokerTest.Base {\n" + + " public String toString() {\n" + + " return 'x'+super.toString();\n" + + " }\n" + + "}\n" + + "class Bar extends Foo {}\n" + + "new Bar().toString();\n", + (Object) "xbase", + "Script1.super(Script1).setBinding(Binding)", + "new Bar()", + "new Foo()", + "new SandboxInvokerTest$Base()", + "Bar.toString()", + "Bar.super(Foo).toString()", + "String.plus(String)"); + } + + @Issue("JENKINS-45982") + @Test + public void transformedSuperClass() throws Throwable { + assertIntercept( + "class Foo extends SandboxInvokerTest.Base {\n" + + " public String other() {\n" + + " return 'base'\n" + + " }\n" + + "}\n" + + "class Bar extends Foo {\n" + + " public String other() {\n" + + " return 'y'+super.other()\n" + + " }\n" + + "}\n" + + "new Bar().other();\n", + (Object) "ybase", + "Script1.super(Script1).setBinding(Binding)", + "new Bar()", + "new Foo()", + "new SandboxInvokerTest$Base()", + "Bar.other()", + "Bar.super(Bar).other()", + "String.plus(String)"); + } + + @Issue("SECURITY-551") + @Test public void constructors() throws Throwable { + assertIntercept( + "import java.awt.Point;\n" + + "class C {\n" + + " Point p\n" + + " C() {\n" + + " p = new Point(1, 3)\n" + + " }\n" + + "}\n" + + "assert new C().p.y == 3\n", + (Object) null, + "Script1.super(Script1).setBinding(Binding)", + "new C()", + "new Point(Integer,Integer)", + "C.p", + "Point.y", + "ScriptBytecodeAdapter:compareEqual(Double,Integer)"); + } + + @Issue("SECURITY-551") + @Test public void fields() throws Throwable { + assertIntercept( + "import java.awt.Point;\n" + + "class C {\n" + + " Point p = new Point(1, 3)\n" + + "}\n" + + "assert new C().p.y == 3\n", + (Object) null, + "Script1.super(Script1).setBinding(Binding)", + "new C()", + "new Point(Integer,Integer)", + "C.p", + "Point.y", + "ScriptBytecodeAdapter:compareEqual(Double,Integer)"); + } + + @Issue("SECURITY-551") + @Test public void initializers() throws Throwable { + assertIntercept( + "import java.awt.Point;\n" + + "class C {\n" + + " Point p\n" + + " {\n" + + " p = new Point(1, 3)\n" + + " }\n" + + "}\n" + + "assert new C().p.y == 3\n", + (Object) null, + "Script1.super(Script1).setBinding(Binding)", + "new C()", + "new Point(Integer,Integer)", + "C.p", + "Point.y", + "ScriptBytecodeAdapter:compareEqual(Double,Integer)"); + } + + @Issue("SECURITY-566") + @Test public void typeCoercion() throws Throwable { + Field pxyCounterField = ProxyGeneratorAdapter.class.getDeclaredField("pxyCounter"); + pxyCounterField.setAccessible(true); + AtomicLong pxyCounterValue = (AtomicLong) pxyCounterField.get(null); + pxyCounterValue.set(0); // make sure *_groovyProxy names are predictable + assertIntercept( + "interface Static {\n" + + " Locale[] getAvailableLocales()\n" + + "}\n" + + "interface Instance {\n" + + " String getCountry()\n" + + "}\n" + + "assert (Locale as Static).getAvailableLocales() != null\n" + + "assert (Locale as Static).availableLocales != null\n" + + "assert Locale.getAvailableLocales() != null\n" + + "assert (Locale.getDefault() as Instance).getCountry() != null\n" + + "assert (Locale.getDefault() as Instance).country != null\n" + + "assert Locale.getDefault().getCountry() != null\n", + (Object) null, + "Script1.super(Script1).setBinding(Binding)", + "Locale:getAvailableLocales()", + "Class1_groovyProxy.getAvailableLocales()", + "ScriptBytecodeAdapter:compareNotEqual(Locale[],null)", + "Locale:getAvailableLocales()", + "Class1_groovyProxy.availableLocales", + "ScriptBytecodeAdapter:compareNotEqual(Locale[],null)", + "Locale:getAvailableLocales()", + "ScriptBytecodeAdapter:compareNotEqual(Locale[],null)", + "Locale:getDefault()", + "Locale.getCountry()", + "Locale2_groovyProxy.getCountry()", + "ScriptBytecodeAdapter:compareNotEqual(String,null)", + "Locale:getDefault()", + "Locale.getCountry()", + "Locale2_groovyProxy.country", + "ScriptBytecodeAdapter:compareNotEqual(String,null)", + "Locale:getDefault()", + "Locale.getCountry()", + "ScriptBytecodeAdapter:compareNotEqual(String,null)"); + } + + @Issue("SECURITY-567") + @Test + public void methodPointers() throws Throwable { + assertIntercept( + "import java.util.concurrent.Callable\n" + + "def b = new SandboxInvokerTest.Base()\n" + + "(b.&noArg)() \n" + + "(b.&multipleArgs)('Kohsuke', 'Kawaguchi') \n" + + "(b.&oneArg)('Something')\n" + + "['Something'].each(b.&oneArg)\n" + + "Callable c = b.&noArg\n" + + "c()\n" + + "def runit(Callable c) {c()}\n" + + "runit({-> b.noArg()})\n" + + "runit(b.&noArg)\n" + + "runit({-> b.noArg()} as Callable)\n" + + "runit(b.&noArg as Callable)\n", + (Object) "No argument", + "Script1.super(Script1).setBinding(Binding)", + "new SandboxInvokerTest$Base()", + "SandboxedMethodClosure.call()", + "SandboxInvokerTest$Base.noArg()", + "SandboxedMethodClosure.call(String,String)", + "SandboxInvokerTest$Base.multipleArgs(String,String)", + "SandboxedMethodClosure.call(String)", + "SandboxInvokerTest$Base.oneArg(String)", + "ArrayList.each(SandboxedMethodClosure)", + "SandboxInvokerTest$Base.oneArg(String)", + "SandboxedMethodClosure.call()", + "SandboxInvokerTest$Base.noArg()", + "Script1.runit(CpsClosure)", + "CpsClosure.call()", + "SandboxInvokerTest$Base.noArg()", + "Script1.runit(SandboxedMethodClosure)", + "SandboxedMethodClosure.call()", + "SandboxInvokerTest$Base.noArg()", + "Script1.runit(CpsClosure)", + "CpsClosure.call()", + "SandboxInvokerTest$Base.noArg()", + "Script1.runit(SandboxedMethodClosure)", + "SandboxedMethodClosure.call()", + "SandboxInvokerTest$Base.noArg()"); + } + + @Issue("SECURITY-567") + @Test + public void methodPointersStatic() throws Throwable { + assertIntercept( + "(SandboxInvokerTest.Base.&staticMultipleArgs)('Kohsuke', 'Kawaguchi')\n" + + "(SandboxInvokerTest.Base.&staticNoArg)()\n" + + "(SandboxInvokerTest.Base.&staticOneArg)('Something')\n", + (Object) "Just one arg: Something", + "Script1.super(Script1).setBinding(Binding)", + "SandboxedMethodClosure.call(String,String)", + "SandboxInvokerTest$Base:staticMultipleArgs(String,String)", + "SandboxedMethodClosure.call()", + "SandboxInvokerTest$Base:staticNoArg()", + "SandboxedMethodClosure.call(String)", + "SandboxInvokerTest$Base:staticOneArg(String)"); + } + + @Issue("JENKINS-45575") + @Test + public void sandboxedMultipleAssignment() throws Throwable { + assertIntercept( + "def (a, b) = ['first', 'second']\n" + + "def c, d\n" + + "(c, d) = ['third', 'fourth']\n" + + "return a + b + c + d\n", + (Object) "firstsecondthirdfourth", + "Script1.super(Script1).setBinding(Binding)", + "ArrayList[Integer]", + "ArrayList[Integer]", + "ArrayList[Integer]", + "ArrayList[Integer]", + "String.plus(String)", + "String.plus(String)", + "String.plus(String)"); + } + + @Issue("JENKINS-45575") + @Test + public void typeCoercionMultipleAssignment() throws Throwable { + Field pxyCounterField = ProxyGeneratorAdapter.class.getDeclaredField("pxyCounter"); + pxyCounterField.setAccessible(true); + AtomicLong pxyCounterValue = (AtomicLong) pxyCounterField.get(null); + pxyCounterValue.set(0); // make sure *_groovyProxy names are predictable + assertIntercept( + "interface Static {\n" + + " Locale[] getAvailableLocales()\n" + + "}\n" + + "interface Instance {\n" + + " String getCountry()\n" + + "}\n" + + "def (a, b) = [Locale as Static, Locale.getDefault() as Instance]\n" + + "assert a.getAvailableLocales() != null\n" + + "assert b.country != null\n", + (Object) null, + "Script1.super(Script1).setBinding(Binding)", + "Locale:getAvailableLocales()", + "Locale:getDefault()", + "Locale.getCountry()", + "ArrayList[Integer]", + "ArrayList[Integer]", + "Class1_groovyProxy.getAvailableLocales()", + "ScriptBytecodeAdapter:compareNotEqual(Locale[],null)", + "Locale2_groovyProxy.country", + "ScriptBytecodeAdapter:compareNotEqual(String,null)"); + } + + @Issue("JENKINS-49679") + @Test + public void sandboxedMultipleAssignmentRunsMethodOnce() throws Throwable { + assertIntercept( + "alreadyRun = false\n" + + "def getAandB() {\n" + + " if (!alreadyRun) {\n" + + " alreadyRun = true\n" + + " return ['first', 'second']\n" + + " } else {\n" + + " return ['bad', 'worse']\n" + + " }\n" + + "}\n" + + "def (a, b) = getAandB()\n" + + "def c, d\n" + + "(c, d) = ['third', 'fourth']\n" + + "return a + b + c + d\n", + (Object) "firstsecondthirdfourth", + "Script1.super(Script1).setBinding(Binding)", + "Script1.alreadyRun=Boolean", + "Script1.getAandB()", + "Script1.alreadyRun", + "Script1.alreadyRun=Boolean", + "ArrayList[Integer]", + "ArrayList[Integer]", + "ArrayList[Integer]", + "ArrayList[Integer]", + "String.plus(String)", + "String.plus(String)", + "String.plus(String)"); + } + + @Issue("SECURITY-1186") + @Test + public void finalizerForbidden() throws Throwable { + try { + evalCpsSandbox("class Test { @Override public void finalize() { } }; null"); + fail("Finalizers should be rejected"); + } catch (MultipleCompilationErrorsException e) { + assertThat(e.getErrorCollector().getErrorCount(), equalTo(1)); + Exception innerE = e.getErrorCollector().getException(0); + assertThat(innerE, instanceOf(SecurityException.class)); + assertThat(innerE.getMessage(), containsString("Object.finalize()")); + } + } + + @Issue("SECURITY-1186") + @Test + public void nonCpsfinalizerForbidden() throws Throwable { + try { + evalCpsSandbox("class Test { @Override @NonCPS public void finalize() { } }; null"); + fail("Finalizers should be rejected"); + } catch (MultipleCompilationErrorsException e) { + assertThat(e.getErrorCollector().getErrorCount(), equalTo(1)); + Exception innerE = e.getErrorCollector().getException(0); + assertThat(innerE, instanceOf(SecurityException.class)); + assertThat(innerE.getMessage(), containsString("Object.finalize()")); + } + } + +} diff --git a/lib/src/test/java/foo.groovy b/lib/src/test/java/foo.groovy deleted file mode 100644 index 1f814e553..000000000 --- a/lib/src/test/java/foo.groovy +++ /dev/null @@ -1,37 +0,0 @@ -// playground to check semantics of Groovy code - -class foo { - public static void main(String[] args) { - new foo().x(); - } - - public void x() { - runClosureWith(new bar()) { - println y(); - println prop; - - println this; // inside the closure 'this' gets resolved as property('this') so it doesn't point to the closure object itself - println this.y(); - println this.prop; - } - } - - public static void runClosureWith(Object delegate, Closure c) { - c.setDelegate(delegate); - c.setResolveStrategy(Closure.DELEGATE_FIRST) - c.run(); - } - - public String y() { - return "foo"; - } - - public String prop = "foo"; - - public static class bar { - public String prop = "foo"; - public String y() { - return "bar"; - } - } -} \ No newline at end of file From 077f8b9c44b921c424ff3904db2d36832f907853 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 24 Oct 2022 17:44:17 -0400 Subject: [PATCH 736/932] Remove gmavenplus --- lib/pom.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/lib/pom.xml b/lib/pom.xml index 674adc50a..078f5c91b 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -64,24 +64,6 @@ - - org.codehaus.gmavenplus - gmavenplus-plugin - 1.5 - - - - testGenerateStubs - testCompile - - - - ${project.build.directory}/generated-sources/groovy-stubs - ${project.build.directory}/generated-test-sources/groovy-stubs - - - - org.apache.maven.plugins maven-surefire-plugin From fc464d6dd8cf7c7d40162718275baec68fb978a6 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 25 Oct 2022 13:12:44 -0400 Subject: [PATCH 737/932] Use explicit imports for all test assertions --- .../com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java | 8 +++++--- .../java/com/cloudbees/groovy/cps/ContinuableTest.java | 5 +++++ .../cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java | 1 + .../com/cloudbees/groovy/cps/CpsTransformer2Test.java | 2 ++ .../java/com/cloudbees/groovy/cps/CpsTransformerTest.java | 4 ++++ .../test/java/com/cloudbees/groovy/cps/SafepointTest.java | 2 ++ .../cloudbees/groovy/cps/impl/FunctionCallBlockTest.java | 2 ++ .../java/com/cloudbees/groovy/cps/impl/NotBlockTest.java | 2 ++ .../groovy/cps/impl/PropertyAccessBlockTest.java | 2 ++ .../com/cloudbees/groovy/cps/impl/ThrowBlockTest.java | 1 + .../com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java | 2 ++ 11 files changed, 28 insertions(+), 3 deletions(-) diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java index 35d9cafbd..ad855ca4f 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java @@ -10,17 +10,19 @@ import java.io.ObjectOutputStream; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import static org.hamcrest.CoreMatchers.equalTo; -import org.junit.Assert; import org.junit.Before; import org.kohsuke.groovy.sandbox.impl.GroovyCallSiteSelector; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.fail; + /** * * * @author Kohsuke Kawaguchi */ -public abstract class AbstractGroovyCpsTest extends Assert { +public abstract class AbstractGroovyCpsTest { /** * CPS-transforming shelll */ diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/ContinuableTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/ContinuableTest.java index a3f045fe8..c291d4607 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/ContinuableTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/ContinuableTest.java @@ -9,6 +9,11 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java index 68b1f8d2a..983d2f8f2 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java @@ -16,6 +16,7 @@ import org.junit.runners.Parameterized; import static java.util.Arrays.asList; +import static org.junit.Assert.assertEquals; @RunWith(Parameterized.class) diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java index a3d9ff080..0ec9fbf4b 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java @@ -23,7 +23,9 @@ import org.jvnet.hudson.test.Issue; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; public class CpsTransformer2Test extends AbstractGroovyCpsTest { diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java index 47adfd05b..a2ca9090d 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java @@ -15,6 +15,10 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/SafepointTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/SafepointTest.java index f719a295a..118fe191b 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/SafepointTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/SafepointTest.java @@ -3,6 +3,8 @@ import org.junit.Ignore; import org.junit.Test; +import static org.junit.Assert.assertEquals; + /** * Make sure that a safepoint covers all the infinite loops. * diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java index a99a63ad4..5c619216b 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java @@ -11,6 +11,8 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.fail; /** * diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/NotBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/NotBlockTest.java index b1d1a3596..e52d040d3 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/impl/NotBlockTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/NotBlockTest.java @@ -11,6 +11,8 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertTrue; public class NotBlockTest extends AbstractGroovyCpsTest { diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.java index 3c5817b5f..2c383afa2 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/PropertyAccessBlockTest.java @@ -5,6 +5,8 @@ import com.cloudbees.groovy.cps.Continuation; import org.junit.Test; +import static org.junit.Assert.assertEquals; + /** * * diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java index 38459384b..af4ab683b 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java @@ -11,6 +11,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.MatcherAssert.assertThat; /** * diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java index 61595e38b..e0da2f223 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java @@ -11,6 +11,8 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; /** * TODO: tests to write From 4b0409120721fc2c513a16d65d22b83b891528a1 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 25 Oct 2022 13:14:33 -0400 Subject: [PATCH 738/932] Merge SandboxInvoker2Test.java into SandboxInvokerTest.java --- .../cps/sandbox/SandboxInvoker2Test.java | 210 ------------------ .../cps/sandbox/SandboxInvokerTest.java | 204 ++++++++++++++++- 2 files changed, 200 insertions(+), 214 deletions(-) delete mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java deleted file mode 100644 index 2be49807f..000000000 --- a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvoker2Test.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * Copyright 2020 CloudBees, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudbees.groovy.cps.sandbox; - -import com.cloudbees.groovy.cps.Continuation; -import com.cloudbees.groovy.cps.CpsTransformer; -import com.cloudbees.groovy.cps.Envs; -import com.cloudbees.groovy.cps.SandboxCpsTransformer; -import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; -import com.cloudbees.groovy.cps.impl.FunctionCallEnv; -import java.io.File; -import static org.hamcrest.CoreMatchers.equalTo; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ErrorCollector; -import org.jvnet.hudson.test.Issue; -import org.kohsuke.groovy.sandbox.ClassRecorder; -import org.kohsuke.groovy.sandbox.impl.GroovyCallSiteSelector; - -public class SandboxInvoker2Test extends AbstractGroovyCpsTest { - @Rule - public ErrorCollector ec = new ErrorCollector(); - - ClassRecorder cr = new ClassRecorder(); - - @Override - protected CpsTransformer createCpsTransformer() { - return new SandboxCpsTransformer(); - } - - @Before public void zeroIota() { - CpsTransformer.iota.set(0); - } - - protected Object evalCpsSandbox(String script) throws Throwable { - FunctionCallEnv e = (FunctionCallEnv)Envs.empty(); - e.setInvoker(new SandboxInvoker()); - - cr.reset(); - cr.register(); - try { - return parseCps(script).invoke(e, null, Continuation.HALT).run().yield.replay(); - } finally { - cr.unregister(); - } - } - - private void assertIntercept(String... expected) { - ec.checkThat(cr.toString().split("\n"), equalTo(expected)); - } - - public void assertIntercept(String script, Object expectedResult, String... expectedInterceptions) throws Throwable { - Object actualResult = evalCpsSandbox(script); - String actualCpsType = GroovyCallSiteSelector.getName(actualResult); - String expectedType = GroovyCallSiteSelector.getName(expectedResult); - ec.checkThat("CPS and sandbox-transformed result (" + actualCpsType + ") does not match expected result (" + expectedType + ")", actualResult, equalTo(expectedResult)); - assertIntercept(expectedInterceptions); - } - - @Issue("SECURITY-1710") - @Test public void methodParametersWithInitialExpressions() throws Throwable { - evalCpsSandbox("def m(p = System.getProperties()){ true }; m()"); - assertIntercept( - "Script1.super(Script1).setBinding(Binding)", - "Script1.m()", - "System:getProperties()", - "Script1.m(Properties)"); - } - - @Test public void constructorParametersWithInitialExpressions() throws Throwable { - evalCpsSandbox( - "class Test {\n" + - " Test(p = System.getProperties()) { }" + - "}\n" + - "new Test()"); - assertIntercept( - "Script1.super(Script1).setBinding(Binding)", - "new Test()", - "System:getProperties()"); - } - - @Ignore("Initial expressions for parameters in CPS-transformed closures are currently ignored") - @Test public void closureParametersWithInitialExpressions() throws Throwable { - // Fails because p is null in the body of the closure. - assertEquals(true, evalCpsSandbox("{ p = System.getProperties() -> p != null }()")); - assertIntercept( - "Script1.super(Script1).setBinding(Binding)", - "CpsClosure.call()", - "System:getProperties()", // Not currently intercepted because it is dropped by the transformer. - "ScriptBytecodeAdapter:compareNotEqual(null,null)"); - } - - @Issue("SECURITY-2824") - @Test public void sandboxInterceptsImplicitCastsVariableAssignment() throws Throwable { - assertEquals(new File("secret.key"), evalCpsSandbox( - "File file\n" + // DeclarationExpression - "file = ['secret.key']\n " + // BinaryExpression - "file")); - assertIntercept( - "Script1.super(Script1).setBinding(Binding)", - "new File(String)"); - } - - @Issue("SECURITY-2824") - @Test - public void sandboxInterceptsImplicitCastsArrayAssignment() throws Throwable { - // Regular Groovy casts the rhs of array assignments to match the component type of the array, but the - // sandbox does not do this (with or without the CPS transformation). Ideally the sandbox would have the same - // behavior as regular Groovy, but the current behavior is safe, which is good enough. - try { - evalCpsSandbox( - "File[] files = [null]\n" + - "files[0] = ['secret.key']\n " + - "files[0]"); - fail("The sandbox must intercept unsafe array element assignments"); - } catch (Throwable t) { - assertEquals("java.lang.ArrayStoreException: java.util.ArrayList", t.toString()); - } - } - - @Issue("SECURITY-2824") - @Test public void sandboxInterceptsImplicitCastsInitialParameterExpressions() throws Throwable { - assertIntercept( - "def method(File file = ['secret.key']) { file }; method()", - new File("secret.key"), - "Script1.super(Script1).setBinding(Binding)", - "Script1.method()", - "new File(String)", - "Script1.method(File)"); - // The CPS transformation currently ignores Closure parameter initial expressions. - assertIntercept( - "({ File file = ['secret.key'] -> file })()", - (Object)null, - "Script2.super(Script2).setBinding(Binding)", - "CpsClosure.call()"); - // "new File(String)" This should also be intercepted if initial expressions are supported - assertIntercept( - "class Test {\n" + - " def x\n" + - " Test(File file = ['secret.key']) {\n" + - " x = file\n" + - " }\n" + - "}\n" + - "new Test().x", - new File("secret.key"), - "Script3.super(Script3).setBinding(Binding)", - "new Test()", - "new File(String)", - "Test.x"); - } - - @Issue("SECURITY-2824") - @Test public void sandboxInterceptsImplicitCastsFields() throws Throwable { - assertIntercept( - "class Test {\n" + - " File file = ['secret.key']\n" + - "}\n" + - "new Test().file", - new File("secret.key"), - "Script1.super(Script1).setBinding(Binding)", - "new Test()", - "new File(String)", - "Test.file"); - assertIntercept( - "@groovy.transform.Field File file = ['secret.key']\n" + - "file", - new File("secret.key"), - "new File(String)", - "Script2.super(Script2).setBinding(Binding)", - "Script2.file"); - } - - @Issue("SECURITY-2824") - @Test public void sandboxInterceptsArrayCastsRecursively() throws Throwable { - assertIntercept( - "([['secret.key']] as File[])[0]", - new File("secret.key"), - "Script1.super(Script1).setBinding(Binding)", - "new File(String)", - "File[][Integer]"); - } - - @Test public void sandboxInterceptsBooleanCasts() throws Throwable { - assertIntercept("if ([:]) { true } else { false }", - false, - "Script1.super(Script1).setBinding(Binding)", - "LinkedHashMap.asBoolean()"); - assertIntercept("if (['a' : 1]) { true } else { false }", - true, - "Script2.super(Script2).setBinding(Binding)", - "LinkedHashMap.asBoolean()"); - } - -} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java index 144d54224..3848bd36e 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java @@ -1,6 +1,27 @@ +/* + * Copyright 2020 CloudBees, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.cloudbees.groovy.cps.sandbox; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.CpsTransformer; +import com.cloudbees.groovy.cps.Envs; +import com.cloudbees.groovy.cps.SandboxCpsTransformer; import com.cloudbees.groovy.cps.AbstractGroovyCpsTest; +import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import java.awt.Point; import java.io.File; import java.lang.reflect.Field; @@ -8,20 +29,58 @@ import java.util.concurrent.atomic.AtomicLong; import org.codehaus.groovy.control.MultipleCompilationErrorsException; import org.codehaus.groovy.runtime.ProxyGeneratorAdapter; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ErrorCollector; import org.jvnet.hudson.test.Issue; import org.kohsuke.groovy.sandbox.ClassRecorder; +import org.kohsuke.groovy.sandbox.impl.GroovyCallSiteSelector; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +public class SandboxInvokerTest extends AbstractGroovyCpsTest { + @Rule + public ErrorCollector ec = new ErrorCollector(); -/** - * @author Kohsuke Kawaguchi - */ -public class SandboxInvokerTest extends SandboxInvoker2Test { ClassRecorder cr = new ClassRecorder(); + @Override + protected CpsTransformer createCpsTransformer() { + return new SandboxCpsTransformer(); + } + + @Before public void zeroIota() { + CpsTransformer.iota.set(0); + } + + protected Object evalCpsSandbox(String script) throws Throwable { + FunctionCallEnv e = (FunctionCallEnv)Envs.empty(); + e.setInvoker(new SandboxInvoker()); + + cr.reset(); + cr.register(); + try { + return parseCps(script).invoke(e, null, Continuation.HALT).run().yield.replay(); + } finally { + cr.unregister(); + } + } + + public void assertIntercept(String script, Object expectedResult, String... expectedInterceptions) throws Throwable { + Object actualResult = evalCpsSandbox(script); + String actualCpsType = GroovyCallSiteSelector.getName(actualResult); + String expectedType = GroovyCallSiteSelector.getName(expectedResult); + ec.checkThat("CPS and sandbox-transformed result (" + actualCpsType + ") does not match expected result (" + expectedType + ")", actualResult, equalTo(expectedResult)); + ec.checkThat(cr.toString().split("\n"), equalTo(expectedInterceptions)); + } + /** * Covers all the intercepted operations. */ @@ -475,4 +534,141 @@ public void nonCpsfinalizerForbidden() throws Throwable { } } + @Issue("SECURITY-1710") + @Test public void methodParametersWithInitialExpressions() throws Throwable { + assertIntercept( + "def m(p = System.getProperties()){ true }; m()", + true, + "Script1.super(Script1).setBinding(Binding)", + "Script1.m()", + "System:getProperties()", + "Script1.m(Properties)"); + } + + @Test public void constructorParametersWithInitialExpressions() throws Throwable { + assertIntercept( + "class Test {\n" + + " Test(p = System.getProperties()) { }" + + "}\n" + + "new Test()\n" + + "null", + null, + "Script1.super(Script1).setBinding(Binding)", + "new Test()", + "System:getProperties()"); + } + + @Ignore("Initial expressions for parameters in CPS-transformed closures are currently ignored") + @Test public void closureParametersWithInitialExpressions() throws Throwable { + // Fails because p is null in the body of the closure. + assertIntercept( + "{ p = System.getProperties() -> p != null }()", + true, + "Script1.super(Script1).setBinding(Binding)", + "CpsClosure.call()", + "System:getProperties()", // Not currently intercepted because it is dropped by the transformer. + "ScriptBytecodeAdapter:compareNotEqual(null,null)"); + } + + @Issue("SECURITY-2824") + @Test public void sandboxInterceptsImplicitCastsVariableAssignment() throws Throwable { + assertIntercept( + "File file\n" + // DeclarationExpression + "file = ['secret.key']\n " + // BinaryExpression + "file", + new File("secret.key"), + "Script1.super(Script1).setBinding(Binding)", + "new File(String)"); + } + + @Issue("SECURITY-2824") + @Test + public void sandboxInterceptsImplicitCastsArrayAssignment() throws Throwable { + // Regular Groovy casts the rhs of array assignments to match the component type of the array, but the + // sandbox does not do this (with or without the CPS transformation). Ideally the sandbox would have the same + // behavior as regular Groovy, but the current behavior is safe, which is good enough. + try { + evalCpsSandbox( + "File[] files = [null]\n" + + "files[0] = ['secret.key']\n " + + "files[0]"); + fail("The sandbox must intercept unsafe array element assignments"); + } catch (Throwable t) { + assertEquals("java.lang.ArrayStoreException: java.util.ArrayList", t.toString()); + } + } + + @Issue("SECURITY-2824") + @Test public void sandboxInterceptsImplicitCastsInitialParameterExpressions() throws Throwable { + assertIntercept( + "def method(File file = ['secret.key']) { file }; method()", + new File("secret.key"), + "Script1.super(Script1).setBinding(Binding)", + "Script1.method()", + "new File(String)", + "Script1.method(File)"); + // The CPS transformation currently ignores Closure parameter initial expressions. + assertIntercept( + "({ File file = ['secret.key'] -> file })()", + (Object)null, + "Script2.super(Script2).setBinding(Binding)", + "CpsClosure.call()"); + // "new File(String)" This should also be intercepted if initial expressions are supported + assertIntercept( + "class Test {\n" + + " def x\n" + + " Test(File file = ['secret.key']) {\n" + + " x = file\n" + + " }\n" + + "}\n" + + "new Test().x", + new File("secret.key"), + "Script3.super(Script3).setBinding(Binding)", + "new Test()", + "new File(String)", + "Test.x"); + } + + @Issue("SECURITY-2824") + @Test public void sandboxInterceptsImplicitCastsFields() throws Throwable { + assertIntercept( + "class Test {\n" + + " File file = ['secret.key']\n" + + "}\n" + + "new Test().file", + new File("secret.key"), + "Script1.super(Script1).setBinding(Binding)", + "new Test()", + "new File(String)", + "Test.file"); + assertIntercept( + "@groovy.transform.Field File file = ['secret.key']\n" + + "file", + new File("secret.key"), + "new File(String)", + "Script2.super(Script2).setBinding(Binding)", + "Script2.file"); + } + + @Issue("SECURITY-2824") + @Test public void sandboxInterceptsArrayCastsRecursively() throws Throwable { + assertIntercept( + "([['secret.key']] as File[])[0]", + new File("secret.key"), + "Script1.super(Script1).setBinding(Binding)", + "new File(String)", + "File[][Integer]"); + } + + @Test public void sandboxInterceptsBooleanCasts() throws Throwable { + assertIntercept("if ([:]) { true } else { false }", + false, + "Script1.super(Script1).setBinding(Binding)", + "LinkedHashMap.asBoolean()"); + assertIntercept("if (['a' : 1]) { true } else { false }", + true, + "Script2.super(Script2).setBinding(Binding)", + "LinkedHashMap.asBoolean()"); + } + } From 9a3b1b042211e83b48fea6a15096e2575b397a0b Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 25 Oct 2022 13:21:32 -0400 Subject: [PATCH 739/932] Merge CpsTransformer2Test.java into CpsTransformerTest.java --- .../groovy/cps/CpsTransformer2Test.java | 195 ------------------ .../groovy/cps/CpsTransformerTest.java | 167 ++++++++++++++- 2 files changed, 166 insertions(+), 196 deletions(-) delete mode 100644 lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java deleted file mode 100644 index 0ec9fbf4b..000000000 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformer2Test.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Copyright 2020 CloudBees, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cloudbees.groovy.cps; - -import java.util.Arrays; -import java.util.Collections; -import org.junit.Ignore; -import org.junit.Test; -import org.jvnet.hudson.test.Issue; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -public class CpsTransformer2Test extends AbstractGroovyCpsTest { - - @Test - public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { - assertEquals(Boolean.FALSE, evalCPS( - "def m1() { true }\n" + - "def m2(p = m1()){ false }\n" + - "m2()\n")); - } - - @Test public void methodsWithInitialExpressionsAreExpandedToCorrectOverloads() throws Throwable { - assertEquals(Arrays.asList("abc", "xbc", "xyc", "xyz"), evalCPS( - "def m2(a = 'a', b = 'b', c = 'c') {\n" + - " a + b + c\n" + - "}\n" + - "def r1 = m2()\n" + - "def r2 = m2('x')\n" + - "def r3 = m2('x', 'y')\n" + - "def r4 = m2('x', 'y', 'z')\n" + - "[r1, r2, r3, r4]")); - assertEquals(Arrays.asList("abc", "xbc", "xby"), evalCPS( - "def m2(a = 'a', b, c = 'c') {\n" + - " a + b + c\n" + - "}\n" + - "def r1 = m2('b')\n" + - "def r2 = m2('x', 'b')\n" + - "def r3 = m2('x', 'b', 'y')\n" + - "[r1, r2, r3]")); - } - - @Test public void voidMethodsWithInitialExpressionsAreExpandedToCorrectOverloads() throws Throwable { - assertEquals(Arrays.asList("abc", "xbc", "xyc", "xyz"), evalCPS( - "import groovy.transform.Field\n" + - "@Field def r = []\n" + - "void m2(a = 'a', b = 'b', c = 'c') {\n" + - " r.add(a + b + c)\n" + - "}\n" + - "m2()\n" + - "m2('x')\n" + - "m2('x', 'y')\n" + - "m2('x', 'y', 'z')\n" + - "r")); - assertEquals(Arrays.asList("abc", "xbc", "xby"), evalCPS( - "import groovy.transform.Field\n" + - "@Field def r = []\n" + - "void m2(a = 'a', b, c = 'c') {\n" + - " r.add(a + b + c)\n" + - "}\n" + - "m2('b')\n" + - "m2('x', 'b')\n" + - "m2('x', 'b', 'y')\n" + - "r")); - } - - @Issue("JENKINS-57253") - @Test public void illegalBreakStatement() throws Throwable { - getBinding().setProperty("sentinel", 1); - try { - evalCPSonly("sentinel = 2; break;"); - fail("Execution should fail"); - } catch (Exception e) { - assertThat(e.toString(), containsString("the break statement is only allowed inside loops or switches")); - } - assertEquals("Script should fail during compilation", 1, getBinding().getProperty("sentinel")); - } - - @Ignore("groovy-cps does not cast method return values to the declared type") - @Test public void methodReturnValuesShouldBeCastToDeclaredReturnType() throws Throwable { - assertEquals(true, evalCPS( - "Boolean castToBoolean(def o) { o }\n" + - "castToBoolean(123)\n")); - } - - @Test public void castToTypeShouldBeUsedForImplicitCasts() throws Throwable { - assertEquals(Arrays.asList("toString", "toString", "toString", "asType"), evalCPS( - "class Test {\n" + - " def auditLog = []\n" + - " @NonCPS\n" + - " def asType(Class c) {\n" + - " auditLog.add('asType')\n" + - " 'Test.asType'\n" + - " }\n" + - " @NonCPS\n" + - " String toString() {\n" + - " auditLog.add('toString')\n" + - " 'Test.toString'\n" + - " }\n" + - "}\n" + - "Test t = new Test()\n" + - "String variable = t\n" + - "String[] array = [t]\n" + - "(String)t\n" + - "t as String\n" + // This is the only cast that should call asType. - "t.auditLog\n")); - } - - @Test public void castRelatedMethodsShouldBeNonCps() throws Throwable { - // asType CPS (supported (to the extent possible) for compatibility with existing code) - assertEquals(Arrays.asList(false, "asType class java.lang.Boolean"), evalCPS( - "class Test {\n" + - " def auditLog = []\n" + - " def asType(Class c) {\n" + - " auditLog.add('asType ' + c)\n" + - " false\n" + - " }\n" + - "}\n" + - "def t = new Test()\n" + - "[t as Boolean, t.auditLog[0]]")); - // asType NonCPS (preferred) - assertEquals(Collections.singletonList("asType class java.lang.Boolean"), evalCPS( - "class Test {\n" + - " def auditLog = []\n" + - " @NonCPS\n" + - " def asType(Class c) {\n" + - " auditLog.add('asType ' + c)\n" + - " null\n" + - " }\n" + - "}\n" + - "def t = new Test()\n" + - "t as Boolean\n" + - "t.auditLog")); - // asBoolean CPS (has never worked, still does not work) - try { - evalCPS( - "class Test {\n" + - " def auditLog = []\n" + - " def asBoolean() {\n" + - " auditLog.add('asBoolean')\n" + - " }\n" + - "}\n" + - "def t = new Test()\n" + - "(Boolean)t\n" + - "t.auditLog"); - fail("Should have thrown an exception"); - } catch (Throwable t) { - assertEquals("java.lang.IllegalStateException: Test.asBoolean must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/", t.toString()); - } - // asBoolean NonCPS (required) - assertEquals(Collections.singletonList("asBoolean"), evalCPS( - "class Test {\n" + - " def auditLog = []\n" + - " @NonCPS\n" + - " def asBoolean() {\n" + - " auditLog.add('asBoolean')\n" + - " }\n" + - "}\n" + - "def t = new Test()\n" + - "(Boolean)t\n" + - "t.auditLog")); - } - - @Test - public void enums() throws Throwable { - assertEquals("FIRST", evalCPS( - "enum EnumTest { FIRST, SECOND }; EnumTest.FIRST.toString()")); - assertEquals("FIRST", evalCPS( - "enum EnumTest { FIRST(), SECOND(); EnumTest() { } }; EnumTest.FIRST.toString()")); - } - - @Test - public void anonymousClass() throws Throwable { - assertEquals(6, evalCPS( - "def o = new Object() { def plusOne(x) { x + 1 } }\n" + - "o.plusOne(5)")); - } -} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java index a2ca9090d..707d81aa2 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java @@ -5,6 +5,7 @@ import java.io.File; import java.math.BigDecimal; import java.util.Arrays; +import java.util.Collections; import java.util.Locale; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -336,7 +337,7 @@ public void assertion() throws Throwable { @Test public void unaryOps() throws Throwable { - assertEvaluate(0, + assertEvaluate(0, "def x = 5;\n" + "def y = -x;\n" + "def z = +x;\n" + @@ -961,4 +962,168 @@ public void spreadMapExpression() throws Throwable { assertThat(e.getMessage(), containsString("spread map not yet supported for CPS transformation")); } } + + @Test + public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { + assertEquals(Boolean.FALSE, evalCPS( + "def m1() { true }\n" + + "def m2(p = m1()){ false }\n" + + "m2()\n")); + } + + @Test public void methodsWithInitialExpressionsAreExpandedToCorrectOverloads() throws Throwable { + assertEquals(Arrays.asList("abc", "xbc", "xyc", "xyz"), evalCPS( + "def m2(a = 'a', b = 'b', c = 'c') {\n" + + " a + b + c\n" + + "}\n" + + "def r1 = m2()\n" + + "def r2 = m2('x')\n" + + "def r3 = m2('x', 'y')\n" + + "def r4 = m2('x', 'y', 'z')\n" + + "[r1, r2, r3, r4]")); + assertEquals(Arrays.asList("abc", "xbc", "xby"), evalCPS( + "def m2(a = 'a', b, c = 'c') {\n" + + " a + b + c\n" + + "}\n" + + "def r1 = m2('b')\n" + + "def r2 = m2('x', 'b')\n" + + "def r3 = m2('x', 'b', 'y')\n" + + "[r1, r2, r3]")); + } + + @Test public void voidMethodsWithInitialExpressionsAreExpandedToCorrectOverloads() throws Throwable { + assertEquals(Arrays.asList("abc", "xbc", "xyc", "xyz"), evalCPS( + "import groovy.transform.Field\n" + + "@Field def r = []\n" + + "void m2(a = 'a', b = 'b', c = 'c') {\n" + + " r.add(a + b + c)\n" + + "}\n" + + "m2()\n" + + "m2('x')\n" + + "m2('x', 'y')\n" + + "m2('x', 'y', 'z')\n" + + "r")); + assertEquals(Arrays.asList("abc", "xbc", "xby"), evalCPS( + "import groovy.transform.Field\n" + + "@Field def r = []\n" + + "void m2(a = 'a', b, c = 'c') {\n" + + " r.add(a + b + c)\n" + + "}\n" + + "m2('b')\n" + + "m2('x', 'b')\n" + + "m2('x', 'b', 'y')\n" + + "r")); + } + + @Issue("JENKINS-57253") + @Test public void illegalBreakStatement() throws Throwable { + getBinding().setProperty("sentinel", 1); + try { + evalCPSonly("sentinel = 2; break;"); + fail("Execution should fail"); + } catch (Exception e) { + assertThat(e.toString(), containsString("the break statement is only allowed inside loops or switches")); + } + assertEquals("Script should fail during compilation", 1, getBinding().getProperty("sentinel")); + } + + @Ignore("groovy-cps does not cast method return values to the declared type") + @Test public void methodReturnValuesShouldBeCastToDeclaredReturnType() throws Throwable { + assertEquals(true, evalCPS( + "Boolean castToBoolean(def o) { o }\n" + + "castToBoolean(123)\n")); + } + + @Test public void castToTypeShouldBeUsedForImplicitCasts() throws Throwable { + assertEquals(Arrays.asList("toString", "toString", "toString", "asType"), evalCPS( + "class Test {\n" + + " def auditLog = []\n" + + " @NonCPS\n" + + " def asType(Class c) {\n" + + " auditLog.add('asType')\n" + + " 'Test.asType'\n" + + " }\n" + + " @NonCPS\n" + + " String toString() {\n" + + " auditLog.add('toString')\n" + + " 'Test.toString'\n" + + " }\n" + + "}\n" + + "Test t = new Test()\n" + + "String variable = t\n" + + "String[] array = [t]\n" + + "(String)t\n" + + "t as String\n" + // This is the only cast that should call asType. + "t.auditLog\n")); + } + + @Test public void castRelatedMethodsShouldBeNonCps() throws Throwable { + // asType CPS (supported (to the extent possible) for compatibility with existing code) + assertEquals(Arrays.asList(false, "asType class java.lang.Boolean"), evalCPS( + "class Test {\n" + + " def auditLog = []\n" + + " def asType(Class c) {\n" + + " auditLog.add('asType ' + c)\n" + + " false\n" + + " }\n" + + "}\n" + + "def t = new Test()\n" + + "[t as Boolean, t.auditLog[0]]")); + // asType NonCPS (preferred) + assertEquals(Collections.singletonList("asType class java.lang.Boolean"), evalCPS( + "class Test {\n" + + " def auditLog = []\n" + + " @NonCPS\n" + + " def asType(Class c) {\n" + + " auditLog.add('asType ' + c)\n" + + " null\n" + + " }\n" + + "}\n" + + "def t = new Test()\n" + + "t as Boolean\n" + + "t.auditLog")); + // asBoolean CPS (has never worked, still does not work) + try { + evalCPS( + "class Test {\n" + + " def auditLog = []\n" + + " def asBoolean() {\n" + + " auditLog.add('asBoolean')\n" + + " }\n" + + "}\n" + + "def t = new Test()\n" + + "(Boolean)t\n" + + "t.auditLog"); + fail("Should have thrown an exception"); + } catch (Throwable t) { + assertEquals("java.lang.IllegalStateException: Test.asBoolean must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/", t.toString()); + } + // asBoolean NonCPS (required) + assertEquals(Collections.singletonList("asBoolean"), evalCPS( + "class Test {\n" + + " def auditLog = []\n" + + " @NonCPS\n" + + " def asBoolean() {\n" + + " auditLog.add('asBoolean')\n" + + " }\n" + + "}\n" + + "def t = new Test()\n" + + "(Boolean)t\n" + + "t.auditLog")); + } + + @Test + public void enums() throws Throwable { + assertEquals("FIRST", evalCPS( + "enum EnumTest { FIRST, SECOND }; EnumTest.FIRST.toString()")); + assertEquals("FIRST", evalCPS( + "enum EnumTest { FIRST(), SECOND(); EnumTest() { } }; EnumTest.FIRST.toString()")); + } + + @Test + public void anonymousClass() throws Throwable { + assertEquals(6, evalCPS( + "def o = new Object() { def plusOne(x) { x + 1 } }\n" + + "o.plusOne(5)")); + } } From 6076db3b599580dc04ced5ea05a005ccb8462265 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 25 Oct 2022 15:35:27 -0400 Subject: [PATCH 740/932] Restore CpsDefaultGroovyMethodsTest test method that verifies @NonCPS behavior --- .../groovy/cps/CpsDefaultGroovyMethodsTest.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java index 983d2f8f2..738a21709 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java @@ -357,10 +357,20 @@ public static Iterable generateParameters() { } @Test - public void sync() throws Throwable { + public void cps() throws Throwable { assertEvaluate(testResult, testCode); } - + + @Test + public void nonCps() throws Throwable { + assertEvaluate(testResult, + "@NonCPS\n" + + "def someMethod() {\n" + + " " + testCode + "\n" + + "}\n" + + "someMethod()"); + } + private static Map map(Object... values) { return InvokerHelper.createMap(values); } From c3199ff52f06d8f665eac97c22333d0a42ee5be6 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 25 Oct 2022 17:00:01 -0400 Subject: [PATCH 741/932] Prefer assertEvaluate over assertEquals(..., evalCPS(...)) in CpsTransformerTest --- .../groovy/cps/CpsTransformerTest.java | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java index 6dd1daf73..5e095769d 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java @@ -965,14 +965,14 @@ public void spreadMapExpression() throws Throwable { @Test public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { - assertEquals(Boolean.FALSE, evalCPS( + assertEvaluate(Boolean.FALSE, "def m1() { true }\n" + "def m2(p = m1()){ false }\n" + - "m2()\n")); + "m2()\n"); } @Test public void methodsWithInitialExpressionsAreExpandedToCorrectOverloads() throws Throwable { - assertEquals(Arrays.asList("abc", "xbc", "xyc", "xyz"), evalCPS( + assertEvaluate(Arrays.asList("abc", "xbc", "xyc", "xyz"), "def m2(a = 'a', b = 'b', c = 'c') {\n" + " a + b + c\n" + "}\n" + @@ -980,15 +980,15 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "def r2 = m2('x')\n" + "def r3 = m2('x', 'y')\n" + "def r4 = m2('x', 'y', 'z')\n" + - "[r1, r2, r3, r4]")); - assertEquals(Arrays.asList("abc", "xbc", "xby"), evalCPS( + "[r1, r2, r3, r4]"); + assertEvaluate(Arrays.asList("abc", "xbc", "xby"), "def m2(a = 'a', b, c = 'c') {\n" + " a + b + c\n" + "}\n" + "def r1 = m2('b')\n" + "def r2 = m2('x', 'b')\n" + "def r3 = m2('x', 'b', 'y')\n" + - "[r1, r2, r3]")); + "[r1, r2, r3]"); } @Test public void voidMethodsWithInitialExpressionsAreExpandedToCorrectOverloads() throws Throwable { @@ -1029,13 +1029,13 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { @Ignore("groovy-cps does not cast method return values to the declared type") @Test public void methodReturnValuesShouldBeCastToDeclaredReturnType() throws Throwable { - assertEquals(true, evalCPS( + assertEvaluate(true, "Boolean castToBoolean(def o) { o }\n" + - "castToBoolean(123)\n")); + "castToBoolean(123)\n"); } @Test public void castToTypeShouldBeUsedForImplicitCasts() throws Throwable { - assertEquals(Arrays.asList("toString", "toString", "toString", "asType"), evalCPS( + assertEvaluate(Arrays.asList("toString", "toString", "toString", "asType"), "class Test {\n" + " def auditLog = []\n" + " @NonCPS\n" + @@ -1054,12 +1054,12 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "String[] array = [t]\n" + "(String)t\n" + "t as String\n" + // This is the only cast that should call asType. - "t.auditLog\n")); + "t.auditLog\n"); } @Test public void castRelatedMethodsShouldBeNonCps() throws Throwable { // asType CPS (supported (to the extent possible) for compatibility with existing code) - assertEquals(Arrays.asList(false, "asType class java.lang.Boolean"), evalCPS( + assertEvaluate(Arrays.asList(false, "asType class java.lang.Boolean"), "class Test {\n" + " def auditLog = []\n" + " def asType(Class c) {\n" + @@ -1068,9 +1068,9 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { " }\n" + "}\n" + "def t = new Test()\n" + - "[t as Boolean, t.auditLog[0]]")); + "[t as Boolean, t.auditLog[0]]"); // asType NonCPS (preferred) - assertEquals(Collections.singletonList("asType class java.lang.Boolean"), evalCPS( + assertEvaluate(Collections.singletonList("asType class java.lang.Boolean"), "class Test {\n" + " def auditLog = []\n" + " @NonCPS\n" + @@ -1081,7 +1081,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "}\n" + "def t = new Test()\n" + "t as Boolean\n" + - "t.auditLog")); + "t.auditLog"); // asBoolean CPS (has never worked, still does not work) try { evalCPS( @@ -1099,7 +1099,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { assertEquals("java.lang.IllegalStateException: Test.asBoolean must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/", t.toString()); } // asBoolean NonCPS (required) - assertEquals(Collections.singletonList("asBoolean"), evalCPS( + assertEvaluate(Collections.singletonList("asBoolean"), "class Test {\n" + " def auditLog = []\n" + " @NonCPS\n" + @@ -1109,32 +1109,32 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "}\n" + "def t = new Test()\n" + "(Boolean)t\n" + - "t.auditLog")); + "t.auditLog"); } @Test public void enums() throws Throwable { - assertEquals("FIRST", evalCPS( - "enum EnumTest { FIRST, SECOND }; EnumTest.FIRST.toString()")); - assertEquals("FIRST", evalCPS( - "enum EnumTest { FIRST(), SECOND(); EnumTest() { } }; EnumTest.FIRST.toString()")); + assertEvaluate("FIRST", + "enum EnumTest { FIRST, SECOND }; EnumTest.FIRST.toString()"); + assertEvaluate("FIRST", + "enum EnumTest { FIRST(), SECOND(); EnumTest() { } }; EnumTest.FIRST.toString()"); } @Test public void anonymousClass() throws Throwable { - assertEquals(6, evalCPS( + assertEvaluate(6, "def o = new Object() { def plusOne(x) { x + 1 } }\n" + - "o.plusOne(5)")); + "o.plusOne(5)"); } @Issue("JENKINS-62064") @Test public void assignmentExprsEvalToRHS() throws Throwable { - assertEquals(Arrays.asList(1, 1, 1), evalCPS( + assertEvaluate(Arrays.asList(1, 1, 1), "def a = b = c = 1\n" + - "[a, b, c]\n")); - assertEquals(Arrays.asList(2, 3, 4), evalCPS( + "[a, b, c]\n"); + assertEvaluate(Arrays.asList(2, 3, 4), "def a = b = c = 1\n" + "c += b += a += 1\n" + - "[a, b, c]\n")); + "[a, b, c]\n"); } } From 150ceb52fb6973d2e0eb58e29da87cfc244b0d50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Oct 2022 17:07:08 +0000 Subject: [PATCH 742/932] Bump junit from 4.11 to 4.13.1 in /lib Bumps [junit](https://github.com/junit-team/junit4) from 4.11 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.11.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.11...r4.13.1) Signed-off-by: dependabot[bot] --- lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pom.xml b/lib/pom.xml index 078f5c91b..4abd3d56a 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -135,7 +135,7 @@ junit junit - 4.11 + 4.13.1 test From 17706c65b27b4cbad4325a88ff3499f3a79a9f52 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 26 Oct 2022 14:42:03 -0700 Subject: [PATCH 743/932] Workaround for JDK-8231454 on Java 11 is no longer necessary as of 11.0.17 (#600) --- .../jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 73af9a206..9d1b3db80 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -52,6 +52,7 @@ import hudson.model.Action; import hudson.model.Result; import hudson.util.Iterators; +import hudson.util.VersionNumber; import io.jenkins.lib.versionnumber.JavaSpecificationVersion; import jenkins.model.CauseOfInterruption; import jenkins.model.Jenkins; @@ -1390,9 +1391,10 @@ private static void cleanUpGlobalClassValue(@NonNull ClassLoader loader) throws } private static void cleanUpClassInfoCache(Class clazz) { - JavaSpecificationVersion current = JavaSpecificationVersion.forCurrentJVM(); - if (current.isNewerThan(new JavaSpecificationVersion("1.8")) - && current.isOlderThan(new JavaSpecificationVersion("16"))) { + int releaseVersion = JavaSpecificationVersion.forCurrentJVM().toReleaseVersion(); + if ((releaseVersion > 8 && releaseVersion < 11) + || (releaseVersion == 11 && new VersionNumber(System.getProperty("java.version")).isOlderThan(new VersionNumber("11.0.17"))) + || (releaseVersion > 11 && releaseVersion < 16)) { try { // TODO Work around JDK-8231454. Class classInfoC = Class.forName("com.sun.beans.introspect.ClassInfo"); From 9aeb7425aa92505592fcecb47364d5b96fb894e5 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Thu, 27 Oct 2022 16:47:45 -0400 Subject: [PATCH 744/932] Adapt tests to support both Java 11 and Java 17 --- .../groovy/cps/CpsTransformerTest.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java index cbd319e95..6707f461c 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java @@ -14,7 +14,9 @@ import org.junit.Test; import org.jvnet.hudson.test.Issue; +import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; @@ -172,16 +174,19 @@ public void workflowCallingWorkflow() throws Throwable { */ @Test public void exceptionFromNonCpsCodeShouldBeCaughtByCatchBlockInCpsCode() throws Throwable { - assertEvaluate("begin 5, end 3, length 3", - "def foo() {\n" + - " 'abc'.substring(5);\n" + // will caught exception - " return 'fail';\n" + - "}\n" + - "try {\n" + - " return foo();\n" + - "} catch(StringIndexOutOfBoundsException e) {\n" + - " return e.message;\n" + - "}\n"); + try { + evalCPS( + "def foo() {\n" + + " 'abc'.substring(5);\n" + // will caught exception + " return 'fail';\n" + + "}\n" + + "return foo()\n"); + fail("Should have failed"); + } catch(StringIndexOutOfBoundsException e) { + assertThat(e.getMessage(), anyOf( + equalTo("String index out of range: -2"), // Before Java 14 + equalTo("begin 5, end 3, length 3"))); // Later versions + } } /** From c1a2ff4c70527eb315a75c1946a7f0fe460d9c06 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Thu, 27 Oct 2022 16:55:59 -0400 Subject: [PATCH 745/932] Move try/catch back into script to preserve test's original intent --- .../groovy/cps/CpsTransformerTest.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java index 6707f461c..ecb5c951f 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java @@ -174,19 +174,19 @@ public void workflowCallingWorkflow() throws Throwable { */ @Test public void exceptionFromNonCpsCodeShouldBeCaughtByCatchBlockInCpsCode() throws Throwable { - try { - evalCPS( - "def foo() {\n" + - " 'abc'.substring(5);\n" + // will caught exception - " return 'fail';\n" + - "}\n" + - "return foo()\n"); - fail("Should have failed"); - } catch(StringIndexOutOfBoundsException e) { - assertThat(e.getMessage(), anyOf( - equalTo("String index out of range: -2"), // Before Java 14 - equalTo("begin 5, end 3, length 3"))); // Later versions - } + String message = (String) evalCPSonly( + "def foo() {\n" + + " 'abc'.substring(5);\n" + // will caught exception + " return 'fail';\n" + + "}\n" + + "try {\n" + + " return foo();\n" + + "} catch(StringIndexOutOfBoundsException e) {\n" + + " return e.message;\n" + + "}\n"); + assertThat(message, anyOf( + equalTo("String index out of range: -2"), // Before Java 14 + equalTo("begin 5, end 3, length 3"))); // Later versions } /** From 945e30a25fb6618d8943abda9a757723555cbb56 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 31 Oct 2022 13:22:23 +0100 Subject: [PATCH 746/932] Bump plugin from 4.48 to 4.49 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 761f3f51e..9bacbfe9e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 4.48 + 4.49 org.jenkins-ci.plugins.workflow @@ -69,6 +69,7 @@ 1.34 16.17.0 8.18.0 + 1.22.19 From b619104e81efe295f16278625d3ad38c87fc51ee Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 31 Oct 2022 14:04:08 -0400 Subject: [PATCH 747/932] Remove files that should not be source controlled --- dgm-builder/nbactions.xml | 46 --------------------------------------- lib/test.groovy | 15 ------------- 2 files changed, 61 deletions(-) delete mode 100644 dgm-builder/nbactions.xml delete mode 100644 lib/test.groovy diff --git a/dgm-builder/nbactions.xml b/dgm-builder/nbactions.xml deleted file mode 100644 index e864b2346..000000000 --- a/dgm-builder/nbactions.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - run - - jar - - - process-classes - org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - - - -classpath %classpath com.cloudbees.groovy.cps.tool.Driver ../lib/target/generated-sources/dgm/ - java - - - - debug - - jar - - - process-classes - org.codehaus.mojo:exec-maven-plugin:1.5.0:exec - - - -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath com.cloudbees.groovy.cps.tool.Driver ../lib/target/generated-sources/dgm/ - java - true - - - - profile - - jar - - - process-classes - org.codehaus.mojo:exec-maven-plugin:1.5.0:exec - - - -classpath %classpath com.cloudbees.groovy.cps.tool.Driver ../lib/target/generated-sources/dgm/ - java - - - diff --git a/lib/test.groovy b/lib/test.groovy deleted file mode 100644 index 26e0fe458..000000000 --- a/lib/test.groovy +++ /dev/null @@ -1,15 +0,0 @@ -def config(c) { - def map = [:]; - map.inc = { x -> x+1 } - c.resolveStrategy = Closure.DELEGATE_FIRST; - c.delegate = map; - c(); - return map; -} - -def x = config { - foo = 3 - fog = containsKey('foo'); -} - -println(x.fog); From a9c28f124d77be71a761888b02e54bea320a1630 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 31 Oct 2022 14:28:23 -0400 Subject: [PATCH 748/932] Migrate to Jenkins plugin parent POM in preparation for integration into workflow-cps Co-authored-by: Basil Crow --- dgm-builder/pom.xml | 55 ++---- .../com/cloudbees/groovy/cps/tool/Driver.java | 3 +- .../cloudbees/groovy/cps/tool/Translator.java | 10 +- lib/pom.xml | 103 +++-------- .../cloudbees/groovy/cps/Continuation.java | 2 + .../cloudbees/groovy/cps/CpsTransformer.java | 5 +- .../java/com/cloudbees/groovy/cps/Env.java | 11 +- .../java/com/cloudbees/groovy/cps/Next.java | 2 +- .../groovy/cps/impl/CallSiteBlock.java | 5 +- .../groovy/cps/impl/CallSiteBlockSupport.java | 4 +- .../groovy/cps/impl/DoWhileBlock.java | 2 +- .../cps/impl/ExcrementOperatorBlock.java | 2 +- .../groovy/cps/impl/ForInLoopBlock.java | 2 +- .../groovy/cps/impl/ForLoopBlock.java | 4 +- .../groovy/cps/impl/FunctionCallBlock.java | 2 + .../groovy/cps/impl/LocalVariableBlock.java | 1 + .../groovy/cps/impl/MethodPointerBlock.java | 9 +- .../cloudbees/groovy/cps/impl/NotBlock.java | 3 +- .../groovy/cps/impl/PropertyishBlock.java | 5 +- .../groovy/cps/impl/SequenceBlock.java | 2 +- .../groovy/cps/impl/SwitchBlock.java | 2 +- .../cloudbees/groovy/cps/impl/ThrowBlock.java | 2 +- .../cps/impl/ValueBoundContinuation.java | 2 +- .../cloudbees/groovy/cps/impl/WhileBlock.java | 2 +- pom.xml | 174 ++---------------- 25 files changed, 102 insertions(+), 312 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 4a9973d7a..db112fa6a 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -11,15 +12,13 @@ CpsDefaultGroovyMethods generator + + 11 + 11 + + - - maven-compiler-plugin - - 1.8 - 1.8 - - org.apache.maven.plugins maven-deploy-plugin @@ -27,15 +26,6 @@ true - org.apache.maven.plugins maven-assembly-plugin @@ -58,24 +48,16 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - - - org.kathrynhuxtable.maven.wagon - wagon-gitsite - 0.3.1 - - + + + javax.annotation + javax.annotation-api + 1.3.2 + org.kohsuke.codemodel codemodel @@ -84,7 +66,7 @@ org.jenkins-ci.main remoting - 2.51 + 4.13.3 org.codehaus.groovy @@ -97,17 +79,6 @@ sources ${groovy.version} - - com.google.guava - guava - 11.0.1 - - - org.jenkins-ci - test-annotations - 1.2 - test - diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java index c03b20137..d47b0fff2 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java @@ -12,6 +12,7 @@ import javax.tools.ToolProvider; import java.io.File; import java.nio.charset.Charset; +import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; @@ -68,7 +69,7 @@ public void run(File dir) throws Exception { } - dir.mkdirs(); + Files.createDirectories(dir.toPath()); t.generateTo(new FileCodeWriter(dir)); } } diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 7d77dfe0d..fe87e550b 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -1,6 +1,5 @@ package com.cloudbees.groovy.cps.tool; -import com.google.common.io.Resources; import com.sun.codemodel.CodeWriter; import com.sun.codemodel.JClass; import com.sun.codemodel.JClassAlreadyExistsException; @@ -75,6 +74,8 @@ import javax.lang.model.util.SimpleTypeVisitor6; import javax.lang.model.util.Types; import javax.tools.JavaCompiler.CompilationTask; +import java.io.BufferedReader; +import java.io.InputStreamReader; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -88,7 +89,8 @@ import java.util.Optional; import java.util.Set; import java.util.TreeMap; -import javax.annotation.processing.Generated; +import java.util.stream.Collectors; +import javax.annotation.Generated; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; @@ -100,8 +102,8 @@ public class Translator { private static final Set translatable; static { - try { - translatable = new HashSet<>(Resources.readLines(Translator.class.getResource("translatable.txt"), StandardCharsets.UTF_8)); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(Translator.class.getResourceAsStream("translatable.txt"), StandardCharsets.UTF_8))) { + translatable = new HashSet<>(reader.lines().collect(Collectors.toSet())); } catch (IOException x) { throw new ExceptionInInitializerError(x); } diff --git a/lib/pom.xml b/lib/pom.xml index 4abd3d56a..2e69d692a 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -13,13 +14,6 @@ - - maven-compiler-plugin - - 1.8 - 1.8 - - org.apache.maven.plugins maven-dependency-plugin @@ -53,41 +47,12 @@ - - org.apache.maven.plugins - maven-site-plugin - - - org.kohsuke - doxia-module-markdown - 1.0 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20 - - false - - - - maven-jar-plugin - - - test-jar - - test-jar - - - - 1.30 + false @@ -98,6 +63,17 @@ runtime true + + com.github.spotbugs + spotbugs-annotations + true + + + com.google.code.findbugs + jsr305 + + + org.kohsuke groovy-sandbox @@ -121,49 +97,24 @@ --> provided - - org.codehaus.groovy - groovy-test - ${groovy.version} - test - com.google.guava guava - 11.0.1 - - - junit - junit - 4.13.1 - test - - - org.jenkins-ci - test-annotations - 1.2 - test + + + com.google.errorprone + error_prone_annotations + + + com.google.j2objc + j2objc-annotations + + + org.checkerframework + checker-qual + + - - - cloudbees-oss-release - - - - maven-source-plugin - - - attach-test-sources - - test-jar-no-fork - - - - - - - - diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuation.java index 282be70e0..e5bcfdff9 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -25,6 +25,8 @@ public interface Continuation extends Serializable { * Singleton implementation that maintains the singleton-ness across serialization */ final class Halt implements Continuation { + private static final long serialVersionUID = 1996175119530893094L; + private Halt() { } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 2aec12d3f..decb574b8 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -5,7 +5,7 @@ import com.cloudbees.groovy.cps.sandbox.Trusted; import com.cloudbees.groovy.cps.sandbox.Untrusted; import com.google.common.annotations.VisibleForTesting; - +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; @@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.Nonnull; import org.codehaus.groovy.ast.*; import org.codehaus.groovy.ast.expr.*; import org.codehaus.groovy.ast.stmt.*; @@ -115,7 +114,7 @@ public CpsTransformer() { super(CompilePhase.CANONICALIZATION); } - public void setConfiguration(@Nonnull TransformerConfiguration config) { + public void setConfiguration(@NonNull TransformerConfiguration config) { this.config = config; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Env.java b/lib/src/main/java/com/cloudbees/groovy/cps/Env.java index 0ee6ef4c6..0555aa920 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -3,10 +3,9 @@ import com.cloudbees.groovy.cps.impl.LocalVariableBlock; import com.cloudbees.groovy.cps.impl.VariableDeclBlock; import com.cloudbees.groovy.cps.sandbox.Invoker; +import edu.umd.cs.findbugs.annotations.NonNull; import groovy.lang.Closure; - import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; import java.io.Serializable; import java.util.List; @@ -36,7 +35,7 @@ public interface Env extends Serializable { * Name of the local variable. * @see VariableDeclBlock */ - void declareVariable(@Nonnull Class type, @Nonnull String name); + void declareVariable(@NonNull Class type, @NonNull String name); /** * Obtains the current value of a local variable in the current environment. @@ -44,7 +43,7 @@ public interface Env extends Serializable { * Name of the local variable. * @see LocalVariableBlock */ - Object getLocalVariable(@Nonnull String name); + Object getLocalVariable(@NonNull String name); /** * Sets the local variable to a new value. @@ -54,10 +53,10 @@ public interface Env extends Serializable { * New value * @see LocalVariableBlock */ - void setLocalVariable(@Nonnull String name, Object value); + void setLocalVariable(@NonNull String name, Object value); @CheckForNull - Class getLocalVariableType(@Nonnull String name); + Class getLocalVariableType(@NonNull String name); /** * Closure instance or 'this' object that surrounds the currently executing code. diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Next.java b/lib/src/main/java/com/cloudbees/groovy/cps/Next.java index 4ce1f3b47..da5aaa1e6 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -141,7 +141,7 @@ public static Next terminate0(Outcome v) { /** * As a {@link Continuation}, just ignore the argument. */ - public Next receive(Object _) { + public Next receive(Object unused) { return this; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlock.java index eb100d50d..a6c054ac2 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlock.java @@ -3,8 +3,7 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.sandbox.CallSiteTag; import com.cloudbees.groovy.cps.sandbox.Invoker; - -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.util.Collection; @@ -18,5 +17,5 @@ public interface CallSiteBlock extends Serializable, Block { /** * Tags associated with this call site. */ - @Nonnull Collection getTags(); + @NonNull Collection getTags(); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlockSupport.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlockSupport.java index 3148b076b..779bf9933 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlockSupport.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallSiteBlockSupport.java @@ -2,7 +2,7 @@ import com.cloudbees.groovy.cps.sandbox.CallSiteTag; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collection; import java.util.Collections; @@ -23,7 +23,7 @@ public CallSiteBlockSupport(Collection tags) { this.tags = tags; } - @Nonnull + @NonNull public Collection getTags() { if (tags==null) return Collections.emptySet(); return Collections.unmodifiableCollection(tags); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java index 358f4e1f3..6fcca8809 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java @@ -39,7 +39,7 @@ public Next top() { return then(body,e,loopHead); } - public Next loopHead(Object _) { + public Next loopHead(Object unused) { return then(cond, e, loopCond); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java index b84cf263e..6766ad704 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ExcrementOperatorBlock.java @@ -88,7 +88,7 @@ public Next calc(Object v) { /** * The result of the evaluation of the entire result depends on whether this is prefix or postfix */ - public Next done(Object _) { + public Next done(Object unused) { return k.receive(prefix?after:before); } } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java index 599110c59..841776fd3 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForInLoopBlock.java @@ -57,7 +57,7 @@ public Next loopHead(Object col) { return increment(null); } - public Next increment(Object _) { + public Next increment(Object unused) { if (itr.hasNext()) { // one more iteration e.setLocalVariable(variable,itr.next()); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java index 22966ee5d..a8cfcbaeb 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ForLoopBlock.java @@ -36,7 +36,7 @@ class ContinuationImpl extends ContinuationGroup { this.loopEnd = loopEnd; } - public Next loopHead(Object _) { + public Next loopHead(Object unused) { return then(e2, e, loopCond); } @@ -52,7 +52,7 @@ public Next loopCond(Object cond) { }); } - public Next increment(Object _) { + public Next increment(Object unused) { return then(e3,e,loopHead); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index 05fea43f6..8491bb904 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -7,6 +7,7 @@ import com.cloudbees.groovy.cps.Next; import com.cloudbees.groovy.cps.sandbox.CallSiteTag; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -41,6 +42,7 @@ public class FunctionCallBlock extends CallSiteBlockSupport { private final boolean safe; + @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "Block array is constructed during compilation, is not mutated, and is never exposed") public FunctionCallBlock(SourceLocation loc, Collection tags, Block lhsExp, Block nameExp, boolean safe, Block[] argExps) { super(tags); this.loc = loc; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java index 2597738d5..3e9932c2e 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LocalVariableBlock.java @@ -16,6 +16,7 @@ public class LocalVariableBlock extends LValueBlock { private SourceLocation loc; public LocalVariableBlock(SourceLocation loc, String name) { + this.loc = loc; this.name = name; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java index 3065eba58..0aabad623 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java @@ -6,12 +6,11 @@ import com.cloudbees.groovy.cps.Next; import com.cloudbees.groovy.cps.sandbox.CallSiteTag; import com.cloudbees.groovy.cps.sandbox.Invoker; -import org.codehaus.groovy.runtime.InvokerHelper; -import org.codehaus.groovy.runtime.MethodClosure; - -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collection; import java.util.Collections; +import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.runtime.MethodClosure; /** * Method pointer expression: {@code LHS&.methodName} @@ -31,7 +30,7 @@ public MethodPointerBlock(SourceLocation loc, Block lhsExp, Block methodNameExp, this.tags = tags; } - @Nonnull + @NonNull @Override public Collection getTags() { return tags !=null ? Collections.unmodifiableCollection(tags) : Collections.emptySet(); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java index bc1776e7c..b69aca5e2 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java @@ -4,6 +4,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; /** @@ -19,8 +20,8 @@ public NotBlock(Block b) { } @Override + @SuppressFBWarnings(value = "DLS_DEAD_LOCAL_STORE", justification = "Unused anonymous class exists to maintain compatibility with classes serialized before ContinuationImpl was introduced.") public Next eval(final Env e, final Continuation k) { - // Only exists to maintain compatibility with classes serialized before ContinuationImpl was introduced. Continuation backwardsCompatibility = new Continuation() { private static final long serialVersionUID = -7345620782904277090L; public Next receive(Object o) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java index 82643edbf..1416b1609 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/PropertyishBlock.java @@ -7,8 +7,7 @@ import com.cloudbees.groovy.cps.LValueBlock; import com.cloudbees.groovy.cps.Next; import com.cloudbees.groovy.cps.sandbox.CallSiteTag; - -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collection; import java.util.Collections; @@ -31,7 +30,7 @@ public PropertyishBlock(SourceLocation loc, Block lhs, Block property, boolean s this.tags = tags; } - @Nonnull + @NonNull public Collection getTags() { return tags !=null ? Collections.unmodifiableCollection(tags) : Collections.emptySet(); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java index 893558105..59c3981c1 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SequenceBlock.java @@ -34,7 +34,7 @@ public ContinuationImpl(Env e, Continuation k, Block exp2) { this.exp2 = exp2; } - public Next receive(Object _) { + public Next receive(Object unused) { return new Next(exp2, e, k); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java index 906b478e9..94bbbe2af 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SwitchBlock.java @@ -98,7 +98,7 @@ public Next matcher(Object caseValue) { /** * Executes the body and falls through to the next body. */ - public Next body(Object _) { + public Next body(Object unused) { if (index==cases.size()) { // that was the last block return k.receive(null); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java index e516366b3..b85f53f23 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java @@ -35,7 +35,7 @@ public ThrowBlock(SourceLocation loc, Block exp, boolean fillStackTrace) { this.fillStackTrace = fillStackTrace; } - public Next eval(final Env e, Continuation _) { + public Next eval(final Env e, Continuation unused) { return new Next(exp,e,new Continuation() { public Next receive(Object t) { if (t==null) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java index 8f7175135..91ded2d40 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ValueBoundContinuation.java @@ -17,7 +17,7 @@ final class ValueBoundContinuation implements Continuation { this.v = v; } - public Next receive(Object _) { + public Next receive(Object unused) { return k.receive(v); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java index 86ee13ce8..b5658a11e 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/WhileBlock.java @@ -34,7 +34,7 @@ class ContinuationImpl extends ContinuationGroup { this.loopEnd = loopEnd; } - public Next loopHead(Object _) { + public Next loopHead(Object unused) { return then(cond, e, loopCond); } diff --git a/pom.xml b/pom.xml index 31fc21236..8db9be8b7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,15 @@ + 4.0.0 - com.cloudbees - cloudbees-oss-parent - 9 + org.jenkins-ci.plugins + plugin + 4.48 + com.cloudbees groovy-cps-parent ${revision}${changelist} pom @@ -16,13 +18,10 @@ UTF-8 + 2.346.1 2.4.21 1.35 -SNAPSHOT - - 1.1 - 1.1 - https://repo.jenkins-ci.org/incrementals/ HEAD @@ -45,153 +44,18 @@ lib - - - - - io.jenkins.tools.incrementals - incrementals-maven-plugin - ${incrementals-plugin.version} - - - org.jenkins-ci.* - io.jenkins.* - - false - false - - - - - - - - - - consume-incrementals - - - incrementals - ${incrementals.url} - - false - - - - - - incrementals - ${incrementals.url} - - false - - - - - - might-produce-incrementals - - - - org.codehaus.mojo - flatten-maven-plugin - 1.0.1 - - true - ${project.build.directory} - ${project.artifactId}-${project.version}.pom - - - - flatten - process-resources - - flatten - - - oss - - - - - - maven-enforcer-plugin - 3.0.0-M2 - - - display-info - - - - [3.5.4,) - 3.5.4+ required to use Incrementals. - - - [${incrementals-enforce-minimum.version},) - - - - - - - - io.jenkins.tools.incrementals - incrementals-enforcer-rules - ${incrementals-plugin.version} - - - - - maven-release-plugin - - incrementals:reincrementalify - - - - - - - produce-incrementals - - - set.changelist - true - - - - - incrementals - ${incrementals.url} - - - - - - maven-source-plugin - 3.0.1 - - - attach-sources - - jar-no-fork - - - - - - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + From 416a43aea1c193ea9a10a7484b9bf88bf9ba95a5 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 31 Oct 2022 16:27:37 -0400 Subject: [PATCH 749/932] Modules should not modify Maven SCM configuration in parent Co-authored-by: Basil Crow --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8db9be8b7..db55f353e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ HEAD - + scm:git:git@github.com/cloudbees/groovy-cps.git scm:git:ssh://git@github.com/cloudbees/groovy-cps.git ${scmTag} From e623ff9584c3f46f36192c30ec5234d8e6e6215d Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 31 Oct 2022 17:44:57 -0400 Subject: [PATCH 750/932] Finish migrating to SpotBugs annotations, avoid deprecated SSH URLs, and do not specify redundant properties Co-authored-by: Basil Crow --- lib/src/main/java/com/cloudbees/groovy/cps/Env.java | 2 +- .../main/java/com/cloudbees/groovy/cps/impl/CallEnv.java | 5 ++--- .../cloudbees/groovy/cps/impl/CpsCallableInvocation.java | 9 +++------ .../java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java | 5 ++--- pom.xml | 3 +-- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Env.java b/lib/src/main/java/com/cloudbees/groovy/cps/Env.java index 0555aa920..f38c3d6a4 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Env.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Env.java @@ -3,9 +3,9 @@ import com.cloudbees.groovy.cps.impl.LocalVariableBlock; import com.cloudbees.groovy.cps.impl.VariableDeclBlock; import com.cloudbees.groovy.cps.sandbox.Invoker; +import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import groovy.lang.Closure; -import javax.annotation.CheckForNull; import java.io.Serializable; import java.util.List; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index ff2423e8f..42a71f1ac 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -6,8 +6,7 @@ import com.cloudbees.groovy.cps.Next; import com.cloudbees.groovy.cps.sandbox.Invoker; import com.google.common.collect.Maps; - -import javax.annotation.Nullable; +import edu.umd.cs.findbugs.annotations.CheckForNull; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -34,7 +33,7 @@ /** * Source location of the call site. */ - @Nullable + @CheckForNull private final SourceLocation callSiteLoc; private Invoker invoker; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java index 9b2ed8000..6a438e3b6 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CpsCallableInvocation.java @@ -4,14 +4,11 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; - +import edu.umd.cs.findbugs.annotations.CheckForNull; +import java.util.Arrays; import java.util.List; - -import static java.util.Arrays.*; import java.util.Collections; import java.util.Map; -import javax.annotation.CheckForNull; - import groovy.lang.Closure; import groovy.lang.GroovyObject; import groovy.lang.MetaClass; @@ -50,7 +47,7 @@ public CpsCallableInvocation(String methodName, CpsCallable call, Object receive this.methodName = methodName; this.call = call; this.receiver = receiver; - this.arguments = arguments != null ? asList(arguments) : Collections.emptyList(); + this.arguments = arguments != null ? Arrays.asList(arguments) : Collections.emptyList(); } public Next invoke(Env caller, SourceLocation loc, Continuation k) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java index 60cadc86f..611b205d7 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java @@ -4,8 +4,7 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; - -import javax.annotation.Nullable; +import edu.umd.cs.findbugs.annotations.CheckForNull; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; @@ -18,7 +17,7 @@ // TODO: should be package local once all the impls move into this class public class TryBlockEnv extends ProxyEnv { private final Map handlers = new LinkedHashMap(2); - @Nullable + @CheckForNull private final Block finally_; public TryBlockEnv(Env parent, Block finally_) { diff --git a/pom.xml b/pom.xml index db55f353e..6a32907f3 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,6 @@ Groovy CPS Execution Parent - UTF-8 2.346.1 2.4.21 1.35 @@ -27,7 +26,7 @@ scm:git:git@github.com/cloudbees/groovy-cps.git - scm:git:ssh://git@github.com/cloudbees/groovy-cps.git + scm:git:git@github.com:cloudbees/groovy-cps.git ${scmTag} From cee026aaaab559d970d2b5d444a6a69775196185 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 31 Oct 2022 23:48:54 +0100 Subject: [PATCH 751/932] Update a few frontend dependencies --- .github/dependabot.yml | 4 + README.md | 2 +- package.json | 18 +- yarn.lock | 505 ++++++++++++++++++----------------------- 4 files changed, 234 insertions(+), 295 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 769057c7d..5a2c12479 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,3 +13,7 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: "yarn" + directory: "/" + schedule: + interval: "weekly" diff --git a/README.md b/README.md index 23630591a..10f685769 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Introduction -A key component of the Pipeline plugin suite, this provides the standard execution engine for Pipeline steps, based on a custom [Groovy](http://www.groovy-lang.org/) interpreter that runs inside the Jenkins controller process. +A key component of the Pipeline plugin suite, this provides the standard execution engine for Pipeline steps, based on a custom [Groovy](https://www.groovy-lang.org/) interpreter that runs inside the Jenkins controller process. (In principle other execution engines could be supported, with `FlowDefinition` being the API entry point, but none has been prototyped and it would likely be a very substantial effort to write one.) diff --git a/package.json b/package.json index ed9f88922..e6d98ba7e 100644 --- a/package.json +++ b/package.json @@ -14,19 +14,19 @@ }, "repository": { "type": "git", - "url": "https://github.com/jenkinsci/workflow-plugin/tree/master/cps" + "url": "https://github.com/jenkinsci/workflow-cps-plugin" }, "readme": "../README.md", "devDependencies": { - "@babel/cli": "^7.18.10", - "@babel/core": "^7.18.10", - "@babel/preset-env": "^7.18.10", - "autoprefixer": "^10.0.1", - "babel-loader": "^8.1.0", - "clean-webpack-plugin": "^3.0.0", + "@babel/cli": "^7.19.3", + "@babel/core": "^7.19.3", + "@babel/preset-env": "^7.19.3", + "autoprefixer": "^10.4.13", + "babel-loader": "^9.0.1", + "clean-webpack-plugin": "^4.0.0", "css-loader": "^5.0.0", "eslint": "^7.12.1", - "eslint-plugin-only-warn": "^1.0.2", + "eslint-plugin-only-warn": "^1.0.3", "less": "^3.12.2", "less-loader": "^7.0.2", "mini-css-extract-plugin": "^1.2.1", @@ -40,7 +40,7 @@ }, "dependencies": { "jenkins-js-modules": "1.3.0", - "jquery": "^3.5.1", + "jquery": "^3.6.1", "jquery-ui": "^1.13.2", "raf": "^3.4.1" }, diff --git a/yarn.lock b/yarn.lock index 9cc395ed8..eccb5119e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8,9 +8,9 @@ dependencies: "@jridgewell/trace-mapping" "^0.3.0" -"@babel/cli@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.18.10.tgz#4211adfc45ffa7d4f3cee6b60bb92e9fe68fe56a" +"@babel/cli@^7.19.3": + version "7.19.3" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.19.3.tgz#55914ed388e658e0b924b3a95da1296267e278e2" dependencies: "@jridgewell/trace-mapping" "^0.3.8" commander "^4.0.1" @@ -35,35 +35,35 @@ dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.13.tgz#6aff7b350a1e8c3e40b029e46cbe78e24a913483" +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.19.4", "@babel/compat-data@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.0.tgz#9b61938c5f688212c7b9ae363a819df7d29d4093" -"@babel/core@^7.18.10": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.13.tgz#9be8c44512751b05094a4d3ab05fc53a47ce00ac" +"@babel/core@^7.19.3": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f" dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.18.13" - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-module-transforms" "^7.18.9" - "@babel/helpers" "^7.18.9" - "@babel/parser" "^7.18.13" + "@babel/generator" "^7.19.6" + "@babel/helper-compilation-targets" "^7.19.3" + "@babel/helper-module-transforms" "^7.19.6" + "@babel/helpers" "^7.19.4" + "@babel/parser" "^7.19.6" "@babel/template" "^7.18.10" - "@babel/traverse" "^7.18.13" - "@babel/types" "^7.18.13" + "@babel/traverse" "^7.19.6" + "@babel/types" "^7.19.4" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.18.13": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212" +"@babel/generator@^7.19.6", "@babel/generator@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.0.tgz#0bfc5379e0efb05ca6092091261fcdf7ec36249d" dependencies: - "@babel/types" "^7.18.13" + "@babel/types" "^7.20.0" "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" @@ -80,13 +80,13 @@ "@babel/helper-explode-assignable-expression" "^7.18.6" "@babel/types" "^7.18.9" -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf" +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.0", "@babel/helper-compilation-targets@^7.19.3": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a" dependencies: - "@babel/compat-data" "^7.18.8" + "@babel/compat-data" "^7.20.0" "@babel/helper-validator-option" "^7.18.6" - browserslist "^4.20.2" + browserslist "^4.21.3" semver "^6.3.0" "@babel/helper-create-class-features-plugin@^7.18.6": @@ -108,9 +108,16 @@ "@babel/helper-annotate-as-pure" "^7.18.6" regexpu-core "^5.1.0" -"@babel/helper-define-polyfill-provider@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073" +"@babel/helper-create-regexp-features-plugin@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b" + dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" + regexpu-core "^5.1.0" + +"@babel/helper-define-polyfill-provider@^0.3.3": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a" dependencies: "@babel/helper-compilation-targets" "^7.17.7" "@babel/helper-plugin-utils" "^7.16.7" @@ -129,12 +136,12 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-function-name@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0" +"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" dependencies: - "@babel/template" "^7.18.6" - "@babel/types" "^7.18.9" + "@babel/template" "^7.18.10" + "@babel/types" "^7.19.0" "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" @@ -154,18 +161,18 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712" +"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f" dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.18.6" + "@babel/helper-simple-access" "^7.19.4" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.18.6" - "@babel/template" "^7.18.6" - "@babel/traverse" "^7.18.9" - "@babel/types" "^7.18.9" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.19.6" + "@babel/types" "^7.19.4" "@babel/helper-optimise-call-expression@^7.18.6": version "7.18.6" @@ -173,9 +180,9 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f" +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf" "@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9": version "7.18.9" @@ -196,11 +203,11 @@ "@babel/traverse" "^7.18.9" "@babel/types" "^7.18.9" -"@babel/helper-simple-access@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea" +"@babel/helper-simple-access@^7.18.6", "@babel/helper-simple-access@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7" dependencies: - "@babel/types" "^7.18.6" + "@babel/types" "^7.19.4" "@babel/helper-skip-transparent-expression-wrappers@^7.18.9": version "7.18.9" @@ -214,13 +221,13 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-string-parser@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56" +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" -"@babel/helper-validator-identifier@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076" +"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" "@babel/helper-validator-option@^7.18.6": version "7.18.6" @@ -235,13 +242,13 @@ "@babel/traverse" "^7.18.11" "@babel/types" "^7.18.10" -"@babel/helpers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9" +"@babel/helpers@^7.19.4": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.0.tgz#27c8ffa8cc32a2ed3762fba48886e7654dbcf77f" dependencies: - "@babel/template" "^7.18.6" - "@babel/traverse" "^7.18.9" - "@babel/types" "^7.18.9" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.20.0" + "@babel/types" "^7.20.0" "@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6": version "7.18.6" @@ -251,9 +258,9 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.18.10", "@babel/parser@^7.18.13": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4" +"@babel/parser@^7.18.10", "@babel/parser@^7.19.6", "@babel/parser@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.0.tgz#b26133c888da4d79b0d3edcf42677bcadc783046" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" @@ -269,12 +276,12 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" "@babel/plugin-proposal-optional-chaining" "^7.18.9" -"@babel/plugin-proposal-async-generator-functions@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952" +"@babel/plugin-proposal-async-generator-functions@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz#34f6f5174b688529342288cd264f80c9ea9fb4a7" dependencies: "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/helper-remap-async-to-generator" "^7.18.9" "@babel/plugin-syntax-async-generators" "^7.8.4" @@ -335,13 +342,13 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7" +"@babel/plugin-proposal-object-rest-spread@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz#a8fc86e8180ff57290c91a75d83fe658189b642d" dependencies: - "@babel/compat-data" "^7.18.8" - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/compat-data" "^7.19.4" + "@babel/helper-compilation-targets" "^7.19.3" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.18.8" @@ -493,21 +500,22 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-block-scoping@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d" +"@babel/plugin-transform-block-scoping@^7.19.4": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz#91fe5e6ffc9ba13cb6c95ed7f0b1204f68c988c5" dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.19.0" -"@babel/plugin-transform-classes@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz#90818efc5b9746879b869d5ce83eb2aa48bbc3da" +"@babel/plugin-transform-classes@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20" dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-compilation-targets" "^7.19.0" "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/helper-replace-supers" "^7.18.9" "@babel/helper-split-export-declaration" "^7.18.6" globals "^11.1.0" @@ -518,11 +526,11 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-destructuring@^7.18.9": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5" +"@babel/plugin-transform-destructuring@^7.19.4": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz#712829ef4825d9cc04bb379de316f981e9a6f648" dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.18.6" @@ -587,15 +595,14 @@ "@babel/helper-simple-access" "^7.18.6" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz#545df284a7ac6a05125e3e405e536c5853099a06" +"@babel/plugin-transform-modules-systemjs@^7.19.0": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d" dependencies: "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-module-transforms" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-validator-identifier" "^7.18.6" - babel-plugin-dynamic-import-node "^2.3.3" + "@babel/helper-module-transforms" "^7.19.6" + "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-validator-identifier" "^7.19.1" "@babel/plugin-transform-modules-umd@^7.18.6": version "7.18.6" @@ -604,12 +611,12 @@ "@babel/helper-module-transforms" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d" +"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz#ec7455bab6cd8fb05c525a94876f435a48128888" dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-create-regexp-features-plugin" "^7.19.0" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/plugin-transform-new-target@^7.18.6": version "7.18.6" @@ -655,11 +662,11 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-spread@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664" +"@babel/plugin-transform-spread@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6" dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" "@babel/plugin-transform-sticky-regex@^7.18.6": @@ -693,17 +700,17 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/preset-env@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4" +"@babel/preset-env@^7.19.3": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.4.tgz#4c91ce2e1f994f717efb4237891c3ad2d808c94b" dependencies: - "@babel/compat-data" "^7.18.8" - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/compat-data" "^7.19.4" + "@babel/helper-compilation-targets" "^7.19.3" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/helper-validator-option" "^7.18.6" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9" - "@babel/plugin-proposal-async-generator-functions" "^7.18.10" + "@babel/plugin-proposal-async-generator-functions" "^7.19.1" "@babel/plugin-proposal-class-properties" "^7.18.6" "@babel/plugin-proposal-class-static-block" "^7.18.6" "@babel/plugin-proposal-dynamic-import" "^7.18.6" @@ -712,7 +719,7 @@ "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" "@babel/plugin-proposal-numeric-separator" "^7.18.6" - "@babel/plugin-proposal-object-rest-spread" "^7.18.9" + "@babel/plugin-proposal-object-rest-spread" "^7.19.4" "@babel/plugin-proposal-optional-catch-binding" "^7.18.6" "@babel/plugin-proposal-optional-chaining" "^7.18.9" "@babel/plugin-proposal-private-methods" "^7.18.6" @@ -736,10 +743,10 @@ "@babel/plugin-transform-arrow-functions" "^7.18.6" "@babel/plugin-transform-async-to-generator" "^7.18.6" "@babel/plugin-transform-block-scoped-functions" "^7.18.6" - "@babel/plugin-transform-block-scoping" "^7.18.9" - "@babel/plugin-transform-classes" "^7.18.9" + "@babel/plugin-transform-block-scoping" "^7.19.4" + "@babel/plugin-transform-classes" "^7.19.0" "@babel/plugin-transform-computed-properties" "^7.18.9" - "@babel/plugin-transform-destructuring" "^7.18.9" + "@babel/plugin-transform-destructuring" "^7.19.4" "@babel/plugin-transform-dotall-regex" "^7.18.6" "@babel/plugin-transform-duplicate-keys" "^7.18.9" "@babel/plugin-transform-exponentiation-operator" "^7.18.6" @@ -749,9 +756,9 @@ "@babel/plugin-transform-member-expression-literals" "^7.18.6" "@babel/plugin-transform-modules-amd" "^7.18.6" "@babel/plugin-transform-modules-commonjs" "^7.18.6" - "@babel/plugin-transform-modules-systemjs" "^7.18.9" + "@babel/plugin-transform-modules-systemjs" "^7.19.0" "@babel/plugin-transform-modules-umd" "^7.18.6" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1" "@babel/plugin-transform-new-target" "^7.18.6" "@babel/plugin-transform-object-super" "^7.18.6" "@babel/plugin-transform-parameters" "^7.18.8" @@ -759,18 +766,18 @@ "@babel/plugin-transform-regenerator" "^7.18.6" "@babel/plugin-transform-reserved-words" "^7.18.6" "@babel/plugin-transform-shorthand-properties" "^7.18.6" - "@babel/plugin-transform-spread" "^7.18.9" + "@babel/plugin-transform-spread" "^7.19.0" "@babel/plugin-transform-sticky-regex" "^7.18.6" "@babel/plugin-transform-template-literals" "^7.18.9" "@babel/plugin-transform-typeof-symbol" "^7.18.9" "@babel/plugin-transform-unicode-escapes" "^7.18.10" "@babel/plugin-transform-unicode-regex" "^7.18.6" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.18.10" - babel-plugin-polyfill-corejs2 "^0.3.2" - babel-plugin-polyfill-corejs3 "^0.5.3" - babel-plugin-polyfill-regenerator "^0.4.0" - core-js-compat "^3.22.1" + "@babel/types" "^7.19.4" + babel-plugin-polyfill-corejs2 "^0.3.3" + babel-plugin-polyfill-corejs3 "^0.6.0" + babel-plugin-polyfill-regenerator "^0.4.1" + core-js-compat "^3.25.1" semver "^6.3.0" "@babel/preset-modules@^0.1.5": @@ -789,7 +796,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.18.10", "@babel/template@^7.18.6": +"@babel/template@^7.18.10": version "7.18.10" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" dependencies: @@ -797,27 +804,27 @@ "@babel/parser" "^7.18.10" "@babel/types" "^7.18.10" -"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.13", "@babel/traverse@^7.18.9": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68" +"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.6", "@babel/traverse@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.0.tgz#538c4c6ce6255f5666eba02252a7b59fc2d5ed98" dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.18.13" + "@babel/generator" "^7.20.0" "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.18.13" - "@babel/types" "^7.18.13" + "@babel/parser" "^7.20.0" + "@babel/types" "^7.20.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.4.4": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a" +"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.4", "@babel/types@^7.20.0", "@babel/types@^7.4.4": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.0.tgz#52c94cf8a7e24e89d2a194c25c35b17a64871479" dependencies: - "@babel/helper-string-parser" "^7.18.10" - "@babel/helper-validator-identifier" "^7.18.6" + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" "@discoveryjs/json-ext@^0.5.0": @@ -913,9 +920,9 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": - version "7.0.10" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.10.tgz#9b05b7896166cd00e9cbd59864853abf65d9ac23" +"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": + version "7.0.11" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" "@types/minimatch@*": version "3.0.5" @@ -929,39 +936,6 @@ version "4.0.0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" -"@types/source-list-map@*": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" - -"@types/tapable@^1": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310" - -"@types/uglify-js@*": - version "3.13.1" - resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea" - dependencies: - source-map "^0.6.1" - -"@types/webpack-sources@*": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b" - dependencies: - "@types/node" "*" - "@types/source-list-map" "*" - source-map "^0.7.3" - -"@types/webpack@^4.4.31": - version "4.41.32" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.32.tgz#a7bab03b72904070162b2f169415492209e94212" - dependencies: - "@types/node" "*" - "@types/tapable" "^1" - "@types/uglify-js" "*" - "@types/webpack-sources" "*" - anymatch "^3.0.0" - source-map "^0.6.0" - "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" @@ -1106,10 +1080,22 @@ acorn@^8.5.0, acorn@^8.7.1: version "8.8.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + dependencies: + ajv "^8.0.0" + ajv-keywords@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" +ajv-keywords@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + dependencies: + fast-deep-equal "^3.1.3" + ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -1119,9 +1105,9 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.1: - version "8.10.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d" +ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0: + version "8.11.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -1148,7 +1134,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -anymatch@^3.0.0, anymatch@~3.1.2: +anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" dependencies: @@ -1175,25 +1161,23 @@ astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" -autoprefixer@^10.0.1: - version "10.4.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.4.tgz#3e85a245b32da876a893d3ac2ea19f01e7ea5a1e" +autoprefixer@^10.4.13: + version "10.4.13" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.13.tgz#b5136b59930209a321e9fa3dca2e7c4d223e83a8" dependencies: - browserslist "^4.20.2" - caniuse-lite "^1.0.30001317" + browserslist "^4.21.4" + caniuse-lite "^1.0.30001426" fraction.js "^4.2.0" normalize-range "^0.1.2" picocolors "^1.0.0" postcss-value-parser "^4.2.0" -babel-loader@^8.1.0: - version "8.2.3" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" +babel-loader@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.0.1.tgz#d473f30a6ffc2f2abca610c01775c40fc5c2a970" dependencies: - find-cache-dir "^3.3.1" - loader-utils "^1.4.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" + find-cache-dir "^3.3.2" + schema-utils "^4.0.0" babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" @@ -1201,26 +1185,26 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" -babel-plugin-polyfill-corejs2@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d" +babel-plugin-polyfill-corejs2@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122" dependencies: "@babel/compat-data" "^7.17.7" - "@babel/helper-define-polyfill-provider" "^0.3.2" + "@babel/helper-define-polyfill-provider" "^0.3.3" semver "^6.1.1" -babel-plugin-polyfill-corejs3@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7" +babel-plugin-polyfill-corejs3@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a" dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.2" - core-js-compat "^3.21.0" + "@babel/helper-define-polyfill-provider" "^0.3.3" + core-js-compat "^3.25.1" -babel-plugin-polyfill-regenerator@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe" +babel-plugin-polyfill-regenerator@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747" dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.2" + "@babel/helper-define-polyfill-provider" "^0.3.3" balanced-match@^1.0.0: version "1.0.2" @@ -1247,24 +1231,14 @@ braces@~3.0.2: dependencies: fill-range "^7.0.1" -browserslist@^4.14.5, browserslist@^4.20.2: - version "4.20.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" - dependencies: - caniuse-lite "^1.0.30001317" - electron-to-chromium "^1.4.84" - escalade "^3.1.1" - node-releases "^2.0.2" - picocolors "^1.0.0" - -browserslist@^4.21.3: - version "4.21.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" +browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4: + version "4.21.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" dependencies: - caniuse-lite "^1.0.30001370" - electron-to-chromium "^1.4.202" + caniuse-lite "^1.0.30001400" + electron-to-chromium "^1.4.251" node-releases "^2.0.6" - update-browserslist-db "^1.0.5" + update-browserslist-db "^1.0.9" buffer-from@^1.0.0: version "1.1.2" @@ -1281,13 +1255,9 @@ callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" -caniuse-lite@^1.0.30001317: - version "1.0.30001317" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz#0548fb28fd5bc259a70b8c1ffdbe598037666a1b" - -caniuse-lite@^1.0.30001370: - version "1.0.30001382" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001382.tgz#4d37f0d0b6fffb826c8e5e1c0f4bf8ce592db949" +caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426: + version "1.0.30001427" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001427.tgz#d3a749f74be7ae0671fbec3a4eea18576e8ad646" chalk@^2.0.0: version "2.4.2" @@ -1322,11 +1292,10 @@ chrome-trace-event@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" -clean-webpack-plugin@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz#a99d8ec34c1c628a4541567aa7b457446460c62b" +clean-webpack-plugin@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz#72947d4403d452f38ed61a9ff0ada8122aacd729" dependencies: - "@types/webpack" "^4.4.31" del "^4.1.1" clone-deep@^4.0.1: @@ -1393,12 +1362,11 @@ copy-anything@^2.0.1: dependencies: is-what "^3.14.1" -core-js-compat@^3.21.0, core-js-compat@^3.22.1: - version "3.24.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.24.1.tgz#d1af84a17e18dfdd401ee39da9996f9a7ba887de" +core-js-compat@^3.25.1: + version "3.26.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.0.tgz#94e2cf8ba3e63800c4956ea298a6473bc9d62b44" dependencies: - browserslist "^4.21.3" - semver "7.0.0" + browserslist "^4.21.4" cosmiconfig@^7.0.0: version "7.0.1" @@ -1471,13 +1439,9 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -electron-to-chromium@^1.4.202: - version "1.4.226" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.226.tgz#837ea1d19b8305a913cd5f31d135681c4b6d63b1" - -electron-to-chromium@^1.4.84: - version "1.4.87" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.87.tgz#1aeacfa50b2fbf3ecf50a78fbebd8f259d4fe208" +electron-to-chromium@^1.4.251: + version "1.4.284" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" emoji-regex@^8.0.0: version "8.0.0" @@ -1532,7 +1496,7 @@ escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" -eslint-plugin-only-warn@^1.0.2: +eslint-plugin-only-warn@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/eslint-plugin-only-warn/-/eslint-plugin-only-warn-1.0.3.tgz#a75f3a9ded7f03e9808e75ec27f22b644084506e" @@ -1670,7 +1634,7 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -find-cache-dir@^3.3.1: +find-cache-dir@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" dependencies: @@ -1928,9 +1892,9 @@ jquery-ui@^1.13.2: dependencies: jquery ">=1.8.0 <4.0.0" -"jquery@>=1.8.0 <4.0.0", jquery@^3.5.1: - version "3.6.0" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" +"jquery@>=1.8.0 <4.0.0", jquery@^3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16" js-tokens@^4.0.0: version "4.0.0" @@ -1967,12 +1931,6 @@ json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - dependencies: - minimist "^1.2.0" - json5@^2.1.2, json5@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" @@ -2023,14 +1981,6 @@ loader-runner@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" -loader-utils@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" - loader-utils@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" @@ -2070,7 +2020,7 @@ make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.2, make-dir@^3.1.0: +make-dir@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" dependencies: @@ -2108,10 +2058,6 @@ minimatch@^3.0.4, minimatch@^3.1.1: dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -2132,10 +2078,6 @@ neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" -node-releases@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" - node-releases@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" @@ -2463,14 +2405,6 @@ safe-buffer@^5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" -schema-utils@^2.6.5: - version "2.7.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - dependencies: - "@types/json-schema" "^7.0.5" - ajv "^6.12.4" - ajv-keywords "^3.5.2" - schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" @@ -2479,9 +2413,14 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" -semver@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" +schema-utils@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + dependencies: + "@types/json-schema" "^7.0.9" + ajv "^8.8.0" + ajv-formats "^2.1.1" + ajv-keywords "^5.0.0" semver@^5.6.0: version "5.7.1" @@ -2546,14 +2485,10 @@ source-map-support@~0.5.20: buffer-from "^1.0.0" source-map "^0.6.0" -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: +source-map@^0.6.0, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" -source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -2685,9 +2620,9 @@ unicode-property-aliases-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" -update-browserslist-db@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38" +update-browserslist-db@^1.0.9: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" dependencies: escalade "^3.1.1" picocolors "^1.0.0" From 7937db07be34697c3ad9047b1eb123a447ad31e7 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Tue, 1 Nov 2022 13:26:38 +0100 Subject: [PATCH 752/932] Fix dependabot ecosystem --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5a2c12479..fe09c4629 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,7 +13,7 @@ updates: directory: "/" schedule: interval: "weekly" - - package-ecosystem: "yarn" + - package-ecosystem: "npm" directory: "/" schedule: interval: "weekly" From e6cb18169621464958923f8e952d07e782135929 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 1 Nov 2022 13:30:41 -0400 Subject: [PATCH 753/932] Update plugin BOM and remove unnecessary version specifications in pom.xml --- pom.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 761f3f51e..6fca27fcd 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ io.jenkins.tools.bom bom-2.346.x - 1607.va_c1576527071 + 1654.vcb_69d035fa_20 import pom @@ -85,12 +85,10 @@ org.jenkins-ci.plugins.workflow workflow-step-api - 639.v6eca_cd8c04a_a_ io.jenkins.plugins ionicons-api - 19.v744f3b_2b_b_e4e org.jenkins-ci.plugins.workflow @@ -107,7 +105,6 @@ org.jenkins-ci.plugins script-security - 1184.v85d16b_d851b_3 org.jenkins-ci.plugins From 6dd4898b236d32ba09e69f9ebcdca680b7805699 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 1 Nov 2022 13:43:00 -0400 Subject: [PATCH 754/932] Update minimum supported Jenkins version to 2.346.3 for compatibility with BOM --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6fca27fcd..448ed1000 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin - 2.346.1 + 2.346.3 false 1.34 16.17.0 From 306d1ce99ea2d66a7f4441c1dbcb4e36f60b904b Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 1 Nov 2022 15:06:27 -0400 Subject: [PATCH 755/932] Move existing plugin into new module --- .babelrc => plugin/.babelrc | 0 .eslintignore => plugin/.eslintignore | 0 .eslintrc.js => plugin/.eslintrc.js | 0 .mvn_exec_yarn => plugin/.mvn_exec_yarn | 0 package.json => plugin/package.json | 0 plugin/pom.xml | 294 ++++++++++++++++++ .../plugins/workflow/cps/BodyReference.java | 0 .../workflow/cps/ContextVariableSet.java | 0 .../workflow/cps/CpsBodyExecution.java | 0 .../plugins/workflow/cps/CpsBodyInvoker.java | 0 .../workflow/cps/CpsBodySubContext.java | 0 .../plugins/workflow/cps/CpsClosure2.java | 0 .../cps/CpsCompilationErrorsException.java | 0 .../workflow/cps/CpsFlowDefinition.java | 0 .../cps/CpsFlowDefinitionValidator.java | 0 .../workflow/cps/CpsFlowExecution.java | 0 .../workflow/cps/CpsFlowFactoryAction.java | 0 .../workflow/cps/CpsFlowFactoryAction2.java | 0 .../plugins/workflow/cps/CpsGroovyShell.java | 0 .../workflow/cps/CpsGroovyShellFactory.java | 0 .../workflow/cps/CpsScmFlowDefinition.java | 0 .../plugins/workflow/cps/CpsScript.java | 0 .../plugins/workflow/cps/CpsStepContext.java | 0 .../plugins/workflow/cps/CpsThread.java | 0 .../plugins/workflow/cps/CpsThreadDump.java | 0 .../workflow/cps/CpsThreadDumpAction.java | 0 .../plugins/workflow/cps/CpsThreadGroup.java | 0 .../workflow/cps/CpsVmExecutorService.java | 0 .../plugins/workflow/cps/CpsVmThreadOnly.java | 0 .../plugins/workflow/cps/CpsWhitelist.java | 0 .../jenkinsci/plugins/workflow/cps/DSL.java | 0 .../plugins/workflow/cps/EnvActionImpl.java | 0 .../plugins/workflow/cps/FlowHead.java | 0 .../plugins/workflow/cps/GlobalVariable.java | 0 .../workflow/cps/GlobalVariableSet.java | 0 .../cps/GroovyClassLoaderWhitelist.java | 0 .../plugins/workflow/cps/GroovySample.java | 0 .../workflow/cps/GroovyShellDecorator.java | 0 .../cps/GroovySourceFileAllowlist.java | 0 .../plugins/workflow/cps/ParamsVariable.java | 0 .../workflow/cps/PauseUnpauseAction.java | 0 .../workflow/cps/RunWrapperBinder.java | 0 .../workflow/cps/RunningFlowActions.java | 0 .../plugins/workflow/cps/Safepoint.java | 0 .../workflow/cps/SandboxContinuable.java | 0 .../plugins/workflow/cps/Snippetizer.java | 0 .../plugins/workflow/cps/SnippetizerLink.java | 0 .../workflow/cps/TeeFutureCallback.java | 0 .../plugins/workflow/cps/ThreadTask.java | 0 .../workflow/cps/ThreadTaskResult.java | 0 ...tantiatedDescribableWithInterpolation.java | 0 .../cps/actions/ArgumentsActionImpl.java | 0 .../workflow/cps/nodes/StepAtomNode.java | 0 .../cps/nodes/StepDescriptorCache.java | 0 .../workflow/cps/nodes/StepEndNode.java | 0 .../plugins/workflow/cps/nodes/StepNode.java | 0 .../workflow/cps/nodes/StepStartNode.java | 0 .../cps/persistence/IteratorHack.java | 0 .../workflow/cps/persistence/PersistIn.java | 0 .../cps/persistence/PersistenceContext.java | 0 .../cps/replay/OriginalLoadedScripts.java | 0 .../workflow/cps/replay/ReplayAction.java | 0 .../workflow/cps/replay/ReplayCause.java | 0 .../cps/replay/ReplayFlowFactoryAction.java | 0 .../cps/replay/ReplayPipelineCommand.java | 0 .../plugins/workflow/cps/steps/LoadStep.java | 0 .../workflow/cps/steps/LoadStepExecution.java | 0 .../workflow/cps/steps/ParallelStep.java | 0 .../cps/steps/ParallelStepExecution.java | 0 .../cps/view/InterpolatedSecretsAction.java | 0 {src => plugin/src}/main/js/samples.js | 0 .../src}/main/js/workflow-editor.js | 0 .../src}/main/less/workflow-editor.less | 0 .../src}/main/resources/index.jelly | 0 .../cps/CpsFlowDefinition/config.jelly | 0 .../cps/CpsFlowDefinition/help-sandbox.html | 0 .../cps/CpsFlowDefinition/help-script.html | 0 .../cps/CpsScmFlowDefinition/config.jelly | 0 .../help-lightweight.html | 0 .../cps/CpsScmFlowDefinition/help-scm.html | 0 .../CpsScmFlowDefinition/help-scriptPath.html | 0 .../cps/CpsThreadDumpAction/index.jelly | 0 .../cps/EnvActionImpl/Binder/help.jelly | 0 .../default-allowlist | 0 .../plugins/workflow/cps/Messages.properties | 0 .../workflow/cps/Messages_zh_CN.properties | 0 .../workflow/cps/ParamsVariable/help.jelly | 0 .../cps/PauseUnpauseAction/action.jelly | 0 .../workflow/cps/RunWrapperBinder/help.groovy | 0 .../workflow/cps/Snippetizer/block.jelly | 0 .../workflow/cps/Snippetizer/dsld.groovy | 0 .../workflow/cps/Snippetizer/gdsl.groovy | 0 .../workflow/cps/Snippetizer/globals.groovy | 0 .../cps/Snippetizer/globalsHelp.jelly | 0 .../workflow/cps/Snippetizer/help.jelly | 0 .../workflow/cps/Snippetizer/html.groovy | 0 .../workflow/cps/Snippetizer/index.jelly | 0 .../workflow/cps/Snippetizer/sidepanel.jelly | 0 .../workflow/cps/Snippetizer/workflow.css | 0 .../workflow/cps/Snippetizer/workflow.js | 0 .../workflow/cps/replay/Messages.properties | 0 .../cps/replay/Messages_zh_CN.properties | 0 .../cps/replay/ReplayAction/diff.jelly | 0 .../cps/replay/ReplayAction/index.jelly | 0 .../cps/replay/ReplayAction/index.properties | 0 .../cps/replay/ReplayCause/description.jelly | 0 .../replay/ReplayCause/description.properties | 0 .../workflow/cps/samples/github-maven.groovy | 0 .../plugins/workflow/cps/samples/hello.groovy | 0 .../workflow/cps/samples/scripted.groovy | 0 .../workflow/cps/steps/LoadStep/config.jelly | 0 .../cps/steps/LoadStep/help-path.html | 0 .../workflow/cps/steps/LoadStep/help.html | 0 .../cps/steps/ParallelStep/config.jelly | 0 .../workflow/cps/steps/ParallelStep/help.html | 0 .../InterpolatedSecretsAction/summary.jelly | 0 .../jenkinsci/plugins/workflow/editor/taglib | 0 .../workflow/editor/workflow-editor.jelly | 0 .../src}/main/webapp/snippets/workflow.js | 0 .../workflow/CpsDefaultGroovyMethodsTest.java | 0 .../workflow/CpsStringGroovyMethodsTest.java | 0 .../DynamicEnvironmentExpanderTest.java | 0 .../plugins/workflow/GraphListenerTest.java | 0 .../plugins/workflow/SerializationTest.java | 0 .../plugins/workflow/SingleJobTestBase.java | 0 .../plugins/workflow/StepListenerTest.java | 0 .../workflow/SubtypeInjectingStep.java | 0 .../SubtypeInjectingStepExecution.java | 0 .../workflow/SubtypeInjectingStepTest.java | 0 .../workflow/TestDurabilityHintProvider.java | 0 .../WorkflowJobNonRestartingTest.java | 0 .../plugins/workflow/WorkflowTest.java | 0 .../workflow/cps/ContextVariableSetTest.java | 0 .../workflow/cps/CpsBodyExecutionTest.java | 0 .../workflow/cps/CpsFlowDefinition2Test.java | 0 .../cps/CpsFlowDefinitionRJRTest.java | 0 .../workflow/cps/CpsFlowDefinitionTest.java | 0 .../cps/CpsFlowDefinitionValidatorTest.java | 0 .../cps/CpsFlowExecutionMemoryTest.java | 0 .../workflow/cps/CpsFlowExecutionTest.java | 0 .../cps/CpsScmFlowDefinitionTest.java | 0 .../plugins/workflow/cps/CpsScriptTest.java | 0 .../workflow/cps/CpsThreadDumpActionTest.java | 0 .../workflow/cps/CpsThreadDumpTest.java | 0 .../plugins/workflow/cps/CpsThreadTest.java | 0 .../cps/CpsVmExecutorServiceTest.java | 0 .../plugins/workflow/cps/DSLTest.java | 0 .../workflow/cps/DelegatingScript.java | 0 .../cps/DescriptorMatchPredicate.java | 0 .../workflow/cps/EmperorHasNoClothes.java | 0 .../workflow/cps/FlowDurabilityTest.java | 0 .../workflow/cps/ParamsVariableTest.java | 0 .../workflow/cps/PersistenceProblemsTest.java | 0 .../workflow/cps/SandboxContinuableTest.java | 0 .../plugins/workflow/cps/SerialFormTest.java | 0 .../plugins/workflow/cps/SnippetizerTest.java | 0 .../workflow/cps/SnippetizerTester.java | 0 .../cps/actions/ArgumentsActionImplTest.java | 0 .../cps/nodes/StepDescriptorCacheTest.java | 0 .../workflow/cps/nodes/StepNodeTest.java | 0 .../cps/persistence/IteratorHackTest.java | 0 .../workflow/cps/replay/ReplayActionTest.java | 0 .../workflow/cps/steps/LoadStepTest.java | 0 .../workflow/cps/steps/ParallelStepTest.java | 0 .../cps/steps/RestartingLoadStepTest.java | 0 .../testMetaStep/AmbiguousEchoLowerStep.java | 0 .../testMetaStep/AmbiguousEchoUpperStep.java | 0 .../workflow/testMetaStep/California.java | 0 .../plugins/workflow/testMetaStep/Circle.java | 0 .../workflow/testMetaStep/Colorado.java | 0 .../plugins/workflow/testMetaStep/Curve.java | 0 .../workflow/testMetaStep/CurveMetaStep.java | 0 .../DisplaynameWithEscapeCharState.java | 0 .../workflow/testMetaStep/EchoResultStep.java | 0 .../testMetaStep/EchoStringAndDoubleStep.java | 0 .../plugins/workflow/testMetaStep/Hawaii.java | 0 .../plugins/workflow/testMetaStep/Island.java | 0 .../testMetaStep/MonomorphicData.java | 0 .../MonomorphicDataWithSymbol.java | 0 .../testMetaStep/MonomorphicListStep.java | 0 .../MonomorphicListWithSymbolStep.java | 0 .../testMetaStep/MonomorphicStep.java | 0 .../MonomorphicWithSymbolStep.java | 0 .../workflow/testMetaStep/MultiShape.java | 0 .../plugins/workflow/testMetaStep/Nevada.java | 0 .../workflow/testMetaStep/NewYork.java | 0 .../plugins/workflow/testMetaStep/OrStep.java | 0 .../plugins/workflow/testMetaStep/Oregon.java | 0 .../workflow/testMetaStep/Polygon.java | 0 .../plugins/workflow/testMetaStep/State.java | 0 .../workflow/testMetaStep/StateMetaStep.java | 0 .../testMetaStep/chemical/CarbonMonoxide.java | 0 .../testMetaStep/chemical/Chemical.java | 0 .../chemical/DetectionMetaStep.java | 0 .../persistence-workspace/p/running | 0 .../p@tmp/durable-dae459c1/jenkins-log.txt | 0 .../p@tmp/durable-dae459c1/jenkins-result.txt | 0 .../p@tmp/durable-dae459c1/script.sh | 0 .../persistence/jobs/p/builds/1/build.xml | 0 .../persistence/jobs/p/builds/1/log | 0 .../persistence/jobs/p/builds/1/log-index | 0 .../persistence/jobs/p/builds/1/program.dat | Bin .../jobs/p/builds/1/workflow/2.xml | 0 .../jobs/p/builds/1/workflow/3.xml | 0 .../jobs/p/builds/1/workflow/4.xml | 0 .../jobs/p/builds/1/workflow/5.xml | 0 .../persistence/jobs/p/builds/legacyIds | 0 .../persistence/jobs/p/builds/permalinks | 0 .../persistence/jobs/p/config.xml | 0 .../persistence/jobs/p/nextBuildNumber | 0 .../persistence/nodes/remote/config.xml | 0 ...lugins.workflow.flow.FlowExecutionList.xml | 0 ...nkins.slaves.JnlpSlaveAgentProtocol.secret | Bin .../persistence/secrets/master.key | 0 ...localMethodCallWithinLotsOfBranches.groovy | 0 .../src}/test/resources/trusted/foo.groovy | 0 webpack.config.js => plugin/webpack.config.js | 0 yarn.lock => plugin/yarn.lock | 0 pom.xml | 287 +---------------- 219 files changed, 303 insertions(+), 278 deletions(-) rename .babelrc => plugin/.babelrc (100%) rename .eslintignore => plugin/.eslintignore (100%) rename .eslintrc.js => plugin/.eslintrc.js (100%) rename .mvn_exec_yarn => plugin/.mvn_exec_yarn (100%) rename package.json => plugin/package.json (100%) create mode 100644 plugin/pom.xml rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/BodyReference.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSet.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodySubContext.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsClosure2.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsCompilationErrorsException.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidator.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowFactoryAction.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowFactoryAction2.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmThreadOnly.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/CpsWhitelist.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariableSet.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/GroovyClassLoaderWhitelist.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/GroovyShellDecorator.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/ParamsVariable.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/RunWrapperBinder.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/RunningFlowActions.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/Safepoint.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuable.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/SnippetizerLink.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/TeeFutureCallback.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/ThreadTask.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/ThreadTaskResult.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/UninstantiatedDescribableWithInterpolation.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepAtomNode.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCache.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepEndNode.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNode.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHack.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistIn.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistenceContext.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/replay/OriginalLoadedScripts.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStep.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepExecution.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java (100%) rename {src => plugin/src}/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java (100%) rename {src => plugin/src}/main/js/samples.js (100%) rename {src => plugin/src}/main/js/workflow-editor.js (100%) rename {src => plugin/src}/main/less/workflow-editor.less (100%) rename {src => plugin/src}/main/resources/index.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-sandbox.html (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-script.html (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/config.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-lightweight.html (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scm.html (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scriptPath.html (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist/default-allowlist (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Messages.properties (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Messages_zh_CN.properties (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/ParamsVariable/help.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/RunWrapperBinder/help.groovy (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/block.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/dsld.groovy (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/gdsl.groovy (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globals.groovy (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globalsHelp.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/help.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/html.groovy (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/sidepanel.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.js (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/replay/Messages.properties (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/replay/Messages_zh_CN.properties (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/diff.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.properties (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause/description.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause/description.properties (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/samples/github-maven.groovy (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/samples/hello.groovy (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/samples/scripted.groovy (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/config.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help-path.html (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help.html (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep/config.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep/help.html (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction/summary.jelly (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/editor/taglib (100%) rename {src => plugin/src}/main/resources/org/jenkinsci/plugins/workflow/editor/workflow-editor.jelly (100%) rename {src => plugin/src}/main/webapp/snippets/workflow.js (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/CpsDefaultGroovyMethodsTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/CpsStringGroovyMethodsTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/GraphListenerTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/SerializationTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/StepListenerTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepExecution.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/TestDurabilityHintProvider.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidatorTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionMemoryTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsScriptTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpActionTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorServiceTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/DelegatingScript.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/DescriptorMatchPredicate.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/EmperorHasNoClothes.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/ParamsVariableTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/PersistenceProblemsTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/SerialFormTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCacheTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHackTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoLowerStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoUpperStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/California.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Circle.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Colorado.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Curve.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/CurveMetaStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/DisplaynameWithEscapeCharState.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoResultStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoStringAndDoubleStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Hawaii.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Island.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicData.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicDataWithSymbol.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicListStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicListWithSymbolStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicWithSymbolStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MultiShape.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Nevada.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/NewYork.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/OrStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Oregon.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Polygon.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/State.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/StateMetaStep.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/CarbonMonoxide.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/Chemical.java (100%) rename {src => plugin/src}/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/DetectionMetaStep.java (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p/running (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-log.txt (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-result.txt (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/script.sh (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/build.xml (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log-index (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/program.dat (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/2.xml (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/3.xml (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/4.xml (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/5.xml (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/legacyIds (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/permalinks (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/config.xml (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/nextBuildNumber (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/nodes/remote/config.xml (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/jenkins.slaves.JnlpSlaveAgentProtocol.secret (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/master.key (100%) rename {src => plugin/src}/test/resources/org/jenkinsci/plugins/workflow/cps/steps/localMethodCallWithinLotsOfBranches.groovy (100%) rename {src => plugin/src}/test/resources/trusted/foo.groovy (100%) rename webpack.config.js => plugin/webpack.config.js (100%) rename yarn.lock => plugin/yarn.lock (100%) diff --git a/.babelrc b/plugin/.babelrc similarity index 100% rename from .babelrc rename to plugin/.babelrc diff --git a/.eslintignore b/plugin/.eslintignore similarity index 100% rename from .eslintignore rename to plugin/.eslintignore diff --git a/.eslintrc.js b/plugin/.eslintrc.js similarity index 100% rename from .eslintrc.js rename to plugin/.eslintrc.js diff --git a/.mvn_exec_yarn b/plugin/.mvn_exec_yarn similarity index 100% rename from .mvn_exec_yarn rename to plugin/.mvn_exec_yarn diff --git a/package.json b/plugin/package.json similarity index 100% rename from package.json rename to plugin/package.json diff --git a/plugin/pom.xml b/plugin/pom.xml new file mode 100644 index 000000000..bc77084be --- /dev/null +++ b/plugin/pom.xml @@ -0,0 +1,294 @@ + + + + + 4.0.0 + + org.jenkins-ci.plugins.workflow + workflow-cps-parent + ${changelist} + + workflow-cps + hpi + Pipeline: Groovy + https://github.com/jenkinsci/workflow-cps-plugin + + + MIT License + https://opensource.org/licenses/MIT + + + + false + 1.34 + 16.17.0 + 8.18.0 + 1.22.19 + + + + + io.jenkins.tools.bom + bom-2.346.x + 1654.vcb_69d035fa_20 + import + pom + + + + + + org.jenkins-ci.plugins.workflow + workflow-step-api + + + io.jenkins.plugins + ionicons-api + + + org.jenkins-ci.plugins.workflow + workflow-api + + + org.jenkins-ci.plugins.workflow + workflow-support + + + org.jenkins-ci.plugins.workflow + workflow-scm-step + + + org.jenkins-ci.plugins + script-security + + + org.jenkins-ci.plugins + scm-api + + + org.jenkins-ci.plugins + structs + + + org.jenkins-ci.plugins + support-core + true + + + com.github.stephenc.findbugs + findbugs-annotations + + + + + org.jenkins-ci.plugins.workflow + workflow-step-api + tests + test + + + org.jenkins-ci.plugins.workflow + workflow-support + tests + test + + + org.jenkins-ci.plugins.workflow + workflow-basic-steps + test + + + org.jenkins-ci.plugins + mailer + + + + + org.jenkins-ci.plugins.workflow + workflow-job + test + + + org.jenkins-ci.plugins.workflow + workflow-durable-task-step + test + + + org.jenkins-ci.plugins + credentials-binding + test + + + org.jenkins-ci.plugins + pipeline-build-step + test + + + org.jenkins-ci.plugins + pipeline-input-step + test + + + org.jenkins-ci.plugins + junit + test + + + com.cloudbees + groovy-cps + ${groovy-cps.version} + + + com.google.guava + guava + + + + + org.jenkins-ci.ui + ace-editor + + + javax.servlet + servlet-api + + + + + com.cloudbees + diff4j + 1.3 + + + commons-io + commons-io + + + org.jvnet.localizer + localizer + + + + + org.jenkins-ci.plugins + scm-api + tests + test + + + org.jenkins-ci.plugins + git + test + + + org.jenkins-ci.plugins + git + tests + test + + + + org.jenkins-ci.plugins + matrix-project + test + + + org.jenkins-ci.plugins + config-file-provider + test + + + com.cloudbees + groovy-cps + ${groovy-cps.version} + tests + test + + + com.google.guava + guava + + + + + org.jenkins-ci.plugins + pipeline-stage-step + test + + + org.jenkins-ci.plugins + subversion + test + + + org.jenkins-ci.plugins + subversion + tests + test + + + org.testcontainers + testcontainers + 1.17.5 + test + + + + org.apache.commons + commons-compress + + + org.slf4j + slf4j-api + + + + + org.tmatesoft.svnkit + svnkit-cli + 1.10.8 + test + + + + + + src/main/resources + + + target/generated-resources/adjuncts + + + + + org.jenkins-ci.tools + maven-hpi-plugin + + 2.18 + + + + + diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/BodyReference.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/BodyReference.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/BodyReference.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/BodyReference.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSet.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSet.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSet.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSet.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodySubContext.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodySubContext.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodySubContext.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodySubContext.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsClosure2.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsClosure2.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsClosure2.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsClosure2.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsCompilationErrorsException.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsCompilationErrorsException.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsCompilationErrorsException.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsCompilationErrorsException.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidator.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidator.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidator.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidator.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowFactoryAction.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowFactoryAction.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowFactoryAction.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowFactoryAction.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowFactoryAction2.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowFactoryAction2.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowFactoryAction2.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowFactoryAction2.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShellFactory.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScript.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThread.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmThreadOnly.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmThreadOnly.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmThreadOnly.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmThreadOnly.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsWhitelist.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsWhitelist.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/CpsWhitelist.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsWhitelist.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/DSL.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/EnvActionImpl.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariableSet.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariableSet.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariableSet.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariableSet.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyClassLoaderWhitelist.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyClassLoaderWhitelist.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyClassLoaderWhitelist.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyClassLoaderWhitelist.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySample.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyShellDecorator.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyShellDecorator.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyShellDecorator.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovyShellDecorator.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/ParamsVariable.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/ParamsVariable.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/ParamsVariable.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/ParamsVariable.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/RunWrapperBinder.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/RunWrapperBinder.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/RunWrapperBinder.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/RunWrapperBinder.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/RunningFlowActions.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/RunningFlowActions.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/RunningFlowActions.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/RunningFlowActions.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/Safepoint.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/Safepoint.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/Safepoint.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/Safepoint.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuable.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuable.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuable.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuable.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/SnippetizerLink.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/SnippetizerLink.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/SnippetizerLink.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/SnippetizerLink.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/TeeFutureCallback.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/TeeFutureCallback.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/TeeFutureCallback.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/TeeFutureCallback.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/ThreadTask.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/ThreadTask.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/ThreadTask.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/ThreadTask.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/ThreadTaskResult.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/ThreadTaskResult.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/ThreadTaskResult.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/ThreadTaskResult.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/UninstantiatedDescribableWithInterpolation.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/UninstantiatedDescribableWithInterpolation.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/UninstantiatedDescribableWithInterpolation.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/UninstantiatedDescribableWithInterpolation.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepAtomNode.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepAtomNode.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepAtomNode.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepAtomNode.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCache.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCache.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCache.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCache.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepEndNode.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepEndNode.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepEndNode.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepEndNode.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNode.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNode.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNode.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNode.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHack.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHack.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHack.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHack.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistIn.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistIn.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistIn.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistIn.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistenceContext.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistenceContext.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistenceContext.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/PersistenceContext.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/OriginalLoadedScripts.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/OriginalLoadedScripts.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/replay/OriginalLoadedScripts.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/OriginalLoadedScripts.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayPipelineCommand.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStep.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStep.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStep.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStep.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepExecution.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepExecution.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepExecution.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepExecution.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepExecution.java diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java similarity index 100% rename from src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java rename to plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction.java diff --git a/src/main/js/samples.js b/plugin/src/main/js/samples.js similarity index 100% rename from src/main/js/samples.js rename to plugin/src/main/js/samples.js diff --git a/src/main/js/workflow-editor.js b/plugin/src/main/js/workflow-editor.js similarity index 100% rename from src/main/js/workflow-editor.js rename to plugin/src/main/js/workflow-editor.js diff --git a/src/main/less/workflow-editor.less b/plugin/src/main/less/workflow-editor.less similarity index 100% rename from src/main/less/workflow-editor.less rename to plugin/src/main/less/workflow-editor.less diff --git a/src/main/resources/index.jelly b/plugin/src/main/resources/index.jelly similarity index 100% rename from src/main/resources/index.jelly rename to plugin/src/main/resources/index.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-sandbox.html b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-sandbox.html similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-sandbox.html rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-sandbox.html diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-script.html b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-script.html similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-script.html rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-script.html diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/config.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/config.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/config.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/config.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-lightweight.html b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-lightweight.html similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-lightweight.html rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-lightweight.html diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scm.html b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scm.html similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scm.html rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scm.html diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scriptPath.html b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scriptPath.html similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scriptPath.html rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scriptPath.html diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist/default-allowlist b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist/default-allowlist similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist/default-allowlist rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist/default-allowlist diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Messages.properties b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Messages.properties similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Messages.properties rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Messages.properties diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Messages_zh_CN.properties b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Messages_zh_CN.properties similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Messages_zh_CN.properties rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Messages_zh_CN.properties diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/ParamsVariable/help.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/ParamsVariable/help.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/ParamsVariable/help.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/ParamsVariable/help.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/RunWrapperBinder/help.groovy b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/RunWrapperBinder/help.groovy similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/RunWrapperBinder/help.groovy rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/RunWrapperBinder/help.groovy diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/block.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/block.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/block.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/block.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/dsld.groovy b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/dsld.groovy similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/dsld.groovy rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/dsld.groovy diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/gdsl.groovy b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/gdsl.groovy similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/gdsl.groovy rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/gdsl.groovy diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globals.groovy b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globals.groovy similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globals.groovy rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globals.groovy diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globalsHelp.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globalsHelp.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globalsHelp.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/globalsHelp.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/help.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/help.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/help.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/help.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/html.groovy b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/html.groovy similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/html.groovy rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/html.groovy diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/index.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/sidepanel.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/sidepanel.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/sidepanel.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/sidepanel.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.css diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.js b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.js similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.js rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/Snippetizer/workflow.js diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/Messages.properties b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/Messages.properties similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/Messages.properties rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/Messages.properties diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/Messages_zh_CN.properties b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/Messages_zh_CN.properties similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/Messages_zh_CN.properties rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/Messages_zh_CN.properties diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/diff.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/diff.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/diff.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/diff.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.properties b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.properties similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.properties rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.properties diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause/description.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause/description.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause/description.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause/description.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause/description.properties b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause/description.properties similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause/description.properties rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayCause/description.properties diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/github-maven.groovy b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/github-maven.groovy similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/github-maven.groovy rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/github-maven.groovy diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/hello.groovy b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/hello.groovy similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/hello.groovy rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/hello.groovy diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/scripted.groovy b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/scripted.groovy similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/scripted.groovy rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/samples/scripted.groovy diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/config.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/config.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/config.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/config.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help-path.html b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help-path.html similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help-path.html rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help-path.html diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help.html b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help.html similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help.html rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help.html diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep/config.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep/config.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep/config.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep/config.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep/help.html b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep/help.html similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep/help.html rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep/help.html diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction/summary.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction/summary.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction/summary.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/view/InterpolatedSecretsAction/summary.jelly diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/editor/taglib b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/editor/taglib similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/editor/taglib rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/editor/taglib diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/editor/workflow-editor.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/editor/workflow-editor.jelly similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/editor/workflow-editor.jelly rename to plugin/src/main/resources/org/jenkinsci/plugins/workflow/editor/workflow-editor.jelly diff --git a/src/main/webapp/snippets/workflow.js b/plugin/src/main/webapp/snippets/workflow.js similarity index 100% rename from src/main/webapp/snippets/workflow.js rename to plugin/src/main/webapp/snippets/workflow.js diff --git a/src/test/java/org/jenkinsci/plugins/workflow/CpsDefaultGroovyMethodsTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/CpsDefaultGroovyMethodsTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/CpsDefaultGroovyMethodsTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/CpsDefaultGroovyMethodsTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/CpsStringGroovyMethodsTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/CpsStringGroovyMethodsTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/CpsStringGroovyMethodsTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/CpsStringGroovyMethodsTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/GraphListenerTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/GraphListenerTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/GraphListenerTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/GraphListenerTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/SerializationTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/SerializationTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/SerializationTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/SerializationTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/SingleJobTestBase.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/StepListenerTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/StepListenerTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/StepListenerTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/StepListenerTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepExecution.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepExecution.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepExecution.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepExecution.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/SubtypeInjectingStepTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/TestDurabilityHintProvider.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/TestDurabilityHintProvider.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/TestDurabilityHintProvider.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/TestDurabilityHintProvider.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/ContextVariableSetTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidatorTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidatorTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidatorTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionValidatorTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionMemoryTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionMemoryTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionMemoryTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionMemoryTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecutionTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScriptTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScriptTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScriptTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScriptTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpActionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpActionTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpActionTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpActionTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorServiceTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorServiceTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorServiceTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorServiceTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/DelegatingScript.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DelegatingScript.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/DelegatingScript.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DelegatingScript.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/DescriptorMatchPredicate.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DescriptorMatchPredicate.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/DescriptorMatchPredicate.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DescriptorMatchPredicate.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/EmperorHasNoClothes.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/EmperorHasNoClothes.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/EmperorHasNoClothes.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/EmperorHasNoClothes.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/ParamsVariableTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/ParamsVariableTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/ParamsVariableTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/ParamsVariableTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/PersistenceProblemsTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/PersistenceProblemsTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/PersistenceProblemsTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/PersistenceProblemsTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/SerialFormTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SerialFormTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/SerialFormTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SerialFormTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SnippetizerTester.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCacheTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCacheTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCacheTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepDescriptorCacheTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHackTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHackTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHackTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHackTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStepTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/RestartingLoadStepTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoLowerStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoLowerStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoLowerStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoLowerStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoUpperStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoUpperStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoUpperStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoUpperStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/California.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/California.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/California.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/California.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Circle.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Circle.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Circle.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Circle.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Colorado.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Colorado.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Colorado.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Colorado.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Curve.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Curve.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Curve.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Curve.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/CurveMetaStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/CurveMetaStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/CurveMetaStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/CurveMetaStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/DisplaynameWithEscapeCharState.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/DisplaynameWithEscapeCharState.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/DisplaynameWithEscapeCharState.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/DisplaynameWithEscapeCharState.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoResultStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoResultStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoResultStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoResultStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoStringAndDoubleStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoStringAndDoubleStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoStringAndDoubleStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoStringAndDoubleStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Hawaii.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Hawaii.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Hawaii.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Hawaii.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Island.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Island.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Island.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Island.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicData.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicData.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicData.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicData.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicDataWithSymbol.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicDataWithSymbol.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicDataWithSymbol.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicDataWithSymbol.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicListStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicListStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicListStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicListStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicListWithSymbolStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicListWithSymbolStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicListWithSymbolStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicListWithSymbolStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicWithSymbolStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicWithSymbolStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicWithSymbolStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MonomorphicWithSymbolStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MultiShape.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MultiShape.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MultiShape.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/MultiShape.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Nevada.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Nevada.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Nevada.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Nevada.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/NewYork.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/NewYork.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/NewYork.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/NewYork.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/OrStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/OrStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/OrStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/OrStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Oregon.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Oregon.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Oregon.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Oregon.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Polygon.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Polygon.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Polygon.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/Polygon.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/State.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/State.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/State.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/State.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/StateMetaStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/StateMetaStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/StateMetaStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/StateMetaStep.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/CarbonMonoxide.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/CarbonMonoxide.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/CarbonMonoxide.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/CarbonMonoxide.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/Chemical.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/Chemical.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/Chemical.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/Chemical.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/DetectionMetaStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/DetectionMetaStep.java similarity index 100% rename from src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/DetectionMetaStep.java rename to plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/chemical/DetectionMetaStep.java diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p/running b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p/running similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p/running rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p/running diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-log.txt b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-log.txt similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-log.txt rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-log.txt diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-result.txt b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-result.txt similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-result.txt rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/jenkins-result.txt diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/script.sh b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/script.sh similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/script.sh rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence-workspace/p@tmp/durable-dae459c1/script.sh diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/build.xml b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/build.xml similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/build.xml rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/build.xml diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log-index b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log-index similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log-index rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/log-index diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/program.dat b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/program.dat similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/program.dat rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/program.dat diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/2.xml b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/2.xml similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/2.xml rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/2.xml diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/3.xml b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/3.xml similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/3.xml rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/3.xml diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/4.xml b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/4.xml similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/4.xml rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/4.xml diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/5.xml b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/5.xml similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/5.xml rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/1/workflow/5.xml diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/legacyIds b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/legacyIds similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/legacyIds rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/legacyIds diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/permalinks b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/permalinks similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/permalinks rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/builds/permalinks diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/config.xml b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/config.xml similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/config.xml rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/config.xml diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/nextBuildNumber b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/nextBuildNumber similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/nextBuildNumber rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/jobs/p/nextBuildNumber diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/nodes/remote/config.xml b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/nodes/remote/config.xml similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/nodes/remote/config.xml rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/nodes/remote/config.xml diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/jenkins.slaves.JnlpSlaveAgentProtocol.secret b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/jenkins.slaves.JnlpSlaveAgentProtocol.secret similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/jenkins.slaves.JnlpSlaveAgentProtocol.secret rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/jenkins.slaves.JnlpSlaveAgentProtocol.secret diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/master.key b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/master.key similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/master.key rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/SerialFormTest/persistence/secrets/master.key diff --git a/src/test/resources/org/jenkinsci/plugins/workflow/cps/steps/localMethodCallWithinLotsOfBranches.groovy b/plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/steps/localMethodCallWithinLotsOfBranches.groovy similarity index 100% rename from src/test/resources/org/jenkinsci/plugins/workflow/cps/steps/localMethodCallWithinLotsOfBranches.groovy rename to plugin/src/test/resources/org/jenkinsci/plugins/workflow/cps/steps/localMethodCallWithinLotsOfBranches.groovy diff --git a/src/test/resources/trusted/foo.groovy b/plugin/src/test/resources/trusted/foo.groovy similarity index 100% rename from src/test/resources/trusted/foo.groovy rename to plugin/src/test/resources/trusted/foo.groovy diff --git a/webpack.config.js b/plugin/webpack.config.js similarity index 100% rename from webpack.config.js rename to plugin/webpack.config.js diff --git a/yarn.lock b/plugin/yarn.lock similarity index 100% rename from yarn.lock rename to plugin/yarn.lock diff --git a/pom.xml b/pom.xml index c035af497..3f56449fc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,28 +1,4 @@ - - 4.0.0 @@ -32,18 +8,19 @@ org.jenkins-ci.plugins.workflow - workflow-cps + workflow-cps-parent ${changelist} - hpi - Pipeline: Groovy + pom + Pipeline: Groovy Parent https://github.com/jenkinsci/workflow-cps-plugin MIT License https://opensource.org/licenses/MIT + repo - + scm:git:https://github.com/${gitHubRepo}.git scm:git:git@github.com:${gitHubRepo}.git https://github.com/${gitHubRepo} @@ -65,254 +42,8 @@ 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin 2.346.3 - false - 1.34 - 16.17.0 - 8.18.0 - 1.22.19 - - - - io.jenkins.tools.bom - bom-2.346.x - 1654.vcb_69d035fa_20 - import - pom - - - - - - org.jenkins-ci.plugins.workflow - workflow-step-api - - - io.jenkins.plugins - ionicons-api - - - org.jenkins-ci.plugins.workflow - workflow-api - - - org.jenkins-ci.plugins.workflow - workflow-support - - - org.jenkins-ci.plugins.workflow - workflow-scm-step - - - org.jenkins-ci.plugins - script-security - - - org.jenkins-ci.plugins - scm-api - - - org.jenkins-ci.plugins - structs - - - org.jenkins-ci.plugins - support-core - true - - - com.github.stephenc.findbugs - findbugs-annotations - - - - - org.jenkins-ci.plugins.workflow - workflow-step-api - tests - test - - - org.jenkins-ci.plugins.workflow - workflow-support - tests - test - - - org.jenkins-ci.plugins.workflow - workflow-basic-steps - test - - - org.jenkins-ci.plugins - mailer - - - - - org.jenkins-ci.plugins.workflow - workflow-job - test - - - org.jenkins-ci.plugins.workflow - workflow-durable-task-step - test - - - org.jenkins-ci.plugins - credentials-binding - test - - - org.jenkins-ci.plugins - pipeline-build-step - test - - - org.jenkins-ci.plugins - pipeline-input-step - test - - - org.jenkins-ci.plugins - junit - test - - - com.cloudbees - groovy-cps - ${groovy-cps.version} - - - com.google.guava - guava - - - - - org.jenkins-ci.ui - ace-editor - - - javax.servlet - servlet-api - - - - - com.cloudbees - diff4j - 1.3 - - - commons-io - commons-io - - - org.jvnet.localizer - localizer - - - - - org.jenkins-ci.plugins - scm-api - tests - test - - - org.jenkins-ci.plugins - git - test - - - org.jenkins-ci.plugins - git - tests - test - - - - org.jenkins-ci.plugins - matrix-project - test - - - org.jenkins-ci.plugins - config-file-provider - test - - - com.cloudbees - groovy-cps - ${groovy-cps.version} - tests - test - - - com.google.guava - guava - - - - - org.jenkins-ci.plugins - pipeline-stage-step - test - - - org.jenkins-ci.plugins - subversion - test - - - org.jenkins-ci.plugins - subversion - tests - test - - - org.testcontainers - testcontainers - 1.17.5 - test - - - - org.apache.commons - commons-compress - - - org.slf4j - slf4j-api - - - - - org.tmatesoft.svnkit - svnkit-cli - 1.10.8 - test - - - - - - src/main/resources - - - target/generated-resources/adjuncts - - - - - org.jenkins-ci.tools - maven-hpi-plugin - - 2.18 - - - - - + + plugin + + \ No newline at end of file From 33e276c2c53e7178d7a81afb2db15aaf42393483 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 1 Nov 2022 16:11:31 -0400 Subject: [PATCH 756/932] Remove LICENSE.txt file from groovy-cps --- LICENSE.txt | 177 ---------------------------------------------------- 1 file changed, 177 deletions(-) delete mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index f433b1a53..000000000 --- a/LICENSE.txt +++ /dev/null @@ -1,177 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS From 1b01482f7077021d68c23b1c266e3b669ff83182 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 2 Nov 2022 11:43:16 -0400 Subject: [PATCH 757/932] Skip deployment and installation for groovy-cps-dgm-builder --- dgm-builder/pom.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 425a9ceb6..8653c9bdf 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -24,17 +24,12 @@ 11 11 + true + true - - org.apache.maven.plugins - maven-deploy-plugin - - true - - org.apache.maven.plugins maven-assembly-plugin From f0b2f0d71dcf89ce1ef9c84419c74f9477a66de2 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Fri, 4 Nov 2022 15:22:51 -0400 Subject: [PATCH 758/932] Only skip installation of groovy-cps-dgm-builder when set.changelist is true --- dgm-builder/pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 8653c9bdf..a019577dc 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -25,7 +25,6 @@ 11 11 true - true @@ -85,4 +84,18 @@ + + + skip-installation + + + set.changelist + true + + + + true + + + From d5fc56081e86e581f87cf18a2da2bd7a8db58b62 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 26 Oct 2022 18:40:04 -0400 Subject: [PATCH 759/932] Add support for SpreadExpression and SpreadMapExpression Co-authored-by: sonallux <13821543+sonallux@users.noreply.github.com> --- .../com/cloudbees/groovy/cps/Builder.java | 10 ++ .../cloudbees/groovy/cps/CpsTransformer.java | 18 ++- .../groovy/cps/impl/FunctionCallBlock.java | 5 +- .../cloudbees/groovy/cps/impl/ListBlock.java | 2 +- .../groovy/cps/impl/SpreadBlock.java | 108 ++++++++++++++++ .../groovy/cps/impl/SpreadMapBlock.java | 48 +++++++ .../groovy/cps/AbstractGroovyCpsTest.java | 26 +++- .../groovy/cps/CpsTransformerTest.java | 120 +++++++++++++++--- 8 files changed, 305 insertions(+), 32 deletions(-) create mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadBlock.java create mode 100644 lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadMapBlock.java diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java index 26ba365f1..3a966086b 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -32,6 +32,8 @@ import com.cloudbees.groovy.cps.impl.ReturnBlock; import com.cloudbees.groovy.cps.impl.SequenceBlock; import com.cloudbees.groovy.cps.impl.SourceLocation; +import com.cloudbees.groovy.cps.impl.SpreadBlock; +import com.cloudbees.groovy.cps.impl.SpreadMapBlock; import com.cloudbees.groovy.cps.impl.StaticFieldBlock; import com.cloudbees.groovy.cps.impl.SuperBlock; import com.cloudbees.groovy.cps.impl.SwitchBlock; @@ -732,6 +734,14 @@ public Block yield(Object o) { return new YieldBlock(o); } + public Block spread(int line, Block list) { + return new SpreadBlock(loc(line), list); + } + + public Block spreadMap(int line, Block map) { + return new SpreadMapBlock(loc(line), map); + } + private SourceLocation loc(int line) { return new SourceLocation(loc,line); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index decb574b8..7a9055187 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -1277,14 +1277,24 @@ public void run() { @Override public void visitSpreadExpression(SpreadExpression expression) { - sourceUnit.addError(new SyntaxException("spread not yet supported for CPS transformation", - expression.getLineNumber(), expression.getColumnNumber())); + makeNode("spread", new Runnable() { + @Override + public void run() { + loc(expression); + visit(expression.getExpression()); + } + }); } @Override public void visitSpreadMapExpression(SpreadMapExpression expression) { - sourceUnit.addError(new SyntaxException("spread map not yet supported for CPS transformation", - expression.getLineNumber(), expression.getColumnNumber())); + makeNode("spreadMap", new Runnable() { + @Override + public void run() { + loc(expression); + visit(expression.getExpression()); + } + }); } @Override diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index 8491bb904..97e5ef506 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -92,11 +92,12 @@ private Next dispatchOrArg() { if (args.length>idx) return then(argExps[idx],e,fixArg); else { + Object[] expandedArgs = SpreadBlock.despreadList(args); if (name.equals("")) { // constructor call Object v; try { - v = e.getInvoker().contextualize(FunctionCallBlock.this).constructorCall((Class)lhs,args); + v = e.getInvoker().contextualize(FunctionCallBlock.this).constructorCall((Class)lhs, expandedArgs); } catch (Throwable t) { if (t instanceof CpsCallableInvocation) { ((CpsCallableInvocation) t).checkMismatch(lhs, Collections.singletonList(name)); @@ -112,7 +113,7 @@ private Next dispatchOrArg() { if (safe && lhs == null) { return k.receive(null); } else { - return methodCall(e, loc, k, FunctionCallBlock.this, lhs, name, args); + return methodCall(e, loc, k, FunctionCallBlock.this, lhs, name, expandedArgs); } } } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java index 9ddb2d3ee..06e4a524e 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ListBlock.java @@ -15,7 +15,7 @@ public ListBlock(Block... args) { @Override protected Object toCollection(Object[] result) { - return InvokerHelper.createList(result); + return InvokerHelper.createList(SpreadBlock.despreadList(result)); } private static final long serialVersionUID = 1L; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadBlock.java new file mode 100644 index 000000000..3cbb12b60 --- /dev/null +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadBlock.java @@ -0,0 +1,108 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import org.codehaus.groovy.ast.expr.SpreadExpression; +import org.codehaus.groovy.ast.expr.SpreadMapExpression; +import org.codehaus.groovy.classgen.AsmClassGenerator; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; + +/** + * Handles {@link SpreadExpression} similarly to the way that {@link SpreadMapBlock} handles {@link SpreadMapExpression}, + * but with a {@code groovy-cps}-specific {@link SpreadList} marker class. + * + *

We use a marker class because we cannot easily mimic the way that Groovy normally handles {@link SpreadExpression}. + * To do so, we would need modifications to {@link CpsTransformer} for list and argument list visitors akin to {@link AsmClassGenerator.despreadList}, + * a new implementation of {@link Block} that would fix those expressions and then call {@link ScriptBytecodeAdapter#despreadList}, + * and a variant of {@link FunctionCallBlock} that takes a single {@link Block} which is expected to evaluate to {@code Object[]} + * (rather than a {@code Block[]}) so that the result of {@code despreadList} can be used directly as the arguments array + * for the function call. + */ +public class SpreadBlock implements Block { + private final SourceLocation loc; + private final Block listExp; + + public SpreadBlock(SourceLocation loc, Block listExp) { + this.loc = loc; + this.listExp = listExp; + } + + @Override + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e, k).then(listExp, e, fixList); + } + + class ContinuationImpl extends ContinuationGroup { + private final Env e; + private final Continuation k; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next fixList(Object value) { + try { + return k.receive(new SpreadList(despreadList(value).toArray())); + } catch (IllegalArgumentException t) { + return throwException(e, t, loc, new ReferenceStackTrace()); + } + } + + // c.f. https://github.com/apache/groovy/blob/bd12deac1d73b036d6bae378b69cfdb2cf692490/src/main/java/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java#L908-L920 + private List despreadList(Object value) { + if (value == null) { + return Collections.singletonList(null); + } else if (value instanceof List) { + return (List) value; + } else if (value.getClass().isArray()) { + return DefaultTypeTransformation.primitiveArrayToList(value); + } else { + String error = "cannot spread the type " + value.getClass().getName() + " with value " + value; + if (value instanceof Map) { + error += ", did you mean to use the spread-map operator instead?"; + } + throw new IllegalArgumentException(error); + } + } + + private static final long serialVersionUID = 1L; + } + + /** + * Holds the expanded value until it is interpolated into its surrounding context by {@link ListBlock} or {@link FunctionCallBlock}. + */ + static class SpreadList implements Serializable { + private final Object[] expanded; + + public SpreadList(Object[] expanded) { + this.expanded = expanded; + } + + private static final long serialVersionUID = 1L; + } + + public static Object[] despreadList(Object[] list) { + List expanded = new ArrayList<>(); + for (Object element : list) { + if (element instanceof SpreadList) { + Collections.addAll(expanded, ((SpreadList) element).expanded); + } else { + expanded.add(element); + } + } + return expanded.toArray(); + } + + static final ContinuationPtr fixList = new ContinuationPtr(ContinuationImpl.class, "fixList"); + + private static final long serialVersionUID = 1L; +} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadMapBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadMapBlock.java new file mode 100644 index 000000000..04de28260 --- /dev/null +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadMapBlock.java @@ -0,0 +1,48 @@ +package com.cloudbees.groovy.cps.impl; + +import com.cloudbees.groovy.cps.Block; +import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.Env; +import com.cloudbees.groovy.cps.Next; +import groovy.lang.SpreadMapEvaluatingException; +import org.codehaus.groovy.runtime.InvokerHelper; + +public class SpreadMapBlock implements Block { + private final SourceLocation loc; + private final Block mapExp; + + public SpreadMapBlock(SourceLocation loc, Block mapExp) { + this.loc = loc; + this.mapExp = mapExp; + } + + @Override + public Next eval(Env e, Continuation k) { + return new ContinuationImpl(e, k).then(mapExp, e, fixMap); + } + + class ContinuationImpl extends ContinuationGroup { + private final Env e; + private final Continuation k; + + ContinuationImpl(Env e, Continuation k) { + this.e = e; + this.k = k; + } + + public Next fixMap(Object value) { + try { + // Creates a groovy.lang.SpreadMap, which InvokerHelper.createMap (used by MapBlock) handles specially. + return k.receive(InvokerHelper.spreadMap(value)); + } catch (SpreadMapEvaluatingException t) { + return throwException(e, t, loc, new ReferenceStackTrace()); + } + } + + private static final long serialVersionUID = 1L; + } + + static final ContinuationPtr fixMap = new ContinuationPtr(ContinuationImpl.class, "fixMap"); + + private static final long serialVersionUID = 1L; +} diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java index ad855ca4f..6fdbedf3f 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java @@ -11,10 +11,11 @@ import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.junit.Before; +import org.junit.Rule; +import org.junit.rules.ErrorCollector; import org.kohsuke.groovy.sandbox.impl.GroovyCallSiteSelector; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.fail; /** @@ -23,6 +24,9 @@ * @author Kohsuke Kawaguchi */ public abstract class AbstractGroovyCpsTest { + @Rule + public ErrorCollector ec = new ErrorCollector(); + /** * CPS-transforming shelll */ @@ -50,11 +54,21 @@ public void setUp() { cc.addCompilationCustomizers(imports); sh = new GroovyShell(binding,cc); } - + + /** + * @return a GroovyShell that has {@link CpsTransformer} enabled and will CPS-transform all scripts + */ public GroovyShell getCsh() { return csh; } - + + /** + * @return a regular GroovyShell that will not CPS-transform scripts + */ + public GroovyShell getSh() { + return sh; + } + public Binding getBinding() { return binding; } @@ -67,15 +81,15 @@ public void assertEvaluate(Object expectedResult, String script) throws Throwabl Object actualCps = evalCPSonly(script); String actualCpsType = GroovyCallSiteSelector.getName(actualCps); String expectedType = GroovyCallSiteSelector.getName(expectedResult); - assertThat("CPS-transformed result (" + actualCpsType + ") does not match expected result (" + expectedType + ")", actualCps, equalTo(expectedResult)); + ec.checkThat("CPS-transformed result (" + actualCpsType + ") does not match expected result (" + expectedType + ")", actualCps, equalTo(expectedResult)); Object actualNonCps = sh.evaluate(script); String actualNonCpsType = GroovyCallSiteSelector.getName(actualNonCps); - assertThat("Non-CPS-transformed result (" + actualNonCpsType + ") does not match expected result (" + expectedType + ")", actualNonCps, equalTo(expectedResult)); + ec.checkThat("Non-CPS-transformed result (" + actualNonCpsType + ") does not match expected result (" + expectedType + ")", actualNonCps, equalTo(expectedResult)); } public Object evalCPS(String script) throws Throwable { Object resultInCps = evalCPSonly(script); - assertThat(resultInCps, equalTo(sh.evaluate(script))); // make sure that regular non-CPS execution reports the same result + ec.checkThat(resultInCps, equalTo(sh.evaluate(script))); // make sure that regular non-CPS execution reports the same result return resultInCps; } diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java index ecb5c951f..6f63abdf8 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import groovy.lang.IntRange; +import groovy.lang.MissingMethodException; import java.io.File; import java.math.BigDecimal; import java.util.Arrays; @@ -10,6 +11,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.codehaus.groovy.control.MultipleCompilationErrorsException; +import org.codehaus.groovy.runtime.InvokerHelper; import org.junit.Ignore; import org.junit.Test; import org.jvnet.hudson.test.Issue; @@ -944,28 +946,108 @@ public void synchronizedStatement() throws Throwable { } } - @Test - public void spreadExpression() throws Throwable { - try { - evalCPSonly( - "def x = [1, 2, 3]\n" + + @Issue("JENKINS-46163") + @Test public void spreadExpression() throws Throwable { + String[] declarations = new String[] { + "def", // ArrayList + "Object[]", // Object array + "int[]" // Primitive array + }; + for (String decl : declarations) { + assertEvaluate(Arrays.asList(1, 2, 3, 4, 5), + decl + " x = [1, 2, 3]\n" + "return [*x, 4, 5]\n"); - } catch (Exception e) { - assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); - assertThat(e.getMessage(), containsString("spread not yet supported for CPS transformation")); + assertEvaluate(Arrays.asList(4, 1, 2, 3, 5), + decl + " x = [1, 2, 3]\n" + + "return [4, *x, 5]\n"); + assertEvaluate(Arrays.asList(4, 5, 1, 2, 3), + decl + " x = [1, 2, 3]\n" + + "return [4, 5, *x]\n"); + assertEvaluate(Arrays.asList(1, 2, 3), + decl + " x = [1, 2, 3]\n" + + "return [*x]\n"); + assertEvaluate(Arrays.asList(1, 2, 3, 4, 5, 6, 7), + decl + " x = [2, 3]\n" + + decl + " y = [5, 6]\n" + + "return [1, *x, 4, *y, 7]\n"); } - } - - @Test - public void spreadMapExpression() throws Throwable { - try { - evalCPSonly( - "def x = [a: 1, b: 2, c: 3]\n" + - "return [*:x, d: 4, e: 5]\n"); - } catch (Exception e) { - assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); - assertThat(e.getMessage(), containsString("spread map not yet supported for CPS transformation")); + assertEvaluate(Collections.singletonList(null), + "def x = null\n" + + "return [*x]\n"); + } + + @Issue("JENKINS-46163") + @Test public void spreadMapExpression() throws Throwable { + assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", 3, "d", 4, "e", 5 }), + "def x = [a: 1, b: 2, c: 3]\n" + + "return [*:x, d: 4, e: 5]\n"); + assertEvaluate(InvokerHelper.createMap(new Object[] { "d", 4, "a", 1, "b", 2, "c", 3, "e", 5 }), + "def x = [a: 1, b: 2, c: 3]\n" + + "return [d: 4, *:x, e: 5]\n"); + assertEvaluate(InvokerHelper.createMap(new Object[] { "d", 4, "e", 5, "a", 1, "b", 2, "c", 3, "e", 5 }), + "def x = [a: 1, b: 2, c: 3]\n" + + "return [d: 4, e: 5, *:x]\n"); + assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", -1 }), + "def x = [a: 1, b: 2, c: 3]\n" + + "return [c: 4, *:x, c: -1]\n"); // The final value for a key takes precedence. + assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", 3 }), + "def x = [a: 1, b: 2, c: 3]\n" + + "return [*:x]\n"); + assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7 }), + "def x = [b: 2, c: 3]\n" + + "def y = [e: 5, f: 6]\n" + + "return [a: 1, *:x, d: 4, *:y, g: 7]\n"); + } + + @Issue("JENKINS-46163") + @Test public void spreadMethodCallArguments() throws Throwable { + String[] declarations = new String[] { + "def", // ArrayList + "Object[]", // Object array + "int[]" // Primitive array + }; + for (String decl : declarations) { + assertEvaluate(Arrays.asList(1, 2, 3), + decl + " x = [1, 2, 3]\n" + + "def id(a, b, c) { [a, b, c] }\n" + + "return id(*x)\n"); + assertEvaluate(Arrays.asList(1, 2, 3), + decl + " x = [2, 3]\n" + + "def id(a, b, c) { [a, b, c] }\n" + + "return id(1, *x)\n"); + assertEvaluate(Arrays.asList(1, 2, 3), + decl + " x = [1, 2]\n" + + "def id(a, b, c) { [a, b, c] }\n" + + "return id(*x, 3)\n"); + assertEvaluate(Arrays.asList(1, 2, 3), + decl + " x = [2]\n" + + "def id(a, b, c) { [a, b, c] }\n" + + "return id(1, *x, 3)\n"); } + assertEvaluate(Arrays.asList(1, null, 3), + "def x = null\n" + + "def id(a, b, c) { [a, b, c] }\n" + + "return id(1, *x, 3)\n"); + } + + @Issue("JENKINS-46163") + @Test public void spreadMapMethodCallArguments() throws Throwable { + assertEvaluate(Collections.singletonMap("a", 1), + "def x = [a: 1]\n" + + "def id(Map m) { m }\n" + + "return id(*:x)\n"); + assertEvaluate(Collections.singletonMap("a", 1), + "def x = [a: 1]\n" + + "def id(def m) { m }\n" + + "return id(*:x)\n"); + ec.checkThrows(MissingMethodException.class, () -> evalCPSonly( + "def x = [a: 1]\n" + + "def id(String a, int i) { [a, i] }\n" + + "return id(*:x)\n")); + ec.checkThrows(MissingMethodException.class, () -> getSh().evaluate( + "def x = [a: 1]\n" + + "def id(String a, int i) { [a, i] }\n" + + "return id(*:x)\n")); } @Test From 565b1cac7cf2ebf2dd251c081a495e746d0f091f Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Thu, 27 Oct 2022 13:15:17 -0400 Subject: [PATCH 760/932] Improve test harness using idioms from groovy-sandbox --- .../groovy/cps/AbstractGroovyCpsTest.java | 81 ++++++-- .../groovy/cps/CpsTransformerTest.java | 178 ++++++++---------- .../cps/sandbox/SandboxInvokerTest.java | 77 ++++---- 3 files changed, 191 insertions(+), 145 deletions(-) diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java index 6fdbedf3f..64cc15def 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java @@ -8,6 +8,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; +import java.util.concurrent.atomic.AtomicReference; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.junit.Before; @@ -77,20 +78,76 @@ protected CpsTransformer createCpsTransformer() { return new CpsTransformer(); } - public void assertEvaluate(Object expectedResult, String script) throws Throwable { - Object actualCps = evalCPSonly(script); - String actualCpsType = GroovyCallSiteSelector.getName(actualCps); - String expectedType = GroovyCallSiteSelector.getName(expectedResult); - ec.checkThat("CPS-transformed result (" + actualCpsType + ") does not match expected result (" + expectedType + ")", actualCps, equalTo(expectedResult)); - Object actualNonCps = sh.evaluate(script); - String actualNonCpsType = GroovyCallSiteSelector.getName(actualNonCps); - ec.checkThat("Non-CPS-transformed result (" + actualNonCpsType + ") does not match expected result (" + expectedType + ")", actualNonCps, equalTo(expectedResult)); + /** + * Use {@code ShouldFail.class} as the expected result for {@link #eval} and similar methods when the expression is expected to throw an exception. + */ + public static final class ShouldFail { } + + @FunctionalInterface + public interface ExceptionHandler { + public void handleException(Throwable e) throws Exception; + } + + protected void eval(String script, Object expectedResult, ExceptionHandler handler) { + try { + Object actual = sh.evaluate(script); + String actualType = GroovyCallSiteSelector.getName(actual); + String expectedType = GroovyCallSiteSelector.getName(expectedResult); + ec.checkThat("Non-CPS-transformed result (" + actualType + ") does not match expected result (" + expectedType + ")", actual, equalTo(expectedResult)); + } catch (Throwable t) { + ec.checkSucceeds(() -> { + handler.handleException(t); + return null; + }); + } + } + + protected void evalCps(String script, Object expectedResult, ExceptionHandler handler) { + try { + Object actual = parseCps(script).invoke(null, null, Continuation.HALT).run(10000).replay(); + String actualType = GroovyCallSiteSelector.getName(actual); + String expectedType = GroovyCallSiteSelector.getName(expectedResult); + ec.checkThat("Non-CPS-transformed result (" + actualType + ") does not match expected result (" + expectedType + ")", actual, equalTo(expectedResult)); + } catch (Throwable t) { + ec.checkSucceeds(() -> { + handler.handleException(t); + return null; + }); + } } - public Object evalCPS(String script) throws Throwable { - Object resultInCps = evalCPSonly(script); - ec.checkThat(resultInCps, equalTo(sh.evaluate(script))); // make sure that regular non-CPS execution reports the same result - return resultInCps; + /** + * Execute a Groovy expression both with and without the CPS transformation and check that the return value matches + * the expected value in both cases. + * @param expectedReturnValue The expected return value for running the script. + * @param script The Groovy script to execute. + */ + public void assertEvaluate(Object expectedReturnValue, String script) { + evalCps(script, expectedReturnValue, e -> { + throw new RuntimeException("Failed to evaluate sandboxed script: " + script, e); + }); + eval(script, expectedReturnValue, e -> { + throw new RuntimeException("Failed to evaluate unsandboxed script: " + script, e); + }); + } + + /** + * Execute a Groovy expression both with and without the CPS transformation and check that the script throws an + * exception with the same class and message in both cases. + * @param expression The Groovy expression to execute. + */ + public void assertFailsWithSameException(String expression) { + AtomicReference cpsException = new AtomicReference<>(); + evalCps(expression, ShouldFail.class, cpsException::set); + AtomicReference nonCpsException = new AtomicReference<>(); + eval(expression, ShouldFail.class, nonCpsException::set); + if (cpsException.get() == null || nonCpsException.get() == null) { + return; // Either evalCps or eval will have already recorded an error because the result was not ShouldFail. + } + ec.checkThat("CPS-transformed and non-CPS-transformed exceptions should have the same type", + nonCpsException.get().getClass(), equalTo(cpsException.get().getClass())); + ec.checkThat("CPS-transformed and non-CPS-transformed exceptions should have the same message", + nonCpsException.get().getMessage(), equalTo(cpsException.get().getMessage())); } public Object evalCPSonly(String script) throws Throwable { diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java index 6f63abdf8..021d1a709 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java @@ -2,7 +2,6 @@ import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import groovy.lang.IntRange; -import groovy.lang.MissingMethodException; import java.io.File; import java.math.BigDecimal; import java.util.Arrays; @@ -23,7 +22,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; /** * @@ -327,19 +325,15 @@ public void assertion() throws Throwable { "assert true : 'message'\n" + "return 3;\n"); - try { - evalCPS("assert 1+2 == ((4));"); - fail(); - } catch (AssertionError e) { - assertThat(e.getMessage(), containsString("1+2 == ((4))")); - } + evalCps("assert 1+2 == ((4));", ShouldFail.class, t -> { + ec.checkThat(t, instanceOf(AssertionError.class)); + ec.checkThat(t.getMessage(), containsString("1+2 == ((4))")); + }); - try { - evalCPS("assert (1+2) == 4 : 'with message';"); - fail(); - } catch (AssertionError e) { - assertThat(e.getMessage(), containsString("with message. Expression: assert (1+2) == 4 : 'with message'")); - } + evalCps("assert (1+2) == 4 : 'with message';", ShouldFail.class, t -> { + ec.checkThat(t, instanceOf(AssertionError.class)); + ec.checkThat(t.getMessage(), containsString("with message. Expression: assert (1+2) == 4 : 'with message'")); + }); } @Test @@ -869,14 +863,14 @@ public void excessiveListElements() throws Throwable { "return b.size()\n"); String s2 = IntStream.range(0, 251).boxed().map(Object::toString).collect(Collectors.joining(",\n")); - try { - assertEvaluate(251, - "def b = [" + s2 + "]\n" + - "return b.size()\n"); - } catch (Exception e) { - assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); - assertThat(e.getMessage(), containsString("List expressions can only contain up to 250 elements")); - } + evalCps( + "def b = [" + s2 + "]\n" + + "return b.size()\n", + ShouldFail.class, + t -> { + assertThat(t, instanceOf(MultipleCompilationErrorsException.class)); + assertThat(t.getMessage(), containsString("List expressions can only contain up to 250 elements")); + }); } @Issue("JENKINS-47363") @@ -887,14 +881,14 @@ public void excessiveMapElements() throws Throwable { "def b = [" + s1 + "]\n" + "return b.size()\n"); String s2 = IntStream.range(0, 126).boxed().map(i -> i + ":" + i).collect(Collectors.joining(",\n")); - try { - assertEvaluate(126, - "def b = [" + s2 + "]\n" + - "return b.size()\n"); - } catch (Exception e) { - assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); - assertThat(e.getMessage(), containsString("Map expressions can only contain up to 125 entries")); - } + evalCps( + "def b = [" + s2 + "]\n" + + "return b.size()\n", + ShouldFail.class, + t -> { + assertThat(t, instanceOf(MultipleCompilationErrorsException.class)); + assertThat(t.getMessage(), containsString("Map expressions can only contain up to 125 entries")); + }); } @Issue("JENKINS-49679") @@ -918,32 +912,26 @@ public void multipleAssignmentRunsMethodOnce() throws Throwable { @Test public void mapEntryInBadContext() throws Throwable { - try { - evalCPSonly("return [[a: 'a'], [b: 'b'][c: 'c']]"); - } catch (Exception e) { - assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); - assertThat(e.getMessage(), containsString("Unsupported map entry expression for CPS transformation in this context")); - } + evalCps("return [[a: 'a'], [b: 'b'][c: 'c']]", ShouldFail.class, e -> { + ec.checkThat(e, instanceOf(MultipleCompilationErrorsException.class)); + ec.checkThat(e.getMessage(), containsString("Unsupported map entry expression for CPS transformation in this context")); + }); } @Test public void spreadMethodCall() throws Throwable { - try { - evalCPSonly("return ['a', 'b', 'c']*.hashCode()"); - } catch (Exception e) { - assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); - assertThat(e.getMessage(), containsString("spread not yet supported for CPS transformation")); - } + evalCps("return ['a', 'b', 'c']*.hashCode()", ShouldFail.class, e -> { + ec.checkThat(e, instanceOf(MultipleCompilationErrorsException.class)); + ec.checkThat(e.getMessage(), containsString("spread not yet supported for CPS transformation")); + }); } @Test public void synchronizedStatement() throws Throwable { - try { - evalCPSonly("synchronized(this) { return 1 }"); - } catch (Exception e) { - assertThat(e, instanceOf(MultipleCompilationErrorsException.class)); - assertThat(e.getMessage(), containsString("synchronized is unsupported for CPS transformation")); - } + evalCps("synchronized(this) { return 1 }", ShouldFail.class, e -> { + ec.checkThat(e, instanceOf(MultipleCompilationErrorsException.class)); + ec.checkThat(e.getMessage(), containsString("synchronized is unsupported for CPS transformation")); + }); } @Issue("JENKINS-46163") @@ -974,29 +962,9 @@ public void synchronizedStatement() throws Throwable { assertEvaluate(Collections.singletonList(null), "def x = null\n" + "return [*x]\n"); - } - - @Issue("JENKINS-46163") - @Test public void spreadMapExpression() throws Throwable { - assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", 3, "d", 4, "e", 5 }), - "def x = [a: 1, b: 2, c: 3]\n" + - "return [*:x, d: 4, e: 5]\n"); - assertEvaluate(InvokerHelper.createMap(new Object[] { "d", 4, "a", 1, "b", 2, "c", 3, "e", 5 }), - "def x = [a: 1, b: 2, c: 3]\n" + - "return [d: 4, *:x, e: 5]\n"); - assertEvaluate(InvokerHelper.createMap(new Object[] { "d", 4, "e", 5, "a", 1, "b", 2, "c", 3, "e", 5 }), - "def x = [a: 1, b: 2, c: 3]\n" + - "return [d: 4, e: 5, *:x]\n"); - assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", -1 }), - "def x = [a: 1, b: 2, c: 3]\n" + - "return [c: 4, *:x, c: -1]\n"); // The final value for a key takes precedence. - assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", 3 }), - "def x = [a: 1, b: 2, c: 3]\n" + - "return [*:x]\n"); - assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7 }), - "def x = [b: 2, c: 3]\n" + - "def y = [e: 5, f: 6]\n" + - "return [a: 1, *:x, d: 4, *:y, g: 7]\n"); + assertFailsWithSameException( + "def x = 1\n" + + "return *x\n"); // *x cannot exist outside of list literals and method call arguments. } @Issue("JENKINS-46163") @@ -1031,23 +999,39 @@ public void synchronizedStatement() throws Throwable { } @Issue("JENKINS-46163") - @Test public void spreadMapMethodCallArguments() throws Throwable { + @Test public void spreadMapExpression() throws Throwable { + assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", 3, "d", 4, "e", 5 }), + "def x = [a: 1, b: 2, c: 3]\n" + + "return [*:x, d: 4, e: 5]\n"); + assertEvaluate(InvokerHelper.createMap(new Object[] { "d", 4, "a", 1, "b", 2, "c", 3, "e", 5 }), + "def x = [a: 1, b: 2, c: 3]\n" + + "return [d: 4, *:x, e: 5]\n"); + assertEvaluate(InvokerHelper.createMap(new Object[] { "d", 4, "e", 5, "a", 1, "b", 2, "c", 3, "e", 5 }), + "def x = [a: 1, b: 2, c: 3]\n" + + "return [d: 4, e: 5, *:x]\n"); + assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", -1 }), + "def x = [a: 1, b: 2, c: 3]\n" + + "return [c: 4, *:x, c: -1]\n"); // The final value for a key takes precedence. + assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", 3 }), + "def x = [a: 1, b: 2, c: 3]\n" + + "return [*:x]\n"); + assertEvaluate(InvokerHelper.createMap(new Object[] { "a", 1, "b", 2, "c", 3, "d", 4, "e", 5, "f", 6, "g", 7 }), + "def x = [b: 2, c: 3]\n" + + "def y = [e: 5, f: 6]\n" + + "return [a: 1, *:x, d: 4, *:y, g: 7]\n"); + // When used in method call arguments, *:map is the same as map, except for creating an instance of SpreadMap. + // IDK why Groovy even allows the spread syntax here. assertEvaluate(Collections.singletonMap("a", 1), "def x = [a: 1]\n" + - "def id(Map m) { m }\n" + + "def id(def m) { m }\n" + "return id(*:x)\n"); - assertEvaluate(Collections.singletonMap("a", 1), + assertFailsWithSameException( "def x = [a: 1]\n" + - "def id(def m) { m }\n" + + "def id(String a, int i) { [a, i] }\n" + "return id(*:x)\n"); - ec.checkThrows(MissingMethodException.class, () -> evalCPSonly( - "def x = [a: 1]\n" + - "def id(String a, int i) { [a, i] }\n" + - "return id(*:x)\n")); - ec.checkThrows(MissingMethodException.class, () -> getSh().evaluate( - "def x = [a: 1]\n" + - "def id(String a, int i) { [a, i] }\n" + - "return id(*:x)\n")); + assertFailsWithSameException( + "def x = [a: 1]\n" + + "return *:x\n"); // *:x is syntactically invalid outside of map literals and method call arguments. } @Test @@ -1079,7 +1063,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { } @Test public void voidMethodsWithInitialExpressionsAreExpandedToCorrectOverloads() throws Throwable { - assertEquals(Arrays.asList("abc", "xbc", "xyc", "xyz"), evalCPS( + assertEvaluate(Arrays.asList("abc", "xbc", "xyc", "xyz"), "import groovy.transform.Field\n" + "@Field def r = []\n" + "void m2(a = 'a', b = 'b', c = 'c') {\n" + @@ -1089,8 +1073,8 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "m2('x')\n" + "m2('x', 'y')\n" + "m2('x', 'y', 'z')\n" + - "r")); - assertEquals(Arrays.asList("abc", "xbc", "xby"), evalCPS( + "r"); + assertEvaluate(Arrays.asList("abc", "xbc", "xby"), "import groovy.transform.Field\n" + "@Field def r = []\n" + "void m2(a = 'a', b, c = 'c') {\n" + @@ -1099,18 +1083,15 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "m2('b')\n" + "m2('x', 'b')\n" + "m2('x', 'b', 'y')\n" + - "r")); + "r"); } @Issue("JENKINS-57253") @Test public void illegalBreakStatement() throws Throwable { getBinding().setProperty("sentinel", 1); - try { - evalCPSonly("sentinel = 2; break;"); - fail("Execution should fail"); - } catch (Exception e) { + evalCps("sentinel = 2; break;", ShouldFail.class, e -> { assertThat(e.toString(), containsString("the break statement is only allowed inside loops or switches")); - } + }); assertEquals("Script should fail during compilation", 1, getBinding().getProperty("sentinel")); } @@ -1170,8 +1151,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "t as Boolean\n" + "t.auditLog"); // asBoolean CPS (has never worked, still does not work) - try { - evalCPS( + evalCps( "class Test {\n" + " def auditLog = []\n" + " def asBoolean() {\n" + @@ -1180,11 +1160,11 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "}\n" + "def t = new Test()\n" + "(Boolean)t\n" + - "t.auditLog"); - fail("Should have thrown an exception"); - } catch (Throwable t) { - assertEquals("java.lang.IllegalStateException: Test.asBoolean must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/", t.toString()); - } + "t.auditLog", + ShouldFail.class, + t -> { + ec.checkThat(t.toString(), equalTo("java.lang.IllegalStateException: Test.asBoolean must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/")); + }); // asBoolean NonCPS (required) assertEvaluate(Collections.singletonList("asBoolean"), "class Test {\n" + diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java index 3848bd36e..6d9da7158 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java @@ -31,9 +31,7 @@ import org.codehaus.groovy.runtime.ProxyGeneratorAdapter; import org.junit.Before; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ErrorCollector; import org.jvnet.hudson.test.Issue; import org.kohsuke.groovy.sandbox.ClassRecorder; import org.kohsuke.groovy.sandbox.impl.GroovyCallSiteSelector; @@ -43,12 +41,8 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; public class SandboxInvokerTest extends AbstractGroovyCpsTest { - @Rule - public ErrorCollector ec = new ErrorCollector(); - ClassRecorder cr = new ClassRecorder(); @Override @@ -60,24 +54,42 @@ protected CpsTransformer createCpsTransformer() { CpsTransformer.iota.set(0); } - protected Object evalCpsSandbox(String script) throws Throwable { - FunctionCallEnv e = (FunctionCallEnv)Envs.empty(); - e.setInvoker(new SandboxInvoker()); + private void evalCpsSandbox(String expression, Object expectedResult, ExceptionHandler handler) { + FunctionCallEnv env = (FunctionCallEnv)Envs.empty(); + env.setInvoker(new SandboxInvoker()); cr.reset(); cr.register(); try { - return parseCps(script).invoke(e, null, Continuation.HALT).run().yield.replay(); + Object actual = parseCps(expression).invoke(env, null, Continuation.HALT).run().yield.replay(); + String actualType = GroovyCallSiteSelector.getName(actual); + String expectedType = GroovyCallSiteSelector.getName(expectedResult); + ec.checkThat("CPS and sandbox-transformed result (" + actualType + ") does not match expected result (" + expectedType + ")", actual, equalTo(expectedResult)); + } catch (Throwable t) { + ec.checkSucceeds(() -> { + try { + handler.handleException(t); + } catch (Throwable t2) { + t2.addSuppressed(t); // Keep the original error around in case an assertion fails in the handler. + throw t2; + } + return null; + }); } finally { cr.unregister(); } } + @Override + public void assertEvaluate(Object expectedReturnValue, String script) { + evalCpsSandbox(script, expectedReturnValue, e -> { + throw new RuntimeException("Failed to evaluate CPS and sandboxed-transformed script: " + script, e); + }); + // TODO: Refactor things so we can check evalCps as well. + } + public void assertIntercept(String script, Object expectedResult, String... expectedInterceptions) throws Throwable { - Object actualResult = evalCpsSandbox(script); - String actualCpsType = GroovyCallSiteSelector.getName(actualResult); - String expectedType = GroovyCallSiteSelector.getName(expectedResult); - ec.checkThat("CPS and sandbox-transformed result (" + actualCpsType + ") does not match expected result (" + expectedType + ")", actualResult, equalTo(expectedResult)); + assertEvaluate(expectedResult, script); ec.checkThat(cr.toString().split("\n"), equalTo(expectedInterceptions)); } @@ -440,7 +452,7 @@ public void sandboxedMultipleAssignment() throws Throwable { "ArrayList[Integer]", "ArrayList[Integer]", "String.plus(String)", - "String.plus(String)", + "String.plus(String)", "String.plus(String)"); } @@ -509,29 +521,27 @@ public void sandboxedMultipleAssignmentRunsMethodOnce() throws Throwable { @Issue("SECURITY-1186") @Test public void finalizerForbidden() throws Throwable { - try { - evalCpsSandbox("class Test { @Override public void finalize() { } }; null"); - fail("Finalizers should be rejected"); - } catch (MultipleCompilationErrorsException e) { + evalCpsSandbox("class Test { @Override public void finalize() { } }; null", ShouldFail.class, t -> { + assertThat(t, instanceOf(MultipleCompilationErrorsException.class)); + MultipleCompilationErrorsException e = (MultipleCompilationErrorsException) t; assertThat(e.getErrorCollector().getErrorCount(), equalTo(1)); Exception innerE = e.getErrorCollector().getException(0); assertThat(innerE, instanceOf(SecurityException.class)); assertThat(innerE.getMessage(), containsString("Object.finalize()")); - } + }); } @Issue("SECURITY-1186") @Test public void nonCpsfinalizerForbidden() throws Throwable { - try { - evalCpsSandbox("class Test { @Override @NonCPS public void finalize() { } }; null"); - fail("Finalizers should be rejected"); - } catch (MultipleCompilationErrorsException e) { + evalCpsSandbox("class Test { @Override @NonCPS public void finalize() { } }; null", ShouldFail.class, t -> { + assertThat(t, instanceOf(MultipleCompilationErrorsException.class)); + MultipleCompilationErrorsException e = (MultipleCompilationErrorsException) t; assertThat(e.getErrorCollector().getErrorCount(), equalTo(1)); Exception innerE = e.getErrorCollector().getException(0); assertThat(innerE, instanceOf(SecurityException.class)); assertThat(innerE.getMessage(), containsString("Object.finalize()")); - } + }); } @Issue("SECURITY-1710") @@ -587,15 +597,14 @@ public void sandboxInterceptsImplicitCastsArrayAssignment() throws Throwable { // Regular Groovy casts the rhs of array assignments to match the component type of the array, but the // sandbox does not do this (with or without the CPS transformation). Ideally the sandbox would have the same // behavior as regular Groovy, but the current behavior is safe, which is good enough. - try { - evalCpsSandbox( - "File[] files = [null]\n" + - "files[0] = ['secret.key']\n " + - "files[0]"); - fail("The sandbox must intercept unsafe array element assignments"); - } catch (Throwable t) { - assertEquals("java.lang.ArrayStoreException: java.util.ArrayList", t.toString()); - } + evalCpsSandbox( + "File[] files = [null]\n" + + "files[0] = ['secret.key']\n " + + "files[0]", + ShouldFail.class, + t -> { + assertEquals("java.lang.ArrayStoreException: java.util.ArrayList", t.toString()); + }); } @Issue("SECURITY-2824") From 09a307b98cb9f695ae6a69b48364d31fd750ed8c Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 09:46:24 -0700 Subject: [PATCH 761/932] Replace deprecated usage with non-deprecated equivalent --- .../main/java/com/cloudbees/groovy/cps/tool/Translator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index fe87e550b..3510fd088 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -71,7 +71,7 @@ import javax.lang.model.type.WildcardType; import javax.lang.model.util.ElementScanner7; import javax.lang.model.util.Elements; -import javax.lang.model.util.SimpleTypeVisitor6; +import javax.lang.model.util.SimpleTypeVisitor8; import javax.lang.model.util.Types; import javax.tools.JavaCompiler.CompilationTask; import java.io.BufferedReader; @@ -767,7 +767,7 @@ private JType t(TypeMirror m, Map typeVars) { if (m.getKind().isPrimitive()) return JType.parse(codeModel,m.toString()); - return m.accept(new SimpleTypeVisitor6() { + return m.accept(new SimpleTypeVisitor8() { @Override public JType visitPrimitive(PrimitiveType t, Void __) { return primitive(t, t.getKind()); From 14f1c6700eb240f1b45e5d83c5a8311ad2dfc6af Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 10:41:32 -0700 Subject: [PATCH 762/932] Use diamond operator where possible --- lib/src/main/java/com/cloudbees/groovy/cps/Builder.java | 2 +- lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java | 2 +- .../main/java/com/cloudbees/groovy/cps/CpsTransformer.java | 4 ++-- lib/src/main/java/com/cloudbees/groovy/cps/Next.java | 2 +- .../com/cloudbees/groovy/cps/TransformerConfiguration.java | 2 +- .../java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java | 4 ++-- lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java | 2 +- lib/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java | 4 ++-- .../java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java | 2 +- .../java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java | 2 +- .../java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java | 2 +- .../java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java | 2 +- .../main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java | 2 +- .../main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java | 2 +- .../java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java index 26ba365f1..cadf0dca2 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -77,7 +77,7 @@ private Builder(Builder parent, Collection newTags) { private Collection combine(Collection a, Collection b) { if (a.isEmpty()) return b; if (b.isEmpty()) return a; - Collection all = new ArrayList(a); + Collection all = new ArrayList<>(a); all.addAll(b); return all; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java index a1d006966..fbeb15f19 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -199,7 +199,7 @@ public static Object suspend(String methodName, Object v) { * If this object represents a yet-started program, an empty list will be returned. */ public List getStackTrace() { - List r = new ArrayList(); + List r = new ArrayList<>(); if (e!=null) e.buildStackTraceElements(r,Integer.MAX_VALUE); return r; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index decb574b8..1206ddb33 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -942,8 +942,8 @@ public void run() { params = new ListExpression(Collections.singletonList(new ConstantExpression("it"))); } else { Parameter[] paramArray = exp.getParameters(); - List typesList = new ArrayList(paramArray.length); - List paramsList = new ArrayList(paramArray.length); + List typesList = new ArrayList<>(paramArray.length); + List paramsList = new ArrayList<>(paramArray.length); // Note: This code currently ignores initial expressions for closure parameters. // Be careful that any refactoring either maintains the status quo, or transforms these // initial expressions in such a way that they are correctly intercepted by the sandbox. diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Next.java b/lib/src/main/java/com/cloudbees/groovy/cps/Next.java index da5aaa1e6..f66b11f10 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -61,7 +61,7 @@ public Outcome run(final int max) { @Override public Outcome call() { int remaining = max; - List functions = new ArrayList(); + List functions = new ArrayList<>(); Next n = Next.this; while(n.yield==null) { functions.add(n.f.getClass().getCanonicalName()); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/TransformerConfiguration.java b/lib/src/main/java/com/cloudbees/groovy/cps/TransformerConfiguration.java index 6edf772f7..233259415 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/TransformerConfiguration.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/TransformerConfiguration.java @@ -15,7 +15,7 @@ */ public class TransformerConfiguration { private ClassNode closureType = new ClassNode(CpsClosure.class); - private List safepoints = new ArrayList(); + private List safepoints = new ArrayList<>(); public ClassNode getClosureType() { return closureType; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java index 2961695cf..66e036d70 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/BlockScopeEnv.java @@ -38,12 +38,12 @@ public BlockScopeEnv(Env parent, int localsSize) { public void declareVariable(Class type, String name) { if (locals == Collections.EMPTY_MAP) { - this.locals = new HashMap(2); + this.locals = new HashMap<>(2); } locals.put(name, null); if (types == null || types == Collections.EMPTY_MAP) { - types = new HashMap(2); + types = new HashMap<>(2); } types.put(name, type); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java index 42a71f1ac..06457ef99 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CallEnv.java @@ -73,7 +73,7 @@ protected Map getTypes() { /** Used when we are actually going to mutate the types info */ protected Map getTypesForMutation() { if (types == null || types == Collections.EMPTY_MAP) { - this.types = new HashMap(2); + this.types = new HashMap<>(2); } return this.types; } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java index f9c060d2a..67ad01cc2 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java @@ -64,11 +64,11 @@ static class Info { @SuppressWarnings({"unchecked", "rawtypes"}) // generic array creation static void record(Object receiver, String method, Object[] args) { Info c = store.get(); - c.receiver = new WeakReference(receiver); + c.receiver = new WeakReference<>(receiver); c.method = method; c.args = new WeakReference[args.length]; for (int i = 0; i < args.length; i++) { - c.args[i] = new WeakReference(args[i]); + c.args[i] = new WeakReference<>(args[i]); } } } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java index 2361aa8a5..efde9bc98 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ClosureCallEnv.java @@ -41,7 +41,7 @@ public ClosureCallEnv(Env caller, Continuation returnAddress, SourceLocation loc public void declareVariable(Class type, String name) { if (locals == Collections.EMPTY_MAP) { - locals = new HashMap(2); + locals = new HashMap<>(2); } locals.put(name, null); getTypesForMutation().put(name, type); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index d44e2341b..c4a087bb1 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -145,7 +145,7 @@ private void fixupStackTrace(Env e, Throwable t, SourceLocation loc, ReferenceSt List orig = Arrays.asList(ts); int pos = ts.length-rs.length; - List stack = new ArrayList(orig.subList(0,pos)); + List stack = new ArrayList<>(orig.subList(0,pos)); stack.add((loc!=null ? loc : UNKNOWN).toStackTrace()); e.buildStackTraceElements(stack,Integer.MAX_VALUE); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index 8491bb904..d22161e26 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -125,7 +125,7 @@ private Next dispatchOrArg() { * Insert the logical CPS stack trace in front of the actual stack trace. */ private void fillInStackTrace(Env e, Throwable t) { - List stack = new ArrayList(); + List stack = new ArrayList<>(); stack.add((loc!=null ? loc : UNKNOWN).toStackTrace()); e.buildStackTraceElements(stack,Integer.MAX_VALUE); stack.add(Continuable.SEPARATOR_STACK_ELEMENT); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java index 435352f86..6b736226c 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallEnv.java @@ -26,7 +26,7 @@ public FunctionCallEnv(Env caller, Continuation returnAddress, SourceLocation lo public FunctionCallEnv(Env caller, Continuation returnAddress, SourceLocation loc, Object _this, int localsCount) { super(caller,returnAddress,loc, localsCount); - locals = (localsCount <= 0) ? new HashMap(2) : Maps.newHashMapWithExpectedSize(localsCount+1); + locals = (localsCount <= 0) ? new HashMap<>(2) : Maps.newHashMapWithExpectedSize(localsCount+1); locals.put("this", _this); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java index b85f53f23..24399ddec 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java @@ -54,7 +54,7 @@ public Next receive(Object t) { this section contains the actual stack trace where 'throwable' was created */ - List stack = new ArrayList(); + List stack = new ArrayList<>(); stack.add((loc!=null ? loc : UNKNOWN).toStackTrace()); e.buildStackTraceElements(stack,Integer.MAX_VALUE); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java index 611b205d7..14af4be4f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/TryBlockEnv.java @@ -16,7 +16,7 @@ */ // TODO: should be package local once all the impls move into this class public class TryBlockEnv extends ProxyEnv { - private final Map handlers = new LinkedHashMap(2); + private final Map handlers = new LinkedHashMap<>(2); @CheckForNull private final Block finally_; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java index de4d7aec6..9d6f57c8e 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/VariableDeclBlock.java @@ -28,7 +28,7 @@ public Next eval(final Env e, final Continuation k) { private static final long serialVersionUID = 1L; - private static final Map defaultPrimitiveValue = new HashMap(); + private static final Map defaultPrimitiveValue = new HashMap<>(); static { defaultPrimitiveValue.put(boolean.class,false); defaultPrimitiveValue.put(int.class,0); From 364773d6b6f333c98c7b7a95810e50f977dc5c07 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 09:46:43 -0700 Subject: [PATCH 763/932] Remove unnecessary semicolon --- .../plugins/workflow/cps/GroovySourceFileAllowlist.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java index 4a2343592..eadaee5da 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java @@ -201,7 +201,7 @@ public DefaultAllowlist() throws IOException { private static void loadDefaultAllowlist(List allowlist) throws IOException { try (InputStream is = GroovySourceFileAllowlist.class.getResourceAsStream("GroovySourceFileAllowlist/default-allowlist"); - BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));) { + BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) { String line; while ((line = reader.readLine()) != null) { line = line.trim(); From bb1734468cf0aabe34dd90e24bd50ff4d048524f Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 09:48:29 -0700 Subject: [PATCH 764/932] Remove redundant modifiers --- lib/src/main/java/com/cloudbees/groovy/cps/Block.java | 2 +- lib/src/main/java/com/cloudbees/groovy/cps/Continuation.java | 2 +- .../main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java | 2 +- .../jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Block.java b/lib/src/main/java/com/cloudbees/groovy/cps/Block.java index 0ed9bcd27..c41e22e50 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Block.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Block.java @@ -21,7 +21,7 @@ public interface Block extends Serializable { /** * A function that does nothing. */ - final static Block NOOP = new Noop(); + Block NOOP = new Noop(); final class Noop implements Block { private Noop() {} diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuation.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuation.java index e5bcfdff9..024b4c8cd 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuation.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuation.java @@ -19,7 +19,7 @@ public interface Continuation extends Serializable { /** * Indicates the end of a program. */ - final static Continuation HALT = new Halt(); + Continuation HALT = new Halt(); /** * Singleton implementation that maintains the singleton-ness across serialization diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java b/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java index effcd52ac..fc7c23f63 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/DepthTrackingEnv.java @@ -10,5 +10,5 @@ public interface DepthTrackingEnv extends Env { int MAX_LEGAL_DEPTH = 1024; /** Return how deep this environment is within nested closure/function calls. */ - public int getDepth(); + int getDepth(); } diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java index 26144838e..88e6f44b9 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition2Test.java @@ -950,7 +950,7 @@ public Set> getRequiredContext() { } } - public static interface UnsafeDescribable extends Describable { + public interface UnsafeDescribable extends Describable { void doSomething(); } } From 15829a2b37de5d5995f8508cbba83206a3d6108d Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 09:48:58 -0700 Subject: [PATCH 765/932] Use method references where possible --- .../com/cloudbees/groovy/cps/tool/Translator.java | 2 +- .../com/cloudbees/groovy/cps/CpsTransformer.java | 14 ++------------ .../java/com/cloudbees/groovy/cps/impl/Caller.java | 7 +------ .../cloudbees/groovy/cps/impl/LogicalOpBlock.java | 4 +--- 4 files changed, 5 insertions(+), 22 deletions(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 3510fd088..4db223ee1 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -291,7 +291,7 @@ private void translateMethod(final CompilationUnitTree cut, ExecutableElement e, } else { delegating.body()._return(delegateCall); } - delegatingParams.forEach(p -> delegateCall.arg(p)); + delegatingParams.forEach(delegateCall::arg); JVar $b = m.body().decl($Builder, "b", JExpr._new($Builder).arg(JExpr.invoke("loc").arg(methodName)). invoke("contextualize").arg(codeModel.ref("com.cloudbees.groovy.cps.sandbox.Trusted").staticRef("INSTANCE"))); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java index 1206ddb33..415a5951f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/CpsTransformer.java @@ -227,12 +227,7 @@ public void visitMethod(final MethodNode m) { final AtomicReference body = new AtomicReference<>(); // transform the body - parent = new ParentClosure() { - @Override - public void call(Expression e) { - body.set(e); - } - }; + parent = body::set; visitWithSafepoint(m.getCode()); ListExpression params = new ListExpression(); @@ -442,12 +437,7 @@ protected TupleExpression makeChildren(Runnable body) { final List argExps = new ArrayList<>(); ParentClosure old = parent; try { - parent = new ParentClosure() { - @Override - public void call(Expression e) { - argExps.add(e); - } - }; + parent = argExps::add; body.run(); // evaluate arguments return new TupleExpression(argExps); } finally { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java index 67ad01cc2..813a4e2a5 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/Caller.java @@ -14,12 +14,7 @@ public class Caller { /** * Caller information needs to be recorded per thread. */ - private static final ThreadLocal store = new ThreadLocal() { - @Override - protected Info initialValue() { - return new Info(); - } - }; + private static final ThreadLocal store = ThreadLocal.withInitial(Info::new); /** * Checks if the method is called from asynchronous CPS transformed code. diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java index c6515c210..cec9b78f9 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/LogicalOpBlock.java @@ -46,9 +46,7 @@ public Next decide(Object lhs) { } public Next castRhs(Object rhs) { - return castToBoolean(rhs, e, v -> { - return k.receive(v); - }); + return castToBoolean(rhs, e, k::receive); } private static final long serialVersionUID = 1L; From 6b881c28d12c00aeddb5090922bf2ef5a63eb17e Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 09:49:31 -0700 Subject: [PATCH 766/932] Replace Collections#sort with List#sort --- .../org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java | 2 +- .../plugins/workflow/cps/actions/ArgumentsActionImplTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java index 25f556c4a..293d3a550 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java @@ -165,7 +165,7 @@ private void checkAllDone(boolean stepFailed) { // all done List toAttach = new ArrayList<>(handler.failures); if (!handler.failFast) { - Collections.sort(toAttach, new ThrowableComparator(new ArrayList<>(handler.failures))); + toAttach.sort(new ThrowableComparator(new ArrayList<>(handler.failures))); } if (!toAttach.isEmpty()) { Throwable head = toAttach.get(0); diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java index 8bda4dce7..3f3bbccb2 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java @@ -113,7 +113,7 @@ private void testDeserialize(FlowExecution execution) throws Exception { getFileM.setAccessible(true); List nodes = new DepthFirstScanner().allNodes(execution.getCurrentHeads()); - Collections.sort(nodes, FlowScanningUtils.ID_ORDER_COMPARATOR); + nodes.sort(FlowScanningUtils.ID_ORDER_COMPARATOR); Field nodeExecutionF = FlowNode.class.getDeclaredField("exec"); nodeExecutionF.setAccessible(true); From 0087152d7b0cbfb97cfe7b9a98099b878e5a1803 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 09:53:11 -0700 Subject: [PATCH 767/932] Use Stream API where possible --- .../workflow/cps/actions/ArgumentsActionImplTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java index 3f3bbccb2..be1a7b85e 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java @@ -6,8 +6,6 @@ import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl; import com.google.common.base.Predicates; import com.google.common.collect.Collections2; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; import hudson.EnvVars; import hudson.Functions; @@ -83,6 +81,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.logging.Level; +import java.util.stream.Stream; import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval; import org.jenkinsci.plugins.structs.describable.UninstantiatedDescribable; import org.jenkinsci.plugins.workflow.steps.StepExecutions; @@ -143,7 +142,7 @@ private void testDeserialize(FlowExecution execution) throws Exception { ArgumentsAction expectedInfoAction = f.getPersistentAction(ArgumentsAction.class); if (expectedInfoAction != null) { - Action deserializedInfoAction = Iterables.getFirst(Iterables.filter(Lists.newArrayList(deserializedActions), Predicates.instanceOf(ArgumentsAction.class)), null); + Action deserializedInfoAction = Stream.of(deserializedActions).filter(ArgumentsAction.class::isInstance).findFirst().orElse(null); assertNotNull(deserializedInfoAction); ArgumentsAction ArgumentsAction = (ArgumentsAction)deserializedInfoAction; From 8f97c7610fcac2ccbca6b9f2dc7a289f495700e8 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 09:53:41 -0700 Subject: [PATCH 768/932] Use Map#computeIfAbsent where possible --- .../java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java index 1253f8651..82567cd9c 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java @@ -136,8 +136,7 @@ public static CpsThreadDump from(CpsThreadGroup g) { // all the threads that share the same head form a logically single thread Map> m = new LinkedHashMap<>(); for (CpsThread t : g.getThreads()) { - List l = m.get(t.head); - if (l==null) m.put(t.head, l = new ArrayList<>()); + List l = m.computeIfAbsent(t.head, unused -> new ArrayList<>()); l.add(t); } From 3f0c0c5129cd1d0b7beeda9640dbbebbdbbc98a3 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 09:54:14 -0700 Subject: [PATCH 769/932] Replace statement lambda with expression lambda where possible --- .../com/cloudbees/groovy/cps/tool/Translator.java | 12 +++--------- .../java/com/cloudbees/groovy/cps/impl/IfBlock.java | 4 +--- .../java/com/cloudbees/groovy/cps/impl/NotBlock.java | 4 +--- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 4db223ee1..7a3561719 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -160,9 +160,7 @@ public Translator(CompilationTask task) throws IOException { private String mangledName(ExecutableElement e) { StringBuilder overloadResolved = new StringBuilder("$").append(n(e)); - e.getParameters().forEach(ve -> { - overloadResolved.append("__").append(types.erasure(ve.asType()).toString().replace("[]", "_array").replaceAll("[^\\p{javaJavaIdentifierPart}]+", "_")); - }); + e.getParameters().forEach(ve -> overloadResolved.append("__").append(types.erasure(ve.asType()).toString().replace("[]", "_array").replaceAll("[^\\p{javaJavaIdentifierPart}]+", "_"))); return overloadResolved.toString(); } @@ -298,9 +296,7 @@ private void translateMethod(final CompilationUnitTree cut, ExecutableElement e, JInvocation f = JExpr._new($CpsFunction); // parameter names - f.arg(codeModel.ref(Arrays.class).staticInvoke("asList").tap( inv -> { - e.getParameters().forEach( p -> inv.arg(n(p)) ); - })); + f.arg(codeModel.ref(Arrays.class).staticInvoke("asList").tap(inv -> e.getParameters().forEach(p -> inv.arg(n(p)) ))); // translate the method body into an expression that invokes Builder f.arg(trees.getTree(e).getBody().accept(new SimpleTreeVisitor() { @@ -577,9 +573,7 @@ public JExpression visitArrayType(ArrayTypeTree at, Void __) { @Override public JExpression visitNewArray(NewArrayTree nt, Void __) { if (nt.getInitializers()!=null) { - return $b.invoke("newArrayFromInitializers").tap(inv -> { - nt.getInitializers().forEach(d -> inv.arg(visit(d))); - }); + return $b.invoke("newArrayFromInitializers").tap(inv -> nt.getInitializers().forEach(d -> inv.arg(visit(d)))); } else { return $b.invoke("newArray").tap(inv -> { inv.arg(loc(nt)); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java index cb52efc70..bf5bdceac 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/IfBlock.java @@ -33,9 +33,7 @@ class ContinuationImpl extends ContinuationGroup { } public Next jump(Object cond) { - return castToBoolean(cond, e, b -> { - return then(b ? then : els, e, k); - }); + return castToBoolean(cond, e, b -> then(b ? then : els, e, k)); } private static final long serialVersionUID = 1L; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java index b69aca5e2..972502b4a 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/NotBlock.java @@ -44,9 +44,7 @@ class ContinuationImpl extends ContinuationGroup { } public Next cast(Object o) { - return castToBoolean(o, e, b -> { - return k.receive(!b); - }); + return castToBoolean(o, e, b -> k.receive(!b)); } private static final long serialVersionUID = 1L; From fef592b9cd76fd1c79bec10bd19cbab421672d08 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 09:54:54 -0700 Subject: [PATCH 770/932] Remove unnecessary iteration --- .../plugins/workflow/cps/steps/ParallelStepTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java index ac6b778e5..b3e32c4c3 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java @@ -676,10 +676,7 @@ private void parallelPropagatesStatusImpl(Result upstreamResult, Result... downs String.format("Scheduling project: %s", downstreamJob.getName()), run); story.j.waitForMessage( String.format("Starting building: %s", downstreamJob.getName()), run); - List downstreamBuilds = new ArrayList<>(); - for (FreeStyleBuild downstreamBuild : downstreamJob.getBuilds()) { - downstreamBuilds.add(downstreamBuild); - } + List downstreamBuilds = new ArrayList<>(downstreamJob.getBuilds()); assertEquals(1, downstreamBuilds.size()); story.j.waitForCompletion(downstreamBuilds.get(0)); if (!downstreamResult.equals(Result.SUCCESS)) { From eb8bd8d4b1089832aadaef6e80b8a297a1559dd0 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 09:55:52 -0700 Subject: [PATCH 771/932] Simplify assertion --- .../java/com/cloudbees/groovy/cps/VariableDeclarationTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/VariableDeclarationTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/VariableDeclarationTest.java index eddac6f10..7dc84091b 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/VariableDeclarationTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/VariableDeclarationTest.java @@ -4,6 +4,7 @@ import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import java.lang.reflect.InvocationTargetException; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import org.junit.Test; /** @@ -41,7 +42,7 @@ public void defaultValues() { assertEquals(0L, lv); Object ov = createVariable(Object.class); - assertEquals(null, ov); + assertNull(ov); float fv = createVariable(float.class); assertEquals(0.0f, fv, 0.0); From d7a2752a1876cdef873e16d794f53118a990256f Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 09:56:31 -0700 Subject: [PATCH 772/932] Simplify Stream API call chain --- .../src/main/java/com/cloudbees/groovy/cps/tool/Translator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index 7a3561719..b9ce24afb 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -376,7 +376,7 @@ public JExpression visitMethodInvocation(MethodInvocationTree mt, Void __) { ).findAny(); if (callSite.isPresent()) { ExecutableElement e = (ExecutableElement) callSite.get(); - if (e.getModifiers().contains(Modifier.PUBLIC) && !e.isVarArgs() && !e.getParameters().stream().anyMatch(p -> types.isAssignable(p.asType(), closureType))) { + if (e.getModifiers().contains(Modifier.PUBLIC) && !e.isVarArgs() && e.getParameters().stream().noneMatch(p -> types.isAssignable(p.asType(), closureType))) { // Delegate to the standard version. inv = $b.invoke("staticCall") .arg(loc(mt)) From 3e90d7fc45a0df23d58073e37890e47f3c0369e7 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 10:07:28 -0700 Subject: [PATCH 773/932] Use Collections#singletonList where possible --- .../main/java/com/cloudbees/groovy/cps/tool/Driver.java | 2 +- .../java/com/cloudbees/groovy/cps/impl/SuspendBlock.java | 4 ++-- .../java/org/jenkinsci/plugins/workflow/cps/DSLTest.java | 8 ++++---- .../workflow/cps/actions/ArgumentsActionImplTest.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java index d47b0fff2..f9de0efa2 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java @@ -57,7 +57,7 @@ public void run(File dir) throws Exception { // Tree symbols created by the original JavacTask.parse() call to be thrown away, // which breaks later processing. // So for now, don't perform annotation processing - List options = asList("-proc:none"); + List options = Collections.singletonList("-proc:none"); Translator t = new Translator(javac.getTask(null, fileManager, errorListener, options, null, src)); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java index fcc563a17..5a715323e 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java @@ -6,7 +6,7 @@ import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import java.util.Arrays; +import java.util.Collections; /** * Gets a value from local variable and removes it. @@ -30,5 +30,5 @@ public Next eval(Env e, final Continuation k) { /** * CPS Definition of the {@link Continuable#suspend(Object)} method. */ - public static final CpsFunction SUSPEND = new CpsFunction(Arrays.asList("suspendValue"),new SuspendBlock()); + public static final CpsFunction SUSPEND = new CpsFunction(Collections.singletonList("suspendValue"),new SuspendBlock()); } diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java index a1c07fa16..58b3c0b8b 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java @@ -462,7 +462,7 @@ public void namedSoleParamForStep() throws Exception { assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); assertThat(stepWarning.getStepName(), is(shellStep)); - assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); + assertThat(stepWarning.getInterpolatedVariables(), is(Collections.singletonList("PASSWORD"))); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate(shellStep)); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); @@ -492,7 +492,7 @@ public void namedSoleParamForStep() throws Exception { assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); assertThat(stepWarning.getStepName(), is("archiveArtifacts")); - assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); + assertThat(stepWarning.getInterpolatedVariables(), is(Collections.singletonList("PASSWORD"))); } @Test public void multipleSensitiveVariables() throws Exception { @@ -549,7 +549,7 @@ public void namedSoleParamForStep() throws Exception { assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); assertThat(stepWarning.getStepName(), is("monomorphWithSymbolStep")); - assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); + assertThat(stepWarning.getInterpolatedVariables(), is(Collections.singletonList("PASSWORD"))); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate("monomorphWithSymbolStep")); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); @@ -632,7 +632,7 @@ public void namedSoleParamForStep() throws Exception { assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); assertThat(stepWarning.getStepName(), is(shellStep)); - assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD"))); + assertThat(stepWarning.getInterpolatedVariables(), is(Collections.singletonList("PASSWORD"))); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate(shellStep)); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java index be1a7b85e..489489650 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java @@ -281,7 +281,7 @@ public void oversizedMap() { @Test public void oversizedList() { ArgumentsActionImpl impl = new ArgumentsActionImpl(Collections.emptySet()); - List unsanitized = Arrays.asList(generateStringOfSize(ArgumentsActionImpl.getMaxRetainedLength())); + List unsanitized = Collections.singletonList(generateStringOfSize(ArgumentsActionImpl.getMaxRetainedLength())); Object sanitized = impl.sanitizeListAndRecordMutation(unsanitized, null); Assert.assertEquals(ArgumentsAction.NotStoredReason.OVERSIZE_VALUE, sanitized); } @@ -529,7 +529,7 @@ public void testSpecialMetastepCases() throws Exception { assertEquals(true, args.get("moderate")); Map stateArgs = (Map)args.get("state"); assertTrue("Nested state Describable should only include a class argument or none at all", - stateArgs.size() <= 1 && Sets.difference(stateArgs.keySet(), new HashSet<>(Arrays.asList("$class"))).size() == 0); + stateArgs.size() <= 1 && Sets.difference(stateArgs.keySet(), new HashSet<>(Collections.singletonList("$class"))).size() == 0); // Same metastep but only one arg supplied, shouldn't auto-unwrap the internal step because can take 2 args job = r.createProject(WorkflowJob.class); From 823a17e4fa2ef185ff1c9a994b732e481819cb41 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 10:27:50 -0700 Subject: [PATCH 774/932] Access static method via class reference rather than instance reference --- .../plugins/workflow/cps/actions/ArgumentsActionImplTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java index 489489650..0a92a2357 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java @@ -484,7 +484,7 @@ public void testBasicCredentials() throws Exception { WorkflowRun run = job.scheduleBuild2(0).getStartCondition().get(); r.waitForCompletion(run); FlowExecution exec = run.getExecution(); - String log = r.getLog(run); + String log = JenkinsRule.getLog(run); ForkScanner scanner = new ForkScanner(); List filtered = scanner.filteredNodes(exec, new DescriptorMatchPredicate(BindingStep.DescriptorImpl.class)); From 8bf3888b3d974436f7a236c524ea2c4417687665 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 10:33:30 -0700 Subject: [PATCH 775/932] Improve error message --- .../org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index 1db7a6996..2d1e883b3 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -301,7 +301,7 @@ static void waitForBuildToResumeOrFail(WorkflowRun run) throws Exception { if (TimeUnit.SECONDS.convert(currentTime-nanoStartTime, TimeUnit.NANOSECONDS) > 10) { StringBuilder builder = new StringBuilder(); builder.append("Run result: "+run.getResult()); - builder.append(" and execution != null:"+run.getExecution() != null+" "); + builder.append(" and execution != null:"+(run.getExecution() != null)); FlowExecution exec = run.getExecution(); if (exec instanceof CpsFlowExecution) { CpsFlowExecution cpsFlow = (CpsFlowExecution)exec; From b9893bfde1b12b31c4ebb0fa6b033eeb66b71c02 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 5 Nov 2022 10:03:50 -0700 Subject: [PATCH 776/932] Remove unused imports --- .../src/main/java/com/cloudbees/groovy/cps/tool/Driver.java | 1 - lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java | 5 ----- lib/src/main/java/com/cloudbees/groovy/cps/Outcome.java | 3 --- .../java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java | 1 - .../com/cloudbees/groovy/cps/impl/MethodPointerBlock.java | 2 -- .../main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java | 1 - .../cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java | 1 - 7 files changed, 14 deletions(-) diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java index f9de0efa2..3b42232a6 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java @@ -13,7 +13,6 @@ import java.io.File; import java.nio.charset.Charset; import java.nio.file.Files; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java index fbeb15f19..b5a0753ee 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -1,11 +1,8 @@ package com.cloudbees.groovy.cps; -import com.cloudbees.groovy.cps.impl.ConstantBlock; import com.cloudbees.groovy.cps.impl.CpsCallableInvocation; import com.cloudbees.groovy.cps.impl.SuspendBlock; -import com.cloudbees.groovy.cps.impl.ThrowBlock; import com.cloudbees.groovy.cps.sandbox.Invoker; -import com.google.common.base.Function; import groovy.lang.GroovyShell; import groovy.lang.Script; @@ -16,9 +13,7 @@ import java.util.ArrayList; import java.util.List; -import static com.cloudbees.groovy.cps.impl.SourceLocation.UNKNOWN; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import groovy.lang.Closure; import org.codehaus.groovy.runtime.GroovyCategorySupport; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Outcome.java b/lib/src/main/java/com/cloudbees/groovy/cps/Outcome.java index 2feeff160..578351235 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Outcome.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Outcome.java @@ -1,14 +1,11 @@ package com.cloudbees.groovy.cps; import com.cloudbees.groovy.cps.impl.ConstantBlock; -import com.cloudbees.groovy.cps.impl.SourceLocation; import com.cloudbees.groovy.cps.impl.ThrowBlock; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; -import static com.cloudbees.groovy.cps.impl.SourceLocation.UNKNOWN; - /** * Result of an evaluation. * diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java index 6fcca8809..267f1be58 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/DoWhileBlock.java @@ -4,7 +4,6 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import java.util.function.Function; /** * do { ... } while ( ... ); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java index 0aabad623..5cb30b95a 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java @@ -5,11 +5,9 @@ import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; import com.cloudbees.groovy.cps.sandbox.CallSiteTag; -import com.cloudbees.groovy.cps.sandbox.Invoker; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collection; import java.util.Collections; -import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.MethodClosure; /** diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java index 24399ddec..5f6025b6a 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java @@ -7,7 +7,6 @@ import com.cloudbees.groovy.cps.Next; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static com.cloudbees.groovy.cps.impl.SourceLocation.*; diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java index 738a21709..46c869455 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java @@ -2,7 +2,6 @@ import java.math.BigDecimal; import java.util.AbstractMap; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; From 69887289a1ea63f003c7a52a2e22f2db3a8e60a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 00:05:07 +0000 Subject: [PATCH 777/932] Bump exec-maven-plugin from 1.6.0 to 3.1.0 Bumps [exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 1.6.0 to 3.1.0. - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/exec-maven-plugin-1.6.0...exec-maven-plugin-3.1.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pom.xml b/lib/pom.xml index af333de78..c2ebcc65d 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -37,7 +37,7 @@ org.codehaus.mojo exec-maven-plugin - 1.6.0 + 3.1.0 generate-sources From 81c4f89107fef5f1ac661e9a04b1ccb6302d48ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 00:05:14 +0000 Subject: [PATCH 778/932] Bump bom-2.346.x from 1654.vcb_69d035fa_20 to 1670.v7f165fc7a_079 Bumps [bom-2.346.x](https://github.com/jenkinsci/bom) from 1654.vcb_69d035fa_20 to 1670.v7f165fc7a_079. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.346.x dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 9d23bab80..8fc53c12c 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -51,7 +51,7 @@ io.jenkins.tools.bom bom-2.346.x - 1654.vcb_69d035fa_20 + 1670.v7f165fc7a_079 import pom From 026c94821d8255000cc4b26de57eb44fb1fdb75d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 00:05:56 +0000 Subject: [PATCH 779/932] Bump groovy-sandbox.version from 1.30 to 1.31 Bumps `groovy-sandbox.version` from 1.30 to 1.31. Updates `groovy-sandbox` from 1.30 to 1.31 - [Release notes](https://github.com/jenkinsci/pom/releases) - [Changelog](https://github.com/jenkinsci/pom/blob/master/CHANGELOG-old.md) - [Commits](https://github.com/jenkinsci/pom/compare/jenkins-1.30...jenkins-1.31) Updates `groovy-sandbox` from 1.30 to 1.31 - [Release notes](https://github.com/jenkinsci/pom/releases) - [Changelog](https://github.com/jenkinsci/pom/blob/master/CHANGELOG-old.md) - [Commits](https://github.com/jenkinsci/pom/compare/jenkins-1.30...jenkins-1.31) --- updated-dependencies: - dependency-name: org.kohsuke:groovy-sandbox dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.kohsuke:groovy-sandbox:tests dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pom.xml b/lib/pom.xml index af333de78..47e5b5675 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -60,7 +60,7 @@ - 1.30 + 1.31 false From c5c86cf5dbc4b8a55d93d160d3e5bb8a26c19322 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 7 Nov 2022 09:53:13 -0500 Subject: [PATCH 780/932] Make Dependabot ignore Groovy updates --- .github/dependabot.yml | 2 ++ pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fe09c4629..f488c4b57 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,8 @@ updates: directory: "/" schedule: interval: "weekly" + ignore: + - dependency-name: org.codehaus.groovy:groovy - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/pom.xml b/pom.xml index 742c8563b..92a7df0e2 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin 2.346.3 - 2.4.21 + 2.4.21 dgm-builder From 4f18c0124c024626c15c83f6aaf47247fb0ca07c Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 7 Nov 2022 09:53:37 -0500 Subject: [PATCH 781/932] Pick up remoting version from Jenkins core BOM --- dgm-builder/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index a019577dc..5828d519c 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -69,7 +69,6 @@ org.jenkins-ci.main remoting - 4.13.3 org.codehaus.groovy From f62f1822b01c59660d1a76b094e2407307bd36f0 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 7 Nov 2022 17:22:51 -0500 Subject: [PATCH 782/932] Fix Javadoc errors by importing linked clases and switching some links to just be code formatting instead --- .../main/java/com/cloudbees/groovy/cps/impl/SpreadBlock.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadBlock.java index 3cbb12b60..80c84fed1 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SpreadBlock.java @@ -2,6 +2,7 @@ import com.cloudbees.groovy.cps.Block; import com.cloudbees.groovy.cps.Continuation; +import com.cloudbees.groovy.cps.CpsTransformer; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; import java.io.Serializable; @@ -20,7 +21,7 @@ * but with a {@code groovy-cps}-specific {@link SpreadList} marker class. * *

We use a marker class because we cannot easily mimic the way that Groovy normally handles {@link SpreadExpression}. - * To do so, we would need modifications to {@link CpsTransformer} for list and argument list visitors akin to {@link AsmClassGenerator.despreadList}, + * To do so, we would need modifications to {@link CpsTransformer} for list and argument list visitors akin to {@code AsmClassGenerator.despreadList}, * a new implementation of {@link Block} that would fix those expressions and then call {@link ScriptBytecodeAdapter#despreadList}, * and a variant of {@link FunctionCallBlock} that takes a single {@link Block} which is expected to evaluate to {@code Object[]} * (rather than a {@code Block[]}) so that the result of {@code despreadList} can be used directly as the arguments array From 3f3706c46f9744e4afad8ef30168626e7e90df0d Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Wed, 9 Nov 2022 11:35:48 -0500 Subject: [PATCH 783/932] Convert GStringImpl to String in the RHS of CPS-transformed method pointers (#614) --- .../groovy/cps/impl/MethodPointerBlock.java | 4 ++++ .../groovy/cps/sandbox/SandboxInvokerTest.java | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java index 0aabad623..de033e1cb 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/MethodPointerBlock.java @@ -7,6 +7,7 @@ import com.cloudbees.groovy.cps.sandbox.CallSiteTag; import com.cloudbees.groovy.cps.sandbox.Invoker; import edu.umd.cs.findbugs.annotations.NonNull; +import groovy.lang.GString; import java.util.Collection; import java.util.Collections; import org.codehaus.groovy.runtime.InvokerHelper; @@ -64,6 +65,9 @@ public Next fixLhs(Object lhs) { * Obtain a method pointer, which is really just a {@link MethodClosure}. */ public Next done(Object methodName) { + if (methodName instanceof GString) { + methodName = methodName.toString(); + } return k.receive(e.getInvoker().contextualize(MethodPointerBlock.this).methodPointer(lhs, (String)methodName)); } diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java index 6d9da7158..e29efd272 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java @@ -680,4 +680,19 @@ public void sandboxInterceptsImplicitCastsArrayAssignment() throws Throwable { "LinkedHashMap.asBoolean()"); } + @Test public void dynamicMethodPointer() throws Throwable { + assertIntercept( + "def method3() {\n" + + " true\n" + + "}\n" + + "def mp = this.&/method${1 + 2}/\n" + + "mp()", + true, + "Script1.super(Script1).setBinding(Binding)", + "Integer.plus(Integer)", + "new GStringImpl(Object[],String[])", + "SandboxedMethodClosure.call()", + "Script1.method3()"); + } + } From 3be8544da9390c3049e29f335b7e184f5bcbda07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 16:43:09 +0000 Subject: [PATCH 784/932] Bump svnkit-cli from 1.10.8 to 1.10.9 Bumps svnkit-cli from 1.10.8 to 1.10.9. --- updated-dependencies: - dependency-name: org.tmatesoft.svnkit:svnkit-cli dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 8fc53c12c..74bc3c8e8 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -267,7 +267,7 @@ org.tmatesoft.svnkit svnkit-cli - 1.10.8 + 1.10.9 test From 67a4565c5c88d26f561f6053aa1f19036f1fe210 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sun, 13 Nov 2022 11:05:39 -0800 Subject: [PATCH 785/932] Reduce reflection in `CpsFlowExecution` --- .../jenkinsci/plugins/workflow/cps/CpsFlowExecution.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 4f9344355..669fda72b 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -1483,6 +1483,13 @@ private static void cleanUpClassHelperCache(@NonNull Class clazz) throws Exce } private static void cleanUpObjectStreamClassCaches(@NonNull Class clazz) throws Exception { + int releaseVersion = JavaSpecificationVersion.forCurrentJVM().toReleaseVersion(); + VersionNumber javaVersion = new VersionNumber(System.getProperty("java.version")); + if ((releaseVersion < 11) + || (releaseVersion == 11 && javaVersion.isOlderThan(new VersionNumber("11.0.16"))) + || (releaseVersion > 11 && releaseVersion < 17) + || (releaseVersion == 17 && javaVersion.isOlderThan(new VersionNumber("17.0.4"))) + || (releaseVersion == 18 && javaVersion.isOlderThan(new VersionNumber("18.0.2")))) { Class cachesC = Class.forName("java.io.ObjectStreamClass$Caches"); for (String cacheFName : new String[] {"localDescs", "reflectors"}) { Field cacheF = cachesC.getDeclaredField(cacheFName); @@ -1500,6 +1507,7 @@ private static void cleanUpObjectStreamClassCaches(@NonNull Class clazz) thro } } } + } } synchronized @CheckForNull FlowHead getFirstHead() { From a383b02b51bec5fc09e7ba3c1fd4421ea40e899c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 00:11:46 +0000 Subject: [PATCH 786/932] Bump plugin from 4.49 to 4.51 Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.49 to 4.51. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.49...plugin-4.51) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92a7df0e2..1d3987942 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.49 + 4.51 org.jenkins-ci.plugins.workflow From cbcc415904d580e093c2bae8b81d6d52ab9409ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 00:11:58 +0000 Subject: [PATCH 787/932] Bump testcontainers from 1.17.5 to 1.17.6 Bumps [testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.17.5 to 1.17.6. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.5...1.17.6) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 8fc53c12c..21223228a 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -250,7 +250,7 @@ org.testcontainers testcontainers - 1.17.5 + 1.17.6 test From 6a757923858a89c4cba3658a1fc15cc3b3ac436f Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 21 Nov 2022 22:21:59 -0800 Subject: [PATCH 788/932] Remove unnecessary SpotBugs exclusions --- .../jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java | 2 +- .../java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java | 1 - .../java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java index 7689348be..ab0800ea8 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java @@ -99,7 +99,7 @@ public boolean isLightweight() { @SuppressFBWarnings( value = {"NP_LOAD_OF_KNOWN_NULL_VALUE", "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", - "RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE", "RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"}, + "RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE"}, justification = "false positives for try-resource in java 11" ) @Override public CpsFlowExecution create(FlowExecutionOwner owner, TaskListener listener, List actions) throws Exception { diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java index 95abec2f2..25c1f46d4 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java @@ -198,7 +198,6 @@ public class CpsStepContext extends DefaultStepContext { // TODO add XStream cla * This method returns null if the step descriptor used is not recoverable in the current VM session, * such as when the plugin that implements this was removed. So the caller should defend against null. */ - @SuppressFBWarnings(value="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", justification="TODO 1.653+ switch to Jenkins.getInstanceOrNull") public @CheckForNull StepDescriptor getStepDescriptor() { Jenkins j = Jenkins.getInstanceOrNull(); if (j == null) { diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java index 57c5f4dae..b6d0b9cef 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java @@ -554,7 +554,6 @@ void saveProgram() throws IOException { saveProgram(f); } - @SuppressFBWarnings(value="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", justification="TODO 1.653+ switch to Jenkins.getInstanceOrNull") @CpsVmThreadOnly public void saveProgram(File f) throws IOException { File dir = f.getParentFile(); From 6916c5d583f8909d18035ebb518b3aee27691d03 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 3 Dec 2022 13:58:56 -0800 Subject: [PATCH 789/932] Require Java 11 or newer --- dgm-builder/pom.xml | 8 --- .../com/cloudbees/groovy/cps/tool/Driver.java | 12 ++-- .../cloudbees/groovy/cps/tool/Translator.java | 2 +- .../com/cloudbees/groovy/cps/Builder.java | 7 +-- .../com/cloudbees/groovy/cps/Continuable.java | 5 +- .../java/com/cloudbees/groovy/cps/Next.java | 2 +- .../cloudbees/groovy/cps/impl/CastBlock.java | 5 +- .../groovy/cps/impl/ContinuationGroup.java | 4 +- .../groovy/cps/impl/FunctionCallBlock.java | 4 +- .../groovy/cps/impl/SuspendBlock.java | 4 +- .../cloudbees/groovy/cps/impl/ThrowBlock.java | 3 +- .../com/cloudbees/groovy/cps/BasicTest.java | 6 +- .../cps/CpsDefaultGroovyMethodsTest.java | 2 +- .../cps/CpsStringGroovyMethodsTest.java | 5 +- .../groovy/cps/CpsTransformerTest.java | 58 ++++++++++--------- .../cps/impl/FunctionCallBlockTest.java | 2 +- .../groovy/cps/impl/ThrowBlockTest.java | 2 +- .../groovy/cps/impl/TryCatchBlockTest.java | 2 +- .../cps/sandbox/SandboxInvokerTest.java | 3 +- plugin/pom.xml | 2 +- .../workflow/cps/CpsBodyExecution.java | 7 +-- .../plugins/workflow/cps/CpsBodyInvoker.java | 2 +- .../workflow/cps/CpsFlowDefinition.java | 2 +- .../workflow/cps/CpsFlowExecution.java | 36 ++++++------ .../plugins/workflow/cps/CpsStepContext.java | 4 +- .../plugins/workflow/cps/CpsThreadDump.java | 2 +- .../workflow/cps/CpsThreadDumpAction.java | 4 +- .../plugins/workflow/cps/CpsThreadGroup.java | 2 +- .../workflow/cps/CpsVmExecutorService.java | 2 +- .../plugins/workflow/cps/FlowHead.java | 9 +-- .../plugins/workflow/cps/GlobalVariable.java | 8 +-- .../cps/GroovySourceFileAllowlist.java | 2 +- .../plugins/workflow/cps/Snippetizer.java | 4 +- .../cps/actions/ArgumentsActionImpl.java | 2 +- .../workflow/cps/nodes/StepEndNode.java | 2 +- .../cps/persistence/IteratorHack.java | 2 +- .../workflow/cps/replay/ReplayAction.java | 3 +- .../cps/replay/ReplayFlowFactoryAction.java | 3 +- .../DynamicEnvironmentExpanderTest.java | 3 +- .../plugins/workflow/WorkflowTest.java | 6 +- .../workflow/cps/CpsBodyExecutionTest.java | 6 +- .../cps/CpsScmFlowDefinitionTest.java | 8 +-- .../workflow/cps/CpsThreadDumpTest.java | 7 +-- .../plugins/workflow/cps/DSLTest.java | 14 ++--- .../workflow/cps/SandboxContinuableTest.java | 3 +- .../cps/actions/ArgumentsActionImplTest.java | 12 ++-- .../workflow/cps/nodes/StepNodeTest.java | 8 +-- .../workflow/cps/replay/ReplayActionTest.java | 8 +-- .../workflow/cps/steps/ParallelStepTest.java | 10 +--- .../testMetaStep/AmbiguousEchoLowerStep.java | 2 +- .../testMetaStep/AmbiguousEchoUpperStep.java | 2 +- .../workflow/testMetaStep/EchoResultStep.java | 2 +- .../testMetaStep/EchoStringAndDoubleStep.java | 2 +- pom.xml | 4 +- 54 files changed, 158 insertions(+), 173 deletions(-) diff --git a/dgm-builder/pom.xml b/dgm-builder/pom.xml index 5828d519c..82e1e48bf 100644 --- a/dgm-builder/pom.xml +++ b/dgm-builder/pom.xml @@ -22,8 +22,6 @@ - 11 - 11 true @@ -55,12 +53,6 @@ - - - javax.annotation - javax.annotation-api - 1.3.2 - org.kohsuke.codemodel codemodel diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java index 3b42232a6..d05ebe66a 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Driver.java @@ -14,11 +14,9 @@ import java.nio.charset.Charset; import java.nio.file.Files; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; - -import static java.util.Arrays.*; +import java.util.Set; public class Driver { public static void main(String[] args) throws Exception { @@ -31,18 +29,18 @@ public void run(File dir) throws Exception { try (StandardJavaFileManager fileManager = javac.getStandardFileManager(errorListener, Locale.getDefault(), Charset.defaultCharset())) { fileManager.setLocation(StandardLocation.CLASS_PATH, - Collections.singleton(Which.jarFile(GroovyShell.class))); + Set.of(Which.jarFile(GroovyShell.class))); File groovySrcJar = Which.jarFile(Driver.class.getClassLoader().getResource("groovy/lang/GroovyShell.java")); // classes to translate // TODO include other classes mentioned in DefaultGroovyMethods.DGM_LIKE_CLASSES if they have any applicable methods - List fileNames = asList("DefaultGroovyMethods", + List fileNames = List.of("DefaultGroovyMethods", "DefaultGroovyStaticMethods", "StringGroovyMethods"); List src = new ArrayList<>(); - for (JavaFileObject jfo : fileManager.list(StandardLocation.CLASS_PATH, "org.codehaus.groovy.runtime", Collections.singleton(JavaFileObject.Kind.SOURCE), true)) { + for (JavaFileObject jfo : fileManager.list(StandardLocation.CLASS_PATH, "org.codehaus.groovy.runtime", Set.of(JavaFileObject.Kind.SOURCE), true)) { for (String name : fileNames) { if (jfo.toUri().toString().endsWith("/org/codehaus/groovy/runtime/" + name + ".java")) { src.add(jfo); @@ -56,7 +54,7 @@ public void run(File dir) throws Exception { // Tree symbols created by the original JavacTask.parse() call to be thrown away, // which breaks later processing. // So for now, don't perform annotation processing - List options = Collections.singletonList("-proc:none"); + List options = List.of("-proc:none"); Translator t = new Translator(javac.getTask(null, fileManager, errorListener, options, null, src)); diff --git a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java index b9ce24afb..ff8320d0b 100644 --- a/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java +++ b/dgm-builder/src/main/java/com/cloudbees/groovy/cps/tool/Translator.java @@ -90,7 +90,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.stream.Collectors; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java index 623dba6d1..77ee87ac4 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -51,7 +51,6 @@ import java.util.*; import static com.cloudbees.groovy.cps.Block.*; -import static java.util.Arrays.*; /** * Builder pattern for constructing {@link Block}s into a tree. @@ -100,7 +99,7 @@ public Builder withClosureType(Class t) { * @see Invoker#contextualize(CallSiteBlock) */ public Builder contextualize(CallSiteTag... tags) { - return new Builder(this,Arrays.asList(tags)); + return new Builder(this,List.of(tags)); } /** @@ -289,7 +288,7 @@ public Block doWhile(String label, Block body, Block cond) { } public Block tryCatch(Block body, Block finally_, CatchExpression... catches) { - return tryCatch(body, asList(catches), finally_); + return tryCatch(body, List.of(catches), finally_); } @@ -723,7 +722,7 @@ public Block gstring(int line, Block listOfValues, Block listOfStrings) { * @see #case_(int, Block, Block) */ public Block switch_(String label, Block switchExp, Block defaultStmt, CaseExpression... caseExps) { - return new SwitchBlock(label, switchExp, defaultStmt, Arrays.asList(caseExps)); + return new SwitchBlock(label, switchExp, defaultStmt, List.of(caseExps)); } public CaseExpression case_(int line, Block matcher, Block body) { diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java index b5a0753ee..88988cd2f 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Continuable.java @@ -13,7 +13,6 @@ import java.util.ArrayList; import java.util.List; -import com.google.common.collect.ImmutableList; import groovy.lang.Closure; import org.codehaus.groovy.runtime.GroovyCategorySupport; @@ -25,7 +24,7 @@ public class Continuable implements Serializable { @SuppressWarnings("rawtypes") - public static final List categories = ImmutableList.of( + public static final List categories = List.of( CpsDefaultGroovyMethods.class, CpsDefaultGroovyStaticMethods.class, CpsStringGroovyMethods.class); @@ -144,7 +143,7 @@ public Outcome run0(final Outcome cn) { * throwing an exception */ public Outcome run0(final Outcome cn, List categories) { - return GroovyCategorySupport.use(categories, new Closure(null) { + return GroovyCategorySupport.use(categories, new Closure<>(null) { @Override public Outcome call() { Next n = cn.resumeFrom(e,k); diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Next.java b/lib/src/main/java/com/cloudbees/groovy/cps/Next.java index f66b11f10..189d7d8f6 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Next.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Next.java @@ -57,7 +57,7 @@ public Next run() { /** for testing only */ public Outcome run(final int max) { - return GroovyCategorySupport.use(Continuable.categories, new Closure(null) { + return GroovyCategorySupport.use(Continuable.categories, new Closure<>(null) { @Override public Outcome call() { int remaining = max; diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java index f4ee32423..40c3df34c 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java @@ -5,6 +5,7 @@ import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; import java.util.Collections; +import java.util.List; import org.codehaus.groovy.runtime.InvokerInvocationException; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; @@ -45,7 +46,7 @@ public Next cast(Object value) { } catch (CpsCallableInvocation inv) { // Implementations of asType and other methods used by the Groovy stdlib should be @NonCPS, but we // just log a warning and invoke the callable anyway to maintain the existing behavior. - inv.checkMismatch(ScriptBytecodeAdapter.class, Collections.singletonList(coerce ? "asType" : "castToType")); + inv.checkMismatch(ScriptBytecodeAdapter.class, List.of(coerce ? "asType" : "castToType")); return inv.invoke(e, loc, k); } catch (Throwable t) { if (t instanceof InvokerInvocationException) { @@ -56,7 +57,7 @@ public Next cast(Object value) { Throwable cause = t.getCause(); if (cause instanceof CpsCallableInvocation) { CpsCallableInvocation inv = (CpsCallableInvocation)cause; - inv.checkMismatch(ScriptBytecodeAdapter.class, Collections.singletonList(coerce ? "asType" : "castToType")); + inv.checkMismatch(ScriptBytecodeAdapter.class, List.of(coerce ? "asType" : "castToType")); String classAndMethod = inv.getClassAndMethodForDisplay(); t = new IllegalStateException(classAndMethod + " must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/"); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java index c4a087bb1..2b7ea7083 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ContinuationGroup.java @@ -143,7 +143,7 @@ private void fixupStackTrace(Env e, Throwable t, SourceLocation loc, ReferenceSt to show how the actual execution happened on JVM */ - List orig = Arrays.asList(ts); + List orig = List.of(ts); int pos = ts.length-rs.length; List stack = new ArrayList<>(orig.subList(0,pos)); @@ -238,7 +238,7 @@ protected Next castToBoolean(Object value, Env e, Function fn) { Throwable cause = t.getCause(); if (cause instanceof CpsCallableInvocation) { CpsCallableInvocation inv = (CpsCallableInvocation)cause; - inv.checkMismatch(ScriptBytecodeAdapter.class, Collections.singletonList("castToType")); + inv.checkMismatch(ScriptBytecodeAdapter.class, List.of("castToType")); String classAndMethod = inv.getClassAndMethodForDisplay(); t = new IllegalStateException(classAndMethod + " must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/"); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java index ae8c4736e..68729269a 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java @@ -100,7 +100,7 @@ private Next dispatchOrArg() { v = e.getInvoker().contextualize(FunctionCallBlock.this).constructorCall((Class)lhs, expandedArgs); } catch (Throwable t) { if (t instanceof CpsCallableInvocation) { - ((CpsCallableInvocation) t).checkMismatch(lhs, Collections.singletonList(name)); + ((CpsCallableInvocation) t).checkMismatch(lhs, List.of(name)); } return throwException(e, t, loc, new ReferenceStackTrace()); } @@ -130,7 +130,7 @@ private void fillInStackTrace(Env e, Throwable t) { stack.add((loc!=null ? loc : UNKNOWN).toStackTrace()); e.buildStackTraceElements(stack,Integer.MAX_VALUE); stack.add(Continuable.SEPARATOR_STACK_ELEMENT); - stack.addAll(Arrays.asList(t.getStackTrace())); + stack.addAll(List.of(t.getStackTrace())); t.setStackTrace(stack.toArray(new StackTraceElement[stack.size()])); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java index 5a715323e..830bc3ce4 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/SuspendBlock.java @@ -6,7 +6,7 @@ import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import java.util.Collections; +import java.util.List; /** * Gets a value from local variable and removes it. @@ -30,5 +30,5 @@ public Next eval(Env e, final Continuation k) { /** * CPS Definition of the {@link Continuable#suspend(Object)} method. */ - public static final CpsFunction SUSPEND = new CpsFunction(Collections.singletonList("suspendValue"),new SuspendBlock()); + public static final CpsFunction SUSPEND = new CpsFunction(List.of("suspendValue"),new SuspendBlock()); } diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java index 5f6025b6a..b192df56b 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/ThrowBlock.java @@ -10,7 +10,6 @@ import java.util.List; import static com.cloudbees.groovy.cps.impl.SourceLocation.*; -import static java.util.Arrays.asList; /** * @author Kohsuke Kawaguchi @@ -58,7 +57,7 @@ public Next receive(Object t) { stack.add((loc!=null ? loc : UNKNOWN).toStackTrace()); e.buildStackTraceElements(stack,Integer.MAX_VALUE); stack.add(Continuable.SEPARATOR_STACK_ELEMENT); - stack.addAll(asList(throwable.getStackTrace())); + stack.addAll(List.of(throwable.getStackTrace())); throwable.setStackTrace(stack.toArray(new StackTraceElement[stack.size()])); } diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/BasicTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/BasicTest.java index 9c57a7570..f5694aa5b 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/BasicTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/BasicTest.java @@ -6,8 +6,8 @@ import org.junit.Test; import java.lang.reflect.InvocationTargetException; +import java.util.List; -import static java.util.Arrays.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -131,7 +131,7 @@ private void if_(boolean cond, int expected) { public void asyncCallingAsync() { class Op { public int add(int x, int y) { - CpsFunction f = new CpsFunction(asList("x", "y"), + CpsFunction f = new CpsFunction(List.of("x", "y"), b.sequence( b.setLocalVariable(0, "z", b.functionCall(0, $x, "plus", $y)), b.return_($z) @@ -212,7 +212,7 @@ class Op { */ public void throw_(int depth, String message) { Block $depth = b.localVariable("depth"); - CpsFunction f = new CpsFunction(asList("depth", "message"), + CpsFunction f = new CpsFunction(List.of("depth", "message"), b.block( b.if_(b.lessThan(0, b.zero(), $depth), b.functionCall(0, b.this_(), "throw_", b.minus(0, $depth, b.one()), b.localVariable("message")), diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java index 46c869455..44916cb9e 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsDefaultGroovyMethodsTest.java @@ -379,6 +379,6 @@ private static Map.Entry mapEntry(A key, B value) { } private static Set set(Object... values) { - return new HashSet<>(asList(values)); + return new HashSet<>(List.of(values)); } } diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.java index 9084abcbc..fbd2139f7 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsStringGroovyMethodsTest.java @@ -1,6 +1,7 @@ package com.cloudbees.groovy.cps; import java.util.Arrays; +import java.util.List; import org.junit.Ignore; import org.junit.Test; @@ -27,9 +28,9 @@ public void find() throws Throwable { @Test public void findAll() throws Throwable { - assertEvaluate(Arrays.asList("oof", "oof", "oof"), + assertEvaluate(List.of("oof", "oof", "oof"), "'foobarfoobarfoo'.findAll('foo') { it.reverse() }"); - assertEvaluate(Arrays.asList("oof", "oof", "oof"), + assertEvaluate(List.of("oof", "oof", "oof"), "'foobarfoobarfoo'.findAll(~/foo/) { it.reverse() }"); } diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java index 021d1a709..9b80f2005 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java @@ -6,6 +6,8 @@ import java.math.BigDecimal; import java.util.Arrays; import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.Locale; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -390,7 +392,7 @@ public void ternaryOp2() throws Throwable { @Test public void ternaryOp3() throws Throwable { - assertEvaluate(Arrays.asList("ok", 2), "def x = 'ok'; def y = null; [x ?: 1, y ?: 2]"); + assertEvaluate(List.of("ok", 2), "def x = 'ok'; def y = null; [x ?: 1, y ?: 2]"); } @Test @@ -500,7 +502,7 @@ public void bitShift() throws Throwable { assertEvaluate(2147483647, "-1>>>1"); assertEvaluate(2147483647, "x=-1; x>>>=1; x"); - assertEvaluate(Arrays.asList("hello", "world"), "x=[]; x<<'hello'; x<<'world'; x"); + assertEvaluate(List.of("hello", "world"), "x=[]; x<<'hello'; x<<'world'; x"); } @Test @@ -525,7 +527,7 @@ public void regexpOperator() throws Throwable { @Test public void arrayPassedToMethod() throws Throwable { assertEvaluate(4, "def m(x) {x.size()}; def a = [1, 2]; a.size() + m(a)"); // control case - assertEvaluate(4, "def m(x) {x.size()}; def a = [1, 2].toArray(); a.length + m(Arrays.asList(a))"); // workaround #1 + assertEvaluate(4, "def m(x) {x.size()}; def a = [1, 2].toArray(); a.length + m(List.of(a))"); // workaround #1 assertEvaluate(4, "@NonCPS def m(x) {x.length}; def a = [1, 2].toArray(); a.length + m(a)"); // workaround #2 assertEvaluate(4, "def m(x) {x.length}; def a = [1, 2].toArray(); a.length + m(a)"); // formerly: groovy.lang.MissingPropertyException: No such property: length for class: java.lang.Integer } @@ -545,7 +547,7 @@ public void currying() throws Throwable { @Issue("JENKINS-28277") @Test public void ncurrying_native_closure() throws Throwable { - assertEvaluate(Arrays.asList(-3, 2), + assertEvaluate(List.of(-3, 2), "@NonCPS\n" + "def makeNativeClosure() {\n" + " Collections.&binarySearch\n" + @@ -591,17 +593,17 @@ public void nonField() throws Throwable { @Test public void method_pointer() throws Throwable { // method pointer to a native static method - assertEvaluate(Arrays.asList(3, 7), + assertEvaluate(List.of(3, 7), "def add = CpsTransformerTest.&add\n" + "return [ add(1,2), add(3,4) ]\n"); // method pointer to a native instance method - assertEvaluate(Arrays.asList(true, false), + assertEvaluate(List.of(true, false), "def contains = 'foobar'.&contains\n" + "return [ contains('oo'), contains('xyz') ]\n"); // method pointer to a CPS transformed method - assertEvaluate(Arrays.asList(1101, 10011), + assertEvaluate(List.of(1101, 10011), "class X {\n" + " int z;\n" + " X(int z) { this.z = z; }\n" + @@ -782,7 +784,7 @@ public void category() throws Throwable { @Issue("JENKINS-38268") @Test public void lexicalScope() throws Throwable { - assertEvaluate(Arrays.asList(1, 1), + assertEvaluate(List.of(1, 1), "def a = [id: 'a', count: 0]\n" + "def b = [id: 'b', count: 0]\n" + "def toRun = [a, b].collect { thing -> return { thing.count = thing.count + 1 } }\n" + @@ -942,19 +944,19 @@ public void synchronizedStatement() throws Throwable { "int[]" // Primitive array }; for (String decl : declarations) { - assertEvaluate(Arrays.asList(1, 2, 3, 4, 5), + assertEvaluate(List.of(1, 2, 3, 4, 5), decl + " x = [1, 2, 3]\n" + "return [*x, 4, 5]\n"); - assertEvaluate(Arrays.asList(4, 1, 2, 3, 5), + assertEvaluate(List.of(4, 1, 2, 3, 5), decl + " x = [1, 2, 3]\n" + "return [4, *x, 5]\n"); - assertEvaluate(Arrays.asList(4, 5, 1, 2, 3), + assertEvaluate(List.of(4, 5, 1, 2, 3), decl + " x = [1, 2, 3]\n" + "return [4, 5, *x]\n"); - assertEvaluate(Arrays.asList(1, 2, 3), + assertEvaluate(List.of(1, 2, 3), decl + " x = [1, 2, 3]\n" + "return [*x]\n"); - assertEvaluate(Arrays.asList(1, 2, 3, 4, 5, 6, 7), + assertEvaluate(List.of(1, 2, 3, 4, 5, 6, 7), decl + " x = [2, 3]\n" + decl + " y = [5, 6]\n" + "return [1, *x, 4, *y, 7]\n"); @@ -975,19 +977,19 @@ public void synchronizedStatement() throws Throwable { "int[]" // Primitive array }; for (String decl : declarations) { - assertEvaluate(Arrays.asList(1, 2, 3), + assertEvaluate(List.of(1, 2, 3), decl + " x = [1, 2, 3]\n" + "def id(a, b, c) { [a, b, c] }\n" + "return id(*x)\n"); - assertEvaluate(Arrays.asList(1, 2, 3), + assertEvaluate(List.of(1, 2, 3), decl + " x = [2, 3]\n" + "def id(a, b, c) { [a, b, c] }\n" + "return id(1, *x)\n"); - assertEvaluate(Arrays.asList(1, 2, 3), + assertEvaluate(List.of(1, 2, 3), decl + " x = [1, 2]\n" + "def id(a, b, c) { [a, b, c] }\n" + "return id(*x, 3)\n"); - assertEvaluate(Arrays.asList(1, 2, 3), + assertEvaluate(List.of(1, 2, 3), decl + " x = [2]\n" + "def id(a, b, c) { [a, b, c] }\n" + "return id(1, *x, 3)\n"); @@ -1021,7 +1023,7 @@ public void synchronizedStatement() throws Throwable { "return [a: 1, *:x, d: 4, *:y, g: 7]\n"); // When used in method call arguments, *:map is the same as map, except for creating an instance of SpreadMap. // IDK why Groovy even allows the spread syntax here. - assertEvaluate(Collections.singletonMap("a", 1), + assertEvaluate(Map.of("a", 1), "def x = [a: 1]\n" + "def id(def m) { m }\n" + "return id(*:x)\n"); @@ -1043,7 +1045,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { } @Test public void methodsWithInitialExpressionsAreExpandedToCorrectOverloads() throws Throwable { - assertEvaluate(Arrays.asList("abc", "xbc", "xyc", "xyz"), + assertEvaluate(List.of("abc", "xbc", "xyc", "xyz"), "def m2(a = 'a', b = 'b', c = 'c') {\n" + " a + b + c\n" + "}\n" + @@ -1052,7 +1054,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "def r3 = m2('x', 'y')\n" + "def r4 = m2('x', 'y', 'z')\n" + "[r1, r2, r3, r4]"); - assertEvaluate(Arrays.asList("abc", "xbc", "xby"), + assertEvaluate(List.of("abc", "xbc", "xby"), "def m2(a = 'a', b, c = 'c') {\n" + " a + b + c\n" + "}\n" + @@ -1063,7 +1065,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { } @Test public void voidMethodsWithInitialExpressionsAreExpandedToCorrectOverloads() throws Throwable { - assertEvaluate(Arrays.asList("abc", "xbc", "xyc", "xyz"), + assertEvaluate(List.of("abc", "xbc", "xyc", "xyz"), "import groovy.transform.Field\n" + "@Field def r = []\n" + "void m2(a = 'a', b = 'b', c = 'c') {\n" + @@ -1074,7 +1076,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "m2('x', 'y')\n" + "m2('x', 'y', 'z')\n" + "r"); - assertEvaluate(Arrays.asList("abc", "xbc", "xby"), + assertEvaluate(List.of("abc", "xbc", "xby"), "import groovy.transform.Field\n" + "@Field def r = []\n" + "void m2(a = 'a', b, c = 'c') {\n" + @@ -1103,7 +1105,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { } @Test public void castToTypeShouldBeUsedForImplicitCasts() throws Throwable { - assertEvaluate(Arrays.asList("toString", "toString", "toString", "asType"), + assertEvaluate(List.of("toString", "toString", "toString", "asType"), "class Test {\n" + " def auditLog = []\n" + " @NonCPS\n" + @@ -1127,7 +1129,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { @Test public void castRelatedMethodsShouldBeNonCps() throws Throwable { // asType CPS (supported (to the extent possible) for compatibility with existing code) - assertEvaluate(Arrays.asList(false, "asType class java.lang.Boolean"), + assertEvaluate(List.of(false, "asType class java.lang.Boolean"), "class Test {\n" + " def auditLog = []\n" + " def asType(Class c) {\n" + @@ -1138,7 +1140,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { "def t = new Test()\n" + "[t as Boolean, t.auditLog[0]]"); // asType NonCPS (preferred) - assertEvaluate(Collections.singletonList("asType class java.lang.Boolean"), + assertEvaluate(List.of("asType class java.lang.Boolean"), "class Test {\n" + " def auditLog = []\n" + " @NonCPS\n" + @@ -1166,7 +1168,7 @@ public void initialExpressionsInMethodsAreCpsTransformed() throws Throwable { ec.checkThat(t.toString(), equalTo("java.lang.IllegalStateException: Test.asBoolean must be @NonCPS; see: https://jenkins.io/redirect/pipeline-cps-method-mismatches/")); }); // asBoolean NonCPS (required) - assertEvaluate(Collections.singletonList("asBoolean"), + assertEvaluate(List.of("asBoolean"), "class Test {\n" + " def auditLog = []\n" + " @NonCPS\n" + @@ -1196,10 +1198,10 @@ public void anonymousClass() throws Throwable { @Issue("JENKINS-62064") @Test public void assignmentExprsEvalToRHS() throws Throwable { - assertEvaluate(Arrays.asList(1, 1, 1), + assertEvaluate(List.of(1, 1, 1), "def a = b = c = 1\n" + "[a, b, c]\n"); - assertEvaluate(Arrays.asList(2, 3, 4), + assertEvaluate(List.of(2, 3, 4), "def a = b = c = 1\n" + "c += b += a += 1\n" + "[a, b, c]\n"); diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java index 5c619216b..904ca8a2e 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/FunctionCallBlockTest.java @@ -47,7 +47,7 @@ public void infiniteRecursion() { @Test public void stackTraceFixup() throws Throwable { - List elements = Arrays.asList((StackTraceElement[]) evalCPSonly( + List elements = List.of((StackTraceElement[]) evalCPSonly( "\n" + "\n" + "def x() {\n" + diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java index af4ab683b..904995dc7 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/ThrowBlockTest.java @@ -21,7 +21,7 @@ public class ThrowBlockTest extends AbstractGroovyCpsTest { @Test public void stackTraceFixup() throws Throwable { - List elements = Arrays.asList((StackTraceElement[]) evalCPSonly( + List elements = List.of((StackTraceElement[]) evalCPSonly( "\n" + "\n" + "def x() {\n" + diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java index e0da2f223..ea7583440 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/impl/TryCatchBlockTest.java @@ -23,7 +23,7 @@ public class TryCatchBlockTest extends AbstractGroovyCpsTest { @Test public void stackTraceFixup() throws Throwable { - List elements = Arrays.asList((StackTraceElement[]) evalCPSonly( + List elements = List.of((StackTraceElement[]) evalCPSonly( "\n" + "\n" + "def x() {\n" + diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java index e29efd272..ae9c3a3ea 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java @@ -26,6 +26,7 @@ import java.io.File; import java.lang.reflect.Field; import java.util.Arrays; +import java.util.List; import java.util.concurrent.atomic.AtomicLong; import org.codehaus.groovy.control.MultipleCompilationErrorsException; import org.codehaus.groovy.runtime.ProxyGeneratorAdapter; @@ -193,7 +194,7 @@ public void mixingTrustedAndUntrusted() throws Throwable { assertIntercept( "trusted.foo(4)", - Arrays.asList(new Point(1, 4), new File("foo")), + List.of(new Point(1, 4), new File("foo")), //"Script1.super(Script1).setBinding(Binding)", "Script2.super(Script2).setBinding(Binding)", "Script2.trusted", diff --git a/plugin/pom.xml b/plugin/pom.xml index 21223228a..8ea7663e4 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -50,7 +50,7 @@ io.jenkins.tools.bom - bom-2.346.x + bom-2.361.x 1670.v7f165fc7a_079 import pom diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java index 585134ac7..94459758b 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java @@ -8,7 +8,6 @@ import com.cloudbees.groovy.cps.impl.FunctionCallEnv; import com.cloudbees.groovy.cps.impl.TryBlockEnv; import com.cloudbees.groovy.cps.sandbox.SandboxInvoker; -import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.FutureCallback; import hudson.model.Action; import hudson.util.Iterators; @@ -197,7 +196,7 @@ public Collection getCurrentExecutions() { } } final CompletableFuture> result = new CompletableFuture<>(); - t.getExecution().runInCpsVmThread(new FutureCallback() { + t.getExecution().runInCpsVmThread(new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup g) { try { List executions = new ArrayList<>(); @@ -249,7 +248,7 @@ public boolean cancel(Throwable error) { } if (t!=null) { - t.getExecution().runInCpsVmThread(new FutureCallback() { + t.getExecution().runInCpsVmThread(new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup g) { // Similar to getCurrentExecutions but we want the raw CpsThread, not a StepExecution; cf. CpsFlowExecution.interrupt @@ -257,7 +256,7 @@ public void onSuccess(CpsThreadGroup g) { for (CpsThread t : thread.group.getThreads()) { m.put(t.head, t); } - for (CpsThread t : Iterators.reverse(ImmutableList.copyOf(m.values()))) { + for (CpsThread t : Iterators.reverse(List.copyOf(m.values()))) { LinearBlockHoppingScanner scanner = new LinearBlockHoppingScanner(); scanner.setup(t.head.get()); for (FlowNode node : scanner) { diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java index 364b50143..b09d93658 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyInvoker.java @@ -151,7 +151,7 @@ public CpsBodyExecution start() { // when this method is called asynchronously, the body is scheduled to run in the same thread // that started run. try { - owner.getExecution().runInCpsVmThread(new FutureCallback() { + owner.getExecution().runInCpsVmThread(new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup g) { CpsThread thread = owner.getThread(g); diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java index 7f8ff700f..02d429ff1 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java @@ -105,7 +105,7 @@ public boolean isSandbox() { // Used only from Groovy tests. public CpsFlowExecution create(FlowExecutionOwner handle, Action... actions) throws IOException { - return create(handle, StreamTaskListener.fromStderr(), Arrays.asList(actions)); + return create(handle, StreamTaskListener.fromStderr(), List.of(actions)); } @Override diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java index 4f9344355..7faabae1a 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java @@ -129,6 +129,7 @@ import java.lang.ref.Reference; import java.lang.ref.WeakReference; import java.lang.reflect.Field; +import java.lang.reflect.InaccessibleObjectException; import java.lang.reflect.Method; import java.util.Collection; import java.util.Date; @@ -476,7 +477,7 @@ public String getScript() { } public Map getLoadedScripts() { - return Collections.unmodifiableMap(new HashMap<>(loadedScripts)); + return Map.copyOf(loadedScripts); } /** @@ -568,9 +569,9 @@ private CpsScript parseScript() throws IOException { s.execution = this; if (false) { System.out.println("scriptName="+s.getClass().getName()); - System.out.println(Arrays.asList(s.getClass().getInterfaces())); - System.out.println(Arrays.asList(s.getClass().getDeclaredFields())); - System.out.println(Arrays.asList(s.getClass().getDeclaredMethods())); + System.out.println(List.of(s.getClass().getInterfaces())); + System.out.println(List.of(s.getClass().getDeclaredFields())); + System.out.println(List.of(s.getClass().getDeclaredMethods())); } return s; } @@ -781,7 +782,7 @@ public void loadProgramAsync(File programDataFile) { Futures.addCallback( r.restorePickles(pickleFutures = new ArrayList<>()), - new FutureCallback() { + new FutureCallback<>() { public void onSuccess(Unmarshaller u) { pickleFutures = null; try { @@ -849,7 +850,7 @@ private void loadProgramFailed(final Throwable problem, SettableFuture() { + runInCpsVmThread(new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup g) { CpsThread t = g.addThread( new Continuable(new ThrowBlock(new ConstantBlock( @@ -878,7 +879,7 @@ void croak(Throwable t) { } @Override protected void afterStepExecutionsResumed() { - runInCpsVmThread(new FutureCallback() { + runInCpsVmThread(new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup g) { try { if (pausedWhenLoaded) { @@ -918,8 +919,9 @@ void runInCpsVmThread(final FutureCallback callback) { throw new IllegalStateException("build storage unloadable, or build already finished"); } // first we need to wait for programPromise to fullfil CpsThreadGroup, then we need to run in its runner, phew! - Futures.addCallback(programPromise, new FutureCallback() { + Futures.addCallback(programPromise, new FutureCallback<>() { final Exception source = new Exception(); // call stack of this object captures who called this. useful during debugging. + @Override public void onSuccess(final CpsThreadGroup g) { g.runner.submit(new Runnable() { @@ -1009,7 +1011,7 @@ public ListenableFuture> getCurrentExecutions(final boolean } final SettableFuture> r = SettableFuture.create(); - runInCpsVmThread(new FutureCallback() { + runInCpsVmThread(new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup g) { if (innerMostOnly) { @@ -1160,7 +1162,7 @@ public void interrupt(Result result, CauseOfInterruption... causes) throws IOExc final FlowInterruptedException ex = new FlowInterruptedException(result,causes); // stop all ongoing activities - runInCpsVmThread(new FutureCallback() { + runInCpsVmThread(new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup g) { // don't touch outer ones. See JENKINS-26148 @@ -1169,7 +1171,7 @@ public void onSuccess(CpsThreadGroup g) { m.put(t.head, t); } // for each inner most CpsThread, from young to old... - for (CpsThread t : Iterators.reverse(ImmutableList.copyOf(m.values()))) { + for (CpsThread t : Iterators.reverse(List.copyOf(m.values()))) { try { t.stop(ex); } catch (Exception x) { @@ -1412,7 +1414,7 @@ private static void cleanUpClassInfoCache(Class clazz) { Field cacheF = classInfoC.getDeclaredField("CACHE"); try { cacheF.setAccessible(true); - } catch (RuntimeException e) { // TODO Java 9+ InaccessibleObjectException + } catch (InaccessibleObjectException e) { /* * Not running with "--add-opens java.desktop/com.sun.beans.introspect=ALL-UNNAMED". * Until core adds this to its --add-opens configuration, and until that core @@ -1626,7 +1628,7 @@ public void pause(final boolean v) throws IOException { ((AccessControlled) executable).checkPermission(Item.CANCEL); } done = false; - Futures.addCallback(programPromise, new FutureCallback() { + Futures.addCallback(programPromise, new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup g) { if (v) { g.pause(); @@ -1675,7 +1677,7 @@ public void pause(final boolean v) throws IOException { } } cpsExec.checkpoint(true); - cpsExec.runInCpsVmThread(new FutureCallback() { + cpsExec.runInCpsVmThread(new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup g) { LOGGER.fine(() -> "shutting down CPS VM threadin for " + cpsExec); g.shutdown(); @@ -1990,7 +1992,7 @@ public void autopersist(@NonNull FlowNode n) throws IOException { @Extension(optional=true) public static class PipelineTimings extends Component { @Override public Set getRequiredPermissions() { - return Collections.singleton(Jenkins.ADMINISTER); + return Set.of(Jenkins.ADMINISTER); } @Override public String getDisplayName() { @@ -2092,7 +2094,7 @@ private void checkpoint(boolean shuttingDown) { final CompletableFuture myOutcome = new CompletableFuture<>(); LOGGER.log(Level.FINE, "About to try to checkpoint the program for: {0}", this); if (programPromise != null && programPromise.isDone()) { - runInCpsVmThread(new FutureCallback() { + runInCpsVmThread(new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup result) { try { @@ -2165,7 +2167,7 @@ private void checkAndAbortNonresumableBuild() { try { owner.getListener().getLogger().println("Failing build: shutting down controller and build is marked to not resume"); final Throwable x = new FlowInterruptedException(Result.ABORTED); - Futures.addCallback(this.getCurrentExecutions(/* cf. JENKINS-26148 */true), new FutureCallback>() { + Futures.addCallback(this.getCurrentExecutions(/* cf. JENKINS-26148 */true), new FutureCallback<>() { @Override public void onSuccess(List l) { for (StepExecution e : Iterators.reverse(l)) { StepContext context = e.getContext(); diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java index 25c1f46d4..89864685b 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java @@ -378,7 +378,7 @@ private void scheduleNextRun() { } } - flow.runInCpsVmThread(new FutureCallback() { + flow.runInCpsVmThread(new FutureCallback<>() { @CpsVmThreadOnly @Override public void onSuccess(CpsThreadGroup g) { @@ -543,7 +543,7 @@ synchronized R withBodyInvokers(Function, R> action) { return f; } - exec.runInCpsVmThread(new FutureCallback() { + exec.runInCpsVmThread(new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup result) { try { // TODO keep track of whether the program was saved anyway after saveState was called but before now, and do not bother resaving it in that case diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java index 82567cd9c..8d5ac2c0a 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDump.java @@ -71,7 +71,7 @@ private ThreadInfo(List e) { */ public ThreadInfo(Throwable t) { headline = t.toString(); - stack.addAll(Arrays.asList(t.getStackTrace())); + stack.addAll(List.of(t.getStackTrace())); } /** diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java index 3e3eb808a..5b03367f3 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction.java @@ -67,7 +67,7 @@ public String getThreadDump() { @WebMethod(name = "program.xml") public void doProgramDotXml(StaplerRequest req, StaplerResponse rsp) throws Exception { Jenkins.get().checkPermission(Jenkins.RUN_SCRIPTS); CompletableFuture f = new CompletableFuture<>(); - execution.runInCpsVmThread(new FutureCallback() { + execution.runInCpsVmThread(new FutureCallback<>() { @Override public void onSuccess(CpsThreadGroup g) { try { f.complete(g.asXml()); @@ -95,7 +95,7 @@ public String getThreadDump() { @Extension(optional=true) public static class PipelineThreadDump extends Component { @Override public Set getRequiredPermissions() { - return Collections.singleton(Jenkins.ADMINISTER); + return Set.of(Jenkins.ADMINISTER); } @Override public String getDisplayName() { diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java index b6d0b9cef..11c1712b3 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java @@ -489,7 +489,7 @@ private boolean run() { @CpsVmThreadOnly /*package*/ void notifyNewHead(final FlowNode head) { assertVmThread(); - execution.notifyListeners(Collections.singletonList(head), true); + execution.notifyListeners(List.of(head), true); synchronized (nodesToNotifyLock) { if (nodesToNotify == null) { nodesToNotify = new ArrayList<>(); diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java index 47298495c..5850b3e9e 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java @@ -59,7 +59,7 @@ private void reportProblem(Throwable t) { @Override protected Callable wrap(final Callable r) { - return new Callable() { + return new Callable<>() { @Override public V call() throws Exception { ThreadContext context = setUp(); diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java index bcb588d55..6ef5290ba 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/FlowHead.java @@ -32,6 +32,7 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Collections; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -124,8 +125,8 @@ void newStartNode(FlowStartNode n) throws IOException { // in recovering from error and such situation, we sometimes need to grow the graph // without running the program. // TODO can CpsThreadGroup.notifyNewHead be used instead to notify both kinds of listeners? - execution.notifyListeners(Collections.singletonList(head), true); - execution.notifyListeners(Collections.singletonList(head), false); + execution.notifyListeners(List.of(head), true); + execution.notifyListeners(List.of(head), false); } } @@ -159,8 +160,8 @@ void setNewHead(@NonNull FlowNode v) { // in recovering from error and such situation, we sometimes need to grow the graph // without running the program. // TODO can CpsThreadGroup.notifyNewHead be used instead to notify both kinds of listeners? - execution.notifyListeners(Collections.singletonList(v), true); - execution.notifyListeners(Collections.singletonList(v), false); + execution.notifyListeners(List.of(v), true); + execution.notifyListeners(List.of(v), false); } } diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java index 85c7dee72..6ae0e55f3 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GlobalVariable.java @@ -88,9 +88,9 @@ public abstract class GlobalVariable implements ExtensionPoint { * @return a possibly empty list */ public static @NonNull Iterable forRun(@CheckForNull final Run run) { - return new Iterable() { + return new Iterable<>() { @Override public Iterator iterator() { - return new FlattenIterator(ExtensionList.lookup(GlobalVariableSet.class).iterator()) { + return new FlattenIterator<>(ExtensionList.lookup(GlobalVariableSet.class).iterator()) { @Override protected Iterator expand(GlobalVariableSet vs) { return vs.forRun(run).iterator(); } @@ -105,9 +105,9 @@ public abstract class GlobalVariable implements ExtensionPoint { * @return a possibly empty list */ public static @NonNull Iterable forJob(@CheckForNull final Job job) { - return new Iterable() { + return new Iterable<>() { @Override public Iterator iterator() { - return new FlattenIterator(ExtensionList.lookup(GlobalVariableSet.class).iterator()) { + return new FlattenIterator<>(ExtensionList.lookup(GlobalVariableSet.class).iterator()) { @Override protected Iterator expand(GlobalVariableSet vs) { return vs.forJob(job).iterator(); } diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java index eadaee5da..b9c330256 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/GroovySourceFileAllowlist.java @@ -190,7 +190,7 @@ public DefaultAllowlist() throws IOException { loadDefaultAllowlist(ALLOWED_SOURCE_FILES); // Some plugins use test-specific Groovy DSLs. if (Main.isUnitTest) { - ALLOWED_SOURCE_FILES.addAll(Arrays.asList( + ALLOWED_SOURCE_FILES.addAll(List.of( // pipeline-model-definition "/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelAndOtherFieldAgentScript.groovy", "/org/jenkinsci/plugins/pipeline/modeldefinition/parser/GlobalStageNameTestConditionalScript.groovy", diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java index 6a9de6a56..56e99a1be 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java @@ -510,7 +510,7 @@ public HttpResponse doGenerateSnippet(StaplerRequest req, @QueryParameter String DescribableModel m = DescribableModel.of(d.clazz); DescribableParameter soleRequiredParameter = m.getSoleRequiredParameter(); if (soleRequiredParameter != null) { - step = d.newInstance(Collections.singletonMap(soleRequiredParameter.getName(), o)); + step = d.newInstance(Map.of(soleRequiredParameter.getName(), o)); break; } } @@ -554,7 +554,7 @@ public List getSnippetizerLinks() { @Override public Collection createFor(Job target) { // TODO probably want an API for FlowExecutionContainer or something if (target.getClass().getName().equals("org.jenkinsci.plugins.workflow.job.WorkflowJob") && target.hasPermission(Item.EXTENDED_READ)) { - return Collections.singleton(new LocalAction()); + return Set.of(new LocalAction()); } else { return Collections.emptySet(); } diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java index f80b1cb7b..0d9d58be9 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java @@ -175,7 +175,7 @@ Object sanitizeArrayAndRecordMutation(@NonNull Object[] objects, @CheckForNull E this.isUnmodifiedBySanitization = false; return NotStoredReason.OVERSIZE_VALUE; } - List inputList = Arrays.asList(objects); + List inputList = List.of(objects); Object sanitized = sanitizeListAndRecordMutation(inputList, variables); if (sanitized == inputList) { // Works because if not mutated, we return original input instance return objects; diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepEndNode.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepEndNode.java index 2c9f8df5a..ae06b5ac7 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepEndNode.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepEndNode.java @@ -27,7 +27,7 @@ public StepEndNode(CpsFlowExecution exec, StepStartNode stepStartNode, List Iterator iterator(Set set) { public static Iterator iterator(E[] array) { // TODO as above - return new Itr<>(Arrays.asList(array)); + return new Itr<>(List.of(array)); } public static Iterator iterator(Deque deque) { diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java index 5030cf3ce..207821e47 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java @@ -25,7 +25,6 @@ package org.jenkinsci.plugins.workflow.cps.replay; import com.cloudbees.diff.Diff; -import com.google.common.collect.ImmutableList; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Extension; import hudson.ExtensionList; @@ -233,7 +232,7 @@ public void doRebuild(StaplerRequest req, StaplerResponse rsp) throws ServletExc rsp.sendRedirect("../.."); // back to WorkflowJob; new build might not start instantly so cannot redirect to it } - private static final Iterable> COPIED_ACTIONS = ImmutableList.of( + private static final Iterable> COPIED_ACTIONS = List.of( ParametersAction.class, SCMRevisionAction.class ); diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java index 1a4c497b8..fb6ae3033 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayFlowFactoryAction.java @@ -24,7 +24,6 @@ package org.jenkinsci.plugins.workflow.cps.replay; -import com.google.common.collect.ImmutableSet; import hudson.Extension; import hudson.model.Action; import hudson.model.InvisibleAction; @@ -74,7 +73,7 @@ class ReplayFlowFactoryAction extends InvisibleAction implements CpsFlowFactoryA } Set replaceableScripts() { - return ImmutableSet.copyOf(replacementLoadedScripts.keySet()); + return Set.copyOf(replacementLoadedScripts.keySet()); } @CheckForNull String replace(String clazz) { diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java index a053652d3..f894bdaa6 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/DynamicEnvironmentExpanderTest.java @@ -24,7 +24,6 @@ package org.jenkinsci.plugins.workflow; -import com.google.common.collect.ImmutableSet; import hudson.EnvVars; import hudson.model.EnvironmentContributor; import hudson.model.Run; @@ -204,7 +203,7 @@ protected Void run() throws Exception { @TestExtension("perStepEnvironment") public static class DescriptorImpl extends StepDescriptor { @Override public String getFunctionName() { return "printEnv"; } - @Override public Set> getRequiredContext() { return ImmutableSet.of(EnvVars.class, TaskListener.class); } + @Override public Set> getRequiredContext() { return Set.of(EnvVars.class, TaskListener.class); } } } diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java index 44700a353..99c71aa6d 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java @@ -157,7 +157,7 @@ private void liveness() { @Override public void evaluate() throws Throwable { jenkins().setSecurityRealm(story.j.createDummySecurityRealm()); jenkins().save(); - QueueItemAuthenticatorConfiguration.get().getAuthenticators().add(new MockQueueItemAuthenticator(Collections.singletonMap("demo", User.getById("someone", true).impersonate()))); + QueueItemAuthenticatorConfiguration.get().getAuthenticators().add(new MockQueueItemAuthenticator(Map.of("demo", User.getById("someone", true).impersonate()))); p = jenkins().createProject(WorkflowJob.class, "demo"); p.setDefinition(new CpsFlowDefinition("checkAuth()", false)); ScriptApproval.get().preapproveAll(); @@ -212,7 +212,7 @@ public static final class Execution extends AbstractStepExecutionImpl { } } public static void finish(final boolean terminate) { - StepExecution.applyAll(Execution.class, new Function() { + StepExecution.applyAll(Execution.class, new Function<>() { @Override public Void apply(Execution input) { try { input.listener.getLogger().println((terminate ? "finally" : "still") + " running as " + input.flow.getAuthentication().getName() + " from " + Thread.currentThread().getName()); @@ -234,7 +234,7 @@ public static void finish(final boolean terminate) { @Override public void evaluate() throws Throwable { jenkins().setSecurityRealm(story.j.createDummySecurityRealm()); jenkins().save(); - QueueItemAuthenticatorConfiguration.get().getAuthenticators().add(new MockQueueItemAuthenticator(Collections.singletonMap("demo", User.getById("someone", true).impersonate()))); + QueueItemAuthenticatorConfiguration.get().getAuthenticators().add(new MockQueueItemAuthenticator(Map.of("demo", User.getById("someone", true).impersonate()))); p = jenkins().createProject(WorkflowJob.class, "demo"); p.setDefinition(new CpsFlowDefinition("echo \"ran as ${auth()}\"", true)); b = story.j.assertBuildStatusSuccess(p.scheduleBuild2(0)); diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java index 20f9074ad..175d35a20 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecutionTest.java @@ -85,7 +85,7 @@ public void synchronousExceptionInBody() throws Exception { nodes.add(s); } - assertEquals(Arrays.asList( + assertEquals(List.of( "FlowEndNode", "StepEndNode:synchronousExceptionInBody", // this for the end of invoking a body "StepStartNode:synchronousExceptionInBody", // this for invoking a body @@ -147,7 +147,7 @@ public boolean start() throws Exception { SemaphoreStep.waitForStart("b/1", b); SemaphoreStep.waitForStart("c/1", b); final RetainsBodyStep.Execution[] execs = new RetainsBodyStep.Execution[3]; - StepExecution.applyAll(RetainsBodyStep.Execution.class, new Function() { + StepExecution.applyAll(RetainsBodyStep.Execution.class, new Function<>() { @Override public Void apply(RetainsBodyStep.Execution exec) { execs[exec.count] = exec; return null; @@ -157,7 +157,7 @@ public boolean start() throws Exception { assertNotNull(execs[1]); assertNotNull(execs[2]); final Set semaphores = new HashSet<>(); - StepExecution.applyAll(SemaphoreStep.Execution.class, new Function() { + StepExecution.applyAll(SemaphoreStep.Execution.class, new Function<>() { @Override public Void apply(SemaphoreStep.Execution exec) { if (exec.getStatus().matches("waiting on [ab]/1")) { semaphores.add(exec); diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java index a08a430df..ef2b0585d 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java @@ -233,8 +233,8 @@ public class CpsScmFlowDefinitionTest { sampleRepo.write("flow.groovy", "echo 'version two'"); sampleRepo.git("commit", "--all", "--message=two"); WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p"); - CpsScmFlowDefinition def = new CpsScmFlowDefinition(new GitSCM(Collections.singletonList(new UserRemoteConfig(sampleRepo.fileUrl(), null, null, null)), - Collections.singletonList(new BranchSpec("${VERSION}")), + CpsScmFlowDefinition def = new CpsScmFlowDefinition(new GitSCM(List.of(new UserRemoteConfig(sampleRepo.fileUrl(), null, null, null)), + List.of(new BranchSpec("${VERSION}")), false, Collections.emptyList(), null, null, Collections.emptyList()), "flow.groovy"); def.setLightweight(false); // TODO SCMFileSystem.of cannot pick up build parameters p.setDefinition(def); @@ -252,8 +252,8 @@ public class CpsScmFlowDefinitionTest { sampleRepo.git("add", "otherFlow.groovy"); sampleRepo.git("commit", "--all", "--message=commits"); WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p"); - CpsScmFlowDefinition def = new CpsScmFlowDefinition(new GitSCM(Collections.singletonList(new UserRemoteConfig(sampleRepo.fileUrl(), null, null, null)), - Collections.singletonList(new BranchSpec("master")), + CpsScmFlowDefinition def = new CpsScmFlowDefinition(new GitSCM(List.of(new UserRemoteConfig(sampleRepo.fileUrl(), null, null, null)), + List.of(new BranchSpec("master")), false, Collections.emptyList(), null, null, Collections.emptyList()), "${SCRIPT_PATH}"); p.setDefinition(def); diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java index b65051362..c456b8ad0 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpTest.java @@ -1,7 +1,6 @@ package org.jenkinsci.plugins.workflow.cps; import java.util.ArrayList; -import static java.util.Arrays.asList; import java.util.List; import hudson.model.queue.QueueTaskFuture; @@ -38,7 +37,7 @@ public void setUp() throws Exception { @Test public void simple() throws Exception { - p.setDefinition(new CpsFlowDefinition(StringUtils.join(asList( + p.setDefinition(new CpsFlowDefinition(StringUtils.join(List.of( "def foo() { bar() }", "def bar() {", " semaphore 'x'", @@ -77,7 +76,7 @@ public void simple() throws Exception { @Test public void parallel() throws Exception { - p.setDefinition(new CpsFlowDefinition(StringUtils.join(asList( + p.setDefinition(new CpsFlowDefinition(StringUtils.join(List.of( "def foo(x) { bar(x) }",// 1 "def bar(x) {", " semaphore x", // 3 @@ -153,7 +152,7 @@ public void parallel() throws Exception { } private void assertStackTrace(ThreadInfo t, String... expected) { - assertEquals(asList(expected), toString(t.getStackTrace())); + assertEquals(List.of(expected), toString(t.getStackTrace())); } private List toString(List in) { diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java index 58b3c0b8b..8798fea18 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java @@ -462,7 +462,7 @@ public void namedSoleParamForStep() throws Exception { assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); assertThat(stepWarning.getStepName(), is(shellStep)); - assertThat(stepWarning.getInterpolatedVariables(), is(Collections.singletonList("PASSWORD"))); + assertThat(stepWarning.getInterpolatedVariables(), is(List.of("PASSWORD"))); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate(shellStep)); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); @@ -492,7 +492,7 @@ public void namedSoleParamForStep() throws Exception { assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); assertThat(stepWarning.getStepName(), is("archiveArtifacts")); - assertThat(stepWarning.getInterpolatedVariables(), is(Collections.singletonList("PASSWORD"))); + assertThat(stepWarning.getInterpolatedVariables(), is(List.of("PASSWORD"))); } @Test public void multipleSensitiveVariables() throws Exception { @@ -518,7 +518,7 @@ public void namedSoleParamForStep() throws Exception { assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); assertThat(stepWarning.getStepName(), is(shellStep)); - assertThat(stepWarning.getInterpolatedVariables(), is(Arrays.asList("PASSWORD", "USERNAME"))); + assertThat(stepWarning.getInterpolatedVariables(), is(List.of("PASSWORD", "USERNAME"))); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate(shellStep)); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); @@ -549,7 +549,7 @@ public void namedSoleParamForStep() throws Exception { assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); assertThat(stepWarning.getStepName(), is("monomorphWithSymbolStep")); - assertThat(stepWarning.getInterpolatedVariables(), is(Collections.singletonList("PASSWORD"))); + assertThat(stepWarning.getInterpolatedVariables(), is(List.of("PASSWORD"))); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate("monomorphWithSymbolStep")); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); @@ -584,10 +584,10 @@ public void namedSoleParamForStep() throws Exception { assertThat(warnings.size(), is(2)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); assertThat(stepWarning.getStepName(), is("monomorphWithSymbolStep")); - assertThat(stepWarning.getInterpolatedVariables(), equalTo(Arrays.asList("PASSWORD", "USERNAME"))); + assertThat(stepWarning.getInterpolatedVariables(), equalTo(List.of("PASSWORD", "USERNAME"))); InterpolatedSecretsAction.InterpolatedWarnings listStepWarning = warnings.get(1); assertThat(listStepWarning.getStepName(), is("monomorphListSymbolStep")); - assertThat(listStepWarning.getInterpolatedVariables(), equalTo(Arrays.asList("PASSWORD", "USERNAME"))); + assertThat(listStepWarning.getInterpolatedVariables(), equalTo(List.of("PASSWORD", "USERNAME"))); } @Test public void noBodyError() throws Exception { @@ -632,7 +632,7 @@ public void namedSoleParamForStep() throws Exception { assertThat(warnings.size(), is(1)); InterpolatedSecretsAction.InterpolatedWarnings stepWarning = warnings.get(0); assertThat(stepWarning.getStepName(), is(shellStep)); - assertThat(stepWarning.getInterpolatedVariables(), is(Collections.singletonList("PASSWORD"))); + assertThat(stepWarning.getInterpolatedVariables(), is(List.of("PASSWORD"))); LinearScanner scan = new LinearScanner(); FlowNode node = scan.findFirstMatch(run.getExecution().getCurrentHeads().get(0), new NodeStepTypePredicate(shellStep)); ArgumentsAction argAction = node.getPersistentAction(ArgumentsAction.class); diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java index 2d9434dba..4f7a3ff6a 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuableTest.java @@ -26,6 +26,7 @@ import hudson.model.Result; import java.util.Collections; +import java.util.Set; import java.util.stream.Collectors; import org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException; import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval; @@ -53,7 +54,7 @@ public class SandboxContinuableTest { p.setDefinition(new CpsFlowDefinition("catchError {Jenkins.instance}", true)); WorkflowRun b = r.assertBuildStatus(Result.FAILURE, p.scheduleBuild2(0)); r.assertLogContains(RejectedAccessException.class.getName() + ": Scripts not permitted to use staticMethod jenkins.model.Jenkins getInstance", b); - assertEquals(Collections.singleton("staticMethod jenkins.model.Jenkins getInstance"), + assertEquals(Set.of("staticMethod jenkins.model.Jenkins getInstance"), ScriptApproval.get().getPendingSignatures().stream().map(ps -> ps.signature).collect(Collectors.toSet())); r.assertLogContains(org.jenkinsci.plugins.scriptsecurity.scripts.Messages.ScriptApprovalNote_message(), b); } diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java index 0a92a2357..7df22f3d7 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImplTest.java @@ -281,7 +281,7 @@ public void oversizedMap() { @Test public void oversizedList() { ArgumentsActionImpl impl = new ArgumentsActionImpl(Collections.emptySet()); - List unsanitized = Collections.singletonList(generateStringOfSize(ArgumentsActionImpl.getMaxRetainedLength())); + List unsanitized = List.of(generateStringOfSize(ArgumentsActionImpl.getMaxRetainedLength())); Object sanitized = impl.sanitizeListAndRecordMutation(unsanitized, null); Assert.assertEquals(ArgumentsAction.NotStoredReason.OVERSIZE_VALUE, sanitized); } @@ -422,7 +422,7 @@ public boolean equals(Object ob) { @Issue("JENKINS-54186") @Test public void fauxDescribable() throws Exception { logging.record(ArgumentsActionImpl.class, Level.FINE); - ArgumentsActionImpl impl = new ArgumentsActionImpl(Collections.singletonMap("curve", new Fractal())); + ArgumentsActionImpl impl = new ArgumentsActionImpl(Map.of("curve", new Fractal())); Map args = impl.getArguments(); assertThat(args, IsMapContaining.hasEntry("curve", ArgumentsAction.NotStoredReason.UNSERIALIZABLE)); } @@ -438,9 +438,9 @@ public void testAvoidStoringSpecialTypes() throws Exception { HashMap testMap = new HashMap<>(); testMap.put("safe", 5); testMap.put("maskme", new SuperSpecialThing()); - testMap.put("maskMyMapValue", Collections.singletonMap("bob", new SuperSpecialThing(-5, "testing"))); - testMap.put("maskAnElement", Arrays.asList("cheese", new SuperSpecialThing(5, "pi"), -8, - Arrays.asList("nested", new SuperSpecialThing()))); + testMap.put("maskMyMapValue", Map.of("bob", new SuperSpecialThing(-5, "testing"))); + testMap.put("maskAnElement", List.of("cheese", new SuperSpecialThing(5, "pi"), -8, + List.of("nested", new SuperSpecialThing()))); ArgumentsActionImpl argsAction = new ArgumentsActionImpl(testMap); Map maskedArgs = argsAction.getArguments(); @@ -529,7 +529,7 @@ public void testSpecialMetastepCases() throws Exception { assertEquals(true, args.get("moderate")); Map stateArgs = (Map)args.get("state"); assertTrue("Nested state Describable should only include a class argument or none at all", - stateArgs.size() <= 1 && Sets.difference(stateArgs.keySet(), new HashSet<>(Collections.singletonList("$class"))).size() == 0); + stateArgs.size() <= 1 && Sets.difference(stateArgs.keySet(), Set.of("$class")).size() == 0); // Same metastep but only one arg supplied, shouldn't auto-unwrap the internal step because can take 2 args job = r.createProject(WorkflowJob.class); diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java index a657d2877..ae75cfa7f 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/nodes/StepNodeTest.java @@ -73,7 +73,7 @@ public class StepNodeTest { assertThat(coreStepNodes, hasSize(1)); assertEquals("archiveArtifacts", coreStepNodes.get(0).getDisplayFunctionName()); assertEquals(r.jenkins.getDescriptor(ArtifactArchiver.class).getDisplayName(), coreStepNodes.get(0).getDisplayName()); - List coreWrapperStepNodes = new DepthFirstScanner().filteredNodes(b.getExecution(), Predicates.and(new NodeStepTypePredicate("wrap"), new Predicate() { + List coreWrapperStepNodes = new DepthFirstScanner().filteredNodes(b.getExecution(), Predicates.and(new NodeStepTypePredicate("wrap"), new Predicate<>() { @Override public boolean apply(FlowNode n) { return n instanceof StepStartNode && !((StepStartNode) n).isBody(); } @@ -100,7 +100,7 @@ public class StepNodeTest { assertThat(coreStepNodes, hasSize(1)); assertEquals("archiveArtifacts", coreStepNodes.get(0).getDisplayFunctionName()); assertEquals(r.jenkins.getDescriptor(ArtifactArchiver.class).getDisplayName(), coreStepNodes.get(0).getDisplayName()); - List coreWrapperStepNodes = new DepthFirstScanner().filteredNodes(b.getExecution(), Predicates.and(new NodeStepTypePredicate("wrap"), new Predicate() { + List coreWrapperStepNodes = new DepthFirstScanner().filteredNodes(b.getExecution(), Predicates.and(new NodeStepTypePredicate("wrap"), new Predicate<>() { @Override public boolean apply(FlowNode n) { return n instanceof StepStartNode && !((StepStartNode) n).isBody(); } @@ -127,7 +127,7 @@ public class StepNodeTest { assertThat(coreStepNodes, hasSize(1)); assertEquals("archiveArtifacts", coreStepNodes.get(0).getDisplayFunctionName()); assertEquals(r.jenkins.getDescriptor(ArtifactArchiver.class).getDisplayName(), coreStepNodes.get(0).getDisplayName()); - List coreWrapperStepNodes = new DepthFirstScanner().filteredNodes(b.getExecution(), Predicates.and(new NodeStepTypePredicate("wrap"), new Predicate() { + List coreWrapperStepNodes = new DepthFirstScanner().filteredNodes(b.getExecution(), Predicates.and(new NodeStepTypePredicate("wrap"), new Predicate<>() { @Override public boolean apply(FlowNode n) { return n instanceof StepStartNode && !((StepStartNode) n).isBody(); } @@ -156,7 +156,7 @@ public class StepNodeTest { assertThat(coreStepNodes, hasSize(1)); assertEquals("junit", coreStepNodes.get(0).getDisplayFunctionName()); assertEquals(r.jenkins.getDescriptor(JUnitResultArchiver.class).getDisplayName(), coreStepNodes.get(0).getDisplayName()); - List coreWrapperStepNodes = new DepthFirstScanner().filteredNodes(b.getExecution(), Predicates.and(new NodeStepTypePredicate("wrap"), new Predicate() { + List coreWrapperStepNodes = new DepthFirstScanner().filteredNodes(b.getExecution(), Predicates.and(new NodeStepTypePredicate("wrap"), new Predicate<>() { @Override public boolean apply(FlowNode n) { return n instanceof StepStartNode && !((StepStartNode) n).isBody(); } diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java index 644b6dec9..b648bce0c 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayActionTest.java @@ -290,7 +290,7 @@ private static boolean canRebuild(WorkflowRun b, String user) { SemaphoreStep.success("wait/2", null); WorkflowRun b2 = (WorkflowRun) b1.getAction(ReplayAction.class).run( "echo 'trying edits'\nnode {load 'f1.groovy'}; semaphore 'wait'; node {load 'f2.groovy'}", - Collections.singletonMap("Script2", "echo 'new second part'")).get(); + Map.of("Script2", "echo 'new second part'")).get(); story.j.assertBuildStatusSuccess(b2); story.j.assertLogContains("trying edits", b2); story.j.assertLogContains("original first part", b2); @@ -307,12 +307,10 @@ private static boolean canRebuild(WorkflowRun b, String user) { assertThat(diff, not(containsString("first part"))); System.out.println(diff); // Now replay #2, editing all scripts, and restarting in the middle. - Map replayMap = new HashMap<>(); - replayMap.put("Script1", "echo 'new first part'"); - replayMap.put("Script2", "echo 'newer second part'"); + Map replayMap = Map.of("Script1", "echo 'new first part'", "Script2", "echo 'newer second part'"); WorkflowRun b3 = (WorkflowRun) b2.getAction(ReplayAction.class).run( "node {load 'f1.groovy'}; semaphore 'wait'; node {load 'f2.groovy'}", - Collections.unmodifiableMap(replayMap)).waitForStart(); + replayMap).waitForStart(); SemaphoreStep.waitForStart("wait/3", b3); } }); diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java index b3e32c4c3..5c99726f5 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStepTest.java @@ -10,10 +10,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Arrays; - -import static java.util.Arrays.asList; - import java.util.Comparator; import java.util.List; import java.util.logging.Level; @@ -405,7 +401,7 @@ public void suspend() throws Exception { assert b.isBuilding(); // we let one branch go at a time - for (String branch : asList("A", "B")) { + for (String branch : List.of("A", "B")) { SemaphoreStep.success("suspend" + branch + "/1", null); waitForWorkflowToSuspend(); @@ -419,7 +415,7 @@ public void suspend() throws Exception { story.j.waitForCompletion(b); // make sure all the three branches have executed to the end. - for (String branch : asList("A", "B", "C")) { + for (String branch : List.of("A", "B", "C")) { story.j.assertLogContains(branch + " done", b); } @@ -461,7 +457,7 @@ private void shouldHaveParallelStepsInTheOrder(String... expected) { actual.add(a.getThreadName()); } - assertEquals(Arrays.asList(expected),actual); + assertEquals(List.of(expected),actual); } /** diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoLowerStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoLowerStep.java index f70627ca4..1e4eb353f 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoLowerStep.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoLowerStep.java @@ -61,7 +61,7 @@ public String getFunctionName() { @Override public Set> getRequiredContext() { - return Collections.singleton(TaskListener.class); + return Set.of(TaskListener.class); } } diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoUpperStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoUpperStep.java index f007d2fe9..1e7ec81cf 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoUpperStep.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/AmbiguousEchoUpperStep.java @@ -60,7 +60,7 @@ public String getFunctionName() { @Override public Set> getRequiredContext() { - return Collections.singleton(TaskListener.class); + return Set.of(TaskListener.class); } } } diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoResultStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoResultStep.java index 7dfe07aba..c2912c673 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoResultStep.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoResultStep.java @@ -40,7 +40,7 @@ public String getFunctionName() { @Override public Set> getRequiredContext() { - return Collections.singleton(TaskListener.class); + return Set.of(TaskListener.class); } } diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoStringAndDoubleStep.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoStringAndDoubleStep.java index 368b44f67..eccb3b545 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoStringAndDoubleStep.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/testMetaStep/EchoStringAndDoubleStep.java @@ -50,7 +50,7 @@ public String getFunctionName() { @Override public Set> getRequiredContext() { - return Collections.singleton(TaskListener.class); + return Set.of(TaskListener.class); } } diff --git a/pom.xml b/pom.xml index 1d3987942..576f96f84 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.51 + 4.52 org.jenkins-ci.plugins.workflow @@ -41,7 +41,7 @@ 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin - 2.346.3 + 2.361.4 2.4.21 From b6d5ad20ea2cb24d521ae8500fb1aff7d221e155 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 00:00:50 +0000 Subject: [PATCH 790/932] Bump plugin from 4.52 to 4.53 Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.52 to 4.53. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.52...plugin-4.53) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 576f96f84..9da18caa2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.52 + 4.53 org.jenkins-ci.plugins.workflow From 1b2c029d4a8f89e76524d60bf5247152f0cf5b1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 00:01:06 +0000 Subject: [PATCH 791/932] Bump groovy-sandbox.version from 1.31 to 1.32 Bumps `groovy-sandbox.version` from 1.31 to 1.32. Updates `groovy-sandbox` from 1.31 to 1.32 - [Release notes](https://github.com/jenkinsci/groovy-sandbox/releases) - [Commits](https://github.com/jenkinsci/groovy-sandbox/compare/groovy-sandbox-1.31...groovy-sandbox-1.32) Updates `groovy-sandbox` from 1.31 to 1.32 - [Release notes](https://github.com/jenkinsci/groovy-sandbox/releases) - [Commits](https://github.com/jenkinsci/groovy-sandbox/compare/groovy-sandbox-1.31...groovy-sandbox-1.32) --- updated-dependencies: - dependency-name: org.kohsuke:groovy-sandbox dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.kohsuke:groovy-sandbox:tests dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pom.xml b/lib/pom.xml index 0d9e6faaf..6e8a0f41f 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -60,7 +60,7 @@ - 1.31 + 1.32 false From 28f4d773fb5f50807b9005d12a0a517599db0f64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 00:01:15 +0000 Subject: [PATCH 792/932] Bump bom-2.361.x from 1670.v7f165fc7a_079 to 1742.vb_70478c1b_25f Bumps [bom-2.361.x](https://github.com/jenkinsci/bom) from 1670.v7f165fc7a_079 to 1742.vb_70478c1b_25f. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.361.x dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 8ea7663e4..a07d92712 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -51,7 +51,7 @@ io.jenkins.tools.bom bom-2.361.x - 1670.v7f165fc7a_079 + 1742.vb_70478c1b_25f import pom From d392eaf4c98a9f0d212cb294fe3b8b1b6c188716 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 12 Dec 2022 14:21:37 -0500 Subject: [PATCH 793/932] [JENKINS-70108] CastBlock must contextualize invoker to avoid issues in mixed-trust scenarios --- .../main/java/com/cloudbees/groovy/cps/Builder.java | 2 +- .../com/cloudbees/groovy/cps/impl/CastBlock.java | 10 ++++++---- .../groovy/cps/sandbox/SandboxInvokerTest.java | 12 ++++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java index 77ee87ac4..869946fa3 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/Builder.java @@ -588,7 +588,7 @@ public Block postfixDec(int line, LValueBlock body) { * be used in all other cases, such as Java-syntax casts and implicit casts inserted by the Groovy runtime. */ public Block cast(int line, Block block, Class type, boolean coerce) { - return new CastBlock(loc(line), block, type, false, coerce, false); + return new CastBlock(loc(line), tags, block, type, false, coerce, false); } /** diff --git a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java index 40c3df34c..4346a3ad1 100644 --- a/lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java +++ b/lib/src/main/java/com/cloudbees/groovy/cps/impl/CastBlock.java @@ -4,12 +4,13 @@ import com.cloudbees.groovy.cps.Continuation; import com.cloudbees.groovy.cps.Env; import com.cloudbees.groovy.cps.Next; -import java.util.Collections; +import com.cloudbees.groovy.cps.sandbox.CallSiteTag; +import java.util.Collection; import java.util.List; import org.codehaus.groovy.runtime.InvokerInvocationException; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; -public class CastBlock implements Block { +public class CastBlock extends CallSiteBlockSupport { private final SourceLocation loc; private final Block valueExp; private final Class type; @@ -17,7 +18,8 @@ public class CastBlock implements Block { private final boolean coerce; private final boolean strict; - public CastBlock(SourceLocation loc, Block valueExp, Class type, boolean ignoreAutoboxing, boolean coerce, boolean strict) { + public CastBlock(SourceLocation loc, Collection tags, Block valueExp, Class type, boolean ignoreAutoboxing, boolean coerce, boolean strict) { + super(tags); this.loc = loc; this.valueExp = valueExp; this.type = type; @@ -42,7 +44,7 @@ class ContinuationImpl extends ContinuationGroup { public Next cast(Object value) { try { - return k.receive(e.getInvoker().cast(value, type, ignoreAutoboxing, coerce, strict)); + return k.receive(e.getInvoker().contextualize(CastBlock.this).cast(value, type, ignoreAutoboxing, coerce, strict)); } catch (CpsCallableInvocation inv) { // Implementations of asType and other methods used by the Groovy stdlib should be @NonCPS, but we // just log a warning and invoke the callable anyway to maintain the existing behavior. diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java index ae9c3a3ea..2d084b6c6 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java @@ -696,4 +696,16 @@ public void sandboxInterceptsImplicitCastsArrayAssignment() throws Throwable { "Script1.method3()"); } + @Test public void castsInTrustedCodeCalledByUntrustedCodeShouldBeTrusted() throws Throwable { + TrustedCpsCompiler trusted = new TrustedCpsCompiler(); + trusted.setUp(); + getBinding().setVariable("trusted", trusted.getCsh().parse("def foo() { File f = ['secret.key'] }")); + + assertIntercept( + "trusted.foo()", // Untrusted script + new File("secret.key"), + "Script1.super(Script1).setBinding(Binding)", + "Script1.trusted", + "Script1.foo()"); + } } From 041de1c8bf9c6c5f0ea0745ed686a84e68d0e23c Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 12 Dec 2022 15:12:52 -0500 Subject: [PATCH 794/932] Fix error messages in assertEvaluate that incorrectly refer to the sandbox --- .../java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java index 64cc15def..460805b72 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/AbstractGroovyCpsTest.java @@ -124,10 +124,10 @@ protected void evalCps(String script, Object expectedResult, ExceptionHandler ha */ public void assertEvaluate(Object expectedReturnValue, String script) { evalCps(script, expectedReturnValue, e -> { - throw new RuntimeException("Failed to evaluate sandboxed script: " + script, e); + throw new RuntimeException("Failed to evaluate CPS-transformed script: " + script, e); }); eval(script, expectedReturnValue, e -> { - throw new RuntimeException("Failed to evaluate unsandboxed script: " + script, e); + throw new RuntimeException("Failed to evaluate non-CPS-transformed script: " + script, e); }); } From a9cf86cf72630dc9c3ff8d150088024ee999581f Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Mon, 12 Dec 2022 15:15:40 -0500 Subject: [PATCH 795/932] Use Arrays.asList instead of List.of in Groovy script for test to avoid VerifyError https://github.com/jenkinsci/workflow-cps-plugin/pull/635#discussion_r1046343921 --- .../test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java index 9b80f2005..42fd3b74c 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/CpsTransformerTest.java @@ -527,7 +527,7 @@ public void regexpOperator() throws Throwable { @Test public void arrayPassedToMethod() throws Throwable { assertEvaluate(4, "def m(x) {x.size()}; def a = [1, 2]; a.size() + m(a)"); // control case - assertEvaluate(4, "def m(x) {x.size()}; def a = [1, 2].toArray(); a.length + m(List.of(a))"); // workaround #1 + assertEvaluate(4, "def m(x) {x.size()}; def a = [1, 2].toArray(); a.length + m(Arrays.asList(a))"); // workaround #1 assertEvaluate(4, "@NonCPS def m(x) {x.length}; def a = [1, 2].toArray(); a.length + m(a)"); // workaround #2 assertEvaluate(4, "def m(x) {x.length}; def a = [1, 2].toArray(); a.length + m(a)"); // formerly: groovy.lang.MissingPropertyException: No such property: length for class: java.lang.Integer } From a737a279848bb4f624d9a0ef8576672bcda53d87 Mon Sep 17 00:00:00 2001 From: donghui <977675308@qq.com> Date: Wed, 14 Dec 2022 00:13:14 +0800 Subject: [PATCH 796/932] typofix: heck --> check --- doc/persistence.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/persistence.md b/doc/persistence.md index 6ff4b405d..e28dd9842 100644 --- a/doc/persistence.md +++ b/doc/persistence.md @@ -15,7 +15,6 @@ Running pipelines persist in 3 pieces: - If null, probably the build dates back to before this field was added - we check to see if this is running in a highly persistent DurabilityMode (Max_survivability generally) * done - if true, this execution completed, if false or un-set, the pipeline is a candidate to resume unless its only head is a FlowEndNode - The handling of false is for legacy reasons, since it was only recently made persistent. - * * various other boolean flags & settings for the execution (durability setting, user that started the build, is it sandboxed, etc) 3. The Program -- this is the current execution state of the Pipeline * This holds the Groovy state - the `CpsThreadGroup` - with runtime calls transformed by CPS so they can persist @@ -29,7 +28,7 @@ Running pipelines persist in 3 pieces: Some basic rules: -1. If the FlowNodeStorage is corrupt, incomplete, or un-persisted, all manner of heck will break loose +1. If the FlowNodeStorage is corrupt, incomplete, or un-persisted, all manner of check will break loose - In terms of Pipeline execution, the impact is like the Resonance Cascade from the Half-Life games - The pipeline can never be resumed (the key piece is missing) - Usually we fake up some placeholder FlowNodes to cover this situation and save them @@ -37,4 +36,4 @@ Some basic rules: in order to be able to load the heads and restore the program. 3. Once we've set persistedClean as false and saved the FlowExecution, then it doesn't matter what we do -- the Pipeline will assume it already has incomplete persistence data (as with 1) when trying to resume. This is how we handle the low-durability modes, to - avoid resuming a stale state of the Pipeline simply because we have old data persisted and are not updating it. \ No newline at end of file + avoid resuming a stale state of the Pipeline simply because we have old data persisted and are not updating it. From de1d17c862f4d4318518c3d928c44754bf0dd827 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Tue, 13 Dec 2022 11:23:15 -0500 Subject: [PATCH 797/932] [JENKINS-70108] Add ignored test for less impactful variant of the issue --- .../cps/sandbox/SandboxInvokerTest.java | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java index 2d084b6c6..29c088a89 100644 --- a/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java +++ b/lib/src/test/java/com/cloudbees/groovy/cps/sandbox/SandboxInvokerTest.java @@ -696,11 +696,11 @@ public void sandboxInterceptsImplicitCastsArrayAssignment() throws Throwable { "Script1.method3()"); } - @Test public void castsInTrustedCodeCalledByUntrustedCodeShouldBeTrusted() throws Throwable { + @Issue("JENKINS-70108") + @Test public void castsInTrustedCodeCalledByUntrustedCodeShouldNotBeIntercepted() throws Throwable { TrustedCpsCompiler trusted = new TrustedCpsCompiler(); trusted.setUp(); getBinding().setVariable("trusted", trusted.getCsh().parse("def foo() { File f = ['secret.key'] }")); - assertIntercept( "trusted.foo()", // Untrusted script new File("secret.key"), @@ -708,4 +708,32 @@ public void sandboxInterceptsImplicitCastsArrayAssignment() throws Throwable { "Script1.trusted", "Script1.foo()"); } + + /* + * All blocks that perform boolean casts internally using ContinuationGroup.castToBoolean incorrectly intercept + * calls performed by the cast when the cast is in trusted code that is called by untrusted code. For boolean + * casts, this is not that interesting, since it only causes problems in practice if you cast a type that + * implements an asBoolean method that would not be allowed by the sandbox. + * I see two obvious ways to fix this: + * 1. Add a CallSiteBlock parameter to ContinuationGroup.castToBoolean, and use it to contextualize the invoker + * used in that method. All Blocks that use the method would need to be updated to implement CallSiteBlock. + * 2. Delete ContinuationGroup.castToBoolean and replace all uses with basic Java casts to boolean. Modify + * CpsTransformer to insert explicit boolean casts into the CPS-transformed program for all AST nodes whose + * Blocks previously used castToBoolean. + */ + @Ignore("This variant of JENKINS-70108 seems less likely to cause problems in practice and is more complex to fix") + @Test public void booleanCastsInTrustedCodeCalledByUntrustedCodeShouldNotBeIntercepted() throws Throwable { + TrustedCpsCompiler trusted = new TrustedCpsCompiler(); + trusted.setUp(); + getBinding().setVariable("trusted", trusted.getCsh().parse( + "class Test { @NonCPS def asBoolean() { false } }\n" + + "def foo() { if (new Test()) { 123 } else { 456 } }")); + assertIntercept( + "trusted.foo()", // Untrusted script + 456, + "Script1.super(Script1).setBinding(Binding)", + "Script1.trusted", + "Script1.foo()"); + // Currently the call to Test.asBoolean() is also intercepted, which is incorrect. + } } From fb7fd7fe61e5a228c48f357d530142e66d035d60 Mon Sep 17 00:00:00 2001 From: donghui <977675308@qq.com> Date: Wed, 14 Dec 2022 08:23:45 +0800 Subject: [PATCH 798/932] Update doc/persistence.md Co-authored-by: Devin Nusbaum --- doc/persistence.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/persistence.md b/doc/persistence.md index e28dd9842..c30a034f4 100644 --- a/doc/persistence.md +++ b/doc/persistence.md @@ -28,8 +28,7 @@ Running pipelines persist in 3 pieces: Some basic rules: -1. If the FlowNodeStorage is corrupt, incomplete, or un-persisted, all manner of check will break loose - - In terms of Pipeline execution, the impact is like the Resonance Cascade from the Half-Life games +1. If the FlowNodeStorage is corrupt, incomplete, or un-persisted, various things will break - The pipeline can never be resumed (the key piece is missing) - Usually we fake up some placeholder FlowNodes to cover this situation and save them 2. Whenever persisting data, the Pipeline *must* have the FlowNodes persisted on disk (via `storage.flush()` generally) From 7c908a0a2d9b16b68a0a6f010f183cc8c34b145e Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 15 Dec 2022 08:08:41 -0500 Subject: [PATCH 799/932] Replacing `Arrays.asList` with `List.of` can introduce `NullPointerException` --- .../workflow/cps/actions/ArgumentsActionImpl.java | 2 +- .../workflow/cps/persistence/IteratorHack.java | 2 +- .../workflow/cps/persistence/IteratorHackTest.java | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java index 0d9d58be9..429a012ca 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/actions/ArgumentsActionImpl.java @@ -175,7 +175,7 @@ Object sanitizeArrayAndRecordMutation(@NonNull Object[] objects, @CheckForNull E this.isUnmodifiedBySanitization = false; return NotStoredReason.OVERSIZE_VALUE; } - List inputList = List.of(objects); + List inputList = Arrays.asList(objects); Object sanitized = sanitizeListAndRecordMutation(inputList, variables); if (sanitized == inputList) { // Works because if not mutated, we return original input instance return objects; diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHack.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHack.java index b541c5e12..5b07c8bd5 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHack.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHack.java @@ -102,7 +102,7 @@ public static Iterator iterator(Set set) { public static Iterator iterator(E[] array) { // TODO as above - return new Itr<>(List.of(array)); + return new Itr<>(Arrays.asList(array)); } public static Iterator iterator(Deque deque) { diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHackTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHackTest.java index e98406dcc..efc131425 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHackTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/persistence/IteratorHackTest.java @@ -256,4 +256,18 @@ public class IteratorHackTest { r.assertBuildStatusSuccess(r.waitForCompletion(b)); }); } + + @Issue("https://github.com/jenkinsci/workflow-cps-plugin/pull/627#issuecomment-1352869571") + @Test public void arrayIterator() throws Exception { + rr.then(r -> { + WorkflowJob p = r.createProject(WorkflowJob.class); + p.setDefinition(new CpsFlowDefinition( + "Object[] arr = [1, null, 2]\n" + + "for (def elt : arr) {\n" + + " echo(/iterating on $elt/)\n" + + "}\n", false)); + rr.j.assertLogContains("iterating on null", rr.j.buildAndAssertSuccess(p)); + }); + } + } From 808c9f2fc3dbacfd00fd54e644a63e5012c153df Mon Sep 17 00:00:00 2001 From: Martin Kosicky Date: Tue, 2 Aug 2022 13:16:44 +0200 Subject: [PATCH 800/932] [JENKINS-42971] CpsScmFlowDefinition sends build to SCMFileSystem in order to expand branch if they contain parameters --- .../jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java index ab0800ea8..3fd2fefac 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java @@ -115,7 +115,7 @@ public boolean isLightweight() { Run build = (Run) _build; String expandedScriptPath = build.getEnvironment(listener).expand(scriptPath); if (isLightweight()) { - try (SCMFileSystem fs = SCMFileSystem.of(build.getParent(), scm)) { + try (SCMFileSystem fs = SCMFileSystem.of(build.getParent(), scm,null, build)) { if (fs != null) { try { String script = fs.child(expandedScriptPath).contentAsString(); diff --git a/pom.xml b/pom.xml index 9da18caa2..63459113a 100644 --- a/pom.xml +++ b/pom.xml @@ -49,4 +49,4 @@ lib plugin - + \ No newline at end of file From 811b55198607e9aa4269a044acca60f465c0d27b Mon Sep 17 00:00:00 2001 From: Martin Kosicky Date: Thu, 4 Aug 2022 11:30:14 +0200 Subject: [PATCH 801/932] [JENKINS-42971] CpsScmFlowDefinition added integration test for environment variables expansion --- .../cps/CpsScmFlowDefinitionTest.java | 32 +++ pom.xml | 250 +++++++++++++++++- 2 files changed, 281 insertions(+), 1 deletion(-) diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java index ef2b0585d..9e830f942 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java @@ -46,7 +46,10 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.logging.Level; + import jenkins.model.Jenkins; +import jenkins.plugins.git.GitSCMFileSystem; import jenkins.plugins.git.GitSampleRepoRule; import jenkins.plugins.git.GitStep; import jenkins.scm.impl.subversion.SubversionSampleRepoRule; @@ -59,6 +62,8 @@ import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.plugins.workflow.job.WorkflowRun; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.hasItem; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -70,6 +75,7 @@ import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.LoggerRule; import org.jvnet.hudson.test.SingleFileSCM; import static org.hamcrest.MatcherAssert.assertThat; @@ -195,6 +201,32 @@ public class CpsScmFlowDefinitionTest { r.assertLogContains("version one", b); } + @Test public void lightweight_brach_parametrised() throws Exception { + LoggerRule lr = new LoggerRule(); + lr.record(GitSCMFileSystem.class.getName(), Level.ALL).capture(4024); + + sampleRepo.init(); + sampleRepo.git("checkout","-b","master2"); + sampleRepo.write("flow.groovy", "echo 'version one'"); + sampleRepo.git("add", "flow.groovy"); + sampleRepo.git("commit", "--message=init"); + WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p"); + p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("BRANCH","",""))); + GitStep step = new GitStep(sampleRepo.toString()); + step.setBranch("${BRANCH}"); + + CpsScmFlowDefinition def = new CpsScmFlowDefinition(step.createSCM(), "flow.groovy"); + def.setLightweight(true); + TestDurabilityHintProvider provider = Jenkins.get().getExtensionList(TestDurabilityHintProvider.class).get(0); + provider.registerHint("p", FlowDurabilityHint.PERFORMANCE_OPTIMIZED); + p.setDefinition(def); + + WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0, new ParametersAction(new StringParameterValue("BRANCH","master2")))); + Assert.assertEquals(FlowDurabilityHint.PERFORMANCE_OPTIMIZED, b.getExecution().getDurabilityHint()); + + assertThat(lr.getMessages(), hasItem(containsString("refs/heads/master2:refs/remotes/origin/master2"))); + } + @Issue("JENKINS-59425") @Test public void missingFile() throws Exception { sampleRepo.init(); diff --git a/pom.xml b/pom.xml index 63459113a..477fa5e3a 100644 --- a/pom.xml +++ b/pom.xml @@ -44,9 +44,257 @@ 2.361.4 2.4.21 +<<<<<<< HEAD dgm-builder lib plugin - \ No newline at end of file + +======= + + + + io.jenkins.tools.bom + bom-2.346.x + 1478.v81d3dc4f9a_43 + import + pom + + + + + + org.jenkins-ci.plugins.workflow + workflow-step-api + 639.v6eca_cd8c04a_a_ + + + org.jenkins-ci.plugins.workflow + workflow-api + + + org.jenkins-ci.plugins.workflow + workflow-support + + + org.jenkins-ci.plugins.workflow + workflow-scm-step + + + org.jenkins-ci.plugins + script-security + + + org.jenkins-ci.plugins + 625.va_c59c48ce36f + scm-api + + + org.jenkins-ci.plugins + structs + + + org.jenkins-ci.plugins + support-core + true + + + com.github.stephenc.findbugs + findbugs-annotations + + + + + org.jenkins-ci.plugins.workflow + workflow-step-api + tests + test + + + org.jenkins-ci.plugins.workflow + workflow-support + tests + test + + + org.jenkins-ci.plugins.workflow + workflow-basic-steps + test + + + org.jenkins-ci.plugins + mailer + + + + + org.jenkins-ci.plugins.workflow + workflow-job + test + + + org.jenkins-ci.plugins.workflow + workflow-durable-task-step + test + + + org.jenkins-ci.plugins + credentials-binding + test + + + org.jenkins-ci.plugins + pipeline-build-step + test + + + org.jenkins-ci.plugins + pipeline-input-step + test + + + org.jenkins-ci.plugins + junit + test + + + com.cloudbees + groovy-cps + ${groovy-cps.version} + + + com.google.guava + guava + + + + + org.jenkins-ci.ui + ace-editor + + + javax.servlet + servlet-api + + + + + com.cloudbees + diff4j + 1.3 + + + commons-io + commons-io + + + org.jvnet.localizer + localizer + + + + + org.jenkins-ci.plugins + scm-api + 625.va_c59c48ce36f + tests + test + + + org.jenkins-ci.plugins + 4.11.5-rc4795.d7159dc85662 + git + test + + + org.jenkins-ci.plugins + git + tests + test + + + + org.jenkins-ci.plugins + matrix-project + test + + + org.jenkins-ci.plugins + config-file-provider + test + + + com.cloudbees + groovy-cps + ${groovy-cps.version} + tests + test + + + com.google.guava + guava + + + + + org.jenkins-ci.plugins + pipeline-stage-step + test + + + org.jenkins-ci.plugins + subversion + test + + + org.jenkins-ci.plugins + subversion + tests + test + + + org.testcontainers + testcontainers + 1.17.3 + test + + + + org.apache.commons + commons-compress + + + org.slf4j + slf4j-api + + + + + org.tmatesoft.svnkit + svnkit-cli + 1.10.7 + test + + + + + + src/main/resources + + + target/generated-resources/adjuncts + + + + + org.jenkins-ci.tools + maven-hpi-plugin + + 2.18 + + + + + +>>>>>>> ecd48a98 ([JENKINS-42971] CpsScmFlowDefinition added integration test for environment variables expansion) From b69d3807de31fa7c598d9dbd67d1505673fb5411 Mon Sep 17 00:00:00 2001 From: Martin Kosicky Date: Thu, 4 Aug 2022 14:52:59 +0200 Subject: [PATCH 802/932] Format of test --- .../plugins/workflow/cps/CpsScmFlowDefinitionTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java index 9e830f942..c67ee214d 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java @@ -201,7 +201,9 @@ public class CpsScmFlowDefinitionTest { r.assertLogContains("version one", b); } - @Test public void lightweight_brach_parametrised() throws Exception { + @Issue("JENKINS-42971") + @Test + public void lightweight_brach_parametrised() throws Exception { LoggerRule lr = new LoggerRule(); lr.record(GitSCMFileSystem.class.getName(), Level.ALL).capture(4024); From 003b2ba3105f64f2d8a232b0efe7c63e0fde841c Mon Sep 17 00:00:00 2001 From: Martin Kosicky Date: Thu, 4 Aug 2022 15:08:29 +0200 Subject: [PATCH 803/932] [JENKINS-42971] Simplifyied test --- .../cps/CpsScmFlowDefinitionTest.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java index c67ee214d..0a8fc450c 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java @@ -43,6 +43,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -204,9 +205,6 @@ public class CpsScmFlowDefinitionTest { @Issue("JENKINS-42971") @Test public void lightweight_brach_parametrised() throws Exception { - LoggerRule lr = new LoggerRule(); - lr.record(GitSCMFileSystem.class.getName(), Level.ALL).capture(4024); - sampleRepo.init(); sampleRepo.git("checkout","-b","master2"); sampleRepo.write("flow.groovy", "echo 'version one'"); @@ -214,19 +212,16 @@ public void lightweight_brach_parametrised() throws Exception { sampleRepo.git("commit", "--message=init"); WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p"); p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("BRANCH","",""))); - GitStep step = new GitStep(sampleRepo.toString()); - step.setBranch("${BRANCH}"); + GitSCM scm = new GitSCM(GitSCM.createRepoList(sampleRepo.toString(), null), + new ArrayList() {{ + add(new BranchSpec("${BRANCH}")); + }}, null, null, Collections.emptyList()); - CpsScmFlowDefinition def = new CpsScmFlowDefinition(step.createSCM(), "flow.groovy"); + CpsScmFlowDefinition def = new CpsScmFlowDefinition(scm, "flow.groovy"); def.setLightweight(true); - TestDurabilityHintProvider provider = Jenkins.get().getExtensionList(TestDurabilityHintProvider.class).get(0); - provider.registerHint("p", FlowDurabilityHint.PERFORMANCE_OPTIMIZED); p.setDefinition(def); - WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0, new ParametersAction(new StringParameterValue("BRANCH","master2")))); - Assert.assertEquals(FlowDurabilityHint.PERFORMANCE_OPTIMIZED, b.getExecution().getDurabilityHint()); - - assertThat(lr.getMessages(), hasItem(containsString("refs/heads/master2:refs/remotes/origin/master2"))); + r.assertBuildStatusSuccess(p.scheduleBuild2(0, new ParametersAction(new StringParameterValue("BRANCH","master2")))); } @Issue("JENKINS-59425") From 6b133735e96f2664617ac2e03b628618302463b3 Mon Sep 17 00:00:00 2001 From: Martin Kosicky Date: Fri, 5 Aug 2022 16:58:38 +0200 Subject: [PATCH 804/932] [JENKINS-42971] Linting fixes --- .../plugins/workflow/cps/CpsScmFlowDefinition.java | 2 +- .../plugins/workflow/cps/CpsScmFlowDefinitionTest.java | 8 +++----- pom.xml | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java index 3fd2fefac..24cc23a43 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java @@ -115,7 +115,7 @@ public boolean isLightweight() { Run build = (Run) _build; String expandedScriptPath = build.getEnvironment(listener).expand(scriptPath); if (isLightweight()) { - try (SCMFileSystem fs = SCMFileSystem.of(build.getParent(), scm,null, build)) { + try (SCMFileSystem fs = SCMFileSystem.of(build.getParent(), scm, null, build)) { if (fs != null) { try { String script = fs.child(expandedScriptPath).contentAsString(); diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java index 0a8fc450c..097ac2b6b 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java @@ -206,16 +206,14 @@ public class CpsScmFlowDefinitionTest { @Test public void lightweight_brach_parametrised() throws Exception { sampleRepo.init(); - sampleRepo.git("checkout","-b","master2"); + sampleRepo.git("checkout", "-b", "master2"); sampleRepo.write("flow.groovy", "echo 'version one'"); sampleRepo.git("add", "flow.groovy"); sampleRepo.git("commit", "--message=init"); WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p"); - p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("BRANCH","",""))); + p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("BRANCH", ""))); GitSCM scm = new GitSCM(GitSCM.createRepoList(sampleRepo.toString(), null), - new ArrayList() {{ - add(new BranchSpec("${BRANCH}")); - }}, null, null, Collections.emptyList()); + Collections.singletonList(new BranchSpec("${BRANCH}")), null, null, Collections.emptyList()); CpsScmFlowDefinition def = new CpsScmFlowDefinition(scm, "flow.groovy"); def.setLightweight(true); diff --git a/pom.xml b/pom.xml index 477fa5e3a..c43c4eb13 100644 --- a/pom.xml +++ b/pom.xml @@ -210,6 +210,7 @@ org.jenkins-ci.plugins git + 4.11.5-rc4795.d7159dc85662 tests test From c5273bb3528bca02bebbc0c101e5faaa7c48cdce Mon Sep 17 00:00:00 2001 From: MartinKosicky Date: Fri, 5 Aug 2022 20:19:01 +0200 Subject: [PATCH 805/932] Update src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java Code formatting Co-authored-by: Jesse Glick --- .../plugins/workflow/cps/CpsScmFlowDefinitionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java index 097ac2b6b..0dd7dffb3 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java @@ -219,7 +219,7 @@ public void lightweight_brach_parametrised() throws Exception { def.setLightweight(true); p.setDefinition(def); - r.assertBuildStatusSuccess(p.scheduleBuild2(0, new ParametersAction(new StringParameterValue("BRANCH","master2")))); + r.assertBuildStatusSuccess(p.scheduleBuild2(0, new ParametersAction(new StringParameterValue("BRANCH", "master2")))); } @Issue("JENKINS-59425") From 21562e566d7b2619e818679a61f1c01f5f34afc3 Mon Sep 17 00:00:00 2001 From: Martin Kosicky Date: Thu, 11 Aug 2022 09:23:21 +0200 Subject: [PATCH 806/932] Using scm-api that was already merged --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c43c4eb13..2483cec81 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ org.jenkins-ci.plugins - 625.va_c59c48ce36f + 621.vda_a_b_055e58f7 scm-api @@ -197,7 +197,7 @@ org.jenkins-ci.plugins scm-api - 625.va_c59c48ce36f + 621.vda_a_b_055e58f7 tests test From 9c4f46e236716b5d6fd158364b8abc708dee723a Mon Sep 17 00:00:00 2001 From: Martin Kosicky Date: Thu, 11 Aug 2022 09:26:33 +0200 Subject: [PATCH 807/932] Bumped git plugin to newest increment --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2483cec81..e8e6200de 100644 --- a/pom.xml +++ b/pom.xml @@ -203,14 +203,14 @@ org.jenkins-ci.plugins - 4.11.5-rc4795.d7159dc85662 + 4.12.0-rc4821.0fa_d6b_a_a_0928 git test org.jenkins-ci.plugins git - 4.11.5-rc4795.d7159dc85662 + 4.12.0-rc4821.0fa_d6b_a_a_0928 tests test From 54d07701a8656b1a54914e716c1b34e0b02a6d2a Mon Sep 17 00:00:00 2001 From: Martin Kosicky Date: Thu, 11 Aug 2022 19:05:56 +0200 Subject: [PATCH 808/932] Bumped BOM , to fix dependencies --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e8e6200de..79055b2bd 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ io.jenkins.tools.bom bom-2.346.x - 1478.v81d3dc4f9a_43 + 1556.vfc6a_f216e3c6 import pom @@ -203,14 +203,14 @@ org.jenkins-ci.plugins - 4.12.0-rc4821.0fa_d6b_a_a_0928 + 4.12.0-rc4823.c61fb_c41c2e0 git test org.jenkins-ci.plugins git - 4.12.0-rc4821.0fa_d6b_a_a_0928 + 4.12.0-rc4823.c61fb_c41c2e0 tests test From 1073bfaf8ce93ac37ae158dfbbe0feff3a160f62 Mon Sep 17 00:00:00 2001 From: Martin Kosicky Date: Fri, 16 Dec 2022 20:53:41 +0100 Subject: [PATCH 809/932] Fix of bad merge --- pom.xml | 251 +------------------------------------------------------- 1 file changed, 1 insertion(+), 250 deletions(-) diff --git a/pom.xml b/pom.xml index 79055b2bd..63459113a 100644 --- a/pom.xml +++ b/pom.xml @@ -44,258 +44,9 @@ 2.361.4 2.4.21 -<<<<<<< HEAD dgm-builder lib plugin - -======= - - - - io.jenkins.tools.bom - bom-2.346.x - 1556.vfc6a_f216e3c6 - import - pom - - - - - - org.jenkins-ci.plugins.workflow - workflow-step-api - 639.v6eca_cd8c04a_a_ - - - org.jenkins-ci.plugins.workflow - workflow-api - - - org.jenkins-ci.plugins.workflow - workflow-support - - - org.jenkins-ci.plugins.workflow - workflow-scm-step - - - org.jenkins-ci.plugins - script-security - - - org.jenkins-ci.plugins - 621.vda_a_b_055e58f7 - scm-api - - - org.jenkins-ci.plugins - structs - - - org.jenkins-ci.plugins - support-core - true - - - com.github.stephenc.findbugs - findbugs-annotations - - - - - org.jenkins-ci.plugins.workflow - workflow-step-api - tests - test - - - org.jenkins-ci.plugins.workflow - workflow-support - tests - test - - - org.jenkins-ci.plugins.workflow - workflow-basic-steps - test - - - org.jenkins-ci.plugins - mailer - - - - - org.jenkins-ci.plugins.workflow - workflow-job - test - - - org.jenkins-ci.plugins.workflow - workflow-durable-task-step - test - - - org.jenkins-ci.plugins - credentials-binding - test - - - org.jenkins-ci.plugins - pipeline-build-step - test - - - org.jenkins-ci.plugins - pipeline-input-step - test - - - org.jenkins-ci.plugins - junit - test - - - com.cloudbees - groovy-cps - ${groovy-cps.version} - - - com.google.guava - guava - - - - - org.jenkins-ci.ui - ace-editor - - - javax.servlet - servlet-api - - - - - com.cloudbees - diff4j - 1.3 - - - commons-io - commons-io - - - org.jvnet.localizer - localizer - - - - - org.jenkins-ci.plugins - scm-api - 621.vda_a_b_055e58f7 - tests - test - - - org.jenkins-ci.plugins - 4.12.0-rc4823.c61fb_c41c2e0 - git - test - - - org.jenkins-ci.plugins - git - 4.12.0-rc4823.c61fb_c41c2e0 - tests - test - - - - org.jenkins-ci.plugins - matrix-project - test - - - org.jenkins-ci.plugins - config-file-provider - test - - - com.cloudbees - groovy-cps - ${groovy-cps.version} - tests - test - - - com.google.guava - guava - - - - - org.jenkins-ci.plugins - pipeline-stage-step - test - - - org.jenkins-ci.plugins - subversion - test - - - org.jenkins-ci.plugins - subversion - tests - test - - - org.testcontainers - testcontainers - 1.17.3 - test - - - - org.apache.commons - commons-compress - - - org.slf4j - slf4j-api - - - - - org.tmatesoft.svnkit - svnkit-cli - 1.10.7 - test - - - - - - src/main/resources - - - target/generated-resources/adjuncts - - - - - org.jenkins-ci.tools - maven-hpi-plugin - - 2.18 - - - - - ->>>>>>> ecd48a98 ([JENKINS-42971] CpsScmFlowDefinition added integration test for environment variables expansion) + \ No newline at end of file From 24ad926d6dc9baa28f5fb6bf8cc04cc0fec98d74 Mon Sep 17 00:00:00 2001 From: MartinKosicky Date: Fri, 16 Dec 2022 21:02:49 +0100 Subject: [PATCH 810/932] Update pom.xml fix newline Co-authored-by: Devin Nusbaum --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63459113a..9da18caa2 100644 --- a/pom.xml +++ b/pom.xml @@ -49,4 +49,4 @@ lib plugin - \ No newline at end of file + From 8aca5e840674177cea673f65f2e0c807fff6f281 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 00:07:50 +0000 Subject: [PATCH 811/932] Bump bom-2.361.x from 1742.vb_70478c1b_25f to 1750.v0071fa_4c4a_e3 Bumps [bom-2.361.x](https://github.com/jenkinsci/bom) from 1742.vb_70478c1b_25f to 1750.v0071fa_4c4a_e3. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.361.x dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index e641ddc06..3c7bc95ea 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -51,7 +51,7 @@ io.jenkins.tools.bom bom-2.361.x - 1742.vb_70478c1b_25f + 1750.v0071fa_4c4a_e3 import pom From 0a257b225bde0fb5f2cc07719a278036971ca707 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 21 Dec 2022 11:34:47 -0800 Subject: [PATCH 812/932] Add Java 17 to build matrix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 315a26660..df22ae2a9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ buildPlugin(useContainerAgent: true, configurations: [ [ platform: "windows", jdk: "11" ], - [ platform: "linux", jdk: "11" ] + [ platform: "linux", jdk: "17" ] ]) From eb24fb7205d52b9153447a8f86b5c3e57d8a73a0 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 3 Jan 2023 17:50:40 -0500 Subject: [PATCH 813/932] Typo in test name --- .../plugins/workflow/cps/CpsScmFlowDefinitionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java index 0dd7dffb3..ca21a439e 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinitionTest.java @@ -204,7 +204,7 @@ public class CpsScmFlowDefinitionTest { @Issue("JENKINS-42971") @Test - public void lightweight_brach_parametrised() throws Exception { + public void lightweight_branch_parametrised() throws Exception { sampleRepo.init(); sampleRepo.git("checkout", "-b", "master2"); sampleRepo.write("flow.groovy", "echo 'version one'"); From fa242b91b7b2be38a8be7882bd5c2f47aa2816de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 13:21:44 -0700 Subject: [PATCH 814/932] Bump loader-utils from 2.0.2 to 2.0.4 in /plugin (#628) Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.2 to 2.0.4. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v2.0.2...v2.0.4) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- plugin/yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/yarn.lock b/plugin/yarn.lock index eccb5119e..ebb872db0 100644 --- a/plugin/yarn.lock +++ b/plugin/yarn.lock @@ -1982,8 +1982,8 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" loader-utils@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + version "2.0.4" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" dependencies: big.js "^5.2.2" emojis-list "^3.0.0" From 05f27418bccdfd7d54f48a7f69dd21ae884c89c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 13:22:34 -0700 Subject: [PATCH 815/932] Bump json5 from 2.2.1 to 2.2.3 in /plugin (#648) Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.3. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v2.2.1...v2.2.3) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- plugin/yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/yarn.lock b/plugin/yarn.lock index ebb872db0..2d0304b81 100644 --- a/plugin/yarn.lock +++ b/plugin/yarn.lock @@ -1932,8 +1932,8 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" json5@^2.1.2, json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" kind-of@^6.0.2: version "6.0.3" From 6979c6b461fceca8f2bb111920feac7283bcff87 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 18 Jan 2023 15:06:30 -0500 Subject: [PATCH 816/932] Adapt `DSLTest.legacyStage` to test only the special case --- plugin/pom.xml | 5 +++++ .../java/org/jenkinsci/plugins/workflow/cps/DSLTest.java | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 3c7bc95ea..5b1a977b3 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -55,6 +55,11 @@ import pom + + org.jenkins-ci.plugins + pipeline-stage-step + 303.v50e56cdd58d9 + diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java index 8798fea18..93852c82b 100644 --- a/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java +++ b/plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/DSLTest.java @@ -600,7 +600,10 @@ public void namedSoleParamForStep() throws Exception { p.setDefinition(new CpsFlowDefinition( "stage(name: 'A');\n" + "echo('done')", true)); - WorkflowRun b = r.assertBuildStatusSuccess(p.scheduleBuild2(0)); + WorkflowRun b = r.waitForCompletion(p.scheduleBuild2(0).waitForStart()); + r.assertLogContains(org.jenkinsci.plugins.workflow.support.steps.stage.Messages.StageStepExecution_non_block_mode_deprecated(), b); + // Special case in DSL.invokeStep: + r.assertLogNotContains("stage step must be called with a body", b); } @Test public void standardStage() throws Exception { From 7440ea5ea70eb3b0ccdfe1db6db7ef2dc243b054 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 18 Jan 2023 16:09:28 -0500 Subject: [PATCH 817/932] Works; back to stock deps --- plugin/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 5b1a977b3..3c7bc95ea 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -55,11 +55,6 @@ import pom - - org.jenkins-ci.plugins - pipeline-stage-step - 303.v50e56cdd58d9 - From b11fb83dec4b40e6ccef8652d34e5c8aef0f0293 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 00:04:10 +0000 Subject: [PATCH 818/932] Bump plugin from 4.53 to 4.54 Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.53 to 4.54. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.53...plugin-4.54) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9da18caa2..df2eaf428 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.53 + 4.54 org.jenkins-ci.plugins.workflow From 353043ec61b87889de6c1439e43eea163804ac65 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 31 Jan 2023 16:39:09 -0800 Subject: [PATCH 819/932] Upgrade ACE Editor from 1.2.2 to 1.15.0 --- plugin/package.json | 2 +- plugin/pom.xml | 14 +------ .../main/{webapp => js}/snippets/workflow.js | 0 plugin/src/main/js/workflow-editor.js | 39 ++++++++----------- plugin/yarn.lock | 15 +++---- 5 files changed, 24 insertions(+), 46 deletions(-) rename plugin/src/main/{webapp => js}/snippets/workflow.js (100%) diff --git a/plugin/package.json b/plugin/package.json index e6d98ba7e..81194ac23 100644 --- a/plugin/package.json +++ b/plugin/package.json @@ -39,7 +39,7 @@ "webpack-fix-style-only-entries": "^0.6.1" }, "dependencies": { - "jenkins-js-modules": "1.3.0", + "ace-builds": "^1.15.0", "jquery": "^3.6.1", "jquery-ui": "^1.13.2", "raf": "^3.4.1" diff --git a/plugin/pom.xml b/plugin/pom.xml index 3c7bc95ea..3f54de928 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -42,8 +42,8 @@ false - 16.17.0 - 8.18.0 + 18.13.0 + 8.19.3 1.22.19 @@ -165,16 +165,6 @@ - - org.jenkins-ci.ui - ace-editor - - - javax.servlet - servlet-api - - - com.cloudbees diff4j diff --git a/plugin/src/main/webapp/snippets/workflow.js b/plugin/src/main/js/snippets/workflow.js similarity index 100% rename from plugin/src/main/webapp/snippets/workflow.js rename to plugin/src/main/js/snippets/workflow.js diff --git a/plugin/src/main/js/workflow-editor.js b/plugin/src/main/js/workflow-editor.js index 3eda2daff..c9859fe9a 100644 --- a/plugin/src/main/js/workflow-editor.js +++ b/plugin/src/main/js/workflow-editor.js @@ -1,19 +1,21 @@ import $ from 'jquery'; -import jenkinsJSModules from 'jenkins-js-modules'; // Polyfill for window.requestAnimationFrame import 'raf/polyfill'; // Import the resizable module to allow the textarea to be expanded import 'jquery-ui/ui/widgets/resizable'; import { addSamplesWidget } from './samples'; +// Import ACE +import "ace-builds/src-noconflict/ace"; +import "ace-builds/src-noconflict/ext-language_tools"; +import "ace-builds/src-noconflict/mode-groovy"; +import "ace-builds/src-noconflict/theme-tomorrow"; + +// Import custom snippets +import "./snippets/workflow"; + var editorIdCounter = 0; -// The Jenkins 'ace-editor:ace-editor-122' plugin doesn't support a synchronous -// require option. This is because of how the ACE editor is written. So, we need -// to use lower level jenkins-js-modules async 'import' to get a handle on a -// specific version of ACE, from which we create an editor instance for workflow. -jenkinsJSModules.import('ace-editor:ace-editor-122') - .onFulfilled(function (acePack) { $('.workflow-editor-wrapper').each(function() { initEditor($(this)); }); @@ -30,24 +32,18 @@ jenkinsJSModules.import('ace-editor:ace-editor-122') var editorId = 'workflow-editor-' + editorIdCounter; aceContainer.attr('id', editorId); - // The 'ace-editor:ace-editor-122' plugin supplies an "ACEPack" object. - // ACEPack understands the hardwired async nature of the ACE impl and so - // provides some async ACE script loading functions. - - acePack.edit(editorId, function() { - var ace = acePack.ace; - var editor = this.editor; + var editor = ace.edit(editorId); // Attach the ACE editor instance to the element. Useful for testing. var $wfEditor = $('#' + editorId); $wfEditor.get(0).aceEditor = editor; - acePack.addPackOverride('snippets/groovy.js', '../workflow-cps/snippets/workflow.js'); + // https://stackoverflow.com/a/66923593 + var snippetManager = ace.require('ace/snippets').snippetManager; + var snippetContent = ace.require('ace/snippets/groovy').snippetText; + var snippets = snippetManager.parseSnippetFile(snippetContent); + snippetManager.register(snippets, 'groovy'); - acePack.addScript('ext-language_tools.js', function() { - ace.require("ace/ext/language_tools"); - - editor.$blockScrolling = Infinity; editor.session.setMode("ace/mode/groovy"); editor.setTheme("ace/theme/tomorrow"); editor.setAutoScrollEditorIntoView(true); @@ -60,7 +56,7 @@ jenkinsJSModules.import('ace-editor:ace-editor-122') }); editor.setValue(textarea.val(), 1); - editor.getSession().on('change', function() { + editor.getSession().on('change', function(delta) { textarea.val(editor.getValue()); showSamplesWidget(); }); @@ -108,7 +104,6 @@ jenkinsJSModules.import('ace-editor:ace-editor-122') } } showSamplesWidget(); - }); // Make the editor resizable using jQuery UI resizable (http://api.jqueryui.com/resizable). // ACE Editor doesn't have this as a config option. @@ -129,9 +124,7 @@ jenkinsJSModules.import('ace-editor:ace-editor-122') }) }, }); - }); wrapper.show(); textarea.hide(); } - }); diff --git a/plugin/yarn.lock b/plugin/yarn.lock index 2d0304b81..a58b5e9f9 100644 --- a/plugin/yarn.lock +++ b/plugin/yarn.lock @@ -1064,6 +1064,11 @@ version "4.2.2" resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" +ace-builds@^1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.15.0.tgz#e4e5eee17a1d3d17fc92c1207bbc30f185f260cc" + integrity sha512-L1RXgqxDvzbJ7H8Y2v9lb4kHaZRn5JNTECG+oZTH2EDewMmpQMLDC4GnFKIh3+xb/gk2nVPO7gGwpTYPw91QzA== + acorn-import-assertions@^1.7.6: version "1.8.0" resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" @@ -1872,12 +1877,6 @@ isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" -jenkins-js-modules@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jenkins-js-modules/-/jenkins-js-modules-1.3.0.tgz#d1872a0917a7b4bcae216a598ea7076f874c49be" - dependencies: - window-handle "0.0.6" - jest-worker@^27.4.5: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" @@ -2726,10 +2725,6 @@ wildcard@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" -window-handle@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/window-handle/-/window-handle-0.0.6.tgz#f71cc52f8c21f337ae8785b71c8356e08a263c2e" - word-wrap@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" From f8d1b81c275d7ba653d74f83db14539207b7bd02 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 31 Jan 2023 17:04:16 -0800 Subject: [PATCH 820/932] Fix `no-undef` linter errors --- plugin/src/main/js/snippets/workflow.js | 1 + plugin/src/main/js/workflow-editor.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin/src/main/js/snippets/workflow.js b/plugin/src/main/js/snippets/workflow.js index 49956c9df..d7540600e 100644 --- a/plugin/src/main/js/snippets/workflow.js +++ b/plugin/src/main/js/snippets/workflow.js @@ -1,3 +1,4 @@ +import ace from "ace-builds/src-noconflict/ace"; ace.define("ace/snippets/groovy",["require","exports","module"], function(require, exports, module) { "use strict"; diff --git a/plugin/src/main/js/workflow-editor.js b/plugin/src/main/js/workflow-editor.js index c9859fe9a..db2f2f471 100644 --- a/plugin/src/main/js/workflow-editor.js +++ b/plugin/src/main/js/workflow-editor.js @@ -6,7 +6,7 @@ import 'jquery-ui/ui/widgets/resizable'; import { addSamplesWidget } from './samples'; // Import ACE -import "ace-builds/src-noconflict/ace"; +import ace from "ace-builds/src-noconflict/ace"; import "ace-builds/src-noconflict/ext-language_tools"; import "ace-builds/src-noconflict/mode-groovy"; import "ace-builds/src-noconflict/theme-tomorrow"; From 48ca31ee95b511517f5163b0e99864198ac38ad8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Feb 2023 00:02:11 +0000 Subject: [PATCH 821/932] Bump svnkit-cli from 1.10.9 to 1.10.10 Bumps svnkit-cli from 1.10.9 to 1.10.10. --- updated-dependencies: - dependency-name: org.tmatesoft.svnkit:svnkit-cli dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index 3f54de928..763f66e97 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -257,7 +257,7 @@ org.tmatesoft.svnkit svnkit-cli - 1.10.9 + 1.10.10 test From bf6cd9263589016ce4bfe1b783b7ee8b2ebd37ba Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 8 Feb 2023 11:40:56 -0800 Subject: [PATCH 822/932] [JENKINS-70564] Replay page broken after the Ace editor update --- plugin/src/main/js/workflow-editor.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin/src/main/js/workflow-editor.js b/plugin/src/main/js/workflow-editor.js index db2f2f471..68af6e52e 100644 --- a/plugin/src/main/js/workflow-editor.js +++ b/plugin/src/main/js/workflow-editor.js @@ -9,6 +9,7 @@ import { addSamplesWidget } from './samples'; import ace from "ace-builds/src-noconflict/ace"; import "ace-builds/src-noconflict/ext-language_tools"; import "ace-builds/src-noconflict/mode-groovy"; +import "ace-builds/src-noconflict/snippets/javascript"; import "ace-builds/src-noconflict/theme-tomorrow"; // Import custom snippets @@ -16,6 +17,7 @@ import "./snippets/workflow"; var editorIdCounter = 0; +document.addEventListener("DOMContentLoaded", function() { $('.workflow-editor-wrapper').each(function() { initEditor($(this)); }); @@ -128,3 +130,4 @@ var editorIdCounter = 0; wrapper.show(); textarea.hide(); } +}); From 8afc8e271e05b7adcbd1b58691bb69bbf720cfa4 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 8 Feb 2023 11:45:17 -0800 Subject: [PATCH 823/932] Dark, but not Dark (System), theme support (#654) * Dark theme support * fixup * Apply method restrictions * Make theme-manager optional --- plugin/pom.xml | 11 ++++++++ .../workflow/cps/CpsFlowDefinition.java | 10 ++++++++ .../workflow/cps/replay/ReplayAction.java | 7 ++++++ .../plugins/workflow/cps/view/ThemeUtil.java | 25 +++++++++++++++++++ plugin/src/main/js/workflow-editor.js | 4 ++- .../cps/CpsFlowDefinition/config.jelly | 2 +- .../cps/replay/ReplayAction/index.jelly | 4 +-- .../workflow/editor/workflow-editor.jelly | 5 +++- 8 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/view/ThemeUtil.java diff --git a/plugin/pom.xml b/plugin/pom.xml index 763f66e97..a4e549285 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -180,6 +180,17 @@ + + io.jenkins.plugins + theme-manager + true + + + io.jenkins.blueocean + blueocean-web + + + org.jenkins-ci.plugins scm-api diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java index 02d429ff1..88b787089 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java @@ -37,12 +37,16 @@ import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn; +import org.jenkinsci.plugins.workflow.cps.replay.ReplayAction; +import org.jenkinsci.plugins.workflow.cps.view.ThemeUtil; import org.jenkinsci.plugins.workflow.flow.DurabilityHintProvider; import org.jenkinsci.plugins.workflow.flow.FlowDefinition; import org.jenkinsci.plugins.workflow.flow.FlowDefinitionDescriptor; import org.jenkinsci.plugins.workflow.flow.FlowDurabilityHint; import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner; import org.jenkinsci.plugins.workflow.flow.GlobalDefaultFlowDurabilityLevel; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.stapler.AncestorInPath; import org.kohsuke.stapler.DataBoundConstructor; @@ -180,4 +184,10 @@ public JSON doCheckScriptCompile(@AncestorInPath Item job, @QueryParameter Strin } } + + /** @see ReplayAction#getTheme */ + @Restricted(DoNotUse.class) + /* accessible to Jelly */ public String getTheme() { + return ThemeUtil.getTheme(); + } } diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java index 207821e47..44e2e5c2e 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java @@ -70,6 +70,7 @@ import org.acegisecurity.AccessDeniedException; import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution; +import org.jenkinsci.plugins.workflow.cps.view.ThemeUtil; import org.jenkinsci.plugins.workflow.flow.FlowExecution; import org.jenkinsci.plugins.workflow.flow.FlowExecutionOwner; import org.kohsuke.accmod.Restricted; @@ -199,6 +200,12 @@ private ReplayAction(Run run) { return run; } + /** @see CpsFlowDefinition#getTheme */ + @Restricted(DoNotUse.class) + /* accessible to Jelly */ public String getTheme() { + return ThemeUtil.getTheme(); + } + @Restricted(DoNotUse.class) @RequirePOST public void doRun(StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException { diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/view/ThemeUtil.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/view/ThemeUtil.java new file mode 100644 index 000000000..eaf91e77c --- /dev/null +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/view/ThemeUtil.java @@ -0,0 +1,25 @@ +package org.jenkinsci.plugins.workflow.cps.view; + +import io.jenkins.plugins.thememanager.Theme; +import io.jenkins.plugins.thememanager.ThemeManagerPageDecorator; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; + +@Restricted(NoExternalUse.class) +public final class ThemeUtil { + + private ThemeUtil() { + // Suppress default constructor for noninstantiability + throw new AssertionError(); + } + + public static String getTheme() { + try { + Theme theme = ThemeManagerPageDecorator.get().findTheme(); + return theme.getProperty("ace-editor", "theme").orElse("tomorrow"); + } catch (LinkageError e) { + // Optional plugin not installed + return "tomorrow"; + } + } +} diff --git a/plugin/src/main/js/workflow-editor.js b/plugin/src/main/js/workflow-editor.js index db2f2f471..87c2f24ac 100644 --- a/plugin/src/main/js/workflow-editor.js +++ b/plugin/src/main/js/workflow-editor.js @@ -10,6 +10,7 @@ import ace from "ace-builds/src-noconflict/ace"; import "ace-builds/src-noconflict/ext-language_tools"; import "ace-builds/src-noconflict/mode-groovy"; import "ace-builds/src-noconflict/theme-tomorrow"; +import "ace-builds/src-noconflict/theme-tomorrow_night"; // Import custom snippets import "./snippets/workflow"; @@ -45,7 +46,8 @@ var editorIdCounter = 0; snippetManager.register(snippets, 'groovy'); editor.session.setMode("ace/mode/groovy"); - editor.setTheme("ace/theme/tomorrow"); + var theme = aceContainer.attr("theme") === "tomorrow_night" ? "tomorrow_night" : "tomorrow"; + editor.setTheme("ace/theme/" + theme); editor.setAutoScrollEditorIntoView(true); editor.setOption("minLines", 20); // enable autocompletion and snippets diff --git a/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly index c075a1fd2..6be9df79c 100644 --- a/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly +++ b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly @@ -26,7 +26,7 @@ - + diff --git a/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.jelly index 6a28e8d13..f64d08cd6 100644 --- a/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.jelly +++ b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.jelly @@ -13,11 +13,11 @@

- + - + diff --git a/plugin/src/main/resources/org/jenkinsci/plugins/workflow/editor/workflow-editor.jelly b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/editor/workflow-editor.jelly index 4077eb8ab..62f424ff6 100644 --- a/plugin/src/main/resources/org/jenkinsci/plugins/workflow/editor/workflow-editor.jelly +++ b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/editor/workflow-editor.jelly @@ -5,6 +5,9 @@ The script. + + The ACE editor theme. + @@ -14,7 +17,7 @@