Changeset 15321 in project

Timestamp:

08/05/09 08:21:08 (10 years ago)

Author:

felix winkelmann

Message:

documentation fixes, read-symbolic-link enhancement by mario; rational? fixed (thanks to John Cowan)

Location:

chicken/trunk

Files:

• . (modified) (1 prop)
• c-platform.scm (modified) (1 diff)
• chicken.h (modified) (1 diff)
• library.scm (modified) (1 diff)
• manual (modified) (1 prop)
• manual/Deviations from the standard (modified) (1 diff)
• manual/Unit posix (modified) (1 diff)
• posixunix.scm (modified) (1 diff)
• runtime.c (modified) (1 diff)
• site/index.html (modified) (1 diff)

chicken/trunk/c-platform.scm

@@ -539 +539 @@
 (rewrite 'number? 2 1 "C_i_numberp" #t #f)
 (rewrite 'complex? 2 1 "C_i_numberp" #t #f)
-(rewrite 'rational? 2 1 "C_i_numberp" #t #f)
+(rewrite 'rational? 2 1 "C_i_rationalp" #t #f)
 (rewrite 'real? 2 1 "C_i_numberp" #t #f)
 (rewrite 'integer? 2 1 "C_i_integerp" #t #f)

chicken/trunk/chicken.h

@@ -1532 +1532 @@
 C_fctexport C_word C_fcall C_i_stringp(C_word x) C_regparm;
 C_fctexport C_word C_fcall C_i_numberp(C_word x) C_regparm;
+C_fctexport C_word C_fcall C_i_rationalp(C_word x) C_regparm;
 C_fctexport C_word C_fcall C_i_integerp(C_word x) C_regparm;
 C_fctexport C_word C_fcall C_i_flonump(C_word x) C_regparm;

chicken/trunk/library.scm

@@ -909 +909 @@
 (define complex? number?)
 (define real? number?)
-(define rational? number?)
+(define (rational? n) (##core#inline "C_i_rationalp" n))
 (define ##sys#flonum-fraction (##core#primitive "C_flonum_fraction"))
 (define (##sys#integer? x) (##core#inline "C_i_integerp" x))

chicken/trunk/manual/Deviations from the standard

@@ -41 +41 @@
 extended-precision integers (bignums). The routines {{complex?}},
 {{real?}} and {{rational?}} are identical to the standard procedure
-{{number?}}. The procedures {{numerator}}, {{denominator}},
-{{rationalize}}, {{make-rectangular}} and {{make-polar}} are not
-implemented. Fixnums are limited to ±2<nowiki><sup>30</sup></nowiki>
-(or ±2<nowiki><sup>62</sup></nowiki> on 64-bit hardware).  Support for
-extended numbers is available as a separate package, provided the GNU
-multiprecision library is installed.
+{{number?}}. The procedures {{rationalize}}, {{make-rectangular}} and
+{{make-polar}} are not implemented. Fixnums are limited to
+±2<nowiki><sup>30</sup></nowiki> (or ±2<nowiki><sup>62</sup></nowiki>
+on 64-bit hardware). Support for extended numbers is available as a
+separate package, provided the GNU multiprecision library is
+installed.
 
 [6.2.6] The procedure {{string->number}} does not obey read/write

chicken/trunk/manual/Unit posix

@@ -639 +639 @@
 ==== read-symbolic-link
 
-<procedure>(read-symbolic-link FILENAME)</procedure>
+<procedure>(read-symbolic-link FILENAME [CANONICALIZE])</procedure>
 
 Returns the filename to which the symbolic link {{FILENAME}} points.
+If {{CANONICALIZE}} is given and true, then symbolic links are
+resolved repeatedly until the result is not a link.
 
 ==== file-link

chicken/trunk/posixunix.scm

@@ -1534 +1534 @@
   (let ([substring substring]
         [buf (make-string (fx+ _filename_max 1))] )
-    (lambda (fname)
+    (lambda (fname #!optional canonicalize)
       (##sys#check-string fname 'read-symbolic-link)
       (let ([len (##core#inline "C_readlink" (##sys#make-c-string (##sys#expand-home-path fname)) buf)])
       (when (fx< len 0)
         (posix-error #:file-error 'read-symbolic-link "cannot read symbolic link" fname) )
-      (substring buf 0 len) ) ) ) )
+      (let ((pathname (substring buf 0 len)))
+        (if (and canonicalize (symbolic-link? pathname))
+            (read-symbolic-link pathname 'canonicalize)
+            pathname ) ) ) ) ) )
 
 (define file-link

chicken/trunk/runtime.c

@@ -4704 +4704 @@
 
 
+C_regparm C_word C_fcall C_i_rationalp(C_word x)
+{
+  if((x & C_FIXNUM_BIT) != 0) return C_SCHEME_TRUE;
+
+  if((!C_immediatep(x) && C_block_header(x) == C_FLONUM_TAG)) {
+    double n = C_flonum_magnitude(x);
+
+    if(C_isinf(n) || C_isnan(n)) return C_SCHEME_FALSE;
+  }
+
+  return C_SCHEME_TRUE;
+}
+
+
 C_regparm C_word C_fcall C_i_integerp(C_word x)
 {

chicken/trunk/site/index.html

@@ -157 +157 @@
 <h3>DOCUMENTATION</h3>
 <p>
-Browse the <a href="http://chicken.wiki.br/man/4/">User's manual</a> at the CHICKEN 
+Browse the <a href="http://chicken.wiki.br/man/4/The User's Manual">User's manual</a> at the CHICKEN 
 <a href="http://chicken.wiki.br/">wiki</a>
 </p>