Skip to content

Commit cc58ca9

Browse files
ilevdilevd
committed
Parser cleaning
1 parent 8d15936 commit cc58ca9

1 file changed

Lines changed: 0 additions & 53 deletions

File tree

‎src-java/cwp/parser/Parser.java‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import cwp.lexer.LexerReader;
77
import cwp.lexer.Token;
8-
import cwp.lexer.readers.Str;
98

109
import java.util.*;
1110

@@ -45,22 +44,7 @@ public static int getPrecedence(String s) {
4544
return precedence.getOrDefault(s, -1);
4645
}
4746

48-
/*
49-
enum Precedence {
50-
LOWEST,
51-
PIPE, // |> , |>>
52-
OR,
53-
AND,
54-
NOT,
55-
COMPARISON, //>, <, >= ,<=, =, ==, !=,
56-
SUM, // +, -
57-
PRODUCT // *, /
58-
// PREFIX
59-
// CALL
60-
}
61-
*/
6247

63-
//CharReader charReader;
6448
LexerReader lexerReader;
6549
ArrayList<Integer> indentation = new ArrayList<Integer>();
6650
int curLine = 1;
@@ -94,26 +78,18 @@ public boolean checkIndentation(int indent) {
9478

9579

9680
public Parser(String s) {
97-
//charReader = new CharReader(s);
9881
lexerReader = new LexerReader(s);
99-
// indentation.add(1);
10082
}
10183

10284
public void unreadToken(Token t) {
10385
lexerReader.unread(t);
10486
}
10587

10688
public Token nextTokenWithSep() {
107-
//return LexerReader.read(charReader);
10889
return lexerReader.read();
10990
}
11091

11192
public Token nextToken() {
112-
// Token t = LexerReader.read(charReader);
113-
// while (t.type == Token.Type.COMMA || t.type == Token.Type.TO) {
114-
// t = LexerReader.read(charReader);
115-
// }
116-
// return t;
11793
Token t = lexerReader.read();
11894
while (t.type == Token.Type.COMMA || t.type == Token.Type.TO) {
11995
t = lexerReader.read();
@@ -169,36 +145,13 @@ public Expr readExpr(Token.Type delim, Expr delimReturn) {
169145
if (t.type == Token.Type.SYMBOL && Controls.isMap(t.str)) {
170146
return readFlatCotrol(t, Controls.Type.MAP);
171147
}
172-
// Expr e = readBaseExpr(t);
173-
//Expr e = readUnaryExpr(t);
174148
Expr e = readInfixExpr(t, LOWEST);
175-
//System.out.println(">>>> " + e);
176149
if (e == null) {
177150
throw Util.sneakyThrow(new ParserException("Unexpected token: " + t.str, t));
178151
}
179152
return e;
180153
}
181154

182-
183-
// public Expr readInfixExpr(Token t, int prevPrecedence) {
184-
// Expr leftExpr = readUnaryExpr(t);
185-
// Token opToken = nextTokenWithSep();
186-
// //System.out.println(">>readInfixExpr " + leftExpr + " " + opToken + " " + prevPrecedence + " " + (prevPrecedence >= SUM));
187-
// for (; ; ) {
188-
// int curPrecedence = getPrecedence(opToken.str);
189-
// if (curPrecedence == -1 || prevPrecedence >= curPrecedence) {
190-
// unreadToken(opToken);
191-
// break;
192-
// }
193-
// //System.out.println(">>curPrec " + curPrecedence + " " + opToken.str);
194-
// // curPrecedence > prevPrecedence
195-
// Expr rightExpr = readInfixExpr(nextToken(), curPrecedence);
196-
// leftExpr = new InfixExpr(opToken, leftExpr, rightExpr);
197-
// opToken = nextTokenWithSep();
198-
// }
199-
// return leftExpr;
200-
// }
201-
202155
public Expr readInfixExpr(Token t, int prevPrecedence) {
203156
Expr firstExpr = readUnaryExpr(t);
204157
if (firstExpr.initTok.type == Token.Type.EOF) throw Util.runtimeException("EOF while reading");
@@ -244,7 +197,6 @@ public Expr readUnaryExpr(Token t) {
244197
if (nextExpr.initTok.type == Token.Type.EOF) throw Util.runtimeException("EOF while reading");
245198
return new UnaryExpr(t, nextExpr, true);
246199
}
247-
//return readBaseExpr(t);
248200
return readFunctionCallExpr(t);
249201
}
250202

@@ -673,25 +625,20 @@ public ArrayList<Token> readAll() {
673625
ArrayList<Token> arr = new ArrayList<Token>();
674626
//Token t = LexerReader.read(charReader);
675627
Token t = lexerReader.read();
676-
677628
curLine = t.line;
678629
if (t.column != lastIndentation()) {
679630
Util.runtimeException("EOF while reading character");
680631
}
681-
682632
while (t.type != Token.Type.EOF) {
683633
arr.add(t);
684-
685634
// t = LexerReader.read(charReader);
686635
t = lexerReader.read();
687636
if (t.type == Token.Type.COLON) {
688637

689638
}
690-
691639
}
692640
arr.add(t);
693641
return arr;
694-
695642
}
696643

697644
public static ArrayList<Expr> readString(String s) {

0 commit comments

Comments
 (0)