From 190b805b6c4f29b257d7dca7239a87acab3400af Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@cs.wpi.edu>
Date: Mon, 4 Jul 2011 18:53:11 -0400
Subject: [PATCH] moving isString into plt.baselib.strings

---
 js-assembler/runtime-src/baselib_equality.js |  4 ++--
 js-assembler/runtime-src/baselib_strings.js  | 12 ++++++++++++
 js-assembler/runtime-src/types.js            |  5 ++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/js-assembler/runtime-src/baselib_equality.js b/js-assembler/runtime-src/baselib_equality.js
index 0713a52..d4f9bf7 100644
--- a/js-assembler/runtime-src/baselib_equality.js
+++ b/js-assembler/runtime-src/baselib_equality.js
@@ -9,11 +9,11 @@
     var equals = function(x, y, aUnionFind) {
         if (x === y) { return true; }
 
-        if (isNumber(x) && isNumber(y)) {
+        if (jsnums.isSchemeNumber(x) && jsnums.isSchemeNumber(y)) {
 	    return jsnums.eqv(x, y);
         }
 
-        if (isString(x) && isString(y)) {
+        if (baselib.strings.isString(x) && baselib.strings.isString(y)) {
 	    return x.toString() === y.toString();
         }
 
diff --git a/js-assembler/runtime-src/baselib_strings.js b/js-assembler/runtime-src/baselib_strings.js
index faa3053..a63216a 100644
--- a/js-assembler/runtime-src/baselib_strings.js
+++ b/js-assembler/runtime-src/baselib_strings.js
@@ -10,6 +10,16 @@
     baselib.strings = exports;
 
 
+
+    var isString = function(s) {
+	return (typeof s === 'string' || 
+                s instanceof Str);
+    };
+
+
+
+
+
     // Now using mutable strings
     var Str = function(chars) {
 	this.chars = chars;
@@ -156,5 +166,7 @@ String.prototype.toDisplayedString = function(cache) {
 
     exports.Str = Str;
     exports.escapeString = escapeString;
+    exports.isString = isString;
+
 
 })(this['plt'].baselib);
\ No newline at end of file
diff --git a/js-assembler/runtime-src/types.js b/js-assembler/runtime-src/types.js
index 607a183..8018e44 100644
--- a/js-assembler/runtime-src/types.js
+++ b/js-assembler/runtime-src/types.js
@@ -664,9 +664,8 @@ if (! this['plt']) { this['plt'] = {}; }
 
 
 
-    var isString = function(s) {
-	return (typeof s === 'string' || s instanceof plt.baselib.strings.Str);
-    }
+    var isString = plt.baselib.strings.isString;
+