X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Futils.lisp;h=0196d04a95db8b39867aa1d4906d76b4b0859a6a;hp=dff2ab02ac52a9f0a35c73bdddd2eb951b67af7d;hb=HEAD;hpb=b50166ae0ba2bc09a9094c0e675ec92010b7293e

diff --git a/sql/utils.lisp b/sql/utils.lisp
index dff2ab0..0196d04 100644
--- a/sql/utils.lisp
+++ b/sql/utils.lisp
@@ -17,10 +17,21 @@
 (in-package #:clsql-sys)
 
 (defmacro defaulting (&rest place-value-plist)
+  "for places and values (as an &rest plist)
+   if place-n is null set it to value-n"
   `(progn
     ,@(loop for (place value . rest) on place-value-plist by #'cddr
             collect `(unless ,place (setf ,place ,value)))))
 
+(defmacro pop-n (place &optional (n 1))
+  "pops n items off of a list in place and returns their values in a new list
+
+   if n > the length of the list in place, then we return the full list,
+     setting the place to nil"
+  `(loop repeat ,n
+    while ,place
+    collect (pop ,place)))
+
 (defun %get-int (v)
   (etypecase v
     (string (parse-integer v :junk-allowed t))
@@ -89,8 +100,8 @@
 
 #+lispworks
 (defvar +lw-has-without-preemption+
-  #+lispworks6 nil
-  #-lispworks6 t)
+  #-(or lispworks5 lispworks4) nil
+  #+(or lispworks5 lispworks4) t)
 #+lispworks
 (defvar +lw-global-lock+
   (unless +lw-has-without-preemption+
@@ -364,7 +375,7 @@ list of characters and replacement strings."
   (cdr (assoc (string var) ext:*environment-list* :test #'equalp
               :key #'string))
   #+lispworks (lw:environment-variable (string var))
-  #+mcl (ccl::getenv var)
+  #+ccl (ccl::getenv var)
   #+sbcl (sb-ext:posix-getenv var))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -397,7 +408,7 @@ list of characters and replacement strings."
   (setq cl:*features* (delete :clsql-lowercase-reader cl:*features*)))
 
 (defun replace-all (string part replacement &key (test #'char=) stream)
-  "Returns a new string in which all the occurences of the part 
+  "Returns a new string in which all the occurences of the part
 is replaced with replacement. [FROM http://cl-cookbook.sourceforge.net/strings.html#manip]"
   (let ((out (or stream (make-string-output-stream))))
     (loop with part-length = (length part)
@@ -413,6 +424,26 @@ is replaced with replacement. [FROM http://cl-cookbook.sourceforge.net/strings.h
     (unless stream
       (get-output-stream-string out))))
 
+(defun read-decimal-value (string)
+  (let* ((comma 0)
+         (dot 0)
+         (last))
+    (loop for c across string
+          do (case c
+               (#\. (incf dot) (setf last 'dot))
+               (#\, (incf comma) (setf last 'comma))))
+    (let* ((bag (if (and (eql last 'dot) (eql dot 1))
+                    ".0123456789+-"
+                    ",0123456789+-"))
+           (clean (with-output-to-string (out)
+                    (loop for c across string
+                          do (when (find c bag :test #'char=)
+                               (write-char c out))))))
+      (if (and (eql last 'dot) (eql dot 1))
+          (decimals:parse-decimal-number clean)
+          (decimals:parse-decimal-number
+           clean :decimal-separator #\,)))))
+
 
 (defun filter-plist (plist &rest keys-to-remove)
   "Returns a copy of the given plist with indicated key-value pairs
@@ -432,7 +463,7 @@ removed. keys are searched with #'MEMBER"
     ;;clearing mechanism. If you are on an implementation that doesn't support
     ;;weak hash tables then you're memory may accumulate.
 
-    #-(or sbcl allegro clisp lispworks)
+    #-(or sbcl allegro clisp lispworks ccl)
     (warn "UNSAFE! use of weak hash on implementation without support. (see clsql/sql/utils.lisp to add)")
 
     (make-hash-table
@@ -440,6 +471,7 @@ removed. keys are searched with #'MEMBER"
       #+clisp     :weak      #+clisp :value
       #+lispworks :weak-kind #+lispworks :value
       #+sbcl :weakness #+sbcl :value
+      #+ccl :weak #+ccl :value
       ,@args)
     ))