X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fstring.lisp;h=1bb322b84f6f6e4847d566a386fb2d1e5e57e467;hb=928c6f695253c9f03ff440d18338efb8eea9b2f0;hp=756bf96ec82f85340e7eef8642bc24a3b0284cd4;hpb=fde8e7678f3a194026bf14d630d3b7e979e3ce6e;p=jscl.git

diff --git a/src/string.lisp b/src/string.lisp
index 756bf96..1bb322b 100644
--- a/src/string.lisp
+++ b/src/string.lisp
@@ -13,19 +13,29 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with JSCL.  If not, see <http://www.gnu.org/licenses/>.
 
+(defun stringp (s)
+  (stringp s))
+
+(defun string-length (string)
+  (storage-vector-size string))
+
+(defun make-string (n &key initial-element)
+  (make-array n :element-type 'character :initial-element initial-element))
+
 (defun string (x)
   (cond ((stringp x) x)
         ((symbolp x) (symbol-name x))
-        (t (char-to-string x))))
+        (t (make-string 1 :initial-element x))))
 
 (defun string= (s1 s2)
-  (let ((n (length s1)))
+  (let* ((s1 (string s1))
+         (s2 (string s2))
+         (n (length s1)))
     (when (= (length s2) n)
       (dotimes (i n t)
         (unless (char= (char s1 i) (char s2 i))
           (return-from string= nil))))))
 
-<<<<<<< HEAD
 (defun string< (s1 s2)
   (let ((len-1 (length s1))
         (len-2 (length s2)))
@@ -36,10 +46,6 @@
                  (return-from string< i))
                (when (and (= i (1- len-1)) (> len-2 len-1))
                  (return-from string< (1+ i))))))))
-=======
-(defun stringp (s)
-  (stringp s))
->>>>>>> ee0ae303e9d3f7f99eeb3af1824b61f2616f5925
 
 (define-setf-expander char (string index)
   (let ((g!string (gensym))
@@ -50,3 +56,16 @@
             (list g!value)
             `(aset ,g!string ,g!index ,g!value)
             `(char ,g!string ,g!index))))
+
+(defun concatenate-two (string1 string2)
+  (let* ((len1 (length string1))
+         (len2 (length string2))
+         (string (make-array (+ len1 len2) :element-type 'character))
+         (i 0))
+    (dotimes (j len1)
+      (aset string i (char string1 j))
+      (incf i))
+    (dotimes (j len2)
+      (aset string i (char string2 j))
+      (incf i))
+    string))