Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /charles/src/ai302/

charles
Discussion topic

Back to topic list

CVS update: /charles/src/ai302/

Reply

Author matthewjheaney
Full name Matthew Heaney
Date 2004-09-21 20:10:11 PDT
Message User: matthewjheaney
Date: 04/09/21 20:10:11

Modified:
 /charles/src/ai302/
  a-cdlili.ads

Log:
 incorporate changes made in madison

File Changes:

Directory: /charles/src/ai302/
==============================

File [changed]: a-cdlili.ads
Url: http://charles.tigri​s.org/source/browse/​charles/src/ai302/a-​cdlili.ads?r1=1.3​&r2=1.4
Delta lines: +16 -12
---------------------
--- a-cdlili.ads 11 Sep 2004 22:23:10 -0000 1.3
+++ a-cdlili.ads 22 Sep 2004 03:10:11 -0000 1.4
@@ -113,23 +113,19 @@
    generic
       with function "<" (Left, Right : Element_Type)
          return Boolean is <>;
- procedure Generic_Sort (Container : in out List'Class);
+ procedure Generic_Sort (Container : in out List);
 
    generic
       with function "<" (Left, Right : Element_Type)
          return Boolean is <>;
    procedure Generic_Merge (Target : in out List;
                             Source : in out List);
- --
- -- TODO: resolve parameter types in Madison.
- -- Either import both as List'Class, or import the
- -- the list type as a generic formal type.
- -- ENDTODO.
-
 
    procedure Reverse_List (Container : in out List);
 
- procedure Swap (Container : in out List;
+ procedure Swap_Elements (I, J : in Cursor);
+
+ procedure Swap_Links (Container : in out List;
                    I, J : in Cursor);
 
    procedure Splice (Target : in out List;
@@ -230,11 +226,19 @@
 
    for List'Write use Write;
 
- Empty_List : constant List := (Controlled with null, null, 0);
+ Empty_List : constant List := List'(Controlled with null, null, 0);
+
 
- type Cursor is new Node_Access;
+ type List_Access is access constant List;
+ for List_Access'Storage_Size use 0;
+
+ type Cursor is
+ record
+ Container : List_Access;
+ Node : Node_Access;
+ end record;
 
- No_Element : constant Cursor := null;
+ No_Element : constant Cursor := Cursor'(null, null);
 
 
 end Ada.Containers.Doubl​y_Linked_Lists;




--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe@char​les.tigris.org
For additional commands, e-mail: cvs-help at charles dot tigris dot org

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /charles/src/ai302/ matthewjheaney Matthew Heaney 2004-09-21 20:10:11 PDT
Messages per page: