nice-commit — Changes sent to CVS

[Nice-commit] Nice/stdlib/nice/lang java.nice,1.34,1.35

[<bo...@us...>]

Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv19617/stdlib/nice/lang

Modified Files:
	java.nice 
Log Message:
Commented out references to LinkedHashSet, which is a JDK 1.4 feature.


Index: java.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/java.nice,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** java.nice	30 Aug 2003 23:06:07 -0000	1.34
--- java.nice	31 Aug 2003 11:33:04 -0000	1.35
***************
*** 193,200 ****
--- 193,202 ----
  <T> HashSet<T> HashSet(int,float) = native new HashSet(int,float);
  <T,U | U <: T> HashSet<T> HashSet(Collection<U>) = native new HashSet(Collection);
+ /* JDK1.4
  <T> LinkedHashSet<T> LinkedHashSet() = native new LinkedHashSet();
  <T> LinkedHashSet<T> LinkedHashSet(int) = native new LinkedHashSet(int);
  <T> LinkedHashSet<T> LinkedHashSet(int,float) = native new LinkedHashSet(int,float);
  <T,U | U <: T> LinkedHashSet<T> LinkedHashSet(Collection<U>) = native new LinkedHashSet(Collection);
+ JDK1.4 */
  <K,V> HashMap<K,V> HashMap() = native new HashMap();
  <K,V> HashMap<K,V> HashMap(int) = native new HashMap(int);

[Nice-commit] Nice/debian control,1.12,1.13

[<bo...@us...>]

Update of /cvsroot/nice/Nice/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv18424/debian

Modified Files:
	control 
Log Message:
Use kaffe and jikes to build the package.

Suggest ant.


Index: control
===================================================================
RCS file: /cvsroot/nice/Nice/debian/control,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** control	19 Apr 2003 15:12:02 -0000	1.12
--- control	31 Aug 2003 11:26:08 -0000	1.13
***************
*** 3,13 ****
  Priority: optional
  Maintainer: Daniel Bonniot <bo...@us...>
! Build-Depends-Indep: debhelper (>> 3.0.0), java-compiler, groff
! Standards-Version: 3.5.9
  
  Package: nice
  Architecture: all
! Depends: java-virtual-machine, java1-runtime
! Suggests: emacsen
  Description: Extension of Java with parametric types, multi-methods, and more
   Nice is a new object-oriented programming language.
--- 3,13 ----
  Priority: optional
  Maintainer: Daniel Bonniot <bo...@us...>
! Build-Depends-Indep: debhelper (>> 3.0.0), jikes-classpath (>= 1:1.18) | java-compiler, kaffe (>= 1:1.1.1), groff
! Standards-Version: 3.6.1
  
  Package: nice
  Architecture: all
! Depends: java-virtual-machine, java1-runtime | java2-runtime
! Suggests: emacsen, ant
  Description: Extension of Java with parametric types, multi-methods, and more
   Nice is a new object-oriented programming language.

[Nice-commit] Nice Makefile,1.124,1.125

[<bo...@us...>]

Update of /cvsroot/nice/Nice
In directory sc8-pr-cvs1:/tmp/cvs-serv1867

Modified Files:
	Makefile 
Log Message:
Print the JDK version used to compile the compiler in the version info.

Also try to use ANT_HOME to find ant.

Based on a patch by Christian Stuellenberg.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/Makefile,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** Makefile	31 Aug 2003 00:53:27 -0000	1.124
--- Makefile	31 Aug 2003 09:06:52 -0000	1.125
***************
*** 11,14 ****
--- 11,26 ----
  TAG     = ${shell if [ `grep '^ --' debian/changelog |head -1|wc -c` -le 10 ]; then echo prerelease; fi }
  
+ # ANT classpath; we will use NICE_ANTJAR or ANT_HOME (in that order) 
+ # if present, otherwise try good default
+ ANT_CLASSPATH= ${shell if [ "z${NICE_ANTJAR}" != "z" ] ; \
+ 	then echo "${NICE_ANTJAR}"; \
+ 	elif [ "z${ANT_HOME}" != "z" ] ; \
+ 	then echo "${ANT_HOME}/lib/ant.jar"; \
+ 	else if [ "z${CLASSPATH}" != "z" ]; \
+ 	        then echo "/usr/share/java/ant.jar:./external/ant.jar:${CLASSPATH}"; \
+ 		else echo "/usr/share/java/ant.jar:./external/ant.jar:"; \
+ 	    	fi \
+ 	fi }
+ 
  SHELL = /bin/sh
  TOP=${PWD}
***************
*** 71,75 ****
  
  setDate:
! 	cd src/nice/tools/compiler; ./setBuildDate "${VERSION}" "${TAG}"
  
  test:
--- 83,92 ----
  
  setDate:
! 	cd src; ${JAVAC} nice/tools/compiler/JavaVersion.java
! 	${java} -classpath classes nice.tools.compiler.JavaVersion > src/nice/tools/compiler/javaVersion
! 	@echo "We are using compiler `cat src/nice/tools/compiler/javaVersion` (at least our java version let us assume that)"
! 	cd src/nice/tools/compiler; ./setBuildDate "${VERSION}" "`cat javaVersion`" "${TAG}"
! 	@rm src/nice/tools/compiler/javaVersion
! 	@rm classes/nice/tools/compiler/JavaVersion.class
  
  test:
***************
*** 160,165 ****
  ant:
  	@echo "Building the Ant task definition..."
! 	@${javac} -sourcepath src -classpath "/usr/share/java/ant.jar:./external/ant.jar:./classes:./classes.old" -d classes src/nice/tools/ant/Nicec.java ||\
! 	echo "Compilation of the Ant task definition failed.\nAnt should be in the classpath, or linked to by ./external/ant.jar"
  
  testengine:
--- 177,182 ----
  ant:
  	@echo "Building the Ant task definition..."
! 	@${javac} -sourcepath src -classpath "${ANT_CLASSPATH}:./classes:./classes.old" -d classes src/nice/tools/ant/Nicec.java ||\
! 	echo -e "Compilation of the Ant task definition failed.\n NICE_ANTJAR or ANT_HOME should be set, Ant should be in the CLASSPATH or at least linked to by ./external/ant.jar"
  
  testengine:

[Nice-commit] Nice/src/nice/tools/compiler JavaVersion.java,NONE,1.1 setBuildDate,1.9,1.10

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/nice/tools/compiler
In directory sc8-pr-cvs1:/tmp/cvs-serv1706/src/nice/tools/compiler

Modified Files:
	setBuildDate 
Added Files:
	JavaVersion.java 
Log Message:
Print the JDK version used to compile the compiler in the version info.

Based on a patch by Christian Stuellenberg.


--- NEW FILE: JavaVersion.java ---
/**************************************************************************/
/*                                N I C E                                 */
/*             A high-level object-oriented research language             */
/*                        (c) Daniel Bonniot 2003                         */
/*                                                                        */
/*  This program is free software; you can redistribute it and/or modify  */
/*  it under the terms of the GNU General Public License as published by  */
/*  the Free Software Foundation; either version 2 of the License, or     */
/*  (at your option) any later version.                                   */
/*                                                                        */
/**************************************************************************/

package nice.tools.compiler;

/**
   Print the version of the running JVM.
*/
public class JavaVersion
{
    public static void main(String[] args) 
    {
        System.out.println(System.getProperty("java.version"));
    }
}

Index: setBuildDate
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/compiler/setBuildDate,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** setBuildDate	20 Jul 2003 23:23:46 -0000	1.9
--- setBuildDate	31 Aug 2003 09:06:08 -0000	1.10
***************
*** 1,10 ****
  #! /bin/sh
  
! if [ -z "$2" ]; then
    version="$1"
  else
!   version="$1 $2"
  fi
  
  date="`date -u +'%Y.%m.%d, %T %Z'`"
  
--- 1,12 ----
  #! /bin/sh
  
! if [ -z "$3" ]; then
    version="$1"
  else
!   version="$1 $3"
  fi
  
+ javaVersion="$2"
+ 
  date="`date -u +'%Y.%m.%d, %T %Z'`"
  
***************
*** 13,16 ****
--- 15,20 ----
  echo "let String versionNumber = \"$version\";" >> dateBuild.nice
  echo "let String buildDate = \"$date\";" >> dateBuild.nice
+ echo "let String javaVersion = \"$javaVersion\";" >> dateBuild.nice
+ 
  
  echo "Main-Class: nice.tools.compiler.console.fun

[Nice-commit] Nice/src/nice/tools/compiler/console main.nice,1.4,1.5

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/nice/tools/compiler/console
In directory sc8-pr-cvs1:/tmp/cvs-serv1706/src/nice/tools/compiler/console

Modified Files:
	main.nice 
Log Message:
Print the JDK version used to compile the compiler in the version info.

Based on a patch by Christian Stuellenberg.


Index: main.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/compiler/console/main.nice,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.nice	27 Aug 2003 09:35:06 -0000	1.4
--- main.nice	31 Aug 2003 09:06:08 -0000	1.5
***************
*** 197,200 ****
--- 197,201 ----
  {
    println("Nice compiler version " + versionNumber + " (build " + buildDate + ")");
+   println("Compiled using JDK " + javaVersion);
    println("Copyright (C) 2003 Daniel Bonniot");
    println("Visit the Nice homepage: http://nice.sourceforge.net");

[Nice-commit] Nice/testsuite/compiler/methods super.testsuite,1.8,1.9

[<bo...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/methods
In directory sc8-pr-cvs1:/tmp/cvs-serv14022/testsuite/compiler/methods

Modified Files:
	super.testsuite 
Log Message:
Fixed by not using gj.jar anymore.


Index: super.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/super.testsuite,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** super.testsuite	29 Aug 2003 17:41:45 -0000	1.8
--- super.testsuite	31 Aug 2003 00:54:14 -0000	1.9
***************
*** 218,222 ****
  add(a@A, b@B) = super;
  
! /// PASS bug
    new Bar().isEmpty();
    /// Toplevel
--- 218,222 ----
  add(a@A, b@B) = super;
  
! /// PASS
    new Bar().isEmpty();
    /// Toplevel

[Nice-commit] Nice/external gj.jar,1.2,NONE

[<bo...@us...>]

Update of /cvsroot/nice/Nice/external
In directory sc8-pr-cvs1:/tmp/cvs-serv13930/external

Removed Files:
	gj.jar 
Log Message:
Removed gj.jar. Explicit retypings are used instead.

--- gj.jar DELETED ---

[Nice-commit] Nice Makefile,1.123,1.124

[<bo...@us...>]

Update of /cvsroot/nice/Nice
In directory sc8-pr-cvs1:/tmp/cvs-serv13930

Modified Files:
	Makefile 
Log Message:
Removed gj.jar. Explicit retypings are used instead.

Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/Makefile,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** Makefile	20 Jul 2003 23:23:45 -0000	1.123
--- Makefile	31 Aug 2003 00:53:27 -0000	1.124
***************
*** 140,144 ****
  	cd src/gnu/lists && ./withCollections
  	mkdir -p classes
- 	cd classes; jar xf ../external/gj.jar java
  	-cd src/bossa/syntax && mv -f dispatch.java.bootstrap dispatch.java
  	${JAVAC} \
--- 140,143 ----

[Nice-commit] Nice/testsuite/compiler/typing null.testsuite,1.7,1.8

[<bo...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/typing
In directory sc8-pr-cvs1:/tmp/cvs-serv11194/testsuite/compiler/typing

Modified Files:
	null.testsuite 
Log Message:
The non-null marker '!' is smaller than any nullness marker.


Index: null.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/typing/null.testsuite,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** null.testsuite	27 Apr 2003 19:32:26 -0000	1.7
--- null.testsuite	31 Aug 2003 00:32:56 -0000	1.8
***************
*** 38,39 ****
--- 38,62 ----
  void f(?String) {}
  void f(?java.io.File) {}
+ 
+ /// PASS
+   // Checks that ! is the minimum amond nullness markers.
+   /// Toplevel
+ interface Method <R,A> {
+    R call(A a);
+ }
+ 
+ abstract class OOMemoize<R,A> implements Method<R,A> {
+    HashMap<A,R> table = new HashMap();
+ 
+    R protomethod(A a);
+ }
+ 
+ <R,A> call(this@OOMemoize, a){
+    if (this.table.containsKey(a))
+      return notNull(this.table.get(a));
+    else {
+       let R m = this.protomethod(a);
+       this.table.put(a,m);
+       return m;
+    }
+ }

[Nice-commit] Nice/src/bossa/syntax PrimitiveType.java,1.6,1.7

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1:/tmp/cvs-serv11194/src/bossa/syntax

Modified Files:
	PrimitiveType.java 
Log Message:
The non-null marker '!' is smaller than any nullness marker.


Index: PrimitiveType.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/PrimitiveType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PrimitiveType.java	28 May 2003 12:57:26 -0000	1.6
--- PrimitiveType.java	31 Aug 2003 00:32:56 -0000	1.7
***************
*** 134,138 ****
        {
  	maybeTC = tc;
! 	mlsub.typing.NullnessKind.initialize(tc);
  	// to differ with the null result, which signals error
  	return gnu.bytecode.Type.pointer_type;
--- 134,138 ----
        {
  	maybeTC = tc;
! 	mlsub.typing.NullnessKind.setMaybe(tc);
  	// to differ with the null result, which signals error
  	return gnu.bytecode.Type.pointer_type;
***************
*** 142,145 ****
--- 142,146 ----
        {
  	sureTC = tc;
+ 	mlsub.typing.NullnessKind.setSure(tc);
  	// to differ with the null result, which signals error
  	return gnu.bytecode.Type.pointer_type;

[Nice-commit] Nice/src/mlsub/typing NullnessKind.java,1.1,1.2

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/mlsub/typing
In directory sc8-pr-cvs1:/tmp/cvs-serv11194/src/mlsub/typing

Modified Files:
	NullnessKind.java 
Log Message:
The non-null marker '!' is smaller than any nullness marker.


Index: NullnessKind.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/NullnessKind.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NullnessKind.java	1 Aug 2002 00:27:53 -0000	1.1
--- NullnessKind.java	31 Aug 2003 00:32:56 -0000	1.2
***************
*** 26,37 ****
    public static NullnessKind instance = new NullnessKind();
  
!   public static void initialize(TypeConstructor maybeTC)
    {
!     maybe = maybeTC;
    }
  
    public int arity() { return 1; }
  
!   private static TypeConstructor maybe;
  
    public Monotype freshMonotype()
--- 26,42 ----
    public static NullnessKind instance = new NullnessKind();
  
!   public static void setMaybe(TypeConstructor tc)
    {
!     maybe = tc;
!   }
! 
!   public static void setSure(TypeConstructor tc)
!   {
!     sure = tc;
    }
  
    public int arity() { return 1; }
  
!   private static TypeConstructor maybe, sure;
  
    public Monotype freshMonotype()
***************
*** 41,44 ****
--- 46,50 ----
      try {
        Typing.leq(tc, maybe);
+       Typing.leq(sure, tc);
      } catch(TypingEx ex) {
        bossa.util.Internal.error("Nullness creation error");

[Nice-commit] Nice/stdlib/nice/lang collections.nice,1.53,1.54 java.nice,1.33,1.34

[<ar...@us...>]

Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv30309/F:/nice/stdlib/nice/lang

Modified Files:
	collections.nice java.nice 
Log Message:
Removed the implementation of toArray and added retypings for enumeration.

Index: collections.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/collections.nice,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** collections.nice	29 Aug 2003 15:38:21 -0000	1.53
--- collections.nice	30 Aug 2003 23:06:07 -0000	1.54
***************
*** 391,404 ****
   ****************************************************************/
  
- <T, U | T <: U> U[] toArray(Collection<T> coll)
- {
-   U[] res = cast(new U[coll.size()]);
-   int i = 0;
-   for (T elem : coll)
-     res[i++] = elem;
- 
-   return res;
- }
- 
  <T, U> U[] mapToArray(List<T> list, T->U func)
  {
--- 391,394 ----

Index: java.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/java.nice,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** java.nice	30 Aug 2003 21:41:52 -0000	1.33
--- java.nice	30 Aug 2003 23:06:07 -0000	1.34
***************
*** 171,174 ****
--- 171,176 ----
  <T> void trimToSize(Vector<T>) = native void Vector.trimToSize();
  <T> void removeAllElements(Vector<T>) = native void Vector.removeAllElements();
+ <T> boolean hasMoreElements(Enumeration<T>) = native boolean Enumeration.hasMoreElements();
+ <T> T nextElement(Enumeration<T>) = native Object Enumeration.nextElement();
  
  <T> AbstractCollection<T> AbstractCollection() = native new AbstractCollection();
***************
*** 214,217 ****
--- 216,220 ----
  interface Collection<T> = native java.util.Collection;
  interface Comparator<T> = native java.util.Comparator;
+ interface Enumeration<T> = native java.util.Enumeration;
  interface List<T> extends Collection<T> = native java.util.List;
  interface Set<T> extends Collection<T> = native java.util.Set;

[Nice-commit] Nice/stdlib/nice/lang java.nice,1.32,1.33

[<bo...@us...>]

Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv18652/stdlib/nice/lang

Modified Files:
	java.nice 
Log Message:
Added missing retyped classes and interfaces. Corrected typos.

Uncommented all retypings for the java.util classes.


Index: java.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/java.nice,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** java.nice	29 Aug 2003 19:25:24 -0000	1.32
--- java.nice	30 Aug 2003 21:41:52 -0000	1.33
***************
*** 172,183 ****
  <T> void removeAllElements(Vector<T>) = native void Vector.removeAllElements();
  
- /*
  <T> AbstractCollection<T> AbstractCollection() = native new AbstractCollection();
  <T> AbstractList<T> AbstractList() = native new AbstractList();
  <T> AbstractSequentialList<T> AbstractSequentialList() = native new AbstractSequentialList();
  <T> AbstractSet<T> AbstractSet() = native new AbstractSet();
! <T> AbstractMap<K,V> AbstractMap() = native new AbstractMap();
  <T> ArrayList<T> ArrayList() = native new ArrayList();        
! <T> ArrayList<T> ArrayArrayList(int) = native new ArrayList(int);
  <T,U | U <: T> ArrayList<T> ArrayList(Collection<U>) = native new ArrayList(Collection);
  <T> LinkedList<T> LinkedList() = native new LinkedList();
--- 172,182 ----
  <T> void removeAllElements(Vector<T>) = native void Vector.removeAllElements();
  
  <T> AbstractCollection<T> AbstractCollection() = native new AbstractCollection();
  <T> AbstractList<T> AbstractList() = native new AbstractList();
  <T> AbstractSequentialList<T> AbstractSequentialList() = native new AbstractSequentialList();
  <T> AbstractSet<T> AbstractSet() = native new AbstractSet();
! <K,V> AbstractMap<K,V> AbstractMap() = native new AbstractMap();
  <T> ArrayList<T> ArrayList() = native new ArrayList();        
! <T> ArrayList<T> ArrayList(int) = native new ArrayList(int);
  <T,U | U <: T> ArrayList<T> ArrayList(Collection<U>) = native new ArrayList(Collection);
  <T> LinkedList<T> LinkedList() = native new LinkedList();
***************
*** 212,218 ****
  <K,K0,V,V0 | K0 <: K, V0 <: V> TreeMap<K,V> TreeMap(Map<K0,V0>) = native new TreeMap(Map);
  <K,V> TreeMap<K,V> TreeMap(SortedMap<K,V>) = native new TreeMap(SortedMap);
! */
! /*
  interface Collection<T> = native java.util.Collection;
  interface List<T> extends Collection<T> = native java.util.List;
  interface Set<T> extends Collection<T> = native java.util.Set;
--- 211,217 ----
  <K,K0,V,V0 | K0 <: K, V0 <: V> TreeMap<K,V> TreeMap(Map<K0,V0>) = native new TreeMap(Map);
  <K,V> TreeMap<K,V> TreeMap(SortedMap<K,V>) = native new TreeMap(SortedMap);
! 
  interface Collection<T> = native java.util.Collection;
+ interface Comparator<T> = native java.util.Comparator;
  interface List<T> extends Collection<T> = native java.util.List;
  interface Set<T> extends Collection<T> = native java.util.Set;
***************
*** 223,227 ****
  interface SortedMap<K,V> extends Map<T> = native java.util.SortedMap;
  interface Map$Entry<K,V> = native java.util.Map.Entry;
! class AbstractCollection<T> = native java.util.AbstractCollection;
  class AbstractList<T> extends AbstractCollection<T> implements List<T> = native java.util.AbstractList;
  class AbstractSequentialList<T> extends AbstractList<T> = native java.util.AbstractSequentialList;
--- 222,226 ----
  interface SortedMap<K,V> extends Map<T> = native java.util.SortedMap;
  interface Map$Entry<K,V> = native java.util.Map.Entry;
! class AbstractCollection<T> implements Collection<T> = native java.util.AbstractCollection;
  class AbstractList<T> extends AbstractCollection<T> implements List<T> = native java.util.AbstractList;
  class AbstractSequentialList<T> extends AbstractList<T> = native java.util.AbstractSequentialList;
***************
*** 229,232 ****
--- 228,232 ----
  class AbstractMap<K,V> implements Map<K,V> = native java.util.AbstractMap;
  class ArrayList<T> extends AbstractList<T> = native java.util.ArrayList;
+ class Dictionary<K,V> = native java.util.Dictionary;
  class HashMap<K,V> extends AbstractMap<K,V> = native java.util.HashMap;
  class HashSet<T> extends AbstractSet<T> = native java.util.HashSet;
***************
*** 238,242 ****
  class Vector<T> extends AbstractList<T> = native java.util.Vector;
  class WeakHashMap<K,V> extends AbstractMap<K,V> = native java.util.WeakHashMap;
- */
  
  <T> Iterator<T> iterator(Collection<T>) = 
--- 238,241 ----
***************
*** 330,333 ****
--- 329,334 ----
  <T,U | T <: U> T min(Collection<T>, Comparator<U>) = 
    native Object Collections.max(Collection, Comparator);
+ <T> void sort(List<T>, Comparator<T>) = 
+   native void Collections.sort(List, Comparator);
  
  <T,U,V | U <: T, V <: T> boolean Arrays_equals(U[], V[]) = 

[Nice-commit] Nice/testsuite/compiler/methods nativeOverride.testsuite,1.6,1.7

[<bo...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/methods
In directory sc8-pr-cvs1:/tmp/cvs-serv16339/testsuite/compiler/methods

Modified Files:
	nativeOverride.testsuite 
Log Message:
Fixed the testcases by implemented the missing methods.
It is important to extend AbstractList and not ArrayList, or the tested
situation disappears.


Index: nativeOverride.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/nativeOverride.testsuite,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nativeOverride.testsuite	30 Aug 2003 21:11:29 -0000	1.6
--- nativeOverride.testsuite	30 Aug 2003 21:24:42 -0000	1.7
***************
*** 194,207 ****
    Collection<String> b = new Bar();
    /// Toplevel
! class Bar<T> extends ArrayList<T>
  {
    isEmpty() = false;
  }
  
! /// PASS bug
    Collection<String> b = new Bar();
    /// Toplevel
! class Bar<T> extends ArrayList<T>
  {
    removeAll(other@Bar) = false;
  }
--- 194,213 ----
    Collection<String> b = new Bar();
    /// Toplevel
! class Bar<T> extends AbstractList<T>
  {
    isEmpty() = false;
+ 
+   size() = 0;
+   get(i) = cast(null);
  }
  
! /// PASS
    Collection<String> b = new Bar();
    /// Toplevel
! class Bar<T> extends AbstractList<T>
  {
    removeAll(other@Bar) = false;
+ 
+   size() = 0;
+   get(i) = cast(null);
  }

[Nice-commit] Nice/testsuite/compiler/methods nativeOverride.testsuite,1.5,1.6

[<ar...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/methods
In directory sc8-pr-cvs1:/tmp/cvs-serv14460/F:/nice/testsuite/compiler/methods

Modified Files:
	nativeOverride.testsuite 
Log Message:
fix testcases by extending arraylist instead of abstractlist.

Index: nativeOverride.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/nativeOverride.testsuite,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nativeOverride.testsuite	28 Aug 2003 12:46:37 -0000	1.5
--- nativeOverride.testsuite	30 Aug 2003 21:11:29 -0000	1.6
***************
*** 194,198 ****
    Collection<String> b = new Bar();
    /// Toplevel
! class Bar<T> extends AbstractList<T>
  {
    isEmpty() = false;
--- 194,198 ----
    Collection<String> b = new Bar();
    /// Toplevel
! class Bar<T> extends ArrayList<T>
  {
    isEmpty() = false;
***************
*** 202,206 ****
    Collection<String> b = new Bar();
    /// Toplevel
! class Bar<T> extends AbstractList<T>
  {
    removeAll(other@Bar) = false;
--- 202,206 ----
    Collection<String> b = new Bar();
    /// Toplevel
! class Bar<T> extends ArrayList<T>
  {
    removeAll(other@Bar) = false;

[Nice-commit] Nice/testsuite/compiler/statements/variables var.testsuite,1.2,1.3

[<ar...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/statements/variables
In directory sc8-pr-cvs1:/tmp/cvs-serv398/F:/nice/testsuite/compiler/statements/variables

Modified Files:
	var.testsuite 
Log Message:
infer x to type int when exp is of type short in "var x = exp".

Index: var.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/statements/variables/var.testsuite,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** var.testsuite	30 Aug 2003 10:31:36 -0000	1.2
--- var.testsuite	30 Aug 2003 15:53:33 -0000	1.3
***************
*** 39,40 ****
--- 39,44 ----
    // i must have type int, not byte.
    i = i + 1;
+ 
+ /// PASS
+   var i = 200;
+   i = i + 1;

[Nice-commit] Nice/src/bossa/syntax typecheck.nice,1.76,1.77

[<ar...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1:/tmp/cvs-serv398/F:/nice/src/bossa/syntax

Modified Files:
	typecheck.nice 
Log Message:
infer x to type int when exp is of type short in "var x = exp".

Index: typecheck.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/typecheck.nice,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** typecheck.nice	30 Aug 2003 10:31:36 -0000	1.76
--- typecheck.nice	30 Aug 2003 15:53:33 -0000	1.77
***************
*** 586,590 ****
        decl.value = value = value.noOverloading();
        target.type = checkMonomorphic(value.getType(), decl);
!       if (target.type == PrimitiveType.byteType)
  	target.type = notNull(PrimitiveType.intType);
      }
--- 586,591 ----
        decl.value = value = value.noOverloading();
        target.type = checkMonomorphic(value.getType(), decl);
!       if (target.type == PrimitiveType.byteType || 
!           target.type == PrimitiveType.shortType)
  	target.type = notNull(PrimitiveType.intType);
      }

[Nice-commit] Nice/src/bossa/syntax PolySymbol.java,1.16,1.17 MethodDeclaration.java,1.46,1.47

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1:/tmp/cvs-serv21667/src/bossa/syntax

Modified Files:
	PolySymbol.java MethodDeclaration.java 
Log Message:
Only check for double resolve in MethodDeclaration.Symbol, and avoid
messing up the type by adding the nullness marker twice.


Index: PolySymbol.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/PolySymbol.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** PolySymbol.java	30 Aug 2003 10:37:12 -0000	1.16
--- PolySymbol.java	30 Aug 2003 10:57:32 -0000	1.17
***************
*** 58,67 ****
    void resolve()
    {
!     // Check that resolving has not already been done.
!     if (syntacticType != null)
!       {
!         type = syntacticType.resolveToLowlevel();
!         syntacticType = null;
!       }
    }
    
--- 58,63 ----
    void resolve()
    {
!     type = syntacticType.resolveToLowlevel();
!     syntacticType = null;
    }
    

Index: MethodDeclaration.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/MethodDeclaration.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** MethodDeclaration.java	30 Aug 2003 10:37:12 -0000	1.46
--- MethodDeclaration.java	30 Aug 2003 10:57:32 -0000	1.47
***************
*** 312,320 ****
      void resolve()
      {
!       super.resolve();
  
!       // The method has a raw type, while the symbol needs a nullness marker
!       MethodDeclaration.this.type = this.type;
!       this.type = Types.addSure(this.type);
      }
  
--- 312,324 ----
      void resolve()
      {
!       // Check that resolving has not already been done.
!       if (syntacticType != null)
!         {
!           super.resolve();
  
!           // The method has a raw type, while the symbol needs a nullness marker
!           MethodDeclaration.this.type = this.type;
!           this.type = Types.addSure(this.type);
!         }
      }
  

[Nice-commit] Nice/src/bossa/syntax PolySymbol.java,1.15,1.16 NiceClass.java,1.59,1.60 MethodDeclaration.java,1.45,1.46 JavaMethod.java,1.27,1.28 JavaConstructor.java,1.2,1.3

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1:/tmp/cvs-serv19033/src/bossa/syntax

Modified Files:
	PolySymbol.java NiceClass.java MethodDeclaration.java 
	JavaMethod.java JavaConstructor.java 
Log Message:
Allow retyped classes that are subclassed in the same package.


Index: PolySymbol.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/PolySymbol.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PolySymbol.java	26 Jul 2003 22:29:47 -0000	1.15
--- PolySymbol.java	30 Aug 2003 10:37:12 -0000	1.16
***************
*** 58,63 ****
    void resolve()
    {
!     type = syntacticType.resolveToLowlevel();
!     syntacticType = null;
    }
    
--- 58,67 ----
    void resolve()
    {
!     // Check that resolving has not already been done.
!     if (syntacticType != null)
!       {
!         type = syntacticType.resolveToLowlevel();
!         syntacticType = null;
!       }
    }
    

Index: NiceClass.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/NiceClass.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** NiceClass.java	26 Aug 2003 14:21:37 -0000	1.59
--- NiceClass.java	30 Aug 2003 10:37:12 -0000	1.60
***************
*** 733,737 ****
  
      List constructors = TypeConstructors.getConstructors(tc);
!     JavaConstructor m = (JavaConstructor)
        ((MethodDeclaration.Symbol) constructors.get(index)).getDefinition();
      return m.getConstructorInvocation();
--- 733,737 ----
  
      List constructors = TypeConstructors.getConstructors(tc);
!     JavaMethod m = (JavaMethod)
        ((MethodDeclaration.Symbol) constructors.get(index)).getDefinition();
      return m.getConstructorInvocation();

Index: MethodDeclaration.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/MethodDeclaration.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** MethodDeclaration.java	26 Aug 2003 16:07:58 -0000	1.45
--- MethodDeclaration.java	30 Aug 2003 10:37:12 -0000	1.46
***************
*** 110,113 ****
--- 110,116 ----
    public final Monotype[] getArgTypes()
    {
+     if (type == null)
+       symbol.resolve();
+ 
      return type.domain();
    }

Index: JavaMethod.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/JavaMethod.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** JavaMethod.java	24 Jun 2003 15:28:19 -0000	1.27
--- JavaMethod.java	30 Aug 2003 10:37:13 -0000	1.28
***************
*** 102,105 ****
--- 102,110 ----
    }
    
+   gnu.expr.Expression getConstructorInvocation()
+   {
+     return new QuoteExp(new InitializeProc(reflectMethod));
+   }
+ 
    /****************************************************************
     * Module interface

Index: JavaConstructor.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/JavaConstructor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JavaConstructor.java	9 Sep 2002 12:59:26 -0000	1.2
--- JavaConstructor.java	30 Aug 2003 10:37:13 -0000	1.3
***************
*** 39,46 ****
      return new QuoteExp(new InstantiateProc(reflectMethod));
    }
-   
-   Expression getConstructorInvocation()
-   {
-     return new QuoteExp(new InitializeProc(reflectMethod));
-   }
  }
--- 39,41 ----

[Nice-commit] Nice/testsuite/compiler/statements/variables var.testsuite,1.1,1.2

[<bo...@us...>]

Update of /cvsroot/nice/Nice/testsuite/compiler/statements/variables
In directory sc8-pr-cvs1:/tmp/cvs-serv18359/testsuite/compiler/statements/variables

Modified Files:
	var.testsuite 
Log Message:
Make 'var i = <byte expression>' assign i the type int.


Index: var.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/statements/variables/var.testsuite,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** var.testsuite	16 May 2003 12:05:15 -0000	1.1
--- var.testsuite	30 Aug 2003 10:31:36 -0000	1.2
***************
*** 34,35 ****
--- 34,40 ----
    }
  }
+ 
+ /// PASS
+   var i = 0;
+   // i must have type int, not byte.
+   i = i + 1;

[Nice-commit] Nice/src/bossa/syntax typecheck.nice,1.75,1.76

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1:/tmp/cvs-serv18359/src/bossa/syntax

Modified Files:
	typecheck.nice 
Log Message:
Make 'var i = <byte expression>' assign i the type int.


Index: typecheck.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/typecheck.nice,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** typecheck.nice	28 Aug 2003 08:46:32 -0000	1.75
--- typecheck.nice	30 Aug 2003 10:31:36 -0000	1.76
***************
*** 586,589 ****
--- 586,591 ----
        decl.value = value = value.noOverloading();
        target.type = checkMonomorphic(value.getType(), decl);
+       if (target.type == PrimitiveType.byteType)
+ 	target.type = notNull(PrimitiveType.intType);
      }
    else

[Nice-commit] Nice/stdlib/nice/lang java.nice,1.31,1.32

[<ar...@us...>]

Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv17602/F:/nice/stdlib/nice/lang

Modified Files:
	java.nice 
Log Message:
typo's.

Index: java.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/java.nice,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** java.nice	29 Aug 2003 19:22:19 -0000	1.31
--- java.nice	29 Aug 2003 19:25:24 -0000	1.32
***************
*** 211,215 ****
  <K,V,T | K <: T> TreeMap<K,V> TreeMap(Comparator<T>) = native new TreeMap(Comparator);
  <K,K0,V,V0 | K0 <: K, V0 <: V> TreeMap<K,V> TreeMap(Map<K0,V0>) = native new TreeMap(Map);
! <K,V> TreeMap<K,V> TreeMap(SorteMap<K,V>) = native new TreeMap(SortedMap);
  */
  /*
--- 211,215 ----
  <K,V,T | K <: T> TreeMap<K,V> TreeMap(Comparator<T>) = native new TreeMap(Comparator);
  <K,K0,V,V0 | K0 <: K, V0 <: V> TreeMap<K,V> TreeMap(Map<K0,V0>) = native new TreeMap(Map);
! <K,V> TreeMap<K,V> TreeMap(SortedMap<K,V>) = native new TreeMap(SortedMap);
  */
  /*
***************
*** 233,237 ****
  class Hashtable<K,V> implements Map<K,V> = native java.util.Hashtable;
  class LinkedList<T> extends AbstractSequentialList<T> = native java.util.LinkedList;
! class Stack<T> extends Vector<T> = native java.util.Vector;
  class TreeMap<K,V> extends AbstractMap<K,V> implements SortedMap<K,V> = native java.util.TreeMap;
  class TreeSet<T> extends AbstractSet<T> implements SortedSet<T> = native java.util.TreeSet;
--- 233,237 ----
  class Hashtable<K,V> implements Map<K,V> = native java.util.Hashtable;
  class LinkedList<T> extends AbstractSequentialList<T> = native java.util.LinkedList;
! class Stack<T> extends Vector<T> = native java.util.Stack;
  class TreeMap<K,V> extends AbstractMap<K,V> implements SortedMap<K,V> = native java.util.TreeMap;
  class TreeSet<T> extends AbstractSet<T> implements SortedSet<T> = native java.util.TreeSet;

[Nice-commit] Nice/stdlib/nice/lang java.nice,1.30,1.31

[<ar...@us...>]

Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv16916/F:/nice/stdlib/nice/lang

Modified Files:
	java.nice 
Log Message:
typo's.

Index: java.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/java.nice,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** java.nice	29 Aug 2003 18:58:28 -0000	1.30
--- java.nice	29 Aug 2003 19:22:19 -0000	1.31
***************
*** 211,216 ****
  <K,V,T | K <: T> TreeMap<K,V> TreeMap(Comparator<T>) = native new TreeMap(Comparator);
  <K,K0,V,V0 | K0 <: K, V0 <: V> TreeMap<K,V> TreeMap(Map<K0,V0>) = native new TreeMap(Map);
! <K,V> TreeMap<K,V> TreeMap(Sor/*
! ap<K,V>) = native new TreeMap(SortedMap);
  */
  /*
--- 211,215 ----
  <K,V,T | K <: T> TreeMap<K,V> TreeMap(Comparator<T>) = native new TreeMap(Comparator);
  <K,K0,V,V0 | K0 <: K, V0 <: V> TreeMap<K,V> TreeMap(Map<K0,V0>) = native new TreeMap(Map);
! <K,V> TreeMap<K,V> TreeMap(SorteMap<K,V>) = native new TreeMap(SortedMap);
  */
  /*
***************
*** 229,241 ****
  class AbstractSet<T> extends AbstractCollection<T> implements Set<T> = native java.util.AbstractSet;
  class AbstractMap<K,V> implements Map<K,V> = native java.util.AbstractMap;
! class ArrayList<T> extends AbstractList<T> implements Cloneable, Serializable = native java.util.ArrayList;
! class HashMap<K,V> extends AbstractMap<K,V> implements Cloneable, Serializable = native java.util.HashMap;
! class HashSet<T> extends AbstractSet<T> implements Cloneable, Serializable = native java.util.HashSet;
! class Hashtable<K,V> implements Map<K,V>, Cloneable, Serializable = native java.util.Hashtable;
! class LinkedList<T> extends AbstractSequentialList<T> implements Cloneable, Serializable = native java.util.LinkedList;
  class Stack<T> extends Vector<T> = native java.util.Vector;
! class TreeMap<K,V> extends AbstractMap<K,V> implements SortedMap<K,V>, Cloneable, Serializable = native java.util.TreeMap;
! class TreeSet<T> extends AbstractSet<T> implements SortedSet<T>, Cloneable, Serializable = native java.util.TreeSet;
! class Vector<T> extends AbstractList<T> implements CloneabWeakSerializable = native java.util.Vector;
  class WeakHashMap<K,V> extends AbstractMap<K,V> = native java.util.WeakHashMap;
  */
--- 228,240 ----
  class AbstractSet<T> extends AbstractCollection<T> implements Set<T> = native java.util.AbstractSet;
  class AbstractMap<K,V> implements Map<K,V> = native java.util.AbstractMap;
! class ArrayList<T> extends AbstractList<T> = native java.util.ArrayList;
! class HashMap<K,V> extends AbstractMap<K,V> = native java.util.HashMap;
! class HashSet<T> extends AbstractSet<T> = native java.util.HashSet;
! class Hashtable<K,V> implements Map<K,V> = native java.util.Hashtable;
! class LinkedList<T> extends AbstractSequentialList<T> = native java.util.LinkedList;
  class Stack<T> extends Vector<T> = native java.util.Vector;
! class TreeMap<K,V> extends AbstractMap<K,V> implements SortedMap<K,V> = native java.util.TreeMap;
! class TreeSet<T> extends AbstractSet<T> implements SortedSet<T> = native java.util.TreeSet;
! class Vector<T> extends AbstractList<T> = native java.util.Vector;
  class WeakHashMap<K,V> extends AbstractMap<K,V> = native java.util.WeakHashMap;
  */

[Nice-commit] Nice/stdlib/nice/lang java.nice,1.29,1.30

[<ar...@us...>]

Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv11657/F:/nice/stdlib/nice/lang

Modified Files:
	java.nice 
Log Message:
Added retypings for java.util classes and constructors(commented out).

Index: java.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/java.nice,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** java.nice	29 Aug 2003 13:45:08 -0000	1.29
--- java.nice	29 Aug 2003 18:58:28 -0000	1.30
***************
*** 172,175 ****
--- 172,244 ----
  <T> void removeAllElements(Vector<T>) = native void Vector.removeAllElements();
  
+ /*
+ <T> AbstractCollection<T> AbstractCollection() = native new AbstractCollection();
+ <T> AbstractList<T> AbstractList() = native new AbstractList();
+ <T> AbstractSequentialList<T> AbstractSequentialList() = native new AbstractSequentialList();
+ <T> AbstractSet<T> AbstractSet() = native new AbstractSet();
+ <T> AbstractMap<K,V> AbstractMap() = native new AbstractMap();
+ <T> ArrayList<T> ArrayList() = native new ArrayList();        
+ <T> ArrayList<T> ArrayArrayList(int) = native new ArrayList(int);
+ <T,U | U <: T> ArrayList<T> ArrayList(Collection<U>) = native new ArrayList(Collection);
+ <T> LinkedList<T> LinkedList() = native new LinkedList();
+ <T,U | U <: T> LinkedList<T> LinkedList(Collection<U>) = native new LinkedList(Collection);
+ <T> Stack<T> Stack() = native new Stack();
+ <T> Vector<T> Vector() = native new Vector();
+ <T> Vector<T> Vector(int) = native new Vector(int);
+ <T> Vector<T> Vector(int, int) = native new Vector(int, int);
+ <T,U | U <: T> Vector<T> Vector(Collection<U>) = native new Vector(Collection);
+ <T> HashSet<T> HashSet() = native new HashSet();
+ <T> HashSet<T> HashSet(int) = native new HashSet(int);
+ <T> HashSet<T> HashSet(int,float) = native new HashSet(int,float);
+ <T,U | U <: T> HashSet<T> HashSet(Collection<U>) = native new HashSet(Collection);
+ <T> LinkedHashSet<T> LinkedHashSet() = native new LinkedHashSet();
+ <T> LinkedHashSet<T> LinkedHashSet(int) = native new LinkedHashSet(int);
+ <T> LinkedHashSet<T> LinkedHashSet(int,float) = native new LinkedHashSet(int,float);
+ <T,U | U <: T> LinkedHashSet<T> LinkedHashSet(Collection<U>) = native new LinkedHashSet(Collection);
+ <K,V> HashMap<K,V> HashMap() = native new HashMap();
+ <K,V> HashMap<K,V> HashMap(int) = native new HashMap(int);
+ <K,V> HashMap<K,V> HashMap(int,float) = native new HashMap(int,float);
+ <K,K0,V,V0 | K0 <: K, V0 <: V> HashMap<K,V> HashMap(Map<K0,V0>) = native new HashMap(Map);
+ <K,V> Hashtable<K,V> Hashtable() = native new Hashtable();
+ <K,V> Hashtable<K,V> Hashtable(int) = native new Hashtable(int);
+ <K,V> Hashtable<K,V> Hashtable(int,float) = native new Hashtable(int,float);
+ <K,K0,V,V0 | K0 <: K, V0 <: V> Hashtable<K,V> Hashtable(Map<K0,V0>) = native new Hashtable(Map);
+ <T> TreeSet<T> TreeSet() = native new TreeSet();
+ <T,U | U <: T> TreeSet<T> TreeSet(Collection<U>) = native new TreeSet(Collection);
+ <T,U | T <: U> TreeSet<T> TreeSet(Comparator<U>) = native new TreeSet(Comparator);
+ <T> TreeSet<T> TreeSet(SortedSet<T>) = native new TreeSet(SortedSet);
+ <K,V> TreeMap<K,V> TreeMap() = native new TreeMap();
+ <K,V,T | K <: T> TreeMap<K,V> TreeMap(Comparator<T>) = native new TreeMap(Comparator);
+ <K,K0,V,V0 | K0 <: K, V0 <: V> TreeMap<K,V> TreeMap(Map<K0,V0>) = native new TreeMap(Map);
+ <K,V> TreeMap<K,V> TreeMap(Sor/*
+ ap<K,V>) = native new TreeMap(SortedMap);
+ */
+ /*
+ interface Collection<T> = native java.util.Collection;
+ interface List<T> extends Collection<T> = native java.util.List;
+ interface Set<T> extends Collection<T> = native java.util.Set;
+ interface SortedSet<T> extends Set<T> = native java.util.SortedSet;
+ interface Iterator<T> = native java.util.Iterator;
+ interface ListIterator<T> extends Iterator<T> = native java.util.ListIterator;
+ interface Map<K,V> = native java.util.Map;
+ interface SortedMap<K,V> extends Map<T> = native java.util.SortedMap;
+ interface Map$Entry<K,V> = native java.util.Map.Entry;
+ class AbstractCollection<T> = native java.util.AbstractCollection;
+ class AbstractList<T> extends AbstractCollection<T> implements List<T> = native java.util.AbstractList;
+ class AbstractSequentialList<T> extends AbstractList<T> = native java.util.AbstractSequentialList;
+ class AbstractSet<T> extends AbstractCollection<T> implements Set<T> = native java.util.AbstractSet;
+ class AbstractMap<K,V> implements Map<K,V> = native java.util.AbstractMap;
+ class ArrayList<T> extends AbstractList<T> implements Cloneable, Serializable = native java.util.ArrayList;
+ class HashMap<K,V> extends AbstractMap<K,V> implements Cloneable, Serializable = native java.util.HashMap;
+ class HashSet<T> extends AbstractSet<T> implements Cloneable, Serializable = native java.util.HashSet;
+ class Hashtable<K,V> implements Map<K,V>, Cloneable, Serializable = native java.util.Hashtable;
+ class LinkedList<T> extends AbstractSequentialList<T> implements Cloneable, Serializable = native java.util.LinkedList;
+ class Stack<T> extends Vector<T> = native java.util.Vector;
+ class TreeMap<K,V> extends AbstractMap<K,V> implements SortedMap<K,V>, Cloneable, Serializable = native java.util.TreeMap;
+ class TreeSet<T> extends AbstractSet<T> implements SortedSet<T>, Cloneable, Serializable = native java.util.TreeSet;
+ class Vector<T> extends AbstractList<T> implements CloneabWeakSerializable = native java.util.Vector;
+ class WeakHashMap<K,V> extends AbstractMap<K,V> = native java.util.WeakHashMap;
+ */
+ 
  <T> Iterator<T> iterator(Collection<T>) = 
    native Iterator Collection.iterator();

[Nice-commit] Nice/src/bossa/syntax SuperExp.java,1.11,1.12

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1:/tmp/cvs-serv29077/src/bossa/syntax

Modified Files:
	SuperExp.java 
Log Message:
Call the correct super implementation when an implemented interface also 
declared the method.


Index: SuperExp.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/SuperExp.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SuperExp.java	10 Jun 2003 09:35:40 -0000	1.11
--- SuperExp.java	29 Aug 2003 17:41:45 -0000	1.12
***************
*** 107,111 ****
      
      return superClass.getMethod(thisMethod.getName(), 
! 				thisMethod.getParameterTypes());
    }
  
--- 107,111 ----
      
      return superClass.getMethod(thisMethod.getName(), 
! 				thisMethod.getParameterTypes(), true);
    }