aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/stepA_interop.js8
-rw-r--r--js/types.js4
2 files changed, 10 insertions, 2 deletions
diff --git a/js/stepA_interop.js b/js/stepA_interop.js
index 456c006..d879cd3 100644
--- a/js/stepA_interop.js
+++ b/js/stepA_interop.js
@@ -5,6 +5,7 @@ if (typeof module !== 'undefined') {
var printer = require('./printer');
var Env = require('./env').Env;
var core = require('./core');
+ var interop = require('./interop');
}
// read
@@ -108,8 +109,11 @@ function _EVAL(ast, env) {
return eval(a1.toString());
case ".":
var el = eval_ast(ast.slice(2), env),
- f = eval(a1.toString());
- return f.apply(f, el);
+ r = interop.resolve_js(a1.toString()),
+ obj = r[0], f = r[1];
+ var res = f.apply(obj, el);
+ console.log("DEBUG3:", res);
+ return interop.js_to_mal(res);
case "try*":
try {
return EVAL(a1, env);
diff --git a/js/types.js b/js/types.js
index 848a484..e3901b7 100644
--- a/js/types.js
+++ b/js/types.js
@@ -79,6 +79,10 @@ function _clone (obj) {
default:
throw new Error("clone of non-collection: " + _obj_type(obj));
}
+ Object.defineProperty(new_obj, "__meta__", {
+ enumerable: false,
+ writable: true
+ });
return new_obj;
}