Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

[operators]feat: add final keyword check on assignment expr #366

Merged
merged 4 commits into from
Oct 6, 2020
Merged

[operators]feat: add final keyword check on assignment expr #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ef2585
fix: add final keyword check on assignment expr
summer-ji-eng Oct 4, 2020
975d59e
Merge branch 'master' into fix_assignment_expr
summer-ji-eng Oct 5, 2020
fd4cf71
Merge branch 'master' into fix_assignment_expr
summer-ji-eng Oct 6, 2020
8305e9b
Merge branch 'master' into fix_assignment_expr
summer-ji-eng Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/main/java/com/google/api/generator/engine/ast/AssignmentExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package com.google.api.generator.engine.ast;

import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;

@AutoValue
public abstract class AssignmentExpr implements Expr {
Expand Down Expand Up @@ -67,6 +68,15 @@ public AssignmentExpr build() {
lhsType.reference().name(), rhsType.reference().name()));
}
}

if (!assignmentExpr.variableExpr().isDecl()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if the decl is final too? That is, I think we can remove the outer check.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind, that would apply only on the general for statement.

Preconditions.checkState(
!assignmentExpr.variableExpr().isFinal(),
String.format(
"Cannot assign a value to final variable '%s'.",
assignmentExpr.variableExpr().variable().name()));
}

return assignmentExpr;
}
}
Expand Down
26 changes: 26 additions & 0 deletions src/test/java/com/google/api/generator/engine/ast/AssignmentExprTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,32 @@ public void writeAssignmentExpr_invalidBoxedPrimitiveType() {
assertInvalidAssignmentExpr(lVariableExpr, rVariableExpr);
}

@Test
public void writeAssignmentExpr_validIsDeclFinalVariableExpr() {
Variable lVariable = Variable.builder().setName("x").setType(TypeNode.INT).build();
VariableExpr lVariableExpr =
VariableExpr.builder().setVariable(lVariable).setIsDecl(true).setIsFinal(true).build();

ValueExpr valueExpr =
ValueExpr.withValue(PrimitiveValue.builder().setType(TypeNode.INT).setValue("0").build());
assertValidAssignmentExpr(lVariableExpr, valueExpr);
}

@Test
public void writeAssignmentExpr_invalidIsNotDeclFinalVariableExpr() {
Variable lVariable = Variable.builder().setName("x").setType(TypeNode.INT).build();
VariableExpr lVariableExpr =
VariableExpr.builder().setVariable(lVariable).setIsDecl(false).setIsFinal(true).build();

ValueExpr valueExpr =
ValueExpr.withValue(PrimitiveValue.builder().setType(TypeNode.INT).setValue("0").build());
assertThrows(
IllegalStateException.class,
() -> {
AssignmentExpr.builder().setVariableExpr(lVariableExpr).setValueExpr(valueExpr).build();
});
}

private static void assertInvalidAssignmentExpr(VariableExpr variableExpr, Expr valueExpr) {
assertThrows(
TypeMismatchException.class,
Expand Down