Skip to content

Commit 8e13caf

Browse files
haya14busahaya14busa
committed
udpate generated code
1 parent d104dfb commit 8e13caf

File tree

2 files changed

+84
-72
lines changed

2 files changed

+84
-72
lines changed

‎js/vimlparser.js

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ VimLParser.prototype.parse_cmd_append = function() {
13581358
}
13591359

13601360
VimLParser.prototype.parse_cmd_insert = function() {
1361-
return this.parse_cmd_append();
1361+
this.parse_cmd_append();
13621362
}
13631363

13641364
VimLParser.prototype.parse_cmd_loadkeymap = function() {
@@ -1417,27 +1417,27 @@ VimLParser.prototype.parse_cmd_lua = function() {
14171417
}
14181418

14191419
VimLParser.prototype.parse_cmd_mzscheme = function() {
1420-
return this.parse_cmd_lua();
1420+
this.parse_cmd_lua();
14211421
}
14221422

14231423
VimLParser.prototype.parse_cmd_perl = function() {
1424-
return this.parse_cmd_lua();
1424+
this.parse_cmd_lua();
14251425
}
14261426

14271427
VimLParser.prototype.parse_cmd_python = function() {
1428-
return this.parse_cmd_lua();
1428+
this.parse_cmd_lua();
14291429
}
14301430

14311431
VimLParser.prototype.parse_cmd_python3 = function() {
1432-
return this.parse_cmd_lua();
1432+
this.parse_cmd_lua();
14331433
}
14341434

14351435
VimLParser.prototype.parse_cmd_ruby = function() {
1436-
return this.parse_cmd_lua();
1436+
this.parse_cmd_lua();
14371437
}
14381438

14391439
VimLParser.prototype.parse_cmd_tcl = function() {
1440-
return this.parse_cmd_lua();
1440+
this.parse_cmd_lua();
14411441
}
14421442

14431443
VimLParser.prototype.parse_cmd_finish = function() {
@@ -1449,7 +1449,7 @@ VimLParser.prototype.parse_cmd_finish = function() {
14491449

14501450
// FIXME
14511451
VimLParser.prototype.parse_cmd_usercmd = function() {
1452-
return this.parse_cmd_common();
1452+
this.parse_cmd_common();
14531453
}
14541454

14551455
VimLParser.prototype.parse_cmd_function = function() {
@@ -1458,12 +1458,14 @@ VimLParser.prototype.parse_cmd_function = function() {
14581458
// :function
14591459
if (this.ends_excmds(this.reader.peek())) {
14601460
this.reader.seek_set(pos);
1461-
return this.parse_cmd_common();
1461+
this.parse_cmd_common();
1462+
return;
14621463
}
14631464
// :function /pattern
14641465
if (this.reader.peekn(1) == "/") {
14651466
this.reader.seek_set(pos);
1466-
return this.parse_cmd_common();
1467+
this.parse_cmd_common();
1468+
return;
14671469
}
14681470
var left = this.parse_lvalue_func();
14691471
this.reader.skip_white();
@@ -1477,7 +1479,8 @@ VimLParser.prototype.parse_cmd_function = function() {
14771479
// :function {name}
14781480
if (this.reader.peekn(1) != "(") {
14791481
this.reader.seek_set(pos);
1480-
return this.parse_cmd_common();
1482+
this.parse_cmd_common();
1483+
return;
14811484
}
14821485
// :function[!] {name}([arguments]) [range] [abort] [dict] [closure]
14831486
var node = Node(NODE_FUNCTION);
@@ -1635,7 +1638,8 @@ VimLParser.prototype.parse_cmd_let = function() {
16351638
// :let
16361639
if (this.ends_excmds(this.reader.peek())) {
16371640
this.reader.seek_set(pos);
1638-
return this.parse_cmd_common();
1641+
this.parse_cmd_common();
1642+
return;
16391643
}
16401644
var lhs = this.parse_letlhs();
16411645
this.reader.skip_white();
@@ -1644,7 +1648,8 @@ VimLParser.prototype.parse_cmd_let = function() {
16441648
// :let {var-name} ..
16451649
if (this.ends_excmds(s1) || s2 != "+=" && s2 != "-=" && s2 != ".=" && s1 != "=") {
16461650
this.reader.seek_set(pos);
1647-
return this.parse_cmd_common();
1651+
this.parse_cmd_common();
1652+
return;
16481653
}
16491654
// :let left op right
16501655
var node = Node(NODE_LET);
@@ -3771,73 +3776,73 @@ Compiler.prototype.compile = function(node) {
37713776
return this.compile_toplevel(node);
37723777
}
37733778
else if (node.type == NODE_COMMENT) {
3774-
return this.compile_comment(node);
3779+
this.compile_comment(node);
37753780
}
37763781
else if (node.type == NODE_EXCMD) {
3777-
return this.compile_excmd(node);
3782+
this.compile_excmd(node);
37783783
}
37793784
else if (node.type == NODE_FUNCTION) {
3780-
return this.compile_function(node);
3785+
this.compile_function(node);
37813786
}
37823787
else if (node.type == NODE_DELFUNCTION) {
3783-
return this.compile_delfunction(node);
3788+
this.compile_delfunction(node);
37843789
}
37853790
else if (node.type == NODE_RETURN) {
3786-
return this.compile_return(node);
3791+
this.compile_return(node);
37873792
}
37883793
else if (node.type == NODE_EXCALL) {
3789-
return this.compile_excall(node);
3794+
this.compile_excall(node);
37903795
}
37913796
else if (node.type == NODE_LET) {
3792-
return this.compile_let(node);
3797+
this.compile_let(node);
37933798
}
37943799
else if (node.type == NODE_UNLET) {
3795-
return this.compile_unlet(node);
3800+
this.compile_unlet(node);
37963801
}
37973802
else if (node.type == NODE_LOCKVAR) {
3798-
return this.compile_lockvar(node);
3803+
this.compile_lockvar(node);
37993804
}
38003805
else if (node.type == NODE_UNLOCKVAR) {
3801-
return this.compile_unlockvar(node);
3806+
this.compile_unlockvar(node);
38023807
}
38033808
else if (node.type == NODE_IF) {
3804-
return this.compile_if(node);
3809+
this.compile_if(node);
38053810
}
38063811
else if (node.type == NODE_WHILE) {
3807-
return this.compile_while(node);
3812+
this.compile_while(node);
38083813
}
38093814
else if (node.type == NODE_FOR) {
3810-
return this.compile_for(node);
3815+
this.compile_for(node);
38113816
}
38123817
else if (node.type == NODE_CONTINUE) {
3813-
return this.compile_continue(node);
3818+
this.compile_continue(node);
38143819
}
38153820
else if (node.type == NODE_BREAK) {
3816-
return this.compile_break(node);
3821+
this.compile_break(node);
38173822
}
38183823
else if (node.type == NODE_TRY) {
3819-
return this.compile_try(node);
3824+
this.compile_try(node);
38203825
}
38213826
else if (node.type == NODE_THROW) {
3822-
return this.compile_throw(node);
3827+
this.compile_throw(node);
38233828
}
38243829
else if (node.type == NODE_ECHO) {
3825-
return this.compile_echo(node);
3830+
this.compile_echo(node);
38263831
}
38273832
else if (node.type == NODE_ECHON) {
3828-
return this.compile_echon(node);
3833+
this.compile_echon(node);
38293834
}
38303835
else if (node.type == NODE_ECHOHL) {
3831-
return this.compile_echohl(node);
3836+
this.compile_echohl(node);
38323837
}
38333838
else if (node.type == NODE_ECHOMSG) {
3834-
return this.compile_echomsg(node);
3839+
this.compile_echomsg(node);
38353840
}
38363841
else if (node.type == NODE_ECHOERR) {
3837-
return this.compile_echoerr(node);
3842+
this.compile_echoerr(node);
38383843
}
38393844
else if (node.type == NODE_EXECUTE) {
3840-
return this.compile_execute(node);
3845+
this.compile_execute(node);
38413846
}
38423847
else if (node.type == NODE_TERNARY) {
38433848
return this.compile_ternary(node);
@@ -4016,6 +4021,7 @@ Compiler.prototype.compile = function(node) {
40164021
else {
40174022
throw viml_printf("Compiler: unknown node: %s", viml_string(node));
40184023
}
4024+
return NIL;
40194025
}
40204026

40214027
Compiler.prototype.compile_body = function(body) {

‎py/vimlparser.py

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@ def parse_cmd_append(self):
10921092
self.add_node(node)
10931093

10941094
def parse_cmd_insert(self):
1095-
return self.parse_cmd_append()
1095+
self.parse_cmd_append()
10961096

10971097
def parse_cmd_loadkeymap(self):
10981098
self.reader.setpos(self.ea.linepos)
@@ -1140,22 +1140,22 @@ def parse_cmd_lua(self):
11401140
self.add_node(node)
11411141

11421142
def parse_cmd_mzscheme(self):
1143-
return self.parse_cmd_lua()
1143+
self.parse_cmd_lua()
11441144

11451145
def parse_cmd_perl(self):
1146-
return self.parse_cmd_lua()
1146+
self.parse_cmd_lua()
11471147

11481148
def parse_cmd_python(self):
1149-
return self.parse_cmd_lua()
1149+
self.parse_cmd_lua()
11501150

11511151
def parse_cmd_python3(self):
1152-
return self.parse_cmd_lua()
1152+
self.parse_cmd_lua()
11531153

11541154
def parse_cmd_ruby(self):
1155-
return self.parse_cmd_lua()
1155+
self.parse_cmd_lua()
11561156

11571157
def parse_cmd_tcl(self):
1158-
return self.parse_cmd_lua()
1158+
self.parse_cmd_lua()
11591159

11601160
def parse_cmd_finish(self):
11611161
self.parse_cmd_common()
@@ -1164,19 +1164,21 @@ def parse_cmd_finish(self):
11641164

11651165
# FIXME
11661166
def parse_cmd_usercmd(self):
1167-
return self.parse_cmd_common()
1167+
self.parse_cmd_common()
11681168

11691169
def parse_cmd_function(self):
11701170
pos = self.reader.tell()
11711171
self.reader.skip_white()
11721172
# :function
11731173
if self.ends_excmds(self.reader.peek()):
11741174
self.reader.seek_set(pos)
1175-
return self.parse_cmd_common()
1175+
self.parse_cmd_common()
1176+
return
11761177
# :function /pattern
11771178
if self.reader.peekn(1) == "/":
11781179
self.reader.seek_set(pos)
1179-
return self.parse_cmd_common()
1180+
self.parse_cmd_common()
1181+
return
11801182
left = self.parse_lvalue_func()
11811183
self.reader.skip_white()
11821184
if left.type == NODE_IDENTIFIER:
@@ -1187,7 +1189,8 @@ def parse_cmd_function(self):
11871189
# :function {name}
11881190
if self.reader.peekn(1) != "(":
11891191
self.reader.seek_set(pos)
1190-
return self.parse_cmd_common()
1192+
self.parse_cmd_common()
1193+
return
11911194
# :function[!] {name}([arguments]) [range] [abort] [dict] [closure]
11921195
node = Node(NODE_FUNCTION)
11931196
node.pos = self.ea.cmdpos
@@ -1312,15 +1315,17 @@ def parse_cmd_let(self):
13121315
# :let
13131316
if self.ends_excmds(self.reader.peek()):
13141317
self.reader.seek_set(pos)
1315-
return self.parse_cmd_common()
1318+
self.parse_cmd_common()
1319+
return
13161320
lhs = self.parse_letlhs()
13171321
self.reader.skip_white()
13181322
s1 = self.reader.peekn(1)
13191323
s2 = self.reader.peekn(2)
13201324
# :let {var-name} ..
13211325
if self.ends_excmds(s1) or s2 != "+=" and s2 != "-=" and s2 != ".=" and s1 != "=":
13221326
self.reader.seek_set(pos)
1323-
return self.parse_cmd_common()
1327+
self.parse_cmd_common()
1328+
return
13241329
# :let left op right
13251330
node = Node(NODE_LET)
13261331
node.pos = self.ea.cmdpos
@@ -3005,51 +3010,51 @@ def compile(self, node):
30053010
if node.type == NODE_TOPLEVEL:
30063011
return self.compile_toplevel(node)
30073012
elif node.type == NODE_COMMENT:
3008-
return self.compile_comment(node)
3013+
self.compile_comment(node)
30093014
elif node.type == NODE_EXCMD:
3010-
return self.compile_excmd(node)
3015+
self.compile_excmd(node)
30113016
elif node.type == NODE_FUNCTION:
3012-
return self.compile_function(node)
3017+
self.compile_function(node)
30133018
elif node.type == NODE_DELFUNCTION:
3014-
return self.compile_delfunction(node)
3019+
self.compile_delfunction(node)
30153020
elif node.type == NODE_RETURN:
3016-
return self.compile_return(node)
3021+
self.compile_return(node)
30173022
elif node.type == NODE_EXCALL:
3018-
return self.compile_excall(node)
3023+
self.compile_excall(node)
30193024
elif node.type == NODE_LET:
3020-
return self.compile_let(node)
3025+
self.compile_let(node)
30213026
elif node.type == NODE_UNLET:
3022-
return self.compile_unlet(node)
3027+
self.compile_unlet(node)
30233028
elif node.type == NODE_LOCKVAR:
3024-
return self.compile_lockvar(node)
3029+
self.compile_lockvar(node)
30253030
elif node.type == NODE_UNLOCKVAR:
3026-
return self.compile_unlockvar(node)
3031+
self.compile_unlockvar(node)
30273032
elif node.type == NODE_IF:
3028-
return self.compile_if(node)
3033+
self.compile_if(node)
30293034
elif node.type == NODE_WHILE:
3030-
return self.compile_while(node)
3035+
self.compile_while(node)
30313036
elif node.type == NODE_FOR:
3032-
return self.compile_for(node)
3037+
self.compile_for(node)
30333038
elif node.type == NODE_CONTINUE:
3034-
return self.compile_continue(node)
3039+
self.compile_continue(node)
30353040
elif node.type == NODE_BREAK:
3036-
return self.compile_break(node)
3041+
self.compile_break(node)
30373042
elif node.type == NODE_TRY:
3038-
return self.compile_try(node)
3043+
self.compile_try(node)
30393044
elif node.type == NODE_THROW:
3040-
return self.compile_throw(node)
3045+
self.compile_throw(node)
30413046
elif node.type == NODE_ECHO:
3042-
return self.compile_echo(node)
3047+
self.compile_echo(node)
30433048
elif node.type == NODE_ECHON:
3044-
return self.compile_echon(node)
3049+
self.compile_echon(node)
30453050
elif node.type == NODE_ECHOHL:
3046-
return self.compile_echohl(node)
3051+
self.compile_echohl(node)
30473052
elif node.type == NODE_ECHOMSG:
3048-
return self.compile_echomsg(node)
3053+
self.compile_echomsg(node)
30493054
elif node.type == NODE_ECHOERR:
3050-
return self.compile_echoerr(node)
3055+
self.compile_echoerr(node)
30513056
elif node.type == NODE_EXECUTE:
3052-
return self.compile_execute(node)
3057+
self.compile_execute(node)
30533058
elif node.type == NODE_TERNARY:
30543059
return self.compile_ternary(node)
30553060
elif node.type == NODE_OR:
@@ -3168,6 +3173,7 @@ def compile(self, node):
31683173
return self.compile_lambda(node)
31693174
else:
31703175
raise VimLParserException(viml_printf("Compiler: unknown node: %s", viml_string(node)))
3176+
return NIL
31713177

31723178
def compile_body(self, body):
31733179
for node in body:

0 commit comments

Comments
 (0)