Changeset 13550 in project

Timestamp:

03/07/09 06:39:03 (11 years ago)

Author:

Kon Lovett

Message:

'extension-name-and-version' has validation. 'extension-version' ensures default version result is a string.

File:

• chicken/trunk/setup-api.scm (modified) (2 diffs)

chicken/trunk/setup-api.scm

@@ -684 +684 @@
           (else #f))))
 
-(define extension-name-and-version (make-parameter '("" "")))
+(define extension-name-and-version
+  (make-parameter '("" "")
+    (lambda (x)
+      (cond [(or (not x) (null? x))
+             '("" "") ]
+            [(and (list? x) (= 2 (length x)))
+             (let ([dir (car x)]
+                   [ver (cadr x)]
+                   [ensure-string (lambda (x) (if (or (not x) (null? x)) "" (->string x)))])
+               (list (ensure-string dir) (ensure-string ver)) ) ]
+            [else
+             (warning "invalid extension-name-and-version" x)
+             (extension-name-and-version) ] ) ) ) )
 
 (define (extension-name)
@@ -692 +704 @@
   (let ([ver (cadr (extension-name-and-version))])
     (if (string-null? ver)
-        defver
+        (and defver (->string defver))
         ver ) ) )