From a190f3f4e2c05ec171efd2078533464bc706ced2 Mon Sep 17 00:00:00 2001
From: Jaromil <jaromil@dyne.org>
Date: Sat, 16 May 2009 17:00:37 +0200
Subject: [PATCH] refactoring of garbage collection testing that multiple
 scripts can be included from a main one removed js garbage collection in
 controllers (was called after script load) included JSON as a standard
 library (it works!) modified example scripts to avoid namespace clash

---
 scripts/javascript/examples/cynosure.js  |  44 +--
 scripts/javascript/examples/json_test.js |  31 ++
 scripts/javascript/examples/star.js      |  16 +-
 scripts/javascript/examples/test_rand.js |  48 +--
 scripts/javascript/lib/json2.js          | 478 +++++++++++++++++++++++
 src/controller.cpp                       |  21 +-
 src/jsparser.cpp                         |   2 +-
 7 files changed, 578 insertions(+), 62 deletions(-)
 create mode 100644 scripts/javascript/examples/json_test.js
 create mode 100644 scripts/javascript/lib/json2.js

diff --git a/scripts/javascript/examples/cynosure.js b/scripts/javascript/examples/cynosure.js
index 532a3d3a..199b41af 100644
--- a/scripts/javascript/examples/cynosure.js
+++ b/scripts/javascript/examples/cynosure.js
@@ -43,29 +43,29 @@ width=1024; height=768;
 width=800; height=800;
 width=400; height=300;
 
-geo = new GeometryLayer();
-geo.activate(true);
-add_layer(geo);
+cyno_geo = new GeometryLayer();
+cyno_geo.activate(true);
+add_layer(cyno_geo);
 
-trigger = new TriggerController();
-register_controller(trigger);
-trigger.frame = function() { Draw(); };
+cyno_trigger = new TriggerController();
+register_controller(cyno_trigger);
+cyno_trigger.frame = function() { Draw(); };
 
-kbd = new KeyboardController();
-register_controller(kbd);
-kbd.released_q = function() { quit(); }
-kbd.released_x = function() { Draw(); }
+cyno_kbd = new KeyboardController();
+register_controller(cyno_kbd);
+cyno_kbd.released_q = function() { quit(); }
+cyno_kbd.released_x = function() { Draw(); }
 
-kbd.released_p = function() {
+cyno_kbd.released_p = function() {
     echo("ok, I shot myself now");
-    try{rem_controller(trigger);}catch(e){echo("tg nope: "+e);}
-    try{rem_layer(geo);}catch(e){echo("la nope: "+e);}
+    try{rem_controller(cyno_trigger);}catch(e){echo("tg nope: "+e);}
+    try{rem_layer(cyno_geo);}catch(e){echo("la nope: "+e);}
     try{rem_controller(mc);}catch(e){echo("mc nope: "+e);}
-    try{rem_controller(kbd);}catch(e){echo("kb nope: "+e);}
-    delete geo;
+    try{rem_controller(cyno_kbd);}catch(e){echo("kb nope: "+e);}
+    delete cyno_geo;
     delete mc;
-    delete kbd;
-    delete trigger;
+    delete cyno_kbd;
+    delete cyno_trigger;
     gc(); // kbd-js not cleared within this call!
     echo("Bullet arrived.");
 }
@@ -132,7 +132,7 @@ function Draw() {
     for (j=0; j<10; j++) {
 		if ((iterations > 0) && (++i >= iterations)) {
 			i = 0; // clearScreen
-			geo.rectangle_fill(0,0,width,height,0x000000FF);
+			cyno_geo.rectangle_fill(0,0,width,height,0x000000FF);
 		} 
         paint();
     }
@@ -193,22 +193,22 @@ function paint() {
 
 		/* Draw the shadow */
 		if (elevation > 0)
-		  geo.rectangle_fill(curX + elevation, curY + elevation,
+		  cyno_geo.rectangle_fill(curX + elevation, curY + elevation,
 			  curX + elevation + curWidth, 
 			  curY + elevation + curHeight,
 			  0x00000060);
 
         /* Draw the edge */
 		if (shadowWidth > 0)
-		  geo.rectangle_fill(curX + shadowWidth, curY + shadowWidth,
+		  cyno_geo.rectangle_fill(curX + shadowWidth, curY + shadowWidth,
 		  curX + shadowWidth + curWidth, 
 		  curY + shadowWidth + curHeight,
 		  0x000000ff);
 
-		geo.rectangle_fill(curX, curY, curX+curWidth, curY+curHeight, fg_gc)
+		cyno_geo.rectangle_fill(curX, curY, curX+curWidth, curY+curHeight, fg_gc)
 
 		/* Draw a 1-pixel black border around the rectangle */
-		geo.rectangle(curX, curY, curX+curWidth, curY+curHeight, 0x00000000);
+		cyno_geo.rectangle(curX, curY, curX+curWidth, curY+curHeight, 0x00000000);
     }
   }
 }
diff --git a/scripts/javascript/examples/json_test.js b/scripts/javascript/examples/json_test.js
new file mode 100644
index 00000000..62526d91
--- /dev/null
+++ b/scripts/javascript/examples/json_test.js
@@ -0,0 +1,31 @@
+include("../lib/json2.js");
+
+echo("JSON library included");
+
+files = scandir(".");
+
+echo("files found: " + files.length);
+
+// stringify the array
+json_enc = JSON.stringify(files);
+
+// and parse it back
+json_dec = JSON.parse(json_enc);
+
+// then go through the array and load the scripts we like
+var c;
+for(c=0; c<json_dec.length; c++) {
+    if(json_dec[c] == "./star.js") {
+	echo("loading star.js");
+	include(json_dec[c]);
+    }
+    if(json_dec[c] == "./test_rand.js") {
+	echo("loading test_rand.js");
+	include(json_dec[c]);
+    }
+    if(json_dec[c] == "./cynosure.js") {
+	echo("loading cynoruse.js");
+	include(json_dec[c]);
+    }
+}
+
diff --git a/scripts/javascript/examples/star.js b/scripts/javascript/examples/star.js
index c4b99995..f6991fb5 100644
--- a/scripts/javascript/examples/star.js
+++ b/scripts/javascript/examples/star.js
@@ -40,10 +40,13 @@ function drawStar(lay, s_mul, s2_mul) {
 }
 
 running = true;
-kbd = new KeyboardController();
-kbd.pressed_esc = function() { quit(); }
-register_controller( kbd );
 
+var kbd;
+star_kbd = new KeyboardController();
+star_kbd.pressed_esc = function() { quit(); }
+register_controller( star_kbd );
+
+var star;
 star = new GeometryLayer();
 star.color(255,255,255,255);
 //star.set_blit("alpha");
@@ -59,9 +62,10 @@ srand();
 
 cc = 1;
 
-bang = new TriggerController();
-register_controller(bang);
-bang.frame = function() {
+var star_bang;
+star_bang = new TriggerController();
+register_controller(star_bang);
+star_bang.frame = function() {
 
     cc += 0.05;
 
diff --git a/scripts/javascript/examples/test_rand.js b/scripts/javascript/examples/test_rand.js
index 34d4f984..aa27107f 100644
--- a/scripts/javascript/examples/test_rand.js
+++ b/scripts/javascript/examples/test_rand.js
@@ -6,7 +6,7 @@
 width =  400;
 height = 300;
 
-function draw_pixels(geo) {
+function draw_pixels(rand_geo) {
   var x, y;
 
   x = rand()%width;
@@ -15,11 +15,11 @@ function draw_pixels(geo) {
   if(x<0) x = -x;
   if(y<0) y = -y;
 
-  geo.pixel(x,y);
+  rand_geo.pixel(x,y);
 }
 
 
-function draw_triangles(geo) {
+function draw_triangles(rand_geo) {
   var x1, x2, x3;
   var y1, y2, y3;
 
@@ -37,11 +37,11 @@ function draw_triangles(geo) {
   if(y2<0) y2 = -y2;
   if(y3<0) y3 = -y3;
 
-  geo.trigon_fill(x1,y1,x2,y2,x3,y3);
+  rand_geo.trigon_fill(x1,y1,x2,y2,x3,y3);
 }
 
 
-function draw_ellipses(geo) {
+function draw_ellipses(rand_geo) {
   var x, y;
   var rx, ry;
 
@@ -55,10 +55,10 @@ function draw_ellipses(geo) {
   if(rx<0) rx = -rx;
   if(ry<0) ry = -ry;
 
-  geo.ellipse_fill(x, y, rx, ry);
+  rand_geo.ellipse_fill(x, y, rx, ry);
 }
 
-function randomize_color(geo) {
+function randomize_color(rand_geo) {
   var r, g, b;
 
   r = rand() % 255;
@@ -69,33 +69,33 @@ function randomize_color(geo) {
   if(g<0) g = -g;
   if(b<0) b = -b;
 
-  geo.color(r,g,b,150); 
+  rand_geo.color(r,g,b,150); 
 }
 
-geo = new GeometryLayer(400,300);
-//geo.set_blit("alpha");
-//geo.set_blit_value(0.5);
-geo.activate(true);
+rand_geo = new GeometryLayer(400,300);
+//rand_geo.set_blit("alpha");
+//rand_geo.set_blit_value(0.5);
+rand_geo.activate(true);
 //geo.start();
 //geo.set_fps(24);
-add_layer(geo);
+add_layer(rand_geo);
 
 running = true;
-kbd = new KeyboardController();
-kbd.released_q = function() { quit(); }
-kbd.released_p = function() { drawer = draw_pixels; }
-kbd.released_t = function() { drawer = draw_triangles; }
-kbd.released_e = function() { drawer = draw_ellipses; }
-register_controller( kbd );
+rand_kbd = new KeyboardController();
+rand_kbd.released_q = function() { quit(); }
+rand_kbd.released_p = function() { drawer = draw_pixels; }
+rand_kbd.released_t = function() { drawer = draw_triangles; }
+rand_kbd.released_e = function() { drawer = draw_ellipses; }
+register_controller( rand_kbd );
 
 drawer = draw_triangles;
 
-bang = new TriggerController();
-bang.frame = function() {
-  randomize_color(geo);
-  drawer(geo);
+rand_bang = new TriggerController();
+rand_bang.frame = function() {
+  randomize_color(rand_geo);
+  drawer(rand_geo);
 }
-register_controller(bang);
+register_controller(rand_bang);
 
 
 
diff --git a/scripts/javascript/lib/json2.js b/scripts/javascript/lib/json2.js
new file mode 100644
index 00000000..7e27df51
--- /dev/null
+++ b/scripts/javascript/lib/json2.js
@@ -0,0 +1,478 @@
+/*
+    http://www.JSON.org/json2.js
+    2009-04-16
+
+    Public Domain.
+
+    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+    See http://www.JSON.org/js.html
+
+    This file creates a global JSON object containing two methods: stringify
+    and parse.
+
+        JSON.stringify(value, replacer, space)
+            value       any JavaScript value, usually an object or array.
+
+            replacer    an optional parameter that determines how object
+                        values are stringified for objects. It can be a
+                        function or an array of strings.
+
+            space       an optional parameter that specifies the indentation
+                        of nested structures. If it is omitted, the text will
+                        be packed without extra whitespace. If it is a number,
+                        it will specify the number of spaces to indent at each
+                        level. If it is a string (such as '\t' or '&nbsp;'),
+                        it contains the characters used to indent at each level.
+
+            This method produces a JSON text from a JavaScript value.
+
+            When an object value is found, if the object contains a toJSON
+            method, its toJSON method will be called and the result will be
+            stringified. A toJSON method does not serialize: it returns the
+            value represented by the name/value pair that should be serialized,
+            or undefined if nothing should be serialized. The toJSON method
+            will be passed the key associated with the value, and this will be
+            bound to the object holding the key.
+
+            For example, this would serialize Dates as ISO strings.
+
+                Date.prototype.toJSON = function (key) {
+                    function f(n) {
+                        // Format integers to have at least two digits.
+                        return n < 10 ? '0' + n : n;
+                    }
+
+                    return this.getUTCFullYear()   + '-' +
+                         f(this.getUTCMonth() + 1) + '-' +
+                         f(this.getUTCDate())      + 'T' +
+                         f(this.getUTCHours())     + ':' +
+                         f(this.getUTCMinutes())   + ':' +
+                         f(this.getUTCSeconds())   + 'Z';
+                };
+
+            You can provide an optional replacer method. It will be passed the
+            key and value of each member, with this bound to the containing
+            object. The value that is returned from your method will be
+            serialized. If your method returns undefined, then the member will
+            be excluded from the serialization.
+
+            If the replacer parameter is an array of strings, then it will be
+            used to select the members to be serialized. It filters the results
+            such that only members with keys listed in the replacer array are
+            stringified.
+
+            Values that do not have JSON representations, such as undefined or
+            functions, will not be serialized. Such values in objects will be
+            dropped; in arrays they will be replaced with null. You can use
+            a replacer function to replace those with JSON values.
+            JSON.stringify(undefined) returns undefined.
+
+            The optional space parameter produces a stringification of the
+            value that is filled with line breaks and indentation to make it
+            easier to read.
+
+            If the space parameter is a non-empty string, then that string will
+            be used for indentation. If the space parameter is a number, then
+            the indentation will be that many spaces.
+
+            Example:
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}]);
+            // text is '["e",{"pluribus":"unum"}]'
+
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+            text = JSON.stringify([new Date()], function (key, value) {
+                return this[key] instanceof Date ?
+                    'Date(' + this[key] + ')' : value;
+            });
+            // text is '["Date(---current time---)"]'
+
+
+        JSON.parse(text, reviver)
+            This method parses a JSON text to produce an object or array.
+            It can throw a SyntaxError exception.
+
+            The optional reviver parameter is a function that can filter and
+            transform the results. It receives each of the keys and values,
+            and its return value is used instead of the original value.
+            If it returns what it received, then the structure is not modified.
+            If it returns undefined then the member is deleted.
+
+            Example:
+
+            // Parse the text. Values that look like ISO date strings will
+            // be converted to Date objects.
+
+            myData = JSON.parse(text, function (key, value) {
+                var a;
+                if (typeof value === 'string') {
+                    a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+                    if (a) {
+                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+                            +a[5], +a[6]));
+                    }
+                }
+                return value;
+            });
+
+            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+                var d;
+                if (typeof value === 'string' &&
+                        value.slice(0, 5) === 'Date(' &&
+                        value.slice(-1) === ')') {
+                    d = new Date(value.slice(5, -1));
+                    if (d) {
+                        return d;
+                    }
+                }
+                return value;
+            });
+
+
+    This is a reference implementation. You are free to copy, modify, or
+    redistribute.
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.
+*/
+
+/*jslint evil: true */
+
+/*global JSON */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+    lastIndex, length, parse, prototype, push, replace, slice, stringify,
+    test, toJSON, toString, valueOf
+*/
+
+// Create a JSON object only if one does not already exist. We create the
+// methods in a closure to avoid creating global variables.
+
+if (!this.JSON) {
+    JSON = {};
+}
+(function () {
+
+    function f(n) {
+        // Format integers to have at least two digits.
+        return n < 10 ? '0' + n : n;
+    }
+
+    if (typeof Date.prototype.toJSON !== 'function') {
+
+        Date.prototype.toJSON = function (key) {
+
+            return this.getUTCFullYear()   + '-' +
+                 f(this.getUTCMonth() + 1) + '-' +
+                 f(this.getUTCDate())      + 'T' +
+                 f(this.getUTCHours())     + ':' +
+                 f(this.getUTCMinutes())   + ':' +
+                 f(this.getUTCSeconds())   + 'Z';
+        };
+
+        String.prototype.toJSON =
+        Number.prototype.toJSON =
+        Boolean.prototype.toJSON = function (key) {
+            return this.valueOf();
+        };
+    }
+
+    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        gap,
+        indent,
+        meta = {    // table of character substitutions
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        },
+        rep;
+
+
+    function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+        escapable.lastIndex = 0;
+        return escapable.test(string) ?
+            '"' + string.replace(escapable, function (a) {
+                var c = meta[a];
+                return typeof c === 'string' ? c :
+                    '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+            }) + '"' :
+            '"' + string + '"';
+    }
+
+
+    function str(key, holder) {
+
+// Produce a string from holder[key].
+
+        var i,          // The loop counter.
+            k,          // The member key.
+            v,          // The member value.
+            length,
+            mind = gap,
+            partial,
+            value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+        if (value && typeof value === 'object' &&
+                typeof value.toJSON === 'function') {
+            value = value.toJSON(key);
+        }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+        if (typeof rep === 'function') {
+            value = rep.call(holder, key, value);
+        }
+
+// What happens next depends on the value's type.
+
+        switch (typeof value) {
+        case 'string':
+            return quote(value);
+
+        case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+            return isFinite(value) ? String(value) : 'null';
+
+        case 'boolean':
+        case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+            return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+        case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+            if (!value) {
+                return 'null';
+            }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+            gap += indent;
+            partial = [];
+
+// Is the value an array?
+
+            if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+                length = value.length;
+                for (i = 0; i < length; i += 1) {
+                    partial[i] = str(i, value) || 'null';
+                }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+                v = partial.length === 0 ? '[]' :
+                    gap ? '[\n' + gap +
+                            partial.join(',\n' + gap) + '\n' +
+                                mind + ']' :
+                          '[' + partial.join(',') + ']';
+                gap = mind;
+                return v;
+            }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+            if (rep && typeof rep === 'object') {
+                length = rep.length;
+                for (i = 0; i < length; i += 1) {
+                    k = rep[i];
+                    if (typeof k === 'string') {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+                for (k in value) {
+                    if (Object.hasOwnProperty.call(value, k)) {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+            v = partial.length === 0 ? '{}' :
+                gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
+                        mind + '}' : '{' + partial.join(',') + '}';
+            gap = mind;
+            return v;
+        }
+    }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+    if (typeof JSON.stringify !== 'function') {
+        JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+            var i;
+            gap = '';
+            indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' &&
+                    (typeof replacer !== 'object' ||
+                     typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+            return str('', {'': value});
+        };
+    }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+    if (typeof JSON.parse !== 'function') {
+        JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+            var j;
+
+            function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return '\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+            if (/^[\],:{}\s]*$/.
+test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                return typeof reviver === 'function' ?
+                    walk({'': j}, '') : j;
+            }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+            throw new SyntaxError('JSON.parse');
+        };
+    }
+}());
diff --git a/src/controller.cpp b/src/controller.cpp
index fa4ccd8b..8ab2f9a7 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -106,22 +106,25 @@ void Controller::poll_sdlevents(Uint32 eventmask) {
 void js_ctrl_gc (JSContext *cx, JSObject *obj) {
 	func("%s",__PRETTY_FUNCTION__);
 	Controller* ctrl;
+	JSClass *jc;
 	if (!obj) {
 		error("%n called with NULL object", __PRETTY_FUNCTION__);
 		return;
 	}
+	warning("controller garbage collector called (TODO)");
 	// This callback is declared a Controller Class only,
 	// we can skip the typecheck of obj, can't we?
-	ctrl = (Controller *) JS_GetPrivate(cx, obj);
-	JSClass *jc = JS_GET_CLASS(cx,obj);
+// 	ctrl = (Controller *) JS_GetPrivate(cx, obj);
 
-	if (ctrl) {
-		func("JSvalcmp(%s): %p / %p ctrl: %p", jc->name, OBJECT_TO_JSVAL(obj), ctrl->jsobj, ctrl);
-		notice("JSgc: deleting %s Controller %s", jc->name, ctrl->name);
-		delete ctrl;
-	} else {
-		func("Mh, object(%s) has no private data", jc->name);
-	}
+// 	if (ctrl) {
+// 	  //	  jc = JS_GET_CLASS(cx,obj);
+// 	  func("JSvalcmp(%s): %p / %p ctrl: %p", jc->name, OBJECT_TO_JSVAL(obj), ctrl->jsobj, ctrl);
+// 	  notice("JSgc: deleting %s Controller %s", jc->name, ctrl->name);
+// 	  delete ctrl;
+// 	} else {
+// 	  func("Mh, object(%s) has no private data", jc->name);
+// 	}
+	
 }
 
 /* JSCall function by name, cvalues will be converted
diff --git a/src/jsparser.cpp b/src/jsparser.cpp
index f01b24e0..91c4f946 100644
--- a/src/jsparser.cpp
+++ b/src/jsparser.cpp
@@ -371,7 +371,7 @@ int JsParser::open(JSContext *cx, JSObject *obj, const char* script_file) {
 	// if anything more was wrong, our ErrorReporter was called!
 	free(buf);
 	func("%s evalres: %i", __func__, eval_res);
-	gc();
+	//	gc();
 	return eval_res;
 }