forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request #1867 from TreeViz/fix-broken-js-inputstreams 

Add `new` keyword to return proper InputStreams
This commit is contained in:
Terence Parr 2017-05-11 14:22:59 -07:00 committed by GitHub
parent b404abb11e 892aa4a376
commit cf359a0e32
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contributors.txt
View File

@ -144,3 +144,4 @@ YYYY/MM/DD, github id, Full name, email
2017/03/15, robertvanderhulst, Robert van der Hulst, robert@xsharp.eu
2017/03/28, cmd-johnson, Jonas Auer, jonas.auer.94@gmail.com
2017/04/12, lys0716, Yishuang Lu, luyscmu@gmail.com
2017/05/11, jimallman, Jim Allman, jim@ibang.com

10
runtime/JavaScript/src/antlr4/CharStreams.js
View File

@ -18,7 +18,7 @@ var fs = isNodeJs ? require("fs") : null;
var CharStreams = {
// Creates an InputStream from a string.
fromString: function(str) {
return InputStream(str, true);
return new InputStream(str, true);
},
// Asynchronously creates an InputStream from a blob given the
@ -30,7 +30,7 @@ var CharStreams = {
fromBlob: function(blob, encoding, onLoad, onError) {
var reader = FileReader();
reader.onload = function(e) {
var is = InputStream(e.target.result, true);
var is = new InputStream(e.target.result, true);
onLoad(is);
};
reader.onerror = onError;
@ -41,7 +41,7 @@ var CharStreams = {
// encoding of the bytes in that buffer (defaults to 'utf8' if
// encoding is null).
fromBuffer: function(buffer, encoding) {
return InputStream(buffer.toString(encoding), true);
return new InputStream(buffer.toString(encoding), true);
},
// Asynchronously creates an InputStream from a file on disk given
@ -53,7 +53,7 @@ var CharStreams = {
fs.readFile(path, encoding, function(err, data) {
var is = null;
if (data !== null) {
is = InputStream(data, true);
is = new InputStream(data, true);
}
callback(err, is);
});
@ -64,7 +64,7 @@ var CharStreams = {
// 'utf8' if encoding is null).
fromPathSync: function(path, encoding) {
var data = fs.readFileSync(path, encoding);
return InputStream(data, true);
return new InputStream(data, true);
}
};