From: Samuel Chase <samebchase@gmail.com>
Date: Thu, 16 May 2013 16:33:42 +0000 (+0530)
Subject: Merge branch 'master' of https://github.com/davazp/jscl into experimental
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=fde8e7678f3a194026bf14d630d3b7e979e3ce6e;p=jscl.git

Merge branch 'master' of https://github.com/davazp/jscl into experimental

Conflicts:
	src/string.lisp
	src/toplevel.lisp
---

fde8e7678f3a194026bf14d630d3b7e979e3ce6e
diff --cc src/string.lisp
index 9c547ef,d48ff3e..756bf96
--- a/src/string.lisp
+++ b/src/string.lisp
@@@ -25,16 -25,8 +25,21 @@@
          (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)))
 +    (cond ((= len-2 0) nil)
 +          ((= len-1 0) 0)
 +          (t (dotimes (i len-1 nil)
 +               (when (char< (char s1 i) (char s2 i))
 +                 (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))
diff --cc src/toplevel.lisp
index 5ed0f88,ed0abfe..2ba05cf
--- a/src/toplevel.lisp
+++ b/src/toplevel.lisp
@@@ -73,10 -73,11 +73,15 @@@
            prog2 progn psetq push quote rassoc read-from-string remove remove-if
            remove-if-not return return-from revappend reverse rplaca rplacd
            second set setf setq seventh sixth some string string-upcase string=
++<<<<<<< HEAD
 +          string< stringp subseq subst symbol-function symbol-name symbol-package
++=======
+           stringp sublis subseq subst symbol-function symbol-name symbol-package
++>>>>>>> ee0ae303e9d3f7f99eeb3af1824b61f2616f5925
            symbol-plist symbol-value symbolp t tagbody tailp tenth third throw
-           tree-equal truncate unless unwind-protect values values-list variable
-           vector-push-extend warn when write-line write-string zerop))
+           time trace tree-equal truncate unless untrace unwind-protect values
+           values-list variable vector-push-extend warn when write-line write-string
+           zerop))
  
  (setq *package* *user-package*)