Skip to content

Commit 12cf721

Browse files
committed
update js
1 parent 66086cc commit 12cf721

File tree

3 files changed

+854
-8
lines changed

3 files changed

+854
-8
lines changed

js/jscompiler.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ function s:JavascriptCompiler.compile_function(node)
290290
unlet rlist[-1]
291291
let va = 1
292292
endif
293-
if left =~ '^\(VimLParser\|ExprTokenizer\|ExprParser\|LvalueParser\|StringReader\|Compiler\)\.'
293+
if left =~ '^\(VimLParser\|ExprTokenizer\|ExprParser\|LvalueParser\|StringReader\|Compiler\|RegexpParser\)\.'
294294
let [_0, klass, name; _] = matchlist(left, '^\(.*\)\.\(.*\)$')
295295
if name == 'new'
296296
return
@@ -344,10 +344,10 @@ function s:JavascriptCompiler.compile_let(node)
344344
call self.out('function LvalueParser() { ExprParser.apply(this, arguments); this.__init__.apply(this, arguments); }')
345345
call self.out('LvalueParser.prototype = Object.create(ExprParser.prototype);')
346346
return
347-
elseif left =~ '^\(VimLParser\|ExprTokenizer\|ExprParser\|LvalueParser\|StringReader\|Compiler\)$'
347+
elseif left =~ '^\(VimLParser\|ExprTokenizer\|ExprParser\|LvalueParser\|StringReader\|Compiler\|RegexpParser\)$'
348348
call self.out('function %s() { this.__init__.apply(this, arguments); }', left)
349349
return
350-
elseif left =~ '^\(VimLParser\|ExprTokenizer\|ExprParser\|LvalueParser\|StringReader\|Compiler\)\.'
350+
elseif left =~ '^\(VimLParser\|ExprTokenizer\|ExprParser\|LvalueParser\|StringReader\|Compiler\|RegexpParser\)\.'
351351
let [_0, klass, name; _] = matchlist(left, '^\(.*\)\.\(.*\)$')
352352
call self.out('%s.prototype.%s %s %s;', klass, name, op, right)
353353
return

js/vimlfunc.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ var pat_vim2js = {
6565
"^[A-Za-z_][0-9A-Za-z_]*$" : "^[A-Za-z_][0-9A-Za-z_]*$",
6666
"^[A-Z]$" : "^[A-Z]$",
6767
"^[a-z]$" : "^[a-z]$",
68-
"^[vgslabwt]:$\\|^\\([vgslabwt]:\\)\\?[A-Za-z_][0-9A-Za-z_]*$" : "^[vgslabwt]:$|^([vgslabwt]:)?[A-Za-z_][0-9A-Za-z_]*$",
68+
"^[vgslabwt]:$\\|^\\([vgslabwt]:\\)\\?[A-Za-z_][0-9A-Za-z_#]*$" : "^[vgslabwt]:$|^([vgslabwt]:)?[A-Za-z_][0-9A-Za-z_#]*$",
69+
"^[0-7]$" : "^[0-7]$",
6970
}
7071

7172
function viml_add(lst, item) {
@@ -76,6 +77,10 @@ function viml_call(func, args) {
7677
return func.apply(null, args);
7778
}
7879

80+
function viml_char2nr(c) {
81+
return c.charCodeAt(0);
82+
}
83+
7984
function viml_empty(obj) {
8085
return obj.length == 0;
8186
}
@@ -160,7 +165,7 @@ function viml_range(start) {
160165

161166
function viml_readfile(path) {
162167
// FIXME: newline?
163-
return fs.readFileSync(path, 'utf-8').split(/\n/);
168+
return fs.readFileSync(path, 'utf-8').split(/\r\n|\r|\n/);
164169
}
165170

166171
function viml_remove(lst, idx) {

0 commit comments

Comments
 (0)