Skip to content

Minor fixes needed for contract-chameleon #131

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

Open
Robert-Brune wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Minor fixes needed for contract-chameleon #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1c9050
Add own snapshot version
Robert-Brune Oct 6, 2025
65892c2
Merge pull request #1 from Contract-LIB/fix/jml-parser
Robert-Brune Nov 18, 2025
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
2 changes: 1 addition & 1 deletion javaparser-core-generators/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>jmlparser-parent</artifactId>
<groupId>io.github.jmltoolkit</groupId>
<version>3.27.0-b7-SNAPSHOT</version>
<version>3.27.0-c1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion javaparser-core-metamodel-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>jmlparser-parent</artifactId>
<groupId>io.github.jmltoolkit</groupId>
<version>3.27.0-b7-SNAPSHOT</version>
<version>3.27.0-c1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion javaparser-core-serialization/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>jmlparser-parent</artifactId>
<groupId>io.github.jmltoolkit</groupId>
<version>3.27.0-b7-SNAPSHOT</version>
<version>3.27.0-c1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion javaparser-core-testing-bdd/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>jmlparser-parent</artifactId>
<groupId>io.github.jmltoolkit</groupId>
<version>3.27.0-b7-SNAPSHOT</version>
<version>3.27.0-c1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion javaparser-core-testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>jmlparser-parent</artifactId>
<groupId>io.github.jmltoolkit</groupId>
<version>3.27.0-b7-SNAPSHOT</version>
<version>3.27.0-c1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion javaparser-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>jmlparser-parent</artifactId>
<groupId>io.github.jmltoolkit</groupId>
<version>3.27.0-b7-SNAPSHOT</version>
<version>3.27.0-c1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
10 changes: 10 additions & 0 deletions .../github/javaparser/ast/validator/language_level_validations/chunks/ModifierValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.github.javaparser.ast.stmt.CatchClause;
import com.github.javaparser.ast.validator.ProblemReporter;
import com.github.javaparser.ast.validator.VisitorValidator;
import com.github.javaparser.ast.jml.body.JmlFieldDeclaration;
import com.github.javaparser.utils.SeparatedItemStringBuilder;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -116,6 +117,13 @@ public void visit(ConstructorDeclaration n, ProblemReporter reporter) {
super.visit(n, reporter);
}

@Override
public void visit(JmlFieldDeclaration n, ProblemReporter reporter) {
//Adds model, ghost, and instance to the allowed modifiers
validateModifiers(n.getDecl(), reporter, PUBLIC, PROTECTED, PRIVATE, STATIC, FINAL, TRANSIENT, VOLATILE, JML_GHOST, JML_MODEL, JML_INSTANCE);
super.visit(n.getDecl(), reporter);
}

@Override
public void visit(FieldDeclaration n, ProblemReporter reporter) {
validateModifiers(n, reporter, PUBLIC, PROTECTED, PRIVATE, STATIC, FINAL, TRANSIENT, VOLATILE);
Expand Down Expand Up @@ -186,6 +194,8 @@ public void visit(ModuleRequiresDirective n, ProblemReporter reporter) {
private <T extends NodeWithModifiers<?> & NodeWithTokenRange<?>> void validateModifiers(T n, ProblemReporter reporter, Modifier.Keyword... allowedModifiers) {
validateAtMostOneOf(n, reporter, PUBLIC, PROTECTED, PRIVATE);
validateAtMostOneOf(n, reporter, FINAL, ABSTRACT);
validateAtMostOneOf(n, reporter, JML_INSTANCE, STATIC);
validateAtMostOneOf(n, reporter, JML_MODEL, JML_GHOST);
if (hasStrictfp) {
validateAtMostOneOf(n, reporter, NATIVE, STRICTFP);
} else {
Expand Down
96 changes: 55 additions & 41 deletions javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinterVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,6 +997,17 @@ void wrapInJmlIfNeeded(Runnable run) {
}
}

void wrapInJmlIfNeededBlock(Runnable run) {
boolean b = inJmlComment();
if (!b) {
startJmlComment(false, new NodeList<>());
run.run();
endJmlComment();
} else {
run.run();
}
}

@Override
public void visit(JmlCallableClause n, Void arg) {
printOrphanCommentsBeforeThisChildNode(n);
Expand Down Expand Up @@ -1031,58 +1042,61 @@ public void visit(JmlClauseIf n, Void arg) {

@Override
public void visit(JmlClassExprDeclaration n, Void arg) {
printOrphanCommentsBeforeThisChildNode(n);
printModifiers(n.getModifiers());
printer.print("invariant ");
n.getInvariant().accept(this, arg);
printer.print(";");
wrapInJmlIfNeeded(() -> {
printOrphanCommentsBeforeThisChildNode(n);
printModifiers(n.getModifiers());
printer.print("invariant ");
n.getInvariant().accept(this, arg);
printer.print(";");
});
}

@Override
public void visit(JmlClassAccessibleDeclaration n, Void arg) {
printOrphanCommentsBeforeThisChildNode(n);
printModifiers(n.getModifiers());
printer.print("accessible");
printer.print(" ");
n.getVariable().accept(this, arg);
printer.print(" : ");
printList(n.getExpressions(), ", ");
if (n.getMeasuredBy().isPresent()) {
printer.print("\\measured_by");
n.getMeasuredBy().get().accept(this, arg);
}
printer.print(";");
wrapInJmlIfNeeded(() -> {
printModifiers(n.getModifiers());
printer.print("accessible");
printer.print(" ");
n.getVariable().accept(this, arg);
printer.print(" : ");
printList(n.getExpressions(), ", ");
if (n.getMeasuredBy().isPresent()) {
printer.print("\\measured_by");
n.getMeasuredBy().get().accept(this, arg);
}
printer.print(";");
});
}

@Override
public void visit(JmlRepresentsDeclaration n, Void arg) {
printOrphanCommentsBeforeThisChildNode(n);
printModifiers(n.getModifiers());
printer.print("represents");
printer.print(" ");
n.getName().accept(this, arg);
printer.print(" = ");
n.getExpr().accept(this, arg);
printer.print(";");
wrapInJmlIfNeeded(() -> {
printOrphanCommentsBeforeThisChildNode(n);
printModifiers(n.getModifiers());
printer.print("represents");
printer.print(" ");
n.getName().accept(this, arg);
printer.print(" = ");
n.getExpr().accept(this, arg);
printer.print(";");
});
}

@Override
public void visit(JmlContract n, Void arg) {
printOrphanCommentsBeforeThisChildNode(n);
boolean openedJml = inJmlComment();
if (!openedJml)
startJmlComment(false, n.getJmlTags());
printModifiers(n.getModifiers());
printer.print(" ");
printer.print(n.getBehavior().jmlSymbol());
printer.indent();
printer.println();
printList(n.getClauses(), "");
printer.indent();
printList(n.getSubContracts(), "", "", "", "{|\n", "|}");
printer.unindent().unindent();
if (!openedJml)
endJmlComment();
wrapInJmlIfNeededBlock(() -> {
printModifiers(n.getModifiers());
printer.print(" ");
printer.print(n.getBehavior().jmlSymbol());
printer.indent();
printer.println();
printList(n.getClauses(), "");
printer.indent();
printList(n.getSubContracts(), "", "", "", "{|\n", "|}");
printer.unindent().unindent();
});
}

private void endJmlComment() {
Expand Down Expand Up @@ -1176,9 +1190,9 @@ public void visit(JmlDocType n, Void arg) {

@Override
public void visit(JmlFieldDeclaration n, Void arg) {
startJmlComment(false, new NodeList<>());
n.getDecl().accept(this, null);
endJmlComment();
wrapInJmlIfNeeded(() -> {
n.getDecl().accept(this, null);
});
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion javaparser-symbol-solver-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>jmlparser-parent</artifactId>
<groupId>io.github.jmltoolkit</groupId>
<version>3.27.0-b7-SNAPSHOT</version>
<version>3.27.0-c1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion javaparser-symbol-solver-testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>jmlparser-parent</artifactId>
<groupId>io.github.jmltoolkit</groupId>
<version>3.27.0-b7-SNAPSHOT</version>
<version>3.27.0-c1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion jmlparser-jml-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>jmlparser-parent</artifactId>
<groupId>io.github.jmltoolkit</groupId>
<version>3.27.0-b7-SNAPSHOT</version>
<version>3.27.0-c1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<groupId>io.github.jmltoolkit</groupId>
<artifactId>jmlparser-parent</artifactId>
<packaging>pom</packaging>
<version>3.27.0-b7-SNAPSHOT</version>
<version>3.27.0-c1-SNAPSHOT</version>

<name>jmlparser-parent</name>
<url>https://github.com/wadoon/jmlparser</url>
Expand Down