6001: Disable usual-integrations.

Interferes with overriding / to compute only integer or
floating-point division, which apparently this code relies on.

(cherry picked from commit 689c0a207b162d076dd47a695cd0e9669ef16cf6)

diff --git a/src/6001/arith.scm b/src/6001/arith.scm
index 6945e4942fea6569a0db6547df7c4c5ead44f48c..81f4b18a480f316f5dad1b4d73e33231b1e4bf85 100644 (file)
--- a/src/6001/arith.scm
+++ b/src/6001/arith.scm
@@ -27,7 +27,7 @@ USA.
 ;;;; Scheme Arithmetic for 6.001
 ;;; package: (student number)
 
-(declare (usual-integrations))
+;(declare (usual-integrations))
 \f
 (define-integrable (int:->flonum n)
   ((ucode-primitive integer->flonum 2) n #b10))

diff --git a/src/6001/edextra.scm b/src/6001/edextra.scm
index 6d458929476b84355c3ad55044dd180fc3946736..fefd20b578c9d8c3cd71dc174fa932eeede54161 100644 (file)
--- a/src/6001/edextra.scm
+++ b/src/6001/edextra.scm
@@ -26,7 +26,7 @@ USA.
 
 ;;;; 6.001: Edwin Extensions
 
-(declare (usual-integrations))
+;(declare (usual-integrations))
 \f
 (define student-root-directory)
 (define student-work-directory)

diff --git a/src/6001/floppy.scm b/src/6001/floppy.scm
index a1de6c2ac94b0c9660212561eddbb429b80787b2..fe16a4df8244486300edba2cfae7685695bc8a35 100644 (file)
--- a/src/6001/floppy.scm
+++ b/src/6001/floppy.scm
@@ -26,7 +26,7 @@ USA.
 
 ;;;; 6.001: HP-UX Floppy Commands
 
-(declare (usual-integrations))
+;(declare (usual-integrations))
 \f
 (define (run-floppy-login-loop)
   (set! floppy-contents-loaded? false)

diff --git a/src/6001/make.scm b/src/6001/make.scm
index ee067aa9e37d4a890d5a57d8b3be32b67e13ef37..5efafcb6325ac3d7b2c5fcf9d3be97e633fd8e38 100644 (file)
--- a/src/6001/make.scm
+++ b/src/6001/make.scm
@@ -26,7 +26,7 @@ USA.
 
 ;;;; 6.001: System Construction
 
-(declare (usual-integrations))
+;(declare (usual-integrations))
 
 (with-loader-base-uri (system-library-uri "6001/")
   (lambda ()

diff --git a/src/6001/nodefs.scm b/src/6001/nodefs.scm
index 1351908549eff92625f7dc871643079db720e200..ed0a2bd6cdff88a8465f58d003c2d279df2467c6 100644 (file)
--- a/src/6001/nodefs.scm
+++ b/src/6001/nodefs.scm
@@ -27,7 +27,7 @@ USA.
 ;;;; SCode rewriting for 6.001
 ;;; package: (student scode-rewriting)
 
-(declare (usual-integrations))
+;(declare (usual-integrations))
 \f
 (define (initialize-package!)
   (set! hook/repl-eval student/repl-eval)

diff --git a/src/6001/pic-imag.scm b/src/6001/pic-imag.scm
index 075dfc53e36e30b9a56fb06fa7b91a26b5442575..25a57ccc69fcac8179a1256c219610ce16b430a1 100644 (file)
--- a/src/6001/pic-imag.scm
+++ b/src/6001/pic-imag.scm
@@ -26,7 +26,7 @@ USA.
 
 ;;;; 6.001 Images
 
-(declare (usual-integrations))
+;(declare (usual-integrations))
 \f
 ;;; Procedure to build an image given a picture and the magnification factors
 

diff --git a/src/6001/pic-ops.scm b/src/6001/pic-ops.scm
index 148ce276964951b77ef032ff6b8c6b199faa8ec1..57d50557c1588e7ba20b923d20fd8a7cd7926781 100644 (file)
--- a/src/6001/pic-ops.scm
+++ b/src/6001/pic-ops.scm
@@ -26,7 +26,7 @@ USA.
 
 ;;; Operations for manipulating pictures
 
-(declare (usual-integrations))
+;(declare (usual-integrations))
 \f
 (define-integrable (in-rect? x y width height)
   (and (fix:< -1 x) (fix:< x width) (fix:< -1 y) (fix:< y height)))

diff --git a/src/6001/pic-read.scm b/src/6001/pic-read.scm
index 4aacb5550bb4654df6586249a3b052e884ef41e8..913d3a742b7cdd9fa4dbcb3c5ccb4c01191ce9c0 100644 (file)
--- a/src/6001/pic-read.scm
+++ b/src/6001/pic-read.scm
@@ -26,7 +26,7 @@ USA.
 
 ;;;; Procedures to read a file in raw pgm format into a picture
 
-(declare (usual-integrations))
+;(declare (usual-integrations))
 \f
 (define (pgm-file->picture filename)
   (call-with-input-file (standard-pathname filename "pgm")

diff --git a/src/6001/pic-reco.scm b/src/6001/pic-reco.scm
index 8cb4d1df0222e2c16aea6479589890fd93808903..65adcf8c06c5752b40361f54e73d6ea96b0a6f71 100644 (file)
--- a/src/6001/pic-reco.scm
+++ b/src/6001/pic-reco.scm
@@ -26,7 +26,7 @@ USA.
 
 ;;; Representation of pictures using records
 
-(declare (usual-integrations))
+;(declare (usual-integrations))
 \f
 (define-record-type <picture>
     (%make-picture width height)

diff --git a/src/6001/picture.scm b/src/6001/picture.scm
index ec1a97114d0d837c9f5a1e5e89678e72922afa2e..77c013cdb19560296ee65cf050dd61d220ead6fd 100644 (file)
--- a/src/6001/picture.scm
+++ b/src/6001/picture.scm
@@ -26,7 +26,7 @@ USA.
 
 ;;;; 6.001 Images
 
-(declare (usual-integrations))
+;(declare (usual-integrations))
 \f
 ;;;; Miscellaneous Utilities