Removed "the" prefix on variable names.

This commit is contained in:
Deryck Brown 2022-05-12 20:29:47 +01:00
parent a02acc009b
commit 5292b42be6
77 changed files with 222 additions and 217 deletions

View File

@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class AST { public abstract class AST {
public AST(SourcePosition thePosition) { public AST(SourcePosition position) {
position = thePosition; this.position = position;
entity = null; entity = null;
} }
@ -30,6 +30,11 @@ public abstract class AST {
public abstract Object visit(Visitor v, Object o); 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; public RuntimeEntity entity;
} }

View File

@ -18,7 +18,7 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class ActualParameter extends AST { public abstract class ActualParameter extends AST {
public ActualParameter(SourcePosition thePosition) { public ActualParameter(SourcePosition position) {
super(thePosition); super(position);
} }
} }

View File

@ -18,7 +18,7 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class ActualParameterSequence extends AST { public abstract class ActualParameterSequence extends AST {
public ActualParameterSequence(SourcePosition thePosition) { public ActualParameterSequence(SourcePosition position) {
super(thePosition); super(position);
} }
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class AnyTypeDenoter extends TypeDenoter { public class AnyTypeDenoter extends TypeDenoter {
public AnyTypeDenoter(SourcePosition thePosition) { public AnyTypeDenoter(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class ArrayAggregate extends AST { public abstract class ArrayAggregate extends AST {
public ArrayAggregate(SourcePosition thePosition) { public ArrayAggregate(SourcePosition position) {
super(thePosition); super(position);
elemCount = 0; elemCount = 0;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class ArrayExpression extends Expression { public class ArrayExpression extends Expression {
public ArrayExpression(ArrayAggregate aaAST, SourcePosition thePosition) { public ArrayExpression(ArrayAggregate aaAST, SourcePosition position) {
super(thePosition); super(position);
AA = aaAST; AA = aaAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class ArrayTypeDenoter extends TypeDenoter { public class ArrayTypeDenoter extends TypeDenoter {
public ArrayTypeDenoter(IntegerLiteral ilAST, TypeDenoter tAST, SourcePosition thePosition) { public ArrayTypeDenoter(IntegerLiteral ilAST, TypeDenoter tAST, SourcePosition position) {
super(thePosition); super(position);
IL = ilAST; IL = ilAST;
T = tAST; T = tAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class AssignCommand extends Command { public class AssignCommand extends Command {
public AssignCommand(Vname vAST, Expression eAST, SourcePosition thePosition) { public AssignCommand(Vname vAST, Expression eAST, SourcePosition position) {
super(thePosition); super(position);
V = vAST; V = vAST;
E = eAST; E = eAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class BinaryExpression extends Expression { public class BinaryExpression extends Expression {
public BinaryExpression(Expression e1AST, Operator oAST, Expression e2AST, SourcePosition thePosition) { public BinaryExpression(Expression e1AST, Operator oAST, Expression e2AST, SourcePosition position) {
super(thePosition); super(position);
O = oAST; O = oAST;
E1 = e1AST; E1 = e1AST;
E2 = e2AST; E2 = e2AST;

View File

@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class BinaryOperatorDeclaration extends Declaration { public class BinaryOperatorDeclaration extends Declaration {
public BinaryOperatorDeclaration(Operator oAST, TypeDenoter arg1AST, TypeDenoter arg2AST, TypeDenoter resultAST, public BinaryOperatorDeclaration(Operator oAST, TypeDenoter arg1AST, TypeDenoter arg2AST, TypeDenoter resultAST,
SourcePosition thePosition) { SourcePosition position) {
super(thePosition); super(position);
O = oAST; O = oAST;
ARG1 = arg1AST; ARG1 = arg1AST;
ARG2 = arg2AST; ARG2 = arg2AST;

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class BoolTypeDenoter extends TypeDenoter { public class BoolTypeDenoter extends TypeDenoter {
public BoolTypeDenoter(SourcePosition thePosition) { public BoolTypeDenoter(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class CallCommand extends Command { public class CallCommand extends Command {
public CallCommand(Identifier iAST, ActualParameterSequence apsAST, SourcePosition thePosition) { public CallCommand(Identifier iAST, ActualParameterSequence apsAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
APS = apsAST; APS = apsAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class CallExpression extends Expression { public class CallExpression extends Expression {
public CallExpression(Identifier iAST, ActualParameterSequence apsAST, SourcePosition thePosition) { public CallExpression(Identifier iAST, ActualParameterSequence apsAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
APS = apsAST; APS = apsAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class CharTypeDenoter extends TypeDenoter { public class CharTypeDenoter extends TypeDenoter {
public CharTypeDenoter(SourcePosition thePosition) { public CharTypeDenoter(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class CharacterExpression extends Expression { public class CharacterExpression extends Expression {
public CharacterExpression(CharacterLiteral clAST, SourcePosition thePosition) { public CharacterExpression(CharacterLiteral clAST, SourcePosition position) {
super(thePosition); super(position);
CL = clAST; CL = clAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class CharacterLiteral extends Terminal { public class CharacterLiteral extends Terminal {
public CharacterLiteral(String theSpelling, SourcePosition thePosition) { public CharacterLiteral(String spelling, SourcePosition position) {
super(theSpelling, thePosition); super(spelling, position);
} }
@Override @Override

View File

@ -18,7 +18,7 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class Command extends AST { public abstract class Command extends AST {
public Command(SourcePosition thePosition) { public Command(SourcePosition position) {
super(thePosition); super(position);
} }
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class ConstActualParameter extends ActualParameter { public class ConstActualParameter extends ActualParameter {
public ConstActualParameter(Expression eAST, SourcePosition thePosition) { public ConstActualParameter(Expression eAST, SourcePosition position) {
super(thePosition); super(position);
E = eAST; E = eAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class ConstDeclaration extends Declaration { public class ConstDeclaration extends Declaration {
public ConstDeclaration(Identifier iAST, Expression eAST, SourcePosition thePosition) { public ConstDeclaration(Identifier iAST, Expression eAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
E = eAST; E = eAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class ConstFormalParameter extends FormalParameter { public class ConstFormalParameter extends FormalParameter {
public ConstFormalParameter(Identifier iAST, TypeDenoter tAST, SourcePosition thePosition) { public ConstFormalParameter(Identifier iAST, TypeDenoter tAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
T = tAST; T = tAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class Declaration extends AST { public abstract class Declaration extends AST {
public Declaration(SourcePosition thePosition) { public Declaration(SourcePosition position) {
super(thePosition); super(position);
duplicated = false; duplicated = false;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class DotVname extends Vname { public class DotVname extends Vname {
public DotVname(Vname vAST, Identifier iAST, SourcePosition thePosition) { public DotVname(Vname vAST, Identifier iAST, SourcePosition position) {
super(thePosition); super(position);
V = vAST; V = vAST;
I = iAST; I = iAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class EmptyActualParameterSequence extends ActualParameterSequence { public class EmptyActualParameterSequence extends ActualParameterSequence {
public EmptyActualParameterSequence(SourcePosition thePosition) { public EmptyActualParameterSequence(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class EmptyCommand extends Command { public class EmptyCommand extends Command {
public EmptyCommand(SourcePosition thePosition) { public EmptyCommand(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class EmptyExpression extends Expression { public class EmptyExpression extends Expression {
public EmptyExpression(SourcePosition thePosition) { public EmptyExpression(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class EmptyFormalParameterSequence extends FormalParameterSequence { public class EmptyFormalParameterSequence extends FormalParameterSequence {
public EmptyFormalParameterSequence(SourcePosition thePosition) { public EmptyFormalParameterSequence(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class ErrorTypeDenoter extends TypeDenoter { public class ErrorTypeDenoter extends TypeDenoter {
public ErrorTypeDenoter(SourcePosition thePosition) { public ErrorTypeDenoter(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class Expression extends AST { public abstract class Expression extends AST {
public Expression(SourcePosition thePosition) { public Expression(SourcePosition position) {
super(thePosition); super(position);
type = null; type = null;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class FieldTypeDenoter extends TypeDenoter { public abstract class FieldTypeDenoter extends TypeDenoter {
public FieldTypeDenoter(SourcePosition thePosition) { public FieldTypeDenoter(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class FormalParameter extends Declaration { public abstract class FormalParameter extends Declaration {
public FormalParameter(SourcePosition thePosition) { public FormalParameter(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class FormalParameterSequence extends AST { public abstract class FormalParameterSequence extends AST {
public FormalParameterSequence(SourcePosition thePosition) { public FormalParameterSequence(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class FuncActualParameter extends ActualParameter { public class FuncActualParameter extends ActualParameter {
public FuncActualParameter(Identifier iAST, SourcePosition thePosition) { public FuncActualParameter(Identifier iAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
} }

View File

@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class FuncDeclaration extends Declaration { public class FuncDeclaration extends Declaration {
public FuncDeclaration(Identifier iAST, FormalParameterSequence fpsAST, TypeDenoter tAST, Expression eAST, public FuncDeclaration(Identifier iAST, FormalParameterSequence fpsAST, TypeDenoter tAST, Expression eAST,
SourcePosition thePosition) { SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
FPS = fpsAST; FPS = fpsAST;
T = tAST; T = tAST;

View File

@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class FuncFormalParameter extends FormalParameter { public class FuncFormalParameter extends FormalParameter {
public FuncFormalParameter(Identifier iAST, FormalParameterSequence fpsAST, TypeDenoter tAST, public FuncFormalParameter(Identifier iAST, FormalParameterSequence fpsAST, TypeDenoter tAST,
SourcePosition thePosition) { SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
FPS = fpsAST; FPS = fpsAST;
T = tAST; T = tAST;

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class Identifier extends Terminal { public class Identifier extends Terminal {
public Identifier(String theSpelling, SourcePosition thePosition) { public Identifier(String spelling, SourcePosition position) {
super(theSpelling, thePosition); super(spelling, position);
type = null; type = null;
decl = null; decl = null;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class IfCommand extends Command { public class IfCommand extends Command {
public IfCommand(Expression eAST, Command c1AST, Command c2AST, SourcePosition thePosition) { public IfCommand(Expression eAST, Command c1AST, Command c2AST, SourcePosition position) {
super(thePosition); super(position);
E = eAST; E = eAST;
C1 = c1AST; C1 = c1AST;
C2 = c2AST; C2 = c2AST;

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class IfExpression extends Expression { public class IfExpression extends Expression {
public IfExpression(Expression e1AST, Expression e2AST, Expression e3AST, SourcePosition thePosition) { public IfExpression(Expression e1AST, Expression e2AST, Expression e3AST, SourcePosition position) {
super(thePosition); super(position);
E1 = e1AST; E1 = e1AST;
E2 = e2AST; E2 = e2AST;
E3 = e3AST; E3 = e3AST;

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class IntTypeDenoter extends TypeDenoter { public class IntTypeDenoter extends TypeDenoter {
public IntTypeDenoter(SourcePosition thePosition) { public IntTypeDenoter(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class IntegerExpression extends Expression { public class IntegerExpression extends Expression {
public IntegerExpression(IntegerLiteral ilAST, SourcePosition thePosition) { public IntegerExpression(IntegerLiteral ilAST, SourcePosition position) {
super(thePosition); super(position);
IL = ilAST; IL = ilAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class IntegerLiteral extends Terminal { public class IntegerLiteral extends Terminal {
public IntegerLiteral(String theSpelling, SourcePosition thePosition) { public IntegerLiteral(String spelling, SourcePosition position) {
super(theSpelling, thePosition); super(spelling, position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class LetCommand extends Command { public class LetCommand extends Command {
public LetCommand(Declaration dAST, Command cAST, SourcePosition thePosition) { public LetCommand(Declaration dAST, Command cAST, SourcePosition position) {
super(thePosition); super(position);
D = dAST; D = dAST;
C = cAST; C = cAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class LetExpression extends Expression { public class LetExpression extends Expression {
public LetExpression(Declaration dAST, Expression eAST, SourcePosition thePosition) { public LetExpression(Declaration dAST, Expression eAST, SourcePosition position) {
super(thePosition); super(position);
D = dAST; D = dAST;
E = eAST; E = eAST;
} }

View File

@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class MultipleActualParameterSequence extends ActualParameterSequence { public class MultipleActualParameterSequence extends ActualParameterSequence {
public MultipleActualParameterSequence(ActualParameter apAST, ActualParameterSequence apsAST, public MultipleActualParameterSequence(ActualParameter apAST, ActualParameterSequence apsAST,
SourcePosition thePosition) { SourcePosition position) {
super(thePosition); super(position);
AP = apAST; AP = apAST;
APS = apsAST; APS = apsAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class MultipleArrayAggregate extends ArrayAggregate { public class MultipleArrayAggregate extends ArrayAggregate {
public MultipleArrayAggregate(Expression eAST, ArrayAggregate aaAST, SourcePosition thePosition) { public MultipleArrayAggregate(Expression eAST, ArrayAggregate aaAST, SourcePosition position) {
super(thePosition); super(position);
E = eAST; E = eAST;
AA = aaAST; AA = aaAST;
} }

View File

@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class MultipleFieldTypeDenoter extends FieldTypeDenoter { public class MultipleFieldTypeDenoter extends FieldTypeDenoter {
public MultipleFieldTypeDenoter(Identifier iAST, TypeDenoter tAST, FieldTypeDenoter ftAST, public MultipleFieldTypeDenoter(Identifier iAST, TypeDenoter tAST, FieldTypeDenoter ftAST,
SourcePosition thePosition) { SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
T = tAST; T = tAST;
FT = ftAST; FT = ftAST;

View File

@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class MultipleFormalParameterSequence extends FormalParameterSequence { public class MultipleFormalParameterSequence extends FormalParameterSequence {
public MultipleFormalParameterSequence(FormalParameter fpAST, FormalParameterSequence fpsAST, public MultipleFormalParameterSequence(FormalParameter fpAST, FormalParameterSequence fpsAST,
SourcePosition thePosition) { SourcePosition position) {
super(thePosition); super(position);
FP = fpAST; FP = fpAST;
FPS = fpsAST; FPS = fpsAST;
} }

View File

@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class MultipleRecordAggregate extends RecordAggregate { public class MultipleRecordAggregate extends RecordAggregate {
public MultipleRecordAggregate(Identifier iAST, Expression eAST, RecordAggregate raAST, public MultipleRecordAggregate(Identifier iAST, Expression eAST, RecordAggregate raAST,
SourcePosition thePosition) { SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
E = eAST; E = eAST;
RA = raAST; RA = raAST;

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class Operator extends Terminal { public class Operator extends Terminal {
public Operator(String theSpelling, SourcePosition thePosition) { public Operator(String spelling, SourcePosition position) {
super(theSpelling, thePosition); super(spelling, position);
decl = null; decl = null;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class ProcActualParameter extends ActualParameter { public class ProcActualParameter extends ActualParameter {
public ProcActualParameter(Identifier iAST, SourcePosition thePosition) { public ProcActualParameter(Identifier iAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class ProcDeclaration extends Declaration { public class ProcDeclaration extends Declaration {
public ProcDeclaration(Identifier iAST, FormalParameterSequence fpsAST, Command cAST, SourcePosition thePosition) { public ProcDeclaration(Identifier iAST, FormalParameterSequence fpsAST, Command cAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
FPS = fpsAST; FPS = fpsAST;
C = cAST; C = cAST;

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class ProcFormalParameter extends FormalParameter { public class ProcFormalParameter extends FormalParameter {
public ProcFormalParameter(Identifier iAST, FormalParameterSequence fpsAST, SourcePosition thePosition) { public ProcFormalParameter(Identifier iAST, FormalParameterSequence fpsAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
FPS = fpsAST; FPS = fpsAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class Program extends AST { public class Program extends AST {
public Program(Command cAST, SourcePosition thePosition) { public Program(Command cAST, SourcePosition position) {
super(thePosition); super(position);
C = cAST; C = cAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class RecordAggregate extends AST { public abstract class RecordAggregate extends AST {
public RecordAggregate(SourcePosition thePosition) { public RecordAggregate(SourcePosition position) {
super(thePosition); super(position);
type = null; type = null;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class RecordExpression extends Expression { public class RecordExpression extends Expression {
public RecordExpression(RecordAggregate raAST, SourcePosition thePosition) { public RecordExpression(RecordAggregate raAST, SourcePosition position) {
super(thePosition); super(position);
RA = raAST; RA = raAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class RecordTypeDenoter extends TypeDenoter { public class RecordTypeDenoter extends TypeDenoter {
public RecordTypeDenoter(FieldTypeDenoter ftAST, SourcePosition thePosition) { public RecordTypeDenoter(FieldTypeDenoter ftAST, SourcePosition position) {
super(thePosition); super(position);
FT = ftAST; FT = ftAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class SequentialCommand extends Command { public class SequentialCommand extends Command {
public SequentialCommand(Command c1AST, Command c2AST, SourcePosition thePosition) { public SequentialCommand(Command c1AST, Command c2AST, SourcePosition position) {
super(thePosition); super(position);
C1 = c1AST; C1 = c1AST;
C2 = c2AST; C2 = c2AST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class SequentialDeclaration extends Declaration { public class SequentialDeclaration extends Declaration {
public SequentialDeclaration(Declaration d1AST, Declaration d2AST, SourcePosition thePosition) { public SequentialDeclaration(Declaration d1AST, Declaration d2AST, SourcePosition position) {
super(thePosition); super(position);
D1 = d1AST; D1 = d1AST;
D2 = d2AST; D2 = d2AST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class SimpleTypeDenoter extends TypeDenoter { public class SimpleTypeDenoter extends TypeDenoter {
public SimpleTypeDenoter(Identifier iAST, SourcePosition thePosition) { public SimpleTypeDenoter(Identifier iAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class SimpleVname extends Vname { public class SimpleVname extends Vname {
public SimpleVname(Identifier iAST, SourcePosition thePosition) { public SimpleVname(Identifier iAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class SingleActualParameterSequence extends ActualParameterSequence { public class SingleActualParameterSequence extends ActualParameterSequence {
public SingleActualParameterSequence(ActualParameter apAST, SourcePosition thePosition) { public SingleActualParameterSequence(ActualParameter apAST, SourcePosition position) {
super(thePosition); super(position);
AP = apAST; AP = apAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class SingleArrayAggregate extends ArrayAggregate { public class SingleArrayAggregate extends ArrayAggregate {
public SingleArrayAggregate(Expression eAST, SourcePosition thePosition) { public SingleArrayAggregate(Expression eAST, SourcePosition position) {
super(thePosition); super(position);
E = eAST; E = eAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class SingleFieldTypeDenoter extends FieldTypeDenoter { public class SingleFieldTypeDenoter extends FieldTypeDenoter {
public SingleFieldTypeDenoter(Identifier iAST, TypeDenoter tAST, SourcePosition thePosition) { public SingleFieldTypeDenoter(Identifier iAST, TypeDenoter tAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
T = tAST; T = tAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class SingleFormalParameterSequence extends FormalParameterSequence { public class SingleFormalParameterSequence extends FormalParameterSequence {
public SingleFormalParameterSequence(FormalParameter fpAST, SourcePosition thePosition) { public SingleFormalParameterSequence(FormalParameter fpAST, SourcePosition position) {
super(thePosition); super(position);
FP = fpAST; FP = fpAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class SingleRecordAggregate extends RecordAggregate { public class SingleRecordAggregate extends RecordAggregate {
public SingleRecordAggregate(Identifier iAST, Expression eAST, SourcePosition thePosition) { public SingleRecordAggregate(Identifier iAST, Expression eAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
E = eAST; E = eAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class SubscriptVname extends Vname { public class SubscriptVname extends Vname {
public SubscriptVname(Vname vAST, Expression eAST, SourcePosition thePosition) { public SubscriptVname(Vname vAST, Expression eAST, SourcePosition position) {
super(thePosition); super(position);
V = vAST; V = vAST;
E = eAST; E = eAST;
} }

View File

@ -18,10 +18,10 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
abstract public class Terminal extends AST { abstract public class Terminal extends AST {
public Terminal(String theSpelling, SourcePosition thePosition) { public Terminal(String spelling, SourcePosition position) {
super(thePosition); super(position);
spelling = theSpelling; this.spelling = spelling;
} }
public String spelling; public final String spelling;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class TypeDeclaration extends Declaration { public class TypeDeclaration extends Declaration {
public TypeDeclaration(Identifier iAST, TypeDenoter tAST, SourcePosition thePosition) { public TypeDeclaration(Identifier iAST, TypeDenoter tAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
T = tAST; T = tAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class TypeDenoter extends AST { public abstract class TypeDenoter extends AST {
public TypeDenoter(SourcePosition thePosition) { public TypeDenoter(SourcePosition position) {
super(thePosition); super(position);
} }
@Override @Override

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class UnaryExpression extends Expression { public class UnaryExpression extends Expression {
public UnaryExpression(Operator oAST, Expression eAST, SourcePosition thePosition) { public UnaryExpression(Operator oAST, Expression eAST, SourcePosition position) {
super(thePosition); super(position);
O = oAST; O = oAST;
E = eAST; E = eAST;
} }

View File

@ -19,8 +19,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class UnaryOperatorDeclaration extends Declaration { public class UnaryOperatorDeclaration extends Declaration {
public UnaryOperatorDeclaration(Operator oAST, TypeDenoter argAST, TypeDenoter resultAST, public UnaryOperatorDeclaration(Operator oAST, TypeDenoter argAST, TypeDenoter resultAST,
SourcePosition thePosition) { SourcePosition position) {
super(thePosition); super(position);
O = oAST; O = oAST;
ARG = argAST; ARG = argAST;
RES = resultAST; RES = resultAST;

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class VarActualParameter extends ActualParameter { public class VarActualParameter extends ActualParameter {
public VarActualParameter(Vname vAST, SourcePosition thePosition) { public VarActualParameter(Vname vAST, SourcePosition position) {
super(thePosition); super(position);
V = vAST; V = vAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class VarDeclaration extends Declaration { public class VarDeclaration extends Declaration {
public VarDeclaration(Identifier iAST, TypeDenoter tAST, SourcePosition thePosition) { public VarDeclaration(Identifier iAST, TypeDenoter tAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
T = tAST; T = tAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class VarFormalParameter extends FormalParameter { public class VarFormalParameter extends FormalParameter {
public VarFormalParameter(Identifier iAST, TypeDenoter tAST, SourcePosition thePosition) { public VarFormalParameter(Identifier iAST, TypeDenoter tAST, SourcePosition position) {
super(thePosition); super(position);
I = iAST; I = iAST;
T = tAST; T = tAST;
} }

View File

@ -17,138 +17,138 @@ package Triangle.AbstractSyntaxTrees;
public interface Visitor { public interface Visitor {
// Commands // 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 // 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 // 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 // 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 // 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 // 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 // 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 // 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 // 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 // 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 // Programs
public abstract Object visitProgram(Program ast, Object o); Object visitProgram(Program ast, Object o);
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public abstract class Vname extends AST { public abstract class Vname extends AST {
public Vname(SourcePosition thePosition) { public Vname(SourcePosition position) {
super(thePosition); super(position);
variable = false; variable = false;
type = null; type = null;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class VnameExpression extends Expression { public class VnameExpression extends Expression {
public VnameExpression(Vname vAST, SourcePosition thePosition) { public VnameExpression(Vname vAST, SourcePosition position) {
super(thePosition); super(position);
V = vAST; V = vAST;
} }

View File

@ -18,8 +18,8 @@ import Triangle.SyntacticAnalyzer.SourcePosition;
public class WhileCommand extends Command { public class WhileCommand extends Command {
public WhileCommand(Expression eAST, Command cAST, SourcePosition thePosition) { public WhileCommand(Expression eAST, Command cAST, SourcePosition position) {
super(thePosition); super(position);
E = eAST; E = eAST;
C = cAST; C = cAST;
} }