simonkellet/Triangle-Tools
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: simonkellet:4341d02572a16b102fbe2cf52541bad7252c4b3a
Branches Tags
simonkellet:main
simonkellet:java11
simonkellet:version-2.1
..
compare: simonkellet:a647259dc259a46eb3f81c5b936866546aa1e8ca
Branches Tags
simonkellet:java11
simonkellet:main
simonkellet:version-2.1

No commits in common. "4341d02572a16b102fbe2cf52541bad7252c4b3a" and "a647259dc259a46eb3f81c5b936866546aa1e8ca" have entirely different histories.
4341d02572 ... a647259dc2

12 changed files with 22 additions and 101 deletions
Show Stats Expand all files Collapse all files

21
Triangle.Compiler/src/main/java/triangle/abstractSyntaxTrees/commands/RepeatCommand.java
View File

@ -1,21 +0,0 @@
package triangle.abstractSyntaxTrees.commands;
import triangle.abstractSyntaxTrees.expressions.Expression;
import triangle.abstractSyntaxTrees.visitors.CommandVisitor;
import triangle.syntacticAnalyzer.SourcePosition;
public class RepeatCommand extends Command {
public RepeatCommand(Expression eAST, Command cAST, SourcePosition position) {
super(position);
E = eAST;
C = cAST;
}
public <TArg, TResult> TResult visit(CommandVisitor<TArg, TResult> v, TArg arg) {
return v.visitRepeatCommand(this, arg);
}
public final Expression E;
public final Command C;
}

6
Triangle.Compiler/src/main/java/triangle/abstractSyntaxTrees/visitors/CommandVisitor.java
View File

@ -5,11 +5,11 @@ import triangle.abstractSyntaxTrees.commands.CallCommand;
import triangle.abstractSyntaxTrees.commands.EmptyCommand;
import triangle.abstractSyntaxTrees.commands.IfCommand;
import triangle.abstractSyntaxTrees.commands.LetCommand;
import triangle.abstractSyntaxTrees.commands.RepeatCommand;
import triangle.abstractSyntaxTrees.commands.SequentialCommand;
import triangle.abstractSyntaxTrees.commands.WhileCommand;
public interface CommandVisitor<TArg, TResult> {
TResult visitAssignCommand(AssignCommand ast, TArg arg);
TResult visitCallCommand(CallCommand ast, TArg arg);
@ -23,7 +23,5 @@ public interface CommandVisitor<TArg, TResult> {
TResult visitSequentialCommand(SequentialCommand ast, TArg arg);
TResult visitWhileCommand(WhileCommand ast, TArg arg);
TResult visitRepeatCommand(RepeatCommand ast, TArg arg);
}
}

6
Triangle.Compiler/src/main/java/triangle/codeGenerator/Encoder.java
View File

@ -38,7 +38,6 @@ import triangle.abstractSyntaxTrees.commands.CallCommand;
import triangle.abstractSyntaxTrees.commands.EmptyCommand;
import triangle.abstractSyntaxTrees.commands.IfCommand;
import triangle.abstractSyntaxTrees.commands.LetCommand;
import triangle.abstractSyntaxTrees.commands.RepeatCommand;
import triangle.abstractSyntaxTrees.commands.SequentialCommand;
import triangle.abstractSyntaxTrees.commands.WhileCommand;
import triangle.abstractSyntaxTrees.declarations.BinaryOperatorDeclaration;
@ -181,11 +180,6 @@ public final class Encoder implements ActualParameterVisitor<Frame, Integer>,
emitter.emit(OpCode.JUMPIF, Machine.trueRep, Register.CB, loopAddr);
return null;
}
@Override
public Void visitRepeatCommand(RepeatCommand ast, Frame frame) {
return null;
}
// Expressions
@Override

6
Triangle.Compiler/src/main/java/triangle/contextualAnalyzer/Checker.java
View File

@ -34,7 +34,6 @@ import triangle.abstractSyntaxTrees.commands.CallCommand;
import triangle.abstractSyntaxTrees.commands.EmptyCommand;
import triangle.abstractSyntaxTrees.commands.IfCommand;
import triangle.abstractSyntaxTrees.commands.LetCommand;
import triangle.abstractSyntaxTrees.commands.RepeatCommand;
import triangle.abstractSyntaxTrees.commands.SequentialCommand;
import triangle.abstractSyntaxTrees.commands.WhileCommand;
import triangle.abstractSyntaxTrees.declarations.BinaryOperatorDeclaration;
@ -185,11 +184,6 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
return null;
}
@Override
public Void visitRepeatCommand(RepeatCommand ast, Void arg) {
return null;
}
// Expressions

13
Triangle.Compiler/src/main/java/triangle/syntacticAnalyzer/Parser.java
View File

@ -37,7 +37,6 @@ import triangle.abstractSyntaxTrees.commands.Command;
import triangle.abstractSyntaxTrees.commands.EmptyCommand;
import triangle.abstractSyntaxTrees.commands.IfCommand;
import triangle.abstractSyntaxTrees.commands.LetCommand;
import triangle.abstractSyntaxTrees.commands.RepeatCommand;
import triangle.abstractSyntaxTrees.commands.SequentialCommand;
import triangle.abstractSyntaxTrees.commands.WhileCommand;
import triangle.abstractSyntaxTrees.declarations.ConstDeclaration;
@ -321,7 +320,7 @@ public class Parser {
}
break;
case Token.WHILE: { //while expr. do command
case Token.WHILE: {
acceptIt();
Expression eAST = parseExpression();
accept(Token.DO);
@ -331,16 +330,6 @@ public class Parser {
}
break;
case Token.REPEAT: { //repeat command until expr.
acceptIt();
Command cAST = parseSingleCommand();
accept(Token.UNTIL); //check that there is a "until"
Expression eAST = parseExpression();
finish(commandPos);
commandAST = new RepeatCommand(eAST, cAST, commandPos);
}
break;
case Token.SEMICOLON:
case Token.END:
case Token.ELSE:

25
Triangle.Compiler/src/main/java/triangle/syntacticAnalyzer/Scanner.java
View File

@ -35,7 +35,7 @@ public final class Scanner {
private boolean isOperator(char c) {
return (c == '+' || c == '-' || c == '*' || c == '/' || c == '=' || c == '<' || c == '>' || c == '\\'
|| c == '&' || c == '@' || c == '%' || c == '^' || c == '?' || c == '|');
|| c == '&' || c == '@' || c == '%' || c == '^' || c == '?');
}
///////////////////////////////////////////////////////////////////////////////
@ -64,7 +64,7 @@ public final class Scanner {
private void scanSeparator() {
switch (currentChar) {
// ! comment
// comment
case '!': {
takeIt();
while ((currentChar != SourceFile.EOL) && (currentChar != SourceFile.EOT))
@ -84,18 +84,6 @@ public final class Scanner {
}
break;
// new type of comment, the multi-line $ comment
case '$':{
takeIt();
//check if it is not the comment char or EOT, skipping new lines (no EOL)
while((currentChar != '$') && (currentChar != SourceFile.EOT))
takeIt();
//if we reach another $, takeIt and move on, we've reached the end of the multi-line comment
if(currentChar == '$')
takeIt();
}
break;
// whitespace
case ' ':
case '\n':
@ -199,13 +187,6 @@ public final class Scanner {
while (isOperator(currentChar))
takeIt();
return Token.OPERATOR;
// TODO: Bar operator, week 3
case '|':
takeIt();
while(isOperator(currentChar))
takeIt();
return Token.OPERATOR;
case '\'':
takeIt();
@ -281,7 +262,7 @@ public final class Scanner {
currentlyScanningToken = false;
// skip any whitespace or comments
while (currentChar == '!' || currentChar == ' ' || currentChar == '\n' || currentChar == '\r'
|| currentChar == '\t' || currentChar == '#' || currentChar == '$')
|| currentChar == '\t' || currentChar == '#')
scanSeparator();
currentlyScanningToken = true;

12
Triangle.Compiler/src/main/java/triangle/syntacticAnalyzer/Token.java
View File

@ -64,20 +64,20 @@ final class Token extends Object {
// reserved words - must be in alphabetical order...
ARRAY = 4, BEGIN = 5, CONST = 6, DO = 7, ELSE = 8, END = 9, FUNC = 10, IF = 11, IN = 12, LET = 13, OF = 14,
PROC = 15, RECORD = 16, REPEAT = 17, THEN = 18, TYPE = 19, UNTIL = 20, VAR = 21, WHILE = 22,
PROC = 15, RECORD = 16, THEN = 17, TYPE = 18, VAR = 19, WHILE = 20,
// punctuation...
DOT = 23, COLON = 24, SEMICOLON = 25, COMMA = 26, BECOMES = 27, IS = 28,
DOT = 21, COLON = 22, SEMICOLON = 23, COMMA = 24, BECOMES = 25, IS = 26,
// brackets...
LPAREN = 29, RPAREN = 30, LBRACKET = 31, RBRACKET = 32, LCURLY = 33, RCURLY = 34,
LPAREN = 27, RPAREN = 28, LBRACKET = 29, RBRACKET = 30, LCURLY = 31, RCURLY = 32,
// special tokens...
EOT = 35, ERROR = 36;
EOT = 33, ERROR = 34;
private static String[] tokenTable = new String[] { "<int>", "<char>", "<identifier>", "<operator>", "array",
"begin", "const", "do", "else", "end", "func", "if", "in", "let", "of", "proc", "record", "repeat", "then", "type",
"until", "var", "while", ".", ":", ";", ",", ":=", "~", "(", ")", "[", "]", "{", "}", "", "<error>" };
"begin", "const", "do", "else", "end", "func", "if", "in", "let", "of", "proc", "record", "then", "type",
"var", "while", ".", ":", ";", ",", ":=", "~", "(", ")", "[", "]", "{", "}", "", "<error>" };
private final static int firstReservedWord = Token.ARRAY, lastReservedWord = Token.WHILE;

6
Triangle.Compiler/src/main/java/triangle/treeDrawer/LayoutVisitor.java
View File

@ -33,7 +33,6 @@ import triangle.abstractSyntaxTrees.commands.CallCommand;
import triangle.abstractSyntaxTrees.commands.EmptyCommand;
import triangle.abstractSyntaxTrees.commands.IfCommand;
import triangle.abstractSyntaxTrees.commands.LetCommand;
import triangle.abstractSyntaxTrees.commands.RepeatCommand;
import triangle.abstractSyntaxTrees.commands.SequentialCommand;
import triangle.abstractSyntaxTrees.commands.WhileCommand;
import triangle.abstractSyntaxTrees.declarations.BinaryOperatorDeclaration;
@ -159,11 +158,6 @@ public class LayoutVisitor implements ActualParameterVisitor<Void, DrawingTree>,
var d2 = ast.C.visit(this);
return layoutBinary("WhileCom.", d1, d2);
}
@Override
public DrawingTree visitRepeatCommand(RepeatCommand ast, Void obj) {
return null;
}
// Expressions
@Override

6
Triangle.Compiler/src/test/java/triangle/syntacticAnalyser/TestScanner.java
View File

@ -28,19 +28,19 @@ public class TestScanner {
@Test
public void testHiNewComment2() {
compileExpectSuccess("/hi-newcomment2.tri");
compileExpectFailure("/hi-newcomment2.tri");
}
@Test
public void testBarDemo() {
compileExpectSuccess("/bardemo.tri"); //TODO: Change this to failure
compileExpectFailure("/bardemo.tri");
}
@Test
public void testRepeatUntil() {
compileExpectSuccess("/repeatuntil.tri");
compileExpectFailure("/repeatuntil.tri");
}
@Test

BIN
build/libs/Triangle-Tools.jar
View File

Binary file not shown.

3
programs/hi-newcomment2.tri
View File

@ -4,9 +4,6 @@
$
another new comment
another new comment
another new comment
another new comment
$
begin

19
tam
View File

@ -14,16 +14,11 @@ if [ -z "$1" ]
file=$1
fi
printf "${GRN}[INFO] Compiling file: $1.tri to $1.tam ...${NC}\n"
printf "${GRN}Compiling file: $1.tri to $1.tam ...${NC}\n"
# Compile to tam
if java -cp build/libs/Triangle-Tools.jar triangle.Compiler programs/$1.tri -o=$1.tam &> /dev/null #quiet
then
printf "${GRN}[INFO] Running file: $1.tam ...${NC}\n"
java -cp build/libs/Triangle-Tools.jar triangle.abstractMachine.Interpreter $1.tam
else
printf "${RED}[ERROR] Could not complie $1.tri ...${NC}"
err=$(java -cp build/libs/Triangle-Tools.jar triangle.Compiler programs/$1.tri -o=$1.tam)
printf "${RED}\n$err\n${NC}"
exit 1
fi
#java -cp build/libs/Triangle-Tools.jar triangle.Compiler programs/$1.tri -o=$1.tam &> /dev/null #Quiet output, not handy!
java -cp build/libs/Triangle-Tools.jar triangle.Compiler programs/$1.tri -o=$1.tam
printf "${GRN}Running file: $1.tam ...${NC}\n"
# Run the Program
java -cp build/libs/Triangle-Tools.jar triangle.abstractMachine.Interpreter $1.tam