jslint 1.0.5 → 1.1.0

data/jslint/json2.js

@@ -1,6 +1,6 @@
 /*
     http://www.JSON.org/json2.js
-    2010-08-25
+    2011-02-23
 
     Public Domain.
 
@@ -141,7 +141,7 @@
     redistribute.
 */
 
-/*jslint evil: true, strict: false */
+/*jslint evil: true, strict: false, regexp: false */
 
 /*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
     call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
@@ -153,11 +153,13 @@
 // Create a JSON object only if one does not already exist. We create the
 // methods in a closure to avoid creating global variables.
 
-if (!this.JSON) {
-    this.JSON = {};
+var JSON;
+if (!JSON) {
+    JSON = {};
 }
 
 (function () {
+    "use strict";
 
     function f(n) {
         // Format integers to have at least two digits.
@@ -169,19 +171,19 @@ if (!this.JSON) {
         Date.prototype.toJSON = function (key) {
 
             return isFinite(this.valueOf()) ?
-                   this.getUTCFullYear()   + '-' +
-                 f(this.getUTCMonth() + 1) + '-' +
-                 f(this.getUTCDate())      + 'T' +
-                 f(this.getUTCHours())     + ':' +
-                 f(this.getUTCMinutes())   + ':' +
-                 f(this.getUTCSeconds())   + 'Z' : null;
+                this.getUTCFullYear()     + '-' +
+                f(this.getUTCMonth() + 1) + '-' +
+                f(this.getUTCDate())      + 'T' +
+                f(this.getUTCHours())     + ':' +
+                f(this.getUTCMinutes())   + ':' +
+                f(this.getUTCSeconds())   + 'Z' : null;
         };
 
-        String.prototype.toJSON =
-        Number.prototype.toJSON =
-        Boolean.prototype.toJSON = function (key) {
-            return this.valueOf();
-        };
+        String.prototype.toJSON      =
+            Number.prototype.toJSON  =
+            Boolean.prototype.toJSON = function (key) {
+                return this.valueOf();
+            };
     }
 
     var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
@@ -207,13 +209,11 @@ if (!this.JSON) {
 // sequences.
 
         escapable.lastIndex = 0;
-        return escapable.test(string) ?
-            '"' + string.replace(escapable, function (a) {
-                var c = meta[a];
-                return typeof c === 'string' ? c :
-                    '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-            }) + '"' :
-            '"' + string + '"';
+        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+            var c = meta[a];
+            return typeof c === 'string' ? c :
+                '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        }) + '"' : '"' + string + '"';
     }
 
     function str(key, holder) {
@@ -295,11 +295,9 @@ if (!this.JSON) {
 // Join all of the elements together, separated with commas, and wrap them in
 // brackets.
 
-                v = partial.length === 0 ? '[]' :
-                    gap ? '[\n' + gap +
-                            partial.join(',\n' + gap) + '\n' +
-                                mind + ']' :
-                          '[' + partial.join(',') + ']';
+                v = partial.length === 0 ? '[]' : gap ?
+                    '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' :
+                    '[' + partial.join(',') + ']';
                 gap = mind;
                 return v;
             }
@@ -309,8 +307,8 @@ if (!this.JSON) {
             if (rep && typeof rep === 'object') {
                 length = rep.length;
                 for (i = 0; i < length; i += 1) {
-                    k = rep[i];
-                    if (typeof k === 'string') {
+                    if (typeof rep[i] === 'string') {
+                        k = rep[i];
                         v = str(k, value);
                         if (v) {
                             partial.push(quote(k) + (gap ? ': ' : ':') + v);
@@ -322,7 +320,7 @@ if (!this.JSON) {
 // Otherwise, iterate through all of the keys in the object.
 
                 for (k in value) {
-                    if (Object.hasOwnProperty.call(value, k)) {
+                    if (Object.prototype.hasOwnProperty.call(value, k)) {
                         v = str(k, value);
                         if (v) {
                             partial.push(quote(k) + (gap ? ': ' : ':') + v);
@@ -334,9 +332,9 @@ if (!this.JSON) {
 // Join all of the member texts together, separated with commas,
 // and wrap them in braces.
 
-            v = partial.length === 0 ? '{}' :
-                gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
-                        mind + '}' : '{' + partial.join(',') + '}';
+            v = partial.length === 0 ? '{}' : gap ?
+                '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' :
+                '{' + partial.join(',') + '}';
             gap = mind;
             return v;
         }
@@ -377,7 +375,7 @@ if (!this.JSON) {
             rep = replacer;
             if (replacer && typeof replacer !== 'function' &&
                     (typeof replacer !== 'object' ||
-                     typeof replacer.length !== 'number')) {
+                    typeof replacer.length !== 'number')) {
                 throw new Error('JSON.stringify');
             }
 
@@ -406,7 +404,7 @@ if (!this.JSON) {
                 var k, v, value = holder[key];
                 if (value && typeof value === 'object') {
                     for (k in value) {
-                        if (Object.hasOwnProperty.call(value, k)) {
+                        if (Object.prototype.hasOwnProperty.call(value, k)) {
                             v = walk(value, k);
                             if (v !== undefined) {
                                 value[k] = v;
@@ -446,9 +444,9 @@ if (!this.JSON) {
 // ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
 
             if (/^[\],:{}\s]*$/
-.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
-.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
-.replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+                    .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
 
 // In the third stage we use the eval function to compile the text into a
 // JavaScript structure. The '{' operator is subject to a syntactic ambiguity

data/jslint/node.coffee

@@ -0,0 +1,69 @@
+###
+  (c) 2010 Geraud Boyer
+  Adapted from rhino.js from Douglas Crockford  (www.JSLint.com)
+
+  This is the node companion to fulljslint.js.
+###
+###global JSLINT
+###
+###jslint rhino: false, node: true, strict: false
+###
+###global require,sys,__filename,process
+###
+
+((args) ->
+  sys = require 'sys'
+  fs = require 'fs'
+  path = require 'path'
+
+  print_syntax = () ->
+    sys.puts 'Usage: jslint.js [options] file.js'
+    process.exit 1
+
+  print_syntax() if args.length is 0
+
+  filename = path.join path.dirname(__filename), 'jslint.js'
+  JSLINT = fs.readFileSync(filename).toString 'UTF8'
+  eval JSLINT
+
+  # Sensible defaults
+  options =
+    rhino: no, node: no, passfail: no, bitwise: yes, immed: yes, newcap: yes,
+    nomen: yes, onevar: yes, plusplus: yes, regexp: yes, undef: yes, white: yes
+
+  input = null
+  input_filename = null
+  args.forEach (arg, index) ->
+
+    if arg.match /^--no-(\w+)$/
+      options[RegExp.$1] = no
+    else if arg.match /^--(\w+)=(\S.*)$/
+      options[RegExp.$1] = JSON.parse(RegExp.$2)
+    else if arg.match /^--(\w+)$/
+      options[RegExp.$1] = yes
+    else
+      input_filename = arg
+      input = fs.readFileSync input_filename
+      if not input
+        sys.puts "jslint: Couldn't open file '#{input_filename}'."
+        process.exit 1
+      else
+        # sys.debug('opening input');
+        input = input.toString 'UTF8'
+    return
+
+  print_syntax() if not input
+
+  if not JSLINT input, options
+    JSLINT.errors.forEach (error) ->
+      if error
+        sys.puts "Lint at line #{error.line} character #{error.character}: #{error.reason}"
+        sys.puts (error.evidence or '').replace /^\s*(\S*(\s+\S+)*)\s*$/, "$1"
+        sys.puts ''
+    process.exit 2
+  else
+    sys.puts "jslint: No problems found in #{input_filename}"
+    process.exit 0
+
+  return
+) process.ARGV.slice 2

data/jslint/node.js

@@ -1,72 +1,77 @@
 /*
-    (c) 2010 Geraud Boyer
-    Adapted from rhino.js from Douglas Crockford  (www.JSLint.com)
-*/
-// This is the node companion to fulljslint.js.
-
-/*global JSLINT */
-/*jslint rhino: false, strict: false */
-/*global require,sys,__filename,process */
-
-(function (args) {
-    var sys = require('sys'),
-        fs = require('fs'),
-        path = require('path'),
-        JSLINT = fs.readFileSync(path.join(path.dirname(__filename), 'fulljslint.js')).toString('UTF8'),
-        options = {
-            rhino: true, passfail: false, bitwise: true,
-            eqeqeq: true, immed: true, newcap: true,
-            nomen: true, onevar: true, plusplus: true,
-            regexp: true, undef: true, white: true
-        },
-        filename, input;
+  (c) 2010 Geraud Boyer
+  Adapted from rhino.js from Douglas Crockford  (www.JSLint.com)
 
-    if (args.length === 0) {
-        sys.puts('Usage: jslint.js [options] file.js');
+  This is the node companion to fulljslint.js.
+*/
+/*global JSLINT
+*/
+/*jslint rhino: false, node: true, strict: false
+*/
+/*global require,sys,__filename,process
+*/(function(args) {
+  var JSLINT, filename, fs, input, input_filename, options, path, print_syntax, sys;
+  sys = require('sys');
+  fs = require('fs');
+  path = require('path');
+  print_syntax = function() {
+    sys.puts('Usage: jslint.js [options] file.js');
+    return process.exit(1);
+  };
+  if (args.length === 0) {
+    print_syntax();
+  }
+  filename = path.join(path.dirname(__filename), 'jslint.js');
+  JSLINT = fs.readFileSync(filename).toString('UTF8');
+  eval(JSLINT);
+  options = {
+    rhino: false,
+    node: false,
+    passfail: false,
+    bitwise: true,
+    immed: true,
+    newcap: true,
+    nomen: true,
+    onevar: true,
+    plusplus: true,
+    regexp: true,
+    undef: true,
+    white: true
+  };
+  input = null;
+  input_filename = null;
+  args.forEach(function(arg, index) {
+    if (arg.match(/^--no-(\w+)$/)) {
+      options[RegExp.$1] = false;
+    } else if (arg.match(/^--(\w+)=(\S.*)$/)) {
+      options[RegExp.$1] = JSON.parse(RegExp.$2);
+    } else if (arg.match(/^--(\w+)$/)) {
+      options[RegExp.$1] = true;
+    } else {
+      input_filename = arg;
+      input = fs.readFileSync(input_filename);
+      if (!input) {
+        sys.puts("jslint: Couldn't open file '" + input_filename + "'.");
         process.exit(1);
+      } else {
+        input = input.toString('UTF8');
+      }
     }
-    eval(JSLINT);
-
-    args.forEach(function (arg, index) {
-        // sys.debug("Arg(" + index + "): " + arg);
-        if (arg.match(/^--no-(\w+)$/)) {
-            // sys.debug("a=false");
-            options[RegExp.$1] = false;
-        }
-        else if (arg.match(/^--(\w+)=(\S.*)$/)) {
-            // sys.debug("a=b");
-            // sys.debug("value: " + RegExp.$2);
-            options[RegExp.$1] = JSON.parse(RegExp.$2);
-        }
-        else if (arg.match(/^--(\w+)$/)) {
-            // sys.debug("a=true");
-            options[RegExp.$1] = true;
-        }
-        else {
-            filename = arg;
-            input = fs.readFileSync(filename);
-            if (!input) {
-                sys.puts("jslint: Couldn't open file '" + filename + "'.");
-                process.exit(1);
-            }
-            else {
-                // sys.debug('opening input');
-                input = input.toString('UTF8');
-            }
-        }
+  });
+  if (!input) {
+    print_syntax();
+  }
+  if (!JSLINT(input, options)) {
+    JSLINT.errors.forEach(function(error) {
+      if (error) {
+        sys.puts("Lint at line " + error.line + " character " + error.character + ": " + error.reason);
+        sys.puts((error.evidence || '').replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"));
+        return sys.puts('');
+      }
     });
-    if (!JSLINT(input, options)) {
-        JSLINT.errors.forEach(function (error) {
-            if (error) {
-                sys.puts('Lint at line ' + error.line + ' character ' + error.character + ': ' + error.reason);
-                sys.puts((error.evidence || '').replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"));
-                sys.puts('');
-            }
-        });
-        process.exit(2);
-    }
-    else {
-        sys.puts("jslint: No problems found in " + filename);
-        process.exit(0);
-    }
-}(process.ARGV.slice(2)));
+    process.exit(2);
+  } else {
+    sys.puts("jslint: No problems found in " + input_filename);
+    process.exit(0);
+  }
+})(process.ARGV.slice(2));

data/jslint/rhino.coffee

@@ -0,0 +1,59 @@
+###
+  rhino.js
+  2009-09-11
+  Copyright (c) 2002 Douglas Crockford  (www.JSLint.com) Rhino Edition
+
+  Converted to CoffeeScript by Geraud Boyer
+
+  This is the Rhino companion to fulljslint.js.
+
+###
+
+###global JSLINT
+###
+###jslint rhino: true, strict: false
+###
+#
+do (arguments) ->
+
+  print_syntax = () ->
+    sys.puts 'Usage: jslint.js [options] file.js'
+    quit 1
+
+  print_syntax() if not arguments[0]
+
+  options =
+    rhino: no, node: no, passfail: no, strict: no, bitwise: yes, newcap: yes,
+    nomen: yes, onevar: yes, plusplus: yes, regexp: yes, undef: yes, white: yes
+
+  input = null
+  input_filename = null
+
+  for arg in arguments
+    do (arg)->
+      if arg.match /^--no-(\w+)$/
+        options[RegExp.$1] = no
+      else if arg.match /^--(\w+)=(\S.*)$/
+        options[RegExp.$1] = JSON.parse RegExp.$2
+      else if arg.match /^--(\w+)$/
+        options[RegExp.$1] = yes
+      else
+        input_filename = arg
+        input = readFile input_filename
+        if not input
+          print "jslint: Couldn't open file '#{input_filename}'."
+          quit 1
+      return
+
+  print_syntax() if not input
+
+  if not JSLINT input, options
+    JSLINT.errors.forEach (error) ->
+      if error
+        print "Lint at line #{error.line} character #{error.character}: #{error.reason}"
+        print (error.evidence or '').replace /^\s*(\S*(\s+\S+)*)\s*$/, "$1"
+        print ''
+    quit 2
+  else
+    print "jslint: No problems found in #{input_filename}"
+    quit 0

data/jslint/rhino.js

@@ -1,59 +1,75 @@
-// rhino.js
-// 2009-09-11
 /*
-Copyright (c) 2002 Douglas Crockford  (www.JSLint.com) Rhino Edition
-*/
+  rhino.js
+  2009-09-11
+  Copyright (c) 2002 Douglas Crockford  (www.JSLint.com) Rhino Edition
 
-// This is the Rhino companion to fulljslint.js.
+  Converted to CoffeeScript by Geraud Boyer
 
-/*global JSLINT */
-/*jslint rhino: true, strict: false */
+  This is the Rhino companion to fulljslint.js.
 
-(function (a) {
-    var e, i, options, arg;
-    if (!a[0]) {
-        print("Usage: jslint.js [options] file.js");
-        quit(1);
-    }
-    options = {
-        rhino: true,  passfail:false,
-        bitwise: true, eqeqeq: true, immed: true,
-        newcap: true, nomen: true, onevar: true, plusplus: true,
-        regexp: true,  undef: true, white: true
-    };
-    while((arg = a.shift())) {
-        if (arg.match(/^--no(\w+)$/)) {
-            options[RegExp.$1] = false;
-        }
-        else if (arg.match(/^--(\w+)=(\S.*)$/)) {
-            options[RegExp.$1] = JSON.parse(RegExp.$2);
-        }
-        else if (arg.match(/^--(\w+)$/)) {
-            options[RegExp.$1] = true;
-        }
-        else {
-            var filename = arg
-            var input = readFile(filename);
-            if (!input) {
-                print("jslint: Couldn't open file '" + filename + "'.");
-                quit(1);
-            }
-        }
-    }
-    if (!JSLINT(input, options)) {
-        for (i = 0; i < JSLINT.errors.length; i += 1) {
-            e = JSLINT.errors[i];
-            if (e) {
-                print('Lint at line ' + e.line + ' character ' +
-                        e.character + ': ' + e.reason);
-                print((e.evidence || '').
-                        replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"));
-                print('');
-            }
-        }
-        quit(2);
+*/
+/*global JSLINT
+*/
+/*jslint rhino: true, strict: false
+*/(function(arguments) {
+  var arg, input, input_filename, options, print_syntax, _fn, _i, _len;
+  print_syntax = function() {
+    sys.puts('Usage: jslint.js [options] file.js');
+    return quit(1);
+  };
+  if (!arguments[0]) {
+    print_syntax();
+  }
+  options = {
+    rhino: false,
+    node: false,
+    passfail: false,
+    strict: false,
+    bitwise: true,
+    newcap: true,
+    nomen: true,
+    onevar: true,
+    plusplus: true,
+    regexp: true,
+    undef: true,
+    white: true
+  };
+  input = null;
+  input_filename = null;
+  _fn = function(arg) {
+    if (arg.match(/^--no-(\w+)$/)) {
+      options[RegExp.$1] = false;
+    } else if (arg.match(/^--(\w+)=(\S.*)$/)) {
+      options[RegExp.$1] = JSON.parse(RegExp.$2);
+    } else if (arg.match(/^--(\w+)$/)) {
+      options[RegExp.$1] = true;
     } else {
-        print("jslint: No problems found in " + a[0]);
-        quit();
+      input_filename = arg;
+      input = readFile(input_filename);
+      if (!input) {
+        print("jslint: Couldn't open file '" + input_filename + "'.");
+        quit(1);
+      }
     }
-}(arguments));
+  };
+  for (_i = 0, _len = arguments.length; _i < _len; _i++) {
+    arg = arguments[_i];
+    _fn(arg);
+  }
+  if (!input) {
+    print_syntax();
+  }
+  if (!JSLINT(input, options)) {
+    JSLINT.errors.forEach(function(error) {
+      if (error) {
+        print("Lint at line " + error.line + " character " + error.character + ": " + error.reason);
+        print((error.evidence || '').replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"));
+        return print('');
+      }
+    });
+    return quit(2);
+  } else {
+    print("jslint: No problems found in " + input_filename);
+    return quit(0);
+  }
+})(arguments);