From 48dcd488054024d98fe1e659a4029630130d1d35 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Wed, 22 Jun 2016 23:25:59 +0300 Subject: Add multiplication and division operations --- main/core/tokenizer/Tokenizer.java | 8 ++++-- main/core/tokenizer/token/Token.java | 16 +++++++++++ main/core/tokenizer/token/types/DivisionToken.java | 23 ++++++++++++++++ .../tokenizer/token/types/DoubleLiteralToken.java | 32 ++++++++++++++++++++++ .../tokenizer/token/types/MultiplicationToken.java | 23 ++++++++++++++++ 5 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 main/core/tokenizer/token/types/DivisionToken.java create mode 100644 main/core/tokenizer/token/types/DoubleLiteralToken.java create mode 100644 main/core/tokenizer/token/types/MultiplicationToken.java (limited to 'main/core/tokenizer') diff --git a/main/core/tokenizer/Tokenizer.java b/main/core/tokenizer/Tokenizer.java index 3501737..9ff1e4c 100644 --- a/main/core/tokenizer/Tokenizer.java +++ b/main/core/tokenizer/Tokenizer.java @@ -34,7 +34,12 @@ public class Tokenizer { private Tokenizer() { tokenRegexes.put(Token.Type.CommentToken, "^\\/\\*(.*?)\\*\\/"); + + tokenRegexes.put(Token.Type.DoubleLiteralToken, "^([-+]?[0-9]*\\.?[0-9]+)f\\b"); + tokenRegexes.put(Token.Type.IntegerLiteralToken, "^([-+]?\\d+)\\b"); + tokenRegexes.put(Token.Type.BooleanLiteralToken, "^(true|false)\\b"); tokenRegexes.put(Token.Type.StringLiteralToken, "^\"(.*?)\""); + tokenRegexes.put(Token.Type.WhitespaceToken, "^( |\t)"); tokenRegexes.put(Token.Type.NewlineToken, "^(\n|\r\n)"); tokenRegexes.put(Token.Type.AdditionToken, "^(\\+)"); @@ -57,8 +62,7 @@ public class Tokenizer { tokenRegexes.put(Token.Type.NegationToken, "^(not)\\b"); tokenRegexes.put(Token.Type.DeclarationToken, "^(decl)\\b"); tokenRegexes.put(Token.Type.BranchToken, "^(if)\\b"); - tokenRegexes.put(Token.Type.IntegerLiteralToken, "^(\\d+)"); - tokenRegexes.put(Token.Type.BooleanLiteralToken, "^(true|false)\\b"); + tokenRegexes.put(Token.Type.SymbolToken, "^([a-zA-Z]+\\w*)"); discardedTokenTypes.add(Token.Type.WhitespaceToken); diff --git a/main/core/tokenizer/token/Token.java b/main/core/tokenizer/token/Token.java index a9b66e8..d4058cb 100644 --- a/main/core/tokenizer/token/Token.java +++ b/main/core/tokenizer/token/Token.java @@ -33,32 +33,42 @@ abstract public class Token { /* Token types, ordered by precedence */ public enum Type { CommentToken, + AdditionToken, SubtractionToken, DivisionToken, MultiplicationToken, + AssignmentToken, + LessThanToken, GreaterThanToken, LessOrEqualThanToken, GreaterOrEqualThanToken, EqualsToken, NotEqualsToken, + OpenParenToken, ClosedParenToken, + FunctionDefineToken, DeclarationToken, + StringLiteralToken, IntegerLiteralToken, BooleanLiteralToken, + DoubleLiteralToken, + WhitespaceToken, NewlineToken, + BranchToken, SymbolToken, EndBlockToken, FunctionBodyToken, BranchBodyToken, NegationToken, + NotAToken } @@ -162,10 +172,16 @@ abstract public class Token { return new StringLiteralToken(text, rawText); case BooleanLiteralToken: return new BooleanLiteralToken(text); + case DoubleLiteralToken: + return new DoubleLiteralToken(text, rawText); case AdditionToken: return new AdditionToken(); case SubtractionToken: return new SubtractionToken(); + case MultiplicationToken: + return new MultiplicationToken(); + case DivisionToken: + return new DivisionToken(); case FunctionDefineToken: return new FunctionDefineToken(); case EndBlockToken: diff --git a/main/core/tokenizer/token/types/DivisionToken.java b/main/core/tokenizer/token/types/DivisionToken.java new file mode 100644 index 0000000..14f4d13 --- /dev/null +++ b/main/core/tokenizer/token/types/DivisionToken.java @@ -0,0 +1,23 @@ +package com.jantuomi.interpreter.main.core.tokenizer.token.types; + +import com.jantuomi.interpreter.main.core.parser.ast.ASTNode; +import com.jantuomi.interpreter.main.core.parser.ast.DivisionNode; +import com.jantuomi.interpreter.main.exception.InterpreterException; + +/** + * Created by jan on 15.6.2016. + */ +public class DivisionToken extends BinaryOperatorToken { + public DivisionToken() { + super(Type.DivisionToken); + } + + @Override + public ASTNode generateNode() throws InterpreterException { + return new DivisionNode(this, + lhs.generateNode(), + rhs.generateNode() + ); + + } +} diff --git a/main/core/tokenizer/token/types/DoubleLiteralToken.java b/main/core/tokenizer/token/types/DoubleLiteralToken.java new file mode 100644 index 0000000..1a379eb --- /dev/null +++ b/main/core/tokenizer/token/types/DoubleLiteralToken.java @@ -0,0 +1,32 @@ +package com.jantuomi.interpreter.main.core.tokenizer.token.types; + +import com.jantuomi.interpreter.main.core.parser.ast.ASTNode; +import com.jantuomi.interpreter.main.core.parser.ast.DoubleLiteralNode; +import com.jantuomi.interpreter.main.core.tokenizer.token.Token; + +import java.util.Arrays; +import java.util.List; + +/** + * Created by jan on 15.6.2016. + */ +public class DoubleLiteralToken extends Token{ + public DoubleLiteralToken(String text, String rawText) { + super(Type.DoubleLiteralToken, text, rawText); + } + + @Override + public ASTNode generateNode() { + return new DoubleLiteralNode(this); + } + + @Override + public Token setArguments(List args) { + return this; + } + + @Override + public List getChildren() { + return Arrays.asList(); + } +} diff --git a/main/core/tokenizer/token/types/MultiplicationToken.java b/main/core/tokenizer/token/types/MultiplicationToken.java new file mode 100644 index 0000000..521f01a --- /dev/null +++ b/main/core/tokenizer/token/types/MultiplicationToken.java @@ -0,0 +1,23 @@ +package com.jantuomi.interpreter.main.core.tokenizer.token.types; + +import com.jantuomi.interpreter.main.core.parser.ast.ASTNode; +import com.jantuomi.interpreter.main.core.parser.ast.MultiplicationNode; +import com.jantuomi.interpreter.main.exception.InterpreterException; + +/** + * Created by jan on 15.6.2016. + */ +public class MultiplicationToken extends BinaryOperatorToken { + public MultiplicationToken() { + super(Type.MultiplicationToken); + } + + @Override + public ASTNode generateNode() throws InterpreterException { + return new MultiplicationNode(this, + lhs.generateNode(), + rhs.generateNode() + ); + + } +} -- cgit v1.3