move RegExp.escape from es7 to core namespace - rejected, close #…

…116
zloirock · Nov 19, 2015 · d5ee778 · d5ee778
1 parent 6275d89
commit d5ee778
Show file tree

Hide file tree

Showing 24 changed files with 46 additions and 63 deletions.
diff --git a/build/build.ls b/build/build.ls
@@ -119,7 +119,6 @@ list = <[
   es7.string.pad-end
   es7.string.trim-left
   es7.string.trim-right
-  es7.regexp.escape
   es7.object.get-own-property-descriptors
   es7.object.values
   es7.object.entries
@@ -140,6 +139,7 @@ list = <[
   core.object.define
   core.object.make
   core.number.iterator
+  core.regexp.escape
   core.string.escape-html
   core.string.unescape-html
   core.log

diff --git a/build/index.js b/build/index.js
diff --git a/core/index.js b/core/index.js
@@ -9,6 +9,7 @@ require('../modules/core.object.classof');
 require('../modules/core.object.define');
 require('../modules/core.object.make');
 require('../modules/core.number.iterator');
+require('../modules/core.regexp.escape');
 require('../modules/core.string.escape-html');
 require('../modules/core.string.unescape-html');
 require('../modules/core.log');

diff --git a/es7/regexp.js → core/regexp.js b/es7/regexp.js → core/regexp.js
@@ -1,2 +1,2 @@
-require('../modules/es7.regexp.escape');
+require('../modules/core.regexp.escape');
 module.exports = require('../modules/$.core').RegExp;
diff --git a/es7/index.js b/es7/index.js
@@ -4,7 +4,6 @@ require('../modules/es7.string.pad-start');
 require('../modules/es7.string.pad-end');
 require('../modules/es7.string.trim-left');
 require('../modules/es7.string.trim-right');
-require('../modules/es7.regexp.escape');
 require('../modules/es7.object.get-own-property-descriptors');
 require('../modules/es7.object.values');
 require('../modules/es7.object.entries');

diff --git a/fn/regexp/escape.js b/fn/regexp/escape.js
@@ -1,2 +1,2 @@
-require('../../modules/es7.regexp.escape');
+require('../../modules/core.regexp.escape');
 module.exports = require('../../modules/$.core').RegExp.escape;
diff --git a/fn/regexp/index.js b/fn/regexp/index.js
@@ -4,5 +4,5 @@ require('../../modules/es6.regexp.match');
 require('../../modules/es6.regexp.replace');
 require('../../modules/es6.regexp.search');
 require('../../modules/es6.regexp.split');
-require('../../modules/es7.regexp.escape');
+require('../../modules/core.regexp.escape');
 module.exports = require('../../modules/$.core').RegExp;
diff --git a/index.js b/index.js
@@ -10,6 +10,7 @@ require('./modules/core.object.classof');
 require('./modules/core.object.define');
 require('./modules/core.object.make');
 require('./modules/core.number.iterator');
+require('./modules/core.regexp.escape');
 require('./modules/core.string.escape-html');
 require('./modules/core.string.unescape-html');
 require('./modules/core.log');

diff --git a/library/core/index.js b/library/core/index.js
@@ -9,6 +9,7 @@ require('../modules/core.object.classof');
 require('../modules/core.object.define');
 require('../modules/core.object.make');
 require('../modules/core.number.iterator');
+require('../modules/core.regexp.escape');
 require('../modules/core.string.escape-html');
 require('../modules/core.string.unescape-html');
 require('../modules/core.log');

diff --git a/library/es7/regexp.js → library/core/regexp.js b/library/es7/regexp.js → library/core/regexp.js
@@ -1,2 +1,2 @@
-require('../modules/es7.regexp.escape');
+require('../modules/core.regexp.escape');
 module.exports = require('../modules/$.core').RegExp;
diff --git a/library/es7/index.js b/library/es7/index.js
@@ -4,7 +4,6 @@ require('../modules/es7.string.pad-start');
 require('../modules/es7.string.pad-end');
 require('../modules/es7.string.trim-left');
 require('../modules/es7.string.trim-right');
-require('../modules/es7.regexp.escape');
 require('../modules/es7.object.get-own-property-descriptors');
 require('../modules/es7.object.values');
 require('../modules/es7.object.entries');

diff --git a/library/fn/regexp/escape.js b/library/fn/regexp/escape.js
@@ -1,2 +1,2 @@
-require('../../modules/es7.regexp.escape');
+require('../../modules/core.regexp.escape');
 module.exports = require('../../modules/$.core').RegExp.escape;
diff --git a/library/fn/regexp/index.js b/library/fn/regexp/index.js
@@ -4,5 +4,5 @@ require('../../modules/es6.regexp.match');
 require('../../modules/es6.regexp.replace');
 require('../../modules/es6.regexp.search');
 require('../../modules/es6.regexp.split');
-require('../../modules/es7.regexp.escape');
+require('../../modules/core.regexp.escape');
 module.exports = require('../../modules/$.core').RegExp;
diff --git a/library/index.js b/library/index.js
@@ -10,6 +10,7 @@ require('./modules/core.object.classof');
 require('./modules/core.object.define');
 require('./modules/core.object.make');
 require('./modules/core.number.iterator');
+require('./modules/core.regexp.escape');
 require('./modules/core.string.escape-html');
 require('./modules/core.string.unescape-html');
 require('./modules/core.log');

diff --git a/library/modules/es7.regexp.escape.js → library/modules/core.regexp.escape.js b/library/modules/es7.regexp.escape.js → library/modules/core.regexp.escape.js
diff --git a/library/shim.js b/library/shim.js
@@ -91,7 +91,6 @@ require('./modules/es7.string.pad-start');
 require('./modules/es7.string.pad-end');
 require('./modules/es7.string.trim-left');
 require('./modules/es7.string.trim-right');
-require('./modules/es7.regexp.escape');
 require('./modules/es7.object.get-own-property-descriptors');
 require('./modules/es7.object.values');
 require('./modules/es7.object.entries');

diff --git a/modules/es7.regexp.escape.js → modules/core.regexp.escape.js b/modules/es7.regexp.escape.js → modules/core.regexp.escape.js
diff --git a/shim.js b/shim.js
@@ -91,7 +91,6 @@ require('./modules/es7.string.pad-start');
 require('./modules/es7.string.pad-end');
 require('./modules/es7.string.trim-left');
 require('./modules/es7.string.trim-right');
-require('./modules/es7.regexp.escape');
 require('./modules/es7.object.get-own-property-descriptors');
 require('./modules/es7.object.values');
 require('./modules/es7.object.entries');

diff --git a/tests/commonjs.ls b/tests/commonjs.ls
@@ -174,7 +174,6 @@ for P in <[.. ../library]>
   ok \Map of require("#P/es6")
   ok \includes of require("#P/es7/array")
   ok \values of require("#P/es7/object")
-  ok \escape of require("#P/es7/regexp")
   ok \at of require("#P/es7/string")
   require("#P/es7/set")
   require("#P/es7/map")
@@ -191,6 +190,7 @@ for P in <[.. ../library]>
   ok \part of require("#P/core/function")
   ok typeof require("#P/core/log") is \function
   ok \define of require("#P/core/object")
+  ok \escape of require("#P/core/regexp")
   ok \escapeHTML of require("#P/core/string")
   ok \Array of require("#P/core")
 console.log 'CommonJS - OK'
diff --git a/tests/es.js b/tests/es.js
diff --git a/tests/library.js b/tests/library.js
diff --git a/tests/library/es7.regexp.escape.ls → tests/library/core.regexp.escape.ls b/tests/library/es7.regexp.escape.ls → tests/library/core.regexp.escape.ls
@@ -1,5 +1,5 @@
 {module, test} = QUnit
-module \ES7
+module \core-js
 
 test 'RegExp.escape' (assert)->
   {escape} = core.RegExp

diff --git a/tests/tests.js b/tests/tests.js
diff --git a/tests/tests/es7.regexp.escape.ls → tests/tests/core.regexp.escape.ls b/tests/tests/es7.regexp.escape.ls → tests/tests/core.regexp.escape.ls
@@ -1,5 +1,5 @@
 {module, test} = QUnit
-module \ES7
+module \core-js
 
 test 'RegExp.escape' (assert)->
   {escape} = RegExp