jslint_on_rails 1.0.0 → 1.0.2

data/Gemfile

@@ -0,0 +1,8 @@
+disable_system_gems
+clear_sources
+source "http://gemcutter.org"
+source "http://gems.github.com"
+bundle_path 'gems'
+
+gem 'rspec'
+gem 'fakefs'

data/README.markdown

@@ -48,11 +48,13 @@ file to be kept - for example:
 If you wish to write your own rake task to run JSLint, you can create and execute the JSLint object manually:
 
     require 'jslint'
+    
     lint = JSLint::Lint.new(
       :paths => ['public/javascripts/**/*.js'],
       :exclude_paths => ['public/javascripts/vendor/**/*.js'],
       :config_path => 'config/jslint.yml'
     )
+    
     lint.run
 
 

data/Rakefile

@@ -0,0 +1,8 @@
+require 'gems/environment'
+require 'spec/rake/spectask'
+
+desc 'Run the specs'
+Spec::Rake::SpecTask.new do |t|
+  t.libs << 'lib'
+  t.spec_opts = ['--colour', '--format', 'specdoc']
+end

data/lib/jslint.rb

@@ -1,3 +1,3 @@
-require File.expand_path(File.dirname(__FILE__) + '/jslint/errors')
-require File.expand_path(File.dirname(__FILE__) + '/jslint/utils')
-require File.expand_path(File.dirname(__FILE__) + '/jslint/lint')
+require 'jslint/errors'
+require 'jslint/utils'
+require 'jslint/lint'

data/{config → lib/jslint/config}/jslint.yml

@@ -36,6 +36,7 @@ white:    false     # true if strict whitespace rules apply (see also 'indent' o
 cap:      false     # true if upper case HTML should be allowed
 css:      true      # true if CSS workarounds should be tolerated
 debug:    false     # true if debugger statements should be allowed (set to false before going into production)
+es5:      true      # true if ECMAScript 5 syntax should be allowed
 evil:     false     # true if eval should be allowed
 forin:    true      # true if unfiltered 'for in' statements should be allowed
 fragment: true      # true if HTML fragments should be allowed
@@ -53,7 +54,7 @@ passfail: false     # true if the scan should stop on first error (per file)
 predef:   ''        # Names of predefined global variables - comma-separated string
 browser:  true      # true if the standard browser globals should be predefined
 rhino:    false     # true if the Rhino environment globals should be predefined
-sidebar:  false     # true if the Windows Sidebar Gadgets globals should be predefined
+windows:  false     # true if Windows-specific globals should be predefined
 widget:   false     # true if the Yahoo Widgets globals should be predefined
 devel:    true      # true if functions like alert, confirm, console, prompt etc. are predefined
 

data/lib/jslint/lint.rb

@@ -1,13 +1,16 @@
+require 'jslint/errors'
+require 'jslint/utils'
+
 module JSLint
 
   PATH = File.dirname(__FILE__)
 
-  TEST_JAR_FILE = File.expand_path("#{PATH}/../../vendor/test.jar")
-  RHINO_JAR_FILE = File.expand_path("#{PATH}/../../vendor/rhino.jar")
+  TEST_JAR_FILE = File.expand_path("#{PATH}/vendor/test.jar")
+  RHINO_JAR_FILE = File.expand_path("#{PATH}/vendor/rhino.jar")
   TEST_JAR_CLASS = "Test"
   RHINO_JAR_CLASS = "org.mozilla.javascript.tools.shell.Main"
 
-  JSLINT_FILE = File.expand_path("#{PATH}/../../vendor/jslint.js")
+  JSLINT_FILE = File.expand_path("#{PATH}/vendor/jslint.js")
 
   class Lint
 
@@ -24,27 +27,35 @@ module JSLint
       excluded_files = files_matching_paths(options, :exclude_paths)
       @file_list = Utils.exclude_files(included_files, excluded_files)
 
-      ['paths', 'exclude_paths', 'config_path'].each { |field| @config.delete(field) }
+      ['paths', 'exclude_paths'].each { |field| @config.delete(field) }
     end
 
     def run
       check_java
-      puts "Running JSLint:\n\n"
-      command = "java -cp #{RHINO_JAR_FILE} #{RHINO_JAR_CLASS} #{JSLINT_FILE} #{option_string} #{@file_list.join(' ')}"
-      success = system(command)
+      Utils.xputs "Running JSLint:\n\n"
+      arguments = "#{JSLINT_FILE} #{option_string} #{@file_list.join(' ')}"
+      success = call_java_with_status(RHINO_JAR_FILE, RHINO_JAR_CLASS, arguments)
       raise LintCheckFailure, "JSLint test failed." unless success
     end
 
 
     private
 
+    def call_java_with_output(jar, mainClass, arguments = "")
+      %x(java -cp #{jar} #{mainClass} #{arguments})
+    end
+
+    def call_java_with_status(jar, mainClass, arguments = "")
+      system("java -cp #{jar} #{mainClass} #{arguments}")
+    end
+
     def option_string
       @config.map { |k, v| "#{k}=#{v.inspect}" }.join(',')
     end
 
     def check_java
       unless @java_ok
-        java_test = %x(java -cp #{TEST_JAR_FILE} #{TEST_JAR_CLASS})
+        java_test = call_java_with_output(TEST_JAR_FILE, TEST_JAR_CLASS)
         if java_test.strip == "OK"
           @java_ok = true
         else

data/lib/jslint/rails.rb

@@ -1,2 +1,4 @@
+require 'jslint/utils'
+
 # for Rails, set config file path to config/jslint.yml in Rails root
-JSLint.config_path = File.expand_path(RAILS_ROOT + '/config/jslint.yml')
+JSLint.config_path = File.join(Rails.root, 'config', 'jslint.yml')

data/lib/jslint/tasks.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../jslint')
+require 'jslint/lint'
+require 'jslint/utils'
 
 desc "Run JSLint check on selected Javascript files"
 task :jslint do

data/lib/jslint/utils.rb

@@ -2,7 +2,8 @@ require 'ftools'
 
 module JSLint
 
-  DEFAULT_CONFIG_FILE = File.expand_path(File.dirname(__FILE__) + "/../../config/jslint.yml")
+  VERSION = "1.0.2"
+  DEFAULT_CONFIG_FILE = File.expand_path(File.dirname(__FILE__) + "/config/jslint.yml")
 
   class << self
     attr_accessor :config_path
@@ -11,6 +12,14 @@ module JSLint
   module Utils
     class << self
 
+      def xprint(txt)
+        print txt
+      end
+
+      def xputs(txt)
+        puts txt
+      end
+
       def load_config_file(file_name)
         if file_name && File.exists?(file_name) && File.file?(file_name) && File.readable?(file_name)
           YAML.load_file(file_name)
@@ -40,28 +49,28 @@ module JSLint
 
       def copy_config_file
         raise ArgumentError, "Please set JSLint.config_path" if JSLint.config_path.nil?
-        print "Copying default config file to #{File.expand_path(JSLint.config_path)}... "
+        xprint "Copying default config file to #{File.expand_path(JSLint.config_path)}... "
         if File.exists?(JSLint.config_path)
-          puts "\n\nWarning: config file exists, so it won't be overwritten. " +
-               "You can copy it manually from the jslint_on_rails directory if you want to reset it."
+          xputs "\n\nWarning: config file exists, so it won't be overwritten. " +
+                "You can copy it manually from the jslint_on_rails directory if you want to reset it."
         else
           File.copy(JSLint::DEFAULT_CONFIG_FILE, JSLint.config_path)
-          puts "OK."
+          xputs "OK."
         end
       end
 
       def remove_config_file
         raise ArgumentError, "Please set JSLint.config_path" if JSLint.config_path.nil?
-        print "Removing config file... "
+        xprint "Removing config file... "
         if File.exists?(JSLint.config_path) && File.file?(JSLint.config_path)
           if File.read(JSLint.config_path) == File.read(JSLint::DEFAULT_CONFIG_FILE)
             File.delete(JSLint.config_path)
-            puts "OK."
+            xputs "OK."
           else
-            puts "File was modified, so it won't be deleted automatically."
+            xputs "File was modified, so it won't be deleted automatically."
           end
         else
-          puts "OK (no config file found)."
+          xputs "OK (no config file found)."
         end
       end
 

data/{vendor → lib/jslint/vendor}/jslint.js

@@ -1,5 +1,5 @@
 // jslint.js
-// 2009-11-22
+// 2010-04-06
 
 /*
 Copyright (c) 2002 Douglas Crockford  (www.JSLint.com)
@@ -144,110 +144,112 @@ SOFTWARE.
     evil: true, nomen: false, onevar: false, regexp: false, strict: true
 */
 
-/*members "\b", "\t", "\n", "\f", "\r", "!=", "!==", "\"", "%",
-    "(begin)", "(breakage)", "(context)", "(error)", "(global)",
-    "(identifier)", "(last)", "(line)", "(loopage)", "(name)", "(onevar)",
-    "(params)", "(scope)", "(verb)", "*", "+", "++", "-", "--", "\/",
-    "<", "<=", "==", "===", ">", ">=", ADSAFE, Array, Boolean,
-    COM, Canvas, CustomAnimation, Date, Debug, E, Error, EvalError,
-    FadeAnimation, Flash, FormField, Frame, Function, HotKey, Image, JSON,
-    LN10, LN2, LOG10E, LOG2E, MAX_VALUE, MIN_VALUE, Math, MenuItem,
-    MoveAnimation, NEGATIVE_INFINITY, Number, Object, Option, PI,
-    POSITIVE_INFINITY, Point, RangeError, Rectangle, ReferenceError, RegExp,
-    ResizeAnimation, RotateAnimation, SQRT1_2, SQRT2, ScrollBar, String,
-    Style, SyntaxError, System, Text, TextArea, Timer, TypeError, URIError,
-    URL, Web, Window, XMLDOM, XMLHttpRequest, "\\", a, abbr, acronym,
-    addEventListener, address, adsafe, alert, aliceblue, animator,
-    antiquewhite, appleScript, applet, apply, approved, aqua, aquamarine,
-    area, arguments, arity, autocomplete, azure, b, background,
-    "background-attachment", "background-color", "background-image",
-    "background-position", "background-repeat", base, bdo, beep, beige, big,
-    bisque, bitwise, black, blanchedalmond, block, blockquote, blue,
-    blueviolet, blur, body, border, "border-bottom", "border-bottom-color",
-    "border-bottom-style", "border-bottom-width", "border-collapse",
-    "border-color", "border-left", "border-left-color", "border-left-style",
-    "border-left-width", "border-right", "border-right-color",
-    "border-right-style", "border-right-width", "border-spacing",
-    "border-style", "border-top", "border-top-color", "border-top-style",
-    "border-top-width", "border-width", bottom, br, brown, browser,
-    burlywood, button, bytesToUIString, c, cadetblue, call, callee, caller,
-    canvas, cap, caption, "caption-side", cases, center, charAt, charCodeAt,
-    character, chartreuse, chocolate, chooseColor, chooseFile, chooseFolder,
-    cite, clear, clearInterval, clearTimeout, clip, close, closeWidget,
-    closed, closure, cm, code, col, colgroup, color, comment, condition,
-    confirm, console, constructor, content, convertPathToHFS,
-    convertPathToPlatform, coral, cornflowerblue, cornsilk,
-    "counter-increment", "counter-reset", create, crimson, css, cursor,
-    cyan, d, darkblue, darkcyan, darkgoldenrod, darkgray, darkgreen,
-    darkkhaki, darkmagenta, darkolivegreen, darkorange, darkorchid, darkred,
-    darksalmon, darkseagreen, darkslateblue, darkslategray, darkturquoise,
-    darkviolet, data, dd, debug, decodeURI, decodeURIComponent, deeppink,
-    deepskyblue, defaultStatus, defineClass, del, deserialize, devel, dfn,
-    dimension, dimgray, dir, direction, display, div, dl, document,
-    dodgerblue, dt, edition, else, em, embed, empty, "empty-cells",
-    encodeURI, encodeURIComponent, entityify, eqeqeq, errors, escape, eval,
-    event, evidence, evil, ex, exception, exec, exps, fieldset, filesystem,
-    firebrick, first, float, floor, floralwhite, focus, focusWidget, font,
-    "font-face", "font-family", "font-size", "font-size-adjust",
-    "font-stretch", "font-style", "font-variant", "font-weight",
-    forestgreen, forin, form, fragment, frame, frames, frameset, from,
-    fromCharCode, fuchsia, fud, funct, function, functions, g, gainsboro,
-    gc, getComputedStyle, ghostwhite, global, globals, gold, goldenrod,
-    gray, green, greenyellow, h1, h2, h3, h4, h5, h6, hasOwnProperty, head,
-    height, help, history, honeydew, hotpink, hr, html, i, iTunes, id,
-    identifier, iframe, img, immed, implieds, in, include, indent, indexOf,
-    indianred, indigo, init, input, ins, isAlpha, isApplicationRunning,
-    isDigit, isFinite, isNaN, ivory, join, jslint, json, kbd, khaki,
-    konfabulatorVersion, label, labelled, lang, last, lavender,
-    lavenderblush, lawngreen, laxbreak, lbp, led, left, legend,
-    lemonchiffon, length, "letter-spacing", li, lib, lightblue, lightcoral,
-    lightcyan, lightgoldenrodyellow, lightgreen, lightpink, lightsalmon,
-    lightseagreen, lightskyblue, lightslategray, lightsteelblue,
-    lightyellow, lime, limegreen, line, "line-height", linen, link,
-    "list-style", "list-style-image", "list-style-position",
-    "list-style-type", load, loadClass, location, log, m, magenta, map,
-    margin, "margin-bottom", "margin-left", "margin-right", "margin-top",
-    "marker-offset", maroon, match, "max-height", "max-width", maxerr, maxlen,
-    md5, media, mediumaquamarine, mediumblue, mediumorchid, mediumpurple,
-    mediumseagreen, mediumslateblue, mediumspringgreen, mediumturquoise,
-    mediumvioletred, member, menu, message, meta, midnightblue,
-    "min-height", "min-width", mintcream, mistyrose, mm, moccasin, moveBy,
-    moveTo, name, navajowhite, navigator, navy, new, newcap, noframes,
-    nomen, noscript, nud, object, ol, oldlace, olive, olivedrab, on,
-    onbeforeunload, onblur, onerror, onevar, onfocus, onload, onresize,
-    onunload, opacity, open, openURL, opener, opera, optgroup, option,
-    orange, orangered, orchid, outer, outline, "outline-color",
-    "outline-style", "outline-width", overflow, "overflow-x", "overflow-y",
-    p, padding, "padding-bottom", "padding-left", "padding-right",
-    "padding-top", page, "page-break-after", "page-break-before",
-    palegoldenrod, palegreen, paleturquoise, palevioletred, papayawhip,
-    param, parent, parseFloat, parseInt, passfail, pc, peachpuff, peru,
-    pink, play, plum, plusplus, pop, popupMenu, position, powderblue, pre,
-    predef, preferenceGroups, preferences, print, prompt, prototype, pt,
-    purple, push, px, q, quit, quotes, random, range, raw, reach, readFile,
-    readUrl, reason, red, regexp, reloadWidget, removeEventListener,
-    replace, report, reserved, resizeBy, resizeTo, resolvePath,
-    resumeUpdates, rhino, right, rosybrown, royalblue, runCommand,
-    runCommandInBg, saddlebrown, safe, salmon, samp, sandybrown, saveAs,
-    savePreferences, screen, script, scroll, scrollBy, scrollTo, seagreen,
-    seal, search, seashell, select, serialize, setInterval, setTimeout,
-    shift, showWidgetPreferences, sidebar, sienna, silver, skyblue,
-    slateblue, slategray, sleep, slice, small, snow, sort, span, spawn,
-    speak, split, springgreen, src, status, steelblue, strict, strong,
-    style, styleproperty, sub, substr, sup, supplant, suppressUpdates, sync,
-    system, table, "table-layout", tan, tbody, td, teal, tellWidget, test,
-    "text-align", "text-decoration", "text-indent", "text-shadow",
-    "text-transform", textarea, tfoot, th, thead, thistle, title,
-    toLowerCase, toString, toUpperCase, toint32, token, tomato, top, tr, tt,
-    turquoise, type, u, ul, undef, unescape, "unicode-bidi", unused,
-    unwatch, updateNow, urls, value, valueOf, var, version,
-    "vertical-align", violet, visibility, watch, wheat, white,
-    "white-space", whitesmoke, widget, width, "word-spacing", "word-wrap",
-    yahooCheckLogin, yahooLogin, yahooLogout, yellow, yellowgreen,
-    "z-index"
+/*members "\b", "\t", "\n", "\f", "\r", "!=", "!==", "\"", "%", 
+    "(begin)", "(breakage)", "(context)", "(error)", "(global)", 
+    "(identifier)", "(last)", "(line)", "(loopage)", "(name)", "(onevar)", 
+    "(params)", "(scope)", "(verb)", "*", "+", "++", "-", "--", "\/", 
+    "<", "<=", "==", "===", ">", ">=", ADSAFE, ActiveXObject, 
+    Array, Boolean, COM, CScript, Canvas, CustomAnimation, Date, Debug, E, 
+    Enumerator, Error, EvalError, FadeAnimation, Flash, FormField, Frame, 
+    Function, HotKey, Image, JSON, LN10, LN2, LOG10E, LOG2E, MAX_VALUE, 
+    MIN_VALUE, Math, MenuItem, MoveAnimation, NEGATIVE_INFINITY, Number, 
+    Object, Option, PI, POSITIVE_INFINITY, Point, RangeError, Rectangle, 
+    ReferenceError, RegExp, ResizeAnimation, RotateAnimation, SQRT1_2, 
+    SQRT2, ScrollBar, String, Style, SyntaxError, System, Text, TextArea, 
+    Timer, TypeError, URIError, URL, VBArray, WScript, Web, Window, XMLDOM, 
+    XMLHttpRequest, "\\", a, abbr, acronym, addEventListener, address, 
+    adsafe, alert, aliceblue, animator, antiquewhite, appleScript, applet, 
+    apply, approved, aqua, aquamarine, area, arguments, arity, article, 
+    aside, audio, autocomplete, azure, b, background, 
+    "background-attachment", "background-color", "background-image", 
+    "background-position", "background-repeat", base, bdo, beep, beige, big, 
+    bisque, bitwise, black, blanchedalmond, block, blockquote, blue, 
+    blueviolet, blur, body, border, "border-bottom", "border-bottom-color", 
+    "border-bottom-style", "border-bottom-width", "border-collapse", 
+    "border-color", "border-left", "border-left-color", "border-left-style", 
+    "border-left-width", "border-right", "border-right-color", 
+    "border-right-style", "border-right-width", "border-spacing", 
+    "border-style", "border-top", "border-top-color", "border-top-style", 
+    "border-top-width", "border-width", bottom, br, brown, browser, 
+    burlywood, button, bytesToUIString, c, cadetblue, call, callee, caller, 
+    canvas, cap, caption, "caption-side", cases, center, charAt, charCodeAt, 
+    character, chartreuse, chocolate, chooseColor, chooseFile, chooseFolder, 
+    cite, clear, clearInterval, clearTimeout, clip, close, closeWidget, 
+    closed, closure, cm, code, col, colgroup, color, command, comment, 
+    condition, confirm, console, constructor, content, convertPathToHFS, 
+    convertPathToPlatform, coral, cornflowerblue, cornsilk, 
+    "counter-increment", "counter-reset", create, crimson, css, cursor, 
+    cyan, d, darkblue, darkcyan, darkgoldenrod, darkgray, darkgreen, 
+    darkkhaki, darkmagenta, darkolivegreen, darkorange, darkorchid, darkred, 
+    darksalmon, darkseagreen, darkslateblue, darkslategray, darkturquoise, 
+    darkviolet, data, datalist, dd, debug, decodeURI, decodeURIComponent, 
+    deeppink, deepskyblue, defaultStatus, defineClass, del, deserialize, 
+    details, devel, dfn, dialog, dimension, dimgray, dir, direction, 
+    display, div, dl, document, dodgerblue, dt, edition, else, em, embed, 
+    empty, "empty-cells", encodeURI, encodeURIComponent, entityify, eqeqeq, 
+    errors, es5, escape, eval, event, evidence, evil, ex, exception, exec, exps, 
+    fieldset, figure, filesystem, firebrick, first, float, floor, 
+    floralwhite, focus, focusWidget, font, "font-face", "font-family", 
+    "font-size", "font-size-adjust", "font-stretch", "font-style", 
+    "font-variant", "font-weight", footer, forestgreen, forin, form, 
+    fragment, frame, frames, frameset, from, fromCharCode, fuchsia, fud, 
+    funct, function, functions, g, gainsboro, gc, getComputedStyle, 
+    ghostwhite, global, globals, gold, goldenrod, gray, green, greenyellow, 
+    h1, h2, h3, h4, h5, h6, hasOwnProperty, head, header, height, help, 
+    hgroup, history, honeydew, hotpink, hr, html, i, iTunes, id, identifier, 
+    iframe, img, immed, implieds, in, include, indent, indexOf, indianred, 
+    indigo, init, input, ins, isAlpha, isApplicationRunning, isDigit, 
+    isFinite, isNaN, ivory, join, jslint, json, kbd, keygen, khaki, 
+    konfabulatorVersion, label, labelled, lang, last, lavender, 
+    lavenderblush, lawngreen, laxbreak, lbp, led, left, legend, 
+    lemonchiffon, length, "letter-spacing", li, lib, lightblue, lightcoral, 
+    lightcyan, lightgoldenrodyellow, lightgreen, lightpink, lightsalmon, 
+    lightseagreen, lightskyblue, lightslategray, lightsteelblue, 
+    lightyellow, lime, limegreen, line, "line-height", linen, link, 
+    "list-style", "list-style-image", "list-style-position", 
+    "list-style-type", load, loadClass, location, log, m, magenta, map, 
+    margin, "margin-bottom", "margin-left", "margin-right", "margin-top", 
+    mark, "marker-offset", maroon, match, "max-height", "max-width", maxerr, 
+    maxlen, md5, media, mediumaquamarine, mediumblue, mediumorchid, 
+    mediumpurple, mediumseagreen, mediumslateblue, mediumspringgreen, 
+    mediumturquoise, mediumvioletred, member, menu, message, meta, meter, 
+    midnightblue, "min-height", "min-width", mintcream, mistyrose, mm, 
+    moccasin, moveBy, moveTo, name, nav, navajowhite, navigator, navy, new, 
+    newcap, noframes, nomen, noscript, nud, object, ol, oldlace, olive, 
+    olivedrab, on, onbeforeunload, onblur, onerror, onevar, onfocus, onload, 
+    onresize, onunload, opacity, open, openURL, opener, opera, optgroup, 
+    option, orange, orangered, orchid, outer, outline, "outline-color", 
+    "outline-style", "outline-width", output, overflow, "overflow-x", 
+    "overflow-y", p, padding, "padding-bottom", "padding-left", 
+    "padding-right", "padding-top", page, "page-break-after", 
+    "page-break-before", palegoldenrod, palegreen, paleturquoise, 
+    palevioletred, papayawhip, param, parent, parseFloat, parseInt, 
+    passfail, pc, peachpuff, peru, pink, play, plum, plusplus, pop, 
+    popupMenu, position, powderblue, pre, predef, preferenceGroups, 
+    preferences, print, progress, prompt, prototype, pt, purple, push, px, 
+    q, quit, quotes, random, range, raw, reach, readFile, readUrl, reason, 
+    red, regexp, reloadWidget, removeEventListener, replace, report, 
+    reserved, resizeBy, resizeTo, resolvePath, resumeUpdates, rhino, right, 
+    rosybrown, royalblue, rp, rt, ruby, runCommand, runCommandInBg, 
+    saddlebrown, safe, salmon, samp, sandybrown, saveAs, savePreferences, 
+    screen, script, scroll, scrollBy, scrollTo, seagreen, seal, search, 
+    seashell, section, select, serialize, setInterval, setTimeout, shift, 
+    showWidgetPreferences, sienna, silver, skyblue, slateblue, slategray, 
+    sleep, slice, small, snow, sort, source, span, spawn, speak, split, 
+    springgreen, src, stack, status, steelblue, strict, strong, style, 
+    styleproperty, sub, substr, sup, supplant, suppressUpdates, sync, 
+    system, table, "table-layout", tan, tbody, td, teal, tellWidget, test, 
+    "text-align", "text-decoration", "text-indent", "text-shadow", 
+    "text-transform", textarea, tfoot, th, thead, thistle, time, title, 
+    toLowerCase, toString, toUpperCase, toint32, token, tomato, top, tr, tt, 
+    turquoise, type, u, ul, undef, unescape, "unicode-bidi", unused, 
+    unwatch, updateNow, urls, value, valueOf, var, version, 
+    "vertical-align", video, violet, visibility, watch, wheat, white, 
+    "white-space", whitesmoke, widget, width, windows, "word-spacing", 
+    "word-wrap", yahooCheckLogin, yahooLogin, yahooLogout, yellow, 
+    yellowgreen, "z-index"
 */
 
-
 // We build the application inside a function so that we produce only a single
 // global variable. The function will be invoked, its return value is the JSLINT
 // application itself.
@@ -294,6 +296,7 @@ var JSLINT = (function () {
             constructor     : true,
             'eval'          : true,
             prototype       : true,
+            stack           : true,
             unwatch         : true,
             valueOf         : true,
             watch           : true
@@ -311,6 +314,7 @@ var JSLINT = (function () {
             debug      : true, // if debugger statements should be allowed
             devel      : true, // if logging should be allowed (console, alert, etc.)
             eqeqeq     : true, // if === should be required
+            es5        : true, // if ES5 syntax should be allowed
             evil       : true, // if eval should be allowed
             forin      : true, // if for in statements must filter
             fragment   : true, // if HTML fragments should be allowed
@@ -326,7 +330,7 @@ var JSLINT = (function () {
             rhino      : true, // if the Rhino environment globals should be predefined
             undef      : true, // if variables should be declared before used
             safe       : true, // if use of some browser features should be restricted
-            sidebar    : true, // if the System object should be predefined
+            windows    : true, // if MS Windows-specigic globals should be predefined
             strict     : true, // require the "use strict"; pragma
             sub        : true, // if all forms of subscript notation are tolerated
             white      : true, // if strict whitespace rules apply
@@ -587,6 +591,9 @@ var JSLINT = (function () {
             address:  {},
             applet:   {},
             area:     {empty: true, parent: ' map '},
+            article:  {},
+            aside:    {},
+            audio:    {},
             b:        {},
             base:     {empty: true, parent: ' head '},
             bdo:      {},
@@ -602,8 +609,12 @@ var JSLINT = (function () {
             code:     {},
             col:      {empty: true, parent: ' table colgroup '},
             colgroup: {parent: ' table '},
+            command:  {parent: ' menu '},
+            datalist: {},
             dd:       {parent: ' dl '},
             del:      {},
+            details:  {},
+            dialog:   {},
             dfn:      {},
             dir:      {},
             div:      {},
@@ -612,7 +623,9 @@ var JSLINT = (function () {
             em:       {},
             embed:    {},
             fieldset: {},
+            figure:   {},
             font:     {},
+            footer:   {},
             form:     {},
             frame:    {empty: true, parent: ' frameset '},
             frameset: {parent: ' html frameset '},
@@ -623,6 +636,8 @@ var JSLINT = (function () {
             h5:       {},
             h6:       {},
             head:     {parent: ' html '},
+            header:   {},
+            hgroup:   {},
             html:     {parent: '*'},
             hr:       {empty: true},
             i:        {},
@@ -631,28 +646,39 @@ var JSLINT = (function () {
             input:    {empty: true},
             ins:      {},
             kbd:      {},
+            keygen:   {},
             label:    {},
-            legend:   {parent: ' fieldset '},
+            legend:   {parent: ' details fieldset figure '},
             li:       {parent: ' dir menu ol ul '},
             link:     {empty: true, parent: ' head '},
             map:      {},
+            mark:     {},
             menu:     {},
             meta:     {empty: true, parent: ' head noframes noscript '},
+            meter:    {},
+            nav:      {},
             noframes: {parent: ' html body '},
             noscript: {parent: ' body head noframes '},
             object:   {},
             ol:       {},
             optgroup: {parent: ' select '},
             option:   {parent: ' optgroup select '},
+            output:   {},
             p:        {},
             param:    {empty: true, parent: ' applet object '},
             pre:      {},
+            progress: {},
             q:        {},
+            rp:       {},
+            rt:       {},
+            ruby:     {},
             samp:     {},
             script:   {empty: true, parent: ' body div frame head iframe p pre span '},
+            section:  {},
             select:   {},
             small:    {},
             span:     {},
+            source:   {},
             strong:   {},
             style:    {parent: ' head ', empty: true},
             sub:      {},
@@ -664,12 +690,14 @@ var JSLINT = (function () {
             tfoot:    {parent: ' table '},
             th:       {parent: ' tr '},
             thead:    {parent: ' table '},
+            time:     {},
             title:    {parent: ' head '},
             tr:       {parent: ' table tbody thead tfoot '},
             tt:       {},
             u:        {},
             ul:       {},
-            'var':    {}
+            'var':    {},
+            video:    {}
         },
 
         ids,            // HTML ids
@@ -710,8 +738,14 @@ var JSLINT = (function () {
 
         scope,      // The current scope
 
-        sidebar = {
-            System      : false
+        windows = {
+            ActiveXObject: false,
+            CScript      : false,
+            Debug        : false,
+            Enumerator   : false,
+            System       : false,
+            VBArray      : false,
+            WScript      : false
         },
 
         src,
@@ -872,7 +906,8 @@ var JSLINT = (function () {
 // token
         tx = /^\s*([(){}\[.,:;'"~\?\]#@]|==?=?|\/(\*(jslint|members?|global)?|=|\/)?|\*[\/=]?|\+[+=]?|-[\-=]?|%=?|&[&=]?|\|[|=]?|>>?>?=?|<([\/=!]|\!(\[|--)?|<=?)?|\^=?|\!=?=?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+([xX][0-9a-fA-F]+|\.[0-9]*)?([eE][+\-]?[0-9]+)?)/,
 // html token
-        hx = /^\s*(['"=>\/&#]|<(?:\/|\!(?:--)?)?|[a-zA-Z][a-zA-Z0-9_\-]*|[0-9]+|--|.)/,
+////////        hx = /^\s*(['"=>\/&#]|<(?:\/|\!(?:--)?)?|[a-zA-Z][a-zA-Z0-9_\-]*|[0-9]+|--|.)/,
+        hx = /^\s*(['"=>\/&#]|<(?:\/|\!(?:--)?)?|[a-zA-Z][a-zA-Z0-9_\-]*|[0-9]+|--)/,
 // characters in strings that need escapement
         nx = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/,
         nxg = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
@@ -890,7 +925,7 @@ var JSLINT = (function () {
         sx = /^\s*([{:#%.=,>+\[\]@()"';]|\*=?|\$=|\|=|\^=|~=|[a-zA-Z_][a-zA-Z0-9_\-]*|[0-9]+|<\/|\/\*)/,
         ssx = /^\s*([@#!"'};:\-%.=,+\[\]()*_]|[a-zA-Z][a-zA-Z0-9._\-]*|\/\*?|\d+(?:\.\d+)?|<\/)/,
 // attributes characters
-        qx = /[^a-zA-Z0-9-_\/ ]/,
+        qx = /[^a-zA-Z0-9+\-_\/ ]/,
 // query characters for ids
         dx = /[\[\]\/\\"'*<>.&:(){}+=#]/,
 
@@ -982,11 +1017,11 @@ var JSLINT = (function () {
             if (option.devel) {
                 combine(predefined, devel);
             }
-            if (option.browser || option.sidebar) {
+            if (option.browser) {
                 combine(predefined, browser);
             }
-            if (option.sidebar) {
-                combine(predefined, sidebar);
+            if (option.windows) {
+                combine(predefined, windows);
             }
             if (option.widget) {
                 combine(predefined, widget);
@@ -1126,8 +1161,8 @@ var JSLINT = (function () {
             i = t.id;
             if (i !== '(endline)') {
                 prereg = i &&
-                        (('(,=:[!&|?{};'.indexOf(i.charAt(i.length - 1)) >= 0) ||
-                        i === 'return');
+                    (('(,=:[!&|?{};'.indexOf(i.charAt(i.length - 1)) >= 0) ||
+                    i === 'return');
             }
             return t;
         }
@@ -1332,17 +1367,32 @@ var JSLINT = (function () {
                             }
                         }
                     }
+//                     t = match(rx[xmode] || tx);
+//                     if (!t) {
+//                         if (xmode === 'html') {
+//                             return it('(error)', s.charAt(0));
+//                         } else {
+//                             t = '';
+//                             c = '';
+//                             while (s && s < '!') {
+//                                 s = s.substr(1);
+//                             }
+//                             if (s) {
+//                                 errorAt("Unexpected '{a}'.",
+//                                         line, character, s.substr(0, 1));
+//                             }
+//                         }
                     t = match(rx[xmode] || tx);
                     if (!t) {
-                        if (xmode === 'html') {
-                            return it('(error)', s.charAt(0));
-                        } else {
-                            t = '';
-                            c = '';
-                            while (s && s < '!') {
-                                s = s.substr(1);
-                            }
-                            if (s) {
+                        t = '';
+                        c = '';
+                        while (s && s < '!') {
+                            s = s.substr(1);
+                        }
+                        if (s) {
+                            if (xmode === 'html') {
+                                return it('(error)', s.charAt(0));
+                            } else {
                                 errorAt("Unexpected '{a}'.",
                                         line, character, s.substr(0, 1));
                             }
@@ -1427,7 +1477,8 @@ var JSLINT = (function () {
                                     errorAt("Unclosed comment.", line, character);
                                 } else {
                                     if (option.safe && ax.test(s)) {
-                                        warningAt("ADsafe comment violation.", line, character);
+                                        warningAt("ADsafe comment violation.",
+                                                line, character);
                                     }
                                 }
                             }
@@ -1458,6 +1509,10 @@ var JSLINT = (function () {
                             break;
     //      /
                         case '/':
+                            if (token.id === '/=') {
+                                errorAt(
+"A regular expression literal can be confused with '/='.", line, from);
+                            }
                             if (prereg) {
                                 depth = 0;
                                 captures = 0;
@@ -1468,11 +1523,13 @@ var JSLINT = (function () {
                                     l += 1;
                                     switch (c) {
                                     case '':
-                                        errorAt("Unclosed regular expression.", line, from);
+                                        errorAt("Unclosed regular expression.",
+                                                line, from);
                                         return;
                                     case '/':
                                         if (depth > 0) {
-                                            warningAt("Unescaped '{a}'.", line, from + l, '/');
+                                            warningAt("Unescaped '{a}'.",
+                                                    line, from + l, '/');
                                         }
                                         c = s.substr(0, l - 1);
                                         q = {
@@ -1486,13 +1543,20 @@ var JSLINT = (function () {
                                         }
                                         character += l;
                                         s = s.substr(l);
+                                        q = s.charAt(0);
+                                        if (q === '/' || q === '*') {
+                                            errorAt("Confusing regular expression.",
+                                                    line, from);
+                                        }
                                         return it('(regexp)', c);
                                     case '\\':
                                         c = s.charAt(l);
                                         if (c < ' ') {
-                                            warningAt("Unexpected control character in regular expression.", line, from + l);
+                                            warningAt(
+"Unexpected control character in regular expression.", line, from + l);
                                         } else if (c === '<') {
-                                            warningAt("Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
+                                            warningAt(
+"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
                                         }
                                         l += 1;
                                         break;
@@ -1508,7 +1572,8 @@ var JSLINT = (function () {
                                                 l += 1;
                                                 break;
                                             default:
-                                                warningAt("Expected '{a}' and instead saw '{b}'.", line, from + l, ':', s.charAt(l));
+                                                warningAt(
+"Expected '{a}' and instead saw '{b}'.", line, from + l, ':', s.charAt(l));
                                             }
                                         } else {
                                             captures += 1;
@@ -1519,7 +1584,8 @@ var JSLINT = (function () {
                                         break;
                                     case ')':
                                         if (depth === 0) {
-                                            warningAt("Unescaped '{a}'.", line, from + l, ')');
+                                            warningAt("Unescaped '{a}'.",
+                                                    line, from + l, ')');
                                         } else {
                                             depth -= 1;
                                         }
@@ -1531,7 +1597,8 @@ var JSLINT = (function () {
                                             q += 1;
                                         }
                                         if (q > 1) {
-                                            warningAt("Spaces are hard to count. Use {{a}}.", line, from + l, q);
+                                            warningAt(
+"Spaces are hard to count. Use {{a}}.", line, from + l, q);
                                         }
                                         break;
                                     case '[':
@@ -1539,55 +1606,64 @@ var JSLINT = (function () {
                                         if (c === '^') {
                                             l += 1;
                                             if (option.regexp) {
-                                                warningAt("Insecure '{a}'.", line, from + l, c);
+                                                warningAt("Insecure '{a}'.",
+                                                        line, from + l, c);
                                             }
                                         }
                                         q = false;
                                         if (c === ']') {
-                                            warningAt("Empty class.", line, from + l - 1);
+                                            warningAt("Empty class.", line,
+                                                    from + l - 1);
                                             q = true;
                                         }
-    klass:                              do {
+klass:                                  do {
                                             c = s.charAt(l);
                                             l += 1;
                                             switch (c) {
                                             case '[':
                                             case '^':
-                                                warningAt("Unescaped '{a}'.", line, from + l, c);
+                                                warningAt("Unescaped '{a}'.",
+                                                        line, from + l, c);
                                                 q = true;
                                                 break;
                                             case '-':
                                                 if (q) {
                                                     q = false;
                                                 } else {
-                                                    warningAt("Unescaped '{a}'.", line, from + l, '-');
+                                                    warningAt("Unescaped '{a}'.",
+                                                            line, from + l, '-');
                                                     q = true;
                                                 }
                                                 break;
                                             case ']':
                                                 if (!q) {
-                                                    warningAt("Unescaped '{a}'.", line, from + l - 1, '-');
+                                                    warningAt("Unescaped '{a}'.",
+                                                            line, from + l - 1, '-');
                                                 }
                                                 break klass;
                                             case '\\':
                                                 c = s.charAt(l);
                                                 if (c < ' ') {
-                                                    warningAt("Unexpected control character in regular expression.", line, from + l);
+                                                    warningAt(
+"Unexpected control character in regular expression.", line, from + l);
                                                 } else if (c === '<') {
-                                                    warningAt("Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
+                                                    warningAt(
+"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
                                                 }
                                                 l += 1;
                                                 q = true;
                                                 break;
                                             case '/':
-                                                warningAt("Unescaped '{a}'.", line, from + l - 1, '/');
+                                                warningAt("Unescaped '{a}'.",
+                                                        line, from + l - 1, '/');
                                                 q = true;
                                                 break;
                                             case '<':
                                                 if (xmode === 'script') {
                                                     c = s.charAt(l);
                                                     if (c === '!' || c === '/') {
-                                                        warningAt("HTML confusion in regular expression '<{a}'.", line, from + l, c);
+                                                        warningAt(
+"HTML confusion in regular expression '<{a}'.", line, from + l, c);
                                                     }
                                                 }
                                                 q = true;
@@ -1599,7 +1675,8 @@ var JSLINT = (function () {
                                         break;
                                     case '.':
                                         if (option.regexp) {
-                                            warningAt("Insecure '{a}'.", line, from + l, c);
+                                            warningAt("Insecure '{a}'.", line,
+                                                    from + l, c);
                                         }
                                         break;
                                     case ']':
@@ -1608,13 +1685,15 @@ var JSLINT = (function () {
                                     case '}':
                                     case '+':
                                     case '*':
-                                        warningAt("Unescaped '{a}'.", line, from + l, c);
+                                        warningAt("Unescaped '{a}'.", line,
+                                                from + l, c);
                                         break;
                                     case '<':
                                         if (xmode === 'script') {
                                             c = s.charAt(l);
                                             if (c === '!' || c === '/') {
-                                                warningAt("HTML confusion in regular expression '<{a}'.", line, from + l, c);
+                                                warningAt(
+"HTML confusion in regular expression '<{a}'.", line, from + l, c);
                                             }
                                         }
                                     }
@@ -1632,7 +1711,8 @@ var JSLINT = (function () {
                                             l += 1;
                                             c = s.charAt(l);
                                             if (c < '0' || c > '9') {
-                                                warningAt("Expected a number and instead saw '{a}'.", line, from + l, c);
+                                                warningAt(
+"Expected a number and instead saw '{a}'.", line, from + l, c);
                                             }
                                             l += 1;
                                             low = +c;
@@ -1663,7 +1743,8 @@ var JSLINT = (function () {
                                                 }
                                             }
                                             if (s.charAt(l) !== '}') {
-                                                warningAt("Expected '{a}' and instead saw '{b}'.", line, from + l, '}', c);
+                                                warningAt(
+"Expected '{a}' and instead saw '{b}'.", line, from + l, '}', c);
                                             } else {
                                                 l += 1;
                                             }
@@ -1671,7 +1752,8 @@ var JSLINT = (function () {
                                                 l += 1;
                                             }
                                             if (low > high) {
-                                                warningAt("'{a}' should not be greater than '{b}'.", line, from + l, low, high);
+                                                warningAt(
+"'{a}' should not be greater than '{b}'.", line, from + l, low, high);
                                             }
                                         }
                                     }
@@ -1765,7 +1847,8 @@ var JSLINT = (function () {
 
     function addlabel(t, type) {
 
-        if (option.safe && funct['(global)'] && typeof predefined[t] !== 'boolean') {
+        if (option.safe && funct['(global)'] &&
+                typeof predefined[t] !== 'boolean') {
             warning('ADsafe global: ' + t + '.', token);
         } else if (t === 'hasOwnProperty') {
             warning("'hasOwnProperty' is a really bad name.");
@@ -1941,7 +2024,8 @@ loop:   for (;;) {
                 if (nexttoken.id === '(end)') {
                     warning("Unmatched '{a}'.", t, t.id);
                 } else {
-                    warning("Expected '{a}' to match '{b}' from line {c} and instead saw '{d}'.",
+                    warning(
+"Expected '{a}' to match '{b}' from line {c} and instead saw '{d}'.",
                             nexttoken, id, t.id, t.line, nexttoken.value);
                 }
             } else if (nexttoken.type !== '(identifier)' ||
@@ -2081,7 +2165,8 @@ loop:   for (;;) {
         if (option.white && nexttoken.id !== '(end)') {
             i = indent + (bias || 0);
             if (nexttoken.from !== i) {
-                warning("Expected '{a}' to have an indentation at {b} instead at {c}.",
+                warning(
+"Expected '{a}' to have an indentation at {b} instead at {c}.",
                         nexttoken, nexttoken.value, i, nexttoken.from);
             }
         }
@@ -2190,7 +2275,8 @@ loop:   for (;;) {
 
     function reservevar(s, v) {
         return reserve(s, function () {
-            if (this.id === 'this' || this.id === 'arguments') {
+            if (this.id === 'this' || this.id === 'arguments' ||
+                    this.id === 'eval') {
                 if (strict_mode && funct['(global)']) {
                     warning("Strict violation.", this);
                 } else if (option.safe) {
@@ -2345,7 +2431,8 @@ loop:   for (;;) {
         x.led = function (left) {
             if (option.plusplus) {
                 warning("Unexpected use of '{a}'.", this, this.id);
-            } else if ((!left.identifier || left.reserved) && left.id !== '.' && left.id !== '[') {
+            } else if ((!left.identifier || left.reserved) &&
+                    left.id !== '.' && left.id !== '[') {
                 warning("Bad operand.", this);
             }
             this.left = left;
@@ -2356,12 +2443,14 @@ loop:   for (;;) {
 
 
     function optionalidentifier() {
-        if (nexttoken.reserved) {
-            warning("Expected an identifier and instead saw '{a}' (a reserved word).",
-                    nexttoken, nexttoken.id);
-        }
         if (nexttoken.identifier) {
             advance();
+            if (option.safe && banned[token.value]) {
+                warning("ADsafe violation: '{a}'.", token, token.value);
+            } else if (token.reserved && !option.es5) {
+                warning("Expected an identifier and instead saw '{a}' (a reserved word).",
+                        token, token.id);
+            } 
             return token.value;
         }
     }
@@ -2439,9 +2528,6 @@ loop:   for (;;) {
         if (!noindent) {
             indentation();
         }
-        if (nexttoken.id === 'new' && !option.newstat) {
-            warning("'new' should not be used as a statement.");
-        }
         r = parse(0, true);
 
 // Look for the final semicolon.
@@ -2451,6 +2537,8 @@ loop:   for (;;) {
                 warning(
 "Expected an assignment or function call and instead saw an expression.",
                         token);
+            } else if (r.id === '(' && r.left.id === 'new' && !option.newstat) {
+                warning("Do not use 'new' for side effects.");
             }
             if (nexttoken.id !== ';') {
                 if (!(nexttoken.id == '}' && option.lastsemic)) {
@@ -2656,9 +2744,10 @@ loop:   for (;;) {
     }
 
     function cssColor() {
-        var i, number;
+        var i, number, value;
         if (nexttoken.identifier) {
-            if (nexttoken.value === 'rgb') {
+            value = nexttoken.value;
+            if (value === 'rgb' || value === 'rgba') {
                 advance();
                 advance('(');
                 for (i = 0; i < 3; i += 1) {
@@ -2686,6 +2775,19 @@ loop:   for (;;) {
                         }
                     }
                 }
+                if (value === 'rgba') {
+                    advance(',');
+                    number = +nexttoken.value;
+                    if (nexttoken.type !== '(number)' || number < 0 || number > 1) {
+                        warning("Expected a number between 0 and 1 and instead saw '{a}'",
+                            nexttoken, number);
+                    }
+                    advance();
+                    if (nexttoken.id === '%') {
+                        warning("Unexpected '%'.");
+                        advance('%');
+                    }
+                }
                 advance(')');
                 return true;
             } else if (cssColorData[nexttoken.value] === true) {
@@ -3479,7 +3581,9 @@ loop:   for (;;) {
             if (ids[u] === true) {
                 warning("Duplicate id='{a}'.", nexttoken, v);
             }
-            if (option.adsafe) {
+            if (!/^[A-Za-z][A-Za-z0-9._:\-]*$/.test(v)) {
+                warning("Bad id: '{a}'.", nexttoken, v);
+            } else if (option.adsafe) {
                 if (adsafe_id) {
                     if (v.slice(0, adsafe_id.length) !== adsafe_id) {
                         warning("ADsafe violation: An id must have a '{a}' prefix",
@@ -3968,6 +4072,9 @@ loop:   for (;;) {
         return this;
     });
 
+
+// ECMAScript parser
+
     delim('(endline)');
     delim('(begin)');
     delim('(end)').reach = true;
@@ -4420,7 +4527,7 @@ loop:   for (;;) {
             this.first.push(parse(10));
             if (nexttoken.id === ',') {
                 comma();
-                if (nexttoken.id === ']') {
+                if (nexttoken.id === ']' && !option.es5) {
                     warning("Extra comma.", token);
                     break;
                 }
@@ -4435,10 +4542,77 @@ loop:   for (;;) {
         advance(']', this);
         return this;
     }, 160);
+    
+    
+    function property_name() {
+        var i = optionalidentifier(true);
+        if (!i) {
+            if (nexttoken.id === '(string)') {
+                i = nexttoken.value;
+                advance();
+            } else if (nexttoken.id === '(number)') {
+                i = nexttoken.value.toString();
+                advance();
+            }
+        }
+        return i;
+    }
+    
 
+    function functionparams() {
+        var i, t = nexttoken, p = [];
+        advance('(');
+        nospace();
+        if (nexttoken.id === ')') {
+            advance(')');
+            nospace(prevtoken, token);
+            return;
+        }
+        for (;;) {
+            i = identifier();
+            p.push(i);
+            addlabel(i, 'parameter');
+            if (nexttoken.id === ',') {
+                comma();
+            } else {
+                advance(')', t);
+                nospace(prevtoken, token);
+                return p;
+            }
+        }
+    }
+    
+
+    function doFunction(i) {
+        var f, s = scope;
+        scope = Object.create(s);
+        funct = {
+            '(name)'    : i || '"' + anonname + '"',
+            '(line)'    : nexttoken.line,
+            '(context)' : funct,
+            '(breakage)': 0,
+            '(loopage)' : 0,
+            '(scope)'   : scope
+        };
+        f = funct;
+        token.funct = funct;
+        functions.push(funct);
+        if (i) {
+            addlabel(i, 'function');
+        }
+        funct['(params)'] = functionparams();
+
+        block(false);
+        scope = s;
+        funct['(last)'] = token.line;
+        funct = funct['(context)'];
+        return f;
+    }
+
+    
     (function (x) {
         x.nud = function () {
-            var b, i, s, seen = {};
+            var b, f, i, j, p, seen = {}, t;
             b = token.line !== nexttoken.line;
             if (b) {
                 indent += option.indent;
@@ -4453,33 +4627,59 @@ loop:   for (;;) {
                 if (b) {
                     indentation();
                 }
-                i = optionalidentifier(true);
-                if (!i) {
-                    if (nexttoken.id === '(string)') {
-                        i = nexttoken.value;
-                        if (ix.test(i)) {
-                            s = syntax[i];
-                        }
-                        advance();
-                    } else if (nexttoken.id === '(number)') {
-                        i = nexttoken.value.toString();
-                        advance();
-                    } else {
-                        error("Expected '{a}' and instead saw '{b}'.",
-                                nexttoken, '}', nexttoken.value);
+                if (nexttoken.value === 'get' && peek().id !== ':') {
+                    advance('get');
+                    if (!option.es5) {
+                        error("get/set are ES5 features.");
+                    }
+                    i = property_name();
+                    if (!i) {
+                        error("Missing property name.");
+                    }
+                    t = nexttoken;
+                    adjacent(token, nexttoken); 
+                    f = doFunction(i);
+                    if (funct['(loopage)']) {
+                        warning("Don't make functions within a loop.", t);
+                    }
+                    p = f['(params)'];
+                    if (p) {
+                        warning("Unexpected parameter '{a}' in get {b} function.", t, p[0], i);
+                    }
+                    adjacent(token, nexttoken); 
+                    advance(',');
+                    indentation();
+                    advance('set');
+                    j = property_name();
+                    if (i !== j) {
+                        error("Expected {a} and instead saw {b}.", token, i, j);
                     }
+                    t = nexttoken;
+                    adjacent(token, nexttoken); 
+                    f = doFunction(i);
+                    p = f['(params)'];
+                    if (!p || p.length !== 1 || p[0] !== 'value') {
+                        warning("Expected (value) in set {a} function.", t, i);
+                    }
+                } else {
+                    i = property_name();
+                    if (typeof i !== 'string') {
+                        break;
+                    }
+                    advance(':');
+                    nonadjacent(token, nexttoken);
+                    parse(10);
                 }
                 if (seen[i] === true) {
                     warning("Duplicate member '{a}'.", nexttoken, i);
                 }
                 seen[i] = true;
                 countMember(i);
-                advance(':');
-                nonadjacent(token, nexttoken);
-                parse(10);
                 if (nexttoken.id === ',') {
                     comma();
-                    if (nexttoken.id === ',' || nexttoken.id === '}') {
+                    if (nexttoken.id === ',') {
+                        warning("Extra comma.", token);
+                    } else if (nexttoken.id === '}' && !option.es5) {
                         warning("Extra comma.", token);
                     }
                 } else {
@@ -4528,6 +4728,9 @@ loop:   for (;;) {
                 nonadjacent(token, nexttoken);
                 advance('=');
                 nonadjacent(token, nexttoken);
+                if (nexttoken.id === 'undefined') {
+                    warning("It is not necessary to initialize '{a}' to 'undefined'.", token, id);
+                }
                 if (peek(0).id === '=' && nexttoken.identifier) {
                     error("Variable {a} was not declared correctly.",
                             nexttoken, nexttoken.value);
@@ -4547,54 +4750,6 @@ loop:   for (;;) {
     stmt('var', varstatement).exps = true;
 
 
-    function functionparams() {
-        var i, t = nexttoken, p = [];
-        advance('(');
-        nospace();
-        if (nexttoken.id === ')') {
-            advance(')');
-            nospace(prevtoken, token);
-            return;
-        }
-        for (;;) {
-            i = identifier();
-            p.push(i);
-            addlabel(i, 'parameter');
-            if (nexttoken.id === ',') {
-                comma();
-            } else {
-                advance(')', t);
-                nospace(prevtoken, token);
-                return p;
-            }
-        }
-    }
-
-    function doFunction(i) {
-        var s = scope;
-        scope = Object.create(s);
-        funct = {
-            '(name)'    : i || '"' + anonname + '"',
-            '(line)'    : nexttoken.line,
-            '(context)' : funct,
-            '(breakage)': 0,
-            '(loopage)' : 0,
-            '(scope)'   : scope
-        };
-        token.funct = funct;
-        functions.push(funct);
-        if (i) {
-            addlabel(i, 'function');
-        }
-        funct['(params)'] = functionparams();
-
-        block(false);
-        scope = s;
-        funct['(last)'] = token.line;
-        funct = funct['(context)'];
-    }
-
-
     blockstmt('function', function () {
         if (inblock) {
             warning(
@@ -4620,8 +4775,8 @@ loop:   for (;;) {
             nonadjacent(token, nexttoken);
         }
         doFunction(i);
-        if (funct['(loopage)'] && nexttoken.id !== '(') {
-            warning("Be careful when making functions within a loop. Consider putting the function in a closure.");
+        if (funct['(loopage)']) {
+            warning("Don't make functions within a loop.");
         }
         return this;
     });
@@ -4957,6 +5112,8 @@ loop:   for (;;) {
                 this.first = nexttoken;
                 advance();
             }
+        } else if (!funct['(loopage)']) {
+            warning("Unexpected '{a}'.", nexttoken, this.value);
         }
         reachable('continue');
         return this;
@@ -5007,6 +5164,9 @@ loop:   for (;;) {
     reserve('public');
     reserve('static');
 
+
+// Parse JSON
+
     function jsonValue() {
 
         function jsonObject() {
@@ -5127,7 +5287,7 @@ loop:   for (;;) {
                 o.on      = false;
                 o.rhino   = false;
                 o.safe    = true;
-                o.sidebar = false;
+                o.windows = false;
                 o.strict  = true;
                 o.sub     = false;
                 o.undef   = true;
@@ -5262,6 +5422,7 @@ loop:   for (;;) {
         return a;
     }
 
+
 // Data summary.
 
     itself.data = function () {
@@ -5350,10 +5511,19 @@ loop:   for (;;) {
 
         var a = [], c, e, err, f, i, k, l, m = '', n, o = [], s;
 
-        function detail(h, s) {
-            if (s) {
-                o.push('<div><i>' + h + '</i> ' +
-                        s.sort().join(', ') + '</div>');
+        function detail(h, array) {
+            var b, i, singularity;
+            if (array) {
+                o.push('<div><i>' + h + '</i> ');
+                array = array.sort();
+                for (i = 0; i < array.length; i += 1) {
+                    if (array[i] !== singularity) {
+                        singularity = array[i];
+                        o.push((b ? ', ' : '') + singularity);
+                        b = true;
+                    }
+                }
+                o.push('</div>');
             }
         }
 
@@ -5408,7 +5578,9 @@ loop:   for (;;) {
                 detail("URLs<br>", data.urls, '<br>');
             }
 
-            if (data.json && !err) {
+            if (xmode === 'style') {
+                o.push('<p>CSS.</p>');
+            } else if (data.json && !err) {
                 o.push('<p>JSON: good.</p>');
             } else if (data.globals) {
                 o.push('<div><i>Global</i> ' +
@@ -5464,7 +5636,7 @@ loop:   for (;;) {
     };
     itself.jslint = itself;
 
-    itself.edition = '2009-11-22';
+    itself.edition = '2010-04-06';
 
     return itself;