Changeset 35340 in project

Timestamp:

03/25/18 08:12:25 (11 months ago)

Author:

kon

Message:

add types

Location:

release/4/message-digest/trunk

Files:

• message-digest-bv.scm (modified) (2 diffs)
• message-digest-port.scm (modified) (1 diff)

release/4/message-digest/trunk/message-digest-bv.scm

@@ -36 +36 @@
 (include "message-digest-types")
 
-;;; Message Digest API
-
-;; Update
-
 ;;
-
-(define (message-digest-update-blob md blb #!optional (start 0) (end (blob-size blb)))
-  (*message-digest-update-blob
-    (check-message-digest 'message-digest-update-blob md)
-    (check-blob/slice 'message-digest-update-blob blb start end)) )
-
-;;
-
-(define (message-digest-update-string md str #!optional (start 0) (end (string-length str)))
-  (*message-digest-update-string
-    (check-message-digest 'message-digest-update-string md)
-    (check-string/slice 'message-digest-update-string str start end)) )
-
-;;
-
-;DEPRECATED
-(define (message-digest-update-substring md str start end)
-  (*message-digest-update-string
-    (check-message-digest 'message-digest-update-substring md)
-    (substring/shared (check-string 'message-digest-update-substring str) start end)) )
-
-;; Single Source API
-
-(define (message-digest-blob mdp blb
-            #!optional
-            (result-type (message-digest-result-form))
-            (start 0) (end (blob-size blb)))
-  (let (
-    (md (initialize-message-digest mdp)) )
-    (message-digest-update-blob md blb start end)
-    (finalize-message-digest md result-type) ) )
-
-(define (message-digest-string mdp str
-            #!optional
-            (result-type (message-digest-result-form))
-            (start 0) (end (string-length str)))
-  (let (
-    (md (initialize-message-digest mdp)) )
-    (message-digest-update-string md str start end)
-    (finalize-message-digest md result-type) ) )
-
-(define (message-digest-blob! mdp blb result-buffer
-            #!optional
-            (start 0) (end (blob-size blb)))
-  (let (
-    (md (initialize-message-digest mdp)) )
-    (message-digest-update-blob md blb start end)
-    (finalize-message-digest! md result-buffer) ) )
-
-(define (message-digest-string! mdp str result-buffer
-            #!optional
-            (start 0) (end (string-length str)))
-  (let (
-    (md (initialize-message-digest mdp)) )
-    (message-digest-update-string md str start end)
-    (finalize-message-digest! md result-buffer) ) )
-
-;;;
 
 (define (check-blob/slice loc blb start end)
@@ -114 +52 @@
     "end < start") )
 
+;;; Message Digest API
+
+;; Update
+
+;;
+
+;FIXME using & then checking !
+
+(define: (message-digest-update-blob (md message-digest) (blb blob) . (opts list)) -> void
+  (let-optionals* opts (
+    (start 0)
+    (end (blob-size blb)) )
+    (*message-digest-update-blob
+      (check-message-digest 'message-digest-update-blob md)
+      (check-blob/slice 'message-digest-update-blob blb start end)) ) )
+
+;;
+
+(define: (message-digest-update-string (md message-digest) (str string) . (opts list)) -> void
+  (let-optionals* opts (
+    (start 0)
+    (end (string-length str)) )
+    (*message-digest-update-string
+      (check-message-digest 'message-digest-update-string md)
+      (check-string/slice 'message-digest-update-string str start end)) ) )
+
+;;
+
+;; Single Source API
+
+(define: (message-digest-blob (mdp message-digest-primitive) (blb blob) . (opts list)) -> message-digest-result-form
+  (let-optionals* opts (
+    (result-type (message-digest-result-form))
+    (start 0)
+    (end (blob-size blb)) )
+    (let (
+      (md (initialize-message-digest mdp)) )
+      (message-digest-update-blob md blb start end)
+      (finalize-message-digest md result-type) ) ) )
+
+(define: (message-digest-string (mdp message-digest-primitive) (str string) . (opts list)) -> message-digest-result-form
+  (let-optionals* opts (
+    (result-type (message-digest-result-form))
+    (start 0)
+    (end (string-length str)) )
+    (let (
+      (md (initialize-message-digest mdp)) )
+      (message-digest-update-string md str start end)
+      (finalize-message-digest md result-type) ) ) )
+
+(define: (message-digest-blob! (mdp message-digest-primitive) (blb blob) (buf message-digest-buffer) . (opts list)) -> message-digest-result-form
+  (let-optionals* opts (
+    (start 0)
+    (end (blob-size blb)) )
+    (let (
+      (md (initialize-message-digest mdp)) )
+      (message-digest-update-blob md blb start end)
+      (finalize-message-digest! md buf) ) ) )
+
+(define: (message-digest-string! (mdp message-digest-primitive) (str string) (buf message-digest-buffer) . (opts list)) -> message-digest-result-form
+  (let-optionals* opts (
+    (start 0)
+    (end (string-length str)) )
+    (let (
+      (md (initialize-message-digest mdp)) )
+      (message-digest-update-string md str start end)
+      (finalize-message-digest! md buf) ) ) )
+
+;;DEPRECATED
+
+(: message-digest-update-substring deprecated)
+(define (message-digest-update-substring md str start end)
+  (*message-digest-update-string
+    (check-message-digest 'message-digest-update-substring md)
+    (substring/shared (check-string 'message-digest-update-substring str) start end)) )
+
 ) ;module message-digest-bv

release/4/message-digest/trunk/message-digest-port.scm

@@ -65 +65 @@
   obj )
 
-; Synthesize a port-name from a primitive-name
+;Synthesize a port-name from a primitive-name
 (define (make-digest-port-name mdp)
   (let* (