Instance's toPointer() should return as CFTypeRef.

[cycript.git] / libcycript.cy

diff --git a/libcycript.cy b/libcycript.cy
index 57e8894a79ba7efaf966f597360dd424514a2e73..7690a299f7eadf6aa43074ecf5433c17c1dbf797 100644 (file)
--- a/libcycript.cy
+++ b/libcycript.cy
@@ -21,18 +21,26 @@
 
 (function() {
 
+Number.prototype.__defineGetter__('$cyt', function() {
+    if (this.$cyt_)
+        return this.$cyt_;
+    if ((this|0) == this)
+        return int;
+});
+
 this.typeid = function(object) {
     return object.$cyt;
 };
 
 let $cy_set = function(object, properties) {
     for (const name in properties)
+        if ("defineProperty" in Object)
         Object.defineProperty(object, name, {
             configurable: true,
             enumerable: false,
             writable: true,
             value: properties[name],
-        });
+        }); else object[name] = properties[name];
 };
 
 $cy_set(Boolean.prototype, {
@@ -72,7 +80,8 @@ $cy_set(Error.prototype, {
 $cy_set(Number.prototype, {
     toCYON: function() {
         if ("$cyt" in this)
-            return `${this.$cyt.toCYON()}(${this.toString()})`;
+            //return `${this.$cyt.toCYON()}(${this.toString()})`;
+            return this.toString();
         return `new Number(${this.toString()})`;
     },
 });
@@ -184,6 +193,26 @@ Java.on('setup', function() {
                 this.put(key, value);
         },
     });
+
+    $cy_set(java.lang.Throwable.prototype, {
+        toCYON: function() {
+            var message = this.getMessage();
+            if (message == null)
+                message = '';
+            else
+                message = message.toCYON();
+
+            let stack = this.getStackTrace();
+            if (stack.length == 0)
+                stack = '';
+            else {
+                stack = stack.join('\n    ');
+                stack = ` /*\n    ${stack} */`;
+            }
+
+            return `new ${this.constructor.class.getName()}(${message})${stack}`;
+        },
+    });
 });
 
 }
@@ -289,7 +318,7 @@ require.resolve = function(name) {
         if (path != null)
             return path;
     } else {
-        let cwd = new (typedef char[1024]);
+        let cwd = *new (typedef char[1024]);
         cwd = getcwd(cwd, cwd.length).toString();
         cwd = cwd.split('/');