From 5292b42be6fb8ba76bca5f81706eaed56b489e2e Mon Sep 17 00:00:00 2001 From: Deryck Brown Date: Thu, 12 May 2022 20:29:47 +0100 Subject: [PATCH] Removed "the" prefix on variable names. --- .../Triangle/AbstractSyntaxTrees/AST.java | 11 +- .../AbstractSyntaxTrees/ActualParameter.java | 4 +- .../ActualParameterSequence.java | 4 +- .../AbstractSyntaxTrees/AnyTypeDenoter.java | 4 +- .../AbstractSyntaxTrees/ArrayAggregate.java | 4 +- .../AbstractSyntaxTrees/ArrayExpression.java | 4 +- .../AbstractSyntaxTrees/ArrayTypeDenoter.java | 4 +- .../AbstractSyntaxTrees/AssignCommand.java | 4 +- .../AbstractSyntaxTrees/BinaryExpression.java | 4 +- .../BinaryOperatorDeclaration.java | 4 +- .../AbstractSyntaxTrees/BoolTypeDenoter.java | 4 +- .../AbstractSyntaxTrees/CallCommand.java | 4 +- .../AbstractSyntaxTrees/CallExpression.java | 4 +- .../AbstractSyntaxTrees/CharTypeDenoter.java | 4 +- .../CharacterExpression.java | 4 +- .../AbstractSyntaxTrees/CharacterLiteral.java | 4 +- .../Triangle/AbstractSyntaxTrees/Command.java | 4 +- .../ConstActualParameter.java | 4 +- .../AbstractSyntaxTrees/ConstDeclaration.java | 4 +- .../ConstFormalParameter.java | 4 +- .../AbstractSyntaxTrees/Declaration.java | 4 +- .../AbstractSyntaxTrees/DotVname.java | 4 +- .../EmptyActualParameterSequence.java | 4 +- .../AbstractSyntaxTrees/EmptyCommand.java | 4 +- .../AbstractSyntaxTrees/EmptyExpression.java | 4 +- .../EmptyFormalParameterSequence.java | 4 +- .../AbstractSyntaxTrees/ErrorTypeDenoter.java | 4 +- .../AbstractSyntaxTrees/Expression.java | 4 +- .../AbstractSyntaxTrees/FieldTypeDenoter.java | 4 +- .../AbstractSyntaxTrees/FormalParameter.java | 4 +- .../FormalParameterSequence.java | 4 +- .../FuncActualParameter.java | 4 +- .../AbstractSyntaxTrees/FuncDeclaration.java | 4 +- .../FuncFormalParameter.java | 4 +- .../AbstractSyntaxTrees/Identifier.java | 4 +- .../AbstractSyntaxTrees/IfCommand.java | 4 +- .../AbstractSyntaxTrees/IfExpression.java | 4 +- .../AbstractSyntaxTrees/IntTypeDenoter.java | 4 +- .../IntegerExpression.java | 4 +- .../AbstractSyntaxTrees/IntegerLiteral.java | 4 +- .../AbstractSyntaxTrees/LetCommand.java | 4 +- .../AbstractSyntaxTrees/LetExpression.java | 4 +- .../MultipleActualParameterSequence.java | 4 +- .../MultipleArrayAggregate.java | 4 +- .../MultipleFieldTypeDenoter.java | 4 +- .../MultipleFormalParameterSequence.java | 4 +- .../MultipleRecordAggregate.java | 4 +- .../AbstractSyntaxTrees/Operator.java | 4 +- .../ProcActualParameter.java | 4 +- .../AbstractSyntaxTrees/ProcDeclaration.java | 4 +- .../ProcFormalParameter.java | 4 +- .../Triangle/AbstractSyntaxTrees/Program.java | 4 +- .../AbstractSyntaxTrees/RecordAggregate.java | 4 +- .../AbstractSyntaxTrees/RecordExpression.java | 4 +- .../RecordTypeDenoter.java | 4 +- .../SequentialCommand.java | 4 +- .../SequentialDeclaration.java | 4 +- .../SimpleTypeDenoter.java | 4 +- .../AbstractSyntaxTrees/SimpleVname.java | 4 +- .../SingleActualParameterSequence.java | 4 +- .../SingleArrayAggregate.java | 4 +- .../SingleFieldTypeDenoter.java | 4 +- .../SingleFormalParameterSequence.java | 4 +- .../SingleRecordAggregate.java | 4 +- .../AbstractSyntaxTrees/SubscriptVname.java | 4 +- .../AbstractSyntaxTrees/Terminal.java | 8 +- .../AbstractSyntaxTrees/TypeDeclaration.java | 4 +- .../AbstractSyntaxTrees/TypeDenoter.java | 4 +- .../AbstractSyntaxTrees/UnaryExpression.java | 4 +- .../UnaryOperatorDeclaration.java | 4 +- .../VarActualParameter.java | 4 +- .../AbstractSyntaxTrees/VarDeclaration.java | 4 +- .../VarFormalParameter.java | 4 +- .../Triangle/AbstractSyntaxTrees/Visitor.java | 124 +++++++++--------- .../Triangle/AbstractSyntaxTrees/Vname.java | 4 +- .../AbstractSyntaxTrees/VnameExpression.java | 4 +- .../AbstractSyntaxTrees/WhileCommand.java | 4 +- 77 files changed, 222 insertions(+), 217 deletions(-) diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AST.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AST.java index 179d568..7e52e5f 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AST.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AST.java @@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class AST { - public AST(SourcePosition thePosition) { - position = thePosition; + public AST(SourcePosition position) { + this.position = position; entity = null; } @@ -30,6 +30,11 @@ public abstract class AST { public abstract Object visit(Visitor v, Object o); - public SourcePosition position; + public final Object visit(Visitor v) { + return visit(v, null); + } + + public final SourcePosition position; + public RuntimeEntity entity; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ActualParameter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ActualParameter.java index 5fed0fb..7924aac 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ActualParameter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ActualParameter.java @@ -18,7 +18,7 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class ActualParameter extends AST { - public ActualParameter(SourcePosition thePosition) { - super(thePosition); + public ActualParameter(SourcePosition position) { + super(position); } } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ActualParameterSequence.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ActualParameterSequence.java index 0b40d39..dc4509f 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ActualParameterSequence.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ActualParameterSequence.java @@ -18,7 +18,7 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class ActualParameterSequence extends AST { - public ActualParameterSequence(SourcePosition thePosition) { - super(thePosition); + public ActualParameterSequence(SourcePosition position) { + super(position); } } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AnyTypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AnyTypeDenoter.java index 13abea9..96aa351 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AnyTypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AnyTypeDenoter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class AnyTypeDenoter extends TypeDenoter { - public AnyTypeDenoter(SourcePosition thePosition) { - super(thePosition); + public AnyTypeDenoter(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayAggregate.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayAggregate.java index 8f9465f..2d0bc96 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayAggregate.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayAggregate.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class ArrayAggregate extends AST { - public ArrayAggregate(SourcePosition thePosition) { - super(thePosition); + public ArrayAggregate(SourcePosition position) { + super(position); elemCount = 0; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayExpression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayExpression.java index 810fb67..03baf73 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayExpression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayExpression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class ArrayExpression extends Expression { - public ArrayExpression(ArrayAggregate aaAST, SourcePosition thePosition) { - super(thePosition); + public ArrayExpression(ArrayAggregate aaAST, SourcePosition position) { + super(position); AA = aaAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayTypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayTypeDenoter.java index ecaa9fd..19ca206 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayTypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ArrayTypeDenoter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class ArrayTypeDenoter extends TypeDenoter { - public ArrayTypeDenoter(IntegerLiteral ilAST, TypeDenoter tAST, SourcePosition thePosition) { - super(thePosition); + public ArrayTypeDenoter(IntegerLiteral ilAST, TypeDenoter tAST, SourcePosition position) { + super(position); IL = ilAST; T = tAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AssignCommand.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AssignCommand.java index 6bfc924..5e3849c 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AssignCommand.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/AssignCommand.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class AssignCommand extends Command { - public AssignCommand(Vname vAST, Expression eAST, SourcePosition thePosition) { - super(thePosition); + public AssignCommand(Vname vAST, Expression eAST, SourcePosition position) { + super(position); V = vAST; E = eAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BinaryExpression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BinaryExpression.java index c5bd980..9d154af 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BinaryExpression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BinaryExpression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class BinaryExpression extends Expression { - public BinaryExpression(Expression e1AST, Operator oAST, Expression e2AST, SourcePosition thePosition) { - super(thePosition); + public BinaryExpression(Expression e1AST, Operator oAST, Expression e2AST, SourcePosition position) { + super(position); O = oAST; E1 = e1AST; E2 = e2AST; diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BinaryOperatorDeclaration.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BinaryOperatorDeclaration.java index 30617bc..80edf9d 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BinaryOperatorDeclaration.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BinaryOperatorDeclaration.java @@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class BinaryOperatorDeclaration extends Declaration { public BinaryOperatorDeclaration(Operator oAST, TypeDenoter arg1AST, TypeDenoter arg2AST, TypeDenoter resultAST, - SourcePosition thePosition) { - super(thePosition); + SourcePosition position) { + super(position); O = oAST; ARG1 = arg1AST; ARG2 = arg2AST; diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BoolTypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BoolTypeDenoter.java index 12bc07d..7941083 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BoolTypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/BoolTypeDenoter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class BoolTypeDenoter extends TypeDenoter { - public BoolTypeDenoter(SourcePosition thePosition) { - super(thePosition); + public BoolTypeDenoter(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CallCommand.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CallCommand.java index 23c31bf..da944ef 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CallCommand.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CallCommand.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class CallCommand extends Command { - public CallCommand(Identifier iAST, ActualParameterSequence apsAST, SourcePosition thePosition) { - super(thePosition); + public CallCommand(Identifier iAST, ActualParameterSequence apsAST, SourcePosition position) { + super(position); I = iAST; APS = apsAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CallExpression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CallExpression.java index a4c7a46..4fdfa02 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CallExpression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CallExpression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class CallExpression extends Expression { - public CallExpression(Identifier iAST, ActualParameterSequence apsAST, SourcePosition thePosition) { - super(thePosition); + public CallExpression(Identifier iAST, ActualParameterSequence apsAST, SourcePosition position) { + super(position); I = iAST; APS = apsAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharTypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharTypeDenoter.java index 93d3672..01121ce 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharTypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharTypeDenoter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class CharTypeDenoter extends TypeDenoter { - public CharTypeDenoter(SourcePosition thePosition) { - super(thePosition); + public CharTypeDenoter(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharacterExpression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharacterExpression.java index 522333e..3b5d688 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharacterExpression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharacterExpression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class CharacterExpression extends Expression { - public CharacterExpression(CharacterLiteral clAST, SourcePosition thePosition) { - super(thePosition); + public CharacterExpression(CharacterLiteral clAST, SourcePosition position) { + super(position); CL = clAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharacterLiteral.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharacterLiteral.java index a8b5046..58c2ab0 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharacterLiteral.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/CharacterLiteral.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class CharacterLiteral extends Terminal { - public CharacterLiteral(String theSpelling, SourcePosition thePosition) { - super(theSpelling, thePosition); + public CharacterLiteral(String spelling, SourcePosition position) { + super(spelling, position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Command.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Command.java index 240b7bc..97f08d3 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Command.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Command.java @@ -18,7 +18,7 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class Command extends AST { - public Command(SourcePosition thePosition) { - super(thePosition); + public Command(SourcePosition position) { + super(position); } } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstActualParameter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstActualParameter.java index 271fa66..a5a1fbe 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstActualParameter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstActualParameter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class ConstActualParameter extends ActualParameter { - public ConstActualParameter(Expression eAST, SourcePosition thePosition) { - super(thePosition); + public ConstActualParameter(Expression eAST, SourcePosition position) { + super(position); E = eAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstDeclaration.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstDeclaration.java index c4588d7..116b5e7 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstDeclaration.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstDeclaration.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class ConstDeclaration extends Declaration { - public ConstDeclaration(Identifier iAST, Expression eAST, SourcePosition thePosition) { - super(thePosition); + public ConstDeclaration(Identifier iAST, Expression eAST, SourcePosition position) { + super(position); I = iAST; E = eAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstFormalParameter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstFormalParameter.java index 923d5e6..b05ff0b 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstFormalParameter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ConstFormalParameter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class ConstFormalParameter extends FormalParameter { - public ConstFormalParameter(Identifier iAST, TypeDenoter tAST, SourcePosition thePosition) { - super(thePosition); + public ConstFormalParameter(Identifier iAST, TypeDenoter tAST, SourcePosition position) { + super(position); I = iAST; T = tAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Declaration.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Declaration.java index 6ac0602..7a8e6c8 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Declaration.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Declaration.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class Declaration extends AST { - public Declaration(SourcePosition thePosition) { - super(thePosition); + public Declaration(SourcePosition position) { + super(position); duplicated = false; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/DotVname.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/DotVname.java index c53cfbb..f07f45f 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/DotVname.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/DotVname.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class DotVname extends Vname { - public DotVname(Vname vAST, Identifier iAST, SourcePosition thePosition) { - super(thePosition); + public DotVname(Vname vAST, Identifier iAST, SourcePosition position) { + super(position); V = vAST; I = iAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyActualParameterSequence.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyActualParameterSequence.java index efab13e..dd6ef21 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyActualParameterSequence.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyActualParameterSequence.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class EmptyActualParameterSequence extends ActualParameterSequence { - public EmptyActualParameterSequence(SourcePosition thePosition) { - super(thePosition); + public EmptyActualParameterSequence(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyCommand.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyCommand.java index d00efd9..7d35d61 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyCommand.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyCommand.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class EmptyCommand extends Command { - public EmptyCommand(SourcePosition thePosition) { - super(thePosition); + public EmptyCommand(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyExpression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyExpression.java index a960a58..9e24680 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyExpression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyExpression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class EmptyExpression extends Expression { - public EmptyExpression(SourcePosition thePosition) { - super(thePosition); + public EmptyExpression(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyFormalParameterSequence.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyFormalParameterSequence.java index 70dd07f..d7aaace 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyFormalParameterSequence.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/EmptyFormalParameterSequence.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class EmptyFormalParameterSequence extends FormalParameterSequence { - public EmptyFormalParameterSequence(SourcePosition thePosition) { - super(thePosition); + public EmptyFormalParameterSequence(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ErrorTypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ErrorTypeDenoter.java index 3cb0f6f..f74cce5 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ErrorTypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ErrorTypeDenoter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class ErrorTypeDenoter extends TypeDenoter { - public ErrorTypeDenoter(SourcePosition thePosition) { - super(thePosition); + public ErrorTypeDenoter(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Expression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Expression.java index 32dac66..569267a 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Expression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Expression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class Expression extends AST { - public Expression(SourcePosition thePosition) { - super(thePosition); + public Expression(SourcePosition position) { + super(position); type = null; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FieldTypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FieldTypeDenoter.java index d229271..eadb011 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FieldTypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FieldTypeDenoter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class FieldTypeDenoter extends TypeDenoter { - public FieldTypeDenoter(SourcePosition thePosition) { - super(thePosition); + public FieldTypeDenoter(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FormalParameter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FormalParameter.java index 2ca1b02..448a53c 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FormalParameter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FormalParameter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class FormalParameter extends Declaration { - public FormalParameter(SourcePosition thePosition) { - super(thePosition); + public FormalParameter(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FormalParameterSequence.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FormalParameterSequence.java index 7e62f17..8266327 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FormalParameterSequence.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FormalParameterSequence.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class FormalParameterSequence extends AST { - public FormalParameterSequence(SourcePosition thePosition) { - super(thePosition); + public FormalParameterSequence(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncActualParameter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncActualParameter.java index 8561892..51378f3 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncActualParameter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncActualParameter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class FuncActualParameter extends ActualParameter { - public FuncActualParameter(Identifier iAST, SourcePosition thePosition) { - super(thePosition); + public FuncActualParameter(Identifier iAST, SourcePosition position) { + super(position); I = iAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncDeclaration.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncDeclaration.java index bff1c2b..32cfde0 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncDeclaration.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncDeclaration.java @@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class FuncDeclaration extends Declaration { public FuncDeclaration(Identifier iAST, FormalParameterSequence fpsAST, TypeDenoter tAST, Expression eAST, - SourcePosition thePosition) { - super(thePosition); + SourcePosition position) { + super(position); I = iAST; FPS = fpsAST; T = tAST; diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncFormalParameter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncFormalParameter.java index 3cfbb7b..7be3b1e 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncFormalParameter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/FuncFormalParameter.java @@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class FuncFormalParameter extends FormalParameter { public FuncFormalParameter(Identifier iAST, FormalParameterSequence fpsAST, TypeDenoter tAST, - SourcePosition thePosition) { - super(thePosition); + SourcePosition position) { + super(position); I = iAST; FPS = fpsAST; T = tAST; diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Identifier.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Identifier.java index 3031dd0..6305dd0 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Identifier.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Identifier.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class Identifier extends Terminal { - public Identifier(String theSpelling, SourcePosition thePosition) { - super(theSpelling, thePosition); + public Identifier(String spelling, SourcePosition position) { + super(spelling, position); type = null; decl = null; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IfCommand.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IfCommand.java index 02b4faf..372a16c 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IfCommand.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IfCommand.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class IfCommand extends Command { - public IfCommand(Expression eAST, Command c1AST, Command c2AST, SourcePosition thePosition) { - super(thePosition); + public IfCommand(Expression eAST, Command c1AST, Command c2AST, SourcePosition position) { + super(position); E = eAST; C1 = c1AST; C2 = c2AST; diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IfExpression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IfExpression.java index f66e852..1142766 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IfExpression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IfExpression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class IfExpression extends Expression { - public IfExpression(Expression e1AST, Expression e2AST, Expression e3AST, SourcePosition thePosition) { - super(thePosition); + public IfExpression(Expression e1AST, Expression e2AST, Expression e3AST, SourcePosition position) { + super(position); E1 = e1AST; E2 = e2AST; E3 = e3AST; diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntTypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntTypeDenoter.java index ae92ad8..9356b3b 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntTypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntTypeDenoter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class IntTypeDenoter extends TypeDenoter { - public IntTypeDenoter(SourcePosition thePosition) { - super(thePosition); + public IntTypeDenoter(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntegerExpression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntegerExpression.java index 986a6ba..a30879e 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntegerExpression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntegerExpression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class IntegerExpression extends Expression { - public IntegerExpression(IntegerLiteral ilAST, SourcePosition thePosition) { - super(thePosition); + public IntegerExpression(IntegerLiteral ilAST, SourcePosition position) { + super(position); IL = ilAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntegerLiteral.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntegerLiteral.java index 037b3a6..50bf7ed 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntegerLiteral.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/IntegerLiteral.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class IntegerLiteral extends Terminal { - public IntegerLiteral(String theSpelling, SourcePosition thePosition) { - super(theSpelling, thePosition); + public IntegerLiteral(String spelling, SourcePosition position) { + super(spelling, position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/LetCommand.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/LetCommand.java index bff4a43..85a38c6 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/LetCommand.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/LetCommand.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class LetCommand extends Command { - public LetCommand(Declaration dAST, Command cAST, SourcePosition thePosition) { - super(thePosition); + public LetCommand(Declaration dAST, Command cAST, SourcePosition position) { + super(position); D = dAST; C = cAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/LetExpression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/LetExpression.java index 6090936..f96fb33 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/LetExpression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/LetExpression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class LetExpression extends Expression { - public LetExpression(Declaration dAST, Expression eAST, SourcePosition thePosition) { - super(thePosition); + public LetExpression(Declaration dAST, Expression eAST, SourcePosition position) { + super(position); D = dAST; E = eAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleActualParameterSequence.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleActualParameterSequence.java index a6bf9dc..9279fda 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleActualParameterSequence.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleActualParameterSequence.java @@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class MultipleActualParameterSequence extends ActualParameterSequence { public MultipleActualParameterSequence(ActualParameter apAST, ActualParameterSequence apsAST, - SourcePosition thePosition) { - super(thePosition); + SourcePosition position) { + super(position); AP = apAST; APS = apsAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleArrayAggregate.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleArrayAggregate.java index 1c2cb6a..a699ebc 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleArrayAggregate.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleArrayAggregate.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class MultipleArrayAggregate extends ArrayAggregate { - public MultipleArrayAggregate(Expression eAST, ArrayAggregate aaAST, SourcePosition thePosition) { - super(thePosition); + public MultipleArrayAggregate(Expression eAST, ArrayAggregate aaAST, SourcePosition position) { + super(position); E = eAST; AA = aaAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleFieldTypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleFieldTypeDenoter.java index da4ce6a..869a984 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleFieldTypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleFieldTypeDenoter.java @@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class MultipleFieldTypeDenoter extends FieldTypeDenoter { public MultipleFieldTypeDenoter(Identifier iAST, TypeDenoter tAST, FieldTypeDenoter ftAST, - SourcePosition thePosition) { - super(thePosition); + SourcePosition position) { + super(position); I = iAST; T = tAST; FT = ftAST; diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleFormalParameterSequence.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleFormalParameterSequence.java index ae9497a..94d0a97 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleFormalParameterSequence.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleFormalParameterSequence.java @@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class MultipleFormalParameterSequence extends FormalParameterSequence { public MultipleFormalParameterSequence(FormalParameter fpAST, FormalParameterSequence fpsAST, - SourcePosition thePosition) { - super(thePosition); + SourcePosition position) { + super(position); FP = fpAST; FPS = fpsAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleRecordAggregate.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleRecordAggregate.java index 1435a82..95a1ad5 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleRecordAggregate.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/MultipleRecordAggregate.java @@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class MultipleRecordAggregate extends RecordAggregate { public MultipleRecordAggregate(Identifier iAST, Expression eAST, RecordAggregate raAST, - SourcePosition thePosition) { - super(thePosition); + SourcePosition position) { + super(position); I = iAST; E = eAST; RA = raAST; diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Operator.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Operator.java index e36e569..a94a859 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Operator.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Operator.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class Operator extends Terminal { - public Operator(String theSpelling, SourcePosition thePosition) { - super(theSpelling, thePosition); + public Operator(String spelling, SourcePosition position) { + super(spelling, position); decl = null; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcActualParameter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcActualParameter.java index a56dc92..c17c04c 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcActualParameter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcActualParameter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class ProcActualParameter extends ActualParameter { - public ProcActualParameter(Identifier iAST, SourcePosition thePosition) { - super(thePosition); + public ProcActualParameter(Identifier iAST, SourcePosition position) { + super(position); I = iAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcDeclaration.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcDeclaration.java index 7cf8d16..45eeb43 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcDeclaration.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcDeclaration.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class ProcDeclaration extends Declaration { - public ProcDeclaration(Identifier iAST, FormalParameterSequence fpsAST, Command cAST, SourcePosition thePosition) { - super(thePosition); + public ProcDeclaration(Identifier iAST, FormalParameterSequence fpsAST, Command cAST, SourcePosition position) { + super(position); I = iAST; FPS = fpsAST; C = cAST; diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcFormalParameter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcFormalParameter.java index 327ce28..3e6931d 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcFormalParameter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/ProcFormalParameter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class ProcFormalParameter extends FormalParameter { - public ProcFormalParameter(Identifier iAST, FormalParameterSequence fpsAST, SourcePosition thePosition) { - super(thePosition); + public ProcFormalParameter(Identifier iAST, FormalParameterSequence fpsAST, SourcePosition position) { + super(position); I = iAST; FPS = fpsAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Program.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Program.java index 81425fa..bc9082b 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Program.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Program.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class Program extends AST { - public Program(Command cAST, SourcePosition thePosition) { - super(thePosition); + public Program(Command cAST, SourcePosition position) { + super(position); C = cAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordAggregate.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordAggregate.java index 79ea2d7..b149068 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordAggregate.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordAggregate.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class RecordAggregate extends AST { - public RecordAggregate(SourcePosition thePosition) { - super(thePosition); + public RecordAggregate(SourcePosition position) { + super(position); type = null; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordExpression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordExpression.java index 9a2d7cb..3f3dd23 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordExpression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordExpression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class RecordExpression extends Expression { - public RecordExpression(RecordAggregate raAST, SourcePosition thePosition) { - super(thePosition); + public RecordExpression(RecordAggregate raAST, SourcePosition position) { + super(position); RA = raAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordTypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordTypeDenoter.java index 7e2b9ce..1089fc0 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordTypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/RecordTypeDenoter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class RecordTypeDenoter extends TypeDenoter { - public RecordTypeDenoter(FieldTypeDenoter ftAST, SourcePosition thePosition) { - super(thePosition); + public RecordTypeDenoter(FieldTypeDenoter ftAST, SourcePosition position) { + super(position); FT = ftAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SequentialCommand.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SequentialCommand.java index a31bd79..78bc131 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SequentialCommand.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SequentialCommand.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class SequentialCommand extends Command { - public SequentialCommand(Command c1AST, Command c2AST, SourcePosition thePosition) { - super(thePosition); + public SequentialCommand(Command c1AST, Command c2AST, SourcePosition position) { + super(position); C1 = c1AST; C2 = c2AST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SequentialDeclaration.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SequentialDeclaration.java index ce650c9..51014df 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SequentialDeclaration.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SequentialDeclaration.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class SequentialDeclaration extends Declaration { - public SequentialDeclaration(Declaration d1AST, Declaration d2AST, SourcePosition thePosition) { - super(thePosition); + public SequentialDeclaration(Declaration d1AST, Declaration d2AST, SourcePosition position) { + super(position); D1 = d1AST; D2 = d2AST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SimpleTypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SimpleTypeDenoter.java index 51e83d2..25ef45b 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SimpleTypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SimpleTypeDenoter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class SimpleTypeDenoter extends TypeDenoter { - public SimpleTypeDenoter(Identifier iAST, SourcePosition thePosition) { - super(thePosition); + public SimpleTypeDenoter(Identifier iAST, SourcePosition position) { + super(position); I = iAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SimpleVname.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SimpleVname.java index a21f812..4a89017 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SimpleVname.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SimpleVname.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class SimpleVname extends Vname { - public SimpleVname(Identifier iAST, SourcePosition thePosition) { - super(thePosition); + public SimpleVname(Identifier iAST, SourcePosition position) { + super(position); I = iAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleActualParameterSequence.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleActualParameterSequence.java index bc068fa..9ffbfb7 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleActualParameterSequence.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleActualParameterSequence.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class SingleActualParameterSequence extends ActualParameterSequence { - public SingleActualParameterSequence(ActualParameter apAST, SourcePosition thePosition) { - super(thePosition); + public SingleActualParameterSequence(ActualParameter apAST, SourcePosition position) { + super(position); AP = apAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleArrayAggregate.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleArrayAggregate.java index 423ccde..8bc2b6b 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleArrayAggregate.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleArrayAggregate.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class SingleArrayAggregate extends ArrayAggregate { - public SingleArrayAggregate(Expression eAST, SourcePosition thePosition) { - super(thePosition); + public SingleArrayAggregate(Expression eAST, SourcePosition position) { + super(position); E = eAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleFieldTypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleFieldTypeDenoter.java index 25d19d1..5a4056a 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleFieldTypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleFieldTypeDenoter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class SingleFieldTypeDenoter extends FieldTypeDenoter { - public SingleFieldTypeDenoter(Identifier iAST, TypeDenoter tAST, SourcePosition thePosition) { - super(thePosition); + public SingleFieldTypeDenoter(Identifier iAST, TypeDenoter tAST, SourcePosition position) { + super(position); I = iAST; T = tAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleFormalParameterSequence.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleFormalParameterSequence.java index f06f9a4..d13f2b8 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleFormalParameterSequence.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleFormalParameterSequence.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class SingleFormalParameterSequence extends FormalParameterSequence { - public SingleFormalParameterSequence(FormalParameter fpAST, SourcePosition thePosition) { - super(thePosition); + public SingleFormalParameterSequence(FormalParameter fpAST, SourcePosition position) { + super(position); FP = fpAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleRecordAggregate.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleRecordAggregate.java index d8d7ac0..fb4155c 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleRecordAggregate.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SingleRecordAggregate.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class SingleRecordAggregate extends RecordAggregate { - public SingleRecordAggregate(Identifier iAST, Expression eAST, SourcePosition thePosition) { - super(thePosition); + public SingleRecordAggregate(Identifier iAST, Expression eAST, SourcePosition position) { + super(position); I = iAST; E = eAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SubscriptVname.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SubscriptVname.java index a03f7b9..1fc80a7 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SubscriptVname.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/SubscriptVname.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class SubscriptVname extends Vname { - public SubscriptVname(Vname vAST, Expression eAST, SourcePosition thePosition) { - super(thePosition); + public SubscriptVname(Vname vAST, Expression eAST, SourcePosition position) { + super(position); V = vAST; E = eAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Terminal.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Terminal.java index dc67590..c4e6af4 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Terminal.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Terminal.java @@ -18,10 +18,10 @@ import Triangle.SyntacticAnalyzer.SourcePosition; abstract public class Terminal extends AST { - public Terminal(String theSpelling, SourcePosition thePosition) { - super(thePosition); - spelling = theSpelling; + public Terminal(String spelling, SourcePosition position) { + super(position); + this.spelling = spelling; } - public String spelling; + public final String spelling; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/TypeDeclaration.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/TypeDeclaration.java index 9870655..a5ff149 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/TypeDeclaration.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/TypeDeclaration.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class TypeDeclaration extends Declaration { - public TypeDeclaration(Identifier iAST, TypeDenoter tAST, SourcePosition thePosition) { - super(thePosition); + public TypeDeclaration(Identifier iAST, TypeDenoter tAST, SourcePosition position) { + super(position); I = iAST; T = tAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/TypeDenoter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/TypeDenoter.java index c4c09f4..2d1e5de 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/TypeDenoter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/TypeDenoter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class TypeDenoter extends AST { - public TypeDenoter(SourcePosition thePosition) { - super(thePosition); + public TypeDenoter(SourcePosition position) { + super(position); } @Override diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/UnaryExpression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/UnaryExpression.java index 27d15ab..1589235 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/UnaryExpression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/UnaryExpression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class UnaryExpression extends Expression { - public UnaryExpression(Operator oAST, Expression eAST, SourcePosition thePosition) { - super(thePosition); + public UnaryExpression(Operator oAST, Expression eAST, SourcePosition position) { + super(position); O = oAST; E = eAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/UnaryOperatorDeclaration.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/UnaryOperatorDeclaration.java index f8a0d3a..7237804 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/UnaryOperatorDeclaration.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/UnaryOperatorDeclaration.java @@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class UnaryOperatorDeclaration extends Declaration { public UnaryOperatorDeclaration(Operator oAST, TypeDenoter argAST, TypeDenoter resultAST, - SourcePosition thePosition) { - super(thePosition); + SourcePosition position) { + super(position); O = oAST; ARG = argAST; RES = resultAST; diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarActualParameter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarActualParameter.java index 48d86eb..a2e6f47 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarActualParameter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarActualParameter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class VarActualParameter extends ActualParameter { - public VarActualParameter(Vname vAST, SourcePosition thePosition) { - super(thePosition); + public VarActualParameter(Vname vAST, SourcePosition position) { + super(position); V = vAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarDeclaration.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarDeclaration.java index 227e867..ed06634 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarDeclaration.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarDeclaration.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class VarDeclaration extends Declaration { - public VarDeclaration(Identifier iAST, TypeDenoter tAST, SourcePosition thePosition) { - super(thePosition); + public VarDeclaration(Identifier iAST, TypeDenoter tAST, SourcePosition position) { + super(position); I = iAST; T = tAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarFormalParameter.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarFormalParameter.java index 5366d59..fd97142 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarFormalParameter.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VarFormalParameter.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class VarFormalParameter extends FormalParameter { - public VarFormalParameter(Identifier iAST, TypeDenoter tAST, SourcePosition thePosition) { - super(thePosition); + public VarFormalParameter(Identifier iAST, TypeDenoter tAST, SourcePosition position) { + super(position); I = iAST; T = tAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Visitor.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Visitor.java index 53993fa..b40caac 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Visitor.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Visitor.java @@ -17,138 +17,138 @@ package Triangle.AbstractSyntaxTrees; public interface Visitor { // Commands - public abstract Object visitAssignCommand(AssignCommand ast, Object o); + Object visitAssignCommand(AssignCommand ast, Object o); - public abstract Object visitCallCommand(CallCommand ast, Object o); + Object visitCallCommand(CallCommand ast, Object o); - public abstract Object visitEmptyCommand(EmptyCommand ast, Object o); + Object visitEmptyCommand(EmptyCommand ast, Object o); - public abstract Object visitIfCommand(IfCommand ast, Object o); + Object visitIfCommand(IfCommand ast, Object o); - public abstract Object visitLetCommand(LetCommand ast, Object o); + Object visitLetCommand(LetCommand ast, Object o); - public abstract Object visitSequentialCommand(SequentialCommand ast, Object o); + Object visitSequentialCommand(SequentialCommand ast, Object o); - public abstract Object visitWhileCommand(WhileCommand ast, Object o); + Object visitWhileCommand(WhileCommand ast, Object o); // Expressions - public abstract Object visitArrayExpression(ArrayExpression ast, Object o); + Object visitArrayExpression(ArrayExpression ast, Object o); - public abstract Object visitBinaryExpression(BinaryExpression ast, Object o); + Object visitBinaryExpression(BinaryExpression ast, Object o); - public abstract Object visitCallExpression(CallExpression ast, Object o); + Object visitCallExpression(CallExpression ast, Object o); - public abstract Object visitCharacterExpression(CharacterExpression ast, Object o); + Object visitCharacterExpression(CharacterExpression ast, Object o); - public abstract Object visitEmptyExpression(EmptyExpression ast, Object o); + Object visitEmptyExpression(EmptyExpression ast, Object o); - public abstract Object visitIfExpression(IfExpression ast, Object o); + Object visitIfExpression(IfExpression ast, Object o); - public abstract Object visitIntegerExpression(IntegerExpression ast, Object o); + Object visitIntegerExpression(IntegerExpression ast, Object o); - public abstract Object visitLetExpression(LetExpression ast, Object o); + Object visitLetExpression(LetExpression ast, Object o); - public abstract Object visitRecordExpression(RecordExpression ast, Object o); + Object visitRecordExpression(RecordExpression ast, Object o); - public abstract Object visitUnaryExpression(UnaryExpression ast, Object o); + Object visitUnaryExpression(UnaryExpression ast, Object o); - public abstract Object visitVnameExpression(VnameExpression ast, Object o); + Object visitVnameExpression(VnameExpression ast, Object o); // Declarations - public abstract Object visitBinaryOperatorDeclaration(BinaryOperatorDeclaration ast, Object o); + Object visitBinaryOperatorDeclaration(BinaryOperatorDeclaration ast, Object o); - public abstract Object visitConstDeclaration(ConstDeclaration ast, Object o); + Object visitConstDeclaration(ConstDeclaration ast, Object o); - public abstract Object visitFuncDeclaration(FuncDeclaration ast, Object o); + Object visitFuncDeclaration(FuncDeclaration ast, Object o); - public abstract Object visitProcDeclaration(ProcDeclaration ast, Object o); + Object visitProcDeclaration(ProcDeclaration ast, Object o); - public abstract Object visitSequentialDeclaration(SequentialDeclaration ast, Object o); + Object visitSequentialDeclaration(SequentialDeclaration ast, Object o); - public abstract Object visitTypeDeclaration(TypeDeclaration ast, Object o); + Object visitTypeDeclaration(TypeDeclaration ast, Object o); - public abstract Object visitUnaryOperatorDeclaration(UnaryOperatorDeclaration ast, Object o); + Object visitUnaryOperatorDeclaration(UnaryOperatorDeclaration ast, Object o); - public abstract Object visitVarDeclaration(VarDeclaration ast, Object o); + Object visitVarDeclaration(VarDeclaration ast, Object o); // Array Aggregates - public abstract Object visitMultipleArrayAggregate(MultipleArrayAggregate ast, Object o); + Object visitMultipleArrayAggregate(MultipleArrayAggregate ast, Object o); - public abstract Object visitSingleArrayAggregate(SingleArrayAggregate ast, Object o); + Object visitSingleArrayAggregate(SingleArrayAggregate ast, Object o); // Record Aggregates - public abstract Object visitMultipleRecordAggregate(MultipleRecordAggregate ast, Object o); + Object visitMultipleRecordAggregate(MultipleRecordAggregate ast, Object o); - public abstract Object visitSingleRecordAggregate(SingleRecordAggregate ast, Object o); + Object visitSingleRecordAggregate(SingleRecordAggregate ast, Object o); // Formal Parameters - public abstract Object visitConstFormalParameter(ConstFormalParameter ast, Object o); + Object visitConstFormalParameter(ConstFormalParameter ast, Object o); - public abstract Object visitFuncFormalParameter(FuncFormalParameter ast, Object o); + Object visitFuncFormalParameter(FuncFormalParameter ast, Object o); - public abstract Object visitProcFormalParameter(ProcFormalParameter ast, Object o); + Object visitProcFormalParameter(ProcFormalParameter ast, Object o); - public abstract Object visitVarFormalParameter(VarFormalParameter ast, Object o); + Object visitVarFormalParameter(VarFormalParameter ast, Object o); - public abstract Object visitEmptyFormalParameterSequence(EmptyFormalParameterSequence ast, Object o); + Object visitEmptyFormalParameterSequence(EmptyFormalParameterSequence ast, Object o); - public abstract Object visitMultipleFormalParameterSequence(MultipleFormalParameterSequence ast, Object o); + Object visitMultipleFormalParameterSequence(MultipleFormalParameterSequence ast, Object o); - public abstract Object visitSingleFormalParameterSequence(SingleFormalParameterSequence ast, Object o); + Object visitSingleFormalParameterSequence(SingleFormalParameterSequence ast, Object o); // Actual Parameters - public abstract Object visitConstActualParameter(ConstActualParameter ast, Object o); + Object visitConstActualParameter(ConstActualParameter ast, Object o); - public abstract Object visitFuncActualParameter(FuncActualParameter ast, Object o); + Object visitFuncActualParameter(FuncActualParameter ast, Object o); - public abstract Object visitProcActualParameter(ProcActualParameter ast, Object o); + Object visitProcActualParameter(ProcActualParameter ast, Object o); - public abstract Object visitVarActualParameter(VarActualParameter ast, Object o); + Object visitVarActualParameter(VarActualParameter ast, Object o); - public abstract Object visitEmptyActualParameterSequence(EmptyActualParameterSequence ast, Object o); + Object visitEmptyActualParameterSequence(EmptyActualParameterSequence ast, Object o); - public abstract Object visitMultipleActualParameterSequence(MultipleActualParameterSequence ast, Object o); + Object visitMultipleActualParameterSequence(MultipleActualParameterSequence ast, Object o); - public abstract Object visitSingleActualParameterSequence(SingleActualParameterSequence ast, Object o); + Object visitSingleActualParameterSequence(SingleActualParameterSequence ast, Object o); // Type Denoters - public abstract Object visitAnyTypeDenoter(AnyTypeDenoter ast, Object o); + Object visitAnyTypeDenoter(AnyTypeDenoter ast, Object o); - public abstract Object visitArrayTypeDenoter(ArrayTypeDenoter ast, Object o); + Object visitArrayTypeDenoter(ArrayTypeDenoter ast, Object o); - public abstract Object visitBoolTypeDenoter(BoolTypeDenoter ast, Object o); + Object visitBoolTypeDenoter(BoolTypeDenoter ast, Object o); - public abstract Object visitCharTypeDenoter(CharTypeDenoter ast, Object o); + Object visitCharTypeDenoter(CharTypeDenoter ast, Object o); - public abstract Object visitErrorTypeDenoter(ErrorTypeDenoter ast, Object o); + Object visitErrorTypeDenoter(ErrorTypeDenoter ast, Object o); - public abstract Object visitSimpleTypeDenoter(SimpleTypeDenoter ast, Object o); + Object visitSimpleTypeDenoter(SimpleTypeDenoter ast, Object o); - public abstract Object visitIntTypeDenoter(IntTypeDenoter ast, Object o); + Object visitIntTypeDenoter(IntTypeDenoter ast, Object o); - public abstract Object visitRecordTypeDenoter(RecordTypeDenoter ast, Object o); + Object visitRecordTypeDenoter(RecordTypeDenoter ast, Object o); - public abstract Object visitMultipleFieldTypeDenoter(MultipleFieldTypeDenoter ast, Object o); + Object visitMultipleFieldTypeDenoter(MultipleFieldTypeDenoter ast, Object o); - public abstract Object visitSingleFieldTypeDenoter(SingleFieldTypeDenoter ast, Object o); + Object visitSingleFieldTypeDenoter(SingleFieldTypeDenoter ast, Object o); // Literals, Identifiers and Operators - public abstract Object visitCharacterLiteral(CharacterLiteral ast, Object o); + Object visitCharacterLiteral(CharacterLiteral ast, Object o); - public abstract Object visitIdentifier(Identifier ast, Object o); + Object visitIdentifier(Identifier ast, Object o); - public abstract Object visitIntegerLiteral(IntegerLiteral ast, Object o); + Object visitIntegerLiteral(IntegerLiteral ast, Object o); - public abstract Object visitOperator(Operator ast, Object o); + Object visitOperator(Operator ast, Object o); // Value-or-variable names - public abstract Object visitDotVname(DotVname ast, Object o); + Object visitDotVname(DotVname ast, Object o); - public abstract Object visitSimpleVname(SimpleVname ast, Object o); + Object visitSimpleVname(SimpleVname ast, Object o); - public abstract Object visitSubscriptVname(SubscriptVname ast, Object o); + Object visitSubscriptVname(SubscriptVname ast, Object o); // Programs - public abstract Object visitProgram(Program ast, Object o); + Object visitProgram(Program ast, Object o); } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Vname.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Vname.java index 97feff4..7103179 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Vname.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/Vname.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public abstract class Vname extends AST { - public Vname(SourcePosition thePosition) { - super(thePosition); + public Vname(SourcePosition position) { + super(position); variable = false; type = null; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VnameExpression.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VnameExpression.java index a92e6b0..100993d 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VnameExpression.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/VnameExpression.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class VnameExpression extends Expression { - public VnameExpression(Vname vAST, SourcePosition thePosition) { - super(thePosition); + public VnameExpression(Vname vAST, SourcePosition position) { + super(position); V = vAST; } diff --git a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/WhileCommand.java b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/WhileCommand.java index 6c37e9b..57d4aa4 100644 --- a/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/WhileCommand.java +++ b/Triangle.Compiler/src/main/java/Triangle/AbstractSyntaxTrees/WhileCommand.java @@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition; public class WhileCommand extends Command { - public WhileCommand(Expression eAST, Command cAST, SourcePosition thePosition) { - super(thePosition); + public WhileCommand(Expression eAST, Command cAST, SourcePosition position) { + super(position); E = eAST; C = cAST; }