From 517fe203e7d5eb65843dc8e7227b3253aa3c8f12 Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Wed, 11 Dec 2013 21:37:51 -0500 Subject: [PATCH] Remove legacy feature checks and server sent events --- docs/files.html | 2 +- docs/index.html | 2 +- docs/symbols/$_.dom.html | 2 +- docs/symbols/$_.event.html | 2 +- docs/symbols/$_.html | 2 +- docs/symbols/$_.store.html | 2 +- docs/symbols/$_.util.html | 2 +- docs/symbols/_global_.html | 2 +- docs/symbols/src/kis-js_src_core.js.html | 339 +- .../src/kis-js_src_modules_DOM.js.html | 2 +- .../src/kis-js_src_modules_ajax.js.html | 251 +- .../src/kis-js_src_modules_event.js.html | 276 +- .../src/kis-js_src_modules_store.js.html | 224 +- kis-all.js | 131 +- kis-lite-dom-min.js | 29 +- kis-lite-dom.js | 126 +- kis-lite-min.js | 13 +- kis-lite.js | 124 +- kis-min.js | 32 +- src/core.js | 80 +- src/modules/DOM.js | 2 +- src/modules/ajax.js | 40 +- src/modules/event.js | 6 - src/modules/store.js | 6 - tests/blanket.js | 5430 +++++++++++++++++ tests/index.html | 29 +- tests/qunit/qunit.css | 7 +- tests/qunit/qunit.js | 480 +- tests/tests/core.js | 20 +- tests/tests/event.js | 16 +- 30 files changed, 6341 insertions(+), 1338 deletions(-) create mode 100644 tests/blanket.js diff --git a/docs/files.html b/docs/files.html index abfd7f0..f33872d 100755 --- a/docs/files.html +++ b/docs/files.html @@ -1 +1 @@ -JsDoc Reference - File Index
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
sse(string, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs

File Index

core.js../kis-js/src/modules/event.js
ajax.js../kis-js/src/modules/event.js
DOM.js../kis-js/src/modules/event.js
event.js../kis-js/src/modules/event.js
store.js../kis-js/src/modules/event.js
util.js../kis-js/src/modules/event.js
\ No newline at end of file +JsDoc Reference - File Index
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs

File Index

core.js../kis-js/src/modules/event.js
ajax.js../kis-js/src/modules/event.js
DOM.js../kis-js/src/modules/event.js
event.js../kis-js/src/modules/event.js
store.js../kis-js/src/modules/event.js
util.js../kis-js/src/modules/event.js
\ No newline at end of file diff --git a/docs/index.html b/docs/index.html index 7b8b50b..c60c2bc 100755 --- a/docs/index.html +++ b/docs/index.html @@ -1 +1 @@ -JsDoc Reference - Index
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
sse(string, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs

Class Index

_global_

Global namespace.

\ No newline at end of file +JsDoc Reference - Index
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs

Class Index

_global_

Global namespace.

\ No newline at end of file diff --git a/docs/symbols/$_.dom.html b/docs/symbols/$_.dom.html index 46840f8..43d0537 100755 --- a/docs/symbols/$_.dom.html +++ b/docs/symbols/$_.dom.html @@ -1 +1 @@ -JsDoc Reference - $_.dom
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
sse(string, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs

Module $_.dom

Defined in: DOM.js.

Method Summary
addClass(string)Adds a class to the element(s) specified by the current selector
removeClass(string)Removes a class from the element(s) specified by the current selector
hide()Hides the element(s) specified by the current selector
show(string)Shows the element(s) specified by the current selector.
attr(string, string)Sets attributes on element(s) specified by the current selector, or, if name is not specified, returns the value of the attribute of the element specified by the current selector.
text(string)Sets or retrieves the text content of the element specified by the current selector.
css(string, string)Sets or retrieves a css property of the element specified by the current selector.
append(string)Adds to the innerHTML of the current element, after the last child.
prepend(string)Adds to the innerHTML of the selected element, before the current children
html(string)Sets or gets the innerHTML propery of the element(s) passed
Method Detail
$_.dom.addClass(string)
Adds a class to the element(s) specified by the current selector 
Parameters:
string class 
 $_.dom.removeClass(string)
 Removes a class from the element(s) specified by the current selector 
Parameters:
string class 
 $_.dom.hide()
 Hides the element(s) specified by the current selector 
 $_.dom.show(string)
 Shows the element(s) specified by the current selector. if type is specified, the element will have it's style property set to "display:[your type]". If type is not specified, the element is set to "display:block". 
Parameters:
string?, Default:  type 
 $_.dom.attr(string, string): string
 Sets attributes on element(s) specified by the current selector, or, if name is not specified, returns the value of the attribute of the element specified by the current selector. 
Parameters:
string name 
string?, Default:  value 
Returns:
 string 
 $_.dom.text(string): string
 Sets or retrieves the text content of the element specified by the current selector. If a value is passed, it will set that value on the current element, otherwise it will return the value of the current element 
Parameters:
string?, Default:  value 
Returns:
 string 
 $_.dom.css(string, string): string
 Sets or retrieves a css property of the element specified by the current selector. If a value is passed, it will set that value on the current element, otherwise it will return the value of the css property on the current element 
Parameters:
string property 
string?, Default:  value 
Returns:
 string 
 $_.dom.append(string)
 Adds to the innerHTML of the current element, after the last child. 
$_("ul").dom.append("<li></li>") adds an li element to the end of the selected ul element
Parameters:
string htm 
 $_.dom.prepend(string)
 Adds to the innerHTML of the selected element, before the current children 
Parameters:
string htm 
 $_.dom.html(string): string
 Sets or gets the innerHTML propery of the element(s) passed 
Parameters:
string?, Default:  htm 
Returns:
 string 
 
\ No newline at end of file
+JsDoc Reference - $_.dom
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs
 Module $_.dom 
Defined in: DOM.js.
Method Summary
addClass(string)Adds a class to the element(s) specified by the current selector
removeClass(string)Removes a class from the element(s) specified by the current selector
hide()Hides the element(s) specified by the current selector
show(string)Shows the element(s) specified by the current selector.
attr(string, string)Sets attributes on element(s) specified by the current selector, or, if name is not specified, returns the value of the attribute of the element specified by the current selector.
text(string)Sets or retrieves the text content of the element specified by the current selector.
css(string, string)Sets or retrieves a css property of the element specified by the current selector.
append(string)Adds to the innerHTML of the current element, after the last child.
prepend(string)Adds to the innerHTML of the selected element, before the current children
html(string)Sets or gets the innerHTML propery of the element(s) passed
 Method Detail 
 $_.dom.addClass(string)
 Adds a class to the element(s) specified by the current selector 
Parameters:
string class 
 $_.dom.removeClass(string)
 Removes a class from the element(s) specified by the current selector 
Parameters:
string class 
 $_.dom.hide()
 Hides the element(s) specified by the current selector 
 $_.dom.show(string)
 Shows the element(s) specified by the current selector. if type is specified, the element will have it's style property set to "display:[your type]". If type is not specified, the element is set to "display:block". 
Parameters:
string?, Default:  type 
 $_.dom.attr(string, string): string
 Sets attributes on element(s) specified by the current selector, or, if name is not specified, returns the value of the attribute of the element specified by the current selector. 
Parameters:
string name 
string?, Default:  value 
Returns:
 string 
 $_.dom.text(string): string
 Sets or retrieves the text content of the element specified by the current selector. If a value is passed, it will set that value on the current element, otherwise it will return the value of the current element 
Parameters:
string?, Default:  value 
Returns:
 string 
 $_.dom.css(string, string): string
 Sets or retrieves a css property of the element specified by the current selector. If a value is passed, it will set that value on the current element, otherwise it will return the value of the css property on the current element 
Parameters:
string property 
string?, Default:  value 
Returns:
 string 
 $_.dom.append(string)
 Adds to the innerHTML of the current element, after the last child. 
$_("ul").dom.append("<li></li>") adds an li element to the end of the selected ul element
Parameters:
string htm 
 $_.dom.prepend(string)
 Adds to the innerHTML of the selected element, before the current children 
Parameters:
string htm 
 $_.dom.html(string): string
 Sets or gets the innerHTML propery of the element(s) passed 
Parameters:
string?, Default:  htm 
Returns:
 string 
 
\ No newline at end of file
diff --git a/docs/symbols/$_.event.html b/docs/symbols/$_.event.html
index ccb8074..4f7aa5f 100755
--- a/docs/symbols/$_.event.html
+++ b/docs/symbols/$_.event.html
@@ -1 +1 @@
-JsDoc Reference - $_.event
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
sse(string, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs
 Module $_.event 
Defined in: event.js.
Method Summary
add(string, function)Adds an event that returns a callback when triggered on the selected event and selector
remove(string, string)Removes an event bound the the specified selector, event type, and callback
live(string, string, function)Binds a persistent event to the document
delegate(string, string, function)Binds an event to a parent object
 Method Detail 
 $_.event.add(string, function)
 Adds an event that returns a callback when triggered on the selected event and selector 
Eg. $_("#selector").event.add("click", do_something());
Parameters:
string event 
function callback 
 $_.event.remove(string, string)
 Removes an event bound the the specified selector, event type, and callback 
Eg. $_("#selector").event.remove("click", do_something());
Parameters:
string event 
string callback 
 $_.event.live(string, string, function)
 Binds a persistent event to the document 
Eg. $_.event.live(".button", "click", do_something());
Parameters:
string target 
string event 
function callback 
 $_.event.delegate(string, string, function)
 Binds an event to a parent object 
Eg. $_("#parent").delegate(".button", "click", do_something());
Parameters:
string target 
string event_type 
function callback 
 
\ No newline at end of file
+JsDoc Reference - $_.event
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs
 Module $_.event 
Defined in: event.js.
Method Summary
add(string, function)Adds an event that returns a callback when triggered on the selected event and selector
remove(string, string)Removes an event bound the the specified selector, event type, and callback
live(string, string, function)Binds a persistent event to the document
delegate(string, string, function)Binds an event to a parent object
 Method Detail 
 $_.event.add(string, function)
 Adds an event that returns a callback when triggered on the selected event and selector 
Eg. $_("#selector").event.add("click", do_something());
Parameters:
string event 
function callback 
 $_.event.remove(string, string)
 Removes an event bound the the specified selector, event type, and callback 
Eg. $_("#selector").event.remove("click", do_something());
Parameters:
string event 
string callback 
 $_.event.live(string, string, function)
 Binds a persistent event to the document 
Eg. $_.event.live(".button", "click", do_something());
Parameters:
string target 
string event 
function callback 
 $_.event.delegate(string, string, function)
 Binds an event to a parent object 
Eg. $_("#parent").delegate(".button", "click", do_something());
Parameters:
string target 
string event_type 
function callback 
 
\ No newline at end of file
diff --git a/docs/symbols/$_.html b/docs/symbols/$_.html
index e051670..c466a45 100755
--- a/docs/symbols/$_.html
+++ b/docs/symbols/$_.html
@@ -1 +1 @@
-JsDoc Reference - $_
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
sse(string, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs
 Module $_ 
Defined in: core.js.
Field Summary
domDOM Dom manipulation module
storeWrapper for localstorage / sessionstorage data serialization.
utilString and object manipulation utilities
eventEvent Listener module
Method Summary
$(string, object)Simple DOM selector function
ext(string, object)Adds the property `obj` to the $_ object, calling it `name`
each(function)Iterates over a $_ object, applying a callback to each item
type(mixed)Retrieves the type of the passed variable
get(string, object, function, function)Sends a GET type ajax request
post(string, object, function, function)Sends a POST type ajax request
sse(string, function)Watches for server-sent events and applies a callback on message
 Field Detail 
 $_.dom
 DOM Dom manipulation module 
Defined in: DOM.js.
 $_.store
 Wrapper for localstorage / sessionstorage data serialization. Each method has a boolean parameter, that when set as true switches the method to use sessionStorage rather than the default localStorage. 
Defined in: store.js.
 $_.util
 String and object manipulation utilities 
Defined in: util.js.
 $_.event
 Event Listener module 
Defined in: event.js.
 Method Detail 
 $_.$(string, object): object
 Simple DOM selector function 
Parameters:
string selector 
object context 
Returns:
 object 
 $_.ext(string, object)
 Adds the property `obj` to the $_ object, calling it `name` 
Parameters:
string name 
object obj 
 $_.each(function)
 Iterates over a $_ object, applying a callback to each item 
Parameters:
function callback 
 $_.type(mixed): string
 Retrieves the type of the passed variable 
Parameters:
mixed obj 
Returns:
 string 
 $_.get(string, object, function, function)
 Sends a GET type ajax request 
Defined in: ajax.js.
Parameters:
string url 
object data 
function success_callback 
function error_callback 
 $_.post(string, object, function, function)
 Sends a POST type ajax request 
Defined in: ajax.js.
Parameters:
string url 
object data 
function success_callback 
function error_callback 
 $_.sse(string, function)
 Watches for server-sent events and applies a callback on message 
Defined in: ajax.js.
Parameters:
string url 
function callback 
 
\ No newline at end of file
+JsDoc Reference - $_
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs
 Module $_ 
Defined in: core.js.
Field Summary
domDOM Dom manipulation module
storeWrapper for localstorage / sessionstorage data serialization.
utilString and object manipulation utilities
eventEvent Listener module
Method Summary
$(string, object)Simple DOM selector function
ext(string, object)Adds the property `obj` to the $_ object, calling it `name`
each(function)Iterates over a $_ object, applying a callback to each item
type(mixed)Retrieves the type of the passed variable
get(string, object, function, function)Sends a GET type ajax request
post(string, object, function, function)Sends a POST type ajax request
 Field Detail 
 $_.dom
 DOM Dom manipulation module 
Defined in: DOM.js.
 $_.store
 Wrapper for localstorage / sessionstorage data serialization. Each method has a boolean parameter, that when set as true switches the method to use sessionStorage rather than the default localStorage. 
Defined in: store.js.
 $_.util
 String and object manipulation utilities 
Defined in: util.js.
 $_.event
 Event Listener module 
Defined in: event.js.
 Method Detail 
 $_.$(string, object): object
 Simple DOM selector function 
Parameters:
string selector 
object context 
Returns:
 object 
 $_.ext(string, object)
 Adds the property `obj` to the $_ object, calling it `name` 
Parameters:
string name 
object obj 
 $_.each(function)
 Iterates over a $_ object, applying a callback to each item 
Parameters:
function callback 
 $_.type(mixed): string
 Retrieves the type of the passed variable 
Parameters:
mixed obj 
Returns:
 string 
 $_.get(string, object, function, function)
 Sends a GET type ajax request 
Defined in: ajax.js.
Parameters:
string url 
object data 
function success_callback 
function error_callback 
 $_.post(string, object, function, function)
 Sends a POST type ajax request 
Defined in: ajax.js.
Parameters:
string url 
object data 
function success_callback 
function error_callback 
 
\ No newline at end of file
diff --git a/docs/symbols/$_.store.html b/docs/symbols/$_.store.html
index 1bddaed..2ded851 100755
--- a/docs/symbols/$_.store.html
+++ b/docs/symbols/$_.store.html
@@ -1 +1 @@
-JsDoc Reference - $_.store
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
sse(string, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs
 Module $_.store 
Defined in: store.js.
Method Summary
get(string, bool)Retrieves and deserializes a value from localstorage, based on the specified key
set(string, mixed, bool)Puts a value into localstorage at the specified key, and JSON-encodes the value if not a string
remove(string, bool)Removes the specified item from storage
getAll(bool)Returns an object of all the raw values in storage
clear(bool)Removes all values from the same domain storage
 Method Detail 
 $_.store.get(string, bool): object
 Retrieves and deserializes a value from localstorage, based on the specified key 
Parameters:
string key 
bool session 
Returns:
 object 
 $_.store.set(string, mixed, bool)
 Puts a value into localstorage at the specified key, and JSON-encodes the value if not a string 
Parameters:
string key 
mixed value 
bool session 
 $_.store.remove(string, bool)
 Removes the specified item from storage 
Parameters:
string key 
bool session 
 $_.store.getAll(bool): object
 Returns an object of all the raw values in storage 
Parameters:
bool session 
Returns:
 object 
 $_.store.clear(bool)
 Removes all values from the same domain storage 
Parameters:
bool session 
 
\ No newline at end of file
+JsDoc Reference - $_.store
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs
 Module $_.store 
Defined in: store.js.
Method Summary
get(string, bool)Retrieves and deserializes a value from localstorage, based on the specified key
set(string, mixed, bool)Puts a value into localstorage at the specified key, and JSON-encodes the value if not a string
remove(string, bool)Removes the specified item from storage
getAll(bool)Returns an object of all the raw values in storage
clear(bool)Removes all values from the same domain storage
 Method Detail 
 $_.store.get(string, bool): object
 Retrieves and deserializes a value from localstorage, based on the specified key 
Parameters:
string key 
bool session 
Returns:
 object 
 $_.store.set(string, mixed, bool)
 Puts a value into localstorage at the specified key, and JSON-encodes the value if not a string 
Parameters:
string key 
mixed value 
bool session 
 $_.store.remove(string, bool)
 Removes the specified item from storage 
Parameters:
string key 
bool session 
 $_.store.getAll(bool): object
 Returns an object of all the raw values in storage 
Parameters:
bool session 
Returns:
 object 
 $_.store.clear(bool)
 Removes all values from the same domain storage 
Parameters:
bool session 
 
\ No newline at end of file
diff --git a/docs/symbols/$_.util.html b/docs/symbols/$_.util.html
index a50b346..3d9252a 100755
--- a/docs/symbols/$_.util.html
+++ b/docs/symbols/$_.util.html
@@ -1 +1 @@
-JsDoc Reference - $_.util
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
sse(string, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs
 Module $_.util 
Defined in: util.js.
Method Summary
object_keys(object)Retrieve the keys, or member names of an object
object_values(object)Retrieves the values of an object, and returns them as an array
array_combine(array/object, array/object)Creates an object, with the property names of the first array, and the values of the second.
object_merge(object)Combines two or more objects/arrays.
str_trans(string, mixed, string)Replaces sections of strings in a greedy fashion, starting with the longest replace pairs first.
 Method Detail 
 $_.util.object_keys(object): array
 Retrieve the keys, or member names of an object 
Parameters:
object
Returns:
 array 
 $_.util.object_values(object): array
 Retrieves the values of an object, and returns them as an array 
Parameters:
object
Returns:
 array 
 $_.util.array_combine(array/object, array/object): object
 Creates an object, with the property names of the first array, and the values of the second. If objects are passed, the values of the object are used. If the arrays or objects passed are not the same size, the function will return false. 
Parameters:
array/object keys 
array/object vals 
Returns:
 object 
 $_.util.object_merge(object): object
 Combines two or more objects/arrays. If the keys are numeric, the outputted object will have re-indexed keys. If a key/value pair exists in both objects, indentical values will be droped, but if a key exists with a different value, with the same key, the value in the second array will replace the value in the first 
Parameters:
object [as many as you wish to combine] 
Returns:
 object 
 $_.util.str_trans(string, mixed, string): string
 Replaces sections of strings in a greedy fashion, starting with the longest replace pairs first. Accepts one replace pair as two parameters, or an object, with from => to replacements as key/value pairs 
Parameters:
string input_string 
mixed from (string)/replace pairs (object) 
string?, Default: 
Returns:
 string 
 
\ No newline at end of file
+JsDoc Reference - $_.util
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs
 Module $_.util 
Defined in: util.js.
Method Summary
object_keys(object)Retrieve the keys, or member names of an object
object_values(object)Retrieves the values of an object, and returns them as an array
array_combine(array/object, array/object)Creates an object, with the property names of the first array, and the values of the second.
object_merge(object)Combines two or more objects/arrays.
str_trans(string, mixed, string)Replaces sections of strings in a greedy fashion, starting with the longest replace pairs first.
 Method Detail 
 $_.util.object_keys(object): array
 Retrieve the keys, or member names of an object 
Parameters:
object
Returns:
 array 
 $_.util.object_values(object): array
 Retrieves the values of an object, and returns them as an array 
Parameters:
object
Returns:
 array 
 $_.util.array_combine(array/object, array/object): object
 Creates an object, with the property names of the first array, and the values of the second. If objects are passed, the values of the object are used. If the arrays or objects passed are not the same size, the function will return false. 
Parameters:
array/object keys 
array/object vals 
Returns:
 object 
 $_.util.object_merge(object): object
 Combines two or more objects/arrays. If the keys are numeric, the outputted object will have re-indexed keys. If a key/value pair exists in both objects, indentical values will be droped, but if a key exists with a different value, with the same key, the value in the second array will replace the value in the first 
Parameters:
object [as many as you wish to combine] 
Returns:
 object 
 $_.util.str_trans(string, mixed, string): string
 Replaces sections of strings in a greedy fashion, starting with the longest replace pairs first. Accepts one replace pair as two parameters, or an object, with from => to replacements as key/value pairs 
Parameters:
string input_string 
mixed from (string)/replace pairs (object) 
string?, Default: 
Returns:
 string 
 
\ No newline at end of file
diff --git a/docs/symbols/_global_.html b/docs/symbols/_global_.html
index e15eb16..25a4d62 100755
--- a/docs/symbols/_global_.html
+++ b/docs/symbols/_global_.html
@@ -1 +1 @@
-JsDoc Reference - _global_
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
sse(string, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs
 Built-In Module _global_ 
 
\ No newline at end of file
+JsDoc Reference - _global_
 
Project Outline
 
$_
dom
store
util
event
$(string, object)
ext(string, object)
each(function)
type(mixed)
get(string, object, function, function)
post(string, object, function, function)
 
$_.dom
addClass(string)
removeClass(string)
hide()
show(string)
attr(string, string)
text(string)
css(string, string)
append(string)
prepend(string)
html(string)
 
$_.event
add(string, function)
remove(string, string)
live(string, string, function)
delegate(string, string, function)
 
$_.store
get(string, bool)
set(string, mixed, bool)
remove(string, bool)
getAll(bool)
clear(bool)
 
$_.util
object_keys(object)
object_values(object)
array_combine(array/object, array/object)
object_merge(object)
str_trans(string, mixed, string)
 
_global_
«
Kis JS Docs
 Built-In Module _global_ 
 
\ No newline at end of file
diff --git a/docs/symbols/src/kis-js_src_core.js.html b/docs/symbols/src/kis-js_src_core.js.html
index 9d5ff98..6fd16e3 100755
--- a/docs/symbols/src/kis-js_src_core.js.html
+++ b/docs/symbols/src/kis-js_src_core.js.html
@@ -15,211 +15,140 @@
   8 
   9 	"use strict";
  10 
- 11 	// Most functions rely on a string selector
- 12 	// which returns html elements. This requires
- 13 	// document.querySelectorAll or a custom
- 14 	// selector engine. I choose to just use the
- 15 	// browser feature, since it is present in
- 16 	// IE 8+, and all other major browsers
- 17 	if (document.querySelector === undefined)
- 18 	{
- 19 		return;
- 20 	}
- 21 
- 22 	var $_, $, dcopy, sel;
- 23 
- 24 
- 25 	/**
- 26 	 * $_
- 27 	 *
- 28 	 * Constructor function
- 29 	 *
- 30 	 * @constuctor
- 31 	 * @namespace
- 32 	 * @param string selector
- 33 	 * @return object
- 34 	 */
- 35 	$_ = function(s)
- 36 	{
- 37 		// Have documentElement be default selector, just in case
- 38 		if (s === undefined)
- 39 		{
- 40 			// Defines a "global" selector for that instance
- 41 			sel = ($_.el !== undefined)
- 42 				? $_.el
- 43 				: document.documentElement;
- 44 		}
- 45 		else
- 46 		{
- 47 			sel = $(s);
- 48 		}
- 49 
- 50 		// Add the selector to the prototype
- 51 		$_.prototype.el = sel;
- 52 
- 53 		// Use the $_ object as it's own prototype
- 54 		var self = dcopy($_);
+ 11 	var $_, $, sel;
+ 12 
+ 13 
+ 14 	/**
+ 15 	 * $_
+ 16 	 *
+ 17 	 * Constructor function
+ 18 	 *
+ 19 	 * @constuctor
+ 20 	 * @namespace
+ 21 	 * @param string selector
+ 22 	 * @return object
+ 23 	 */
+ 24 	$_ = function(s)
+ 25 	{
+ 26 		// Have documentElement be default selector, just in case
+ 27 		if (s === undefined)
+ 28 		{
+ 29 			// Defines a "global" selector for that instance
+ 30 			sel = ($_.el !== undefined)
+ 31 				? $_.el
+ 32 				: document.documentElement;
+ 33 		}
+ 34 		else
+ 35 		{
+ 36 			sel = $(s);
+ 37 		}
+ 38 
+ 39 		// Add the selector to the prototype
+ 40 		$_.prototype.el = sel;
+ 41 
+ 42 		// Use the $_ object as it's own prototype
+ 43 		var self = Object.create($_);
+ 44 
+ 45 		// Give sel to each extension.
+ 46 		for(var i in self)
+ 47 		{
+ 48 			if(typeof self[i] === "object")
+ 49 			{
+ 50 				self[i].el = sel;
+ 51 			}
+ 52 		}
+ 53 
+ 54 		self.el = sel;
  55 
- 56 		// Give sel to each extension.
- 57 		for(var i in self)
- 58 		{
- 59 			if(typeof self[i] === "object")
- 60 			{
- 61 				self[i].el = sel;
- 62 			}
- 63 		}
- 64 
- 65 		self.el = sel;
- 66 
- 67 		return self;
- 68 	};
- 69 
- 70 	/**
- 71 	 * Simple DOM selector function
- 72 	 *
- 73 	 * @memberOf $_
- 74 	 * @param string selector
- 75 	 * @param object context
- 76 	 * @return object
- 77 	 * @type object
- 78 	 */
- 79 	$ = function (a, context)
- 80 	{
- 81 		var x, c;
- 82 
- 83 		if (typeof a != "string" || a === undefined){ return a;}
- 84 
- 85 		//Check for a context of a specific element, otherwise, just run on the document
- 86 		c  = (context != null && context.nodeType === 1)
- 87 			? context
- 88 			: document;
- 89 
- 90 		//Pick the quickest method for each kind of selector
- 91 		if (a.match(/^#([\w\-]+$)/))
- 92 		{
- 93 			return document.getElementById(a.split('#')[1]);
- 94 		}
- 95 		else
- 96 		{
- 97 			x = c.querySelectorAll(a);
- 98 		}
- 99 
-100 		//Return the single object if applicable
-101 		return (x.length === 1) ? x[0] : x;
-102 	};
-103 
-104 	/**
-105 	 * Deep copy/prototypical constructor function
-106 	 *
-107 	 * @param object obj
-108 	 * @private
-109 	 * @return object
-110 	 * @type object
+ 56 		return self;
+ 57 	};
+ 58 
+ 59 	/**
+ 60 	 * Simple DOM selector function
+ 61 	 *
+ 62 	 * @memberOf $_
+ 63 	 * @param string selector
+ 64 	 * @param object context
+ 65 	 * @return object
+ 66 	 * @type object
+ 67 	 */
+ 68 	$ = function (a, context)
+ 69 	{
+ 70 		var x, c;
+ 71 
+ 72 		if (typeof a != "string" || a === undefined){ return a;}
+ 73 
+ 74 		//Check for a context of a specific element, otherwise, just run on the document
+ 75 		c  = (context != null && context.nodeType === 1)
+ 76 			? context
+ 77 			: document;
+ 78 
+ 79 		//Pick the quickest method for each kind of selector
+ 80 		if (a.match(/^#([\w\-]+$)/))
+ 81 		{
+ 82 			return document.getElementById(a.split('#')[1]);
+ 83 		}
+ 84 		else
+ 85 		{
+ 86 			x = c.querySelectorAll(a);
+ 87 		}
+ 88 
+ 89 		//Return the single object if applicable
+ 90 		return (x.length === 1) ? x[0] : x;
+ 91 	};
+ 92 
+ 93 	/**
+ 94 	 * Adds the property `obj` to the $_ object, calling it `name`
+ 95 	 *
+ 96 	 * @param string name
+ 97 	 * @param object obj
+ 98 	 */
+ 99 	$_.ext = function(name, obj)
+100 	{
+101 		obj.el = sel;
+102 		$_[name] = obj;
+103 	};
+104 
+105 	/**
+106 	 * Iterates over a $_ object, applying a callback to each item
+107 	 *
+108 	 * @name $_.each
+109 	 * @function
+110 	 * @param function callback
 111 	 */
-112 	dcopy = function(obj)
+112 	$_.ext('each', function (callback)
 113 	{
-114 		var type, F;
-115 
-116 		if(obj === undefined)
-117 		{
-118 			return;
-119 		}
-120 
-121 		if(Object.create !== undefined)
-122 		{
-123 			return Object.create(obj);
-124 		}
-125 
-126 		type = typeof obj;
-127 
-128 		if(type !== "object" && type !== "function")
-129 		{
-130 			return;
-131 		}
-132 
-133 		/**
-134 		 * @private
-135 		 */
-136 		F = function(){};
-137 
-138 		F.prototype = obj;
-139 
-140 		return new F();
-141 
-142 	};
-143 
-144 	/**
-145 	 * Adds the property `obj` to the $_ object, calling it `name`
-146 	 *
-147 	 * @param string name
-148 	 * @param object obj
-149 	 */
-150 	$_.ext = function(name, obj)
-151 	{
-152 		obj.el = sel;
-153 		$_[name] = obj;
-154 	};
-155 
-156 	/**
-157 	 * Iterates over a $_ object, applying a callback to each item
-158 	 *
-159 	 * @name $_.each
-160 	 * @function
-161 	 * @param function callback
-162 	 */
-163 	$_.ext('each', function (callback)
-164 	{
-165 		if(sel.length !== undefined && sel !== window)
-166 		{
-167 			// Use the native method, if it exists
-168 			if(Array.prototype.forEach !== undefined)
-169 			{
-170 				[].forEach.call(sel, callback);
-171 				return;
-172 			}
-173 
-174 			// Otherwise, fall back to a for loop
-175 			var len = sel.length;
-176 
-177 			if (len === 0)
-178 			{
-179 				return;
-180 			}
-181 
-182 			var selx;
-183 			for (var x = 0; x < len; x++)
-184 			{
-185 				selx = (sel.item(x)) ? sel.item(x) : sel[x];
-186 				callback.call(selx, selx);
-187 			}
-188 		}
-189 		else
-190 		{
-191 			callback.call(sel, sel);
-192 		}
-193 	});
-194 
-195 	/**
-196 	 * Retrieves the type of the passed variable
-197 	 *
-198 	 * @param mixed obj
-199 	 * @return string
-200 	 * @type string
-201 	 */
-202 	$_.type = function(obj)
-203 	{
-204 		if((function() {return obj && (obj !== this)}).call(obj))
-205 		{
-206 			//fallback on 'typeof' for truthy primitive values
-207 			return (typeof obj).toLowerCase();
-208 		}
-209 
-210 		//Strip x from [object x] and return
-211 		return ({}).toString.call(obj).match(/\s([a-z|A-Z]+)/)[1].toLowerCase();
-212 	};
-213 
-214 	//Set global variables
-215 	$_ = window.$_ = window.$_ || $_;
-216 	$_.$ = $;
-217 
-218 }());
\ No newline at end of file
+114 		if(sel.length !== undefined && sel !== window)
+115 		{
+116 			[].forEach.call(sel, callback);
+117 		}
+118 		else
+119 		{
+120 			callback.call(sel, sel);
+121 		}
+122 	});
+123 
+124 	/**
+125 	 * Retrieves the type of the passed variable
+126 	 *
+127 	 * @param mixed obj
+128 	 * @return string
+129 	 * @type string
+130 	 */
+131 	$_.type = function(obj)
+132 	{
+133 		if((function() {return obj && (obj !== this)}).call(obj))
+134 		{
+135 			//fallback on 'typeof' for truthy primitive values
+136 			return (typeof obj).toLowerCase();
+137 		}
+138 
+139 		//Strip x from [object x] and return
+140 		return ({}).toString.call(obj).match(/\s([a-z|A-Z]+)/)[1].toLowerCase();
+141 	};
+142 
+143 	//Set global variables
+144 	$_ = window.$_ = window.$_ || $_;
+145 	$_.$ = $;
+146 }());
+147 
\ No newline at end of file
diff --git a/docs/symbols/src/kis-js_src_modules_DOM.js.html b/docs/symbols/src/kis-js_src_modules_DOM.js.html
index 1814172..826a820 100755
--- a/docs/symbols/src/kis-js_src_modules_DOM.js.html
+++ b/docs/symbols/src/kis-js_src_modules_DOM.js.html
@@ -160,7 +160,7 @@
 153 		addClass: function (c)
 154 		{
 155 			$_.each(function (e){
-156 				this.classList.add(c);
+156 				e.classList.add(c);
 157 			});
 158 		},
 159 		/**
diff --git a/docs/symbols/src/kis-js_src_modules_ajax.js.html b/docs/symbols/src/kis-js_src_modules_ajax.js.html
index 979974e..cf83346 100755
--- a/docs/symbols/src/kis-js_src_modules_ajax.js.html
+++ b/docs/symbols/src/kis-js_src_modules_ajax.js.html
@@ -14,148 +14,113 @@
   7 
   8 	"use strict";
   9 
- 10 	// Don't bother even defining the object if the XMLHttpRequest isn't available
- 11 	if(window.XMLHttpRequest === undefined)
- 12 	{
- 13 		return;
- 14 	}
+ 10 	var ajax = {
+ 11 		_do: function (url, data, success_callback, error_callback, isPost)
+ 12 		{
+ 13 			var type,
+ 14 				request = new XMLHttpRequest();
  15 
- 16 	var ajax = {
- 17 		_do: function (url, data, success_callback, error_callback, isPost)
- 18 		{
- 19 			var type,
- 20 				request = new XMLHttpRequest();
- 21 
- 22 			if (success_callback === undefined)
- 23 			{
- 24 				/**
- 25 				 * @private
- 26 				 */
- 27 				success_callback = function (){};
- 28 			}
- 29 
- 30 			type = (isPost) ? "POST" : "GET";
- 31 
- 32 			if (type === "GET")
- 33 			{
- 34 				url += (url.match(/\?/))
- 35 					? this._serialize(data)
- 36 					: "?" + this._serialize(data);
- 37 			}
- 38 
- 39 			request.open(type, url);
- 40 
- 41 			request.onreadystatechange = function ()
- 42 			{
- 43 				if (request.readyState === 4)
- 44 				{
- 45 					if (request.status === 200)
- 46 					{
- 47 						success_callback.call(request.responseText, request.responseText);
- 48 					}
- 49 					else
- 50 					{
- 51 						if (error_callback !== undefined)
- 52 						{
- 53 							error_callback.call(request.status, request.status);
- 54 						}
- 55 					}
- 56 
- 57 				}
- 58 			};
- 59 
- 60 			if (type === "POST")
- 61 			{
- 62 				request.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
- 63 				request.send(this._serialize(data));
- 64 			}
- 65 			else
- 66 			{
- 67 				request.send(null);
- 68 			}
- 69 		},
- 70 		_serialize: function (data)
- 71 		{
- 72 			var name,
- 73 				value,
- 74 				pairs = [];
- 75 
- 76 			for (name in data)
- 77 			{
- 78 				if (!data.hasOwnProperty(name))
- 79 				{
- 80 					continue;
- 81 				}
- 82 				if (typeof data[name] === "function")
- 83 				{
- 84 					continue;
- 85 				}
- 86 
- 87 				value = data[name].toString();
+ 16 			if (success_callback === undefined)
+ 17 			{
+ 18 				/**
+ 19 				 * @private
+ 20 				 */
+ 21 				success_callback = function (){};
+ 22 			}
+ 23 
+ 24 			type = (isPost) ? "POST" : "GET";
+ 25 
+ 26 			if (type === "GET")
+ 27 			{
+ 28 				url += (url.match(/\?/))
+ 29 					? this._serialize(data)
+ 30 					: "?" + this._serialize(data);
+ 31 			}
+ 32 
+ 33 			request.open(type, url);
+ 34 
+ 35 			request.onreadystatechange = function ()
+ 36 			{
+ 37 				if (request.readyState === 4)
+ 38 				{
+ 39 					if (request.status === 200)
+ 40 					{
+ 41 						success_callback.call(request.responseText, request.responseText);
+ 42 					}
+ 43 					else
+ 44 					{
+ 45 						if (error_callback !== undefined)
+ 46 						{
+ 47 							error_callback.call(request.status, request.status);
+ 48 						}
+ 49 					}
+ 50 
+ 51 				}
+ 52 			};
+ 53 
+ 54 			if (type === "POST")
+ 55 			{
+ 56 				request.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+ 57 				request.send(this._serialize(data));
+ 58 			}
+ 59 			else
+ 60 			{
+ 61 				request.send(null);
+ 62 			}
+ 63 		},
+ 64 		_serialize: function (data)
+ 65 		{
+ 66 			var name,
+ 67 				value,
+ 68 				pairs = [];
+ 69 
+ 70 			for (name in data)
+ 71 			{
+ 72 				if ( ! data.hasOwnProperty(name) || typeof data[name] === "function")
+ 73 				{
+ 74 					continue;
+ 75 				}
+ 76 
+ 77 				value = data[name].toString();
+ 78 
+ 79 				name = encodeURIComponent(name);
+ 80 				value = encodeURIComponent(value);
+ 81 
+ 82 				pairs.push(name + "=" + value);
+ 83 			}
+ 84 
+ 85 			return pairs.join("&");
+ 86 		}
+ 87 	};
  88 
- 89 				name = encodeURIComponent(name);
- 90 				value = encodeURIComponent(value);
- 91 
- 92 				pairs.push(name + "=" + value);
- 93 			}
- 94 
- 95 			return pairs.join("&");
- 96 		}
- 97 	};
- 98 
- 99 	/**
-100 	 * Sends a GET type ajax request
-101 	 *
-102 	 * @name get
-103 	 * @function
-104 	 * @memberOf $_
-105 	 * @param string url
-106 	 * @param object data
-107 	 * @param function success_callback
-108 	 * @param function error_callback
-109 	 */
-110 	$_.ext('get', function (url, data, success_callback, error_callback){
-111 		ajax._do(url, data, success_callback, error_callback, false);
-112 	});
-113 
-114 	/**
-115 	 * Sends a POST type ajax request
-116 	 *
-117 	 * @name post
-118 	 * @function
-119 	 * @memberOf $_
-120 	 * @param string url
-121 	 * @param object data
-122 	 * @param function success_callback
-123 	 * @param function error_callback
-124 	 */
-125 	$_.ext('post', function (url, data, success_callback, error_callback){
-126 		ajax._do(url, data, success_callback, error_callback, true);
-127 	});
-128 
-129 	/**
-130 	 * Watches for server-sent events and applies a callback on message
-131 	 *
-132 	 * @name sse
-133 	 * @function
-134 	 * @memberOf $_
-135 	 * @param string url
-136 	 * @param function callback
-137 	 */
-138 	$_.ext('sse', function(url, callback){
-139 
-140 		var source;
-141 
-142 		// Check for server-sent event support
-143 		if (EventSource !== undefined)
-144 		{
-145 			source = new EventSource(url);
-146 
-147 			// Apply the callback
-148 			source.onmessage = function(event){
-149 				callback.call(event.data, event.data);
-150 			};
-151 		}
-152 	});
-153 
-154 }());
\ No newline at end of file
+ 89 	/**
+ 90 	 * Sends a GET type ajax request
+ 91 	 *
+ 92 	 * @name get
+ 93 	 * @function
+ 94 	 * @memberOf $_
+ 95 	 * @param string url
+ 96 	 * @param object data
+ 97 	 * @param function success_callback
+ 98 	 * @param function error_callback
+ 99 	 */
+100 	$_.ext('get', function (url, data, success_callback, error_callback){
+101 		ajax._do(url, data, success_callback, error_callback, false);
+102 	});
+103 
+104 	/**
+105 	 * Sends a POST type ajax request
+106 	 *
+107 	 * @name post
+108 	 * @function
+109 	 * @memberOf $_
+110 	 * @param string url
+111 	 * @param object data
+112 	 * @param function success_callback
+113 	 * @param function error_callback
+114 	 */
+115 	$_.ext('post', function (url, data, success_callback, error_callback){
+116 		ajax._do(url, data, success_callback, error_callback, true);
+117 	});
+118 }());
+119 
\ No newline at end of file
diff --git a/docs/symbols/src/kis-js_src_modules_event.js.html b/docs/symbols/src/kis-js_src_modules_event.js.html
index 558202e..dfb669c 100755
--- a/docs/symbols/src/kis-js_src_modules_event.js.html
+++ b/docs/symbols/src/kis-js_src_modules_event.js.html
@@ -17,146 +17,140 @@
  10 
  11 	var _add_remove, e, _attach_delegate;
  12 
- 13 	// Don't bother defining the methods if event api isn't supports
- 14 	if (document.addEventListener === undefined)
- 15 	{
- 16 		return false;
- 17 	}
- 18 
- 19 	_add_remove = function (sel, event, callback, add)
- 20 	{
- 21 		var i, len;
- 22 
- 23 		if(sel === undefined)
+ 13 	_add_remove = function (sel, event, callback, add)
+ 14 	{
+ 15 		var i, len;
+ 16 
+ 17 		if(sel === undefined)
+ 18 		{
+ 19 			return null;
+ 20 		}
+ 21 
+ 22 		// Multiple events? Run recursively!
+ 23 		if ( ! event.match(/^([\w\-]+)$/))
  24 		{
- 25 			return null;
- 26 		}
- 27 
- 28 		// Multiple events? Run recursively!
- 29 		if ( ! event.match(/^([\w\-]+)$/))
- 30 		{
- 31 			event = event.split(" ");
- 32 
- 33 			len = event.length;
- 34 
- 35 			for (i = 0; i < len; i++)
- 36 			{
- 37 				_add_remove(sel, event[i], callback, add);
- 38 			}
- 39 
- 40 			return;
- 41 		}
+ 25 			event = event.split(" ");
+ 26 
+ 27 			len = event.length;
+ 28 
+ 29 			for (i = 0; i < len; i++)
+ 30 			{
+ 31 				_add_remove(sel, event[i], callback, add);
+ 32 			}
+ 33 
+ 34 			return;
+ 35 		}
+ 36 
+ 37 		// Bind the event
+ 38 		(add === true)
+ 39 			? sel.addEventListener(event, callback, false)
+ 40 			: sel.removeEventListener(event, callback, false);
+ 41 	};
  42 
- 43 		// Bind the event
- 44 		(add === true)
- 45 			? sel.addEventListener(event, callback, false)
- 46 			: sel.removeEventListener(event, callback, false);
- 47 	};
- 48 
- 49 	_attach_delegate = function(sel, target, event, callback)
- 50 	{
- 51 		// attach the listener to the parent object
- 52 		_add_remove(sel, event, function(e){
- 53 
- 54 			var elem, t;
- 55 
- 56 			// Get the live version of the target selector
- 57 			t = $_.$(target, sel);
- 58 
- 59 			// Check each element to see if it matches the target
- 60 			for(elem in t)
- 61 			{
- 62 				// Fire target callback when event bubbles from target
- 63 				if(e.target == t[elem])
- 64 				{
- 65 					// Trigger the event callback
- 66 					callback.call(t[elem], e);
- 67 
- 68 					// Stop event propegation
- 69 					e.stopPropagation();
- 70 				}
- 71 			}
- 72 
- 73 		}, true);
- 74 	};
- 75 
- 76 	// --------------------------------------------------------------------------
- 77 
- 78 	/**
- 79 	 * Event Listener module
- 80 	 *
- 81 	 * @namespace
- 82 	 * @name event
- 83 	 * @memberOf $_
- 84 	 */
- 85 	e = {
- 86 		/**
- 87 		 * Adds an event that returns a callback when triggered on the selected
- 88 		 * event and selector
- 89 		 *
- 90 		 * @memberOf $_.event
- 91 		 * @name add
- 92 		 * @function
- 93 		 * @example Eg. $_("#selector").event.add("click", do_something());
- 94 		 * @param string event
- 95 		 * @param function callback
- 96 		 */
- 97 		add: function (event, callback)
- 98 		{
- 99 			$_.each(function(e){
-100 				_add_remove(e, event, callback, true);
-101 			});
-102 		},
-103 		/**
-104 		 * Removes an event bound the the specified selector, event type, and callback
-105 		 *
-106 		 * @memberOf $_.event
-107 		 * @name remove
-108 		 * @function
-109 		 * @example Eg. $_("#selector").event.remove("click", do_something());
-110 		 * @param string event
-111 		 * @param string callback
-112 		 */
-113 		remove: function (event, callback)
-114 		{
-115 			$_.each(function(e){
-116 				_add_remove(e, event, callback, false);
-117 			});
-118 		},
-119 		/**
-120 		 * Binds a persistent event to the document
-121 		 *
-122 		 * @memberOf $_.event
-123 		 * @name live
-124 		 * @function
-125 		 * @example Eg. $_.event.live(".button", "click", do_something());
-126 		 * @param string target
-127 		 * @param string event
-128 		 * @param function callback
-129 		 */
-130 		live: function (target, event, callback)
-131 		{
-132 			_attach_delegate(document.documentElement, target, event, callback);
-133 		},
-134 		/**
-135 		 * Binds an event to a parent object
-136 		 *
-137 		 * @memberOf $_.event
-138 		 * @name delegate
-139 		 * @function
-140 		 * @example Eg. $_("#parent").delegate(".button", "click", do_something());
-141 		 * @param string target
-142 		 * @param string event_type
-143 		 * @param function callback
-144 		 */
-145 		delegate: function (target, event, callback)
-146 		{
-147 			$_.each(function(e){
-148 				_attach_delegate(e, target, event, callback);
-149 			});
-150 		}
-151 	};
-152 
-153 	$_.ext('event', e);
-154 
-155 }());
\ No newline at end of file
+ 43 	_attach_delegate = function(sel, target, event, callback)
+ 44 	{
+ 45 		// attach the listener to the parent object
+ 46 		_add_remove(sel, event, function(e){
+ 47 
+ 48 			var elem, t;
+ 49 
+ 50 			// Get the live version of the target selector
+ 51 			t = $_.$(target, sel);
+ 52 
+ 53 			// Check each element to see if it matches the target
+ 54 			for(elem in t)
+ 55 			{
+ 56 				// Fire target callback when event bubbles from target
+ 57 				if(e.target == t[elem])
+ 58 				{
+ 59 					// Trigger the event callback
+ 60 					callback.call(t[elem], e);
+ 61 
+ 62 					// Stop event propegation
+ 63 					e.stopPropagation();
+ 64 				}
+ 65 			}
+ 66 
+ 67 		}, true);
+ 68 	};
+ 69 
+ 70 	// --------------------------------------------------------------------------
+ 71 
+ 72 	/**
+ 73 	 * Event Listener module
+ 74 	 *
+ 75 	 * @namespace
+ 76 	 * @name event
+ 77 	 * @memberOf $_
+ 78 	 */
+ 79 	e = {
+ 80 		/**
+ 81 		 * Adds an event that returns a callback when triggered on the selected
+ 82 		 * event and selector
+ 83 		 *
+ 84 		 * @memberOf $_.event
+ 85 		 * @name add
+ 86 		 * @function
+ 87 		 * @example Eg. $_("#selector").event.add("click", do_something());
+ 88 		 * @param string event
+ 89 		 * @param function callback
+ 90 		 */
+ 91 		add: function (event, callback)
+ 92 		{
+ 93 			$_.each(function(e){
+ 94 				_add_remove(e, event, callback, true);
+ 95 			});
+ 96 		},
+ 97 		/**
+ 98 		 * Removes an event bound the the specified selector, event type, and callback
+ 99 		 *
+100 		 * @memberOf $_.event
+101 		 * @name remove
+102 		 * @function
+103 		 * @example Eg. $_("#selector").event.remove("click", do_something());
+104 		 * @param string event
+105 		 * @param string callback
+106 		 */
+107 		remove: function (event, callback)
+108 		{
+109 			$_.each(function(e){
+110 				_add_remove(e, event, callback, false);
+111 			});
+112 		},
+113 		/**
+114 		 * Binds a persistent event to the document
+115 		 *
+116 		 * @memberOf $_.event
+117 		 * @name live
+118 		 * @function
+119 		 * @example Eg. $_.event.live(".button", "click", do_something());
+120 		 * @param string target
+121 		 * @param string event
+122 		 * @param function callback
+123 		 */
+124 		live: function (target, event, callback)
+125 		{
+126 			_attach_delegate(document.documentElement, target, event, callback);
+127 		},
+128 		/**
+129 		 * Binds an event to a parent object
+130 		 *
+131 		 * @memberOf $_.event
+132 		 * @name delegate
+133 		 * @function
+134 		 * @example Eg. $_("#parent").delegate(".button", "click", do_something());
+135 		 * @param string target
+136 		 * @param string event_type
+137 		 * @param function callback
+138 		 */
+139 		delegate: function (target, event, callback)
+140 		{
+141 			$_.each(function(e){
+142 				_attach_delegate(e, target, event, callback);
+143 			});
+144 		}
+145 	};
+146 
+147 	$_.ext('event', e);
+148 
+149 }());
\ No newline at end of file
diff --git a/docs/symbols/src/kis-js_src_modules_store.js.html b/docs/symbols/src/kis-js_src_modules_store.js.html
index 42a1b95..7ceb95b 100755
--- a/docs/symbols/src/kis-js_src_modules_store.js.html
+++ b/docs/symbols/src/kis-js_src_modules_store.js.html
@@ -14,119 +14,113 @@
   7 
   8 	"use strict";
   9 
- 10 	//No support for localstorage? Bail out early
- 11 	if(localStorage === undefined || JSON === undefined)
- 12 	{
- 13 		return null;
- 14 	}
- 15 
- 16 	//Shortcuts for wrapper
- 17 	var l = localStorage,
- 18 		s = sessionStorage;
- 19 
- 20 	/**
- 21 	 * Wrapper for localstorage / sessionstorage data serialization.
- 22 	 * Each method has a boolean parameter, that when set as true switches the method
- 23 	 * to use sessionStorage rather than the default localStorage.
- 24 	 *
- 25 	 * @name store
- 26 	 * @namespace
- 27 	 * @memberOf $_
- 28 	 */
- 29 	var store = {
- 30 		/**
- 31 		 * Retrieves and deserializes a value from localstorage,
- 32 		 * based on the specified key
- 33 		 *
- 34 		 * @param string key
- 35 		 * @param bool session
- 36 		 * @name get
- 37 		 * @memberOf $_.store
- 38 		 * @function
- 39 		 * @return object
- 40 		 * @type object
- 41 		 */
- 42 		get: function (key, sess)
- 43 		{
- 44 			var val = (sess) ? s.getItem(key) : l.getItem(key);
- 45 
- 46 			return JSON.parse(val);
- 47 		},
- 48 		/**
- 49 		 * Puts a value into localstorage at the specified key,
- 50 		 * and JSON-encodes the value if not a string
- 51 		 *
- 52 		 * @param string key
- 53 		 * @param mixed value
- 54 		 * @param bool session
- 55 		 * @name set
- 56 		 * @memberOf $_.store
- 57 		 * @function
- 58 		 */
- 59 		set: function (key, value, sess)
- 60 		{
- 61 			// Localstorage generally only accepts strings
- 62 			value = JSON.stringify(value);
- 63 
- 64 			(sess) ? s.setItem(key, value) : l.setItem(key, value);
- 65 		},
- 66 		/**
- 67 		 * Removes the specified item from storage
- 68 		 *
- 69 		 * @param string key
- 70 		 * @param bool session
- 71 		 * @name remove
- 72 		 * @memberOf $_.store
- 73 		 * @function
- 74 		 */
- 75 		remove: function (key, sess)
- 76 		{
- 77 			(sess) ? s.removeItem(key) : l.removeItem(key);
- 78 		},
- 79 		/**
- 80 		 * Returns an object of all the raw values in storage
- 81 		 *
- 82 		 * @param bool session
- 83 		 * @name getAll
- 84 		 * @memberOf $_.store
- 85 		 * @function
- 86 		 * @return object
- 87 		 * @type object
- 88 		 */
- 89 		getAll: function (sess)
- 90 		{
- 91 			var i,
- 92 				len,
- 93 				data = {},
- 94 				k,
- 95 				o;
- 96 
- 97 			//Reference to session/localstorage
- 98 			o = (sess) ? l : s;
- 99 
-100 			len = o.length;
+ 10 	//Shortcuts for wrapper
+ 11 	var l = localStorage,
+ 12 		s = sessionStorage;
+ 13 
+ 14 	/**
+ 15 	 * Wrapper for localstorage / sessionstorage data serialization.
+ 16 	 * Each method has a boolean parameter, that when set as true switches the method
+ 17 	 * to use sessionStorage rather than the default localStorage.
+ 18 	 *
+ 19 	 * @name store
+ 20 	 * @namespace
+ 21 	 * @memberOf $_
+ 22 	 */
+ 23 	var store = {
+ 24 		/**
+ 25 		 * Retrieves and deserializes a value from localstorage,
+ 26 		 * based on the specified key
+ 27 		 *
+ 28 		 * @param string key
+ 29 		 * @param bool session
+ 30 		 * @name get
+ 31 		 * @memberOf $_.store
+ 32 		 * @function
+ 33 		 * @return object
+ 34 		 * @type object
+ 35 		 */
+ 36 		get: function (key, sess)
+ 37 		{
+ 38 			var val = (sess) ? s.getItem(key) : l.getItem(key);
+ 39 
+ 40 			return JSON.parse(val);
+ 41 		},
+ 42 		/**
+ 43 		 * Puts a value into localstorage at the specified key,
+ 44 		 * and JSON-encodes the value if not a string
+ 45 		 *
+ 46 		 * @param string key
+ 47 		 * @param mixed value
+ 48 		 * @param bool session
+ 49 		 * @name set
+ 50 		 * @memberOf $_.store
+ 51 		 * @function
+ 52 		 */
+ 53 		set: function (key, value, sess)
+ 54 		{
+ 55 			// Localstorage generally only accepts strings
+ 56 			value = JSON.stringify(value);
+ 57 
+ 58 			(sess) ? s.setItem(key, value) : l.setItem(key, value);
+ 59 		},
+ 60 		/**
+ 61 		 * Removes the specified item from storage
+ 62 		 *
+ 63 		 * @param string key
+ 64 		 * @param bool session
+ 65 		 * @name remove
+ 66 		 * @memberOf $_.store
+ 67 		 * @function
+ 68 		 */
+ 69 		remove: function (key, sess)
+ 70 		{
+ 71 			(sess) ? s.removeItem(key) : l.removeItem(key);
+ 72 		},
+ 73 		/**
+ 74 		 * Returns an object of all the raw values in storage
+ 75 		 *
+ 76 		 * @param bool session
+ 77 		 * @name getAll
+ 78 		 * @memberOf $_.store
+ 79 		 * @function
+ 80 		 * @return object
+ 81 		 * @type object
+ 82 		 */
+ 83 		getAll: function (sess)
+ 84 		{
+ 85 			var i,
+ 86 				len,
+ 87 				data = {},
+ 88 				k,
+ 89 				o;
+ 90 
+ 91 			//Reference to session/localstorage
+ 92 			o = (sess) ? l : s;
+ 93 
+ 94 			len = o.length;
+ 95 
+ 96 			for (i = 0; i < len; i++)
+ 97 			{
+ 98 				k = o.key(i);
+ 99 				data[k] = o.getItem(k);
+100 			}
 101 
-102 			for (i = 0; i < len; i++)
-103 			{
-104 				k = o.key(i);
-105 				data[k] = o.getItem(k);
-106 			}
-107 
-108 			return data;
-109 		},
-110 		/**
-111 		 * Removes all values from the same domain storage
-112 		 *
-113 		 * @param bool session
-114 		 * @name clear
-115 		 * @memberOf $_.store
-116 		 * @function
-117 		 */
-118 		clear: function(sess)
-119 		{
-120 			(sess) ? s.clear() : l.clear();
-121 		}
-122 	};
-123 
-124 	$_.ext('store', store);
-125 }());
\ No newline at end of file
+102 			return data;
+103 		},
+104 		/**
+105 		 * Removes all values from the same domain storage
+106 		 *
+107 		 * @param bool session
+108 		 * @name clear
+109 		 * @memberOf $_.store
+110 		 * @function
+111 		 */
+112 		clear: function(sess)
+113 		{
+114 			(sess) ? s.clear() : l.clear();
+115 		}
+116 	};
+117 
+118 	$_.ext('store', store);
+119 }());
\ No newline at end of file
diff --git a/kis-all.js b/kis-all.js
index 7372ba4..50fc61d 100755
--- a/kis-all.js
+++ b/kis-all.js
@@ -8,18 +8,7 @@
 
 	"use strict";
 
-	// Most functions rely on a string selector
-	// which returns html elements. This requires
-	// document.querySelectorAll or a custom
-	// selector engine. I choose to just use the
-	// browser feature, since it is present in
-	// IE 8+, and all other major browsers
-	if (document.querySelector === undefined)
-	{
-		return;
-	}
-
-	var $_, $, dcopy, sel;
+	var $_, $, sel;
 
 
 	/**
@@ -51,7 +40,7 @@
 		$_.prototype.el = sel;
 
 		// Use the $_ object as it's own prototype
-		var self = dcopy($_);
+		var self = Object.create($_);
 
 		// Give sel to each extension.
 		for(var i in self)
@@ -101,46 +90,6 @@
 		return (x.length === 1) ? x[0] : x;
 	};
 
-	/**
-	 * Deep copy/prototypical constructor function
-	 *
-	 * @param object obj
-	 * @private
-	 * @return object
-	 * @type object
-	 */
-	dcopy = function(obj)
-	{
-		var type, F;
-
-		if(obj === undefined)
-		{
-			return;
-		}
-
-		if(Object.create !== undefined)
-		{
-			return Object.create(obj);
-		}
-
-		type = typeof obj;
-
-		if(type !== "object" && type !== "function")
-		{
-			return;
-		}
-
-		/**
-		 * @private
-		 */
-		F = function(){};
-
-		F.prototype = obj;
-
-		return new F();
-
-	};
-
 	/**
 	 * Adds the property `obj` to the $_ object, calling it `name`
 	 *
@@ -164,27 +113,7 @@
 	{
 		if(sel.length !== undefined && sel !== window)
 		{
-			// Use the native method, if it exists
-			if(Array.prototype.forEach !== undefined)
-			{
-				[].forEach.call(sel, callback);
-				return;
-			}
-
-			// Otherwise, fall back to a for loop
-			var len = sel.length;
-
-			if (len === 0)
-			{
-				return;
-			}
-
-			var selx;
-			for (var x = 0; x < len; x++)
-			{
-				selx = (sel.item(x)) ? sel.item(x) : sel[x];
-				callback.call(selx, selx);
-			}
+			[].forEach.call(sel, callback);
 		}
 		else
 		{
@@ -214,9 +143,9 @@
 	//Set global variables
 	$_ = window.$_ = window.$_ || $_;
 	$_.$ = $;
-
 }());
 
+
 // --------------------------------------------------------------------------
 
 /**
@@ -414,7 +343,7 @@ if(typeof document!=="undefined"&&!("classList" in document.createElement("a")))
 		addClass: function (c)
 		{
 			$_.each(function (e){
-				this.classList.add(c);
+				e.classList.add(c);
 			});
 		},
 		/**
@@ -632,12 +561,6 @@ if(typeof document!=="undefined"&&!("classList" in document.createElement("a")))
  */
 
 	
-	// Don't bother even defining the object if the XMLHttpRequest isn't available
-	if(window.XMLHttpRequest === undefined)
-	{
-		return;
-	}
-
 	var ajax = {
 		_do: function (url, data, success_callback, error_callback, isPost)
 		{
@@ -700,11 +623,7 @@ if(typeof document!=="undefined"&&!("classList" in document.createElement("a")))
 
 			for (name in data)
 			{
-				if (!data.hasOwnProperty(name))
-				{
-					continue;
-				}
-				if (typeof data[name] === "function")
+				if ( ! data.hasOwnProperty(name) || typeof data[name] === "function")
 				{
 					continue;
 				}
@@ -751,32 +670,6 @@ if(typeof document!=="undefined"&&!("classList" in document.createElement("a")))
 		ajax._do(url, data, success_callback, error_callback, true);
 	});
 
-	/**
-	 * Watches for server-sent events and applies a callback on message
-	 *
-	 * @name sse
-	 * @function
-	 * @memberOf $_
-	 * @param string url
-	 * @param function callback
-	 */
-	$_.ext('sse', function(url, callback){
-
-		var source;
-
-		// Check for server-sent event support
-		if (EventSource !== undefined)
-		{
-			source = new EventSource(url);
-
-			// Apply the callback
-			source.onmessage = function(event){
-				callback.call(event.data, event.data);
-			};
-		}
-	});
-
-
 
 // --------------------------------------------------------------------------
 
@@ -790,12 +683,6 @@ if(typeof document!=="undefined"&&!("classList" in document.createElement("a")))
 	
 	var _add_remove, e, _attach_delegate;
 
-	// Don't bother defining the methods if event api isn't supports
-	if (document.addEventListener === undefined)
-	{
-		return false;
-	}
-
 	_add_remove = function (sel, event, callback, add)
 	{
 		var i, len;
@@ -943,12 +830,6 @@ if(typeof document!=="undefined"&&!("classList" in document.createElement("a")))
  */
 
 	
-	//No support for localstorage? Bail out early
-	if(localStorage === undefined || JSON === undefined)
-	{
-		return null;
-	}
-
 	//Shortcuts for wrapper
 	var l = localStorage,
 		s = sessionStorage;
diff --git a/kis-lite-dom-min.js b/kis-lite-dom-min.js
index f377dc0..b6ac510 100755
--- a/kis-lite-dom-min.js
+++ b/kis-lite-dom-min.js
@@ -1,15 +1,14 @@
-(function(d){if(document.querySelector!==d){var e,g,a,b;e=function(c){b=c===d?e.el!==d?e.el:document.documentElement:g(c);e.prototype.el=b;c=a(e);for(var h in c)"object"===typeof c[h]&&(c[h].el=b);c.el=b;return c};g=function(c,b){var a;if("string"!=typeof c||c===d)return c;a=null!=b&&1===b.nodeType?b:document;if(c.match(/^#([\w\-]+$)/))return document.getElementById(c.split("#")[1]);a=a.querySelectorAll(c);return 1===a.length?a[0]:a};a=function(a){var b;if(a!==d){if(Object.create!==d)return Object.create(a);
-b=typeof a;if(!("object"!==b&&"function"!==b))return b=function(){},b.prototype=a,new b}};e.ext=function(a,d){d.el=b;e[a]=d};e.ext("each",function(a){if(b.length!==d&&b!==window)if(Array.prototype.forEach!==d)[].forEach.call(b,a);else{var h=b.length;if(0!==h)for(var f,e=0;ed?1:ca?1:be?1:ca?1:b
+  Copyright (C) 2012 Mathias Bynens 
+  Copyright (C) 2012 Joost-Wim Boekesteijn 
+  Copyright (C) 2012 Kris Kowal 
+  Copyright (C) 2012 Yusuke Suzuki 
+  Copyright (C) 2012 Arpad Borsos 
+  Copyright (C) 2011 Ariya Hidayat 
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL  BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*jslint bitwise:true plusplus:true */
+/*global esprima:true, define:true, exports:true, window: true,
+throwError: true, createLiteral: true, generateStatement: true,
+parseAssignmentExpression: true, parseBlock: true, parseExpression: true,
+parseFunctionDeclaration: true, parseFunctionExpression: true,
+parseFunctionSourceElements: true, parseVariableIdentifier: true,
+parseLeftHandSideExpression: true,
+parseStatement: true, parseSourceElement: true */
+
+(function (root, factory) {
+    'use strict';
+
+    // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js,
+    // Rhino, and plain browser loading.
+    if (typeof define === 'function' && define.amd) {
+        define(['exports'], factory);
+    } else if (typeof exports !== 'undefined') {
+        factory(exports);
+    } else {
+        factory((root.esprima = {}));
+    }
+}(this, function (exports) {
+    'use strict';
+
+    var Token,
+        TokenName,
+        Syntax,
+        PropertyKind,
+        Messages,
+        Regex,
+        source,
+        strict,
+        index,
+        lineNumber,
+        lineStart,
+        length,
+        buffer,
+        state,
+        extra;
+
+    Token = {
+        BooleanLiteral: 1,
+        EOF: 2,
+        Identifier: 3,
+        Keyword: 4,
+        NullLiteral: 5,
+        NumericLiteral: 6,
+        Punctuator: 7,
+        StringLiteral: 8
+    };
+
+    TokenName = {};
+    TokenName[Token.BooleanLiteral] = 'Boolean';
+    TokenName[Token.EOF] = '';
+    TokenName[Token.Identifier] = 'Identifier';
+    TokenName[Token.Keyword] = 'Keyword';
+    TokenName[Token.NullLiteral] = 'Null';
+    TokenName[Token.NumericLiteral] = 'Numeric';
+    TokenName[Token.Punctuator] = 'Punctuator';
+    TokenName[Token.StringLiteral] = 'String';
+
+    Syntax = {
+        AssignmentExpression: 'AssignmentExpression',
+        ArrayExpression: 'ArrayExpression',
+        BlockStatement: 'BlockStatement',
+        BinaryExpression: 'BinaryExpression',
+        BreakStatement: 'BreakStatement',
+        CallExpression: 'CallExpression',
+        CatchClause: 'CatchClause',
+        ConditionalExpression: 'ConditionalExpression',
+        ContinueStatement: 'ContinueStatement',
+        DoWhileStatement: 'DoWhileStatement',
+        DebuggerStatement: 'DebuggerStatement',
+        EmptyStatement: 'EmptyStatement',
+        ExpressionStatement: 'ExpressionStatement',
+        ForStatement: 'ForStatement',
+        ForInStatement: 'ForInStatement',
+        FunctionDeclaration: 'FunctionDeclaration',
+        FunctionExpression: 'FunctionExpression',
+        Identifier: 'Identifier',
+        IfStatement: 'IfStatement',
+        Literal: 'Literal',
+        LabeledStatement: 'LabeledStatement',
+        LogicalExpression: 'LogicalExpression',
+        MemberExpression: 'MemberExpression',
+        NewExpression: 'NewExpression',
+        ObjectExpression: 'ObjectExpression',
+        Program: 'Program',
+        Property: 'Property',
+        ReturnStatement: 'ReturnStatement',
+        SequenceExpression: 'SequenceExpression',
+        SwitchStatement: 'SwitchStatement',
+        SwitchCase: 'SwitchCase',
+        ThisExpression: 'ThisExpression',
+        ThrowStatement: 'ThrowStatement',
+        TryStatement: 'TryStatement',
+        UnaryExpression: 'UnaryExpression',
+        UpdateExpression: 'UpdateExpression',
+        VariableDeclaration: 'VariableDeclaration',
+        VariableDeclarator: 'VariableDeclarator',
+        WhileStatement: 'WhileStatement',
+        WithStatement: 'WithStatement'
+    };
+
+    PropertyKind = {
+        Data: 1,
+        Get: 2,
+        Set: 4
+    };
+
+    // Error messages should be identical to V8.
+    Messages = {
+        UnexpectedToken:  'Unexpected token %0',
+        UnexpectedNumber:  'Unexpected number',
+        UnexpectedString:  'Unexpected string',
+        UnexpectedIdentifier:  'Unexpected identifier',
+        UnexpectedReserved:  'Unexpected reserved word',
+        UnexpectedEOS:  'Unexpected end of input',
+        NewlineAfterThrow:  'Illegal newline after throw',
+        InvalidRegExp: 'Invalid regular expression',
+        UnterminatedRegExp:  'Invalid regular expression: missing /',
+        InvalidLHSInAssignment:  'Invalid left-hand side in assignment',
+        InvalidLHSInForIn:  'Invalid left-hand side in for-in',
+        MultipleDefaultsInSwitch: 'More than one default clause in switch statement',
+        NoCatchOrFinally:  'Missing catch or finally after try',
+        UnknownLabel: 'Undefined label \'%0\'',
+        Redeclaration: '%0 \'%1\' has already been declared',
+        IllegalContinue: 'Illegal continue statement',
+        IllegalBreak: 'Illegal break statement',
+        IllegalReturn: 'Illegal return statement',
+        StrictModeWith:  'Strict mode code may not include a with statement',
+        StrictCatchVariable:  'Catch variable may not be eval or arguments in strict mode',
+        StrictVarName:  'Variable name may not be eval or arguments in strict mode',
+        StrictParamName:  'Parameter name eval or arguments is not allowed in strict mode',
+        StrictParamDupe: 'Strict mode function may not have duplicate parameter names',
+        StrictFunctionName:  'Function name may not be eval or arguments in strict mode',
+        StrictOctalLiteral:  'Octal literals are not allowed in strict mode.',
+        StrictDelete:  'Delete of an unqualified identifier in strict mode.',
+        StrictDuplicateProperty:  'Duplicate data property in object literal not allowed in strict mode',
+        AccessorDataProperty:  'Object literal may not have data and accessor property with the same name',
+        AccessorGetSet:  'Object literal may not have multiple get/set accessors with the same name',
+        StrictLHSAssignment:  'Assignment to eval or arguments is not allowed in strict mode',
+        StrictLHSPostfix:  'Postfix increment/decrement may not have eval or arguments operand in strict mode',
+        StrictLHSPrefix:  'Prefix increment/decrement may not have eval or arguments operand in strict mode',
+        StrictReservedWord:  'Use of future reserved word in strict mode'
+    };
+
+    // See also tools/generate-unicode-regex.py.
+    Regex = {
+        NonAsciiIdentifierStart: new RegExp('[\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]'),
+        NonAsciiIdentifierPart: new RegExp('[\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0300-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u0483-\u0487\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u05d0-\u05ea\u05f0-\u05f2\u0610-\u061a\u0620-\u0669\u066e-\u06d3\u06d5-\u06dc\u06df-\u06e8\u06ea-\u06fc\u06ff\u0710-\u074a\u074d-\u07b1\u07c0-\u07f5\u07fa\u0800-\u082d\u0840-\u085b\u08a0\u08a2-\u08ac\u08e4-\u08fe\u0900-\u0963\u0966-\u096f\u0971-\u0977\u0979-\u097f\u0981-\u0983\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bc-\u09c4\u09c7\u09c8\u09cb-\u09ce\u09d7\u09dc\u09dd\u09df-\u09e3\u09e6-\u09f1\u0a01-\u0a03\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a59-\u0a5c\u0a5e\u0a66-\u0a75\u0a81-\u0a83\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abc-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ad0\u0ae0-\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3c-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b5c\u0b5d\u0b5f-\u0b63\u0b66-\u0b6f\u0b71\u0b82\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd0\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c58\u0c59\u0c60-\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbc-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0cde\u0ce0-\u0ce3\u0ce6-\u0cef\u0cf1\u0cf2\u0d02\u0d03\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d-\u0d44\u0d46-\u0d48\u0d4a-\u0d4e\u0d57\u0d60-\u0d63\u0d66-\u0d6f\u0d7a-\u0d7f\u0d82\u0d83\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e01-\u0e3a\u0e40-\u0e4e\u0e50-\u0e59\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb9\u0ebb-\u0ebd\u0ec0-\u0ec4\u0ec6\u0ec8-\u0ecd\u0ed0-\u0ed9\u0edc-\u0edf\u0f00\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e-\u0f47\u0f49-\u0f6c\u0f71-\u0f84\u0f86-\u0f97\u0f99-\u0fbc\u0fc6\u1000-\u1049\u1050-\u109d\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u135d-\u135f\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176c\u176e-\u1770\u1772\u1773\u1780-\u17d3\u17d7\u17dc\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u1820-\u1877\u1880-\u18aa\u18b0-\u18f5\u1900-\u191c\u1920-\u192b\u1930-\u193b\u1946-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u19d0-\u19d9\u1a00-\u1a1b\u1a20-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1aa7\u1b00-\u1b4b\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1bf3\u1c00-\u1c37\u1c40-\u1c49\u1c4d-\u1c7d\u1cd0-\u1cd2\u1cd4-\u1cf6\u1d00-\u1de6\u1dfc-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u200c\u200d\u203f\u2040\u2054\u2071\u207f\u2090-\u209c\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d7f-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2de0-\u2dff\u2e2f\u3005-\u3007\u3021-\u302f\u3031-\u3035\u3038-\u303c\u3041-\u3096\u3099\u309a\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua62b\ua640-\ua66f\ua674-\ua67d\ua67f-\ua697\ua69f-\ua6f1\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua827\ua840-\ua873\ua880-\ua8c4\ua8d0-\ua8d9\ua8e0-\ua8f7\ua8fb\ua900-\ua92d\ua930-\ua953\ua960-\ua97c\ua980-\ua9c0\ua9cf-\ua9d9\uaa00-\uaa36\uaa40-\uaa4d\uaa50-\uaa59\uaa60-\uaa76\uaa7a\uaa7b\uaa80-\uaac2\uaadb-\uaadd\uaae0-\uaaef\uaaf2-\uaaf6\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabea\uabec\uabed\uabf0-\uabf9\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\ufe70-\ufe74\ufe76-\ufefc\uff10-\uff19\uff21-\uff3a\uff3f\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]')
+    };
+
+    // Ensure the condition is true, otherwise throw an error.
+    // This is only to have a better contract semantic, i.e. another safety net
+    // to catch a logic error. The condition shall be fulfilled in normal case.
+    // Do NOT use this to enforce a certain condition on any user input.
+
+    function assert(condition, message) {
+        if (!condition) {
+            throw new Error('ASSERT: ' + message);
+        }
+    }
+
+    function sliceSource(from, to) {
+        return source.slice(from, to);
+    }
+
+    if (typeof 'esprima'[0] === 'undefined') {
+        sliceSource = function sliceArraySource(from, to) {
+            return source.slice(from, to).join('');
+        };
+    }
+
+    function isDecimalDigit(ch) {
+        return '0123456789'.indexOf(ch) >= 0;
+    }
+
+    function isHexDigit(ch) {
+        return '0123456789abcdefABCDEF'.indexOf(ch) >= 0;
+    }
+
+    function isOctalDigit(ch) {
+        return '01234567'.indexOf(ch) >= 0;
+    }
+
+
+    // 7.2 White Space
+
+    function isWhiteSpace(ch) {
+        return (ch === ' ') || (ch === '\u0009') || (ch === '\u000B') ||
+            (ch === '\u000C') || (ch === '\u00A0') ||
+            (ch.charCodeAt(0) >= 0x1680 &&
+             '\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\uFEFF'.indexOf(ch) >= 0);
+    }
+
+    // 7.3 Line Terminators
+
+    function isLineTerminator(ch) {
+        return (ch === '\n' || ch === '\r' || ch === '\u2028' || ch === '\u2029');
+    }
+
+    // 7.6 Identifier Names and Identifiers
+
+    function isIdentifierStart(ch) {
+        return (ch === '$') || (ch === '_') || (ch === '\\') ||
+            (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') ||
+            ((ch.charCodeAt(0) >= 0x80) && Regex.NonAsciiIdentifierStart.test(ch));
+    }
+
+    function isIdentifierPart(ch) {
+        return (ch === '$') || (ch === '_') || (ch === '\\') ||
+            (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') ||
+            ((ch >= '0') && (ch <= '9')) ||
+            ((ch.charCodeAt(0) >= 0x80) && Regex.NonAsciiIdentifierPart.test(ch));
+    }
+
+    // 7.6.1.2 Future Reserved Words
+
+    function isFutureReservedWord(id) {
+        switch (id) {
+
+        // Future reserved words.
+        case 'class':
+        case 'enum':
+        case 'export':
+        case 'extends':
+        case 'import':
+        case 'super':
+            return true;
+        }
+
+        return false;
+    }
+
+    function isStrictModeReservedWord(id) {
+        switch (id) {
+
+        // Strict Mode reserved words.
+        case 'implements':
+        case 'interface':
+        case 'package':
+        case 'private':
+        case 'protected':
+        case 'public':
+        case 'static':
+        case 'yield':
+        case 'let':
+            return true;
+        }
+
+        return false;
+    }
+
+    function isRestrictedWord(id) {
+        return id === 'eval' || id === 'arguments';
+    }
+
+    // 7.6.1.1 Keywords
+
+    function isKeyword(id) {
+        var keyword = false;
+        switch (id.length) {
+        case 2:
+            keyword = (id === 'if') || (id === 'in') || (id === 'do');
+            break;
+        case 3:
+            keyword = (id === 'var') || (id === 'for') || (id === 'new') || (id === 'try');
+            break;
+        case 4:
+            keyword = (id === 'this') || (id === 'else') || (id === 'case') || (id === 'void') || (id === 'with');
+            break;
+        case 5:
+            keyword = (id === 'while') || (id === 'break') || (id === 'catch') || (id === 'throw');
+            break;
+        case 6:
+            keyword = (id === 'return') || (id === 'typeof') || (id === 'delete') || (id === 'switch');
+            break;
+        case 7:
+            keyword = (id === 'default') || (id === 'finally');
+            break;
+        case 8:
+            keyword = (id === 'function') || (id === 'continue') || (id === 'debugger');
+            break;
+        case 10:
+            keyword = (id === 'instanceof');
+            break;
+        }
+
+        if (keyword) {
+            return true;
+        }
+
+        switch (id) {
+        // Future reserved words.
+        // 'const' is specialized as Keyword in V8.
+        case 'const':
+            return true;
+
+        // For compatiblity to SpiderMonkey and ES.next
+        case 'yield':
+        case 'let':
+            return true;
+        }
+
+        if (strict && isStrictModeReservedWord(id)) {
+            return true;
+        }
+
+        return isFutureReservedWord(id);
+    }
+
+    // 7.4 Comments
+
+    function skipComment() {
+        var ch, blockComment, lineComment;
+
+        blockComment = false;
+        lineComment = false;
+
+        while (index < length) {
+            ch = source[index];
+
+            if (lineComment) {
+                ch = source[index++];
+                if (isLineTerminator(ch)) {
+                    lineComment = false;
+                    if (ch === '\r' && source[index] === '\n') {
+                        ++index;
+                    }
+                    ++lineNumber;
+                    lineStart = index;
+                }
+            } else if (blockComment) {
+                if (isLineTerminator(ch)) {
+                    if (ch === '\r' && source[index + 1] === '\n') {
+                        ++index;
+                    }
+                    ++lineNumber;
+                    ++index;
+                    lineStart = index;
+                    if (index >= length) {
+                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+                    }
+                } else {
+                    ch = source[index++];
+                    if (index >= length) {
+                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+                    }
+                    if (ch === '*') {
+                        ch = source[index];
+                        if (ch === '/') {
+                            ++index;
+                            blockComment = false;
+                        }
+                    }
+                }
+            } else if (ch === '/') {
+                ch = source[index + 1];
+                if (ch === '/') {
+                    index += 2;
+                    lineComment = true;
+                } else if (ch === '*') {
+                    index += 2;
+                    blockComment = true;
+                    if (index >= length) {
+                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+                    }
+                } else {
+                    break;
+                }
+            } else if (isWhiteSpace(ch)) {
+                ++index;
+            } else if (isLineTerminator(ch)) {
+                ++index;
+                if (ch ===  '\r' && source[index] === '\n') {
+                    ++index;
+                }
+                ++lineNumber;
+                lineStart = index;
+            } else {
+                break;
+            }
+        }
+    }
+
+    function scanHexEscape(prefix) {
+        var i, len, ch, code = 0;
+
+        len = (prefix === 'u') ? 4 : 2;
+        for (i = 0; i < len; ++i) {
+            if (index < length && isHexDigit(source[index])) {
+                ch = source[index++];
+                code = code * 16 + '0123456789abcdef'.indexOf(ch.toLowerCase());
+            } else {
+                return '';
+            }
+        }
+        return String.fromCharCode(code);
+    }
+
+    function scanIdentifier() {
+        var ch, start, id, restore;
+
+        ch = source[index];
+        if (!isIdentifierStart(ch)) {
+            return;
+        }
+
+        start = index;
+        if (ch === '\\') {
+            ++index;
+            if (source[index] !== 'u') {
+                return;
+            }
+            ++index;
+            restore = index;
+            ch = scanHexEscape('u');
+            if (ch) {
+                if (ch === '\\' || !isIdentifierStart(ch)) {
+                    return;
+                }
+                id = ch;
+            } else {
+                index = restore;
+                id = 'u';
+            }
+        } else {
+            id = source[index++];
+        }
+
+        while (index < length) {
+            ch = source[index];
+            if (!isIdentifierPart(ch)) {
+                break;
+            }
+            if (ch === '\\') {
+                ++index;
+                if (source[index] !== 'u') {
+                    return;
+                }
+                ++index;
+                restore = index;
+                ch = scanHexEscape('u');
+                if (ch) {
+                    if (ch === '\\' || !isIdentifierPart(ch)) {
+                        return;
+                    }
+                    id += ch;
+                } else {
+                    index = restore;
+                    id += 'u';
+                }
+            } else {
+                id += source[index++];
+            }
+        }
+
+        // There is no keyword or literal with only one character.
+        // Thus, it must be an identifier.
+        if (id.length === 1) {
+            return {
+                type: Token.Identifier,
+                value: id,
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        if (isKeyword(id)) {
+            return {
+                type: Token.Keyword,
+                value: id,
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        // 7.8.1 Null Literals
+
+        if (id === 'null') {
+            return {
+                type: Token.NullLiteral,
+                value: id,
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        // 7.8.2 Boolean Literals
+
+        if (id === 'true' || id === 'false') {
+            return {
+                type: Token.BooleanLiteral,
+                value: id,
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        return {
+            type: Token.Identifier,
+            value: id,
+            lineNumber: lineNumber,
+            lineStart: lineStart,
+            range: [start, index]
+        };
+    }
+
+    // 7.7 Punctuators
+
+    function scanPunctuator() {
+        var start = index,
+            ch1 = source[index],
+            ch2,
+            ch3,
+            ch4;
+
+        // Check for most common single-character punctuators.
+
+        if (ch1 === ';' || ch1 === '{' || ch1 === '}') {
+            ++index;
+            return {
+                type: Token.Punctuator,
+                value: ch1,
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        if (ch1 === ',' || ch1 === '(' || ch1 === ')') {
+            ++index;
+            return {
+                type: Token.Punctuator,
+                value: ch1,
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        // Dot (.) can also start a floating-point number, hence the need
+        // to check the next character.
+
+        ch2 = source[index + 1];
+        if (ch1 === '.' && !isDecimalDigit(ch2)) {
+            return {
+                type: Token.Punctuator,
+                value: source[index++],
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        // Peek more characters.
+
+        ch3 = source[index + 2];
+        ch4 = source[index + 3];
+
+        // 4-character punctuator: >>>=
+
+        if (ch1 === '>' && ch2 === '>' && ch3 === '>') {
+            if (ch4 === '=') {
+                index += 4;
+                return {
+                    type: Token.Punctuator,
+                    value: '>>>=',
+                    lineNumber: lineNumber,
+                    lineStart: lineStart,
+                    range: [start, index]
+                };
+            }
+        }
+
+        // 3-character punctuators: === !== >>> <<= >>=
+
+        if (ch1 === '=' && ch2 === '=' && ch3 === '=') {
+            index += 3;
+            return {
+                type: Token.Punctuator,
+                value: '===',
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        if (ch1 === '!' && ch2 === '=' && ch3 === '=') {
+            index += 3;
+            return {
+                type: Token.Punctuator,
+                value: '!==',
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        if (ch1 === '>' && ch2 === '>' && ch3 === '>') {
+            index += 3;
+            return {
+                type: Token.Punctuator,
+                value: '>>>',
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        if (ch1 === '<' && ch2 === '<' && ch3 === '=') {
+            index += 3;
+            return {
+                type: Token.Punctuator,
+                value: '<<=',
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        if (ch1 === '>' && ch2 === '>' && ch3 === '=') {
+            index += 3;
+            return {
+                type: Token.Punctuator,
+                value: '>>=',
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+
+        // 2-character punctuators: <= >= == != ++ -- << >> && ||
+        // += -= *= %= &= |= ^= /=
+
+        if (ch2 === '=') {
+            if ('<>=!+-*%&|^/'.indexOf(ch1) >= 0) {
+                index += 2;
+                return {
+                    type: Token.Punctuator,
+                    value: ch1 + ch2,
+                    lineNumber: lineNumber,
+                    lineStart: lineStart,
+                    range: [start, index]
+                };
+            }
+        }
+
+        if (ch1 === ch2 && ('+-<>&|'.indexOf(ch1) >= 0)) {
+            if ('+-<>&|'.indexOf(ch2) >= 0) {
+                index += 2;
+                return {
+                    type: Token.Punctuator,
+                    value: ch1 + ch2,
+                    lineNumber: lineNumber,
+                    lineStart: lineStart,
+                    range: [start, index]
+                };
+            }
+        }
+
+        // The remaining 1-character punctuators.
+
+        if ('[]<>+-*%&|^!~?:=/'.indexOf(ch1) >= 0) {
+            return {
+                type: Token.Punctuator,
+                value: source[index++],
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [start, index]
+            };
+        }
+    }
+
+    // 7.8.3 Numeric Literals
+
+    function scanNumericLiteral() {
+        var number, start, ch;
+
+        ch = source[index];
+        assert(isDecimalDigit(ch) || (ch === '.'),
+            'Numeric literal must start with a decimal digit or a decimal point');
+
+        start = index;
+        number = '';
+        if (ch !== '.') {
+            number = source[index++];
+            ch = source[index];
+
+            // Hex number starts with '0x'.
+            // Octal number starts with '0'.
+            if (number === '0') {
+                if (ch === 'x' || ch === 'X') {
+                    number += source[index++];
+                    while (index < length) {
+                        ch = source[index];
+                        if (!isHexDigit(ch)) {
+                            break;
+                        }
+                        number += source[index++];
+                    }
+
+                    if (number.length <= 2) {
+                        // only 0x
+                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+                    }
+
+                    if (index < length) {
+                        ch = source[index];
+                        if (isIdentifierStart(ch)) {
+                            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+                        }
+                    }
+                    return {
+                        type: Token.NumericLiteral,
+                        value: parseInt(number, 16),
+                        lineNumber: lineNumber,
+                        lineStart: lineStart,
+                        range: [start, index]
+                    };
+                } else if (isOctalDigit(ch)) {
+                    number += source[index++];
+                    while (index < length) {
+                        ch = source[index];
+                        if (!isOctalDigit(ch)) {
+                            break;
+                        }
+                        number += source[index++];
+                    }
+
+                    if (index < length) {
+                        ch = source[index];
+                        if (isIdentifierStart(ch) || isDecimalDigit(ch)) {
+                            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+                        }
+                    }
+                    return {
+                        type: Token.NumericLiteral,
+                        value: parseInt(number, 8),
+                        octal: true,
+                        lineNumber: lineNumber,
+                        lineStart: lineStart,
+                        range: [start, index]
+                    };
+                }
+
+                // decimal number starts with '0' such as '09' is illegal.
+                if (isDecimalDigit(ch)) {
+                    throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+                }
+            }
+
+            while (index < length) {
+                ch = source[index];
+                if (!isDecimalDigit(ch)) {
+                    break;
+                }
+                number += source[index++];
+            }
+        }
+
+        if (ch === '.') {
+            number += source[index++];
+            while (index < length) {
+                ch = source[index];
+                if (!isDecimalDigit(ch)) {
+                    break;
+                }
+                number += source[index++];
+            }
+        }
+
+        if (ch === 'e' || ch === 'E') {
+            number += source[index++];
+
+            ch = source[index];
+            if (ch === '+' || ch === '-') {
+                number += source[index++];
+            }
+
+            ch = source[index];
+            if (isDecimalDigit(ch)) {
+                number += source[index++];
+                while (index < length) {
+                    ch = source[index];
+                    if (!isDecimalDigit(ch)) {
+                        break;
+                    }
+                    number += source[index++];
+                }
+            } else {
+                ch = 'character ' + ch;
+                if (index >= length) {
+                    ch = '';
+                }
+                throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+            }
+        }
+
+        if (index < length) {
+            ch = source[index];
+            if (isIdentifierStart(ch)) {
+                throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+            }
+        }
+
+        return {
+            type: Token.NumericLiteral,
+            value: parseFloat(number),
+            lineNumber: lineNumber,
+            lineStart: lineStart,
+            range: [start, index]
+        };
+    }
+
+    // 7.8.4 String Literals
+
+    function scanStringLiteral() {
+        var str = '', quote, start, ch, code, unescaped, restore, octal = false;
+
+        quote = source[index];
+        assert((quote === '\'' || quote === '"'),
+            'String literal must starts with a quote');
+
+        start = index;
+        ++index;
+
+        while (index < length) {
+            ch = source[index++];
+
+            if (ch === quote) {
+                quote = '';
+                break;
+            } else if (ch === '\\') {
+                ch = source[index++];
+                if (!isLineTerminator(ch)) {
+                    switch (ch) {
+                    case 'n':
+                        str += '\n';
+                        break;
+                    case 'r':
+                        str += '\r';
+                        break;
+                    case 't':
+                        str += '\t';
+                        break;
+                    case 'u':
+                    case 'x':
+                        restore = index;
+                        unescaped = scanHexEscape(ch);
+                        if (unescaped) {
+                            str += unescaped;
+                        } else {
+                            index = restore;
+                            str += ch;
+                        }
+                        break;
+                    case 'b':
+                        str += '\b';
+                        break;
+                    case 'f':
+                        str += '\f';
+                        break;
+                    case 'v':
+                        str += '\v';
+                        break;
+
+                    default:
+                        if (isOctalDigit(ch)) {
+                            code = '01234567'.indexOf(ch);
+
+                            // \0 is not octal escape sequence
+                            if (code !== 0) {
+                                octal = true;
+                            }
+
+                            if (index < length && isOctalDigit(source[index])) {
+                                octal = true;
+                                code = code * 8 + '01234567'.indexOf(source[index++]);
+
+                                // 3 digits are only allowed when string starts
+                                // with 0, 1, 2, 3
+                                if ('0123'.indexOf(ch) >= 0 &&
+                                        index < length &&
+                                        isOctalDigit(source[index])) {
+                                    code = code * 8 + '01234567'.indexOf(source[index++]);
+                                }
+                            }
+                            str += String.fromCharCode(code);
+                        } else {
+                            str += ch;
+                        }
+                        break;
+                    }
+                } else {
+                    ++lineNumber;
+                    if (ch ===  '\r' && source[index] === '\n') {
+                        ++index;
+                    }
+                }
+            } else if (isLineTerminator(ch)) {
+                break;
+            } else {
+                str += ch;
+            }
+        }
+
+        if (quote !== '') {
+            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+        }
+
+        return {
+            type: Token.StringLiteral,
+            value: str,
+            octal: octal,
+            lineNumber: lineNumber,
+            lineStart: lineStart,
+            range: [start, index]
+        };
+    }
+
+    function scanRegExp() {
+        var str, ch, start, pattern, flags, value, classMarker = false, restore, terminated = false;
+
+        buffer = null;
+        skipComment();
+
+        start = index;
+        ch = source[index];
+        assert(ch === '/', 'Regular expression literal must start with a slash');
+        str = source[index++];
+
+        while (index < length) {
+            ch = source[index++];
+            str += ch;
+            if (classMarker) {
+                if (ch === ']') {
+                    classMarker = false;
+                }
+            } else {
+                if (ch === '\\') {
+                    ch = source[index++];
+                    // ECMA-262 7.8.5
+                    if (isLineTerminator(ch)) {
+                        throwError({}, Messages.UnterminatedRegExp);
+                    }
+                    str += ch;
+                } else if (ch === '/') {
+                    terminated = true;
+                    break;
+                } else if (ch === '[') {
+                    classMarker = true;
+                } else if (isLineTerminator(ch)) {
+                    throwError({}, Messages.UnterminatedRegExp);
+                }
+            }
+        }
+
+        if (!terminated) {
+            throwError({}, Messages.UnterminatedRegExp);
+        }
+
+        // Exclude leading and trailing slash.
+        pattern = str.substr(1, str.length - 2);
+
+        flags = '';
+        while (index < length) {
+            ch = source[index];
+            if (!isIdentifierPart(ch)) {
+                break;
+            }
+
+            ++index;
+            if (ch === '\\' && index < length) {
+                ch = source[index];
+                if (ch === 'u') {
+                    ++index;
+                    restore = index;
+                    ch = scanHexEscape('u');
+                    if (ch) {
+                        flags += ch;
+                        str += '\\u';
+                        for (; restore < index; ++restore) {
+                            str += source[restore];
+                        }
+                    } else {
+                        index = restore;
+                        flags += 'u';
+                        str += '\\u';
+                    }
+                } else {
+                    str += '\\';
+                }
+            } else {
+                flags += ch;
+                str += ch;
+            }
+        }
+
+        try {
+            value = new RegExp(pattern, flags);
+        } catch (e) {
+            throwError({}, Messages.InvalidRegExp);
+        }
+
+        return {
+            literal: str,
+            value: value,
+            range: [start, index]
+        };
+    }
+
+    function isIdentifierName(token) {
+        return token.type === Token.Identifier ||
+            token.type === Token.Keyword ||
+            token.type === Token.BooleanLiteral ||
+            token.type === Token.NullLiteral;
+    }
+
+    function advance() {
+        var ch, token;
+
+        skipComment();
+
+        if (index >= length) {
+            return {
+                type: Token.EOF,
+                lineNumber: lineNumber,
+                lineStart: lineStart,
+                range: [index, index]
+            };
+        }
+
+        token = scanPunctuator();
+        if (typeof token !== 'undefined') {
+            return token;
+        }
+
+        ch = source[index];
+
+        if (ch === '\'' || ch === '"') {
+            return scanStringLiteral();
+        }
+
+        if (ch === '.' || isDecimalDigit(ch)) {
+            return scanNumericLiteral();
+        }
+
+        token = scanIdentifier();
+        if (typeof token !== 'undefined') {
+            return token;
+        }
+
+        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+    }
+
+    function lex() {
+        var token;
+
+        if (buffer) {
+            index = buffer.range[1];
+            lineNumber = buffer.lineNumber;
+            lineStart = buffer.lineStart;
+            token = buffer;
+            buffer = null;
+            return token;
+        }
+
+        buffer = null;
+        return advance();
+    }
+
+    function lookahead() {
+        var pos, line, start;
+
+        if (buffer !== null) {
+            return buffer;
+        }
+
+        pos = index;
+        line = lineNumber;
+        start = lineStart;
+        buffer = advance();
+        index = pos;
+        lineNumber = line;
+        lineStart = start;
+
+        return buffer;
+    }
+
+    // Return true if there is a line terminator before the next token.
+
+    function peekLineTerminator() {
+        var pos, line, start, found;
+
+        pos = index;
+        line = lineNumber;
+        start = lineStart;
+        skipComment();
+        found = lineNumber !== line;
+        index = pos;
+        lineNumber = line;
+        lineStart = start;
+
+        return found;
+    }
+
+    // Throw an exception
+
+    function throwError(token, messageFormat) {
+        var error,
+            args = Array.prototype.slice.call(arguments, 2),
+            msg = messageFormat.replace(
+                /%(\d)/g,
+                function (whole, index) {
+                    return args[index] || '';
+                }
+            );
+
+        if (typeof token.lineNumber === 'number') {
+            error = new Error('Line ' + token.lineNumber + ': ' + msg);
+            error.index = token.range[0];
+            error.lineNumber = token.lineNumber;
+            error.column = token.range[0] - lineStart + 1;
+        } else {
+            error = new Error('Line ' + lineNumber + ': ' + msg);
+            error.index = index;
+            error.lineNumber = lineNumber;
+            error.column = index - lineStart + 1;
+        }
+
+        throw error;
+    }
+
+    function throwErrorTolerant() {
+        try {
+            throwError.apply(null, arguments);
+        } catch (e) {
+            if (extra.errors) {
+                extra.errors.push(e);
+            } else {
+                throw e;
+            }
+        }
+    }
+
+
+    // Throw an exception because of the token.
+
+    function throwUnexpected(token) {
+        if (token.type === Token.EOF) {
+            throwError(token, Messages.UnexpectedEOS);
+        }
+
+        if (token.type === Token.NumericLiteral) {
+            throwError(token, Messages.UnexpectedNumber);
+        }
+
+        if (token.type === Token.StringLiteral) {
+            throwError(token, Messages.UnexpectedString);
+        }
+
+        if (token.type === Token.Identifier) {
+            throwError(token, Messages.UnexpectedIdentifier);
+        }
+
+        if (token.type === Token.Keyword) {
+            if (isFutureReservedWord(token.value)) {
+                throwError(token, Messages.UnexpectedReserved);
+            } else if (strict && isStrictModeReservedWord(token.value)) {
+                throwErrorTolerant(token, Messages.StrictReservedWord);
+                return;
+            }
+            throwError(token, Messages.UnexpectedToken, token.value);
+        }
+
+        // BooleanLiteral, NullLiteral, or Punctuator.
+        throwError(token, Messages.UnexpectedToken, token.value);
+    }
+
+    // Expect the next token to match the specified punctuator.
+    // If not, an exception will be thrown.
+
+    function expect(value) {
+        var token = lex();
+        if (token.type !== Token.Punctuator || token.value !== value) {
+            throwUnexpected(token);
+        }
+    }
+
+    // Expect the next token to match the specified keyword.
+    // If not, an exception will be thrown.
+
+    function expectKeyword(keyword) {
+        var token = lex();
+        if (token.type !== Token.Keyword || token.value !== keyword) {
+            throwUnexpected(token);
+        }
+    }
+
+    // Return true if the next token matches the specified punctuator.
+
+    function match(value) {
+        var token = lookahead();
+        return token.type === Token.Punctuator && token.value === value;
+    }
+
+    // Return true if the next token matches the specified keyword
+
+    function matchKeyword(keyword) {
+        var token = lookahead();
+        return token.type === Token.Keyword && token.value === keyword;
+    }
+
+    // Return true if the next token is an assignment operator
+
+    function matchAssign() {
+        var token = lookahead(),
+            op = token.value;
+
+        if (token.type !== Token.Punctuator) {
+            return false;
+        }
+        return op === '=' ||
+            op === '*=' ||
+            op === '/=' ||
+            op === '%=' ||
+            op === '+=' ||
+            op === '-=' ||
+            op === '<<=' ||
+            op === '>>=' ||
+            op === '>>>=' ||
+            op === '&=' ||
+            op === '^=' ||
+            op === '|=';
+    }
+
+    function consumeSemicolon() {
+        var token, line;
+
+        // Catch the very common case first.
+        if (source[index] === ';') {
+            lex();
+            return;
+        }
+
+        line = lineNumber;
+        skipComment();
+        if (lineNumber !== line) {
+            return;
+        }
+
+        if (match(';')) {
+            lex();
+            return;
+        }
+
+        token = lookahead();
+        if (token.type !== Token.EOF && !match('}')) {
+            throwUnexpected(token);
+        }
+    }
+
+    // Return true if provided expression is LeftHandSideExpression
+
+    function isLeftHandSide(expr) {
+        return expr.type === Syntax.Identifier || expr.type === Syntax.MemberExpression;
+    }
+
+    // 11.1.4 Array Initialiser
+
+    function parseArrayInitialiser() {
+        var elements = [];
+
+        expect('[');
+
+        while (!match(']')) {
+            if (match(',')) {
+                lex();
+                elements.push(null);
+            } else {
+                elements.push(parseAssignmentExpression());
+
+                if (!match(']')) {
+                    expect(',');
+                }
+            }
+        }
+
+        expect(']');
+
+        return {
+            type: Syntax.ArrayExpression,
+            elements: elements
+        };
+    }
+
+    // 11.1.5 Object Initialiser
+
+    function parsePropertyFunction(param, first) {
+        var previousStrict, body;
+
+        previousStrict = strict;
+        body = parseFunctionSourceElements();
+        if (first && strict && isRestrictedWord(param[0].name)) {
+            throwErrorTolerant(first, Messages.StrictParamName);
+        }
+        strict = previousStrict;
+
+        return {
+            type: Syntax.FunctionExpression,
+            id: null,
+            params: param,
+            defaults: [],
+            body: body,
+            rest: null,
+            generator: false,
+            expression: false
+        };
+    }
+
+    function parseObjectPropertyKey() {
+        var token = lex();
+
+        // Note: This function is called only from parseObjectProperty(), where
+        // EOF and Punctuator tokens are already filtered out.
+
+        if (token.type === Token.StringLiteral || token.type === Token.NumericLiteral) {
+            if (strict && token.octal) {
+                throwErrorTolerant(token, Messages.StrictOctalLiteral);
+            }
+            return createLiteral(token);
+        }
+
+        return {
+            type: Syntax.Identifier,
+            name: token.value
+        };
+    }
+
+    function parseObjectProperty() {
+        var token, key, id, param;
+
+        token = lookahead();
+
+        if (token.type === Token.Identifier) {
+
+            id = parseObjectPropertyKey();
+
+            // Property Assignment: Getter and Setter.
+
+            if (token.value === 'get' && !match(':')) {
+                key = parseObjectPropertyKey();
+                expect('(');
+                expect(')');
+                return {
+                    type: Syntax.Property,
+                    key: key,
+                    value: parsePropertyFunction([]),
+                    kind: 'get'
+                };
+            } else if (token.value === 'set' && !match(':')) {
+                key = parseObjectPropertyKey();
+                expect('(');
+                token = lookahead();
+                if (token.type !== Token.Identifier) {
+                    throwUnexpected(lex());
+                }
+                param = [ parseVariableIdentifier() ];
+                expect(')');
+                return {
+                    type: Syntax.Property,
+                    key: key,
+                    value: parsePropertyFunction(param, token),
+                    kind: 'set'
+                };
+            } else {
+                expect(':');
+                return {
+                    type: Syntax.Property,
+                    key: id,
+                    value: parseAssignmentExpression(),
+                    kind: 'init'
+                };
+            }
+        } else if (token.type === Token.EOF || token.type === Token.Punctuator) {
+            throwUnexpected(token);
+        } else {
+            key = parseObjectPropertyKey();
+            expect(':');
+            return {
+                type: Syntax.Property,
+                key: key,
+                value: parseAssignmentExpression(),
+                kind: 'init'
+            };
+        }
+    }
+
+    function parseObjectInitialiser() {
+        var properties = [], property, name, kind, map = {}, toString = String;
+
+        expect('{');
+
+        while (!match('}')) {
+            property = parseObjectProperty();
+
+            if (property.key.type === Syntax.Identifier) {
+                name = property.key.name;
+            } else {
+                name = toString(property.key.value);
+            }
+            kind = (property.kind === 'init') ? PropertyKind.Data : (property.kind === 'get') ? PropertyKind.Get : PropertyKind.Set;
+            if (Object.prototype.hasOwnProperty.call(map, name)) {
+                if (map[name] === PropertyKind.Data) {
+                    if (strict && kind === PropertyKind.Data) {
+                        throwErrorTolerant({}, Messages.StrictDuplicateProperty);
+                    } else if (kind !== PropertyKind.Data) {
+                        throwErrorTolerant({}, Messages.AccessorDataProperty);
+                    }
+                } else {
+                    if (kind === PropertyKind.Data) {
+                        throwErrorTolerant({}, Messages.AccessorDataProperty);
+                    } else if (map[name] & kind) {
+                        throwErrorTolerant({}, Messages.AccessorGetSet);
+                    }
+                }
+                map[name] |= kind;
+            } else {
+                map[name] = kind;
+            }
+
+            properties.push(property);
+
+            if (!match('}')) {
+                expect(',');
+            }
+        }
+
+        expect('}');
+
+        return {
+            type: Syntax.ObjectExpression,
+            properties: properties
+        };
+    }
+
+    // 11.1.6 The Grouping Operator
+
+    function parseGroupExpression() {
+        var expr;
+
+        expect('(');
+
+        expr = parseExpression();
+
+        expect(')');
+
+        return expr;
+    }
+
+
+    // 11.1 Primary Expressions
+
+    function parsePrimaryExpression() {
+        var token = lookahead(),
+            type = token.type;
+
+        if (type === Token.Identifier) {
+            return {
+                type: Syntax.Identifier,
+                name: lex().value
+            };
+        }
+
+        if (type === Token.StringLiteral || type === Token.NumericLiteral) {
+            if (strict && token.octal) {
+                throwErrorTolerant(token, Messages.StrictOctalLiteral);
+            }
+            return createLiteral(lex());
+        }
+
+        if (type === Token.Keyword) {
+            if (matchKeyword('this')) {
+                lex();
+                return {
+                    type: Syntax.ThisExpression
+                };
+            }
+
+            if (matchKeyword('function')) {
+                return parseFunctionExpression();
+            }
+        }
+
+        if (type === Token.BooleanLiteral) {
+            lex();
+            token.value = (token.value === 'true');
+            return createLiteral(token);
+        }
+
+        if (type === Token.NullLiteral) {
+            lex();
+            token.value = null;
+            return createLiteral(token);
+        }
+
+        if (match('[')) {
+            return parseArrayInitialiser();
+        }
+
+        if (match('{')) {
+            return parseObjectInitialiser();
+        }
+
+        if (match('(')) {
+            return parseGroupExpression();
+        }
+
+        if (match('/') || match('/=')) {
+            return createLiteral(scanRegExp());
+        }
+
+        return throwUnexpected(lex());
+    }
+
+    // 11.2 Left-Hand-Side Expressions
+
+    function parseArguments() {
+        var args = [];
+
+        expect('(');
+
+        if (!match(')')) {
+            while (index < length) {
+                args.push(parseAssignmentExpression());
+                if (match(')')) {
+                    break;
+                }
+                expect(',');
+            }
+        }
+
+        expect(')');
+
+        return args;
+    }
+
+    function parseNonComputedProperty() {
+        var token = lex();
+
+        if (!isIdentifierName(token)) {
+            throwUnexpected(token);
+        }
+
+        return {
+            type: Syntax.Identifier,
+            name: token.value
+        };
+    }
+
+    function parseNonComputedMember() {
+        expect('.');
+
+        return parseNonComputedProperty();
+    }
+
+    function parseComputedMember() {
+        var expr;
+
+        expect('[');
+
+        expr = parseExpression();
+
+        expect(']');
+
+        return expr;
+    }
+
+    function parseNewExpression() {
+        var expr;
+
+        expectKeyword('new');
+
+        expr = {
+            type: Syntax.NewExpression,
+            callee: parseLeftHandSideExpression(),
+            'arguments': []
+        };
+
+        if (match('(')) {
+            expr['arguments'] = parseArguments();
+        }
+
+        return expr;
+    }
+
+    function parseLeftHandSideExpressionAllowCall() {
+        var expr;
+
+        expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
+
+        while (match('.') || match('[') || match('(')) {
+            if (match('(')) {
+                expr = {
+                    type: Syntax.CallExpression,
+                    callee: expr,
+                    'arguments': parseArguments()
+                };
+            } else if (match('[')) {
+                expr = {
+                    type: Syntax.MemberExpression,
+                    computed: true,
+                    object: expr,
+                    property: parseComputedMember()
+                };
+            } else {
+                expr = {
+                    type: Syntax.MemberExpression,
+                    computed: false,
+                    object: expr,
+                    property: parseNonComputedMember()
+                };
+            }
+        }
+
+        return expr;
+    }
+
+
+    function parseLeftHandSideExpression() {
+        var expr;
+
+        expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
+
+        while (match('.') || match('[')) {
+            if (match('[')) {
+                expr = {
+                    type: Syntax.MemberExpression,
+                    computed: true,
+                    object: expr,
+                    property: parseComputedMember()
+                };
+            } else {
+                expr = {
+                    type: Syntax.MemberExpression,
+                    computed: false,
+                    object: expr,
+                    property: parseNonComputedMember()
+                };
+            }
+        }
+
+        return expr;
+    }
+
+    // 11.3 Postfix Expressions
+
+    function parsePostfixExpression() {
+        var expr = parseLeftHandSideExpressionAllowCall(), token;
+
+        token = lookahead();
+        if (token.type !== Token.Punctuator) {
+            return expr;
+        }
+
+        if ((match('++') || match('--')) && !peekLineTerminator()) {
+            // 11.3.1, 11.3.2
+            if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
+                throwErrorTolerant({}, Messages.StrictLHSPostfix);
+            }
+
+            if (!isLeftHandSide(expr)) {
+                throwError({}, Messages.InvalidLHSInAssignment);
+            }
+
+            expr = {
+                type: Syntax.UpdateExpression,
+                operator: lex().value,
+                argument: expr,
+                prefix: false
+            };
+        }
+
+        return expr;
+    }
+
+    // 11.4 Unary Operators
+
+    function parseUnaryExpression() {
+        var token, expr;
+
+        token = lookahead();
+        if (token.type !== Token.Punctuator && token.type !== Token.Keyword) {
+            return parsePostfixExpression();
+        }
+
+        if (match('++') || match('--')) {
+            token = lex();
+            expr = parseUnaryExpression();
+            // 11.4.4, 11.4.5
+            if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
+                throwErrorTolerant({}, Messages.StrictLHSPrefix);
+            }
+
+            if (!isLeftHandSide(expr)) {
+                throwError({}, Messages.InvalidLHSInAssignment);
+            }
+
+            expr = {
+                type: Syntax.UpdateExpression,
+                operator: token.value,
+                argument: expr,
+                prefix: true
+            };
+            return expr;
+        }
+
+        if (match('+') || match('-') || match('~') || match('!')) {
+            expr = {
+                type: Syntax.UnaryExpression,
+                operator: lex().value,
+                argument: parseUnaryExpression()
+            };
+            return expr;
+        }
+
+        if (matchKeyword('delete') || matchKeyword('void') || matchKeyword('typeof')) {
+            expr = {
+                type: Syntax.UnaryExpression,
+                operator: lex().value,
+                argument: parseUnaryExpression()
+            };
+            if (strict && expr.operator === 'delete' && expr.argument.type === Syntax.Identifier) {
+                throwErrorTolerant({}, Messages.StrictDelete);
+            }
+            return expr;
+        }
+
+        return parsePostfixExpression();
+    }
+
+    // 11.5 Multiplicative Operators
+
+    function parseMultiplicativeExpression() {
+        var expr = parseUnaryExpression();
+
+        while (match('*') || match('/') || match('%')) {
+            expr = {
+                type: Syntax.BinaryExpression,
+                operator: lex().value,
+                left: expr,
+                right: parseUnaryExpression()
+            };
+        }
+
+        return expr;
+    }
+
+    // 11.6 Additive Operators
+
+    function parseAdditiveExpression() {
+        var expr = parseMultiplicativeExpression();
+
+        while (match('+') || match('-')) {
+            expr = {
+                type: Syntax.BinaryExpression,
+                operator: lex().value,
+                left: expr,
+                right: parseMultiplicativeExpression()
+            };
+        }
+
+        return expr;
+    }
+
+    // 11.7 Bitwise Shift Operators
+
+    function parseShiftExpression() {
+        var expr = parseAdditiveExpression();
+
+        while (match('<<') || match('>>') || match('>>>')) {
+            expr = {
+                type: Syntax.BinaryExpression,
+                operator: lex().value,
+                left: expr,
+                right: parseAdditiveExpression()
+            };
+        }
+
+        return expr;
+    }
+    // 11.8 Relational Operators
+
+    function parseRelationalExpression() {
+        var expr, previousAllowIn;
+
+        previousAllowIn = state.allowIn;
+        state.allowIn = true;
+
+        expr = parseShiftExpression();
+
+        while (match('<') || match('>') || match('<=') || match('>=') || (previousAllowIn && matchKeyword('in')) || matchKeyword('instanceof')) {
+            expr = {
+                type: Syntax.BinaryExpression,
+                operator: lex().value,
+                left: expr,
+                right: parseShiftExpression()
+            };
+        }
+
+        state.allowIn = previousAllowIn;
+        return expr;
+    }
+
+    // 11.9 Equality Operators
+
+    function parseEqualityExpression() {
+        var expr = parseRelationalExpression();
+
+        while (match('==') || match('!=') || match('===') || match('!==')) {
+            expr = {
+                type: Syntax.BinaryExpression,
+                operator: lex().value,
+                left: expr,
+                right: parseRelationalExpression()
+            };
+        }
+
+        return expr;
+    }
+
+    // 11.10 Binary Bitwise Operators
+
+    function parseBitwiseANDExpression() {
+        var expr = parseEqualityExpression();
+
+        while (match('&')) {
+            lex();
+            expr = {
+                type: Syntax.BinaryExpression,
+                operator: '&',
+                left: expr,
+                right: parseEqualityExpression()
+            };
+        }
+
+        return expr;
+    }
+
+    function parseBitwiseXORExpression() {
+        var expr = parseBitwiseANDExpression();
+
+        while (match('^')) {
+            lex();
+            expr = {
+                type: Syntax.BinaryExpression,
+                operator: '^',
+                left: expr,
+                right: parseBitwiseANDExpression()
+            };
+        }
+
+        return expr;
+    }
+
+    function parseBitwiseORExpression() {
+        var expr = parseBitwiseXORExpression();
+
+        while (match('|')) {
+            lex();
+            expr = {
+                type: Syntax.BinaryExpression,
+                operator: '|',
+                left: expr,
+                right: parseBitwiseXORExpression()
+            };
+        }
+
+        return expr;
+    }
+
+    // 11.11 Binary Logical Operators
+
+    function parseLogicalANDExpression() {
+        var expr = parseBitwiseORExpression();
+
+        while (match('&&')) {
+            lex();
+            expr = {
+                type: Syntax.LogicalExpression,
+                operator: '&&',
+                left: expr,
+                right: parseBitwiseORExpression()
+            };
+        }
+
+        return expr;
+    }
+
+    function parseLogicalORExpression() {
+        var expr = parseLogicalANDExpression();
+
+        while (match('||')) {
+            lex();
+            expr = {
+                type: Syntax.LogicalExpression,
+                operator: '||',
+                left: expr,
+                right: parseLogicalANDExpression()
+            };
+        }
+
+        return expr;
+    }
+
+    // 11.12 Conditional Operator
+
+    function parseConditionalExpression() {
+        var expr, previousAllowIn, consequent;
+
+        expr = parseLogicalORExpression();
+
+        if (match('?')) {
+            lex();
+            previousAllowIn = state.allowIn;
+            state.allowIn = true;
+            consequent = parseAssignmentExpression();
+            state.allowIn = previousAllowIn;
+            expect(':');
+
+            expr = {
+                type: Syntax.ConditionalExpression,
+                test: expr,
+                consequent: consequent,
+                alternate: parseAssignmentExpression()
+            };
+        }
+
+        return expr;
+    }
+
+    // 11.13 Assignment Operators
+
+    function parseAssignmentExpression() {
+        var token, expr;
+
+        token = lookahead();
+        expr = parseConditionalExpression();
+
+        if (matchAssign()) {
+            // LeftHandSideExpression
+            if (!isLeftHandSide(expr)) {
+                throwError({}, Messages.InvalidLHSInAssignment);
+            }
+
+            // 11.13.1
+            if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
+                throwErrorTolerant(token, Messages.StrictLHSAssignment);
+            }
+
+            expr = {
+                type: Syntax.AssignmentExpression,
+                operator: lex().value,
+                left: expr,
+                right: parseAssignmentExpression()
+            };
+        }
+
+        return expr;
+    }
+
+    // 11.14 Comma Operator
+
+    function parseExpression() {
+        var expr = parseAssignmentExpression();
+
+        if (match(',')) {
+            expr = {
+                type: Syntax.SequenceExpression,
+                expressions: [ expr ]
+            };
+
+            while (index < length) {
+                if (!match(',')) {
+                    break;
+                }
+                lex();
+                expr.expressions.push(parseAssignmentExpression());
+            }
+
+        }
+        return expr;
+    }
+
+    // 12.1 Block
+
+    function parseStatementList() {
+        var list = [],
+            statement;
+
+        while (index < length) {
+            if (match('}')) {
+                break;
+            }
+            statement = parseSourceElement();
+            if (typeof statement === 'undefined') {
+                break;
+            }
+            list.push(statement);
+        }
+
+        return list;
+    }
+
+    function parseBlock() {
+        var block;
+
+        expect('{');
+
+        block = parseStatementList();
+
+        expect('}');
+
+        return {
+            type: Syntax.BlockStatement,
+            body: block
+        };
+    }
+
+    // 12.2 Variable Statement
+
+    function parseVariableIdentifier() {
+        var token = lex();
+
+        if (token.type !== Token.Identifier) {
+            throwUnexpected(token);
+        }
+
+        return {
+            type: Syntax.Identifier,
+            name: token.value
+        };
+    }
+
+    function parseVariableDeclaration(kind) {
+        var id = parseVariableIdentifier(),
+            init = null;
+
+        // 12.2.1
+        if (strict && isRestrictedWord(id.name)) {
+            throwErrorTolerant({}, Messages.StrictVarName);
+        }
+
+        if (kind === 'const') {
+            expect('=');
+            init = parseAssignmentExpression();
+        } else if (match('=')) {
+            lex();
+            init = parseAssignmentExpression();
+        }
+
+        return {
+            type: Syntax.VariableDeclarator,
+            id: id,
+            init: init
+        };
+    }
+
+    function parseVariableDeclarationList(kind) {
+        var list = [];
+
+        while (index < length) {
+            list.push(parseVariableDeclaration(kind));
+            if (!match(',')) {
+                break;
+            }
+            lex();
+        }
+
+        return list;
+    }
+
+    function parseVariableStatement() {
+        var declarations;
+
+        expectKeyword('var');
+
+        declarations = parseVariableDeclarationList();
+
+        consumeSemicolon();
+
+        return {
+            type: Syntax.VariableDeclaration,
+            declarations: declarations,
+            kind: 'var'
+        };
+    }
+
+    // kind may be `const` or `let`
+    // Both are experimental and not in the specification yet.
+    // see http://wiki.ecmascript.org/doku.php?id=harmony:const
+    // and http://wiki.ecmascript.org/doku.php?id=harmony:let
+    function parseConstLetDeclaration(kind) {
+        var declarations;
+
+        expectKeyword(kind);
+
+        declarations = parseVariableDeclarationList(kind);
+
+        consumeSemicolon();
+
+        return {
+            type: Syntax.VariableDeclaration,
+            declarations: declarations,
+            kind: kind
+        };
+    }
+
+    // 12.3 Empty Statement
+
+    function parseEmptyStatement() {
+        expect(';');
+
+        return {
+            type: Syntax.EmptyStatement
+        };
+    }
+
+    // 12.4 Expression Statement
+
+    function parseExpressionStatement() {
+        var expr = parseExpression();
+
+        consumeSemicolon();
+
+        return {
+            type: Syntax.ExpressionStatement,
+            expression: expr
+        };
+    }
+
+    // 12.5 If statement
+
+    function parseIfStatement() {
+        var test, consequent, alternate;
+
+        expectKeyword('if');
+
+        expect('(');
+
+        test = parseExpression();
+
+        expect(')');
+
+        consequent = parseStatement();
+
+        if (matchKeyword('else')) {
+            lex();
+            alternate = parseStatement();
+        } else {
+            alternate = null;
+        }
+
+        return {
+            type: Syntax.IfStatement,
+            test: test,
+            consequent: consequent,
+            alternate: alternate
+        };
+    }
+
+    // 12.6 Iteration Statements
+
+    function parseDoWhileStatement() {
+        var body, test, oldInIteration;
+
+        expectKeyword('do');
+
+        oldInIteration = state.inIteration;
+        state.inIteration = true;
+
+        body = parseStatement();
+
+        state.inIteration = oldInIteration;
+
+        expectKeyword('while');
+
+        expect('(');
+
+        test = parseExpression();
+
+        expect(')');
+
+        if (match(';')) {
+            lex();
+        }
+
+        return {
+            type: Syntax.DoWhileStatement,
+            body: body,
+            test: test
+        };
+    }
+
+    function parseWhileStatement() {
+        var test, body, oldInIteration;
+
+        expectKeyword('while');
+
+        expect('(');
+
+        test = parseExpression();
+
+        expect(')');
+
+        oldInIteration = state.inIteration;
+        state.inIteration = true;
+
+        body = parseStatement();
+
+        state.inIteration = oldInIteration;
+
+        return {
+            type: Syntax.WhileStatement,
+            test: test,
+            body: body
+        };
+    }
+
+    function parseForVariableDeclaration() {
+        var token = lex();
+
+        return {
+            type: Syntax.VariableDeclaration,
+            declarations: parseVariableDeclarationList(),
+            kind: token.value
+        };
+    }
+
+    function parseForStatement() {
+        var init, test, update, left, right, body, oldInIteration;
+
+        init = test = update = null;
+
+        expectKeyword('for');
+
+        expect('(');
+
+        if (match(';')) {
+            lex();
+        } else {
+            if (matchKeyword('var') || matchKeyword('let')) {
+                state.allowIn = false;
+                init = parseForVariableDeclaration();
+                state.allowIn = true;
+
+                if (init.declarations.length === 1 && matchKeyword('in')) {
+                    lex();
+                    left = init;
+                    right = parseExpression();
+                    init = null;
+                }
+            } else {
+                state.allowIn = false;
+                init = parseExpression();
+                state.allowIn = true;
+
+                if (matchKeyword('in')) {
+                    // LeftHandSideExpression
+                    if (!isLeftHandSide(init)) {
+                        throwError({}, Messages.InvalidLHSInForIn);
+                    }
+
+                    lex();
+                    left = init;
+                    right = parseExpression();
+                    init = null;
+                }
+            }
+
+            if (typeof left === 'undefined') {
+                expect(';');
+            }
+        }
+
+        if (typeof left === 'undefined') {
+
+            if (!match(';')) {
+                test = parseExpression();
+            }
+            expect(';');
+
+            if (!match(')')) {
+                update = parseExpression();
+            }
+        }
+
+        expect(')');
+
+        oldInIteration = state.inIteration;
+        state.inIteration = true;
+
+        body = parseStatement();
+
+        state.inIteration = oldInIteration;
+
+        if (typeof left === 'undefined') {
+            return {
+                type: Syntax.ForStatement,
+                init: init,
+                test: test,
+                update: update,
+                body: body
+            };
+        }
+
+        return {
+            type: Syntax.ForInStatement,
+            left: left,
+            right: right,
+            body: body,
+            each: false
+        };
+    }
+
+    // 12.7 The continue statement
+
+    function parseContinueStatement() {
+        var token, label = null;
+
+        expectKeyword('continue');
+
+        // Optimize the most common form: 'continue;'.
+        if (source[index] === ';') {
+            lex();
+
+            if (!state.inIteration) {
+                throwError({}, Messages.IllegalContinue);
+            }
+
+            return {
+                type: Syntax.ContinueStatement,
+                label: null
+            };
+        }
+
+        if (peekLineTerminator()) {
+            if (!state.inIteration) {
+                throwError({}, Messages.IllegalContinue);
+            }
+
+            return {
+                type: Syntax.ContinueStatement,
+                label: null
+            };
+        }
+
+        token = lookahead();
+        if (token.type === Token.Identifier) {
+            label = parseVariableIdentifier();
+
+            if (!Object.prototype.hasOwnProperty.call(state.labelSet, label.name)) {
+                throwError({}, Messages.UnknownLabel, label.name);
+            }
+        }
+
+        consumeSemicolon();
+
+        if (label === null && !state.inIteration) {
+            throwError({}, Messages.IllegalContinue);
+        }
+
+        return {
+            type: Syntax.ContinueStatement,
+            label: label
+        };
+    }
+
+    // 12.8 The break statement
+
+    function parseBreakStatement() {
+        var token, label = null;
+
+        expectKeyword('break');
+
+        // Optimize the most common form: 'break;'.
+        if (source[index] === ';') {
+            lex();
+
+            if (!(state.inIteration || state.inSwitch)) {
+                throwError({}, Messages.IllegalBreak);
+            }
+
+            return {
+                type: Syntax.BreakStatement,
+                label: null
+            };
+        }
+
+        if (peekLineTerminator()) {
+            if (!(state.inIteration || state.inSwitch)) {
+                throwError({}, Messages.IllegalBreak);
+            }
+
+            return {
+                type: Syntax.BreakStatement,
+                label: null
+            };
+        }
+
+        token = lookahead();
+        if (token.type === Token.Identifier) {
+            label = parseVariableIdentifier();
+
+            if (!Object.prototype.hasOwnProperty.call(state.labelSet, label.name)) {
+                throwError({}, Messages.UnknownLabel, label.name);
+            }
+        }
+
+        consumeSemicolon();
+
+        if (label === null && !(state.inIteration || state.inSwitch)) {
+            throwError({}, Messages.IllegalBreak);
+        }
+
+        return {
+            type: Syntax.BreakStatement,
+            label: label
+        };
+    }
+
+    // 12.9 The return statement
+
+    function parseReturnStatement() {
+        var token, argument = null;
+
+        expectKeyword('return');
+
+        if (!state.inFunctionBody) {
+            throwErrorTolerant({}, Messages.IllegalReturn);
+        }
+
+        // 'return' followed by a space and an identifier is very common.
+        if (source[index] === ' ') {
+            if (isIdentifierStart(source[index + 1])) {
+                argument = parseExpression();
+                consumeSemicolon();
+                return {
+                    type: Syntax.ReturnStatement,
+                    argument: argument
+                };
+            }
+        }
+
+        if (peekLineTerminator()) {
+            return {
+                type: Syntax.ReturnStatement,
+                argument: null
+            };
+        }
+
+        if (!match(';')) {
+            token = lookahead();
+            if (!match('}') && token.type !== Token.EOF) {
+                argument = parseExpression();
+            }
+        }
+
+        consumeSemicolon();
+
+        return {
+            type: Syntax.ReturnStatement,
+            argument: argument
+        };
+    }
+
+    // 12.10 The with statement
+
+    function parseWithStatement() {
+        var object, body;
+
+        if (strict) {
+            throwErrorTolerant({}, Messages.StrictModeWith);
+        }
+
+        expectKeyword('with');
+
+        expect('(');
+
+        object = parseExpression();
+
+        expect(')');
+
+        body = parseStatement();
+
+        return {
+            type: Syntax.WithStatement,
+            object: object,
+            body: body
+        };
+    }
+
+    // 12.10 The swith statement
+
+    function parseSwitchCase() {
+        var test,
+            consequent = [],
+            statement;
+
+        if (matchKeyword('default')) {
+            lex();
+            test = null;
+        } else {
+            expectKeyword('case');
+            test = parseExpression();
+        }
+        expect(':');
+
+        while (index < length) {
+            if (match('}') || matchKeyword('default') || matchKeyword('case')) {
+                break;
+            }
+            statement = parseStatement();
+            if (typeof statement === 'undefined') {
+                break;
+            }
+            consequent.push(statement);
+        }
+
+        return {
+            type: Syntax.SwitchCase,
+            test: test,
+            consequent: consequent
+        };
+    }
+
+    function parseSwitchStatement() {
+        var discriminant, cases, clause, oldInSwitch, defaultFound;
+
+        expectKeyword('switch');
+
+        expect('(');
+
+        discriminant = parseExpression();
+
+        expect(')');
+
+        expect('{');
+
+        if (match('}')) {
+            lex();
+            return {
+                type: Syntax.SwitchStatement,
+                discriminant: discriminant
+            };
+        }
+
+        cases = [];
+
+        oldInSwitch = state.inSwitch;
+        state.inSwitch = true;
+        defaultFound = false;
+
+        while (index < length) {
+            if (match('}')) {
+                break;
+            }
+            clause = parseSwitchCase();
+            if (clause.test === null) {
+                if (defaultFound) {
+                    throwError({}, Messages.MultipleDefaultsInSwitch);
+                }
+                defaultFound = true;
+            }
+            cases.push(clause);
+        }
+
+        state.inSwitch = oldInSwitch;
+
+        expect('}');
+
+        return {
+            type: Syntax.SwitchStatement,
+            discriminant: discriminant,
+            cases: cases
+        };
+    }
+
+    // 12.13 The throw statement
+
+    function parseThrowStatement() {
+        var argument;
+
+        expectKeyword('throw');
+
+        if (peekLineTerminator()) {
+            throwError({}, Messages.NewlineAfterThrow);
+        }
+
+        argument = parseExpression();
+
+        consumeSemicolon();
+
+        return {
+            type: Syntax.ThrowStatement,
+            argument: argument
+        };
+    }
+
+    // 12.14 The try statement
+
+    function parseCatchClause() {
+        var param;
+
+        expectKeyword('catch');
+
+        expect('(');
+        if (!match(')')) {
+            param = parseExpression();
+            // 12.14.1
+            if (strict && param.type === Syntax.Identifier && isRestrictedWord(param.name)) {
+                throwErrorTolerant({}, Messages.StrictCatchVariable);
+            }
+        }
+        expect(')');
+
+        return {
+            type: Syntax.CatchClause,
+            param: param,
+            body: parseBlock()
+        };
+    }
+
+    function parseTryStatement() {
+        var block, handlers = [], finalizer = null;
+
+        expectKeyword('try');
+
+        block = parseBlock();
+
+        if (matchKeyword('catch')) {
+            handlers.push(parseCatchClause());
+        }
+
+        if (matchKeyword('finally')) {
+            lex();
+            finalizer = parseBlock();
+        }
+
+        if (handlers.length === 0 && !finalizer) {
+            throwError({}, Messages.NoCatchOrFinally);
+        }
+
+        return {
+            type: Syntax.TryStatement,
+            block: block,
+            guardedHandlers: [],
+            handlers: handlers,
+            finalizer: finalizer
+        };
+    }
+
+    // 12.15 The debugger statement
+
+    function parseDebuggerStatement() {
+        expectKeyword('debugger');
+
+        consumeSemicolon();
+
+        return {
+            type: Syntax.DebuggerStatement
+        };
+    }
+
+    // 12 Statements
+
+    function parseStatement() {
+        var token = lookahead(),
+            expr,
+            labeledBody;
+
+        if (token.type === Token.EOF) {
+            throwUnexpected(token);
+        }
+
+        if (token.type === Token.Punctuator) {
+            switch (token.value) {
+            case ';':
+                return parseEmptyStatement();
+            case '{':
+                return parseBlock();
+            case '(':
+                return parseExpressionStatement();
+            default:
+                break;
+            }
+        }
+
+        if (token.type === Token.Keyword) {
+            switch (token.value) {
+            case 'break':
+                return parseBreakStatement();
+            case 'continue':
+                return parseContinueStatement();
+            case 'debugger':
+                return parseDebuggerStatement();
+            case 'do':
+                return parseDoWhileStatement();
+            case 'for':
+                return parseForStatement();
+            case 'function':
+                return parseFunctionDeclaration();
+            case 'if':
+                return parseIfStatement();
+            case 'return':
+                return parseReturnStatement();
+            case 'switch':
+                return parseSwitchStatement();
+            case 'throw':
+                return parseThrowStatement();
+            case 'try':
+                return parseTryStatement();
+            case 'var':
+                return parseVariableStatement();
+            case 'while':
+                return parseWhileStatement();
+            case 'with':
+                return parseWithStatement();
+            default:
+                break;
+            }
+        }
+
+        expr = parseExpression();
+
+        // 12.12 Labelled Statements
+        if ((expr.type === Syntax.Identifier) && match(':')) {
+            lex();
+
+            if (Object.prototype.hasOwnProperty.call(state.labelSet, expr.name)) {
+                throwError({}, Messages.Redeclaration, 'Label', expr.name);
+            }
+
+            state.labelSet[expr.name] = true;
+            labeledBody = parseStatement();
+            delete state.labelSet[expr.name];
+
+            return {
+                type: Syntax.LabeledStatement,
+                label: expr,
+                body: labeledBody
+            };
+        }
+
+        consumeSemicolon();
+
+        return {
+            type: Syntax.ExpressionStatement,
+            expression: expr
+        };
+    }
+
+    // 13 Function Definition
+
+    function parseFunctionSourceElements() {
+        var sourceElement, sourceElements = [], token, directive, firstRestricted,
+            oldLabelSet, oldInIteration, oldInSwitch, oldInFunctionBody;
+
+        expect('{');
+
+        while (index < length) {
+            token = lookahead();
+            if (token.type !== Token.StringLiteral) {
+                break;
+            }
+
+            sourceElement = parseSourceElement();
+            sourceElements.push(sourceElement);
+            if (sourceElement.expression.type !== Syntax.Literal) {
+                // this is not directive
+                break;
+            }
+            directive = sliceSource(token.range[0] + 1, token.range[1] - 1);
+            if (directive === 'use strict') {
+                strict = true;
+                if (firstRestricted) {
+                    throwErrorTolerant(firstRestricted, Messages.StrictOctalLiteral);
+                }
+            } else {
+                if (!firstRestricted && token.octal) {
+                    firstRestricted = token;
+                }
+            }
+        }
+
+        oldLabelSet = state.labelSet;
+        oldInIteration = state.inIteration;
+        oldInSwitch = state.inSwitch;
+        oldInFunctionBody = state.inFunctionBody;
+
+        state.labelSet = {};
+        state.inIteration = false;
+        state.inSwitch = false;
+        state.inFunctionBody = true;
+
+        while (index < length) {
+            if (match('}')) {
+                break;
+            }
+            sourceElement = parseSourceElement();
+            if (typeof sourceElement === 'undefined') {
+                break;
+            }
+            sourceElements.push(sourceElement);
+        }
+
+        expect('}');
+
+        state.labelSet = oldLabelSet;
+        state.inIteration = oldInIteration;
+        state.inSwitch = oldInSwitch;
+        state.inFunctionBody = oldInFunctionBody;
+
+        return {
+            type: Syntax.BlockStatement,
+            body: sourceElements
+        };
+    }
+
+    function parseFunctionDeclaration() {
+        var id, param, params = [], body, token, stricted, firstRestricted, message, previousStrict, paramSet;
+
+        expectKeyword('function');
+        token = lookahead();
+        id = parseVariableIdentifier();
+        if (strict) {
+            if (isRestrictedWord(token.value)) {
+                throwErrorTolerant(token, Messages.StrictFunctionName);
+            }
+        } else {
+            if (isRestrictedWord(token.value)) {
+                firstRestricted = token;
+                message = Messages.StrictFunctionName;
+            } else if (isStrictModeReservedWord(token.value)) {
+                firstRestricted = token;
+                message = Messages.StrictReservedWord;
+            }
+        }
+
+        expect('(');
+
+        if (!match(')')) {
+            paramSet = {};
+            while (index < length) {
+                token = lookahead();
+                param = parseVariableIdentifier();
+                if (strict) {
+                    if (isRestrictedWord(token.value)) {
+                        stricted = token;
+                        message = Messages.StrictParamName;
+                    }
+                    if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) {
+                        stricted = token;
+                        message = Messages.StrictParamDupe;
+                    }
+                } else if (!firstRestricted) {
+                    if (isRestrictedWord(token.value)) {
+                        firstRestricted = token;
+                        message = Messages.StrictParamName;
+                    } else if (isStrictModeReservedWord(token.value)) {
+                        firstRestricted = token;
+                        message = Messages.StrictReservedWord;
+                    } else if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) {
+                        firstRestricted = token;
+                        message = Messages.StrictParamDupe;
+                    }
+                }
+                params.push(param);
+                paramSet[param.name] = true;
+                if (match(')')) {
+                    break;
+                }
+                expect(',');
+            }
+        }
+
+        expect(')');
+
+        previousStrict = strict;
+        body = parseFunctionSourceElements();
+        if (strict && firstRestricted) {
+            throwError(firstRestricted, message);
+        }
+        if (strict && stricted) {
+            throwErrorTolerant(stricted, message);
+        }
+        strict = previousStrict;
+
+        return {
+            type: Syntax.FunctionDeclaration,
+            id: id,
+            params: params,
+            defaults: [],
+            body: body,
+            rest: null,
+            generator: false,
+            expression: false
+        };
+    }
+
+    function parseFunctionExpression() {
+        var token, id = null, stricted, firstRestricted, message, param, params = [], body, previousStrict, paramSet;
+
+        expectKeyword('function');
+
+        if (!match('(')) {
+            token = lookahead();
+            id = parseVariableIdentifier();
+            if (strict) {
+                if (isRestrictedWord(token.value)) {
+                    throwErrorTolerant(token, Messages.StrictFunctionName);
+                }
+            } else {
+                if (isRestrictedWord(token.value)) {
+                    firstRestricted = token;
+                    message = Messages.StrictFunctionName;
+                } else if (isStrictModeReservedWord(token.value)) {
+                    firstRestricted = token;
+                    message = Messages.StrictReservedWord;
+                }
+            }
+        }
+
+        expect('(');
+
+        if (!match(')')) {
+            paramSet = {};
+            while (index < length) {
+                token = lookahead();
+                param = parseVariableIdentifier();
+                if (strict) {
+                    if (isRestrictedWord(token.value)) {
+                        stricted = token;
+                        message = Messages.StrictParamName;
+                    }
+                    if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) {
+                        stricted = token;
+                        message = Messages.StrictParamDupe;
+                    }
+                } else if (!firstRestricted) {
+                    if (isRestrictedWord(token.value)) {
+                        firstRestricted = token;
+                        message = Messages.StrictParamName;
+                    } else if (isStrictModeReservedWord(token.value)) {
+                        firstRestricted = token;
+                        message = Messages.StrictReservedWord;
+                    } else if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) {
+                        firstRestricted = token;
+                        message = Messages.StrictParamDupe;
+                    }
+                }
+                params.push(param);
+                paramSet[param.name] = true;
+                if (match(')')) {
+                    break;
+                }
+                expect(',');
+            }
+        }
+
+        expect(')');
+
+        previousStrict = strict;
+        body = parseFunctionSourceElements();
+        if (strict && firstRestricted) {
+            throwError(firstRestricted, message);
+        }
+        if (strict && stricted) {
+            throwErrorTolerant(stricted, message);
+        }
+        strict = previousStrict;
+
+        return {
+            type: Syntax.FunctionExpression,
+            id: id,
+            params: params,
+            defaults: [],
+            body: body,
+            rest: null,
+            generator: false,
+            expression: false
+        };
+    }
+
+    // 14 Program
+
+    function parseSourceElement() {
+        var token = lookahead();
+
+        if (token.type === Token.Keyword) {
+            switch (token.value) {
+            case 'const':
+            case 'let':
+                return parseConstLetDeclaration(token.value);
+            case 'function':
+                return parseFunctionDeclaration();
+            default:
+                return parseStatement();
+            }
+        }
+
+        if (token.type !== Token.EOF) {
+            return parseStatement();
+        }
+    }
+
+    function parseSourceElements() {
+        var sourceElement, sourceElements = [], token, directive, firstRestricted;
+
+        while (index < length) {
+            token = lookahead();
+            if (token.type !== Token.StringLiteral) {
+                break;
+            }
+
+            sourceElement = parseSourceElement();
+            sourceElements.push(sourceElement);
+            if (sourceElement.expression.type !== Syntax.Literal) {
+                // this is not directive
+                break;
+            }
+            directive = sliceSource(token.range[0] + 1, token.range[1] - 1);
+            if (directive === 'use strict') {
+                strict = true;
+                if (firstRestricted) {
+                    throwErrorTolerant(firstRestricted, Messages.StrictOctalLiteral);
+                }
+            } else {
+                if (!firstRestricted && token.octal) {
+                    firstRestricted = token;
+                }
+            }
+        }
+
+        while (index < length) {
+            sourceElement = parseSourceElement();
+            if (typeof sourceElement === 'undefined') {
+                break;
+            }
+            sourceElements.push(sourceElement);
+        }
+        return sourceElements;
+    }
+
+    function parseProgram() {
+        var program;
+        strict = false;
+        program = {
+            type: Syntax.Program,
+            body: parseSourceElements()
+        };
+        return program;
+    }
+
+    // The following functions are needed only when the option to preserve
+    // the comments is active.
+
+    function addComment(type, value, start, end, loc) {
+        assert(typeof start === 'number', 'Comment must have valid position');
+
+        // Because the way the actual token is scanned, often the comments
+        // (if any) are skipped twice during the lexical analysis.
+        // Thus, we need to skip adding a comment if the comment array already
+        // handled it.
+        if (extra.comments.length > 0) {
+            if (extra.comments[extra.comments.length - 1].range[1] > start) {
+                return;
+            }
+        }
+
+        extra.comments.push({
+            type: type,
+            value: value,
+            range: [start, end],
+            loc: loc
+        });
+    }
+
+    function scanComment() {
+        var comment, ch, loc, start, blockComment, lineComment;
+
+        comment = '';
+        blockComment = false;
+        lineComment = false;
+
+        while (index < length) {
+            ch = source[index];
+
+            if (lineComment) {
+                ch = source[index++];
+                if (isLineTerminator(ch)) {
+                    loc.end = {
+                        line: lineNumber,
+                        column: index - lineStart - 1
+                    };
+                    lineComment = false;
+                    addComment('Line', comment, start, index - 1, loc);
+                    if (ch === '\r' && source[index] === '\n') {
+                        ++index;
+                    }
+                    ++lineNumber;
+                    lineStart = index;
+                    comment = '';
+                } else if (index >= length) {
+                    lineComment = false;
+                    comment += ch;
+                    loc.end = {
+                        line: lineNumber,
+                        column: length - lineStart
+                    };
+                    addComment('Line', comment, start, length, loc);
+                } else {
+                    comment += ch;
+                }
+            } else if (blockComment) {
+                if (isLineTerminator(ch)) {
+                    if (ch === '\r' && source[index + 1] === '\n') {
+                        ++index;
+                        comment += '\r\n';
+                    } else {
+                        comment += ch;
+                    }
+                    ++lineNumber;
+                    ++index;
+                    lineStart = index;
+                    if (index >= length) {
+                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+                    }
+                } else {
+                    ch = source[index++];
+                    if (index >= length) {
+                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+                    }
+                    comment += ch;
+                    if (ch === '*') {
+                        ch = source[index];
+                        if (ch === '/') {
+                            comment = comment.substr(0, comment.length - 1);
+                            blockComment = false;
+                            ++index;
+                            loc.end = {
+                                line: lineNumber,
+                                column: index - lineStart
+                            };
+                            addComment('Block', comment, start, index, loc);
+                            comment = '';
+                        }
+                    }
+                }
+            } else if (ch === '/') {
+                ch = source[index + 1];
+                if (ch === '/') {
+                    loc = {
+                        start: {
+                            line: lineNumber,
+                            column: index - lineStart
+                        }
+                    };
+                    start = index;
+                    index += 2;
+                    lineComment = true;
+                    if (index >= length) {
+                        loc.end = {
+                            line: lineNumber,
+                            column: index - lineStart
+                        };
+                        lineComment = false;
+                        addComment('Line', comment, start, index, loc);
+                    }
+                } else if (ch === '*') {
+                    start = index;
+                    index += 2;
+                    blockComment = true;
+                    loc = {
+                        start: {
+                            line: lineNumber,
+                            column: index - lineStart - 2
+                        }
+                    };
+                    if (index >= length) {
+                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+                    }
+                } else {
+                    break;
+                }
+            } else if (isWhiteSpace(ch)) {
+                ++index;
+            } else if (isLineTerminator(ch)) {
+                ++index;
+                if (ch ===  '\r' && source[index] === '\n') {
+                    ++index;
+                }
+                ++lineNumber;
+                lineStart = index;
+            } else {
+                break;
+            }
+        }
+    }
+
+    function filterCommentLocation() {
+        var i, entry, comment, comments = [];
+
+        for (i = 0; i < extra.comments.length; ++i) {
+            entry = extra.comments[i];
+            comment = {
+                type: entry.type,
+                value: entry.value
+            };
+            if (extra.range) {
+                comment.range = entry.range;
+            }
+            if (extra.loc) {
+                comment.loc = entry.loc;
+            }
+            comments.push(comment);
+        }
+
+        extra.comments = comments;
+    }
+
+    function collectToken() {
+        var start, loc, token, range, value;
+
+        skipComment();
+        start = index;
+        loc = {
+            start: {
+                line: lineNumber,
+                column: index - lineStart
+            }
+        };
+
+        token = extra.advance();
+        loc.end = {
+            line: lineNumber,
+            column: index - lineStart
+        };
+
+        if (token.type !== Token.EOF) {
+            range = [token.range[0], token.range[1]];
+            value = sliceSource(token.range[0], token.range[1]);
+            extra.tokens.push({
+                type: TokenName[token.type],
+                value: value,
+                range: range,
+                loc: loc
+            });
+        }
+
+        return token;
+    }
+
+    function collectRegex() {
+        var pos, loc, regex, token;
+
+        skipComment();
+
+        pos = index;
+        loc = {
+            start: {
+                line: lineNumber,
+                column: index - lineStart
+            }
+        };
+
+        regex = extra.scanRegExp();
+        loc.end = {
+            line: lineNumber,
+            column: index - lineStart
+        };
+
+        // Pop the previous token, which is likely '/' or '/='
+        if (extra.tokens.length > 0) {
+            token = extra.tokens[extra.tokens.length - 1];
+            if (token.range[0] === pos && token.type === 'Punctuator') {
+                if (token.value === '/' || token.value === '/=') {
+                    extra.tokens.pop();
+                }
+            }
+        }
+
+        extra.tokens.push({
+            type: 'RegularExpression',
+            value: regex.literal,
+            range: [pos, index],
+            loc: loc
+        });
+
+        return regex;
+    }
+
+    function filterTokenLocation() {
+        var i, entry, token, tokens = [];
+
+        for (i = 0; i < extra.tokens.length; ++i) {
+            entry = extra.tokens[i];
+            token = {
+                type: entry.type,
+                value: entry.value
+            };
+            if (extra.range) {
+                token.range = entry.range;
+            }
+            if (extra.loc) {
+                token.loc = entry.loc;
+            }
+            tokens.push(token);
+        }
+
+        extra.tokens = tokens;
+    }
+
+    function createLiteral(token) {
+        return {
+            type: Syntax.Literal,
+            value: token.value
+        };
+    }
+
+    function createRawLiteral(token) {
+        return {
+            type: Syntax.Literal,
+            value: token.value,
+            raw: sliceSource(token.range[0], token.range[1])
+        };
+    }
+
+    function createLocationMarker() {
+        var marker = {};
+
+        marker.range = [index, index];
+        marker.loc = {
+            start: {
+                line: lineNumber,
+                column: index - lineStart
+            },
+            end: {
+                line: lineNumber,
+                column: index - lineStart
+            }
+        };
+
+        marker.end = function () {
+            this.range[1] = index;
+            this.loc.end.line = lineNumber;
+            this.loc.end.column = index - lineStart;
+        };
+
+        marker.applyGroup = function (node) {
+            if (extra.range) {
+                node.groupRange = [this.range[0], this.range[1]];
+            }
+            if (extra.loc) {
+                node.groupLoc = {
+                    start: {
+                        line: this.loc.start.line,
+                        column: this.loc.start.column
+                    },
+                    end: {
+                        line: this.loc.end.line,
+                        column: this.loc.end.column
+                    }
+                };
+            }
+        };
+
+        marker.apply = function (node) {
+            if (extra.range) {
+                node.range = [this.range[0], this.range[1]];
+            }
+            if (extra.loc) {
+                node.loc = {
+                    start: {
+                        line: this.loc.start.line,
+                        column: this.loc.start.column
+                    },
+                    end: {
+                        line: this.loc.end.line,
+                        column: this.loc.end.column
+                    }
+                };
+            }
+        };
+
+        return marker;
+    }
+
+    function trackGroupExpression() {
+        var marker, expr;
+
+        skipComment();
+        marker = createLocationMarker();
+        expect('(');
+
+        expr = parseExpression();
+
+        expect(')');
+
+        marker.end();
+        marker.applyGroup(expr);
+
+        return expr;
+    }
+
+    function trackLeftHandSideExpression() {
+        var marker, expr;
+
+        skipComment();
+        marker = createLocationMarker();
+
+        expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
+
+        while (match('.') || match('[')) {
+            if (match('[')) {
+                expr = {
+                    type: Syntax.MemberExpression,
+                    computed: true,
+                    object: expr,
+                    property: parseComputedMember()
+                };
+                marker.end();
+                marker.apply(expr);
+            } else {
+                expr = {
+                    type: Syntax.MemberExpression,
+                    computed: false,
+                    object: expr,
+                    property: parseNonComputedMember()
+                };
+                marker.end();
+                marker.apply(expr);
+            }
+        }
+
+        return expr;
+    }
+
+    function trackLeftHandSideExpressionAllowCall() {
+        var marker, expr;
+
+        skipComment();
+        marker = createLocationMarker();
+
+        expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
+
+        while (match('.') || match('[') || match('(')) {
+            if (match('(')) {
+                expr = {
+                    type: Syntax.CallExpression,
+                    callee: expr,
+                    'arguments': parseArguments()
+                };
+                marker.end();
+                marker.apply(expr);
+            } else if (match('[')) {
+                expr = {
+                    type: Syntax.MemberExpression,
+                    computed: true,
+                    object: expr,
+                    property: parseComputedMember()
+                };
+                marker.end();
+                marker.apply(expr);
+            } else {
+                expr = {
+                    type: Syntax.MemberExpression,
+                    computed: false,
+                    object: expr,
+                    property: parseNonComputedMember()
+                };
+                marker.end();
+                marker.apply(expr);
+            }
+        }
+
+        return expr;
+    }
+
+    function filterGroup(node) {
+        var n, i, entry;
+
+        n = (Object.prototype.toString.apply(node) === '[object Array]') ? [] : {};
+        for (i in node) {
+            if (node.hasOwnProperty(i) && i !== 'groupRange' && i !== 'groupLoc') {
+                entry = node[i];
+                if (entry === null || typeof entry !== 'object' || entry instanceof RegExp) {
+                    n[i] = entry;
+                } else {
+                    n[i] = filterGroup(entry);
+                }
+            }
+        }
+        return n;
+    }
+
+    function wrapTrackingFunction(range, loc) {
+
+        return function (parseFunction) {
+
+            function isBinary(node) {
+                return node.type === Syntax.LogicalExpression ||
+                    node.type === Syntax.BinaryExpression;
+            }
+
+            function visit(node) {
+                var start, end;
+
+                if (isBinary(node.left)) {
+                    visit(node.left);
+                }
+                if (isBinary(node.right)) {
+                    visit(node.right);
+                }
+
+                if (range) {
+                    if (node.left.groupRange || node.right.groupRange) {
+                        start = node.left.groupRange ? node.left.groupRange[0] : node.left.range[0];
+                        end = node.right.groupRange ? node.right.groupRange[1] : node.right.range[1];
+                        node.range = [start, end];
+                    } else if (typeof node.range === 'undefined') {
+                        start = node.left.range[0];
+                        end = node.right.range[1];
+                        node.range = [start, end];
+                    }
+                }
+                if (loc) {
+                    if (node.left.groupLoc || node.right.groupLoc) {
+                        start = node.left.groupLoc ? node.left.groupLoc.start : node.left.loc.start;
+                        end = node.right.groupLoc ? node.right.groupLoc.end : node.right.loc.end;
+                        node.loc = {
+                            start: start,
+                            end: end
+                        };
+                    } else if (typeof node.loc === 'undefined') {
+                        node.loc = {
+                            start: node.left.loc.start,
+                            end: node.right.loc.end
+                        };
+                    }
+                }
+            }
+
+            return function () {
+                var marker, node;
+
+                skipComment();
+
+                marker = createLocationMarker();
+                node = parseFunction.apply(null, arguments);
+                marker.end();
+
+                if (range && typeof node.range === 'undefined') {
+                    marker.apply(node);
+                }
+
+                if (loc && typeof node.loc === 'undefined') {
+                    marker.apply(node);
+                }
+
+                if (isBinary(node)) {
+                    visit(node);
+                }
+
+                return node;
+            };
+        };
+    }
+
+    function patch() {
+
+        var wrapTracking;
+
+        if (extra.comments) {
+            extra.skipComment = skipComment;
+            skipComment = scanComment;
+        }
+
+        if (extra.raw) {
+            extra.createLiteral = createLiteral;
+            createLiteral = createRawLiteral;
+        }
+
+        if (extra.range || extra.loc) {
+
+            extra.parseGroupExpression = parseGroupExpression;
+            extra.parseLeftHandSideExpression = parseLeftHandSideExpression;
+            extra.parseLeftHandSideExpressionAllowCall = parseLeftHandSideExpressionAllowCall;
+            parseGroupExpression = trackGroupExpression;
+            parseLeftHandSideExpression = trackLeftHandSideExpression;
+            parseLeftHandSideExpressionAllowCall = trackLeftHandSideExpressionAllowCall;
+
+            wrapTracking = wrapTrackingFunction(extra.range, extra.loc);
+
+            extra.parseAdditiveExpression = parseAdditiveExpression;
+            extra.parseAssignmentExpression = parseAssignmentExpression;
+            extra.parseBitwiseANDExpression = parseBitwiseANDExpression;
+            extra.parseBitwiseORExpression = parseBitwiseORExpression;
+            extra.parseBitwiseXORExpression = parseBitwiseXORExpression;
+            extra.parseBlock = parseBlock;
+            extra.parseFunctionSourceElements = parseFunctionSourceElements;
+            extra.parseCatchClause = parseCatchClause;
+            extra.parseComputedMember = parseComputedMember;
+            extra.parseConditionalExpression = parseConditionalExpression;
+            extra.parseConstLetDeclaration = parseConstLetDeclaration;
+            extra.parseEqualityExpression = parseEqualityExpression;
+            extra.parseExpression = parseExpression;
+            extra.parseForVariableDeclaration = parseForVariableDeclaration;
+            extra.parseFunctionDeclaration = parseFunctionDeclaration;
+            extra.parseFunctionExpression = parseFunctionExpression;
+            extra.parseLogicalANDExpression = parseLogicalANDExpression;
+            extra.parseLogicalORExpression = parseLogicalORExpression;
+            extra.parseMultiplicativeExpression = parseMultiplicativeExpression;
+            extra.parseNewExpression = parseNewExpression;
+            extra.parseNonComputedProperty = parseNonComputedProperty;
+            extra.parseObjectProperty = parseObjectProperty;
+            extra.parseObjectPropertyKey = parseObjectPropertyKey;
+            extra.parsePostfixExpression = parsePostfixExpression;
+            extra.parsePrimaryExpression = parsePrimaryExpression;
+            extra.parseProgram = parseProgram;
+            extra.parsePropertyFunction = parsePropertyFunction;
+            extra.parseRelationalExpression = parseRelationalExpression;
+            extra.parseStatement = parseStatement;
+            extra.parseShiftExpression = parseShiftExpression;
+            extra.parseSwitchCase = parseSwitchCase;
+            extra.parseUnaryExpression = parseUnaryExpression;
+            extra.parseVariableDeclaration = parseVariableDeclaration;
+            extra.parseVariableIdentifier = parseVariableIdentifier;
+
+            parseAdditiveExpression = wrapTracking(extra.parseAdditiveExpression);
+            parseAssignmentExpression = wrapTracking(extra.parseAssignmentExpression);
+            parseBitwiseANDExpression = wrapTracking(extra.parseBitwiseANDExpression);
+            parseBitwiseORExpression = wrapTracking(extra.parseBitwiseORExpression);
+            parseBitwiseXORExpression = wrapTracking(extra.parseBitwiseXORExpression);
+            parseBlock = wrapTracking(extra.parseBlock);
+            parseFunctionSourceElements = wrapTracking(extra.parseFunctionSourceElements);
+            parseCatchClause = wrapTracking(extra.parseCatchClause);
+            parseComputedMember = wrapTracking(extra.parseComputedMember);
+            parseConditionalExpression = wrapTracking(extra.parseConditionalExpression);
+            parseConstLetDeclaration = wrapTracking(extra.parseConstLetDeclaration);
+            parseEqualityExpression = wrapTracking(extra.parseEqualityExpression);
+            parseExpression = wrapTracking(extra.parseExpression);
+            parseForVariableDeclaration = wrapTracking(extra.parseForVariableDeclaration);
+            parseFunctionDeclaration = wrapTracking(extra.parseFunctionDeclaration);
+            parseFunctionExpression = wrapTracking(extra.parseFunctionExpression);
+            parseLeftHandSideExpression = wrapTracking(parseLeftHandSideExpression);
+            parseLogicalANDExpression = wrapTracking(extra.parseLogicalANDExpression);
+            parseLogicalORExpression = wrapTracking(extra.parseLogicalORExpression);
+            parseMultiplicativeExpression = wrapTracking(extra.parseMultiplicativeExpression);
+            parseNewExpression = wrapTracking(extra.parseNewExpression);
+            parseNonComputedProperty = wrapTracking(extra.parseNonComputedProperty);
+            parseObjectProperty = wrapTracking(extra.parseObjectProperty);
+            parseObjectPropertyKey = wrapTracking(extra.parseObjectPropertyKey);
+            parsePostfixExpression = wrapTracking(extra.parsePostfixExpression);
+            parsePrimaryExpression = wrapTracking(extra.parsePrimaryExpression);
+            parseProgram = wrapTracking(extra.parseProgram);
+            parsePropertyFunction = wrapTracking(extra.parsePropertyFunction);
+            parseRelationalExpression = wrapTracking(extra.parseRelationalExpression);
+            parseStatement = wrapTracking(extra.parseStatement);
+            parseShiftExpression = wrapTracking(extra.parseShiftExpression);
+            parseSwitchCase = wrapTracking(extra.parseSwitchCase);
+            parseUnaryExpression = wrapTracking(extra.parseUnaryExpression);
+            parseVariableDeclaration = wrapTracking(extra.parseVariableDeclaration);
+            parseVariableIdentifier = wrapTracking(extra.parseVariableIdentifier);
+        }
+
+        if (typeof extra.tokens !== 'undefined') {
+            extra.advance = advance;
+            extra.scanRegExp = scanRegExp;
+
+            advance = collectToken;
+            scanRegExp = collectRegex;
+        }
+    }
+
+    function unpatch() {
+        if (typeof extra.skipComment === 'function') {
+            skipComment = extra.skipComment;
+        }
+
+        if (extra.raw) {
+            createLiteral = extra.createLiteral;
+        }
+
+        if (extra.range || extra.loc) {
+            parseAdditiveExpression = extra.parseAdditiveExpression;
+            parseAssignmentExpression = extra.parseAssignmentExpression;
+            parseBitwiseANDExpression = extra.parseBitwiseANDExpression;
+            parseBitwiseORExpression = extra.parseBitwiseORExpression;
+            parseBitwiseXORExpression = extra.parseBitwiseXORExpression;
+            parseBlock = extra.parseBlock;
+            parseFunctionSourceElements = extra.parseFunctionSourceElements;
+            parseCatchClause = extra.parseCatchClause;
+            parseComputedMember = extra.parseComputedMember;
+            parseConditionalExpression = extra.parseConditionalExpression;
+            parseConstLetDeclaration = extra.parseConstLetDeclaration;
+            parseEqualityExpression = extra.parseEqualityExpression;
+            parseExpression = extra.parseExpression;
+            parseForVariableDeclaration = extra.parseForVariableDeclaration;
+            parseFunctionDeclaration = extra.parseFunctionDeclaration;
+            parseFunctionExpression = extra.parseFunctionExpression;
+            parseGroupExpression = extra.parseGroupExpression;
+            parseLeftHandSideExpression = extra.parseLeftHandSideExpression;
+            parseLeftHandSideExpressionAllowCall = extra.parseLeftHandSideExpressionAllowCall;
+            parseLogicalANDExpression = extra.parseLogicalANDExpression;
+            parseLogicalORExpression = extra.parseLogicalORExpression;
+            parseMultiplicativeExpression = extra.parseMultiplicativeExpression;
+            parseNewExpression = extra.parseNewExpression;
+            parseNonComputedProperty = extra.parseNonComputedProperty;
+            parseObjectProperty = extra.parseObjectProperty;
+            parseObjectPropertyKey = extra.parseObjectPropertyKey;
+            parsePrimaryExpression = extra.parsePrimaryExpression;
+            parsePostfixExpression = extra.parsePostfixExpression;
+            parseProgram = extra.parseProgram;
+            parsePropertyFunction = extra.parsePropertyFunction;
+            parseRelationalExpression = extra.parseRelationalExpression;
+            parseStatement = extra.parseStatement;
+            parseShiftExpression = extra.parseShiftExpression;
+            parseSwitchCase = extra.parseSwitchCase;
+            parseUnaryExpression = extra.parseUnaryExpression;
+            parseVariableDeclaration = extra.parseVariableDeclaration;
+            parseVariableIdentifier = extra.parseVariableIdentifier;
+        }
+
+        if (typeof extra.scanRegExp === 'function') {
+            advance = extra.advance;
+            scanRegExp = extra.scanRegExp;
+        }
+    }
+
+    function stringToArray(str) {
+        var length = str.length,
+            result = [],
+            i;
+        for (i = 0; i < length; ++i) {
+            result[i] = str.charAt(i);
+        }
+        return result;
+    }
+
+    function parse(code, options) {
+        var program, toString;
+
+        toString = String;
+        if (typeof code !== 'string' && !(code instanceof String)) {
+            code = toString(code);
+        }
+
+        source = code;
+        index = 0;
+        lineNumber = (source.length > 0) ? 1 : 0;
+        lineStart = 0;
+        length = source.length;
+        buffer = null;
+        state = {
+            allowIn: true,
+            labelSet: {},
+            inFunctionBody: false,
+            inIteration: false,
+            inSwitch: false
+        };
+
+        extra = {};
+        if (typeof options !== 'undefined') {
+            extra.range = (typeof options.range === 'boolean') && options.range;
+            extra.loc = (typeof options.loc === 'boolean') && options.loc;
+            extra.raw = (typeof options.raw === 'boolean') && options.raw;
+            if (typeof options.tokens === 'boolean' && options.tokens) {
+                extra.tokens = [];
+            }
+            if (typeof options.comment === 'boolean' && options.comment) {
+                extra.comments = [];
+            }
+            if (typeof options.tolerant === 'boolean' && options.tolerant) {
+                extra.errors = [];
+            }
+        }
+
+        if (length > 0) {
+            if (typeof source[0] === 'undefined') {
+                // Try first to convert to a string. This is good as fast path
+                // for old IE which understands string indexing for string
+                // literals only and not for string object.
+                if (code instanceof String) {
+                    source = code.valueOf();
+                }
+
+                // Force accessing the characters via an array.
+                if (typeof source[0] === 'undefined') {
+                    source = stringToArray(code);
+                }
+            }
+        }
+
+        patch();
+        try {
+            program = parseProgram();
+            if (typeof extra.comments !== 'undefined') {
+                filterCommentLocation();
+                program.comments = extra.comments;
+            }
+            if (typeof extra.tokens !== 'undefined') {
+                filterTokenLocation();
+                program.tokens = extra.tokens;
+            }
+            if (typeof extra.errors !== 'undefined') {
+                program.errors = extra.errors;
+            }
+            if (extra.range || extra.loc) {
+                program.body = filterGroup(program.body);
+            }
+        } catch (e) {
+            throw e;
+        } finally {
+            unpatch();
+            extra = {};
+        }
+
+        return program;
+    }
+
+    // Sync with package.json.
+    exports.version = '1.0.2';
+
+    exports.parse = parse;
+
+    // Deep copy.
+    exports.Syntax = (function () {
+        var name, types = {};
+
+        if (typeof Object.create === 'function') {
+            types = Object.create(null);
+        }
+
+        for (name in Syntax) {
+            if (Syntax.hasOwnProperty(name)) {
+                types[name] = Syntax[name];
+            }
+        }
+
+        if (typeof Object.freeze === 'function') {
+            Object.freeze(types);
+        }
+
+        return types;
+    }());
+
+}));
+/* vim: set sw=4 ts=4 et tw=80 : */
+
+})(null);
+
+(function(require,module){
+
+var parse = require('esprima').parse;
+var objectKeys = Object.keys || function (obj) {
+    var keys = [];
+    for (var key in obj) keys.push(key);
+    return keys;
+};
+var forEach = function (xs, fn) {
+    if (xs.forEach) return xs.forEach(fn);
+    for (var i = 0; i < xs.length; i++) {
+        fn.call(xs, xs[i], i, xs);
+    }
+};
+
+var isArray = Array.isArray || function (xs) {
+    return Object.prototype.toString.call(xs) === '[object Array]';
+};
+
+module.exports = function (src, opts, fn) {
+    if (typeof opts === 'function') {
+        fn = opts;
+        opts = {};
+    }
+    if (typeof src === 'object') {
+        opts = src;
+        src = opts.source;
+        delete opts.source;
+    }
+    src = src === undefined ? opts.source : src;
+    opts.range = true;
+    if (typeof src !== 'string') src = String(src);
+    
+    var ast = parse(src, opts);
+    
+    var result = {
+        chunks : src.split(''),
+        toString : function () { return result.chunks.join('') },
+        inspect : function () { return result.toString() }
+    };
+    var index = 0;
+    
+    (function walk (node, parent) {
+        insertHelpers(node, parent, result.chunks);
+        
+        forEach(objectKeys(node), function (key) {
+            if (key === 'parent') return;
+            
+            var child = node[key];
+            if (isArray(child)) {
+                forEach(child, function (c) {
+                    if (c && typeof c.type === 'string') {
+                        walk(c, node);
+                    }
+                });
+            }
+            else if (child && typeof child.type === 'string') {
+                insertHelpers(child, node, result.chunks);
+                walk(child, node);
+            }
+        });
+        fn(node);
+    })(ast, undefined);
+    
+    return result;
+};
+ 
+function insertHelpers (node, parent, chunks) {
+    if (!node.range) return;
+    
+    node.parent = parent;
+    
+    node.source = function () {
+        return chunks.slice(
+            node.range[0], node.range[1]
+        ).join('');
+    };
+    
+    if (node.update && typeof node.update === 'object') {
+        var prev = node.update;
+        forEach(objectKeys(prev), function (key) {
+            update[key] = prev[key];
+        });
+        node.update = update;
+    }
+    else {
+        node.update = update;
+    }
+    
+    function update (s) {
+        chunks[node.range[0]] = s;
+        for (var i = node.range[0] + 1; i < node.range[1]; i++) {
+            chunks[i] = '';
+        }
+    };
+}
+
+window.falafel = module.exports;})(function(){return {parse: esprima.parse};},{exports: {}});
+
+var inBrowser = typeof window !== 'undefined' && this === window;
+var parseAndModify = (inBrowser ? window.falafel : require("falafel"));
+
+(inBrowser ? window : exports).blanket = (function(){
+    var linesToAddTracking = [
+        "ExpressionStatement",
+        "BreakStatement"   ,
+        "ContinueStatement" ,
+        "VariableDeclaration",
+        "ReturnStatement"   ,
+        "ThrowStatement"   ,
+        "TryStatement"     ,
+        "FunctionDeclaration"    ,
+        "IfStatement"       ,
+        "WhileStatement"    ,
+        "DoWhileStatement"   ,
+        "ForStatement"   ,
+        "ForInStatement"  ,
+        "SwitchStatement"  ,
+        "WithStatement"
+    ],
+    linesToAddBrackets = [
+        "IfStatement"       ,
+        "WhileStatement"    ,
+        "DoWhileStatement"     ,
+        "ForStatement"   ,
+        "ForInStatement"  ,
+        "WithStatement"
+    ],
+    __blanket,
+    copynumber = Math.floor(Math.random()*1000),
+    coverageInfo = {},options = {
+        reporter: null,
+        adapter:null,
+        filter: null,
+        customVariable: null,
+        loader: null,
+        ignoreScriptError: false,
+        existingRequireJS:false,
+        autoStart: false,
+        timeout: 180,
+        ignoreCors: false,
+        branchTracking: false,
+        sourceURL: false,
+        debug:false,
+        engineOnly:false,
+        testReadyCallback:null,
+        commonJS:false,
+        instrumentCache:false,
+        modulePattern: null
+    };
+    
+    if (inBrowser && typeof window.blanket !== 'undefined'){
+        __blanket = window.blanket.noConflict();
+    }
+    
+    _blanket = {
+        noConflict: function(){
+            if (__blanket){
+                return __blanket;
+            }
+            return _blanket;
+        },
+        _getCopyNumber: function(){
+            //internal method
+            //for differentiating between instances
+            return copynumber;
+        },
+        extend: function(obj) {
+            //borrowed from underscore
+            _blanket._extend(_blanket,obj);
+        },
+        _extend: function(dest,source){
+          if (source) {
+            for (var prop in source) {
+              if ( dest[prop] instanceof Object && typeof dest[prop] !== "function"){
+                _blanket._extend(dest[prop],source[prop]);
+              }else{
+                  dest[prop] = source[prop];
+              }
+            }
+          }
+        },
+        getCovVar: function(){
+            var opt = _blanket.options("customVariable");
+            if (opt){
+                if (_blanket.options("debug")) {console.log("BLANKET-Using custom tracking variable:",opt);}
+                return inBrowser ? "window."+opt : opt;
+            }
+            return inBrowser ?   "window._$blanket" : "_$jscoverage";
+        },
+        options: function(key,value){
+            if (typeof key !== "string"){
+                _blanket._extend(options,key);
+            }else if (typeof value === 'undefined'){
+                return options[key];
+            }else{
+                options[key]=value;
+            }
+        },
+        instrument: function(config, next){
+            //check instrumented hash table,
+            //return instrumented code if available.
+            var inFile = config.inputFile,
+                inFileName = config.inputFileName;
+            //check instrument cache
+           if (_blanket.options("instrumentCache") && sessionStorage && sessionStorage.getItem("blanket_instrument_store-"+inFileName)){
+                if (_blanket.options("debug")) {console.log("BLANKET-Reading instrumentation from cache: ",inFileName);}
+                next(sessionStorage.getItem("blanket_instrument_store-"+inFileName));
+            }else{
+                var sourceArray = _blanket._prepareSource(inFile);
+                _blanket._trackingArraySetup=[];
+                var instrumented =  parseAndModify(inFile,{loc:true,comment:true}, _blanket._addTracking(inFileName));
+                instrumented = _blanket._trackingSetup(inFileName,sourceArray)+instrumented;
+                if (_blanket.options("sourceURL")){
+                    instrumented += "\n//@ sourceURL="+inFileName.replace("http://","");
+                }
+                if (_blanket.options("debug")) {console.log("BLANKET-Instrumented file: ",inFileName);}
+                if (_blanket.options("instrumentCache") && sessionStorage){
+                    if (_blanket.options("debug")) {console.log("BLANKET-Saving instrumentation to cache: ",inFileName);}
+                    sessionStorage.setItem("blanket_instrument_store-"+inFileName,instrumented);
+                }
+                next(instrumented);
+            }
+        },
+        _trackingArraySetup: [],
+        _branchingArraySetup: [],
+        _prepareSource: function(source){
+            return source.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(/(\r\n|\n|\r)/gm,"\n").split('\n');
+        },
+        _trackingSetup: function(filename,sourceArray){
+            var branches = _blanket.options("branchTracking");
+            var sourceString = sourceArray.join("',\n'");
+            var intro = "";
+            var covVar = _blanket.getCovVar();
+
+            intro += "if (typeof "+covVar+" === 'undefined') "+covVar+" = {};\n";
+            if (branches){
+                intro += "var _$branchFcn=function(f,l,c,r){ ";
+                intro += "if (!!r) { ";
+                intro += covVar+"[f].branchData[l][c][0] = "+covVar+"[f].branchData[l][c][0] || [];";
+                intro += covVar+"[f].branchData[l][c][0].push(r); }";
+                intro += "else { ";
+                intro += covVar+"[f].branchData[l][c][1] = "+covVar+"[f].branchData[l][c][1] || [];";
+                intro += covVar+"[f].branchData[l][c][1].push(r); }";
+                intro += "return r;};\n";
+            }
+            intro += "if (typeof "+covVar+"['"+filename+"'] === 'undefined'){";
+
+            intro += covVar+"['"+filename+"']=[];\n";
+            if (branches){
+                intro += covVar+"['"+filename+"'].branchData=[];\n";
+            }
+            intro += covVar+"['"+filename+"'].source=['"+sourceString+"'];\n";
+            //initialize array values
+            _blanket._trackingArraySetup.sort(function(a,b){
+                return parseInt(a,10) > parseInt(b,10);
+            }).forEach(function(item){
+                intro += covVar+"['"+filename+"']["+item+"]=0;\n";
+            });
+            if (branches){
+                _blanket._branchingArraySetup.sort(function(a,b){
+                    return a.line > b.line;
+                }).sort(function(a,b){
+                    return a.column > b.column;
+                }).forEach(function(item){
+                    if (item.file === filename){
+                        intro += "if (typeof "+ covVar+"['"+filename+"'].branchData["+item.line+"] === 'undefined'){\n";
+                        intro += covVar+"['"+filename+"'].branchData["+item.line+"]=[];\n";
+                        intro += "}";
+                        intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"] = [];\n";
+                        intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"].consequent = "+JSON.stringify(item.consequent)+";\n";
+                        intro += covVar+"['"+filename+"'].branchData["+item.line+"]["+item.column+"].alternate = "+JSON.stringify(item.alternate)+";\n";
+                    }
+                });
+            }
+            intro += "}";
+
+            return intro;
+        },
+        _blockifyIf: function(node){
+            if (linesToAddBrackets.indexOf(node.type) > -1){
+                var bracketsExistObject = node.consequent || node.body;
+                var bracketsExistAlt = node.alternate;
+                if( bracketsExistAlt && bracketsExistAlt.type !== "BlockStatement") {
+                    bracketsExistAlt.update("{\n"+bracketsExistAlt.source()+"}\n");
+                }
+                if( bracketsExistObject && bracketsExistObject.type !== "BlockStatement") {
+                    bracketsExistObject.update("{\n"+bracketsExistObject.source()+"}\n");
+                }
+            }
+        },
+        _trackBranch: function(node,filename){
+            //recursive on consequent and alternative
+            var line = node.loc.start.line;
+            var col = node.loc.start.column;
+
+            _blanket._branchingArraySetup.push({
+                line: line,
+                column: col,
+                file:filename,
+                consequent: node.consequent.loc,
+                alternate: node.alternate.loc
+            });
+
+            var source = node.source();
+            var updated = "_$branchFcn"+
+                          "('"+filename+"',"+line+","+col+","+source.slice(0,source.indexOf("?"))+
+                          ")"+source.slice(source.indexOf("?"));
+            node.update(updated);
+        },
+        _addTracking: function (filename) {
+            //falafel doesn't take a file name
+            //so we include the filename in a closure
+            //and return the function to falafel
+            var covVar = _blanket.getCovVar();
+
+            return function(node){
+                _blanket._blockifyIf(node);
+
+                if (linesToAddTracking.indexOf(node.type) > -1 && node.parent.type !== "LabeledStatement") {
+                    _blanket._checkDefs(node,filename);
+                    if (node.type === "VariableDeclaration" &&
+                        (node.parent.type === "ForStatement" || node.parent.type === "ForInStatement")){
+                        return;
+                    }
+                    if (node.loc && node.loc.start){
+                        node.update(covVar+"['"+filename+"']["+node.loc.start.line+"]++;\n"+node.source());
+                        _blanket._trackingArraySetup.push(node.loc.start.line);
+                    }else{
+                        //I don't think we can handle a node with no location
+                        throw new Error("The instrumenter encountered a node with no location: "+Object.keys(node));
+                    }
+                }else if (_blanket.options("branchTracking") && node.type === "ConditionalExpression"){
+                    _blanket._trackBranch(node,filename);
+                }
+            };
+        },
+        _checkDefs: function(node,filename){
+            // Make sure developers don't redefine window. if they do, inform them it is wrong.
+            if (inBrowser){
+                if (node.type === "VariableDeclaration" && node.declarations) {
+                    node.declarations.forEach(function(declaration) {
+                        if (declaration.id.name === "window") {
+                            throw new Error("Instrumentation error, you cannot redefine the 'window' variable in  " + filename + ":" + node.loc.start.line);
+                        }
+                    });
+                }
+                if (node.type === "FunctionDeclaration" && node.params) {
+                    node.params.forEach(function(param) {
+                        if (param.name === "window") {
+                            throw new Error("Instrumentation error, you cannot redefine the 'window' variable in  " + filename + ":" + node.loc.start.line);
+                        }
+                    });
+                }
+                //Make sure developers don't redefine the coverage variable
+                if (node.type === "ExpressionStatement" &&
+                    node.expression && node.expression.left &&
+                    node.expression.left.object && node.expression.left.property &&
+                    node.expression.left.object.name +
+                        "." + node.expression.left.property.name === _blanket.getCovVar()) {
+                    throw new Error("Instrumentation error, you cannot redefine the coverage variable in  " + filename + ":" + node.loc.start.line);
+                }
+            }else{
+                //Make sure developers don't redefine the coverage variable in node
+                if (node.type === "ExpressionStatement" &&
+                    node.expression && node.expression.left &&
+                    !node.expression.left.object && !node.expression.left.property &&
+                    node.expression.left.name === _blanket.getCovVar()) {
+                    throw new Error("Instrumentation error, you cannot redefine the coverage variable in  " + filename + ":" + node.loc.start.line);
+                }
+            }
+        },
+        setupCoverage: function(){
+            coverageInfo.instrumentation = "blanket";
+            coverageInfo.stats = {
+                "suites": 0,
+                "tests": 0,
+                "passes": 0,
+                "pending": 0,
+                "failures": 0,
+                "start": new Date()
+            };
+        },
+        _checkIfSetup: function(){
+            if (!coverageInfo.stats){
+                throw new Error("You must call blanket.setupCoverage() first.");
+            }
+        },
+        onTestStart: function(){
+            if (_blanket.options("debug")) {console.log("BLANKET-Test event started");}
+            this._checkIfSetup();
+            coverageInfo.stats.tests++;
+            coverageInfo.stats.pending++;
+        },
+        onTestDone: function(total,passed){
+            this._checkIfSetup();
+            if(passed === total){
+                coverageInfo.stats.passes++;
+            }else{
+                coverageInfo.stats.failures++;
+            }
+            coverageInfo.stats.pending--;
+        },
+        onModuleStart: function(){
+            this._checkIfSetup();
+            coverageInfo.stats.suites++;
+        },
+        onTestsDone: function(){
+            if (_blanket.options("debug")) {console.log("BLANKET-Test event done");}
+            this._checkIfSetup();
+            coverageInfo.stats.end = new Date();
+
+            if (inBrowser){
+                this.report(coverageInfo);
+            }else{
+                if (!_blanket.options("branchTracking")){
+                    delete (inBrowser ? window : global)[_blanket.getCovVar()].branchFcn;
+                }
+                this.options("reporter").call(this,coverageInfo);
+            }
+        }
+    };
+    return _blanket;
+})();
+
+(function(_blanket){
+    var oldOptions = _blanket.options;
+_blanket.extend({
+    outstandingRequireFiles:[],
+    options: function(key,value){
+        var newVal={};
+
+        if (typeof key !== "string"){
+            //key is key/value map
+            oldOptions(key);
+            newVal = key;
+        }else if (typeof value === 'undefined'){
+            //accessor
+            return oldOptions(key);
+        }else{
+            //setter
+            oldOptions(key,value);
+            newVal[key] = value;
+        }
+
+        if (newVal.adapter){
+            _blanket._loadFile(newVal.adapter);
+        }
+        if (newVal.loader){
+            _blanket._loadFile(newVal.loader);
+        }
+    },
+    requiringFile: function(filename,done){
+        if (typeof filename === "undefined"){
+            _blanket.outstandingRequireFiles=[];
+        }else if (typeof done === "undefined"){
+            _blanket.outstandingRequireFiles.push(filename);
+        }else{
+            _blanket.outstandingRequireFiles.splice(_blanket.outstandingRequireFiles.indexOf(filename),1);
+        }
+    },
+    requireFilesLoaded: function(){
+        return _blanket.outstandingRequireFiles.length === 0;
+    },
+    showManualLoader: function(){
+        if (document.getElementById("blanketLoaderDialog")){
+            return;
+        }
+        //copied from http://blog.avtex.com/2012/01/26/cross-browser-css-only-modal-box/
+        var loader = "
";
+            loader += " 
";
+            loader += "
";
+            loader += "
";
+            loader += "Error: Blanket.js encountered a cross origin request error while instrumenting the source files.  ";
+            loader += "

This is likely caused by the source files being referenced locally (using the file:// protocol). ";
+            loader += "

Some solutions include starting Chrome with special flags, running a server locally, or using a browser without these CORS restrictions (Safari).";
+            loader += "
";
+            if (typeof FileReader !== "undefined"){
+                loader += "
Or, try the experimental loader.  When prompted, simply click on the directory containing all the source files you want covered.";
+                loader += "Start Loader";
+                loader += "";
+            }
+            loader += "
Close";
+            loader += "
";
+            loader += "
";
+
+        var css = ".blanketDialogWrapper {";
+            css += "display:block;";
+            css += "position:fixed;";
+            css += "z-index:40001; }";
+
+            css += ".blanketDialogOverlay {";
+            css += "position:fixed;";
+            css += "width:100%;";
+            css += "height:100%;";
+            css += "background-color:black;";
+            css += "opacity:.5; ";
+            css += "-ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)'; ";
+            css += "filter:alpha(opacity=50); ";
+            css += "z-index:40001; }";
+
+            css += ".blanketDialogVerticalOffset { ";
+            css += "position:fixed;";
+            css += "top:30%;";
+            css += "width:100%;";
+            css += "z-index:40002; }";
+
+            css += ".blanketDialogBox { ";
+            css += "width:405px; ";
+            css += "position:relative;";
+            css += "margin:0 auto;";
+            css += "background-color:white;";
+            css += "padding:10px;";
+            css += "border:1px solid black; }";
+
+        var dom = document.createElement("style");
+        dom.innerHTML = css;
+        document.head.appendChild(dom);
+
+        var div = document.createElement("div");
+        div.id = "blanketLoaderDialog";
+        div.className = "blanketDialogWrapper";
+        div.innerHTML = loader;
+        document.body.insertBefore(div,document.body.firstChild);
+
+    },
+    manualFileLoader: function(files){
+        var toArray =Array.prototype.slice;
+        files = toArray.call(files).filter(function(item){
+            return item.type !== "";
+        });
+        var sessionLength = files.length-1;
+        var sessionIndx=0;
+        var sessionArray = {};
+        if (sessionStorage["blanketSessionLoader"]){
+            sessionArray = JSON.parse(sessionStorage["blanketSessionLoader"]);
+        }
+
+
+        var fileLoader = function(event){
+            var fileContent = event.currentTarget.result;
+            var file = files[sessionIndx];
+            var filename = file.webkitRelativePath && file.webkitRelativePath !== '' ? file.webkitRelativePath : file.name;
+            sessionArray[filename] = fileContent;
+            sessionIndx++;
+            if (sessionIndx === sessionLength){
+                sessionStorage.setItem("blanketSessionLoader", JSON.stringify(sessionArray));
+                document.location.reload();
+            }else{
+                readFile(files[sessionIndx]);
+            }
+        };
+        function readFile(file){
+            var reader = new FileReader();
+            reader.onload = fileLoader;
+            reader.readAsText(file);
+        }
+        readFile(files[sessionIndx]);
+    },
+    _loadFile: function(path){
+        if (typeof path !== "undefined"){
+            var request = new XMLHttpRequest();
+            request.open('GET', path, false);
+            request.send();
+            _blanket._addScript(request.responseText);
+        }
+    },
+    _addScript: function(data){
+        var script = document.createElement("script");
+        script.type = "text/javascript";
+        script.text = data;
+        (document.body || document.getElementsByTagName('head')[0]).appendChild(script);
+    },
+    hasAdapter: function(callback){
+        return _blanket.options("adapter") !== null;
+    },
+    report: function(coverage_data){
+        if (!document.getElementById("blanketLoaderDialog")){
+            //all found, clear it
+            _blanket.blanketSession = null;
+        }
+        coverage_data.files = window._$blanket;
+        var require = blanket.options("commonJS") ? blanket._commonjs.require : window.require;
+
+        // Check if we have any covered files that requires reporting
+        // otherwise just exit gracefully.
+        if (!coverage_data.files || !Object.keys(coverage_data.files).length) {
+            if (_blanket.options("debug")) {console.log("BLANKET-Reporting No files were instrumented.");}
+            return;
+        }
+
+        if (typeof coverage_data.files.branchFcn !== "undefined"){
+            delete coverage_data.files.branchFcn;
+        }
+        if (typeof _blanket.options("reporter") === "string"){
+            _blanket._loadFile(_blanket.options("reporter"));
+            _blanket.customReporter(coverage_data,_blanket.options("reporter_options"));
+        }else if (typeof _blanket.options("reporter") === "function"){
+            _blanket.options("reporter")(coverage_data);
+        }else if (typeof _blanket.defaultReporter === 'function'){
+            _blanket.defaultReporter(coverage_data);
+        }else{
+            throw new Error("no reporter defined.");
+        }
+    },
+    _bindStartTestRunner: function(bindEvent,startEvent){
+        if (bindEvent){
+            bindEvent(startEvent);
+        }else{
+            window.addEventListener("load",startEvent,false);
+        }
+    },
+    _loadSourceFiles: function(callback){
+        var require = blanket.options("commonJS") ? blanket._commonjs.require : window.require;
+        function copy(o){
+          var _copy = Object.create( Object.getPrototypeOf(o) );
+          var propNames = Object.getOwnPropertyNames(o);
+
+          propNames.forEach(function(name){
+            var desc = Object.getOwnPropertyDescriptor(o, name);
+            Object.defineProperty(_copy, name, desc);
+          });
+
+          return _copy;
+        }
+        if (_blanket.options("debug")) {console.log("BLANKET-Collecting page scripts");}
+        var scripts = _blanket.utils.collectPageScripts();
+        //_blanket.options("filter",scripts);
+        if (scripts.length === 0){
+            callback();
+        }else{
+
+            //check session state
+            if (sessionStorage["blanketSessionLoader"]){
+                _blanket.blanketSession = JSON.parse(sessionStorage["blanketSessionLoader"]);
+            }
+            
+            scripts.forEach(function(file,indx){   
+                _blanket.utils.cache[file+".js"]={
+                    loaded:false
+                };
+            });
+            
+            var currScript=-1;
+            _blanket.utils.loadAll(function(test){
+                if (test){
+                  return typeof scripts[currScript+1] !== 'undefined';
+                }
+                currScript++;
+                if (currScript >= scripts.length){
+                  return null;
+                }
+                return scripts[currScript]+".js";
+            },callback);
+        }
+    },
+    beforeStartTestRunner: function(opts){
+        opts = opts || {};
+        opts.checkRequirejs = typeof opts.checkRequirejs === "undefined" ? true : opts.checkRequirejs;
+        opts.callback = opts.callback || function() {  };
+        opts.coverage = typeof opts.coverage === "undefined" ? true : opts.coverage;
+        if (opts.coverage) {
+            _blanket._bindStartTestRunner(opts.bindEvent,
+            function(){
+                _blanket._loadSourceFiles(function() {
+
+                    var allLoaded = function(){
+                        return opts.condition ? opts.condition() : _blanket.requireFilesLoaded();
+                    };
+                    var check = function() {
+                        if (allLoaded()) {
+                            if (_blanket.options("debug")) {console.log("BLANKET-All files loaded, init start test runner callback.");}
+                            var cb = _blanket.options("testReadyCallback");
+
+                            if (cb){
+                                if (typeof cb === "function"){
+                                    cb(opts.callback);
+                                }else if (typeof cb === "string"){
+                                    _blanket._addScript(cb);
+                                    opts.callback();
+                                }
+                            }else{
+                                opts.callback();
+                            }
+                        } else {
+                            setTimeout(check, 13);
+                        }
+                    };
+                    check();
+                });
+            });
+        }else{
+            opts.callback();
+        }
+    },
+    utils: {
+        qualifyURL: function (url) {
+            //http://stackoverflow.com/questions/470832/getting-an-absolute-url-from-a-relative-one-ie6-issue
+            var a = document.createElement('a');
+            a.href = url;
+            return a.href;
+        }
+    }
+});
+
+})(blanket);
+
+blanket.defaultReporter = function(coverage){
+    var cssSytle = "#blanket-main {margin:2px;background:#EEE;color:#333;clear:both;font-family:'Helvetica Neue Light', 'HelveticaNeue-Light', 'Helvetica Neue', Calibri, Helvetica, Arial, sans-serif; font-size:17px;} #blanket-main a {color:#333;text-decoration:none;}  #blanket-main a:hover {text-decoration:underline;} .blanket {margin:0;padding:5px;clear:both;border-bottom: 1px solid #FFFFFF;} .bl-error {color:red;}.bl-success {color:#5E7D00;} .bl-file{width:auto;} .bl-cl{float:left;} .blanket div.rs {margin-left:50px; width:150px; float:right} .bl-nb {padding-right:10px;} #blanket-main a.bl-logo {color: #EB1764;cursor: pointer;font-weight: bold;text-decoration: none} .bl-source{ overflow-x:scroll; background-color: #FFFFFF; border: 1px solid #CBCBCB; color: #363636; margin: 25px 20px; width: 80%;} .bl-source div{white-space: pre;font-family: monospace;} .bl-source > div > span:first-child{background-color: #EAEAEA;color: #949494;display: inline-block;padding: 0 10px;text-align: center;width: 30px;} .bl-source .miss{background-color:#e6c3c7} .bl-source span.branchWarning{color:#000;background-color:yellow;} .bl-source span.branchOkay{color:#000;background-color:transparent;}",
+        successRate = 60,
+        head = document.head,
+        fileNumber = 0,
+        body = document.body,
+        headerContent,
+        hasBranchTracking = Object.keys(coverage.files).some(function(elem){
+          return typeof coverage.files[elem].branchData !== 'undefined';
+        }),
+        bodyContent = "
 results
Coverage (%)
Covered/Total Smts.
"+(hasBranchTracking ? "
Covered/Total Branches
":"")+"
",
+        fileTemplate = "
{{fileNumber}}.{{file}}
{{percentage}} %
{{numberCovered}}/{{totalSmts}}
"+( hasBranchTracking ? "
{{passedBranches}}/{{totalBranches}}
" : "" )+"
";
+        grandTotalTemplate = "
{{rowTitle}}
{{percentage}} %
{{numberCovered}}/{{totalSmts}}
"+( hasBranchTracking ? "
{{passedBranches}}/{{totalBranches}}
" : "" ) + "
";
+
+    function blanket_toggleSource(id) {
+        var element = document.getElementById(id);
+        if(element.style.display === 'block') {
+            element.style.display = 'none';
+        } else {
+            element.style.display = 'block';
+        }
+    }
+
+
+    var script = document.createElement("script");
+    script.type = "text/javascript";
+    script.text = blanket_toggleSource.toString().replace('function ' + blanket_toggleSource.name, 'function blanket_toggleSource');
+    body.appendChild(script);
+
+    var percentage = function(number, total) {
+        return (Math.round(((number/total) * 100)*100)/100);
+    };
+
+    var appendTag = function (type, el, str) {
+        var dom = document.createElement(type);
+        dom.innerHTML = str;
+        el.appendChild(dom);
+    };
+
+    function escapeInvalidXmlChars(str) {
+        return str.replace(/\&/g, "&")
+            .replace(//g, ">")
+            .replace(/\"/g, """)
+            .replace(/\'/g, "'");
+    }
+
+    function isBranchFollowed(data,bool){
+        var mode = bool ? 0 : 1;
+        if (typeof data === 'undefined' ||
+            typeof data === null ||
+            typeof data[mode] === 'undefined'){
+            return false;
+        }
+        return data[mode].length > 0;
+    }
+
+    var branchStack = [];
+
+    function branchReport(colsIndex,src,cols,offset,lineNum){
+      var newsrc="";
+       var postfix="";
+      if (branchStack.length > 0){
+        newsrc += "";
+        if (branchStack[0][0].end.line === lineNum){
+          newsrc += escapeInvalidXmlChars(src.slice(0,branchStack[0][0].end.column)) + "";
+          src = src.slice(branchStack[0][0].end.column);
+          branchStack.shift();
+          if (branchStack.length > 0){
+            newsrc += "";
+            if (branchStack[0][0].end.line === lineNum){
+              newsrc += escapeInvalidXmlChars(src.slice(0,branchStack[0][0].end.column)) + "";
+              src = src.slice(branchStack[0][0].end.column);
+              branchStack.shift();
+              if (!cols){
+                return {src: newsrc + escapeInvalidXmlChars(src) ,cols:cols};
+              }
+            }
+            else if (!cols){
+              return {src: newsrc + escapeInvalidXmlChars(src) + "",cols:cols};
+            }
+            else{
+              postfix = "";
+            }
+          }else if (!cols){
+            return {src: newsrc + escapeInvalidXmlChars(src) ,cols:cols};
+          }
+        }else if(!cols){
+          return {src: newsrc + escapeInvalidXmlChars(src) + "",cols:cols};
+        }else{
+          postfix = "";
+        }
+      }
+      var thisline = cols[colsIndex];
+      //consequent
+      
+      var cons = thisline.consequent;
+      if (cons.start.line > lineNum){
+        branchStack.unshift([thisline.alternate,thisline]);
+        branchStack.unshift([cons,thisline]);
+        src = escapeInvalidXmlChars(src);
+      }else{
+        var style = "";
+        newsrc += escapeInvalidXmlChars(src.slice(0,cons.start.column-offset)) + style;
+        
+        if (cols.length > colsIndex+1 &&
+          cols[colsIndex+1].consequent.start.line === lineNum &&
+          cols[colsIndex+1].consequent.start.column-offset < cols[colsIndex].consequent.end.column-offset)
+        {
+          var res = branchReport(colsIndex+1,src.slice(cons.start.column-offset,cons.end.column-offset),cols,cons.start.column-offset,lineNum);
+          newsrc += res.src;
+          cols = res.cols;
+          cols[colsIndex+1] = cols[colsIndex+2];
+          cols.length--;
+        }else{
+          newsrc += escapeInvalidXmlChars(src.slice(cons.start.column-offset,cons.end.column-offset));
+        }
+        newsrc += "";
+
+        var alt = thisline.alternate;
+        if (alt.start.line > lineNum){
+          newsrc += escapeInvalidXmlChars(src.slice(cons.end.column-offset));
+          branchStack.unshift([alt,thisline]);
+        }else{
+          newsrc += escapeInvalidXmlChars(src.slice(cons.end.column-offset,alt.start.column-offset));
+          style = "";
+          newsrc +=  style;
+          if (cols.length > colsIndex+1 &&
+            cols[colsIndex+1].consequent.start.line === lineNum &&
+            cols[colsIndex+1].consequent.start.column-offset < cols[colsIndex].alternate.end.column-offset)
+          {
+            var res2 = branchReport(colsIndex+1,src.slice(alt.start.column-offset,alt.end.column-offset),cols,alt.start.column-offset,lineNum);
+            newsrc += res2.src;
+            cols = res2.cols;
+            cols[colsIndex+1] = cols[colsIndex+2];
+            cols.length--;
+          }else{
+            newsrc += escapeInvalidXmlChars(src.slice(alt.start.column-offset,alt.end.column-offset));
+          }
+          newsrc += "";
+          newsrc += escapeInvalidXmlChars(src.slice(alt.end.column-offset));
+          src = newsrc;
+        }
+      }
+      return {src:src+postfix, cols:cols};
+    }
+
+    var isUndefined =  function(item){
+            return typeof item !== 'undefined';
+      };
+
+    var files = coverage.files;
+    var totals = {
+      totalSmts: 0,
+      numberOfFilesCovered: 0,
+      passedBranches: 0,
+      totalBranches: 0,
+      moduleTotalStatements : {},
+      moduleTotalCoveredStatements : {},
+      moduleTotalBranches : {},
+      moduleTotalCoveredBranches : {}   
+    };
+
+    // check if a data-cover-modulepattern was provided for per-module coverage reporting
+    var modulePattern = _blanket.options("modulePattern");
+    var modulePatternRegex = ( modulePattern ? new RegExp(modulePattern) : null );    
+
+    for(var file in files)
+    {
+        fileNumber++;
+
+        var statsForFile = files[file],
+            totalSmts = 0,
+            numberOfFilesCovered = 0,
+            code = [],
+            i;
+        
+
+        var end = [];
+        for(i = 0; i < statsForFile.source.length; i +=1){
+            var src = statsForFile.source[i];
+            
+            if (branchStack.length > 0 ||
+                typeof statsForFile.branchData !== 'undefined')
+            {
+                if (typeof statsForFile.branchData[i+1] !== 'undefined')
+                {
+                  var cols = statsForFile.branchData[i+1].filter(isUndefined);
+                  var colsIndex=0;
+                  
+                    
+                  src = branchReport(colsIndex,src,cols,0,i+1).src;
+                  
+                }else if (branchStack.length){
+                  src = branchReport(0,src,null,0,i+1).src;
+                }else{
+                  src = escapeInvalidXmlChars(src);
+                }
+              }else{
+                src = escapeInvalidXmlChars(src);
+              }
+              var lineClass="";
+              if(statsForFile[i+1]) {
+                numberOfFilesCovered += 1;
+                totalSmts += 1;
+                lineClass = 'hit';
+              }else{
+                if(statsForFile[i+1] === 0){
+                    totalSmts++;
+                    lineClass = 'miss';
+                }
+              }
+              code[i + 1] = "
"+(i + 1)+""+src+"
";
+        }
+        totals.totalSmts += totalSmts;
+        totals.numberOfFilesCovered += numberOfFilesCovered;
+        var totalBranches=0;
+        var passedBranches=0;
+        if (typeof statsForFile.branchData !== 'undefined'){
+          for(var j=0;j 0 &&
+                    typeof statsForFile.branchData[j][k][1] !== 'undefined' &&
+                    statsForFile.branchData[j][k][1].length > 0){
+                    passedBranches++;
+                  }
+                }
+              }
+            }
+          }
+        }
+        totals.passedBranches += passedBranches;
+        totals.totalBranches += totalBranches;
+
+        // if "data-cover-modulepattern" was provided, 
+        // track totals per module name as well as globally
+        if (modulePatternRegex) {
+            var moduleName = file.match(modulePatternRegex)[1];
+
+            if(!totals.moduleTotalStatements.hasOwnProperty(moduleName)) {
+                totals.moduleTotalStatements[moduleName] = 0;
+                totals.moduleTotalCoveredStatements[moduleName] = 0;
+            }
+
+            totals.moduleTotalStatements[moduleName] += totalSmts;
+            totals.moduleTotalCoveredStatements[moduleName] += numberOfFilesCovered;
+
+            if(!totals.moduleTotalBranches.hasOwnProperty(moduleName)) {
+                totals.moduleTotalBranches[moduleName] = 0;
+                totals.moduleTotalCoveredBranches[moduleName] = 0;
+            }
+
+            totals.moduleTotalBranches[moduleName] += totalBranches;
+            totals.moduleTotalCoveredBranches[moduleName] += passedBranches;            
+        }
+
+        var result = percentage(numberOfFilesCovered, totalSmts);
+
+        var output = fileTemplate.replace("{{file}}", file)
+                                 .replace("{{percentage}}",result)
+                                 .replace("{{numberCovered}}", numberOfFilesCovered)
+                                 .replace(/\{\{fileNumber\}\}/g, fileNumber)
+                                 .replace("{{totalSmts}}", totalSmts)
+                                 .replace("{{totalBranches}}", totalBranches)
+                                 .replace("{{passedBranches}}", passedBranches)
+                                 .replace("{{source}}", code.join(" "));
+        if(result < successRate)
+        {
+            output = output.replace("{{statusclass}}", "bl-error");
+        } else {
+            output = output.replace("{{statusclass}}", "bl-success");
+        }
+        bodyContent += output;
+    }
+
+    // create temporary function for use by the global totals reporter, 
+    // as well as the per-module totals reporter
+    var createAggregateTotal = function(numSt, numCov, numBranch, numCovBr, moduleName) {
+
+        var totalPercent = percentage(numCov, numSt);
+        var statusClass = totalPercent < successRate ? "bl-error" : "bl-success";
+        var rowTitle = ( moduleName ? "Total for module: " + moduleName : "Global total" );
+        var totalsOutput = grandTotalTemplate.replace("{{rowTitle}}", rowTitle)
+            .replace("{{percentage}}", totalPercent)
+            .replace("{{numberCovered}}", numCov)
+            .replace("{{totalSmts}}", numSt)
+            .replace("{{passedBranches}}", numCovBr)
+            .replace("{{totalBranches}}", numBranch)
+            .replace("{{statusclass}}", statusClass);
+
+        bodyContent += totalsOutput;
+    };
+
+    // if "data-cover-modulepattern" was provided, 
+    // output the per-module totals alongside the global totals    
+    if (modulePatternRegex) {
+        for (var thisModuleName in totals.moduleTotalStatements) {
+            if (totals.moduleTotalStatements.hasOwnProperty(thisModuleName)) {
+
+                var moduleTotalSt = totals.moduleTotalStatements[thisModuleName];
+                var moduleTotalCovSt = totals.moduleTotalCoveredStatements[thisModuleName];
+
+                var moduleTotalBr = totals.moduleTotalBranches[thisModuleName];
+                var moduleTotalCovBr = totals.moduleTotalCoveredBranches[thisModuleName];
+
+                createAggregateTotal(moduleTotalSt, moduleTotalCovSt, moduleTotalBr, moduleTotalCovBr, thisModuleName);
+            }
+        }        
+    }
+
+    createAggregateTotal(totals.totalSmts, totals.numberOfFilesCovered, totals.totalBranches, totals.passedBranches, null);
+    bodyContent += "
"; //closing main
+
+
+    appendTag('style', head, cssSytle);
+    //appendStyle(body, headerContent);
+    if (document.getElementById("blanket-main")){
+        document.getElementById("blanket-main").innerHTML=
+            bodyContent.slice(23,-6);
+    }else{
+        appendTag('div', body, bodyContent);
+    }
+    //appendHtml(body, '');
+};
+
+(function(){
+    var newOptions={};
+    //http://stackoverflow.com/a/2954896
+    var toArray =Array.prototype.slice;
+    var scripts = toArray.call(document.scripts);
+    toArray.call(scripts[scripts.length - 1].attributes)
+                    .forEach(function(es){
+                        if(es.nodeName === "data-cover-only"){
+                            newOptions.filter = es.nodeValue;
+                        }
+                        if(es.nodeName === "data-cover-never"){
+                            newOptions.antifilter = es.nodeValue;
+                        }
+                        if(es.nodeName === "data-cover-reporter"){
+                            newOptions.reporter = es.nodeValue;
+                        }
+                        if (es.nodeName === "data-cover-adapter"){
+                            newOptions.adapter = es.nodeValue;
+                        }
+                        if (es.nodeName === "data-cover-loader"){
+                            newOptions.loader = es.nodeValue;
+                        }
+                        if (es.nodeName === "data-cover-timeout"){
+                            newOptions.timeout = es.nodeValue;
+                        }
+                        if (es.nodeName === "data-cover-modulepattern") {
+                            newOptions.modulePattern = es.nodeValue;
+                        }                        
+                        if (es.nodeName === "data-cover-reporter-options"){
+                            try{
+                                newOptions.reporter_options = JSON.parse(es.nodeValue);
+                            }catch(e){
+                                if (blanket.options("debug")){
+                                    throw new Error("Invalid reporter options.  Must be a valid stringified JSON object.");
+                                }
+                            }
+                        }
+                        if (es.nodeName === "data-cover-testReadyCallback"){
+                            newOptions.testReadyCallback = es.nodeValue;
+                        }
+                        if (es.nodeName === "data-cover-customVariable"){
+                            newOptions.customVariable = es.nodeValue;
+                        }
+                        if (es.nodeName === "data-cover-flags"){
+                            var flags = " "+es.nodeValue+" ";
+                            if (flags.indexOf(" ignoreError ") > -1){
+                                newOptions.ignoreScriptError = true;
+                            }
+                            if (flags.indexOf(" autoStart ") > -1){
+                                newOptions.autoStart = true;
+                            }
+                            if (flags.indexOf(" ignoreCors ") > -1){
+                                newOptions.ignoreCors = true;
+                            }
+                            if (flags.indexOf(" branchTracking ") > -1){
+                                newOptions.branchTracking = true;
+                            }
+                            if (flags.indexOf(" sourceURL ") > -1){
+                                newOptions.sourceURL = true;
+                            }
+                            if (flags.indexOf(" debug ") > -1){
+                                newOptions.debug = true;
+                            }
+                            if (flags.indexOf(" engineOnly ") > -1){
+                                newOptions.engineOnly = true;
+                            }
+                            if (flags.indexOf(" commonJS ") > -1){
+                                newOptions.commonJS = true;
+                            }
+                             if (flags.indexOf(" instrumentCache ") > -1){
+                                newOptions.instrumentCache = true;
+                            }
+                        }
+                    });
+    blanket.options(newOptions);
+
+    if (typeof requirejs !== 'undefined'){
+        blanket.options("existingRequireJS",true);
+    }
+    /* setup requirejs loader, if needed */
+    
+    if (blanket.options("commonJS")){
+        blanket._commonjs = {};
+    }
+})();
+(function(_blanket){
+_blanket.extend({
+    utils: {
+        normalizeBackslashes: function(str) {
+            return str.replace(/\\/g, '/');
+        },
+        matchPatternAttribute: function(filename,pattern){
+            if (typeof pattern === 'string'){
+                if (pattern.indexOf("[") === 0){
+                    //treat as array
+                    var pattenArr = pattern.slice(1,pattern.length-1).split(",");
+                    return pattenArr.some(function(elem){
+                        return _blanket.utils.matchPatternAttribute(filename,_blanket.utils.normalizeBackslashes(elem.slice(1,-1)));
+                        //return filename.indexOf(_blanket.utils.normalizeBackslashes(elem.slice(1,-1))) > -1;
+                    });
+                }else if ( pattern.indexOf("//") === 0){
+                    var ex = pattern.slice(2,pattern.lastIndexOf('/'));
+                    var mods = pattern.slice(pattern.lastIndexOf('/')+1);
+                    var regex = new RegExp(ex,mods);
+                    return regex.test(filename);
+                }else if (pattern.indexOf("#") === 0){
+                    return window[pattern.slice(1)].call(window,filename);
+                }else{
+                    return filename.indexOf(_blanket.utils.normalizeBackslashes(pattern)) > -1;
+                }
+            }else if ( pattern instanceof Array ){
+                return pattern.some(function(elem){
+                    return _blanket.utils.matchPatternAttribute(filename,elem);
+                });
+            }else if (pattern instanceof RegExp){
+                return pattern.test(filename);
+            }else if (typeof pattern === "function"){
+                return pattern.call(window,filename);
+            }
+        },
+        blanketEval: function(data){
+            _blanket._addScript(data);
+        },
+        collectPageScripts: function(){
+            var toArray = Array.prototype.slice;
+            var scripts = toArray.call(document.scripts);
+            var selectedScripts=[],scriptNames=[];
+            var filter = _blanket.options("filter");
+            if(filter != null){
+                //global filter in place, data-cover-only
+                var antimatch = _blanket.options("antifilter");
+                selectedScripts = toArray.call(document.scripts)
+                                .filter(function(s){
+                                    return toArray.call(s.attributes).filter(function(sn){
+                                        return sn.nodeName === "src" && _blanket.utils.matchPatternAttribute(sn.nodeValue,filter) &&
+                                            (typeof antimatch === "undefined" || !_blanket.utils.matchPatternAttribute(sn.nodeValue,antimatch));
+                                    }).length === 1;
+                                });
+            }else{
+                selectedScripts = toArray.call(document.querySelectorAll("script[data-cover]"));
+            }
+            scriptNames = selectedScripts.map(function(s){
+                                    return _blanket.utils.qualifyURL(
+                                        toArray.call(s.attributes).filter(
+                                            function(sn){
+                                                return sn.nodeName === "src";
+                                            })[0].value).replace(".js","");
+                                    });
+            if (!filter){
+                _blanket.options("filter","['"+scriptNames.join("','")+"']");
+            }
+            return scriptNames;
+        },
+        loadAll: function(nextScript,cb,preprocessor){
+            /**
+             * load dependencies
+             * @param {nextScript} factory for priority level
+             * @param {cb} the done callback
+             */
+            var currScript=nextScript();
+            var isLoaded = _blanket.utils.scriptIsLoaded(
+                                currScript,
+                                _blanket.utils.ifOrdered,
+                                nextScript,
+                                cb
+                            );
+            
+            if (!(_blanket.utils.cache[currScript] && _blanket.utils.cache[currScript].loaded)){
+                var attach = function(){
+                    if (_blanket.options("debug")) {console.log("BLANKET-Mark script:"+currScript+", as loaded and move to next script.");}
+                    isLoaded();
+                };
+                var whenDone = function(result){
+                    if (_blanket.options("debug")) {console.log("BLANKET-File loading finished");}
+                    if (typeof result !== 'undefined'){
+                        if (_blanket.options("debug")) {console.log("BLANKET-Add file to DOM.");}
+                        _blanket._addScript(result);
+                    }
+                    attach();
+                };
+
+                _blanket.utils.attachScript(
+                    {
+                        url: currScript
+                    },
+                    function (content){
+                        _blanket.utils.processFile(
+                            content,
+                            currScript,
+                            whenDone,
+                            whenDone
+                        );
+                    }
+                );
+            }else{
+                isLoaded();
+            }
+        },
+        attachScript: function(options,cb){
+           var timeout = _blanket.options("timeout") || 3000;
+           setTimeout(function(){
+                if (!_blanket.utils.cache[options.url].loaded){
+                    throw new Error("error loading source script");
+                }
+           },timeout);
+           _blanket.utils.getFile(
+                options.url,
+                cb, 
+                function(){ throw new Error("error loading source script");}
+            );
+        },
+        ifOrdered: function(nextScript,cb){
+            /**
+             * ordered loading callback
+             * @param {nextScript} factory for priority level
+             * @param {cb} the done callback
+             */
+            var currScript = nextScript(true);
+            if (currScript){
+              _blanket.utils.loadAll(nextScript,cb);
+            }else{
+              cb(new Error("Error in loading chain."));
+            }
+        },
+        scriptIsLoaded: function(url,orderedCb,nextScript,cb){
+            /**
+           * returns a callback that checks a loading list to see if a script is loaded.
+           * @param {orderedCb} callback if ordered loading is being done
+           * @param {nextScript} factory for next priority level
+           * @param {cb} the done callback
+           */
+           if (_blanket.options("debug")) {console.log("BLANKET-Returning function");}
+            return function(){
+                if (_blanket.options("debug")) {console.log("BLANKET-Marking file as loaded: "+url);}
+           
+                _blanket.utils.cache[url].loaded=true;
+            
+                if (_blanket.utils.allLoaded()){
+                    if (_blanket.options("debug")) {console.log("BLANKET-All files loaded");}
+                    cb();
+                }else if (orderedCb){
+                    //if it's ordered we need to
+                    //traverse down to the next
+                    //priority level
+                    if (_blanket.options("debug")) {console.log("BLANKET-Load next file.");}
+                    orderedCb(nextScript,cb);
+                }
+            };
+        },
+        cache: {},
+        allLoaded: function (){
+            /**
+             * check if depdencies are loaded in cache
+             */
+            var cached = Object.keys(_blanket.utils.cache);
+            for (var i=0;i -1){
+                        callback(_blanket.blanketSession[key]);
+                        foundInSession=true;
+                        return;
+                    }
+                }
+            }
+            if (!foundInSession){
+                var xhr = _blanket.utils.createXhr();
+                xhr.open('GET', url, true);
+
+                //Allow overrides specified in config
+                if (onXhr) {
+                    onXhr(xhr, url);
+                }
+
+                xhr.onreadystatechange = function (evt) {
+                    var status, err;
+                    
+                    //Do not explicitly handle errors, those should be
+                    //visible via console output in the browser.
+                    if (xhr.readyState === 4) {
+                        status = xhr.status;
+                        if ((status > 399 && status < 600) /*||
+                            (status === 0 &&
+                                navigator.userAgent.toLowerCase().indexOf('firefox') > -1)
+                           */ ) {
+                            //An http 4xx or 5xx error. Signal an error.
+                            err = new Error(url + ' HTTP status: ' + status);
+                            err.xhr = xhr;
+                            errback(err);
+                        } else {
+                            callback(xhr.responseText);
+                        }
+                    }
+                };
+                try{
+                    xhr.send(null);
+                }catch(e){
+                    if (e.code && (e.code === 101 || e.code === 1012) && _blanket.options("ignoreCors") === false){
+                        //running locally and getting error from browser
+                        _blanket.showManualLoader();
+                    } else {
+                        throw e;
+                    }
+                }
+            }
+        }
+    }
+});
+
+(function(){
+    var require = blanket.options("commonJS") ? blanket._commonjs.require : window.require;
+    var requirejs = blanket.options("commonJS") ? blanket._commonjs.requirejs : window.requirejs;
+    if (!_blanket.options("engineOnly") && _blanket.options("existingRequireJS")){
+
+        _blanket.utils.oldloader = requirejs.load;
+
+        requirejs.load = function (context, moduleName, url) {
+            _blanket.requiringFile(url);
+            _blanket.utils.getFile(url, 
+                function(content){ 
+                    _blanket.utils.processFile(
+                        content,
+                        url,
+                        function newLoader(){
+                            context.completeLoad(moduleName);
+                        },
+                        function oldLoader(){
+                            _blanket.utils.oldloader(context, moduleName, url);
+                        }
+                    );
+                }, function (err) {
+                _blanket.requiringFile();
+                throw err;
+            });
+        };
+    }
+})();
+
+})(blanket);
+
+(function(){
+if (typeof QUnit !== 'undefined'){
+    //check to make sure requirejs is completed before we start the test runner
+    var allLoaded = function() {
+        return window.QUnit.config.queue.length > 0 && blanket.noConflict().requireFilesLoaded();
+    };
+
+    if (!QUnit.config.urlConfig[0].tooltip){
+        //older versions we run coverage automatically
+        //and we change how events are binded
+        QUnit.begin=function(){
+            blanket.noConflict().setupCoverage();
+        };
+        
+        QUnit.done=function(failures, total) {
+            blanket.noConflict().onTestsDone();
+        };
+        QUnit.moduleStart=function( details ) {
+            blanket.noConflict().onModuleStart();
+        };
+        QUnit.testStart=function( details ) {
+            blanket.noConflict().onTestStart();
+        };
+        QUnit.testDone=function( details ) {
+            blanket.noConflict().onTestDone(details.total,details.passed);
+        };
+        blanket.beforeStartTestRunner({
+            condition: allLoaded,
+            callback: QUnit.start
+        });
+    }else{
+        QUnit.config.urlConfig.push({
+            id: "coverage",
+            label: "Enable coverage",
+            tooltip: "Enable code coverage."
+        });
+    
+        if ( QUnit.urlParams.coverage || blanket.options("autoStart") ) {
+            QUnit.begin(function(){
+                blanket.noConflict().setupCoverage();
+            });
+            
+            QUnit.done(function(failures, total) {
+                blanket.noConflict().onTestsDone();
+            });
+            QUnit.moduleStart(function( details ) {
+                blanket.noConflict().onModuleStart();
+            });
+            QUnit.testStart(function( details ) {
+                blanket.noConflict().onTestStart();
+            });
+            QUnit.testDone(function( details ) {
+                blanket.noConflict().onTestDone(details.total,details.passed);
+            });
+            blanket.noConflict().beforeStartTestRunner({
+                condition: allLoaded,
+                callback: function(){
+                    if (!(blanket.options("existingRequireJS") && !blanket.options("autoStart"))){
+                        QUnit.start();
+                    }
+                }
+            });
+        }else{
+            if (blanket.options("existingRequireJS")){ requirejs.load = _blanket.utils.oldloader; }
+            blanket.noConflict().beforeStartTestRunner({
+                condition: allLoaded,
+                callback: function(){
+                    if (!(blanket.options("existingRequireJS") && !blanket.options("autoStart"))){
+                        QUnit.start();
+                    }
+                },
+                coverage:false
+            });
+        }
+    }
+}
+})();
\ No newline at end of file
diff --git a/tests/index.html b/tests/index.html
index a52f282..aeff2b0 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -3,26 +3,13 @@
 	
 		
 		
-		Kis-js test app
-		
+		Kis-js test suite
 	
 	
-		
Kis-js Test Suite

-		

-		

-		

-		
    
-		
    
-			test markup, will be hidden
-			
-		
    
+		
    
+		
    
 		
-		
 		
+		
+		
+		
+		
+		
+		
+		
 		
 		
 		
diff --git a/tests/qunit/qunit.css b/tests/qunit/qunit.css
index 552c94c..7ba3f9a 100755
--- a/tests/qunit/qunit.css
+++ b/tests/qunit/qunit.css
@@ -1,5 +1,5 @@
 /**
- * QUnit v1.11.0pre - A JavaScript Unit Testing Framework
+ * QUnit v1.12.0 - A JavaScript Unit Testing Framework
  *
  * http://qunitjs.com
  *
@@ -111,6 +111,11 @@
 	color: #000;
 }
 
+#qunit-tests li .runtime {
+	float: right;
+	font-size: smaller;
+}
+
 .qunit-assert-list {
 	margin-top: 0.5em;
 	padding: 0.5em;
diff --git a/tests/qunit/qunit.js b/tests/qunit/qunit.js
index 65056c1..61af483 100755
--- a/tests/qunit/qunit.js
+++ b/tests/qunit/qunit.js
@@ -1,11 +1,11 @@
 /**
- * QUnit v1.11.0pre - A JavaScript Unit Testing Framework
+ * QUnit v1.12.0 - A JavaScript Unit Testing Framework
  *
  * http://qunitjs.com
  *
- * Copyright 2012 jQuery Foundation and other contributors
+ * Copyright 2013 jQuery Foundation and other contributors
  * Released under the MIT license.
- * http://jquery.org/license
+ * https://jquery.org/license/
  */
 
 (function( window ) {
@@ -20,6 +20,7 @@ var QUnit,
 	hasOwn = Object.prototype.hasOwnProperty,
 	// Keep a local reference to Date (GH-283)
 	Date = window.Date,
+	setTimeout = window.setTimeout,
 	defined = {
 		setTimeout: typeof window.setTimeout !== "undefined",
 		sessionStorage: (function() {
@@ -33,6 +34,35 @@ var QUnit,
 			}
 		}())
 	},
+	/**
+	 * Provides a normalized error string, correcting an issue
+	 * with IE 7 (and prior) where Error.prototype.toString is
+	 * not properly implemented
+	 *
+	 * Based on http://es5.github.com/#x15.11.4.4
+	 *
+	 * @param {String|Error} error
+	 * @return {String} error message
+	 */
+	errorString = function( error ) {
+		var name, message,
+			errorString = error.toString();
+		if ( errorString.substring( 0, 7 ) === "[object" ) {
+			name = error.name ? error.name.toString() : "Error";
+			message = error.message ? error.message.toString() : "";
+			if ( name && message ) {
+				return name + ": " + message;
+			} else if ( name ) {
+				return name;
+			} else if ( message ) {
+				return message;
+			} else {
+				return "Error";
+			}
+		} else {
+			return errorString;
+		}
+	},
 	/**
 	 * Makes a clone of an object using only Array or Object as base,
 	 * and copies over the own enumerable properties.
@@ -69,7 +99,7 @@ Test.prototype = {
 
 		if ( tests ) {
 			b = document.createElement( "strong" );
-			b.innerHTML = this.name;
+			b.innerHTML = this.nameHtml;
 
 			// `a` initialized at top of scope
 			a = document.createElement( "a" );
@@ -86,8 +116,16 @@ Test.prototype = {
 		}
 	},
 	setup: function() {
-		if ( this.module !== config.previousModule ) {
-			if ( config.previousModule ) {
+		if (
+			// Emit moduleStart when we're switching from one module to another
+			this.module !== config.previousModule ||
+				// They could be equal (both undefined) but if the previousModule property doesn't
+				// yet exist it means this is the first test in a suite that isn't wrapped in a
+				// module, in which case we'll just emit a moduleStart event for 'undefined'.
+				// Without this, reporters can get testStart before moduleStart  which is a problem.
+				!hasOwn.call( config, "previousModule" )
+		) {
+			if ( hasOwn.call( config, "previousModule" ) ) {
 				runLoggingCallbacks( "moduleDone", QUnit, {
 					name: config.previousModule,
 					failed: config.moduleStats.bad,
@@ -100,10 +138,6 @@ Test.prototype = {
 			runLoggingCallbacks( "moduleStart", QUnit, {
 				name: this.module
 			});
-		} else if ( config.autorun ) {
-			runLoggingCallbacks( "moduleStart", QUnit, {
-				name: this.module
-			});
 		}
 
 		config.current = this;
@@ -113,24 +147,33 @@ Test.prototype = {
 			teardown: function() {}
 		}, this.moduleTestEnvironment );
 
+		this.started = +new Date();
 		runLoggingCallbacks( "testStart", QUnit, {
 			name: this.testName,
 			module: this.module
 		});
 
-		// allow utility functions to access the current test environment
-		// TODO why??
+		/*jshint camelcase:false */
+
+
+		/**
+		 * Expose the current test environment.
+		 *
+		 * @deprecated since 1.12.0: Use QUnit.config.current.testEnvironment instead.
+		 */
 		QUnit.current_testEnvironment = this.testEnvironment;
 
+		/*jshint camelcase:true */
+
 		if ( !config.pollution ) {
 			saveGlobal();
 		}
 		if ( config.notrycatch ) {
-			this.testEnvironment.setup.call( this.testEnvironment );
+			this.testEnvironment.setup.call( this.testEnvironment, QUnit.assert );
 			return;
 		}
 		try {
-			this.testEnvironment.setup.call( this.testEnvironment );
+			this.testEnvironment.setup.call( this.testEnvironment, QUnit.assert );
 		} catch( e ) {
 			QUnit.pushFailure( "Setup failed on " + this.testName + ": " + ( e.message || e ), extractStacktrace( e, 1 ) );
 		}
@@ -141,21 +184,27 @@ Test.prototype = {
 		var running = id( "qunit-testresult" );
 
 		if ( running ) {
-			running.innerHTML = "Running: 
    " + this.name;
+			running.innerHTML = "Running: 
    " + this.nameHtml;
 		}
 
 		if ( this.async ) {
 			QUnit.stop();
 		}
 
+		this.callbackStarted = +new Date();
+
 		if ( config.notrycatch ) {
 			this.callback.call( this.testEnvironment, QUnit.assert );
+			this.callbackRuntime = +new Date() - this.callbackStarted;
 			return;
 		}
 
 		try {
 			this.callback.call( this.testEnvironment, QUnit.assert );
+			this.callbackRuntime = +new Date() - this.callbackStarted;
 		} catch( e ) {
+			this.callbackRuntime = +new Date() - this.callbackStarted;
+
 			QUnit.pushFailure( "Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + ( e.message || e ), extractStacktrace( e, 0 ) );
 			// else next test will carry the responsibility
 			saveGlobal();
@@ -169,11 +218,14 @@ Test.prototype = {
 	teardown: function() {
 		config.current = this;
 		if ( config.notrycatch ) {
-			this.testEnvironment.teardown.call( this.testEnvironment );
+			if ( typeof this.callbackRuntime === "undefined" ) {
+				this.callbackRuntime = +new Date() - this.callbackStarted;
+			}
+			this.testEnvironment.teardown.call( this.testEnvironment, QUnit.assert );
 			return;
 		} else {
 			try {
-				this.testEnvironment.teardown.call( this.testEnvironment );
+				this.testEnvironment.teardown.call( this.testEnvironment, QUnit.assert );
 			} catch( e ) {
 				QUnit.pushFailure( "Teardown failed on " + this.testName + ": " + ( e.message || e ), extractStacktrace( e, 1 ) );
 			}
@@ -190,12 +242,13 @@ Test.prototype = {
 			QUnit.pushFailure( "Expected at least one assertion, but none were run - call expect(0) to accept zero assertions.", this.stack );
 		}
 
-		var assertion, a, b, i, li, ol,
+		var i, assertion, a, b, time, li, ol,
 			test = this,
 			good = 0,
 			bad = 0,
 			tests = id( "qunit-tests" );
 
+		this.runtime = +new Date() - this.started;
 		config.stats.all += this.assertions.length;
 		config.moduleStats.all += this.assertions.length;
 
@@ -235,10 +288,10 @@ Test.prototype = {
 
 			// `b` initialized at top of scope
 			b = document.createElement( "strong" );
-			b.innerHTML = this.name + " (" + bad + ", " + good + ", " + this.assertions.length + ")";
+			b.innerHTML = this.nameHtml + " (" + bad + ", " + good + ", " + this.assertions.length + ")";
 
 			addEvent(b, "click", function() {
-				var next = b.nextSibling.nextSibling,
+				var next = b.parentNode.lastChild,
 					collapsed = hasClass( next, "qunit-collapsed" );
 				( collapsed ? removeClass : addClass )( next, "qunit-collapsed" );
 			});
@@ -253,13 +306,19 @@ Test.prototype = {
 				}
 			});
 
+			// `time` initialized at top of scope
+			time = document.createElement( "span" );
+			time.className = "runtime";
+			time.innerHTML = this.runtime + " ms";
+
 			// `li` initialized at top of scope
 			li = id( this.id );
 			li.className = bad ? "fail" : "pass";
 			li.removeChild( li.firstChild );
 			a = li.firstChild;
 			li.appendChild( b );
-			li.appendChild ( a );
+			li.appendChild( a );
+			li.appendChild( time );
 			li.appendChild( ol );
 
 		} else {
@@ -277,7 +336,8 @@ Test.prototype = {
 			module: this.module,
 			failed: bad,
 			passed: this.assertions.length - bad,
-			total: this.assertions.length
+			total: this.assertions.length,
+			duration: this.runtime
 		});
 
 		QUnit.reset();
@@ -343,7 +403,7 @@ QUnit = {
 
 	test: function( testName, expected, callback, async ) {
 		var test,
-			name = "" + escapeInnerText( testName ) + "";
+			nameHtml = "" + escapeText( testName ) + "";
 
 		if ( arguments.length === 2 ) {
 			callback = expected;
@@ -351,11 +411,11 @@ QUnit = {
 		}
 
 		if ( config.currentModule ) {
-			name = "" + config.currentModule + ": " + name;
+			nameHtml = "" + escapeText( config.currentModule ) + ": " + nameHtml;
 		}
 
 		test = new Test({
-			name: name,
+			nameHtml: nameHtml,
 			testName: testName,
 			expected: expected,
 			async: async,
@@ -372,7 +432,7 @@ QUnit = {
 		test.queue();
 	},
 
-	// Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	// Specify the number of expected assertions to guarantee that failed test (no assertions are run at all) don't slip through.
 	expect: function( asserts ) {
 		if (arguments.length === 1) {
 			config.current.expected = asserts;
@@ -382,6 +442,18 @@ QUnit = {
 	},
 
 	start: function( count ) {
+		// QUnit hasn't been initialized yet.
+		// Note: RequireJS (et al) may delay onLoad
+		if ( config.semaphore === undefined ) {
+			QUnit.begin(function() {
+				// This is triggered at the top of QUnit.load, push start() to the event loop, to allow QUnit.load to finish first
+				setTimeout(function() {
+					QUnit.start( count );
+				});
+			});
+			return;
+		}
+
 		config.semaphore -= count || 1;
 		// don't start until equal number of stop-calls
 		if ( config.semaphore > 0 ) {
@@ -395,7 +467,7 @@ QUnit = {
 		}
 		// A slight delay, to avoid any current callbacks
 		if ( defined.setTimeout ) {
-			window.setTimeout(function() {
+			setTimeout(function() {
 				if ( config.semaphore > 0 ) {
 					return;
 				}
@@ -418,7 +490,7 @@ QUnit = {
 
 		if ( config.testTimeout && defined.setTimeout ) {
 			clearTimeout( config.timeout );
-			config.timeout = window.setTimeout(function() {
+			config.timeout = setTimeout(function() {
 				QUnit.ok( false, "Test timed out" );
 				config.semaphore = 1;
 				QUnit.start();
@@ -428,7 +500,7 @@ QUnit = {
 };
 
 // `assert` initialized at top of scope
-// Asssert helpers
+// Assert helpers
 // All of these must either call QUnit.push() or manually do:
 // - runLoggingCallbacks( "log", .. );
 // - config.current.assertions.push({ .. });
@@ -446,6 +518,7 @@ assert = {
 			throw new Error( "ok() assertion outside test context, was " + sourceFromStacktrace(2) );
 		}
 		result = !!result;
+		msg = msg || (result ? "okay" : "failed" );
 
 		var source,
 			details = {
@@ -455,14 +528,13 @@ assert = {
 				message: msg
 			};
 
-		msg = escapeInnerText( msg || (result ? "okay" : "failed" ) );
-		msg = "" + msg + "";
+		msg = "" + escapeText( msg ) + "";
 
 		if ( !result ) {
 			source = sourceFromStacktrace( 2 );
 			if ( source ) {
 				details.source = source;
-				msg += "
    Source: 
    " + escapeInnerText( source ) + "
    ";
+				msg += "
    Source: 
    " + escapeText( source ) + "
    ";
 			}
 		}
 		runLoggingCallbacks( "log", QUnit, details );
@@ -571,7 +643,7 @@ assert = {
 				expectedOutput = null;
 			// expected is a regexp
 			} else if ( QUnit.objectType( expected ) === "regexp" ) {
-				ok = expected.test( actual );
+				ok = expected.test( errorString( actual ) );
 			// expected is a constructor
 			} else if ( actual instanceof expected ) {
 				ok = true;
@@ -583,13 +655,13 @@ assert = {
 
 			QUnit.push( ok, actual, expectedOutput, message );
 		} else {
-			QUnit.pushFailure( message, null, 'No exception was thrown.' );
+			QUnit.pushFailure( message, null, "No exception was thrown." );
 		}
 	}
 };
 
 /**
- * @deprecate since 1.8.0
+ * @deprecated since 1.8.0
  * Kept assertion helpers in root for backwards compatibility.
  */
 extend( QUnit, assert );
@@ -678,7 +750,7 @@ config = {
 // Export global variables, unless an 'exports' object exists,
 // in that case we assume we're in CommonJS (dealt with on the bottom of the script)
 if ( typeof exports === "undefined" ) {
-	extend( window, QUnit );
+	extend( window, QUnit.constructor.prototype );
 
 	// Expose QUnit object
 	window.QUnit = QUnit;
@@ -744,7 +816,7 @@ extend( QUnit, {
 
 		if ( qunit ) {
 			qunit.innerHTML =
-				"
    " + escapeInnerText( document.title ) + "
    " +
+				"
    " + escapeText( document.title ) + "
    " +
 				"
    " +
 				"
    " +
 				"
    " +
@@ -777,6 +849,11 @@ extend( QUnit, {
 	},
 
 	// Resets the test setup. Useful for tests that modify the DOM.
+	/*
+	DEPRECATED: Use multiple tests instead of resetting inside a test.
+	Use testStart or testDone for custom cleanup.
+	This method will throw an error in 2.0, and will be removed in 2.1
+	*/
 	reset: function() {
 		var fixture = id( "qunit-fixture" );
 		if ( fixture ) {
@@ -850,13 +927,13 @@ extend( QUnit, {
 				expected: expected
 			};
 
-		message = escapeInnerText( message ) || ( result ? "okay" : "failed" );
+		message = escapeText( message ) || ( result ? "okay" : "failed" );
 		message = "" + message + "";
 		output = message;
 
 		if ( !result ) {
-			expected = escapeInnerText( QUnit.jsDump.parse(expected) );
-			actual = escapeInnerText( QUnit.jsDump.parse(actual) );
+			expected = escapeText( QUnit.jsDump.parse(expected) );
+			actual = escapeText( QUnit.jsDump.parse(actual) );
 			output += "";
 
 			if ( actual !== expected ) {
@@ -868,7 +945,7 @@ extend( QUnit, {
 
 			if ( source ) {
 				details.source = source;
-				output += "";
+				output += "";
 			}
 
 			output += "
    Expected: 
    " + expected + "
    Source: 
    " + escapeInnerText( source ) + "
    Source: 
    " + escapeText( source ) + "
    ";
@@ -895,19 +972,19 @@ extend( QUnit, {
 				message: message
 			};
 
-		message = escapeInnerText( message ) || "error";
+		message = escapeText( message ) || "error";
 		message = "" + message + "";
 		output = message;
 
 		output += "";
 
 		if ( actual ) {
-			output += "";
+			output += "";
 		}
 
 		if ( source ) {
 			details.source = source;
-			output += "";
+			output += "";
 		}
 
 		output += "
    Result: 
    " + escapeInnerText( actual ) + "
    Result: 
    " + escapeText( actual ) + "
    Source: 
    " + escapeInnerText( source ) + "
    Source: 
    " + escapeText( source ) + "
    ";
@@ -926,18 +1003,21 @@ extend( QUnit, {
 			querystring = "?";
 
 		for ( key in params ) {
-			if ( !hasOwn.call( params, key ) ) {
-				continue;
+			if ( hasOwn.call( params, key ) ) {
+				querystring += encodeURIComponent( key ) + "=" +
+					encodeURIComponent( params[ key ] ) + "&";
 			}
-			querystring += encodeURIComponent( key ) + "=" +
-				encodeURIComponent( params[ key ] ) + "&";
 		}
-		return window.location.pathname + querystring.slice( 0, -1 );
+		return window.location.protocol + "//" + window.location.host +
+			window.location.pathname + querystring.slice( 0, -1 );
 	},
 
 	extend: extend,
 	id: id,
-	addEvent: addEvent
+	addEvent: addEvent,
+	addClass: addClass,
+	hasClass: hasClass,
+	removeClass: removeClass
 	// load, equiv, jsDump, diff: Attached later
 });
 
@@ -963,7 +1043,7 @@ extend( QUnit.constructor.prototype, {
 	// testStart: { name }
 	testStart: registerLoggingCallback( "testStart" ),
 
-	// testDone: { name, failed, passed, total }
+	// testDone: { name, failed, passed, total, duration }
 	testDone: registerLoggingCallback( "testDone" ),
 
 	// moduleStart: { name }
@@ -981,8 +1061,10 @@ QUnit.load = function() {
 	runLoggingCallbacks( "begin", QUnit, {} );
 
 	// Initialize the config, saving the execution queue
-	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val, urlConfigCheckboxes, moduleFilter,
+	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val,
+		urlConfigCheckboxesContainer, urlConfigCheckboxes, moduleFilter,
 		numModules = 0,
+		moduleNames = [],
 		moduleFilterHtml = "",
 		urlConfigHtml = "",
 		oldconfig = extend( {}, config );
@@ -1004,16 +1086,32 @@ QUnit.load = function() {
 			};
 		}
 		config[ val.id ] = QUnit.urlParams[ val.id ];
-		urlConfigHtml += "";
+		urlConfigHtml += "";
 	}
-
-	moduleFilterHtml += "";
+
+
+	for ( i = 0; i < numModules; i++) {
+			moduleFilterHtml += "";
+	}
 	moduleFilterHtml += "";
 
 	// `userAgent` initialized at top of scope
@@ -1066,28 +1164,39 @@ QUnit.load = function() {
 		// `label` initialized at top of scope
 		label = document.createElement( "label" );
 		label.setAttribute( "for", "qunit-filter-pass" );
-		label.setAttribute( "title", "Only show tests and assertons that fail. Stored in sessionStorage." );
+		label.setAttribute( "title", "Only show tests and assertions that fail. Stored in sessionStorage." );
 		label.innerHTML = "Hide passed tests";
 		toolbar.appendChild( label );
 
-		urlConfigCheckboxes = document.createElement( 'span' );
-		urlConfigCheckboxes.innerHTML = urlConfigHtml;
-		addEvent( urlConfigCheckboxes, "change", function( event ) {
-			var params = {};
-			params[ event.target.name ] = event.target.checked ? true : undefined;
+		urlConfigCheckboxesContainer = document.createElement("span");
+		urlConfigCheckboxesContainer.innerHTML = urlConfigHtml;
+		urlConfigCheckboxes = urlConfigCheckboxesContainer.getElementsByTagName("input");
+		// For oldIE support:
+		// * Add handlers to the individual elements instead of the container
+		// * Use "click" instead of "change"
+		// * Fallback from event.target to event.srcElement
+		addEvents( urlConfigCheckboxes, "click", function( event ) {
+			var params = {},
+				target = event.target || event.srcElement;
+			params[ target.name ] = target.checked ? true : undefined;
 			window.location = QUnit.url( params );
 		});
-		toolbar.appendChild( urlConfigCheckboxes );
+		toolbar.appendChild( urlConfigCheckboxesContainer );
 
 		if (numModules > 1) {
-			moduleFilter = document.createElement( 'span' );
-			moduleFilter.setAttribute( 'id', 'qunit-modulefilter-container' );
+			moduleFilter = document.createElement( "span" );
+			moduleFilter.setAttribute( "id", "qunit-modulefilter-container" );
 			moduleFilter.innerHTML = moduleFilterHtml;
-			addEvent( moduleFilter, "change", function() {
+			addEvent( moduleFilter.lastChild, "change", function() {
 				var selectBox = moduleFilter.getElementsByTagName("select")[0],
 					selectedModule = decodeURIComponent(selectBox.options[selectBox.selectedIndex].value);
 
-				window.location = QUnit.url( { module: ( selectedModule === "" ) ? undefined : selectedModule } );
+				window.location = QUnit.url({
+					module: ( selectedModule === "" ) ? undefined : selectedModule,
+					// Remove any existing filters
+					filter: undefined,
+					testNumber: undefined
+				});
 			});
 			toolbar.appendChild(moduleFilter);
 		}
@@ -1111,7 +1220,7 @@ addEvent( window, "load", QUnit.load );
 onErrorFnPrev = window.onerror;
 
 // Cover uncaught exceptions
-// Returning true will surpress the default browser handler,
+// Returning true will suppress the default browser handler,
 // returning false will let it run.
 window.onerror = function ( error, filePath, linerNr ) {
 	var ret = false;
@@ -1120,7 +1229,7 @@ window.onerror = function ( error, filePath, linerNr ) {
 	}
 
 	// Treat return value as window.onerror itself does,
-	// Only do our handling if not surpressed.
+	// Only do our handling if not suppressed.
 	if ( ret !== true ) {
 		if ( QUnit.config.current ) {
 			if ( QUnit.config.current.ignoreGlobalErrors ) {
@@ -1150,6 +1259,7 @@ function done() {
 			total: config.moduleStats.all
 		});
 	}
+	delete config.previousModule;
 
 	var i, key,
 		banner = id( "qunit-banner" ),
@@ -1255,7 +1365,7 @@ function validTest( test ) {
 function extractStacktrace( e, offset ) {
 	offset = offset === undefined ? 3 : offset;
 
-	var stack, include, i, regex;
+	var stack, include, i;
 
 	if ( e.stacktrace ) {
 		// Opera
@@ -1298,17 +1408,27 @@ function sourceFromStacktrace( offset ) {
 	}
 }
 
-function escapeInnerText( s ) {
+/**
+ * Escape text for attribute or text content.
+ */
+function escapeText( s ) {
 	if ( !s ) {
 		return "";
 	}
 	s = s + "";
-	return s.replace( /[\&<>]/g, function( s ) {
+	// Both single quotes and double quotes (for attributes)
+	return s.replace( /['"<>&]/g, function( s ) {
 		switch( s ) {
-			case "&": return "&";
-			case "<": return "<";
-			case ">": return ">";
-			default: return s;
+			case "'":
+				return "'";
+			case "\"":
+				return """;
+			case "<":
+				return "<";
+			case ">":
+				return ">";
+			case "&":
+				return "&";
 		}
 	});
 }
@@ -1332,7 +1452,7 @@ function process( last ) {
 		if ( !defined.setTimeout || config.updateRate <= 0 || ( ( new Date().getTime() - start ) < config.updateRate ) ) {
 			config.queue.shift()();
 		} else {
-			window.setTimeout( next, 13 );
+			setTimeout( next, 13 );
 			break;
 		}
 	}
@@ -1347,16 +1467,18 @@ function saveGlobal() {
 
 	if ( config.noglobals ) {
 		for ( var key in window ) {
-			// in Opera sometimes DOM element ids show up here, ignore them
-			if ( !hasOwn.call( window, key ) || /^qunit-test-output/.test( key ) ) {
-				continue;
+			if ( hasOwn.call( window, key ) ) {
+				// in Opera sometimes DOM element ids show up here, ignore them
+				if ( /^qunit-test-output/.test( key ) ) {
+					continue;
+				}
+				config.pollution.push( key );
 			}
-			config.pollution.push( key );
 		}
 	}
 }
 
-function checkPollution( name ) {
+function checkPollution() {
 	var newGlobals,
 		deletedGlobals,
 		old = config.pollution;
@@ -1393,25 +1515,45 @@ function diff( a, b ) {
 
 function extend( a, b ) {
 	for ( var prop in b ) {
-		if ( b[ prop ] === undefined ) {
-			delete a[ prop ];
-
-		// Avoid "Member not found" error in IE8 caused by setting window.constructor
-		} else if ( prop !== "constructor" || a !== window ) {
-			a[ prop ] = b[ prop ];
+		if ( hasOwn.call( b, prop ) ) {
+			// Avoid "Member not found" error in IE8 caused by messing with window.constructor
+			if ( !( prop === "constructor" && a === window ) ) {
+				if ( b[ prop ] === undefined ) {
+					delete a[ prop ];
+				} else {
+					a[ prop ] = b[ prop ];
+				}
+			}
 		}
 	}
 
 	return a;
 }
 
+/**
+ * @param {HTMLElement} elem
+ * @param {string} type
+ * @param {Function} fn
+ */
 function addEvent( elem, type, fn ) {
+	// Standards-based browsers
 	if ( elem.addEventListener ) {
 		elem.addEventListener( type, fn, false );
-	} else if ( elem.attachEvent ) {
-		elem.attachEvent( "on" + type, fn );
+	// IE
 	} else {
-		fn();
+		elem.attachEvent( "on" + type, fn );
+	}
+}
+
+/**
+ * @param {Array|NodeList} elems
+ * @param {string} type
+ * @param {Function} fn
+ */
+function addEvents( elems, type, fn ) {
+	var i = elems.length;
+	while ( i-- ) {
+		addEvent( elems[i], type, fn );
 	}
 }
 
@@ -1431,8 +1573,8 @@ function removeClass( elem, name ) {
 	while ( set.indexOf(" " + name + " ") > -1 ) {
 		set = set.replace(" " + name + " " , " ");
 	}
-	// If possible, trim it for prettiness, but not neccecarily
-	elem.className = window.jQuery ? jQuery.trim( set ) : ( set.trim ? set.trim() : set );
+	// If possible, trim it for prettiness, but not necessarily
+	elem.className = typeof set.trim === "function" ? set.trim() : set.replace(/^\s+|\s+$/g, "");
 }
 
 function id( name ) {
@@ -1448,7 +1590,6 @@ function registerLoggingCallback( key ) {
 
 // Supports deprecated method of completely overwriting logging callbacks
 function runLoggingCallbacks( key, scope, args ) {
-	//debugger;
 	var i, callbacks;
 	if ( QUnit.hasOwnProperty( key ) ) {
 		QUnit[ key ].call(scope, args );
@@ -1482,8 +1623,10 @@ QUnit.equiv = (function() {
 		callers = [],
 		// stack to avoiding loops from circular referencing
 		parents = [],
+		parentsB = [],
 
 		getProto = Object.getPrototypeOf || function ( obj ) {
+			/*jshint camelcase:false */
 			return obj.__proto__;
 		},
 		callbacks = (function () {
@@ -1492,7 +1635,7 @@ QUnit.equiv = (function() {
 			function useStrictEquality( b, a ) {
 				/*jshint eqeqeq:false */
 				if ( b instanceof a.constructor || a instanceof b.constructor ) {
-					// to catch short annotaion VS 'new' annotation of a
+					// to catch short annotation VS 'new' annotation of a
 					// declaration
 					// e.g. var i = 1;
 					// var j = new Number(1);
@@ -1521,7 +1664,7 @@ QUnit.equiv = (function() {
 					return QUnit.objectType( b ) === "regexp" &&
 						// the regex itself
 						a.source === b.source &&
-						// and its modifers
+						// and its modifiers
 						a.global === b.global &&
 						// (gmi) ...
 						a.ignoreCase === b.ignoreCase &&
@@ -1538,7 +1681,7 @@ QUnit.equiv = (function() {
 				},
 
 				"array": function( b, a ) {
-					var i, j, len, loop;
+					var i, j, len, loop, aCircular, bCircular;
 
 					// b could be an object literal here
 					if ( QUnit.objectType( b ) !== "array" ) {
@@ -1553,24 +1696,36 @@ QUnit.equiv = (function() {
 
 					// track reference to avoid circular references
 					parents.push( a );
+					parentsB.push( b );
 					for ( i = 0; i < len; i++ ) {
 						loop = false;
 						for ( j = 0; j < parents.length; j++ ) {
-							if ( parents[j] === a[i] ) {
-								loop = true;// dont rewalk array
+							aCircular = parents[j] === a[i];
+							bCircular = parentsB[j] === b[i];
+							if ( aCircular || bCircular ) {
+								if ( a[i] === b[i] || aCircular && bCircular ) {
+									loop = true;
+								} else {
+									parents.pop();
+									parentsB.pop();
+									return false;
+								}
 							}
 						}
 						if ( !loop && !innerEquiv(a[i], b[i]) ) {
 							parents.pop();
+							parentsB.pop();
 							return false;
 						}
 					}
 					parents.pop();
+					parentsB.pop();
 					return true;
 				},
 
 				"object": function( b, a ) {
-					var i, j, loop,
+					/*jshint forin:false */
+					var i, j, loop, aCircular, bCircular,
 						// Default to true
 						eq = true,
 						aProperties = [],
@@ -1589,28 +1744,36 @@ QUnit.equiv = (function() {
 
 					// stack constructor before traversing properties
 					callers.push( a.constructor );
+
 					// track reference to avoid circular references
 					parents.push( a );
+					parentsB.push( b );
 
-					for ( i in a ) { // be strict: don't ensures hasOwnProperty
-									// and go deep
+					// be strict: don't ensure hasOwnProperty and go deep
+					for ( i in a ) {
 						loop = false;
 						for ( j = 0; j < parents.length; j++ ) {
-							if ( parents[j] === a[i] ) {
-								// don't go down the same path twice
-								loop = true;
+							aCircular = parents[j] === a[i];
+							bCircular = parentsB[j] === b[i];
+							if ( aCircular || bCircular ) {
+								if ( a[i] === b[i] || aCircular && bCircular ) {
+									loop = true;
+								} else {
+									eq = false;
+									break;
+								}
 							}
 						}
-						aProperties.push(i); // collect a's properties
-
-						if (!loop && !innerEquiv( a[i], b[i] ) ) {
+						aProperties.push(i);
+						if ( !loop && !innerEquiv(a[i], b[i]) ) {
 							eq = false;
 							break;
 						}
 					}
 
-					callers.pop(); // unstack, we are done
 					parents.pop();
+					parentsB.pop();
+					callers.pop(); // unstack, we are done
 
 					for ( i in b ) {
 						bProperties.push( i ); // collect b's properties
@@ -1640,7 +1803,7 @@ QUnit.equiv = (function() {
 			}
 
 			// apply transition with (1..n) arguments
-		}( args[0], args[1] ) && arguments.callee.apply( this, args.splice(1, args.length - 1 )) );
+		}( args[0], args[1] ) && innerEquiv.apply( this, args.splice(1, args.length - 1 )) );
 	};
 
 	return innerEquiv;
@@ -1658,7 +1821,7 @@ QUnit.equiv = (function() {
  */
 QUnit.jsDump = (function() {
 	function quote( str ) {
-		return '"' + str.toString().replace( /"/g, '\\"' ) + '"';
+		return "\"" + str.toString().replace( /"/g, "\\\"" ) + "\"";
 	}
 	function literal( o ) {
 		return o + "";
@@ -1751,13 +1914,13 @@ QUnit.jsDump = (function() {
 				if ( this.HTML ) {
 					chr = chr.replace( /\t/g, "   " ).replace( / /g, " " );
 				}
-				return new Array( this._depth_ + (extra||0) ).join(chr);
+				return new Array( this.depth + ( extra || 0 ) ).join(chr);
 			},
 			up: function( a ) {
-				this._depth_ += a || 1;
+				this.depth += a || 1;
 			},
 			down: function( a ) {
-				this._depth_ -= a || 1;
+				this.depth -= a || 1;
 			},
 			setParser: function( name, parser ) {
 				this.parsers[name] = parser;
@@ -1767,7 +1930,7 @@ QUnit.jsDump = (function() {
 			literal: literal,
 			join: join,
 			//
-			_depth_: 1,
+			depth: 1,
 			// This is the list of parsers, to modify them, use jsDump.setParser
 			parsers: {
 				window: "[Window]",
@@ -1795,6 +1958,7 @@ QUnit.jsDump = (function() {
 				nodelist: array,
 				"arguments": array,
 				object: function( map, stack ) {
+					/*jshint forin:false */
 					var ret = [ ], keys, key, val, i;
 					QUnit.jsDump.up();
 					keys = [];
@@ -1811,19 +1975,31 @@ QUnit.jsDump = (function() {
 					return join( "{", ret, "}" );
 				},
 				node: function( node ) {
-					var a, val,
+					var len, i, val,
 						open = QUnit.jsDump.HTML ? "<" : "<",
 						close = QUnit.jsDump.HTML ? ">" : ">",
 						tag = node.nodeName.toLowerCase(),
-						ret = open + tag;
+						ret = open + tag,
+						attrs = node.attributes;
 
-					for ( a in QUnit.jsDump.DOMAttrs ) {
-						val = node[ QUnit.jsDump.DOMAttrs[a] ];
-						if ( val ) {
-							ret += " " + a + "=" + QUnit.jsDump.parse( val, "attribute" );
+					if ( attrs ) {
+						for ( i = 0, len = attrs.length; i < len; i++ ) {
+							val = attrs[i].nodeValue;
+							// IE6 includes all attributes in .attributes, even ones not explicitly set.
+							// Those have values like undefined, null, 0, false, "" or "inherit".
+							if ( val && val !== "inherit" ) {
+								ret += " " + attrs[i].nodeName + "=" + QUnit.jsDump.parse( val, "attribute" );
+							}
 						}
 					}
-					return ret + close + open + "/" + tag + close;
+					ret += close;
+
+					// Show content of TextNode or CDATASection
+					if ( node.nodeType === 3 || node.nodeType === 4 ) {
+						ret += node.nodeValue;
+					}
+
+					return ret + open + "/" + tag + close;
 				},
 				// function calls it internally, it's the arguments part of the function
 				functionArgs: function( fn ) {
@@ -1853,12 +2029,6 @@ QUnit.jsDump = (function() {
 				number: literal,
 				"boolean": literal
 			},
-			DOMAttrs: {
-				//attributes to dump from nodes, name=>realName
-				id: "id",
-				name: "name",
-				"class": "className"
-			},
 			// if true, entities are escaped ( <, >, \t, space and \n )
 			HTML: false,
 			// indentation unit
@@ -1870,27 +2040,6 @@ QUnit.jsDump = (function() {
 	return jsDump;
 }());
 
-// from Sizzle.js
-function getText( elems ) {
-	var i, elem,
-		ret = "";
-
-	for ( i = 0; elems[i]; i++ ) {
-		elem = elems[i];
-
-		// Get the text from text nodes and CDATA nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
-			ret += elem.nodeValue;
-
-		// Traverse everything else, except comment nodes
-		} else if ( elem.nodeType !== 8 ) {
-			ret += getText( elem.childNodes );
-		}
-	}
-
-	return ret;
-}
-
 // from jquery.js
 function inArray( elem, array ) {
 	if ( array.indexOf ) {
@@ -1928,7 +2077,7 @@ QUnit.diff = (function() {
 			os = {};
 
 		for ( i = 0; i < n.length; i++ ) {
-			if ( ns[ n[i] ] == null ) {
+			if ( !hasOwn.call( ns, n[i] ) ) {
 				ns[ n[i] ] = {
 					rows: [],
 					o: null
@@ -1938,7 +2087,7 @@ QUnit.diff = (function() {
 		}
 
 		for ( i = 0; i < o.length; i++ ) {
-			if ( os[ o[i] ] == null ) {
+			if ( !hasOwn.call( os, o[i] ) ) {
 				os[ o[i] ] = {
 					rows: [],
 					n: null
@@ -1948,18 +2097,17 @@ QUnit.diff = (function() {
 		}
 
 		for ( i in ns ) {
-			if ( !hasOwn.call( ns, i ) ) {
-				continue;
-			}
-			if ( ns[i].rows.length === 1 && os[i] !== undefined && os[i].rows.length === 1 ) {
-				n[ ns[i].rows[0] ] = {
-					text: n[ ns[i].rows[0] ],
-					row: os[i].rows[0]
-				};
-				o[ os[i].rows[0] ] = {
-					text: o[ os[i].rows[0] ],
-					row: ns[i].rows[0]
-				};
+			if ( hasOwn.call( ns, i ) ) {
+				if ( ns[i].rows.length === 1 && hasOwn.call( os, i ) && os[i].rows.length === 1 ) {
+					n[ ns[i].rows[0] ] = {
+						text: n[ ns[i].rows[0] ],
+						row: os[i].rows[0]
+					};
+					o[ os[i].rows[0] ] = {
+						text: o[ os[i].rows[0] ],
+						row: ns[i].rows[0]
+					};
+				}
 			}
 		}
 
@@ -2055,9 +2203,9 @@ QUnit.diff = (function() {
 	};
 }());
 
-// for CommonJS enviroments, export everything
+// for CommonJS environments, export everything
 if ( typeof exports !== "undefined" ) {
-	extend( exports, QUnit );
+	extend( exports, QUnit.constructor.prototype );
 }
 
 // get at whatever the global object is, like window in browsers
diff --git a/tests/tests/core.js b/tests/tests/core.js
index 86dac5b..63441bc 100755
--- a/tests/tests/core.js
+++ b/tests/tests/core.js
@@ -50,7 +50,25 @@
 			equal(e, $_("div").el[i], ".each function has current selector");
 			i++;
 		});
-		equal($_().el, window.document.documentElement, "Empty selector is set to documentElement");
+		
+		strictEqual($_().el, window.document.documentElement, "Empty selector is set to documentElement");
+		strictEqual($_('#qunit').el, document.getElementById('qunit'), "Id selector equivalence")
+		
+		strictEqual(is_clone($_('#qunit').el, $_.$('#qunit')), true, "El attribute is same as direct selector");
+		strictEqual(is_clone($_('div').el, $_.$('div')), true, "El attribute is same as direct selector");
+		
+	});
+	
+	asyncTest("Interator tests", function() {
+		$_('#qunit').each(function(el) {
+			equal(el, $_.$('#qunit'));
+			start();
+		});
+		
+		/*$_('foo').each(function(el) {
+			equal(el, undefined);
+			start();	
+		});*/
 	});
 	
 	test("Array.isArray", function(){
diff --git a/tests/tests/event.js b/tests/tests/event.js
index 88dc5a9..98d788c 100755
--- a/tests/tests/event.js
+++ b/tests/tests/event.js
@@ -4,21 +4,15 @@
 	module("events");
 	
 	test("Events defined", function(){
-		expect(2);
+		expect(4);
 		ok($_.event.add, "Add Method Exists");
 		ok($_.event.remove, "Remove Method Exists");
+		ok($_.event.live, "Live Method Exists");
+		ok($_.event.delegate, "Delegate Method Exists");
 	});
 	
-	test("Browser expando support", function() {
-		expect(3);
-		// kis-js events uses expando properties to store event listeners for IE
-		// If this test fails, the event module will likely fail as well
-		var ele = document.createElement("div");
-		ele.expando = {a:5, b:"c", c: function cool(){return ele}};
-		equal(ele.expando.a, 5);
-		equal(ele.expando.b, "c");
-		equal(ele.expando.c(), ele, 
-			"Closure isn't broken by being assigned to an expando property");
+	test("Adding Events", function() {
+		expect(0);	
 	});
 	
 }());
\ No newline at end of file