Changeset 39389 in project

Timestamp:

11/25/20 20:54:08 (7 weeks ago)

Author:

Kon Lovett

Message:

type is interface

Location:

release/5/fx-utils/trunk

Files:

• fx-inlines.scm (modified) (2 diffs)
• fx-utils.scm (modified) (5 diffs)

release/5/fx-utils/trunk/fx-inlines.scm

@@ -26 +26 @@
 
 (: fxzero? (fixnum --> boolean))
-;
+(: fxpositive? (fixnum --> boolean))
+(: fxnatural? (fixnum --> boolean))
+(: fxnegative? (fixnum --> boolean))
+(: fxnon-positive? (fixnum --> boolean))
+(: fxclosed-right? (fixnum fixnum fixnum --> boolean))
+(: fxclosed? (fixnum fixnum fixnum --> boolean))
+(: fxclosed-left? (fixnum fixnum fixnum --> boolean))
+(: fxabs (fixnum --> fixnum))
+(: fxadd1 (fixnum --> fixnum))
+(: fxsub1 (fixnum --> fixnum))
+(: fxsqr (fixnum --> fixnum))
+(: fxcub (fixnum --> fixnum))
+
+;;
+
 (define (fxzero? n) (fx= 0 n))
 
-(: fxpositive? (fixnum --> boolean))
-;
 (define (fxpositive? n) (fx< 0 n))
 
-(: fxnatural? (fixnum --> boolean))
-;
 (define (fxnatural? n) (fx<= 0 n))
 
-(: fxnegative? (fixnum --> boolean))
-;
 (define (fxnegative? n) (fx> 0 n))
 
-(: fxnon-positive? (fixnum --> boolean))
-;
 (define (fxnon-positive? n) (fx>= 0 n))
 
 ;;
 
-(: fxclosed-right? (fixnum fixnum fixnum --> boolean))
-;
 (define (fxclosed-right? l x h) (and (fx< l x) (fx<= x h)))
 
-(: fxclosed? (fixnum fixnum fixnum --> boolean))
-;
 (define (fxclosed? l x h) (and (fx<= l x) (fx<= x h)))
 
-(: fxclosed-left? (fixnum fixnum fixnum --> boolean))
-;
 (define (fxclosed-left? l x h) (and (fx<= l x) (fx< x h)))
 
@@ -65 +65 @@
 ;;
 
-(: fxabs (fixnum --> fixnum))
-;
 (define (fxabs n) (if (fxnegative? n) (fxneg n) n))
 
 ;;
 
-(: fxadd1 (fixnum --> fixnum))
-;
 (define (fxadd1 n) (fx+ n 1))
 
-(: fxsub1 (fixnum --> fixnum))
-;
 (define (fxsub1 n) (fx- n 1))
 
-(: fxsqr (fixnum --> fixnum))
-;
 (define (fxsqr n) (fx* n n))
 
-(: fxcub (fixnum --> fixnum))
-;
 (define (fxcub n) (fx* n (fx* n n)))
 

release/5/fx-utils/trunk/fx-utils.scm

@@ -71 +71 @@
 
 (: C_uword_log2 (number --> number))
-;
+(: *fxrandom (fixnum -> fixnum))
+#;(: C_pow2log2 (number --> number))
+(: fxrandom (#!optional fixnum fixnum -> fixnum))
+(: fxlog2 (fixnum --> fixnum))
+(: fxpow2log2 (fixnum --> fixnum))
+(: fxdistance* (fixnum fixnum fixnum fixnum --> fixnum))
+(: fxdistance (fixnum fixnum fixnum fixnum --> fixnum))
+(: fxquo-and-mod (fixnum fixnum --> fixnum fixnum))
+(: fxmax-and-min (fixnum #!rest fixnum --> fixnum fixnum))
+(: fx% (fixnum fixnum --> fixnum))
+
+;;
+
 (define C_uword_log2 (foreign-lambda long C_uword_log2 unsigned-long))
 
 ;;
 
-(: *fxrandom (fixnum -> fixnum))
-;
 (define-inline (*fxrandom x) (##core#inline "C_random_fixnum" x))
 
 #|
-(: C_pow2log2 (number --> number))
-;
 (define C_pow2log2
   (foreign-lambda* unsigned-long ((long n))
@@ -92 +100 @@
 ;;
 
-(: fxrandom (#!optional fixnum fixnum -> fixnum))
-;
 (define (fxrandom #!optional (lim most-positive-fixnum) (low 0))
   (fx+ low (*fxrandom (fx- lim low))) )
@@ -99 +105 @@
 ;;
 
-(: fxlog2 (fixnum --> fixnum))
-;
 (define (fxlog2 n) (C_uword_log2 n))
 
-(: fxpow2log2 (fixnum --> fixnum))
-;
 (define (fxpow2log2 n)
   (cond
@@ -113 +115 @@
 ;;
 
-(: fxdistance* (fixnum fixnum fixnum fixnum --> fixnum))
-;
 (define (fxdistance* x1 y1 x2 y2) (fx+ (fxsqr (fx- x1 x2)) (fxsqr (fx- y1 y2))))
 
-(: fxdistance (fixnum fixnum fixnum fixnum --> fixnum))
-;
 (define (fxdistance x1 y1 x2 y2) (fx/ (fxdistance* x1 y1 x2 y2) 2))
 
 ;;
 
-(: fxquo-and-mod (fixnum fixnum --> fixnum fixnum))
-;
 (define (fxquo-and-mod fxn fxd) (values (fx/ fxn fxd) (fxmod fxn fxd)))
 
 ;;
 
-(: fxmax-and-min (fixnum #!rest fixnum --> fixnum fixnum))
-;
 (define (fxmax-and-min fx . fxs)
   (let loop ((fxs fxs) (mx fx) (mn fx))
@@ -137 +131 @@
       (let ((cur (car fxs)))
         (loop (cdr fxs) (fxmax mx cur) (fxmin mn cur)) ) ) ) )
+;;
+
+(define (fx% n p) (fx/ (fx* p n) 100))
 
 #|
-;;
-
-(: fx% (fixnum fixnum --> fixnum))
-;
-(define (fx% n p) (fx/ (fx* p n) 100))
-
 ;;