Skip to content

Commit 5097858

Browse files
haya14busahaya14busa
committed
update generated code
1 parent a908e9f commit 5097858

File tree

2 files changed

+32
-13
lines changed

2 files changed

+32
-13
lines changed

‎js/vimlparser.js

+16-7
Original file line numberDiff line numberDiff line change
@@ -704,13 +704,11 @@ VimLParser.prototype.parse_command_modifiers = function() {
704704
var modifiers = [];
705705
while (TRUE) {
706706
var pos = this.reader.tell();
707+
var d = "";
707708
if (isdigit(this.reader.peekn(1))) {
708709
var d = this.reader.read_digit();
709710
this.reader.skip_white();
710711
}
711-
else {
712-
var d = "";
713-
}
714712
var k = this.reader.read_alpha();
715713
var c = this.reader.peekn(1);
716714
this.reader.skip_white();
@@ -1019,6 +1017,7 @@ VimLParser.prototype.parse_command = function() {
10191017

10201018
VimLParser.prototype.find_command = function() {
10211019
var c = this.reader.peekn(1);
1020+
var name = "";
10221021
if (c == "k") {
10231022
this.reader.getn(1);
10241023
var name = "k";
@@ -1222,6 +1221,7 @@ VimLParser.prototype.parse_cmd_modifier_range = function() {
12221221

12231222
// TODO:
12241223
VimLParser.prototype.parse_cmd_common = function() {
1224+
var end = this.reader.getpos();
12251225
if (viml_eqregh(this.ea.cmd.flags, "\\<TRLBAR\\>") && !this.ea.usefilter) {
12261226
var end = this.separate_nextcmd();
12271227
}
@@ -1375,6 +1375,7 @@ VimLParser.prototype.parse_cmd_loadkeymap = function() {
13751375
}
13761376

13771377
VimLParser.prototype.parse_cmd_lua = function() {
1378+
var lines = [];
13781379
this.reader.skip_white();
13791380
if (this.reader.peekn(2) == "<<") {
13801381
this.reader.getn(2);
@@ -1490,6 +1491,7 @@ VimLParser.prototype.parse_cmd_function = function() {
14901491
else {
14911492
var named = {};
14921493
while (TRUE) {
1494+
var varnode = Node(NODE_IDENTIFIER);
14931495
var token = tokenizer.get();
14941496
if (token.type == TOKEN_IDENTIFIER) {
14951497
if (!isargname(token.value) || token.value == "firstline" || token.value == "lastline") {
@@ -1499,7 +1501,6 @@ VimLParser.prototype.parse_cmd_function = function() {
14991501
throw Err(viml_printf("E853: Duplicate argument name: %s", token.value), token.pos);
15001502
}
15011503
named[token.value] = 1;
1502-
var varnode = Node(NODE_IDENTIFIER);
15031504
varnode.pos = token.pos;
15041505
varnode.value = token.value;
15051506
viml_add(node.rlist, varnode);
@@ -1523,7 +1524,6 @@ VimLParser.prototype.parse_cmd_function = function() {
15231524
}
15241525
}
15251526
else if (token.type == TOKEN_DOTDOTDOT) {
1526-
var varnode = Node(NODE_IDENTIFIER);
15271527
varnode.pos = token.pos;
15281528
varnode.value = token.value;
15291529
viml_add(node.rlist, varnode);
@@ -2427,6 +2427,7 @@ ExprTokenizer.prototype.get2 = function() {
24272427
return this.token(TOKEN_REG, r.getn(2), pos);
24282428
}
24292429
else if (c == "&") {
2430+
var s = "";
24302431
if ((r.p(1) == "g" || r.p(1) == "l") && r.p(2) == ":") {
24312432
var s = r.getn(3) + r.read_word();
24322433
}
@@ -2960,6 +2961,7 @@ ExprParser.prototype.parse_expr8 = function() {
29602961
if (token.type != TOKEN_SQCLOSE) {
29612962
throw Err(viml_printf("unexpected token: %s", token.value), token.pos);
29622963
}
2964+
var left = node;
29632965
}
29642966
else {
29652967
var right = this.parse_expr1();
@@ -2977,6 +2979,7 @@ ExprParser.prototype.parse_expr8 = function() {
29772979
if (token.type != TOKEN_SQCLOSE) {
29782980
throw Err(viml_printf("unexpected token: %s", token.value), token.pos);
29792981
}
2982+
var left = node;
29802983
}
29812984
else {
29822985
var node = Node(NODE_SUBSCRIPT);
@@ -2987,9 +2990,9 @@ ExprParser.prototype.parse_expr8 = function() {
29872990
if (token.type != TOKEN_SQCLOSE) {
29882991
throw Err(viml_printf("unexpected token: %s", token.value), token.pos);
29892992
}
2993+
var left = node;
29902994
}
29912995
}
2992-
var left = node;
29932996
delete node;
29942997
}
29952998
else if (token.type == TOKEN_POPEN) {
@@ -3060,6 +3063,7 @@ ExprParser.prototype.parse_expr8 = function() {
30603063
ExprParser.prototype.parse_expr9 = function() {
30613064
var pos = this.reader.tell();
30623065
var token = this.tokenizer.get();
3066+
var node = Node(-1);
30633067
if (token.type == TOKEN_NUMBER) {
30643068
var node = Node(NODE_NUMBER);
30653069
node.pos = token.pos;
@@ -3311,13 +3315,14 @@ ExprParser.prototype.parse_identifier = function() {
33113315
var node = Node(NODE_IDENTIFIER);
33123316
node.pos = npos;
33133317
node.value = curly_parts[0].value;
3318+
return node;
33143319
}
33153320
else {
33163321
var node = Node(NODE_CURLYNAME);
33173322
node.pos = npos;
33183323
node.value = curly_parts;
3324+
return node;
33193325
}
3320-
return node;
33213326
}
33223327

33233328
ExprParser.prototype.parse_curly_parts = function() {
@@ -3385,6 +3390,7 @@ LvalueParser.prototype.parse_lv8 = function() {
33853390
var token = this.tokenizer.get();
33863391
if (!iswhite(c) && token.type == TOKEN_SQOPEN) {
33873392
var npos = token.pos;
3393+
var node = Node(-1);
33883394
if (this.tokenizer.peek().type == TOKEN_COLON) {
33893395
this.tokenizer.get();
33903396
var node = Node(NODE_SLICE);
@@ -3456,6 +3462,7 @@ LvalueParser.prototype.parse_lv8 = function() {
34563462
LvalueParser.prototype.parse_lv9 = function() {
34573463
var pos = this.reader.tell();
34583464
var token = this.tokenizer.get();
3465+
var node = Node(-1);
34593466
if (token.type == TOKEN_COPEN) {
34603467
this.reader.seek_set(pos);
34613468
var node = this.parse_identifier();
@@ -4069,6 +4076,7 @@ Compiler.prototype.compile_excall = function(node) {
40694076
}
40704077

40714078
Compiler.prototype.compile_let = function(node) {
4079+
var left = "";
40724080
if (node.left !== NIL) {
40734081
var left = this.compile(node.left);
40744082
}
@@ -4141,6 +4149,7 @@ Compiler.prototype.compile_while = function(node) {
41414149
}
41424150

41434151
Compiler.prototype.compile_for = function(node) {
4152+
var left = "";
41444153
if (node.left !== NIL) {
41454154
var left = this.compile(node.left);
41464155
}

‎py/vimlparser.py

+16-6
Original file line numberDiff line numberDiff line change
@@ -613,11 +613,10 @@ def parse_command_modifiers(self):
613613
modifiers = []
614614
while TRUE:
615615
pos = self.reader.tell()
616+
d = ""
616617
if isdigit(self.reader.peekn(1)):
617618
d = self.reader.read_digit()
618619
self.reader.skip_white()
619-
else:
620-
d = ""
621620
k = self.reader.read_alpha()
622621
c = self.reader.peekn(1)
623622
self.reader.skip_white()
@@ -841,6 +840,7 @@ def parse_command(self):
841840

842841
def find_command(self):
843842
c = self.reader.peekn(1)
843+
name = ""
844844
if c == "k":
845845
self.reader.getn(1)
846846
name = "k"
@@ -989,6 +989,7 @@ def parse_cmd_modifier_range(self):
989989

990990
# TODO:
991991
def parse_cmd_common(self):
992+
end = self.reader.getpos()
992993
if viml_eqregh(self.ea.cmd.flags, "\\<TRLBAR\\>") and not self.ea.usefilter:
993994
end = self.separate_nextcmd()
994995
elif self.ea.cmd.name == "!" or self.ea.cmd.name == "global" or self.ea.cmd.name == "vglobal" or self.ea.usefilter:
@@ -1105,6 +1106,7 @@ def parse_cmd_loadkeymap(self):
11051106
self.add_node(node)
11061107

11071108
def parse_cmd_lua(self):
1109+
lines = []
11081110
self.reader.skip_white()
11091111
if self.reader.peekn(2) == "<<":
11101112
self.reader.getn(2)
@@ -1198,14 +1200,14 @@ def parse_cmd_function(self):
11981200
else:
11991201
named = AttributeDict({})
12001202
while TRUE:
1203+
varnode = Node(NODE_IDENTIFIER)
12011204
token = tokenizer.get()
12021205
if token.type == TOKEN_IDENTIFIER:
12031206
if not isargname(token.value) or token.value == "firstline" or token.value == "lastline":
12041207
raise VimLParserException(Err(viml_printf("E125: Illegal argument: %s", token.value), token.pos))
12051208
elif viml_has_key(named, token.value):
12061209
raise VimLParserException(Err(viml_printf("E853: Duplicate argument name: %s", token.value), token.pos))
12071210
named[token.value] = 1
1208-
varnode = Node(NODE_IDENTIFIER)
12091211
varnode.pos = token.pos
12101212
varnode.value = token.value
12111213
viml_add(node.rlist, varnode)
@@ -1223,7 +1225,6 @@ def parse_cmd_function(self):
12231225
else:
12241226
raise VimLParserException(Err(viml_printf("unexpected token: %s", token.value), token.pos))
12251227
elif token.type == TOKEN_DOTDOTDOT:
1226-
varnode = Node(NODE_IDENTIFIER)
12271228
varnode.pos = token.pos
12281229
varnode.value = token.value
12291230
viml_add(node.rlist, varnode)
@@ -1936,6 +1937,7 @@ def get2(self):
19361937
# @<EOL> is treated as @"
19371938
return self.token(TOKEN_REG, r.getn(2), pos)
19381939
elif c == "&":
1940+
s = ""
19391941
if (r.p(1) == "g" or r.p(1) == "l") and r.p(2) == ":":
19401942
s = r.getn(3) + r.read_word()
19411943
else:
@@ -2379,6 +2381,7 @@ def parse_expr8(self):
23792381
token = self.tokenizer.get()
23802382
if token.type != TOKEN_SQCLOSE:
23812383
raise VimLParserException(Err(viml_printf("unexpected token: %s", token.value), token.pos))
2384+
left = node
23822385
else:
23832386
right = self.parse_expr1()
23842387
if self.tokenizer.peek().type == TOKEN_COLON:
@@ -2393,6 +2396,7 @@ def parse_expr8(self):
23932396
token = self.tokenizer.get()
23942397
if token.type != TOKEN_SQCLOSE:
23952398
raise VimLParserException(Err(viml_printf("unexpected token: %s", token.value), token.pos))
2399+
left = node
23962400
else:
23972401
node = Node(NODE_SUBSCRIPT)
23982402
node.pos = npos
@@ -2401,7 +2405,7 @@ def parse_expr8(self):
24012405
token = self.tokenizer.get()
24022406
if token.type != TOKEN_SQCLOSE:
24032407
raise VimLParserException(Err(viml_printf("unexpected token: %s", token.value), token.pos))
2404-
left = node
2408+
left = node
24052409
del node
24062410
elif token.type == TOKEN_POPEN:
24072411
node = Node(NODE_CALL)
@@ -2457,6 +2461,7 @@ def parse_expr8(self):
24572461
def parse_expr9(self):
24582462
pos = self.reader.tell()
24592463
token = self.tokenizer.get()
2464+
node = Node(-1)
24602465
if token.type == TOKEN_NUMBER:
24612466
node = Node(NODE_NUMBER)
24622467
node.pos = token.pos
@@ -2654,11 +2659,12 @@ def parse_identifier(self):
26542659
node = Node(NODE_IDENTIFIER)
26552660
node.pos = npos
26562661
node.value = curly_parts[0].value
2662+
return node
26572663
else:
26582664
node = Node(NODE_CURLYNAME)
26592665
node.pos = npos
26602666
node.value = curly_parts
2661-
return node
2667+
return node
26622668

26632669
def parse_curly_parts(self):
26642670
curly_parts = []
@@ -2716,6 +2722,7 @@ def parse_lv8(self):
27162722
token = self.tokenizer.get()
27172723
if not iswhite(c) and token.type == TOKEN_SQOPEN:
27182724
npos = token.pos
2725+
node = Node(-1)
27192726
if self.tokenizer.peek().type == TOKEN_COLON:
27202727
self.tokenizer.get()
27212728
node = Node(NODE_SLICE)
@@ -2772,6 +2779,7 @@ def parse_lv8(self):
27722779
def parse_lv9(self):
27732780
pos = self.reader.tell()
27742781
token = self.tokenizer.get()
2782+
node = Node(-1)
27752783
if token.type == TOKEN_COPEN:
27762784
self.reader.seek_set(pos)
27772785
node = self.parse_identifier()
@@ -3204,6 +3212,7 @@ def compile_excall(self, node):
32043212
self.out("(call %s)", self.compile(node.left))
32053213

32063214
def compile_let(self, node):
3215+
left = ""
32073216
if node.left is not NIL:
32083217
left = self.compile(node.left)
32093218
else:
@@ -3259,6 +3268,7 @@ def compile_while(self, node):
32593268
self.decindent()
32603269

32613270
def compile_for(self, node):
3271+
left = ""
32623272
if node.left is not NIL:
32633273
left = self.compile(node.left)
32643274
else:

0 commit comments

Comments
 (0)