[Guile-commits] 01/04: Remove special support for fluids in GDB interface

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 0dcca77754302e8bad4af82113d952ef243271bd
Author: Andy Wingo <address@hidden>
Date:   Sat Nov 26 15:17:07 2016 +0100

    Remove special support for fluids in GDB interface
    
    * module/system/base/types.scm (inferior-fluid?, inferior-fluid-number)
      (<inferior-fluid>): Remove.  Fluids won't have numbers in the future.
      (cell->object): Adapt.
    * test-suite/tests/types.test ("opaque objects"): Update.
---
 module/system/base/types.scm |   22 ++--------------------
 test-suite/tests/types.test  |    7 ++-----
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/module/system/base/types.scm b/module/system/base/types.scm
index cf3c7c9..652c922 100644
--- a/module/system/base/types.scm
+++ b/module/system/base/types.scm
@@ -42,9 +42,6 @@
             inferior-object-sub-kind
             inferior-object-address
 
-            inferior-fluid?
-            inferior-fluid-number
-
             inferior-struct?
             inferior-struct-name
             inferior-struct-fields
@@ -311,21 +308,6 @@ the matching bits, possibly with bitwise operations to 
extract it from BITS."
 
 (set-record-type-printer! <inferior-struct> print-inferior-struct)
 
-;; Fluids.
-(define-record-type <inferior-fluid>
-  (inferior-fluid number value)
-  inferior-fluid?
-  (number inferior-fluid-number)
-  (value  inferior-fluid-value))
-
-(set-record-type-printer! <inferior-fluid>
-                          (lambda (fluid port)
-                            (match fluid
-                              (($ <inferior-fluid> number)
-                               (format port "#<fluid ~a ~x>"
-                                       number
-                                       (object-address fluid))))))
-
 ;; Object type to represent complex objects from the inferior process that
 ;; cannot be really converted to usable Scheme objects in the current
 ;; process.
@@ -459,8 +441,8 @@ using BACKEND."
                vector)))
           (((_ & #x7f = %tc7-wvect))
            (inferior-object 'weak-vector address))   ; TODO: show elements
-          ((((n << 8) || %tc7-fluid) init-value)
-           (inferior-fluid n #f))                    ; TODO: show current value
+          (((_ & #x7f = %tc7-fluid) init-value)
+           (inferior-object 'fluid address))
           (((_ & #x7f = %tc7-dynamic-state))
            (inferior-object 'dynamic-state address))
           ((((flags+type << 8) || %tc7-port))
diff --git a/test-suite/tests/types.test b/test-suite/tests/types.test
index 15dc3f8..446aff5 100644
--- a/test-suite/tests/types.test
+++ b/test-suite/tests/types.test
@@ -108,11 +108,8 @@
    ((make-doubly-weak-hash-table) weak-table _)
    (#2((1 2 3) (4 5 6)) array _)
    (#*00000110 bitvector _)
-   ((expt 2 70) bignum _))
-
-  (pass-if "fluid"
-    (let ((fluid (make-fluid)))
-      (inferior-fluid? (scm->object (object-address fluid))))))
+   ((expt 2 70) bignum _)
+   ((make-fluid) fluid _)))
 
 (define-record-type <some-struct>
   (some-struct x y z)