Skip to content

Commit 900adca

Browse files
killme2008killme2008
authored
Merge pull request #639 from Drincann/master
refactor: replace typo lookhead with lookahead
2 parents f9d64dc + 312b86f commit 900adca

File tree

11 files changed

+703
-703
lines changed

11 files changed

+703
-703
lines changed

‎examples/calculator.av‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn expr(parser, tokens) {
6969
term(parser, tokens);
7070

7171
while true {
72-
let t = parser.lookhead;
72+
let t = parser.lookahead;
7373

7474
if t.val == '+' {
7575
parser.move();
@@ -89,7 +89,7 @@ fn term(parser, tokens) {
8989
unary(parser, tokens);
9090

9191
while true {
92-
let t = parser.lookhead;
92+
let t = parser.lookahead;
9393

9494
if t.val == '*' {
9595
parser.move();
@@ -106,7 +106,7 @@ fn term(parser, tokens) {
106106
}
107107

108108
fn unary(parser, tokens) {
109-
let t = parser.lookhead;
109+
let t = parser.lookahead;
110110
if t.val == '-' {
111111
parser.move();
112112
unary(parser, tokens);
@@ -117,12 +117,12 @@ fn unary(parser, tokens) {
117117
}
118118

119119
fn factor(parser, tokens) {
120-
let t = parser.lookhead;
120+
let t = parser.lookahead;
121121

122122
if t.val == '(' {
123123
parser.move();
124124
expr(parser, tokens);
125-
t = parser.lookhead;
125+
t = parser.lookahead;
126126
if t.val != ')'{
127127
error(t);
128128
}
@@ -137,10 +137,10 @@ fn factor(parser, tokens) {
137137

138138
fn parser(lexer) {
139139
let parser = seq.map();
140-
parser.lookhead = lexer();
140+
parser.lookahead = lexer();
141141

142142
parser.move = fn() {
143-
parser.lookhead = lexer();
143+
parser.lookahead = lexer();
144144
};
145145

146146
return parser;
@@ -153,8 +153,8 @@ fn parse(s) {
153153

154154
expr(parser, tokens);
155155

156-
if parser.lookhead.type != EOF {
157-
error(parser.lookhead);
156+
if parser.lookahead.type != EOF {
157+
error(parser.lookahead);
158158
}
159159

160160
return tokens;

‎src/main/java/com/googlecode/aviator/AviatorEvaluatorInstance.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,12 +1828,12 @@ public StringSegments compileStringSegments(final String lexeme, final String so
18281828
new ExpressionParser(this, lexer, newCodeGenerator(sourceFile, false));
18291829

18301830
Expression exp = parser.parse(false);
1831-
final Token<?> lookhead = parser.getLookhead();
1832-
if (lookhead == null || (lookhead.getType() != TokenType.Char
1833-
|| ((CharToken) lookhead).getCh() != '}')) {
1831+
final Token<?> lookahead = parser.getLookahead();
1832+
if (lookahead == null || (lookahead.getType() != TokenType.Char
1833+
|| ((CharToken) lookahead).getCh() != '}')) {
18341834
parser.reportSyntaxError("expect '}' to complete string interpolation");
18351835
}
1836-
int expStrLen = lookhead.getStartIndex() + 1;
1836+
int expStrLen = lookahead.getStartIndex() + 1;
18371837
while (expStrLen-- > 0) {
18381838
prev = ch;
18391839
ch = it.next();

‎src/main/java/com/googlecode/aviator/code/CodeGenerator.java‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -29,118 +29,118 @@
2929
*/
3030
public interface CodeGenerator {
3131

32-
public void onAssignment(Token<?> lookhead);
32+
public void onAssignment(Token<?> lookahead);
3333

3434
public void setParser(Parser parser);
3535

36-
public void onShiftRight(Token<?> lookhead);
36+
public void onShiftRight(Token<?> lookahead);
3737

3838

39-
public void onShiftLeft(Token<?> lookhead);
39+
public void onShiftLeft(Token<?> lookahead);
4040

4141

42-
public void onUnsignedShiftRight(Token<?> lookhead);
42+
public void onUnsignedShiftRight(Token<?> lookahead);
4343

4444

45-
public void onBitOr(Token<?> lookhead);
45+
public void onBitOr(Token<?> lookahead);
4646

4747

48-
public void onBitAnd(Token<?> lookhead);
48+
public void onBitAnd(Token<?> lookahead);
4949

5050

51-
public void onBitXor(Token<?> lookhead);
51+
public void onBitXor(Token<?> lookahead);
5252

5353

54-
public void onBitNot(Token<?> lookhead);
54+
public void onBitNot(Token<?> lookahead);
5555

5656

57-
public void onAdd(Token<?> lookhead);
57+
public void onAdd(Token<?> lookahead);
5858

5959

60-
public void onSub(Token<?> lookhead);
60+
public void onSub(Token<?> lookahead);
6161

6262

63-
public void onMult(Token<?> lookhead);
63+
public void onMult(Token<?> lookahead);
6464

6565
public void onExponent(Token<?> loohead);
6666

6767

68-
public void onDiv(Token<?> lookhead);
68+
public void onDiv(Token<?> lookahead);
6969

7070

71-
public void onAndLeft(Token<?> lookhead);
71+
public void onAndLeft(Token<?> lookahead);
7272

7373

74-
public void onAndRight(Token<?> lookhead);
74+
public void onAndRight(Token<?> alookahead);
7575

7676

77-
public void onTernaryBoolean(Token<?> lookhead);
77+
public void onTernaryBoolean(Token<?> lookahead);
7878

7979

80-
public void onTernaryLeft(Token<?> lookhead);
80+
public void onTernaryLeft(Token<?> lookahead);
8181

8282

83-
public void onTernaryRight(Token<?> lookhead);
83+
public void onTernaryRight(Token<?> lookahead);
8484

85-
public void onTernaryEnd(Token<?> lookhead);
85+
public void onTernaryEnd(Token<?> lookahead);
8686

8787

88-
public void onJoinLeft(Token<?> lookhead);
88+
public void onJoinLeft(Token<?> lookahead);
8989

9090

91-
public void onJoinRight(Token<?> lookhead);
91+
public void onJoinRight(Token<?> lookahead);
9292

9393

94-
public void onEq(Token<?> lookhead);
94+
public void onEq(Token<?> lookahead);
9595

9696

97-
public void onMatch(Token<?> lookhead);
97+
public void onMatch(Token<?> lookahead);
9898

9999

100-
public void onNeq(Token<?> lookhead);
100+
public void onNeq(Token<?> lookahead);
101101

102102

103-
public void onLt(Token<?> lookhead);
103+
public void onLt(Token<?> lookahead);
104104

105105

106-
public void onLe(Token<?> lookhead);
106+
public void onLe(Token<?> lookahead);
107107

108108

109-
public void onGt(Token<?> lookhead);
109+
public void onGt(Token<?> lookahead);
110110

111111

112-
public void onGe(Token<?> lookhead);
112+
public void onGe(Token<?> lookahead);
113113

114114

115-
public void onMod(Token<?> lookhead);
115+
public void onMod(Token<?> lookahead);
116116

117117

118-
public void onNot(Token<?> lookhead);
118+
public void onNot(Token<?> lookahead);
119119

120120

121-
public void onNeg(Token<?> lookhead);
121+
public void onNeg(Token<?> lookahead);
122122

123123
public Expression getResult(boolean unboxObject);
124124

125-
public void onConstant(Token<?> lookhead);
125+
public void onConstant(Token<?> lookahead);
126126

127-
public void onMethodName(Token<?> lookhead);
127+
public void onMethodName(Token<?> lookahead);
128128

129-
public void onMethodParameter(Token<?> lookhead);
129+
public void onMethodParameter(Token<?> lookahead);
130130

131-
public void onMethodInvoke(Token<?> lookhead);
131+
public void onMethodInvoke(Token<?> lookahead);
132132

133-
public void onLambdaDefineStart(Token<?> lookhead);
133+
public void onLambdaDefineStart(Token<?> lookahead);
134134

135-
public void onLambdaArgument(Token<?> lookhead, FunctionParam param);
135+
public void onLambdaArgument(Token<?> lookahead, FunctionParam param);
136136

137-
public void onLambdaBodyStart(Token<?> lookhead);
137+
public void onLambdaBodyStart(Token<?> lookahead);
138138

139-
public void onLambdaBodyEnd(Token<?> lookhead);
139+
public void onLambdaBodyEnd(Token<?> lookahead);
140140

141-
public void onArray(Token<?> lookhead);
141+
public void onArray(Token<?> lookahead);
142142

143143
public void onArrayIndexStart(Token<?> token);
144144

145-
public void onArrayIndexEnd(Token<?> lookhead);
145+
public void onArrayIndexEnd(Token<?> lookahead);
146146
}

0 commit comments

Comments
 (0)