repos/tabletprog: interp.js comparison

comparison interp.js @ 312:8511aac1ce82

Fix module references in macros

author	Michael Pavone <pavone@retrodev.com>
date	Fri, 05 Sep 2014 09:56:22 -0700
parents	f6dfb85e80e5
children	d4df33596e7d

comparison

equal deleted inserted replaced

-:dfd204c82849
+:8511aac1ce82
 			var parsed = parseFile(this.names[name]);
 			var ret = parsed.macroexpand(this).eval(this);
 			if (typeof ret == 'function') {
 				ret = ret();
 			}
+			ret.ismodule = true;
 			this.modules[name] = ret;
 			return ret;
 		}
 		return null;
 	},
 symbol.prototype.quote = function(env) {
 	if (this.cleanName() != 'self') {
 		var val = env.find(this.name);
 		if (val !== null) {
-			var newnode = makeASTNode(val);
+			if (val.ismodule) {
-			if (!newnode) {
+				return this;
-				throw new Error(this.name + ' contains a value ' + val + ' that could not be converted to an AST node');
+				} else {
-			}
+				var newnode = makeASTNode(val);
-			return newnode;
+				if (!newnode) {
+					throw new Error(this.name + ' contains a value ' + val + ' that could not be converted to an AST node');
+				}
+				return newnode;
+			}
 		} else {
 			this.dirty = true;
 			return this;
 		}
 	} else {