nice-commit — Changes sent to CVS

[Nice-commit] Nice/testsuite/lib/nice/lang range.testsuite,NONE,1.1

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

Update of /cvsroot/nice/Nice/testsuite/lib/nice/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14902/testsuite/lib/nice/lang

Added Files:
	range.testsuite 
Log Message:
Make sure that finite literal ranges have a static subtype of List.


--- NEW FILE: range.testsuite ---
/// PASS
  List<int> l = 0..10;
  assert l[0] == 0 && l[10] == 10;

[Nice-commit] Nice/stdlib/nice/lang/inline ReferenceOp.java,1.6,1.7

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

Update of /cvsroot/nice/Nice/stdlib/nice/lang/inline
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2097/F:/nice/stdlib/nice/lang/inline

Modified Files:
	ReferenceOp.java 
Log Message:
Optimization for codegeneration of NotNullPattern on primitives.

Index: ReferenceOp.java
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/inline/ReferenceOp.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ReferenceOp.java	3 Aug 2004 14:36:06 -0000	1.6
--- ReferenceOp.java	15 Sep 2004 18:16:27 -0000	1.7
***************
*** 101,104 ****
--- 101,112 ----
         ((QuoteExp)args[0]).getType() == Type.nullType)
      {
+       if (args[1].getType() instanceof PrimType)
+         {
+           if (kind == Ne)
+             code.emitGoto(to);
+ 
+           return;
+         }
+ 
        args[1].compile(comp, stack);
        if (kind == Eq)
***************
*** 111,114 ****
--- 119,130 ----
         ((QuoteExp)args[1]).getType() == Type.nullType)
      {
+       if (args[0].getType() instanceof PrimType)
+         {
+           if (kind == Ne)
+             code.emitGoto(to);
+ 
+           return;
+         }
+ 
        args[0].compile(comp, stack);
        if (kind == Eq)
***************
*** 138,141 ****
--- 154,165 ----
         ((QuoteExp)args[0]).getType() == Type.nullType)
      {
+       if (args[1].getType() instanceof PrimType)
+         {
+           if (kind == Eq)
+             code.emitGoto(to);
+ 
+           return;
+         }
+ 
        args[1].compile(comp, stack);
        if (kind == Eq)
***************
*** 148,151 ****
--- 172,183 ----
         ((QuoteExp)args[1]).getType() == Type.nullType)
      {
+       if (args[0].getType() instanceof PrimType)
+         {
+           if (kind == Eq)
+             code.emitGoto(to);
+ 
+           return;
+         }
+ 
        args[0].compile(comp, stack);
        if (kind == Eq)

[Nice-commit] Nice/stdlib/nice/lang ForInIters.nice,1.8,1.9

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

Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28551/stdlib/nice/lang

Modified Files:
	ForInIters.nice 
Log Message:
Simplification of the type of forIterator:
<T | T <: int, int <: T> is useless, one can directly use int instead of T
in that case.


Index: ForInIters.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/ForInIters.nice,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ForInIters.nice	13 Aug 2004 06:24:39 -0000	1.8
--- ForInIters.nice	15 Sep 2004 17:46:55 -0000	1.9
***************
*** 26,31 ****
  Iterator<char> forIterator(StringBuffer sb) = new StringBufferForIterator(strb: sb);
  
! <T | T <: int, int <: T> 
! Iterator<T> forIterator(OpenRange<T> range) = range.openIterator();
  
  //The implementations of additional Iterators
--- 26,30 ----
  Iterator<char> forIterator(StringBuffer sb) = new StringBufferForIterator(strb: sb);
  
! Iterator<int> forIterator(OpenRange<int> range) = range.openIterator();
  
  //The implementations of additional Iterators

[Nice-commit] Nice/testsuite/compiler/methods ambiguity.testsuite,1.3,1.4 overriding.testsuite,1.7,1.8

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

Update of /cvsroot/nice/Nice/testsuite/compiler/methods
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29861/F:/nice/testsuite/compiler/methods

Modified Files:
	ambiguity.testsuite overriding.testsuite 
Log Message:
Fixed bug in creating patterns for method overrides.

Index: ambiguity.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/ambiguity.testsuite,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ambiguity.testsuite	15 Sep 2004 00:47:31 -0000	1.3
--- ambiguity.testsuite	15 Sep 2004 12:58:57 -0000	1.4
***************
*** 18,22 ****
  foo(null) = true;
  
! /// PASS bug
    /// Toplevel
  void foo(int x, ?int y) {}
--- 18,22 ----
  foo(null) = true;
  
! /// PASS
    /// Toplevel
  void foo(int x, ?int y) {}

Index: overriding.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/overriding.testsuite,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** overriding.testsuite	17 Jun 2004 10:41:13 -0000	1.7
--- overriding.testsuite	15 Sep 2004 12:58:57 -0000	1.8
***************
*** 252,253 ****
--- 252,262 ----
  // This is NOT an override
  override void foo(A<String> x) {}
+ 
+ /// PASS
+   /// package a
+   /// Toplevel
+   boolean foo(?int x) = false;
+   override boolean foo(int x) = true;
+   /// package b import a
+   assert ! foo(null);
+   assert foo(5);

[Nice-commit] Nice/src/bossa/syntax pattern.nice,1.3,1.4

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

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29861/F:/nice/src/bossa/syntax

Modified Files:
	pattern.nice 
Log Message:
Fixed bug in creating patterns for method overrides.

Index: pattern.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/pattern.nice,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pattern.nice	2 Sep 2004 15:46:32 -0000	1.3
--- pattern.nice	15 Sep 2004 12:58:57 -0000	1.4
***************
*** 30,41 ****
  //for use in MethodImplementation
  public Pattern createPattern(?LocatedString name, ?mlsub.typing.TypeConstructor tc, boolean sure)
! {
    let loc = (name != null) ? name.location() : Location.nowhere();
-   if (sure && tc == null)
-     return new NotNullPattern(name, PrimitiveType.sureTC, loc);
  
    if (nice.tools.typing.Types.isPrimitive(tc))
      tc = null;
  
    if (tc == null)
      return new VariablePattern(name, loc);
--- 30,42 ----
  //for use in MethodImplementation
  public Pattern createPattern(?LocatedString name, ?mlsub.typing.TypeConstructor tc, boolean sure)
! { // TODO: don't generate NotNullPatterns if the overriden domain is sure.
    let loc = (name != null) ? name.location() : Location.nowhere();
  
    if (nice.tools.typing.Types.isPrimitive(tc))
      tc = null;
  
+   if (sure && tc == null)
+     return new NotNullPattern(name, PrimitiveType.sureTC, loc);
+ 
    if (tc == null)
      return new VariablePattern(name, loc);
***************
*** 625,628 ****
--- 626,632 ----
      return createPattern(new LocatedString("_", loc));
  
+   if (name.equals("NONNULL"))
+     return new NotNullPattern(null, PrimitiveType.sureTC, loc);
+ 
    if (name.equals("NULL"))
      return createPattern(createNullExp(loc));

[Nice-commit] Nice/src/bossa/syntax Pattern.java,1.91,1.92 MethodBodyDefinition.java,1.151,1.152

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

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6980/src/bossa/syntax

Modified Files:
	Pattern.java MethodBodyDefinition.java 
Log Message:
Take into account nullness when find which method an implementation belongs to.

Always report the precise pattern that prevents an implementation from
belonging to a method, when there is no ambiguity about which method is
concerned.


Index: Pattern.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Pattern.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** Pattern.java	7 Aug 2004 14:20:29 -0000	1.91
--- Pattern.java	15 Sep 2004 00:47:31 -0000	1.92
***************
*** 198,225 ****
        }
    }
!   
!   static void inDomain(Pattern[] patterns, Monotype[] types) throws TypingEx
    {
!     for (int i = 0; i < patterns.length; i++)
!       Types.setMarkedKind(types[i]);
  
!     for (int i = 0; i < patterns.length; i++)
!       patterns[i].inDomain(Types.rawType(types[i]));
!   }
  
-   private void inDomain(Monotype type) throws TypingEx
-   {
      if (constraint != null)
        {
  	constraint.enter();
! 	Typing.leq(patternType, type);
        }
      else
        {
! 	Typing.leq(tc, type);
        }
  
      if (tc2 != null)
!       Typing.leq(tc2, type);
    }
  
--- 198,223 ----
        }
    }
! 
!   void inDomain(Monotype type) throws TypingEx
    {
!     Types.setMarkedKind(type);
  
!     if (this.atNull())
!       Typing.leq(PrimitiveType.maybeTC, type.head());
! 
!     Monotype rawType = Types.rawType(type);
  
      if (constraint != null)
        {
  	constraint.enter();
! 	Typing.leq(patternType, rawType);
        }
      else
        {
! 	Typing.leq(tc, rawType);
        }
  
      if (tc2 != null)
!       Typing.leq(tc2, rawType);
    }
  

Index: MethodBodyDefinition.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/MethodBodyDefinition.java,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** MethodBodyDefinition.java	7 Aug 2004 14:20:28 -0000	1.151
--- MethodBodyDefinition.java	15 Sep 2004 00:47:31 -0000	1.152
***************
*** 129,132 ****
--- 129,136 ----
          hasAdditionalTags = true;
  
+     // Try to remember what caused the error when no symbol could be found.
+     UserError error = null;
+     boolean multipleErrors = false;
+ 
      for(Iterator i = symbols.iterator(); i.hasNext();){
        VarSymbol s = (VarSymbol)i.next();
***************
*** 136,140 ****
  	  continue;
  	}
!       
        MethodDeclaration m = s.getMethodDeclaration();
        if (m.isIgnored())
--- 140,144 ----
  	  continue;
  	}
! 
        MethodDeclaration m = s.getMethodDeclaration();
        if (m.isIgnored())
***************
*** 150,154 ****
  	  continue;
  	}
! 	  
        try{
  	int level;
--- 154,158 ----
  	  continue;
  	}
! 
        try{
  	int level;
***************
*** 162,166 ****
  	  mlsub.typing.Polytype t = m.getType();
  	  Constraint.enter(t.getConstraint());
!           Pattern.inDomain(formals, t.domain());
  	}
  	finally{
--- 166,184 ----
  	  mlsub.typing.Polytype t = m.getType();
  	  Constraint.enter(t.getConstraint());
!           Monotype[] domain = t.domain();
!           for (int p = 0; p < domain.length; p++)
!             try {
!               formals[p].inDomain(domain[p]);
!             }
!             catch (TypingEx e) {
!               if (error == null)
!                 error = new UserError(formals[p],
!                                       "Pattern " + formals[p] +
!                                       " is incompatible with " + domain[p]);
!               else
!                 multipleErrors = true;
! 
!               throw e;
!             }
  	}
  	finally{
***************
*** 245,255 ****
      bossa.syntax.dispatch.removeNonMinimal(symbols);
  
!     if(symbols.size() == 1) 
        return (VarSymbol) symbols.get(0);
  
!     if(symbols.size()==0)
!       User.error(this,
! 		 "No method called " + name + 
! 		 " is compatible with these patterns");
  
      String methods = "";
--- 263,278 ----
      bossa.syntax.dispatch.removeNonMinimal(symbols);
  
!     if(symbols.size() == 1)
        return (VarSymbol) symbols.get(0);
  
!     if (symbols.size() == 0)
!       {
!         if (error != null && ! multipleErrors)
!           throw error;
!         else
!           User.error(this,
!                      "No method called " + name +
!                      " is compatible with these patterns");
!       }
  
      String methods = "";

[Nice-commit] Nice/testsuite/compiler/methods constrained.testsuite,1.5,1.6 ambiguity.testsuite,1.2,1.3

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

Update of /cvsroot/nice/Nice/testsuite/compiler/methods
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6980/testsuite/compiler/methods

Modified Files:
	constrained.testsuite ambiguity.testsuite 
Log Message:
Take into account nullness when find which method an implementation belongs to.

Always report the precise pattern that prevents an implementation from
belonging to a method, when there is no ambiguity about which method is
concerned.


Index: ambiguity.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/ambiguity.testsuite,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ambiguity.testsuite	9 Sep 2004 11:29:29 -0000	1.2
--- ambiguity.testsuite	15 Sep 2004 00:47:31 -0000	1.3
***************
*** 7,11 ****
  f(x@A) {}
  
! /// PASS bug
    assert foo(null);
    /// Toplevel
--- 7,11 ----
  f(x@A) {}
  
! /// PASS
    assert foo(null);
    /// Toplevel

Index: constrained.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/constrained.testsuite,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** constrained.testsuite	11 Sep 2003 21:07:01 -0000	1.5
--- constrained.testsuite	15 Sep 2004 00:47:31 -0000	1.6
***************
*** 66,77 ****
  /// FAIL
    ///Toplevel
!   class A{}                                         
!   class B extends A{}                               
!   interface I<+T | B <: T>{}                        
!   class X<+T | A <: T> implements I<T>{}            
  
!   void foo(I<B>);                                   
!   /*/// FAIL HERE */ foo(@X){} 
!   //@X is not in the domain of foo 
  
  /// FAIL
--- 66,77 ----
  /// FAIL
    ///Toplevel
!   class A {}
!   class B extends A {}
!   interface I<+T | B <: T> {}
!   class X<+T | A <: T> implements I<T> {}
  
!   void foo(I<B>);
!   foo(/*/// FAIL HERE */X x){}
!   // X is not in the domain of foo
  
  /// FAIL

[Nice-commit] Nice/testsuite/compiler/overloading specificity.testsuite,1.6,1.7

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

Update of /cvsroot/nice/Nice/testsuite/compiler/overloading
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6980/testsuite/compiler/overloading

Modified Files:
	specificity.testsuite 
Log Message:
Take into account nullness when find which method an implementation belongs to.

Always report the precise pattern that prevents an implementation from
belonging to a method, when there is no ambiguity about which method is
concerned.


Index: specificity.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/overloading/specificity.testsuite,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** specificity.testsuite	22 Jul 2004 12:40:42 -0000	1.6
--- specificity.testsuite	15 Sep 2004 00:47:31 -0000	1.7
***************
*** 119,123 ****
    void foo(B x) {}
  
! /// PASS bug
    assert foo(null) == null;
    let String s = foo("abc");
--- 119,123 ----
    void foo(B x) {}
  
! /// PASS
    assert foo(null) == null;
    let String s = foo("abc");

[Nice-commit] Nice/src/bossa/syntax MethodImplementation.java,1.7,1.8

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

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22522/src/bossa/syntax

Modified Files:
	MethodImplementation.java 
Log Message:
Cleanup.


Index: MethodImplementation.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/MethodImplementation.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MethodImplementation.java	7 Aug 2004 14:20:29 -0000	1.7
--- MethodImplementation.java	14 Sep 2004 16:11:46 -0000	1.8
***************
*** 96,100 ****
      parameters = res;
    }
!   
    /** Where no patterns are present, add those corresponding to the method
        declaration.
--- 96,100 ----
      parameters = res;
    }
! 
    /** Where no patterns are present, add those corresponding to the method
        declaration.
***************
*** 103,113 ****
    {
      Monotype[] parameters = Types.parameters(declaration.getType());
!     for (int i = 0; i < formals.length; i++)      
        if (formals[i].tc == null)
          formals[i] = bossa.syntax.dispatch.createPattern(formals[i].name,
  		Types.concreteConstructor(parameters[i]),
  		Types.isSure(parameters[i]));
- 			
-   
    }
  
--- 103,111 ----
    {
      Monotype[] parameters = Types.parameters(declaration.getType());
!     for (int i = 0; i < formals.length; i++)
        if (formals[i].tc == null)
          formals[i] = bossa.syntax.dispatch.createPattern(formals[i].name,
  		Types.concreteConstructor(parameters[i]),
  		Types.isSure(parameters[i]));
    }
  

[Nice-commit] Nice/src/nice/tools/repository main.nice,1.1,1.2

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

Update of /cvsroot/nice/Nice/src/nice/tools/repository
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20505/src/nice/tools/repository

Modified Files:
	main.nice 
Log Message:
Typos.


Index: main.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/repository/main.nice,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.nice	7 Aug 2004 14:57:33 -0000	1.1
--- main.nice	14 Sep 2004 16:00:31 -0000	1.2
***************
*** 125,129 ****
  
  /**
!    Find the latest version of a give package, but searching for
     a 'latest' file in the repository.
  */
--- 125,129 ----
  
  /**
!    Find the latest version of a given package, but searching for
     a 'latest' file in the repository.
  */
***************
*** 143,147 ****
  
  /**
!    Find the latest version of a give package, by listing all versions.
  */
  private ?String latestVersionLocal(URL repo, String pkg)
--- 143,147 ----
  
  /**
!    Find the latest version of a given package, by listing all versions.
  */
  private ?String latestVersionLocal(URL repo, String pkg)

[Nice-commit] Nice NEWS,1.48,1.49

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

Update of /cvsroot/nice/Nice
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1958/Nice

Modified Files:
	NEWS 
Log Message:
Multi-argument indexing.

Index: NEWS
===================================================================
RCS file: /cvsroot/nice/Nice/NEWS,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** NEWS	4 Sep 2004 19:17:48 -0000	1.48
--- NEWS	13 Sep 2004 22:09:24 -0000	1.49
***************
*** 26,29 ****
--- 26,31 ----
    * Underscores are allowed and ignored in literal numbers. example:
        long x = 1_000_123_000_456;
+   * The indexing operator supports multiple arguments now. For instance
+     'a[x,y]' is syntactic sugar for 'a.get(x,y)'.
    * Lists now support a wide array of slicing and indexing
      operations. There is a new bit of syntax, '@', which indicates

[Nice-commit] Nice/web language.html,1.22,1.23

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

Update of /cvsroot/nice/Nice/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1251

Modified Files:
	language.html 
Log Message:
Added links to "go further".


Index: language.html
===================================================================
RCS file: /cvsroot/nice/Nice/web/language.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** language.html	24 Jan 2004 21:50:23 -0000	1.22
--- language.html	10 Sep 2004 13:10:26 -0000	1.23
***************
*** 460,466 ****
  <br>&nbsp;
  
! <h2>What else?</h2>
  
! For a more complete description of the language, see 
  <a href="manual.html">the User's manual</a>.
  
--- 460,470 ----
  <br>&nbsp;
  
! <h2>To go further</h2>
  
! Chech this
! <a href="http://nice.sourceforge.net/cgi-bin/twiki/view/Doc/QuickIntroduction">
! list of documents to get started</a> with Nice.
! 
! For a complete description of the language, see
  <a href="manual.html">the User's manual</a>.
  

[Nice-commit] Nice/web new.xsl,1.16,1.17 gray.css,1.1,1.2

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

Update of /cvsroot/nice/Nice/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31995

Modified Files:
	new.xsl gray.css 
Log Message:
Make non-navigation links red in all cases, so they are more clearly visible.


Index: gray.css
===================================================================
RCS file: /cvsroot/nice/Nice/web/gray.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gray.css	5 Apr 2002 09:27:45 -0000	1.1
--- gray.css	10 Sep 2004 13:04:06 -0000	1.2
***************
*** 96,100 ****
  
  a {
! 	color: black;
  	font-weight: bold;
  	text-decoration: none;
--- 96,100 ----
  
  a {
! 	color: #ff0033;
  	font-weight: bold;
  	text-decoration: none;
***************
*** 106,112 ****
--- 106,117 ----
  
  a:visited {
+ 	color: #cc0022;
  	text-decoration: none;
  }
  
+ a:visited.nav {
+ 	color: black;
+ }
+ 
  a:active {
  	text-decoration: none;
***************
*** 114,118 ****
  
  a:hover {
- 	color: #ff0033;
  	text-decoration: underline;
! }
\ No newline at end of file
--- 119,122 ----
  
  a:hover {
  	text-decoration: underline;
! }

Index: new.xsl
===================================================================
RCS file: /cvsroot/nice/Nice/web/new.xsl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** new.xsl	9 Mar 2004 12:31:33 -0000	1.16
--- new.xsl	10 Sep 2004 13:04:06 -0000	1.17
***************
*** 113,117 ****
           <tr>
            <td bgcolor="#cccccc"><img width="48" height="48" align="middle" src="images/floppy-48.png" alt="."/>
!            &nbsp;<span class="title"><a href="install.html">Download</a></span>
            </td>
           </tr>
--- 113,117 ----
           <tr>
            <td bgcolor="#cccccc"><img width="48" height="48" align="middle" src="images/floppy-48.png" alt="."/>
!            &nbsp;<span class="title"><a class="nav" href="install.html">Download</a></span>
            </td>
           </tr>
***************
*** 219,223 ****
           <tr>
            <td bgcolor="#cccccc"><img width="48" height="48" align="middle" src="images/academic-48.png" alt="."/>
!            &nbsp;<span class="title"><a href="research.html">Academic Research</a></span>
            </td>
           </tr>
--- 219,223 ----
           <tr>
            <td bgcolor="#cccccc"><img width="48" height="48" align="middle" src="images/academic-48.png" alt="."/>
!            &nbsp;<span class="title"><a class="nav" href="research.html">Academic Research</a></span>
            </td>
           </tr>
***************
*** 277,281 ****
       <!-- footer -->
         <span class="footer">
!         <a href="mailto:Dan...@in...">Daniel Bonniot</a>
  
         </span>
--- 277,281 ----
       <!-- footer -->
         <span class="footer">
!         <a class="nav" href="mailto:Dan...@in...">Daniel Bonniot</a>
  
         </span>

[Nice-commit] Nice/testsuite/compiler/methods ambiguity.testsuite,1.1,1.2

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

Update of /cvsroot/nice/Nice/testsuite/compiler/methods
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23690/testsuite/compiler/methods

Modified Files:
	ambiguity.testsuite 
Log Message:
Testcases for ambiguity when using null dispatch.


Index: ambiguity.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/ambiguity.testsuite,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ambiguity.testsuite	6 Nov 2002 09:56:25 -0000	1.1
--- ambiguity.testsuite	9 Sep 2004 11:29:29 -0000	1.2
***************
*** 6,7 ****
--- 6,23 ----
  f(x@A) {}
  f(x@A) {}
+ 
+ /// PASS bug
+   assert foo(null);
+   /// Toplevel
+ class A {}
+ class B {}
+ 
+ boolean foo(?A a) = false;
+ boolean foo(B b) = false;
+ 
+ foo(null) = true;
+ 
+ /// PASS bug
+   /// Toplevel
+ void foo(int x, ?int y) {}
+ override void foo(int x, int y) {}

[Nice-commit] Nice/src/gnu/math/CVS-upstream Entries,1.4,NONE Repository,1.1,NONE Root,1.1,NONE

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

Update of /cvsroot/nice/Nice/src/gnu/math/CVS-upstream
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15313/F:/nice/src/gnu/math/CVS-upstream

Removed Files:
	Entries Repository Root 
Log Message:
Removed gnu.math files.

--- Root DELETED ---

--- Repository DELETED ---

--- Entries DELETED ---

[Nice-commit] Nice/src/gnu/math BaseUnit.java,1.1.1.1,NONE BitOps.java,1.1.1.1,NONE CComplex.java,1.1.1.1,NONE COPYING,1.1.1.1,NONE CQuantity.java,1.1.1.1,NONE ChangeLog,1.2,NONE Complex.java,1.1.1.1,NONE DComplex.java,1.1.1.1,NONE DFloNum.java,1.1.1.1,NONE DQuantity.java,1.1.1.1,NONE Dimensions.java,1.1.1.1,NONE ExponentialFormat.java,1.1.1.1,NONE FixedRealFormat.java,1.1.1.1,NONE IntFraction.java,1.2,NONE IntNum.java,1.2,NONE MPN.java,1.2,NONE Makefile.am,1.2,NONE Makefile.in,1.3,NONE MulUnit.java,1.1.1.1,NONE NamedUnit.java,1.1.1.1,NONE Numeric.java,1.1.1.1,NONE Quantity.java,1.1.1.1,NONE RatNum.java,1.1.1.1,NONE RealNum.java,1.1.1.1,NONE Unit.java,1.1.1.1,NONE package.html,1.1.1.1,NONE

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

Update of /cvsroot/nice/Nice/src/gnu/math
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10327/F:/nice/src/gnu/math

Removed Files:
	BaseUnit.java BitOps.java CComplex.java COPYING CQuantity.java 
	ChangeLog Complex.java DComplex.java DFloNum.java 
	DQuantity.java Dimensions.java ExponentialFormat.java 
	FixedRealFormat.java IntFraction.java IntNum.java MPN.java 
	Makefile.am Makefile.in MulUnit.java NamedUnit.java 
	Numeric.java Quantity.java RatNum.java RealNum.java Unit.java 
	package.html 
Log Message:
Removed gnu.math files.

--- CComplex.java DELETED ---

--- IntNum.java DELETED ---

--- RealNum.java DELETED ---

--- Makefile.in DELETED ---

--- DFloNum.java DELETED ---

--- BaseUnit.java DELETED ---

--- package.html DELETED ---

--- FixedRealFormat.java DELETED ---

--- RatNum.java DELETED ---

--- BitOps.java DELETED ---

--- Complex.java DELETED ---

--- IntFraction.java DELETED ---

--- CQuantity.java DELETED ---

--- DComplex.java DELETED ---

--- Dimensions.java DELETED ---

--- COPYING DELETED ---

--- ChangeLog DELETED ---

--- Numeric.java DELETED ---

--- Unit.java DELETED ---

--- Quantity.java DELETED ---

--- DQuantity.java DELETED ---

--- Makefile.am DELETED ---

--- MPN.java DELETED ---

--- ExponentialFormat.java DELETED ---

--- MulUnit.java DELETED ---

--- NamedUnit.java DELETED ---

[Nice-commit] Nice/stdlib/nice/lang using.nice,1.2,1.3

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

Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7290/stdlib/nice/lang

Modified Files:
	using.nice 
Log Message:
Simplified test using Array.equals.


Index: using.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/using.nice,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** using.nice	27 Jan 2004 17:37:21 -0000	1.2
--- using.nice	7 Sep 2004 17:27:04 -0000	1.3
***************
*** 108,114 ****
    byte[] test = "Hello".getBytes();
    byte[] output = os.toByteArray();
!   assert test.length == output.length;
!   for(int i = 0; i < test.length; i++) {
!     assert test[i] == output[i];
!   }
  }
--- 108,111 ----
    byte[] test = "Hello".getBytes();
    byte[] output = os.toByteArray();
!   assert Arrays.equals(test, output);
  }

[Nice-commit] Nice/stdlib/nice/lang java.nice,1.58,1.59

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

Update of /cvsroot/nice/Nice/stdlib/nice/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32070/stdlib/nice/lang

Modified Files:
	java.nice 
Log Message:
Array.equals accepts null arguments.


Index: java.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/java.nice,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** java.nice	26 Aug 2004 23:45:33 -0000	1.58
--- java.nice	7 Sep 2004 16:48:58 -0000	1.59
***************
*** 369,373 ****
  <T> !T max(Collection<!T>) = native Object Collections.max(Collection);
  
! <T,U,V | U <: T, V <: T> boolean Arrays_equals(U[], V[]) = 
    native boolean Arrays.equals(Object[],Object[]);
  
--- 369,373 ----
  <T> !T max(Collection<!T>) = native Object Collections.max(Collection);
  
! <T,U,V | U <: T, V <: T> boolean Arrays_equals(U[?], V[?]) =
    native boolean Arrays.equals(Object[],Object[]);
  

[Nice-commit] Nice/src/nice/tools/doc htmlwriter.nice,1.18,1.19

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

Update of /cvsroot/nice/Nice/src/nice/tools/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14815/src/nice/tools/doc

Modified Files:
	htmlwriter.nice 
Log Message:
Make sure we don't generate another index.html, as it would overwrite
the index (with care to case-insensitive filesystems).


Index: htmlwriter.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/doc/htmlwriter.nice,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** htmlwriter.nice	5 Sep 2004 13:41:18 -0000	1.18
--- htmlwriter.nice	7 Sep 2004 12:33:18 -0000	1.19
***************
*** 414,417 ****
--- 414,423 ----
   */
  String escapeFilename(String filename) {
+     // Make sure we don't generate another index.html, as it would overwrite
+     // the index (with care to case-insensitive filesystems)
+     if (filename.equalsIgnoreCase("index"))
+       // XXX: we should make sure this is unique
+       return "_index";
+ 
      char[] chars = filename.toCharArray();
      StringBuffer buf = new StringBuffer();
***************
*** 433,435 ****
          num = "0" + num;
      return num.toUpperCase();
! }
\ No newline at end of file
--- 439,441 ----
          num = "0" + num;
      return num.toUpperCase();
! }

[Nice-commit] tester Project,1.10,1.11

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

Update of /cvsroot/nice/tester
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12574

Modified Files:
	Project 
Log Message:
Make sure nicedoc is usable in the development version

Index: Project
===================================================================
RCS file: /cvsroot/nice/tester/Project,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Project	7 May 2004 08:54:37 -0000	1.10
--- Project	7 Sep 2004 12:19:29 -0000	1.11
***************
*** 13,16 ****
    cd Nice && make
  else
!   cd Nice && make fixpoint && cp share/java/nice.jar external/nice-bootstrap.jar && make fixpoint
  fi
--- 13,16 ----
    cd Nice && make
  else
!   cd Nice && make fixpoint && cp share/java/nice.jar external/nice-bootstrap.jar && make fixpoint && make nicedoc archive
  fi

[Nice-commit] Nice/src/nice/tools/doc htmlwriter.nice,1.17,1.18

[Francis B. <fb...@us...>]

Update of /cvsroot/nice/Nice/src/nice/tools/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21111/src/nice/tools/doc

Modified Files:
	htmlwriter.nice 
Log Message:
Fixed a bug where the class hierarchy was being incorrectly html encoded.


Index: htmlwriter.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/doc/htmlwriter.nice,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** htmlwriter.nice	5 Sep 2004 12:49:39 -0000	1.17
--- htmlwriter.nice	5 Sep 2004 13:41:18 -0000	1.18
***************
*** 79,91 ****
       *         +--Class
       */
!     String hierarchy = c.getName().toString();
      for(int i = 0; i < list.size(); i++) {
        String spaces = "";
        for(int j = 0; j < (list.size()-i)*6-3; j++)
          spaces = spaces + ' ';
!       hierarchy = list.get(i).getName() + "\n" + spaces + "|\n" + spaces + "+--" + hierarchy;
      }
      writer.write("<pre>\n");
!     writer.write(htmlEncode(hierarchy));
      writer.write("</pre>\n");
  
--- 79,91 ----
       *         +--Class
       */
!     String hierarchy = htmlEncode(c.getName());
      for(int i = 0; i < list.size(); i++) {
        String spaces = "";
        for(int j = 0; j < (list.size()-i)*6-3; j++)
          spaces = spaces + ' ';
!       hierarchy = htmlEncode(list.get(i).getName()) + "\n" + spaces + "|\n" + spaces + "+--" + hierarchy;
      }
      writer.write("<pre>\n");
!     writer.write(hierarchy);
      writer.write("</pre>\n");
  

[Nice-commit] Nice/src/nice/tools/doc htmlwriter.nice,1.16,1.17

[Francis B. <fb...@us...>]

Update of /cvsroot/nice/Nice/src/nice/tools/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13153/src/nice/tools/doc

Modified Files:
	htmlwriter.nice 
Log Message:
Fixed a bug where the types in the method list where not html encoded.


Index: htmlwriter.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/doc/htmlwriter.nice,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** htmlwriter.nice	2 Sep 2004 13:52:41 -0000	1.16
--- htmlwriter.nice	5 Sep 2004 12:49:39 -0000	1.17
***************
*** 252,256 ****
          for(MethodDeclaration m : methods) {
              writer.write("<li><a href='" escapeFilename(getMethodFilename(m)) ".html'>" htmlEncode(m.getName()) "</a>" +
!                    ": " m.getType() "</li>\n");
          }
          writer.write("</ul>\n");
--- 252,256 ----
          for(MethodDeclaration m : methods) {
              writer.write("<li><a href='" escapeFilename(getMethodFilename(m)) ".html'>" htmlEncode(m.getName()) "</a>" +
!                    ": " htmlEncode(m.getType().toString()) "</li>\n");
          }
          writer.write("</ul>\n");

[Nice-commit] Nice/debian changelog,1.242,1.243

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

Update of /cvsroot/nice/Nice/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2461/debian

Modified Files:
	changelog 
Log Message:
Closed 0.9.9


Index: changelog
===================================================================
RCS file: /cvsroot/nice/Nice/debian/changelog,v
retrieving revision 1.242
retrieving revision 1.243
diff -C2 -d -r1.242 -r1.243
*** changelog	4 Sep 2004 19:04:32 -0000	1.242
--- changelog	4 Sep 2004 19:17:47 -0000	1.243
***************
*** 1,2 ****
--- 1,8 ----
+ nice (0.9.9-1) unstable; urgency=low
+ 
+   * New upstream version.
+ 
+  -- Daniel Bonniot <bo...@us...>  Sat,  4 Sep 2004 21:09:53 +0200
+ 
  nice (0.9.8-3) unstable; urgency=high
  

[Nice-commit] Nice NEWS,1.47,1.48

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

Update of /cvsroot/nice/Nice
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2461

Modified Files:
	NEWS 
Log Message:
Closed 0.9.9


Index: NEWS
===================================================================
RCS file: /cvsroot/nice/Nice/NEWS,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** NEWS	2 Sep 2004 18:23:27 -0000	1.47
--- NEWS	4 Sep 2004 19:17:48 -0000	1.48
***************
*** 46,50 ****
  	reflect this.
  
!  --
  
  nice (0.9.8)
--- 46,50 ----
  	reflect this.
  
!  -- Sat,  4 Sep 2004 21:10:36 +0200
  
  nice (0.9.8)

[Nice-commit] Nice/debian changelog,1.241,1.242

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

Update of /cvsroot/nice/Nice/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32392/debian

Modified Files:
	changelog 
Log Message:
Changelog for 0.9.8-3 in Debian.


Index: changelog
===================================================================
RCS file: /cvsroot/nice/Nice/debian/changelog,v
retrieving revision 1.241
retrieving revision 1.242
diff -C2 -d -r1.241 -r1.242
*** changelog	13 Aug 2004 15:51:15 -0000	1.241
--- changelog	4 Sep 2004 19:04:32 -0000	1.242
***************
*** 1,2 ****
--- 1,10 ----
+ nice (0.9.8-3) unstable; urgency=high
+ 
+   * Work-around kaffe's jar tool bug, which creates duplicate entries.
+     Setting urgency to high since 0.9.8-2 is mostly unusable because of this
+     bug (Closes: #268992).
+ 
+  -- Daniel Bonniot <bo...@us...>  Mon, 30 Aug 2004 11:35:58 +0200
+ 
  nice (0.9.8-2) unstable; urgency=low