From 586c2bb5d96e69ea0cd420cd3880b9109e7f6f19 Mon Sep 17 00:00:00 2001 From: Marvin Kaiser Date: Tue, 14 Jan 2020 08:50:45 +0100 Subject: [PATCH] renamed whileLoop to WhileLoop --- src/main/java/de/hsrm/compiler/Klang/ContextAnalysis.java | 4 ++-- .../Klang/nodes/loops/{whileLoop.java => WhileLoop.java} | 4 ++-- .../java/de/hsrm/compiler/Klang/visitors/EvalVisitor.java | 4 ++-- src/main/java/de/hsrm/compiler/Klang/visitors/GenASM.java | 4 ++-- src/main/java/de/hsrm/compiler/Klang/visitors/GetVars.java | 4 ++-- .../de/hsrm/compiler/Klang/visitors/PrettyPrintVisitor.java | 2 +- src/main/java/de/hsrm/compiler/Klang/visitors/Visitor.java | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/de/hsrm/compiler/Klang/nodes/loops/{whileLoop.java => WhileLoop.java} (83%) diff --git a/src/main/java/de/hsrm/compiler/Klang/ContextAnalysis.java b/src/main/java/de/hsrm/compiler/Klang/ContextAnalysis.java index c24d08d..3ff9950 100644 --- a/src/main/java/de/hsrm/compiler/Klang/ContextAnalysis.java +++ b/src/main/java/de/hsrm/compiler/Klang/ContextAnalysis.java @@ -6,7 +6,7 @@ import java.util.HashSet; import de.hsrm.compiler.Klang.nodes.*; import de.hsrm.compiler.Klang.nodes.expressions.*; import de.hsrm.compiler.Klang.nodes.loops.DoWhileLoop; -import de.hsrm.compiler.Klang.nodes.loops.whileLoop; +import de.hsrm.compiler.Klang.nodes.loops.WhileLoop; import de.hsrm.compiler.Klang.nodes.statements.*; import de.hsrm.compiler.Klang.types.Type; @@ -63,7 +63,7 @@ public class ContextAnalysis extends KlangBaseVisitor { public Node visitWhileLoop(KlangParser.WhileLoopContext ctx) { Node condition = this.visit(ctx.cond); Node block = this.visit(ctx.braced_block()); - return new whileLoop((Expression) condition, (Block) block); + return new WhileLoop((Expression) condition, (Block) block); } @Override diff --git a/src/main/java/de/hsrm/compiler/Klang/nodes/loops/whileLoop.java b/src/main/java/de/hsrm/compiler/Klang/nodes/loops/WhileLoop.java similarity index 83% rename from src/main/java/de/hsrm/compiler/Klang/nodes/loops/whileLoop.java rename to src/main/java/de/hsrm/compiler/Klang/nodes/loops/WhileLoop.java index e217263..c422bcb 100644 --- a/src/main/java/de/hsrm/compiler/Klang/nodes/loops/whileLoop.java +++ b/src/main/java/de/hsrm/compiler/Klang/nodes/loops/WhileLoop.java @@ -5,13 +5,13 @@ import de.hsrm.compiler.Klang.nodes.statements.Statement;; import de.hsrm.compiler.Klang.nodes.expressions.Expression; import de.hsrm.compiler.Klang.visitors.Visitor; -public class whileLoop extends Statement { +public class WhileLoop extends Statement { public Expression cond; public Block block; public Block alt; - public whileLoop(Expression cond, Block block) { + public WhileLoop(Expression cond, Block block) { this.cond = cond; this.block = block; } diff --git a/src/main/java/de/hsrm/compiler/Klang/visitors/EvalVisitor.java b/src/main/java/de/hsrm/compiler/Klang/visitors/EvalVisitor.java index 223ddd2..13d7b6d 100644 --- a/src/main/java/de/hsrm/compiler/Klang/visitors/EvalVisitor.java +++ b/src/main/java/de/hsrm/compiler/Klang/visitors/EvalVisitor.java @@ -9,7 +9,7 @@ import de.hsrm.compiler.Klang.nodes.FunctionDefinition; import de.hsrm.compiler.Klang.nodes.Program; import de.hsrm.compiler.Klang.nodes.expressions.*; import de.hsrm.compiler.Klang.nodes.loops.DoWhileLoop; -import de.hsrm.compiler.Klang.nodes.loops.whileLoop; +import de.hsrm.compiler.Klang.nodes.loops.WhileLoop; import de.hsrm.compiler.Klang.nodes.statements.*; public class EvalVisitor implements Visitor { @@ -154,7 +154,7 @@ public class EvalVisitor implements Visitor { } @Override - public Value visit(whileLoop e) { + public Value visit(WhileLoop e) { Value condition = e.cond.welcome(this); Value result = null; while (condition.asInteger() != 0) { diff --git a/src/main/java/de/hsrm/compiler/Klang/visitors/GenASM.java b/src/main/java/de/hsrm/compiler/Klang/visitors/GenASM.java index 63a1384..f4a6a98 100644 --- a/src/main/java/de/hsrm/compiler/Klang/visitors/GenASM.java +++ b/src/main/java/de/hsrm/compiler/Klang/visitors/GenASM.java @@ -9,7 +9,7 @@ import java.util.TreeSet; import de.hsrm.compiler.Klang.nodes.*; import de.hsrm.compiler.Klang.nodes.expressions.*; import de.hsrm.compiler.Klang.nodes.loops.DoWhileLoop; -import de.hsrm.compiler.Klang.nodes.loops.whileLoop; +import de.hsrm.compiler.Klang.nodes.loops.WhileLoop; import de.hsrm.compiler.Klang.nodes.statements.*; public class GenASM implements Visitor { @@ -293,7 +293,7 @@ public class GenASM implements Visitor { } @Override - public Void visit(whileLoop e) { + public Void visit(WhileLoop e) { int lblCond = ++lCount; int lblEnd = ++lCount; this.ex.write(".L" + lblCond + ":\n"); diff --git a/src/main/java/de/hsrm/compiler/Klang/visitors/GetVars.java b/src/main/java/de/hsrm/compiler/Klang/visitors/GetVars.java index 1fca9b3..5faa807 100644 --- a/src/main/java/de/hsrm/compiler/Klang/visitors/GetVars.java +++ b/src/main/java/de/hsrm/compiler/Klang/visitors/GetVars.java @@ -5,7 +5,7 @@ import java.util.Set; import de.hsrm.compiler.Klang.nodes.*; import de.hsrm.compiler.Klang.nodes.expressions.*; import de.hsrm.compiler.Klang.nodes.loops.DoWhileLoop; -import de.hsrm.compiler.Klang.nodes.loops.whileLoop; +import de.hsrm.compiler.Klang.nodes.loops.WhileLoop; import de.hsrm.compiler.Klang.nodes.statements.*; class GetVars implements Visitor { @@ -122,7 +122,7 @@ class GetVars implements Visitor { } @Override - public Void visit(whileLoop e) { + public Void visit(WhileLoop e) { e.cond.welcome(this); e.block.welcome(this); return null; diff --git a/src/main/java/de/hsrm/compiler/Klang/visitors/PrettyPrintVisitor.java b/src/main/java/de/hsrm/compiler/Klang/visitors/PrettyPrintVisitor.java index 37a3da7..2108d7b 100644 --- a/src/main/java/de/hsrm/compiler/Klang/visitors/PrettyPrintVisitor.java +++ b/src/main/java/de/hsrm/compiler/Klang/visitors/PrettyPrintVisitor.java @@ -206,7 +206,7 @@ public class PrettyPrintVisitor implements Visitor { } @Override - public Void visit(whileLoop e) { + public Void visit(WhileLoop e) { ex.write("while ("); e.cond.welcome(this); ex.write(") "); diff --git a/src/main/java/de/hsrm/compiler/Klang/visitors/Visitor.java b/src/main/java/de/hsrm/compiler/Klang/visitors/Visitor.java index ae12485..3dbbf15 100644 --- a/src/main/java/de/hsrm/compiler/Klang/visitors/Visitor.java +++ b/src/main/java/de/hsrm/compiler/Klang/visitors/Visitor.java @@ -23,7 +23,7 @@ public interface Visitor { R visit(ModuloExpression e); R visit(NegateExpression e); R visit(IfStatement e); - R visit(whileLoop e); + R visit(WhileLoop e); R visit(DoWhileLoop e); R visit(PrintStatement e); R visit(VariableDeclaration e);