Skip to content

Added enum types and verification #168

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
rcosta358 merged 19 commits into from
Apr 11, 2026
Merged

Added enum types and verification #168

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c70cc5a
Added enum type support with tests
cheestree Mar 3, 2026
e77a33b
Added EnumRefinementMessage test
cheestree Mar 3, 2026
a359d1f
Applied fixes and suggestions for enums
cheestree Mar 4, 2026
a6a4055
Fixed grammar
cheestree Mar 4, 2026
0ab2098
Revert "Fixed grammar"
cheestree Mar 4, 2026
44758c7
Reapply "Fixed grammar"
cheestree Mar 4, 2026
b610928
Separated translation into phases
cheestree Mar 5, 2026
cdf192e
Refactored variable translation
cheestree Mar 5, 2026
d7dea40
Added enum tests
cheestree Mar 8, 2026
e3e49d2
Added enum tests, adjusted grammar
cheestree Mar 11, 2026
aafde53
Moved RefinementMessage test
cheestree Mar 11, 2026
7a7e074
Changed Enumerate to Enum
cheestree Mar 11, 2026
96905c1
Renamed fields and getters/setters
cheestree Mar 11, 2026
8a4e507
Updated variable translation with suggestions
cheestree Mar 30, 2026
2e46e5c
Merge branch 'liquid-java:main' into main
cheestree Mar 30, 2026
2754337
Updated tests to fit with main changes
cheestree Mar 30, 2026
2c23a2e
Extracted enum logic to its own method
cheestree Mar 30, 2026
c85ed97
Apply suggestions from code review
cheestree Mar 30, 2026
2ad2747
Renamed usage
cheestree Mar 30, 2026
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
Prev Previous commit
Next Next commit
Renamed fields and getters/setters
  • Loading branch information
@cheestree
cheestree committed Mar 14, 2026
commit 96905c1ce4ddb7f29a4fcf2a857147816117b4d4
28 changes: 14 additions & 14 deletions liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Enum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@

public class Enum extends Expression {

private final String enumTypeName;
private final String enumConstantName;
private final String typeName;
private final String constName;

public Enum(String enumTypeName, String enumConstantName) {
this.enumTypeName = enumTypeName;
this.enumConstantName = enumConstantName;
public Enum(String typeName, String constName) {
this.typeName = typeName;
this.constName = constName;
}

public String getEnumTypeName() {
return enumTypeName;
public String getTypeName() {
return typeName;
}

public String getEnumConstantName() {
return enumConstantName;
public String getConstName() {
return constName;
}

@Override
Expand All @@ -45,15 +45,15 @@ public boolean isBooleanTrue() {

@Override
public String toString() {
return enumTypeName + "." + enumConstantName;
return typeName + "." + constName;
}

@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((enumTypeName == null) ? 0 : enumTypeName.hashCode());
result = prime * result + ((enumConstantName == null) ? 0 : enumConstantName.hashCode());
result = prime * result + ((typeName == null) ? 0 : typeName.hashCode());
result = prime * result + ((constName == null) ? 0 : constName.hashCode());
return result;
}

Expand All @@ -64,11 +64,11 @@ public boolean equals(Object obj) {
if (obj == null || getClass() != obj.getClass())
return false;
Enum other = (Enum) obj;
return enumTypeName.equals(other.enumTypeName) && enumConstantName.equals(other.enumConstantName);
return typeName.equals(other.typeName) && constName.equals(other.constName);
}

@Override
public Expression clone() {
return new Enum(enumTypeName, enumConstantName);
return new Enum(typeName, constName);
}
}
2 changes: 1 addition & 1 deletion liquidjava-verifier/src/main/java/liquidjava/smt/ExpressionToZ3Visitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,6 @@ public Expr<?> visitUnaryExpression(UnaryExpression exp) throws LJError {

@Override
public Expr<?> visitEnum(Enum en) throws LJError {
return ctx.makeEnum(en.getEnumTypeName(), en.getEnumConstantName());
return ctx.makeEnum(en.getTypeName(), en.getConstName());
}
}
Loading