Skip to content

Commit 2d0af65

Browse files
committed
preliminary approach to getting es6 features included where available
1 parent 23c2e4c commit 2d0af65

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

Diff for: lazy.node.js

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ var util = require("util");
99
// Node.js)
1010
var Lazy = require("./lazy.js");
1111

12+
var isHarmonySupported = require('./util.js').isHarmonySupported;
13+
if (isHarmonySupported()) {
14+
require('./experimental/lazy.es6.js');
15+
}
16+
1217
/**
1318
* @constructor
1419
*/

Diff for: spec/node_spec.js

+3-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
var fs = require("fs"),
22
path = require("path"),
33
Stream = require("stream"),
4-
MemoryStream = require("memorystream");
4+
MemoryStream = require("memorystream"),
5+
util = require('../util.js');
56

67
require("./lazy_spec.js");
78
require("./map_spec.js");
@@ -29,27 +30,11 @@ require("./watch_spec.js");
2930
require("./merge_spec.js");
3031
require("./join_spec.js");
3132

32-
if (isHarmonySupported()) {
33+
if (util.isHarmonySupported()) {
3334
require('../experimental/lazy.es6.js');
3435
require('./es6_spec.js');
3536
}
3637

37-
function isHarmonySupported() {
38-
var version = process.version.split('.');
39-
40-
// We'll only bother checking Node versions 0.10 and greater
41-
if (version[0] == 'v0' && Number(version[1]) < 10) {
42-
return false;
43-
}
44-
45-
try {
46-
eval('(function*() {})');
47-
return true;
48-
} catch (e) {
49-
return false;
50-
}
51-
}
52-
5338
// Sequence types
5439
require("./string_like_sequence_spec.js");
5540
require("./async_sequence_spec.js");

Diff for: util.js

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
function isHarmonySupported() {
2+
var version = process.version.split('.');
3+
4+
// We'll only bother checking Node versions 0.10 and greater
5+
if (version[0] == 'v0' && Number(version[1]) < 10) {
6+
return false;
7+
}
8+
9+
try {
10+
eval('(function*() {})');
11+
return true;
12+
} catch (e) {
13+
return false;
14+
}
15+
}
16+
17+
module.exports = {
18+
isHarmonySupported: isHarmonySupported
19+
};

0 commit comments

Comments
 (0)