mirror of
https://github.com/jashkenas/coffeescript.git
synced 2026-02-17 11:01:25 -05:00
removing deprecated references to process.mixin in favor of helpers.extend for Node 0.1.32
This commit is contained in:
5
Cakefile
5
Cakefile
@@ -1,4 +1,5 @@
|
|||||||
fs: require 'fs'
|
fs: require 'fs'
|
||||||
|
helpers: require('./helpers').helpers
|
||||||
CoffeeScript: require './lib/coffee-script'
|
CoffeeScript: require './lib/coffee-script'
|
||||||
|
|
||||||
# Run a CoffeeScript through our node/coffee interpreter.
|
# Run a CoffeeScript through our node/coffee interpreter.
|
||||||
@@ -68,11 +69,11 @@ task 'doc:underscore', 'rebuild the Underscore.coffee documentation page', ->
|
|||||||
|
|
||||||
|
|
||||||
task 'test', 'run the CoffeeScript language test suite', ->
|
task 'test', 'run the CoffeeScript language test suite', ->
|
||||||
process.mixin require 'assert'
|
helpers.extend global, require 'assert'
|
||||||
test_count: 0
|
test_count: 0
|
||||||
start_time: new Date()
|
start_time: new Date()
|
||||||
[original_ok, original_throws]: [ok, throws]
|
[original_ok, original_throws]: [ok, throws]
|
||||||
process.mixin {
|
helpers.extend global, {
|
||||||
ok: (args...) -> test_count += 1; original_ok(args...)
|
ok: (args...) -> test_count += 1; original_ok(args...)
|
||||||
throws: (args...) -> test_count += 1; original_throws(args...)
|
throws: (args...) -> test_count += 1; original_throws(args...)
|
||||||
CoffeeScript: CoffeeScript
|
CoffeeScript: CoffeeScript
|
||||||
|
|||||||
3
bin/cake
3
bin/cake
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
|
|
||||||
process.mixin(require('sys'));
|
require('./../lib/helpers').helpers.extend(global, require('sys'));
|
||||||
|
|
||||||
var path = require('path');
|
var path = require('path');
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
|
var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
|
|
||||||
process.mixin(require('sys'));
|
require('./../lib/helpers').helpers.extend(global, require('sys'));
|
||||||
|
|
||||||
var path = require('path');
|
var path = require('path');
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
|
var lib = path.join(path.dirname(fs.realpathSync(__filename)), '../lib');
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
process.mixin require 'assert'
|
|
||||||
|
|
||||||
task 'test', 'run each of the unit tests', ->
|
task 'test', 'run each of the unit tests', ->
|
||||||
for test in test_files
|
for test in test_files
|
||||||
fs.readFile test, (err, code) -> eval coffee.compile code
|
fs.readFile test, (err, code) -> eval coffee.compile code
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Contributed by Jason Huggins
|
# Contributed by Jason Huggins
|
||||||
|
|
||||||
process.mixin require 'sys'
|
sys: require 'sys'
|
||||||
http: require 'http'
|
http: require 'http'
|
||||||
|
|
||||||
server: http.createServer (req, res) ->
|
server: http.createServer (req, res) ->
|
||||||
@@ -10,4 +10,4 @@ server: http.createServer (req, res) ->
|
|||||||
|
|
||||||
server.listen 3000
|
server.listen 3000
|
||||||
|
|
||||||
puts "Server running at http://localhost:3000/"
|
sys.puts "Server running at http://localhost:3000/"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
(function(){
|
(function(){
|
||||||
var CoffeeScript, fs, no_such_task, oparse, options, optparse, path, print_tasks, switches, tasks;
|
var CoffeeScript, fs, helpers, no_such_task, oparse, options, optparse, path, print_tasks, switches, tasks;
|
||||||
var __hasProp = Object.prototype.hasOwnProperty;
|
var __hasProp = Object.prototype.hasOwnProperty;
|
||||||
// `cake` is a simplified version of [Make](http://www.gnu.org/software/make/)
|
// `cake` is a simplified version of [Make](http://www.gnu.org/software/make/)
|
||||||
// ([Rake](http://rake.rubyforge.org/), [Jake](http://github.com/280north/jake))
|
// ([Rake](http://rake.rubyforge.org/), [Jake](http://github.com/280north/jake))
|
||||||
@@ -10,6 +10,7 @@
|
|||||||
// External dependencies.
|
// External dependencies.
|
||||||
fs = require('fs');
|
fs = require('fs');
|
||||||
path = require('path');
|
path = require('path');
|
||||||
|
helpers = require('./helpers').helpers;
|
||||||
optparse = require('./optparse');
|
optparse = require('./optparse');
|
||||||
CoffeeScript = require('./coffee-script');
|
CoffeeScript = require('./coffee-script');
|
||||||
// Keep track of the list of defined tasks, the accepted options, and so on.
|
// Keep track of the list of defined tasks, the accepted options, and so on.
|
||||||
@@ -18,7 +19,7 @@
|
|||||||
switches = [];
|
switches = [];
|
||||||
oparse = null;
|
oparse = null;
|
||||||
// Mixin the top-level Cake functions for Cakefiles to use directly.
|
// Mixin the top-level Cake functions for Cakefiles to use directly.
|
||||||
process.mixin({
|
helpers.extend(global, {
|
||||||
// Define a Cake task with a short name, a sentence description,
|
// Define a Cake task with a short name, a sentence description,
|
||||||
// and the function to run as the action itself.
|
// and the function to run as the action itself.
|
||||||
task: function task(name, description, action) {
|
task: function task(name, description, action) {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
(function(){
|
(function(){
|
||||||
var Lexer, lexer, parser, path, process_scripts;
|
var Lexer, helpers, lexer, parser, path, process_scripts;
|
||||||
// CoffeeScript can be used both on the server, as a command-line compiler based
|
// CoffeeScript can be used both on the server, as a command-line compiler based
|
||||||
// on Node.js/V8, or to run CoffeeScripts directly in the browser. This module
|
// on Node.js/V8, or to run CoffeeScripts directly in the browser. This module
|
||||||
// contains the main entry functions for tokenzing, parsing, and compiling source
|
// contains the main entry functions for tokenzing, parsing, and compiling source
|
||||||
@@ -8,10 +8,11 @@
|
|||||||
// execute all scripts present in `text/coffeescript` tags.
|
// execute all scripts present in `text/coffeescript` tags.
|
||||||
// Set up dependencies correctly for both the server and the browser.
|
// Set up dependencies correctly for both the server and the browser.
|
||||||
if ((typeof process !== "undefined" && process !== null)) {
|
if ((typeof process !== "undefined" && process !== null)) {
|
||||||
process.mixin(require('./nodes'));
|
|
||||||
path = require('path');
|
path = require('path');
|
||||||
Lexer = require('./lexer').Lexer;
|
Lexer = require('./lexer').Lexer;
|
||||||
parser = require('./parser').parser;
|
parser = require('./parser').parser;
|
||||||
|
helpers = require('./helpers').helpers;
|
||||||
|
helpers.extend(global, require('./nodes'));
|
||||||
} else {
|
} else {
|
||||||
this.exports = (this.CoffeeScript = {});
|
this.exports = (this.CoffeeScript = {});
|
||||||
Lexer = this.Lexer;
|
Lexer = this.Lexer;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
(function(){
|
(function(){
|
||||||
var balanced_string, compact, count, del, flatten, helpers, include, merge, starts;
|
var balanced_string, compact, count, del, extend, flatten, helpers, include, merge, starts;
|
||||||
var __hasProp = Object.prototype.hasOwnProperty;
|
var __hasProp = Object.prototype.hasOwnProperty;
|
||||||
// This file contains the common helper functions that we'd like to share among
|
// This file contains the common helper functions that we'd like to share among
|
||||||
// the **Lexer**, **Rewriter**, and the **Nodes**. Merge objects, flatten
|
// the **Lexer**, **Rewriter**, and the **Nodes**. Merge objects, flatten
|
||||||
@@ -60,6 +60,16 @@
|
|||||||
}
|
}
|
||||||
return fresh;
|
return fresh;
|
||||||
});
|
});
|
||||||
|
// Extend a source object with the properties of another object (shallow copy).
|
||||||
|
helpers.extend = (extend = function extend(object, properties) {
|
||||||
|
var _a, _b, key, val;
|
||||||
|
_a = []; _b = properties;
|
||||||
|
for (key in _b) { if (__hasProp.call(_b, key)) {
|
||||||
|
val = _b[key];
|
||||||
|
_a.push(((object[key] = val)));
|
||||||
|
}}
|
||||||
|
return _a;
|
||||||
|
});
|
||||||
// Return a completely flattened version of an array. Handy for getting a
|
// Return a completely flattened version of an array. Handy for getting a
|
||||||
// list of `children` from the nodes.
|
// list of `children` from the nodes.
|
||||||
helpers.flatten = (flatten = function flatten(array) {
|
helpers.flatten = (flatten = function flatten(array) {
|
||||||
|
|||||||
@@ -1,15 +1,16 @@
|
|||||||
(function(){
|
(function(){
|
||||||
var CoffeeScript, prompt, run;
|
var CoffeeScript, helpers, prompt, run;
|
||||||
// A very simple Read-Eval-Print-Loop. Compiles one line at a time to JavaScript
|
// A very simple Read-Eval-Print-Loop. Compiles one line at a time to JavaScript
|
||||||
// and evaluates it. Good for simple tests, or poking around the **Node.js** API.
|
// and evaluates it. Good for simple tests, or poking around the **Node.js** API.
|
||||||
// Using it looks like this:
|
// Using it looks like this:
|
||||||
// coffee> puts "$num bottles of beer" for num in [99..1]
|
// coffee> puts "$num bottles of beer" for num in [99..1]
|
||||||
// Require the **coffee-script** module to get access to the compiler.
|
// Require the **coffee-script** module to get access to the compiler.
|
||||||
CoffeeScript = require('./coffee-script');
|
CoffeeScript = require('./coffee-script');
|
||||||
|
helpers = require('./helpers').helpers;
|
||||||
// Our prompt.
|
// Our prompt.
|
||||||
prompt = 'coffee> ';
|
prompt = 'coffee> ';
|
||||||
// Quick alias for quitting the REPL.
|
// Quick alias for quitting the REPL.
|
||||||
process.mixin({
|
helpers.extend(global, {
|
||||||
quit: function quit() {
|
quit: function quit() {
|
||||||
return process.exit(0);
|
return process.exit(0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
# External dependencies.
|
# External dependencies.
|
||||||
fs: require 'fs'
|
fs: require 'fs'
|
||||||
path: require 'path'
|
path: require 'path'
|
||||||
|
helpers: require('./helpers').helpers
|
||||||
optparse: require './optparse'
|
optparse: require './optparse'
|
||||||
CoffeeScript: require './coffee-script'
|
CoffeeScript: require './coffee-script'
|
||||||
|
|
||||||
@@ -19,7 +20,7 @@ switches: []
|
|||||||
oparse: null
|
oparse: null
|
||||||
|
|
||||||
# Mixin the top-level Cake functions for Cakefiles to use directly.
|
# Mixin the top-level Cake functions for Cakefiles to use directly.
|
||||||
process.mixin {
|
helpers.extend global, {
|
||||||
|
|
||||||
# Define a Cake task with a short name, a sentence description,
|
# Define a Cake task with a short name, a sentence description,
|
||||||
# and the function to run as the action itself.
|
# and the function to run as the action itself.
|
||||||
|
|||||||
@@ -8,10 +8,11 @@
|
|||||||
|
|
||||||
# Set up dependencies correctly for both the server and the browser.
|
# Set up dependencies correctly for both the server and the browser.
|
||||||
if process?
|
if process?
|
||||||
process.mixin require './nodes'
|
|
||||||
path: require 'path'
|
path: require 'path'
|
||||||
Lexer: require('./lexer').Lexer
|
Lexer: require('./lexer').Lexer
|
||||||
parser: require('./parser').parser
|
parser: require('./parser').parser
|
||||||
|
helpers: require('./helpers').helpers
|
||||||
|
helpers.extend global, require './nodes'
|
||||||
else
|
else
|
||||||
this.exports: this.CoffeeScript: {}
|
this.exports: this.CoffeeScript: {}
|
||||||
Lexer: this.Lexer
|
Lexer: this.Lexer
|
||||||
|
|||||||
@@ -35,6 +35,10 @@ helpers.merge: merge: (options, overrides) ->
|
|||||||
(fresh[key]: val) for key, val of overrides if overrides
|
(fresh[key]: val) for key, val of overrides if overrides
|
||||||
fresh
|
fresh
|
||||||
|
|
||||||
|
# Extend a source object with the properties of another object (shallow copy).
|
||||||
|
helpers.extend: extend: (object, properties) ->
|
||||||
|
(object[key]: val) for key, val of properties
|
||||||
|
|
||||||
# Return a completely flattened version of an array. Handy for getting a
|
# Return a completely flattened version of an array. Handy for getting a
|
||||||
# list of `children` from the nodes.
|
# list of `children` from the nodes.
|
||||||
helpers.flatten: flatten: (array) ->
|
helpers.flatten: flatten: (array) ->
|
||||||
|
|||||||
@@ -6,12 +6,13 @@
|
|||||||
|
|
||||||
# Require the **coffee-script** module to get access to the compiler.
|
# Require the **coffee-script** module to get access to the compiler.
|
||||||
CoffeeScript: require './coffee-script'
|
CoffeeScript: require './coffee-script'
|
||||||
|
helpers: require('./helpers').helpers
|
||||||
|
|
||||||
# Our prompt.
|
# Our prompt.
|
||||||
prompt: 'coffee> '
|
prompt: 'coffee> '
|
||||||
|
|
||||||
# Quick alias for quitting the REPL.
|
# Quick alias for quitting the REPL.
|
||||||
process.mixin {
|
helpers.extend global, {
|
||||||
quit: -> process.exit(0)
|
quit: -> process.exit(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user