[Nice-commit] Nice/stdlib/nice/lang collections.nice,1.46,1.47 array.nice,1.22,1.23
Brought to you by:
bonniot
|
From: <bo...@us...> - 2003-05-04 16:49:41
|
Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv32043/stdlib/nice/lang
Modified Files:
collections.nice array.nice
Log Message:
Upgraded source to use new syntax for type parameters in method
implementations.
Index: collections.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/collections.nice,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** collections.nice 3 Mar 2003 16:42:45 -0000 1.46
--- collections.nice 4 May 2003 16:49:38 -0000 1.47
***************
*** 102,106 ****
Default implementation, using an Iterator.
*/
! foreach<T>(c...@ja..., f)
{
for (java.util.Iterator<T> i = c.iterator(); i.hasNext();)
--- 102,106 ----
Default implementation, using an Iterator.
*/
! <T> foreach(c...@ja..., f)
{
for (java.util.Iterator<T> i = c.iterator(); i.hasNext();)
***************
*** 117,121 ****
}
! map<C,T,U>(c, f)
{
C<U> res = c.similarEmptyCollection();
--- 117,121 ----
}
! <C,T,U> map(c, f)
{
C<U> res = c.similarEmptyCollection();
***************
*** 124,128 ****
}
! filter<C,T>(c, test)
{
C<T> res = c.similarEmptyCollection();
--- 124,128 ----
}
! <C,T> filter(c, test)
{
C<T> res = c.similarEmptyCollection();
***************
*** 136,162 ****
}
! similarEmptyCollection<C,T,U>(c#ArrayList)
! {
! ArrayList<U> res = new ArrayList(c.size());
! return res;
! }
! similarEmptyCollection<C,T,U>(c#LinkedList)
! {
! LinkedList<U> res = new LinkedList();
! return res;
! }
! similarEmptyCollection<C,T,U>(c#java.util.Vector)
! {
! java.util.Vector<U> res = new java.util.Vector(c.size());
! return res;
! }
! similarEmptyCollection<C,T,U>(c#java.util.Stack)
! {
! java.util.Stack<U> res = new java.util.Stack();
! return res;
! }
/****************************************************************
--- 136,146 ----
}
! similarEmptyCollection(c#ArrayList) = new ArrayList(c.size());
! similarEmptyCollection(c#LinkedList) = new LinkedList();
! similarEmptyCollection(c#Vector) = new Vector(c.size());
! similarEmptyCollection(c#Stack) = new Stack();
/****************************************************************
Index: array.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/array.nice,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** array.nice 27 Mar 2003 23:01:00 -0000 1.22
--- array.nice 4 May 2003 16:49:38 -0000 1.23
***************
*** 89,95 ****
// Define collection methods
! map<C,T,U>(a@Array, f) = fill(new U[a.length], int i => f(a[i]));
! filter<C, T>(a@Array, test) = a.filter(test);
// Specialized versions for arrays.
--- 89,95 ----
// Define collection methods
! <C,T,U> map(a@Array, f) = fill(new U[a.length], int i => f(a[i]));
! <C,T> filter(a@Array, test) = a.filter(test);
// Specialized versions for arrays.
|