abstract visitor

Kirill Golubev · Kirill Golubev · commit 51521f0bbdb7 · 2022-11-12T14:43:57.000+03:00
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/AliasInvocation.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/AliasInvocation.java
@@ -29,7 +29,7 @@ public List<Expression> getArgs() {
 
     @Override
     public void accept(ExpressionVisitor v) {
-        getArgs().forEach(a -> a.accept(v));
+        v.visitAliasInvocation(this);
     }
 
     @Override
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/BinaryExpression.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/BinaryExpression.java
@@ -47,8 +47,7 @@ public boolean isArithmeticOperation() {
 
     @Override
     public void accept(ExpressionVisitor v) {
-        getFirstOperand().accept(v);
-        getSecondOperand().accept(v);
+        v.visitBinaryExpression(this);
     }
 
     @Override
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/FunctionInvocation.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/FunctionInvocation.java
@@ -34,7 +34,7 @@ public void setChild(int index, Expression element) {
 
     @Override
     public void accept(ExpressionVisitor v) {
-        getArgs().forEach(a -> a.accept(v));
+        v.visitFunctionInvocation(this);
     }
 
     @Override
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/GroupExpression.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/GroupExpression.java
@@ -18,7 +18,7 @@ public Expression getExpression() {
 
     @Override
     public void accept(ExpressionVisitor v) {
-        getExpression().accept(v);
+        v.visitGroupExpression(this);
     }
 
     @Override
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Ite.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Ite.java
@@ -28,9 +28,7 @@ public Expression getElse() {
 
     @Override
     public void accept(ExpressionVisitor v) {
-        getCondition().accept(v);
-        getThen().accept(v);
-        getElse().accept(v);
+        v.visitITE(this);
     }
 
     @Override
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/LiteralBoolean.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/LiteralBoolean.java
@@ -19,7 +19,9 @@ public LiteralBoolean(String value) {
     }
 
     @Override
-    public void accept(ExpressionVisitor v) {}
+    public void accept(ExpressionVisitor v) {
+        v.visitLiteralBoolean(this);
+    }
 
     public ExprWrapper eval(SMTWrapper ctx) {
         return ctx.makeBooleanLiteral(value);
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/LiteralInt.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/LiteralInt.java
@@ -19,7 +19,9 @@ public LiteralInt(String v) {
     }
 
     @Override
-    public void accept(ExpressionVisitor v) {}
+    public void accept(ExpressionVisitor v) {
+        v.visitLiteralInt(this);
+    }
 
     @Override
     public ExprWrapper eval(SMTWrapper ctx) {
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/LiteralReal.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/LiteralReal.java
@@ -19,7 +19,9 @@ public LiteralReal(String v) {
     }
 
     @Override
-    public void accept(ExpressionVisitor v) {}
+    public void accept(ExpressionVisitor v) {
+        v.visitLiteralReal(this);
+    }
 
     @Override
     public ExprWrapper eval(SMTWrapper ctx) {
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/LiteralString.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/LiteralString.java
@@ -14,7 +14,9 @@ public LiteralString(String v) {
     }
 
     @Override
-    public void accept(ExpressionVisitor v) {}
+    public void accept(ExpressionVisitor v) {
+        v.visitLiteralString(this);
+    }
 
     @Override
     public ExprWrapper eval(SMTWrapper ctx) {
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/UnaryExpression.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/UnaryExpression.java
@@ -24,7 +24,9 @@ public String getOp() {
     }
 
     @Override
-    public void accept(ExpressionVisitor v) {}
+    public void accept(ExpressionVisitor v) {
+        v.visitUnaryExpression(this);
+    }
 
     @Override
     public ExprWrapper eval(SMTWrapper ctx) throws Exception {
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Var.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Var.java
@@ -19,7 +19,9 @@ public String getName() {
     }
 
     @Override
-    public void accept(ExpressionVisitor v) {}
+    public void accept(ExpressionVisitor v) {
+        v.visitVar(this);
+    }
 
     @Override
     public ExprWrapper eval(SMTWrapper ctx) throws Exception {
diff --git a/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/visitors/AbstractExpressionVisitor.java b/liquidjava-umbrella/liquidjava-verifier/src/main/java/liquidjava/rj_language/visitors/AbstractExpressionVisitor.java
@@ -0,0 +1,53 @@
+package liquidjava.rj_language.visitors;
+
+import liquidjava.rj_language.ast.*;
+
+public class AbstractExpressionVisitor implements ExpressionVisitor{
+    @Override
+    public void visitAliasInvocation(AliasInvocation ai) {
+        ai.getArgs().forEach(a -> a.accept(this));
+    }
+
+    @Override
+    public void visitBinaryExpression(BinaryExpression be) {
+        be.getFirstOperand().accept(this);
+        be.getSecondOperand().accept(this);
+    }
+
+    @Override
+    public void visitFunctionInvocation(FunctionInvocation fi) {
+        fi.getArgs().forEach(a -> a.accept(this));
+    }
+
+    @Override
+    public void visitGroupExpression(GroupExpression ge) {
+        ge.getExpression().accept(this);
+    }
+
+    @Override
+    public void visitITE(Ite ite) {
+        ite.getCondition().accept(this);
+        ite.getThen().accept(this);
+        ite.getElse().accept(this);
+    }
+
+    @Override
+    public void visitLiteralBoolean(LiteralBoolean lb) {}
+
+    @Override
+    public void visitLiteralInt(LiteralInt li) {}
+
+    @Override
+    public void visitLiteralReal(LiteralReal lr) {}
+
+    @Override
+    public void visitLiteralString(LiteralString ls) {}
+
+    @Override
+    public void visitUnaryExpression(UnaryExpression ue) {
+        ue.getExpression().accept(this);
+    }
+
+    @Override
+    public void visitVar(Var v) {}
+}

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public List<Expression> getArgs() {`
`29`	`29`
`30`	`30`	`@Override`
`31`	`31`	`public void accept(ExpressionVisitor v) {`
`32`		`- getArgs().forEach(a -> a.accept(v));`
	`32`	`+ v.visitAliasInvocation(this);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ public boolean isArithmeticOperation() {`
`47`	`47`
`48`	`48`	`@Override`
`49`	`49`	`public void accept(ExpressionVisitor v) {`
`50`		`- getFirstOperand().accept(v);`
`51`		`- getSecondOperand().accept(v);`
	`50`	`+ v.visitBinaryExpression(this);`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void setChild(int index, Expression element) {`
`34`	`34`
`35`	`35`	`@Override`
`36`	`36`	`public void accept(ExpressionVisitor v) {`
`37`		`- getArgs().forEach(a -> a.accept(v));`
	`37`	`+ v.visitFunctionInvocation(this);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public Expression getExpression() {`
`18`	`18`
`19`	`19`	`@Override`
`20`	`20`	`public void accept(ExpressionVisitor v) {`
`21`		`- getExpression().accept(v);`
	`21`	`+ v.visitGroupExpression(this);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,7 @@ public Expression getElse() {`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public void accept(ExpressionVisitor v) {`
`31`		`- getCondition().accept(v);`
`32`		`- getThen().accept(v);`
`33`		`- getElse().accept(v);`
	`31`	`+ v.visitITE(this);`
`34`	`32`	`}`
`35`	`33`
`36`	`34`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ public LiteralBoolean(String value) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- public void accept(ExpressionVisitor v) {}`
	`22`	`+ public void accept(ExpressionVisitor v) {`
	`23`	`+ v.visitLiteralBoolean(this);`
	`24`	`+ }`
`23`	`25`
`24`	`26`	`public ExprWrapper eval(SMTWrapper ctx) {`
`25`	`27`	`return ctx.makeBooleanLiteral(value);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ public LiteralInt(String v) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- public void accept(ExpressionVisitor v) {}`
	`22`	`+ public void accept(ExpressionVisitor v) {`
	`23`	`+ v.visitLiteralInt(this);`
	`24`	`+ }`
`23`	`25`
`24`	`26`	`@Override`
`25`	`27`	`public ExprWrapper eval(SMTWrapper ctx) {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ public LiteralReal(String v) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- public void accept(ExpressionVisitor v) {}`
	`22`	`+ public void accept(ExpressionVisitor v) {`
	`23`	`+ v.visitLiteralReal(this);`
	`24`	`+ }`
`23`	`25`
`24`	`26`	`@Override`
`25`	`27`	`public ExprWrapper eval(SMTWrapper ctx) {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,9 @@ public LiteralString(String v) {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`@Override`
`17`		`- public void accept(ExpressionVisitor v) {}`
	`17`	`+ public void accept(ExpressionVisitor v) {`
	`18`	`+ v.visitLiteralString(this);`
	`19`	`+ }`
`18`	`20`
`19`	`21`	`@Override`
`20`	`22`	`public ExprWrapper eval(SMTWrapper ctx) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@ public String getOp() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
`27`		`- public void accept(ExpressionVisitor v) {}`
	`27`	`+ public void accept(ExpressionVisitor v) {`
	`28`	`+ v.visitUnaryExpression(this);`
	`29`	`+ }`
`28`	`30`
`29`	`31`	`@Override`
`30`	`32`	`public ExprWrapper eval(SMTWrapper ctx) throws Exception {`