Skip to content

Commit a76da1c

Browse files
haya14busahaya14busa
committed
update generated code
1 parent 6347a94 commit a76da1c

File tree

2 files changed

+32
-13
lines changed

2 files changed

+32
-13
lines changed

‎js/vimlparser.js‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -709,13 +709,11 @@ VimLParser.prototype.parse_command_modifiers = function() {
709709
var modifiers = [];
710710
while (TRUE) {
711711
var pos = this.reader.tell();
712+
var d = "";
712713
if (isdigit(this.reader.peekn(1))) {
713714
var d = this.reader.read_digit();
714715
this.reader.skip_white();
715716
}
716-
else {
717-
var d = "";
718-
}
719717
var k = this.reader.read_alpha();
720718
var c = this.reader.peekn(1);
721719
this.reader.skip_white();
@@ -1024,6 +1022,7 @@ VimLParser.prototype.parse_command = function() {
10241022

10251023
VimLParser.prototype.find_command = function() {
10261024
var c = this.reader.peekn(1);
1025+
var name = "";
10271026
if (c == "k") {
10281027
this.reader.getn(1);
10291028
var name = "k";
@@ -1227,6 +1226,7 @@ VimLParser.prototype.parse_cmd_modifier_range = function() {
12271226

12281227
// TODO:
12291228
VimLParser.prototype.parse_cmd_common = function() {
1229+
var end = this.reader.getpos();
12301230
if (viml_eqregh(this.ea.cmd.flags, "\\<TRLBAR\\>") && !this.ea.usefilter) {
12311231
var end = this.separate_nextcmd();
12321232
}
@@ -1380,6 +1380,7 @@ VimLParser.prototype.parse_cmd_loadkeymap = function() {
13801380
}
13811381

13821382
VimLParser.prototype.parse_cmd_lua = function() {
1383+
var lines = [];
13831384
this.reader.skip_white();
13841385
if (this.reader.peekn(2) == "<<") {
13851386
this.reader.getn(2);
@@ -1496,6 +1497,7 @@ VimLParser.prototype.parse_cmd_function = function() {
14961497
else {
14971498
var named = {};
14981499
while (TRUE) {
1500+
var varnode = Node(NODE_IDENTIFIER);
14991501
var token = tokenizer.get();
15001502
if (token.type == TOKEN_IDENTIFIER) {
15011503
if (!isargname(token.value) || token.value == "firstline" || token.value == "lastline") {
@@ -1505,7 +1507,6 @@ VimLParser.prototype.parse_cmd_function = function() {
15051507
throw Err(viml_printf("E853: Duplicate argument name: %s", token.value), token.pos);
15061508
}
15071509
named[token.value] = 1;
1508-
var varnode = Node(NODE_IDENTIFIER);
15091510
varnode.pos = token.pos;
15101511
varnode.value = token.value;
15111512
viml_add(node.rlist, varnode);
@@ -1529,7 +1530,6 @@ VimLParser.prototype.parse_cmd_function = function() {
15291530
}
15301531
}
15311532
else if (token.type == TOKEN_DOTDOTDOT) {
1532-
var varnode = Node(NODE_IDENTIFIER);
15331533
varnode.pos = token.pos;
15341534
varnode.value = token.value;
15351535
viml_add(node.rlist, varnode);
@@ -2433,6 +2433,7 @@ ExprTokenizer.prototype.get2 = function() {
24332433
return this.token(TOKEN_REG, r.getn(2), pos);
24342434
}
24352435
else if (c == "&") {
2436+
var s = "";
24362437
if ((r.p(1) == "g" || r.p(1) == "l") && r.p(2) == ":") {
24372438
var s = r.getn(3) + r.read_word();
24382439
}
@@ -2966,6 +2967,7 @@ ExprParser.prototype.parse_expr8 = function() {
29662967
if (token.type != TOKEN_SQCLOSE) {
29672968
throw Err(viml_printf("unexpected token: %s", token.value), token.pos);
29682969
}
2970+
var left = node;
29692971
}
29702972
else {
29712973
var right = this.parse_expr1();
@@ -2983,6 +2985,7 @@ ExprParser.prototype.parse_expr8 = function() {
29832985
if (token.type != TOKEN_SQCLOSE) {
29842986
throw Err(viml_printf("unexpected token: %s", token.value), token.pos);
29852987
}
2988+
var left = node;
29862989
}
29872990
else {
29882991
var node = Node(NODE_SUBSCRIPT);
@@ -2993,9 +2996,9 @@ ExprParser.prototype.parse_expr8 = function() {
29932996
if (token.type != TOKEN_SQCLOSE) {
29942997
throw Err(viml_printf("unexpected token: %s", token.value), token.pos);
29952998
}
2999+
var left = node;
29963000
}
29973001
}
2998-
var left = node;
29993002
delete node;
30003003
}
30013004
else if (token.type == TOKEN_POPEN) {
@@ -3066,6 +3069,7 @@ ExprParser.prototype.parse_expr8 = function() {
30663069
ExprParser.prototype.parse_expr9 = function() {
30673070
var pos = this.reader.tell();
30683071
var token = this.tokenizer.get();
3072+
var node = Node(-1);
30693073
if (token.type == TOKEN_NUMBER) {
30703074
var node = Node(NODE_NUMBER);
30713075
node.pos = token.pos;
@@ -3317,13 +3321,14 @@ ExprParser.prototype.parse_identifier = function() {
33173321
var node = Node(NODE_IDENTIFIER);
33183322
node.pos = npos;
33193323
node.value = curly_parts[0].value;
3324+
return node;
33203325
}
33213326
else {
33223327
var node = Node(NODE_CURLYNAME);
33233328
node.pos = npos;
33243329
node.value = curly_parts;
3330+
return node;
33253331
}
3326-
return node;
33273332
}
33283333

33293334
ExprParser.prototype.parse_curly_parts = function() {
@@ -3391,6 +3396,7 @@ LvalueParser.prototype.parse_lv8 = function() {
33913396
var token = this.tokenizer.get();
33923397
if (!iswhite(c) && token.type == TOKEN_SQOPEN) {
33933398
var npos = token.pos;
3399+
var node = Node(-1);
33943400
if (this.tokenizer.peek().type == TOKEN_COLON) {
33953401
this.tokenizer.get();
33963402
var node = Node(NODE_SLICE);
@@ -3462,6 +3468,7 @@ LvalueParser.prototype.parse_lv8 = function() {
34623468
LvalueParser.prototype.parse_lv9 = function() {
34633469
var pos = this.reader.tell();
34643470
var token = this.tokenizer.get();
3471+
var node = Node(-1);
34653472
if (token.type == TOKEN_COPEN) {
34663473
this.reader.seek_set(pos);
34673474
var node = this.parse_identifier();
@@ -4075,6 +4082,7 @@ Compiler.prototype.compile_excall = function(node) {
40754082
}
40764083

40774084
Compiler.prototype.compile_let = function(node) {
4085+
var left = "";
40784086
if (node.left !== NIL) {
40794087
var left = this.compile(node.left);
40804088
}
@@ -4147,6 +4155,7 @@ Compiler.prototype.compile_while = function(node) {
41474155
}
41484156

41494157
Compiler.prototype.compile_for = function(node) {
4158+
var left = "";
41504159
if (node.left !== NIL) {
41514160
var left = this.compile(node.left);
41524161
}

‎py/vimlparser.py‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -618,11 +618,10 @@ def parse_command_modifiers(self):
618618
modifiers = []
619619
while TRUE:
620620
pos = self.reader.tell()
621+
d = ""
621622
if isdigit(self.reader.peekn(1)):
622623
d = self.reader.read_digit()
623624
self.reader.skip_white()
624-
else:
625-
d = ""
626625
k = self.reader.read_alpha()
627626
c = self.reader.peekn(1)
628627
self.reader.skip_white()
@@ -846,6 +845,7 @@ def parse_command(self):
846845

847846
def find_command(self):
848847
c = self.reader.peekn(1)
848+
name = ""
849849
if c == "k":
850850
self.reader.getn(1)
851851
name = "k"
@@ -994,6 +994,7 @@ def parse_cmd_modifier_range(self):
994994

995995
# TODO:
996996
def parse_cmd_common(self):
997+
end = self.reader.getpos()
997998
if viml_eqregh(self.ea.cmd.flags, "\\<TRLBAR\\>") and not self.ea.usefilter:
998999
end = self.separate_nextcmd()
9991000
elif self.ea.cmd.name == "!" or self.ea.cmd.name == "global" or self.ea.cmd.name == "vglobal" or self.ea.usefilter:
@@ -1110,6 +1111,7 @@ def parse_cmd_loadkeymap(self):
11101111
self.add_node(node)
11111112

11121113
def parse_cmd_lua(self):
1114+
lines = []
11131115
self.reader.skip_white()
11141116
if self.reader.peekn(2) == "<<":
11151117
self.reader.getn(2)
@@ -1204,14 +1206,14 @@ def parse_cmd_function(self):
12041206
else:
12051207
named = AttributeDict({})
12061208
while TRUE:
1209+
varnode = Node(NODE_IDENTIFIER)
12071210
token = tokenizer.get()
12081211
if token.type == TOKEN_IDENTIFIER:
12091212
if not isargname(token.value) or token.value == "firstline" or token.value == "lastline":
12101213
raise VimLParserException(Err(viml_printf("E125: Illegal argument: %s", token.value), token.pos))
12111214
elif viml_has_key(named, token.value):
12121215
raise VimLParserException(Err(viml_printf("E853: Duplicate argument name: %s", token.value), token.pos))
12131216
named[token.value] = 1
1214-
varnode = Node(NODE_IDENTIFIER)
12151217
varnode.pos = token.pos
12161218
varnode.value = token.value
12171219
viml_add(node.rlist, varnode)
@@ -1229,7 +1231,6 @@ def parse_cmd_function(self):
12291231
else:
12301232
raise VimLParserException(Err(viml_printf("unexpected token: %s", token.value), token.pos))
12311233
elif token.type == TOKEN_DOTDOTDOT:
1232-
varnode = Node(NODE_IDENTIFIER)
12331234
varnode.pos = token.pos
12341235
varnode.value = token.value
12351236
viml_add(node.rlist, varnode)
@@ -1942,6 +1943,7 @@ def get2(self):
19421943
# @<EOL> is treated as @"
19431944
return self.token(TOKEN_REG, r.getn(2), pos)
19441945
elif c == "&":
1946+
s = ""
19451947
if (r.p(1) == "g" or r.p(1) == "l") and r.p(2) == ":":
19461948
s = r.getn(3) + r.read_word()
19471949
else:
@@ -2385,6 +2387,7 @@ def parse_expr8(self):
23852387
token = self.tokenizer.get()
23862388
if token.type != TOKEN_SQCLOSE:
23872389
raise VimLParserException(Err(viml_printf("unexpected token: %s", token.value), token.pos))
2390+
left = node
23882391
else:
23892392
right = self.parse_expr1()
23902393
if self.tokenizer.peek().type == TOKEN_COLON:
@@ -2399,6 +2402,7 @@ def parse_expr8(self):
23992402
token = self.tokenizer.get()
24002403
if token.type != TOKEN_SQCLOSE:
24012404
raise VimLParserException(Err(viml_printf("unexpected token: %s", token.value), token.pos))
2405+
left = node
24022406
else:
24032407
node = Node(NODE_SUBSCRIPT)
24042408
node.pos = npos
@@ -2407,7 +2411,7 @@ def parse_expr8(self):
24072411
token = self.tokenizer.get()
24082412
if token.type != TOKEN_SQCLOSE:
24092413
raise VimLParserException(Err(viml_printf("unexpected token: %s", token.value), token.pos))
2410-
left = node
2414+
left = node
24112415
del node
24122416
elif token.type == TOKEN_POPEN:
24132417
node = Node(NODE_CALL)
@@ -2463,6 +2467,7 @@ def parse_expr8(self):
24632467
def parse_expr9(self):
24642468
pos = self.reader.tell()
24652469
token = self.tokenizer.get()
2470+
node = Node(-1)
24662471
if token.type == TOKEN_NUMBER:
24672472
node = Node(NODE_NUMBER)
24682473
node.pos = token.pos
@@ -2660,11 +2665,12 @@ def parse_identifier(self):
26602665
node = Node(NODE_IDENTIFIER)
26612666
node.pos = npos
26622667
node.value = curly_parts[0].value
2668+
return node
26632669
else:
26642670
node = Node(NODE_CURLYNAME)
26652671
node.pos = npos
26662672
node.value = curly_parts
2667-
return node
2673+
return node
26682674

26692675
def parse_curly_parts(self):
26702676
curly_parts = []
@@ -2722,6 +2728,7 @@ def parse_lv8(self):
27222728
token = self.tokenizer.get()
27232729
if not iswhite(c) and token.type == TOKEN_SQOPEN:
27242730
npos = token.pos
2731+
node = Node(-1)
27252732
if self.tokenizer.peek().type == TOKEN_COLON:
27262733
self.tokenizer.get()
27272734
node = Node(NODE_SLICE)
@@ -2778,6 +2785,7 @@ def parse_lv8(self):
27782785
def parse_lv9(self):
27792786
pos = self.reader.tell()
27802787
token = self.tokenizer.get()
2788+
node = Node(-1)
27812789
if token.type == TOKEN_COPEN:
27822790
self.reader.seek_set(pos)
27832791
node = self.parse_identifier()
@@ -3210,6 +3218,7 @@ def compile_excall(self, node):
32103218
self.out("(call %s)", self.compile(node.left))
32113219

32123220
def compile_let(self, node):
3221+
left = ""
32133222
if node.left is not NIL:
32143223
left = self.compile(node.left)
32153224
else:
@@ -3265,6 +3274,7 @@ def compile_while(self, node):
32653274
self.decindent()
32663275

32673276
def compile_for(self, node):
3277+
left = ""
32683278
if node.left is not NIL:
32693279
left = self.compile(node.left)
32703280
else:

0 commit comments

Comments
 (0)