Skip to content

Commit

Permalink
GROOVY-5746
Browse files Browse the repository at this point in the history
  • Loading branch information
eric-milles committed Oct 21, 2021
1 parent f4c4abf commit 2b4f3ca
Show file tree
Hide file tree
Showing 11 changed files with 367 additions and 68 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,28 @@ public void testCompileStatic1521() {
runNegativeTest(sources, "");
}

@Test
public void testCompileStatic5746() {
//@formatter:off
String[] sources = {
"Main.groovy",
"import groovy.transform.*\n" +

"@Field int i = 0\n" +
"int getIndex() { i++ }\n" +
"@CompileStatic void test() {\n" +
" def list = ['x','y','z']\n" +
" print(list[index] += '!')\n" +
" print(list[index] += '!')\n" +
" print(list)\n" +
"}\n" +
"test()\n",
};
//@formatter:on

runConformTest(sources, "x!y![x!, y!, z]");
}

@Test
public void testCompileStatic6095() {
//@formatter:off
Expand Down
1 change: 1 addition & 0 deletions base/org.codehaus.groovy25/.checkstyle
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
<file-match-pattern match-pattern="groovy/transform/NewifyASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/TupleConstructorASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/StaticCompilationVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/TemporaryVariableExpression.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/transformers/(Binary|MethodCall)ExpressionTransformer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/transformers/ConstructorCallTransformer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/transformers/CompareToNullExpression.java" include-pattern="false" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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 org.codehaus.groovy.transform.sc;

import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.GroovyCodeVisitor;
import org.codehaus.groovy.ast.expr.Expression;
import org.codehaus.groovy.ast.expr.ExpressionTransformer;
import org.codehaus.groovy.classgen.AsmClassGenerator;
import org.codehaus.groovy.classgen.asm.ExpressionAsVariableSlot;
import org.codehaus.groovy.classgen.asm.WriterController;

import static org.codehaus.groovy.transform.stc.StaticTypesMarker.INFERRED_TYPE;

/**
* A front-end class for {@link org.codehaus.groovy.classgen.asm.ExpressionAsVariableSlot} which
* allows defining temporary variables loaded from variable slots directly at the AST level,
* without any knowledge of {@link org.codehaus.groovy.classgen.AsmClassGenerator}.
*
* @since 2.4.0
*/
public class TemporaryVariableExpression extends Expression {

private final Expression expression;

private ExpressionAsVariableSlot[] variable = {null};

public TemporaryVariableExpression(final Expression expression) {
this.expression = expression;
putNodeMetaData(INFERRED_TYPE, expression.getNodeMetaData(INFERRED_TYPE));
}

@Override
public Expression transformExpression(final ExpressionTransformer transformer) {
TemporaryVariableExpression result = new TemporaryVariableExpression(transformer.transform(expression));
result.copyNodeMetaData(this);
result.variable = variable;
return result;
}

@Override
public void visit(final GroovyCodeVisitor visitor) {
if (visitor instanceof AsmClassGenerator) {
if (variable[0] == null) {
WriterController controller = ((AsmClassGenerator) visitor).getController();
variable[0] = new ExpressionAsVariableSlot(controller, expression);
}
variable[0].visit(visitor);
} else {
expression.visit(visitor);
}
}

public void remove(final WriterController controller) {
controller.getCompileStack().removeVar(variable[0].getIndex());
variable[0] = null;
}

@Override
public ClassNode getType() {
return expression.getType();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.codehaus.groovy.syntax.Types;
import org.codehaus.groovy.transform.sc.ListOfExpressionsExpression;
import org.codehaus.groovy.transform.sc.StaticCompilationMetadataKeys;
import org.codehaus.groovy.transform.sc.TemporaryVariableExpression;
import org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport;
import org.codehaus.groovy.transform.stc.StaticTypesMarker;

Expand Down Expand Up @@ -282,6 +283,17 @@ public Expression transform(final Expression expression) {
call.setSourcePosition(bin);
return call;
}
// GRECLIPSE add -- GROOVY-5746
if (left instanceof BinaryExpression) {
BinaryExpression be = (BinaryExpression) left;
if (be.getOperation().getType() == Types.LEFT_SQUARE_BRACKET) {
be.setLeftExpression(new TemporaryVariableExpression(be.getLeftExpression()));
be.setRightExpression(new TemporaryVariableExpression(be.getRightExpression()));
((BinaryExpression) expr).setLeftExpression(be.getLeftExpression());
((BinaryExpression) expr).setRightExpression(be.getRightExpression());
}
}
// GRECLIPSE end
expr = new BinaryExpression(left, Token.newSymbol(Types.EQUAL, operation.getStartLine(), operation.getStartColumn()), call);
expr.putNodeMetaData("original.operator", operation);
expr.setSourcePosition(bin);
Expand Down
1 change: 1 addition & 0 deletions base/org.codehaus.groovy30/.checkstyle
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
<file-match-pattern match-pattern="groovy/transform/LogASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/NullCheckASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/TupleConstructorASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/TemporaryVariableExpression.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/transformers/(Binary|MethodCall)ExpressionTransformer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/stc/AbstractExtensionMethodCache.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/stc/StaticTypeCheckingSupport.java" include-pattern="false" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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 org.codehaus.groovy.transform.sc;

import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.GroovyCodeVisitor;
import org.codehaus.groovy.ast.expr.Expression;
import org.codehaus.groovy.ast.expr.ExpressionTransformer;
import org.codehaus.groovy.classgen.AsmClassGenerator;
import org.codehaus.groovy.classgen.asm.ExpressionAsVariableSlot;
import org.codehaus.groovy.classgen.asm.WriterController;

import static org.codehaus.groovy.transform.stc.StaticTypesMarker.INFERRED_TYPE;

/**
* A front-end class for {@link org.codehaus.groovy.classgen.asm.ExpressionAsVariableSlot} which
* allows defining temporary variables loaded from variable slots directly at the AST level,
* without any knowledge of {@link org.codehaus.groovy.classgen.AsmClassGenerator}.
*
* @since 2.4.0
*/
public class TemporaryVariableExpression extends Expression {

private final Expression expression;

private ExpressionAsVariableSlot[] variable = {null};

public TemporaryVariableExpression(final Expression expression) {
this.expression = expression;
putNodeMetaData(INFERRED_TYPE, expression.getNodeMetaData(INFERRED_TYPE));
}

@Override
public Expression transformExpression(final ExpressionTransformer transformer) {
TemporaryVariableExpression result = new TemporaryVariableExpression(transformer.transform(expression));
result.copyNodeMetaData(this);
result.variable = variable;
return result;
}

@Override
public void visit(final GroovyCodeVisitor visitor) {
if (visitor instanceof AsmClassGenerator) {
if (variable[0] == null) {
WriterController controller = ((AsmClassGenerator) visitor).getController();
variable[0] = new ExpressionAsVariableSlot(controller, expression);
}
variable[0].visit(visitor);
} else {
expression.visit(visitor);
}
}

public void remove(final WriterController controller) {
controller.getCompileStack().removeVar(variable[0].getIndex());
variable[0] = null;
}

@Override
public ClassNode getType() {
return expression.getType();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.codehaus.groovy.syntax.Types;
import org.codehaus.groovy.transform.sc.ListOfExpressionsExpression;
import org.codehaus.groovy.transform.sc.StaticCompilationMetadataKeys;
import org.codehaus.groovy.transform.sc.TemporaryVariableExpression;
import org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport;
import org.codehaus.groovy.transform.stc.StaticTypesMarker;

Expand Down Expand Up @@ -256,6 +257,17 @@ public Expression transform(final Expression expression) {
return call;
}
// case of +=, -=, /=, ...
// GRECLIPSE add -- GROOVY-5746
if (left instanceof BinaryExpression) {
BinaryExpression be = (BinaryExpression) left;
if (be.getOperation().getType() == Types.LEFT_SQUARE_BRACKET) {
be.setLeftExpression(new TemporaryVariableExpression(be.getLeftExpression()));
be.setRightExpression(new TemporaryVariableExpression(be.getRightExpression()));
((BinaryExpression) expr).setLeftExpression(be.getLeftExpression());
((BinaryExpression) expr).setRightExpression(be.getRightExpression());
}
}
// GRECLIPSE end
// the method represents the operation type only, and we must add an assignment
expr = binX(left, Token.newSymbol(Types.EQUAL, operation.getStartLine(), operation.getStartColumn()), call);
// GRECLIPSE add
Expand Down
1 change: 1 addition & 0 deletions base/org.codehaus.groovy40/.checkstyle
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<file-match-pattern match-pattern="groovy/transform/ASTTransformationVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/(Field|Log|NullCheck)ASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/NotYetImplemented.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/TemporaryVariableExpression.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/transformers/(Binary|MethodCall)ExpressionTransformer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/stc/StaticTypeCheckingSupport.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/stc/StaticTypeCheckingVisitor.java" include-pattern="false" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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 org.codehaus.groovy.transform.sc;

import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.GroovyCodeVisitor;
import org.codehaus.groovy.ast.expr.Expression;
import org.codehaus.groovy.ast.expr.ExpressionTransformer;
import org.codehaus.groovy.classgen.AsmClassGenerator;
import org.codehaus.groovy.classgen.asm.ExpressionAsVariableSlot;
import org.codehaus.groovy.classgen.asm.WriterController;

import static org.codehaus.groovy.transform.stc.StaticTypesMarker.INFERRED_TYPE;

/**
* A front-end class for {@link org.codehaus.groovy.classgen.asm.ExpressionAsVariableSlot} which
* allows defining temporary variables loaded from variable slots directly at the AST level,
* without any knowledge of {@link org.codehaus.groovy.classgen.AsmClassGenerator}.
*
* @since 2.4.0
*/
public class TemporaryVariableExpression extends Expression {

private final Expression expression;

private ExpressionAsVariableSlot[] variable = {null};

public TemporaryVariableExpression(final Expression expression) {
this.expression = expression;
putNodeMetaData(INFERRED_TYPE, expression.getNodeMetaData(INFERRED_TYPE));
}

@Override
public Expression transformExpression(final ExpressionTransformer transformer) {
TemporaryVariableExpression result = new TemporaryVariableExpression(transformer.transform(expression));
result.copyNodeMetaData(this);
result.variable = variable;
return result;
}

@Override
public void visit(final GroovyCodeVisitor visitor) {
if (visitor instanceof AsmClassGenerator) {
if (variable[0] == null) {
WriterController controller = ((AsmClassGenerator) visitor).getController();
variable[0] = new ExpressionAsVariableSlot(controller, expression);
}
variable[0].visit(visitor);
} else {
expression.visit(visitor);
}
}

public void remove(final WriterController controller) {
controller.getCompileStack().removeVar(variable[0].getIndex());
variable[0] = null;
}

@Override
public ClassNode getType() {
return expression.getType();
}
}
Loading

0 comments on commit 2b4f3ca

Please sign in to comment.