fixed format function and aliased Array.prototype.slice

This commit is contained in:
Sami Samhuri 2010-05-06 00:03:24 -07:00
parent 4b3bc26bae
commit a7a1043d59
2 changed files with 31 additions and 7 deletions

View file

@ -8,26 +8,30 @@
var sys = require('sys');
function $args(args) {
return Array.prototype.slice.call(args);
}
exports.extendNativeStrings = function() {
String.prototype.printf = function(/* ... */) {
var args = Array.prototype.slice.call(arguments);
args.unshift(this);
var args = $args(arguments);
if (args[0] !== this) args.unshift(this);
sys.puts(exports.format.apply(this, args));
};
String.prototype.format = function(/* ... */) {
var args = Array.prototype.slice.call(arguments);
var args = $args(arguments);
if (args[0] !== this) args.unshift(this);
exports.format.apply(this, args);
return exports.format.apply(this, args);
};
};
exports.printf = function(/* ... */) {
sys.puts(exports.format.apply(this, Array.prototype.slice.call(arguments)));
sys.puts(exports.format.apply(this, arguments));
};
exports.format = function(format) {
var argIndex = 1 // skip initial format argument
, args = Array.prototype.slice.call(arguments)
, args = $args(arguments)
, i = 0
, n = format.length
, result = ''

View file

@ -1,5 +1,25 @@
var format = require('./format');
var sys = require('sys')
, format = require('./format')
;
format.extendNativeStrings();
sys.puts('Testing printf:');
'hello'.printf();
sys.puts('(expected "hello")');
'hello %s'.printf('sami');
sys.puts('(expected "hello sami")');
'b: %b\nc: %c\nd: %d\nf: %f\no: %o\ns: %s\nx: %x\nX: %X'.printf(42, 65, 42*42, 42*42*42/1000000000, 255, 'sami', 0xfeedface, 0xc0ffee);
sys.puts('(expected "b: 101010\nc: A\nd: 1764\nf: 0.000074\no: 0377\ns: sami\nx: 0xfeedface\nX: 0xC0FFEE")');
sys.puts('(passed if the output looks ok)');
function assertEqual(a, b) {
if (a !== b) throw new Error('assertion failed, ' + a + ' !== ' + b);
}
sys.puts('Testing format:');
assertEqual('hello'.format(), 'hello');
assertEqual('hello %s'.format('sami'), 'hello sami');
assertEqual('b: %b\nc: %c\nd: %d\nf: %f\no: %o\ns: %s\nx: %x\nX: %X'.format(42, 65, 42*42, 42*42*42/1000000000, 255, 'sami', 0xfeedface, 0xc0ffee), "b: 101010\nc: A\nd: 1764\nf: 0.000074\no: 0377\ns: sami\nx: 0xfeedface\nX: 0xC0FFEE");
sys.puts('(pass)');
sys.puts('all passed');