java-projects/Own-Programming-Language-Tutorial
1
0
Fork 0
mirror of https://github.com/aNNiMON/Own-Programming-Language-Tutorial.git synced 2024-09-20 08:44:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Мелкие исправления для повышения скорости

Browse Source
This commit is contained in:
Victor 2016-07-01 18:57:12 +03:00
parent 4df44cadea
commit 03b56ce019
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/annimon/ownlang/parser/Lexer.java
View File

@ -203,7 +203,7 @@ public final class Lexer {
clearBuffer(); clearBuffer();
while (true) { while (true) {
final String text = buffer.toString(); final String text = buffer.toString();
if (!OPERATORS.containsKey(text + current) && !text.isEmpty()) { if (!text.isEmpty() && !OPERATORS.containsKey(text + current)) {
addToken(OPERATORS.get(text)); addToken(OPERATORS.get(text));
return; return;
} }
@ -237,9 +237,9 @@ public final class Lexer {
clearBuffer(); clearBuffer();
char current = peek(0); char current = peek(0);
while (true) { while (true) {
if (current == '`') break;
if (current == '\0') throw error("Reached end of file while parsing extended word."); if (current == '\0') throw error("Reached end of file while parsing extended word.");
if (current == '\n' || current == '\r') throw error("Reached end of line while parsing extended word."); if (current == '\n' || current == '\r') throw error("Reached end of line while parsing extended word.");
if (current == '`') break;
buffer.append(current); buffer.append(current);
current = next(); current = next();
} }
@ -252,7 +252,6 @@ public final class Lexer {
clearBuffer(); clearBuffer();
char current = peek(0); char current = peek(0);
while (true) { while (true) {
if (current == '\0') throw error("Reached end of file while parsing text string.");
if (current == '\\') { if (current == '\\') {
current = next(); current = next();
switch (current) { switch (current) {
@ -288,6 +287,7 @@ public final class Lexer {
continue; continue;
} }
if (current == '"') break; if (current == '"') break;
if (current == '\0') throw error("Reached end of file while parsing text string.");
buffer.append(current); buffer.append(current);
current = next(); current = next();
} }
@ -306,8 +306,8 @@ public final class Lexer {
private void tokenizeMultilineComment() { private void tokenizeMultilineComment() {
char current = peek(0); char current = peek(0);
while (true) { while (true) {
if (current == '\0') throw error("Reached end of file while parsing multiline comment");
if (current == '*' && peek(1) == '/') break; if (current == '*' && peek(1) == '/') break;
if (current == '\0') throw error("Reached end of file while parsing multiline comment");
current = next(); current = next();
} }
next(); // * next(); // *

5
src/com/annimon/ownlang/parser/Parser.java
View File

@ -6,6 +6,7 @@ import com.annimon.ownlang.lib.StringValue;
import com.annimon.ownlang.lib.UserDefinedFunction; import com.annimon.ownlang.lib.UserDefinedFunction;
import com.annimon.ownlang.parser.ast.*; import com.annimon.ownlang.parser.ast.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -27,9 +28,9 @@ public final class Parser {
private static final Token EOF = new Token(TokenType.EOF, "", -1, -1); private static final Token EOF = new Token(TokenType.EOF, "", -1, -1);
private static final Map<TokenType, BinaryExpression.Operator> assignOperator; private static final EnumMap<TokenType, BinaryExpression.Operator> assignOperator;
static { static {
assignOperator = new HashMap<>(BinaryExpression.Operator.values().length + 1); assignOperator = new EnumMap(TokenType.class);
assignOperator.put(TokenType.EQ, null); assignOperator.put(TokenType.EQ, null);
assignOperator.put(TokenType.PLUSEQ, BinaryExpression.Operator.ADD); assignOperator.put(TokenType.PLUSEQ, BinaryExpression.Operator.ADD);
assignOperator.put(TokenType.MINUSEQ, BinaryExpression.Operator.SUBTRACT); assignOperator.put(TokenType.MINUSEQ, BinaryExpression.Operator.SUBTRACT);