src/d2c/runtime/dylan bootstrap.dylan, 1.31.2.10, 1.31.2.11 condition.dylan, 1.14.2.3, 1.14.2.4 exports.dylan, 1.32.2.10, 1.32.2.11 deque.dylan, 1.7.10.1, 1.7.10.2 seals.dylan, 1.4.2.1, 1.4.2.2

Update of /var/lib/cvs/src/d2c/runtime/dylan
In directory cantor:/tmp/cvs-serv712

Modified Files:
      Tag: GD_2_5
        bootstrap.dylan condition.dylan exports.dylan deque.dylan 
        seals.dylan 
Log Message:
job: 7094
Merged trunk to GD_2_5 (in preparation of
cleanup of code in runtime/dylan
Mergepoint on trunk tagged with HEAD_20040824_merged
(to allow doing next merge with less conflicts)

Index: bootstrap.dylan
===================================================================
RCS file: /var/lib/cvs/src/d2c/runtime/dylan/bootstrap.dylan,v
retrieving revision 1.31.2.10
retrieving revision 1.31.2.11
diff -u -d -r1.31.2.10 -r1.31.2.11
--- bootstrap.dylan     22 Jul 2004 16:36:14 -0000      1.31.2.10
+++ bootstrap.dylan     25 Aug 2004 04:29:59 -0000      1.31.2.11
@@ -209,7 +209,7 @@
     limited-collection-definer, limited-vector-class, element-type, 
     %elem, %elem-setter, limited-sv-class, ssv-data, ssv-data-setter,
     lsv-data-type, lsv-fill, %main, main,
-    <stretchy-sequence>, <simple-object-deque>, <stretchy-object-vector>,
+    <stretchy-sequence>, <object-deque>, <stretchy-object-vector>,
     <simple-object-table>, element-error,
 
     // Cheap IO

Index: condition.dylan
===================================================================
RCS file: /var/lib/cvs/src/d2c/runtime/dylan/condition.dylan,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -d -r1.14.2.3 -r1.14.2.4
--- condition.dylan     22 Jul 2004 16:36:14 -0000      1.14.2.3
+++ condition.dylan     25 Aug 2004 04:30:00 -0000      1.14.2.4
@@ -669,10 +669,10 @@
   let instance = condition.uninitialized-slot-error-instance;
   let source-location = condition.uninitialized-slot-error-source-location;
   if (name)
-    condition-format(stream, "Accessing uninitialized slot %s in %=, at\n%=",
+    condition-format(stream, "Accessing uninitialized slot %s in %=, at\n%s",
                     name, instance, source-location);
   else
-    condition-format(stream, "Accessing uninitialized slot in %=, at\n%=", 
+    condition-format(stream, "Accessing uninitialized slot in %=, at\n%s", 
                      instance, source-location);
   end if;
 end method report-condition;

Index: exports.dylan
===================================================================
RCS file: /var/lib/cvs/src/d2c/runtime/dylan/exports.dylan,v
retrieving revision 1.32.2.10
retrieving revision 1.32.2.11
diff -u -d -r1.32.2.10 -r1.32.2.11
--- exports.dylan       22 Jul 2004 16:36:14 -0000      1.32.2.10
+++ exports.dylan       25 Aug 2004 04:30:00 -0000      1.32.2.11
@@ -170,7 +170,7 @@
             // More types.
             <byte-character>, <true>, <false>, <stretchy-sequence>,
             <stretchy-object-vector>, <simple-object-table>,
-            <simple-object-deque> => <object-deque>,
+            <object-deque>,
 
             // Type extensions.
             false-or, one-of, <never-returns>, subclass, direct-instance,

Index: deque.dylan
===================================================================
RCS file: /var/lib/cvs/src/d2c/runtime/dylan/deque.dylan,v
retrieving revision 1.7.10.1
retrieving revision 1.7.10.2
diff -u -d -r1.7.10.1 -r1.7.10.2
--- deque.dylan 3 Feb 2004 05:35:59 -0000       1.7.10.1
+++ deque.dylan 25 Aug 2004 04:30:00 -0000      1.7.10.2
@@ -1,12 +1,10 @@
-copyright: Copyright (c) 1995  Carnegie Mellon University
-          All rights reserved.
 module: dylan-viscera
-author: David Pierce (dpierce@xxxxxxxxxx)
+copyright: see below
 
 //======================================================================
 //
-// Copyright (c) 1994, 1995  Carnegie Mellon University
-// Copyright (c) 1998, 1999, 2000  Gwydion Dylan Maintainers
+// Copyright (c) 1995, 1996, 1997  Carnegie Mellon University
[...1333 lines suppressed...]
+                               #next next-method, #rest more-sequences)
+    => res :: <deque>;
+  if (empty?(more-sequences))
+    let sz = size(sequence);
+    if (sz == #f)
+      error("Cannot map unbounded sequences into deques.");
+    elseif (sz > size(destination))
+      size(destination) := sz
+    end if;
+    let data = destination.deq-data;
+    let offset = destination.deq-current-offset;
+    let mask = destination.deq-data-mask;
+    for (key :: <integer> from 0, elem in sequence)
+      %element(data, logand(key + offset, mask)) := proc(elem);
+    end for;
+    destination;
+  else
+    next-method();
+  end if;
+end method map-into;

Index: seals.dylan
===================================================================
RCS file: /var/lib/cvs/src/d2c/runtime/dylan/seals.dylan,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- seals.dylan 3 Feb 2004 05:35:59 -0000       1.4.2.1
+++ seals.dylan 25 Aug 2004 04:30:00 -0000      1.4.2.2
@@ -54,7 +54,7 @@
 define sealed domain dimensions (<builtin-array>);
 
 define constant <builtin-mutable-sequence>
-  = type-union(<builtin-array>, <list>, <simple-object-deque>);
+  = type-union(<builtin-array>, <list>, <object-deque>);
 
 define sealed domain first-setter (<object>, <builtin-mutable-sequence>);
 define sealed domain second-setter (<object>, <builtin-mutable-sequence>);
@@ -109,7 +109,7 @@
 define sealed domain subsequence-position (<builtin-sequence>, 
<builtin-sequence>);
 
 define constant <builtin-stretchy-sequence>
-  = type-union(<stretchy-object-vector>, <simple-object-deque>);
+  = type-union(<stretchy-object-vector>, <object-deque>);
 
 define sealed domain size-setter (<integer>, <builtin-stretchy-sequence>);
 


_______________________________________________
Gd-chatter mailing list
Gd-chatter@xxxxxxxxxxxxxxxx
http://www.gwydiondylan.org/mailman/listinfo/gd-chatter