X-Git-Url: http://git.kpe.io/?p=uffi.git;a=blobdiff_plain;f=tests%2Fstrtol.lisp;h=6a4240c1cfdb1f5543b27cd9fadf3dc9d23bda01;hp=c2956e37363f004e7170fb00a35a50c752e2e3f8;hb=b86fdf882156aa45dc6e8e93a158dedf506f4233;hpb=a95b9a217335917d96b8c0cced4f49c3e4846115

diff --git a/tests/strtol.lisp b/tests/strtol.lisp
index c2956e3..6a4240c 100644
--- a/tests/strtol.lisp
+++ b/tests/strtol.lisp
@@ -2,29 +2,24 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          strtol.cl
+;;;; Name:          strtol.lisp
 ;;;; Purpose:       UFFI Example file to strtol, uses pointer arithmetic
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strtol.lisp,v 1.1 2002/09/30 10:02:36 kevin Exp $
+;;;; This file, part of UFFI, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; UFFI users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package :cl-user)
+(in-package #:uffi-tests)
 
 (uffi:def-foreign-type char-ptr (* :unsigned-char))
-  
+
 ;; This example does not use :cstring to pass the input string since
 ;; the routine needs to do pointer arithmetic to see how many characters
 ;; were parsed
 
-(uffi:def-function ("strtol" c-strtol) 
+(uffi:def-function ("strtol" c-strtol)
     ((nptr char-ptr)
      (endptr (* char-ptr))
      (base :int))
@@ -36,48 +31,32 @@ Condition flag is T if all of string parses as a long, NIL if
 their was no string at all, or an integer indicating position in string
 of first non-valid character"
   (let* ((str-native (uffi:convert-to-foreign-string str))
-	 (endptr (uffi:allocate-foreign-object 'char-ptr))
-	 (value (c-strtol str-native endptr base))
-	 (endptr-value (uffi:deref-pointer endptr 'char-ptr)))
+         (endptr (uffi:allocate-foreign-object 'char-ptr))
+         (value (c-strtol str-native endptr base))
+         (endptr-value (uffi:deref-pointer endptr 'char-ptr)))
 
     (unwind-protect
-	 (if (uffi:null-pointer-p endptr-value)
-	     (values value t)
-	     (let ((next-char-value (uffi:deref-pointer endptr-value :unsigned-char))
-		   (chars-parsed (- (uffi:pointer-address endptr-value)
-				    (uffi:pointer-address str-native))))
-	       (cond
-		 ((zerop chars-parsed)
-		  (values nil nil))
-		 ((uffi:null-char-p next-char-value)
-		  (values value t))
-		 (t
-		  (values value chars-parsed)))))
+         (if (uffi:null-pointer-p endptr-value)
+             (values value t)
+             (let ((next-char-value (uffi:deref-pointer endptr-value :unsigned-char))
+                   (chars-parsed (- (uffi:pointer-address endptr-value)
+                                    (uffi:pointer-address str-native))))
+               (cond
+                 ((zerop chars-parsed)
+                  (values nil nil))
+                 ((uffi:null-char-p next-char-value)
+                  (values value t))
+                 (t
+                  (values value chars-parsed)))))
       (progn
-	(uffi:free-foreign-object str-native)
-	(uffi:free-foreign-object endptr)))))
+        (uffi:free-foreign-object str-native)
+        (uffi:free-foreign-object endptr)))))
+
+(deftest :strtol.1 (strtol "123") 123 t)
+(deftest :strtol.2 (strtol "0") 0 t)
+(deftest :strtol.3 (strtol "55a") 55 2)
+(deftest :strtol.4 (strtol "a") nil nil)
 
- 
-  
-#+examples-uffi
-(progn
-  (flet ((print-results (str)
-	   (multiple-value-bind (result flag) (strtol str)
-	     (format t "~&(strtol ~S) => ~S,~S" str result flag))))
-    (print-results "55")
-    (print-results "55.3")
-    (print-results "a")))
 
-#+test-uffi
-(progn
-  (flet ((test-strtol (str results)
-	   (util.test:test (multiple-value-list (strtol str)) results
-			   :test #'equal
-			   :fail-info "Error testing strtol")))
-    (test-strtol "123" '(123 t))
-    (test-strtol "0" '(0 t))
-    (test-strtol "55a" '(55 2))
-    (test-strtol "a" '(nil nil))))
 
-