nice-commit — Changes sent to CVS

[Nice-commit] Nice/src/bossa/syntax CustomConstructor.java,NONE,1.1

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

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

Added Files:
	CustomConstructor.java 
Log Message:
Parsing part for custom constructors.

--- NEW FILE: CustomConstructor.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 bossa.syntax;

import bossa.util.*;
import java.util.*;
import mlsub.typing.*;

/**
   A user defined constructor.
 */

public class CustomConstructor extends UserOperator
{
  public CustomConstructor(LocatedString className, FormalParameters params, Block body)
  {
    super(new LocatedString("<init>", className.location()), Constraint.True, 
	  new TypeIdent(className), params, Contract.noContract);

   this.className = className;
   this.body = body;

   User.error("custom constructors are not implemented yet");
  }

  public void printInterface(java.io.PrintWriter s)
  {
    s.print("new " + className + "(" + parameters + ");\n");
  }

  protected gnu.expr.Expression computeCode()
  {
    return null;
  }

  LocatedString className;
  Block body;

}

[Nice-commit] Nice/src/bossa/parser Parser.jj,1.222,1.223

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

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

Modified Files:
	Parser.jj 
Log Message:
Parsing part for custom constructors.

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.222
retrieving revision 1.223
diff -C2 -d -r1.222 -r1.223
*** Parser.jj	4 Dec 2003 23:44:32 -0000	1.222
--- Parser.jj	12 Dec 2003 14:55:01 -0000	1.223
***************
*** 1067,1070 ****
--- 1067,1100 ----
  }
  
+ CustomConstructor customConstructor():
+ {
+   LocatedString name;
+   Block block;
+   FormalParameters params;
+   List statements = new LinkedList();
+   Expression exp;
+   Statement stmt;
+ }
+ { 
+   "new" name=ident() "(" params=formalParameters(false, statements) ")"
+   ( 
+     "=" exp=Expression() ";" { statements.add(new ExpressionStmt(exp)); }
+   | 
+     "{"
+     ( stmt=BlockStatement(statements) { statements.add(stmt); } )+
+     "}"
+   |
+     ";"
+   )
+   {
+     if (statements.isEmpty()) 
+       block = null;
+     else 
+       block = new Block(statements);
+ 
+     return new CustomConstructor(name, params, block);
+   }
+ }
+ 
  AbstractInterface interfaceDefinition(Constraint prefix):
  {
***************
*** 1483,1487 ****
    |
      [ "public" | "private" ]
!     ( res=globalVariable()
      | res=enumDefinition(definitions)
      | { Constraint cst; } cst = constraint()
--- 1513,1518 ----
    |
      [ "public" | "private" ]
!     ( res=customConstructor()
!     | res=globalVariable()
      | res=enumDefinition(definitions)
      | { Constraint cst; } cst = constraint()

[Nice-commit] Nice/web roadmap.xml,1.7,1.8

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

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

Modified Files:
	roadmap.xml 
Log Message:
Added paragraph about the news file and the development version.


Index: roadmap.xml
===================================================================
RCS file: /cvsroot/nice/Nice/web/roadmap.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** roadmap.xml	6 Jun 2003 22:46:22 -0000	1.7
--- roadmap.xml	12 Dec 2003 14:54:58 -0000	1.8
***************
*** 21,24 ****
--- 21,38 ----
  
  <para>
+ You can see the features that have been implemented recently by looking
+ at the 
+ <ulink
+ url="http://cvs.sourceforge.net/viewcvs.py/nice/Nice/NEWS?rev=HEAD">
+ news file</ulink>. These features are available when using the
+ <ulink url="install.html">
+ latest released version of the compiler</ulink>, or for most recent ones, 
+ by installing the
+ <ulink
+ url="http://nice.sourceforge.net/cgi-bin/twiki/view/Dev/DevelopmentVersion">
+ latest development version</ulink>.
+ </para>
+ 
+ <para>
  <variablelist>
  <varlistentry><term>1.0</term>

[Nice-commit] Nice/src/bossa/syntax SuperExp.java,1.13,1.14 JavaClasses.java,1.41,1.42

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

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

Modified Files:
	SuperExp.java JavaClasses.java 
Log Message:
Added paragraph about the news file and the development version.


Index: SuperExp.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/SuperExp.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SuperExp.java	9 Dec 2003 15:21:05 -0000	1.13
--- SuperExp.java	12 Dec 2003 14:53:30 -0000	1.14
***************
*** 136,151 ****
              catch(Types.NotIntroducedClassException ex ) {}
  
! 	    if (superTC == null)
  	      {
! 		// Our safe bet is to assert that the argument is 
! 		// above Object
! 		superTC = JavaClasses.object
! 		  (currentMethod.firstArgument().variance.arity());
  	      }
- 
- 	    constraint = addLeq
- 	      (type.getConstraint(), 
- 	       new Pattern[]{new Pattern(superTC, false)}, 
- 	       monotype.domain());
  	  }
        }
--- 136,152 ----
              catch(Types.NotIntroducedClassException ex ) {}
  
! 	    if (superTC != null)
!               constraint = addLeq
!                 (type.getConstraint(), 
!                  new Pattern[]{new Pattern(superTC, false)}, 
!                  monotype.domain());
!             else
  	      {
! 		// Our safe bet is to assert that the argument is Object.
!                 Monotype[] domain = (Monotype[]) monotype.domain().clone();
!                 domain[0] = bossa.syntax.Monotype.sure(TopMonotype.instance);
!                 monotype = new FunType(domain, monotype.codomain());
!                 constraint = type.getConstraint();
  	      }
  	  }
        }

Index: JavaClasses.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/JavaClasses.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** JavaClasses.java	28 Nov 2003 14:01:30 -0000	1.41
--- JavaClasses.java	12 Dec 2003 14:53:30 -0000	1.42
***************
*** 511,533 ****
     ****************************************************************/
  
-   /****************************************************************
-    * List of TCs for java.lang.Object: one per variance.
-    ****************************************************************/
- 
-   private static final Vector objects = new Vector(5);
-   
-   static TypeConstructor object(int arity)
-   {
-     if(arity>=objects.size())
-       objects.setSize(arity+1);
-     
-     TypeConstructor res = (TypeConstructor) objects.get(arity);
-     if(res==null)
-       {
- 	res = make(compilation, "java.lang.Object", gnu.bytecode.Type.pointer_type);
-       }
-     return res;
-   }
-   
    /** The current compilation. This is not thread safe! */
    static bossa.modules.Compilation compilation;
--- 511,514 ----

[Nice-commit] Nice/web .htaccess,1.14,1.15

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

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

Modified Files:
	.htaccess 
Log Message:
Released 0.9.5


Index: .htaccess
===================================================================
RCS file: /cvsroot/nice/Nice/web/.htaccess,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** .htaccess	21 Nov 2003 08:55:20 -0000	1.14
--- .htaccess	11 Dec 2003 23:48:54 -0000	1.15
***************
*** 1,5 ****
  Redirect /Wiki http://nice.sourceforge.net/cgi-bin/twiki/view 
! Redirect /Nice.tar http://prdownloads.sourceforge.net/nice/Nice-0.9.4-unix.tar.gz 
! Redirect /Nice.zip http://prdownloads.sourceforge.net/nice/Nice-0.9.4-windows.zip 
! Redirect /nice.deb http://prdownloads.sourceforge.net/nice/nice_0.9.4_all.deb 
! Redirect /nice.rpm http://prdownloads.sourceforge.net/nice/Nice-0.9.4-1.noarch.rpm
--- 1,5 ----
  Redirect /Wiki http://nice.sourceforge.net/cgi-bin/twiki/view 
! Redirect /Nice.tar http://prdownloads.sourceforge.net/nice/Nice-0.9.5-unix.tar.gz 
! Redirect /Nice.zip http://prdownloads.sourceforge.net/nice/Nice-0.9.5-windows.zip 
! Redirect /nice.deb http://prdownloads.sourceforge.net/nice/nice_0.9.5-1_all.deb 
! Redirect /nice.rpm http://prdownloads.sourceforge.net/nice/Nice-0.9.5-1.noarch.rpm

[Nice-commit] Nice/stdlib/nice/lang prelude.nice,1.35,1.36 enum.nice,1.5,1.6 Native.java,1.16,1.17

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

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

Modified Files:
	prelude.nice enum.nice Native.java 
Log Message:
Removed uses of 'object(...)', which is not needed anymore.


Index: prelude.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/prelude.nice,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** prelude.nice	19 Nov 2003 16:04:45 -0000	1.35
--- prelude.nice	12 Dec 2003 12:55:25 -0000	1.36
***************
*** 77,82 ****
  /* 
     Allows to consider any nice object as an instance of java.lang.Object
  */
! <Any T> Object object(T) = native Object Native.object(Object);
  
  /** Unsafe cast operator. UNSAFE! */
--- 77,83 ----
  /* 
     Allows to consider any nice object as an instance of java.lang.Object
+    @deprecated object(...) is not needed any more: any value is an Object.
  */
! <T> ?Object object(T x) = x;
  
  /** Unsafe cast operator. UNSAFE! */

Index: enum.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/enum.nice,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** enum.nice	27 Nov 2003 23:37:08 -0000	1.5
--- enum.nice	12 Dec 2003 12:55:25 -0000	1.6
***************
*** 31,35 ****
      for (elem : this.family())
        if (this.name.equals(elem.name))
!         return object(elem);
  
      throw new InvalidObjectException("unknown enum element"); 
--- 31,35 ----
      for (elem : this.family())
        if (this.name.equals(elem.name))
!         return elem;
  
      throw new InvalidObjectException("unknown enum element"); 

Index: Native.java
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/Native.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Native.java	19 Nov 2003 16:04:46 -0000	1.16
--- Native.java	12 Dec 2003 12:55:25 -0000	1.17
***************
*** 23,28 ****
  public final class Native
  {
-   public static Object object(Object o) { return o; }  
- 
    // Operations on "polymorphic" arrays
    // Arrays of unknown component type are of type Object
--- 23,26 ----

[Nice-commit] Nice/stdlib/nice/lang/reflect methods.nice,1.2,1.3 instances.nice,1.1,1.2

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

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

Modified Files:
	methods.nice instances.nice 
Log Message:
Removed uses of 'object(...)', which is not needed anymore.


Index: methods.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/reflect/methods.nice,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** methods.nice	10 Dec 2003 23:26:25 -0000	1.2
--- methods.nice	12 Dec 2003 12:55:25 -0000	1.3
***************
*** 27,31 ****
    let cl = obj.getClass();
    let method = cl.getMethod(methodName, args.map(canonicalClass));
!   return cast( method.invoke(object(obj), args) );
  }
  
--- 27,31 ----
    let cl = obj.getClass();
    let method = cl.getMethod(methodName, args.map(canonicalClass));
!   return cast( method.invoke(obj, args) );
  }
  
***************
*** 37,41 ****
    java.io.File f2 = new java.io.File(".");
  
!   int res = f1.call("compareTo", [object(f2)]);
    assert res == 0;
  }
--- 37,41 ----
    java.io.File f2 = new java.io.File(".");
  
!   int res = f1.call("compareTo", [f2]);
    assert res == 0;
  }
***************
*** 48,52 ****
  {
    let method = obj.getClass().getMethod(methodName, null);
!   return cast( method.invoke(object(obj), null) );
  }
  
--- 48,52 ----
  {
    let method = obj.getClass().getMethod(methodName, null);
!   return cast( method.invoke(obj, null) );
  }
  
***************
*** 68,72 ****
  {
    let method = obj.getClass().getMethod(methodName, [canonicalClass(arg1)]);
!   return cast( method.invoke(object(obj), [object(arg1)]) );
  }
  
--- 68,72 ----
  {
    let method = obj.getClass().getMethod(methodName, [canonicalClass(arg1)]);
!   return cast( method.invoke(obj, [arg1]) );
  }
  

Index: instances.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/reflect/instances.nice,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** instances.nice	8 Oct 2003 17:10:18 -0000	1.1
--- instances.nice	12 Dec 2003 12:55:25 -0000	1.2
***************
*** 41,48 ****
  void _testInstances()
  {
!   _TestS tS = newInstance("nice.lang.reflect._TestS", [object("ABC")]);
    assert tS.s.equals("ABC");
  
!   _TestI tI = newInstance("nice.lang.reflect._TestI", [object(int(42))]);
    assert tI.i == 42;
  }
--- 41,48 ----
  void _testInstances()
  {
!   _TestS tS = newInstance("nice.lang.reflect._TestS", ["ABC"]);
    assert tS.s.equals("ABC");
  
!   _TestI tI = newInstance("nice.lang.reflect._TestI", [int(42)]);
    assert tI.i == 42;
  }
***************
*** 78,82 ****
    Class argClass1 = arg1.canonicalClass();
    let constructor = cl.getConstructor([argClass1]);
!   return cast(constructor.newInstance([object(arg1)]));
  }
  
--- 78,82 ----
    Class argClass1 = arg1.canonicalClass();
    let constructor = cl.getConstructor([argClass1]);
!   return cast(constructor.newInstance([arg1]));
  }
  
***************
*** 104,108 ****
    Class argClass2 = arg2.canonicalClass();
    let constructor = cl.getConstructor([argClass1, argClass2]);
!   return cast(constructor.newInstance([object(arg1),object(arg2)]));
  }
  
--- 104,108 ----
    Class argClass2 = arg2.canonicalClass();
    let constructor = cl.getConstructor([argClass1, argClass2]);
!   return cast(constructor.newInstance([arg1,arg2]));
  }
  

[Nice-commit] Nice/src/bossa/syntax analyse.nice,1.94,1.95

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

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

Modified Files:
	analyse.nice 
Log Message:
Removed uses of 'object(...)', which is not needed anymore.


Index: analyse.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/analyse.nice,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** analyse.nice	9 Dec 2003 17:20:15 -0000	1.94
--- analyse.nice	12 Dec 2003 12:55:25 -0000	1.95
***************
*** 607,611 ****
      throw new bossa.util.UserError(name, "Class " + name + " is not declared");
  
!   e.value = object(type);
    e.representedType = bossa.syntax.Node.getGlobalTypeScope().
      globalLookup(name.toString(), name.location());
--- 607,611 ----
      throw new bossa.util.UserError(name, "Class " + name + " is not declared");
  
!   e.value = type;
    e.representedType = bossa.syntax.Node.getGlobalTypeScope().
      globalLookup(name.toString(), name.location());

[Nice-commit] Nice/src/bossa/syntax NewArrayExp.java,1.17,1.18

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

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

Modified Files:
	NewArrayExp.java 
Log Message:
Restore the ability to do 'new Object[...]'.


Index: NewArrayExp.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/NewArrayExp.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** NewArrayExp.java	5 Oct 2003 14:21:33 -0000	1.17
--- NewArrayExp.java	11 Dec 2003 23:41:57 -0000	1.18
***************
*** 107,110 ****
--- 107,125 ----
  	  monotype = bossa.syntax.Monotype.maybe(raw);
        }
+     else if (resolvedType == mlsub.typing.TopMonotype.instance)
+       {
+         monotype = mlsub.typing.TopMonotype.instance;
+ 	if (nullVars != null)
+ 	  {
+ 	    monotype = MonotypeConstructor.apply(nullVars[nullVars.length - 1],
+ 						 monotype);
+ 	    cst = new Constraint(nullVars, null);
+ 	  }
+         else
+           {
+             monotype = bossa.syntax.Monotype.maybe(monotype);
+             cst = Constraint.True;
+           }
+       }
      else
        {

[Nice-commit] Nice/testsuite/compiler/typing object.testsuite,1.2,1.3

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

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

Modified Files:
	object.testsuite 
Log Message:
Restore the ability to do 'new Object[...]'.


Index: object.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/typing/object.testsuite,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** object.testsuite	8 Dec 2003 19:42:37 -0000	1.2
--- object.testsuite	11 Dec 2003 23:41:55 -0000	1.3
***************
*** 68,69 ****
--- 68,73 ----
    /// Toplevel
    void use(Object[]) {}
+ 
+ /// PASS
+   ?Object[] o1 = new Object[1];
+   Object[] o0 = new Object[0];

[Nice-commit] Nice/debian changelog,1.235,1.236

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

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

Modified Files:
	changelog 
Log Message:
Updated date.


Index: changelog
===================================================================
RCS file: /cvsroot/nice/Nice/debian/changelog,v
retrieving revision 1.235
retrieving revision 1.236
diff -C2 -d -r1.235 -r1.236
*** changelog	10 Dec 2003 19:18:18 -0000	1.235
--- changelog	11 Dec 2003 15:06:41 -0000	1.236
***************
*** 3,5 ****
    * Initial release officially in Debian.
  
!  -- Daniel Bonniot <bo...@us...>  Wed, 10 Dec 2003 20:11:47 +0100
--- 3,5 ----
    * Initial release officially in Debian.
  
!  -- Daniel Bonniot <bo...@us...>  Thu, 11 Dec 2003 16:05:34 +0100

[Nice-commit] Nice NEWS,1.7,1.8

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

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

Modified Files:
	NEWS 
Log Message:
Reorganized, and typos.


Index: NEWS
===================================================================
RCS file: /cvsroot/nice/Nice/NEWS,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NEWS	10 Dec 2003 19:18:18 -0000	1.7
--- NEWS	11 Dec 2003 15:06:08 -0000	1.8
***************
*** 1,4 ****
--- 1,16 ----
  nice (0.9.5)
  
+   * Added new syntax for patterns in method implementations.
+     'Type param' for 'param@Type' and '#Type param' for 'param#Type
+     example usage:
+       class Dummy {
+ 	int x;
+ 	equals(Dummy other) = this.x == other.x;
+       }
+     This syntax should be more consistent and familiar, and is now
+     prefered to the old one, which will eventually be deprecated.
+   * Object is now recognized as a super-type of every type. This allows
+     easier use of Java libraries, creation of heterogeneous collections,
+     and type-safe handling of values with unknown types.
    * String concatenation can be performed by mere juxtaposition of string
      literals and simple expressions, which are converted into strings. For
***************
*** 14,35 ****
    * Enums are serializable now and have a family() method that returns a list
      of all elements in that enum.
!   * Reduced memory usage when doing multiple compilations in one jvm.
!   * The compiler is now more clever about loading imported Java classes
!     only if they are actually used. This reduces memory usage and improves
!     compilation speed.
!   * Added alternative syntax for patterns in method implementations.
!     'Type param' for 'param@Type' and '#Type param' for 'param#Type
!     example usage:
!       class Dummy {
! 	int x;
! 	equals(Dummy other) = this.x == other.x;
!       }
!   * Object is now recognized as a super-type of every type. This allows
!     easier use of Java libraries, creation of heterogeneous collections,
!     and type-safe handling of values with unknown types.
!   * Simplified some complex type in error messages.
    * Safe dynamic type inference in presence of anonymous and local functions.
-   * Reduced memory usage when repeatedly compiling in the same JVM (eclipse
-     plugin, ant, testsuite, ...).
    * Unused local variables will give a warning.
    * Nested multi-line comments are allowed.
--- 26,31 ----
    * Enums are serializable now and have a family() method that returns a list
      of all elements in that enum.
!   * Simplified some complex types in error messages.
    * Safe dynamic type inference in presence of anonymous and local functions.
    * Unused local variables will give a warning.
    * Nested multi-line comments are allowed.
***************
*** 38,41 ****
--- 34,42 ----
      statements are very rarely needed, and can easily be replaced by '{}'.
    * The Emacs mode is updated to work with recent versions of GNU and XEmacs.
+   * Reduced memory usage when repeatedly compiling in the same JVM (eclipse
+     plugin, ant, testsuite, ...).
+   * The compiler is now more clever about loading imported Java classes
+     only if they are actually used. This reduces memory usage and improves
+     compilation speed.
    * Bug fixes (accessing static fields of an superclass or interface, 
      compilation of polymorphic tuples, captured 'this' in initializer, 
***************
*** 43,47 ****
      recompilation, ... )
  
!  -- Wed, 10 Dec 2003 20:17:43 +0100
  
  nice (0.9.4)
--- 44,48 ----
      recompilation, ... )
  
!  -- Thu, 11 Dec 2003 16:05:18 +0100
  
  nice (0.9.4)

[Nice-commit] Nice/distrib Makefile,1.9,1.10

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

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

Modified Files:
	Makefile 
Log Message:
The name of the deb now includes the revision.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/distrib/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile	10 Dec 2003 19:16:52 -0000	1.9
--- Makefile	11 Dec 2003 15:00:36 -0000	1.10
***************
*** 6,10 ****
  CVS_TAG = $(shell echo -n "version_$(VERSION)" | tr -c -- "-_a-zA-Z0-9" "_")
  
! DEB = nice_${VERSION}_all.deb
  
  BUILDROOT = nice-$(VERSION)
--- 6,10 ----
  CVS_TAG = $(shell echo -n "version_$(VERSION)" | tr -c -- "-_a-zA-Z0-9" "_")
  
! DEB = nice_${FULL_DEB_VERSION}_all.deb
  
  BUILDROOT = nice-$(VERSION)

[Nice-commit] Nice/stdlib/nice/lang/reflect methods.nice,1.1,1.2

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

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

Modified Files:
	methods.nice 
Log Message:
More robust test.


Index: methods.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/reflect/methods.nice,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** methods.nice	8 Oct 2003 17:10:18 -0000	1.1
--- methods.nice	10 Dec 2003 23:26:25 -0000	1.2
***************
*** 57,62 ****
    java.io.File f = new java.io.File(".");
  
!   String res = f.call("getCanonicalPath");
!   assert res.equals(".");
  }
  
--- 57,62 ----
    java.io.File f = new java.io.File(".");
  
!   String res = f.call("getPath");
!   assert res.equals(".") : res;
  }
  

[Nice-commit] Nice/regtest/java retyping.nice,NONE,1.1

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

Update of /cvsroot/nice/Nice/regtest/java
In directory sc8-pr-cvs1:/tmp/cvs-serv16565/regtest/java

Added Files:
	retyping.nice 
Log Message:
Made sure that ignored retypings do not cause failures when implementing
a method with the same name.


--- NEW FILE: retyping.nice ---
package regtest.java;

// We define an invalid retyping.
// Then we override a method with the same name, so that the retyped
// method should normally be considered.

void init(regtest.java.J.J, Map<int, int>) = 
  native void regtest.java.J.J.init(WrongName);

class Ret1 {
  void init(String) {}
}

class Ret2 extends Ret1 {
  init(m) {}
}

[Nice-commit] Nice/regtest/java/J J.java,1.2,1.3

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

Update of /cvsroot/nice/Nice/regtest/java/J
In directory sc8-pr-cvs1:/tmp/cvs-serv16565/regtest/java/J

Modified Files:
	J.java 
Log Message:
Made sure that ignored retypings do not cause failures when implementing
a method with the same name.


Index: J.java
===================================================================
RCS file: /cvsroot/nice/Nice/regtest/java/J/J.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** J.java	3 Dec 2003 21:50:41 -0000	1.2
--- J.java	10 Dec 2003 22:34:25 -0000	1.3
***************
*** 5,7 ****
--- 5,9 ----
  
    void jMethod(Other o) {}
+ 
+   public void init(java.util.Map m) {}
  }

[Nice-commit] Nice/src/bossa/syntax MethodBodyDefinition.java,1.145,1.146

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

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

Modified Files:
	MethodBodyDefinition.java 
Log Message:
Made sure that ignored retypings do not cause failures when implementing
a method with the same name.


Index: MethodBodyDefinition.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/MethodBodyDefinition.java,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** MethodBodyDefinition.java	28 Nov 2003 14:01:29 -0000	1.145
--- MethodBodyDefinition.java	10 Dec 2003 22:34:25 -0000	1.146
***************
*** 146,149 ****
--- 146,154 ----
        
        MethodDeclaration m = s.getMethodDeclaration();
+       if (m.isIgnored())
+         {
+           i.remove();
+           continue;
+         }
  
        if (m.getArity() != formals.length

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

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

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

Modified Files:
	main.nice 
Log Message:
Removed unused variable.


Index: main.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/compiler/console/main.nice,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main.nice	31 Aug 2003 09:06:08 -0000	1.5
--- main.nice	10 Dec 2003 19:29:05 -0000	1.6
***************
*** 47,51 ****
    ?String nativeProgram = null;
    ?String nativeCompiler = null;
-   ?String classpath = null;
    boolean editorMode = false;
  
--- 47,50 ----

[Nice-commit] Nice NEWS,1.6,1.7

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

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

Modified Files:
	NEWS 
Log Message:
Closed 0.9.5


Index: NEWS
===================================================================
RCS file: /cvsroot/nice/Nice/NEWS,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NEWS	10 Dec 2003 14:31:19 -0000	1.6
--- NEWS	10 Dec 2003 19:18:18 -0000	1.7
***************
*** 43,47 ****
      recompilation, ... )
  
!  --
  
  nice (0.9.4)
--- 43,47 ----
      recompilation, ... )
  
!  -- Wed, 10 Dec 2003 20:17:43 +0100
  
  nice (0.9.4)

[Nice-commit] Nice/debian changelog,1.234,1.235

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

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

Modified Files:
	changelog 
Log Message:
Closed 0.9.5


Index: changelog
===================================================================
RCS file: /cvsroot/nice/Nice/debian/changelog,v
retrieving revision 1.234
retrieving revision 1.235
diff -C2 -d -r1.234 -r1.235
*** changelog	30 Nov 2003 11:22:27 -0000	1.234
--- changelog	10 Dec 2003 19:18:18 -0000	1.235
***************
*** 1,5 ****
! nice (0.9.4+031130-1) unstable; urgency=low
  
    * Initial release officially in Debian.
  
!  -- Daniel Bonniot <bo...@us...>  Sun, 30 Nov 2003 12:14:49 +0100
--- 1,5 ----
! nice (0.9.5-1) unstable; urgency=low
  
    * Initial release officially in Debian.
  
!  -- Daniel Bonniot <bo...@us...>  Wed, 10 Dec 2003 20:11:47 +0100

[Nice-commit] Nice/distrib Makefile,1.8,1.9

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

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

Modified Files:
	Makefile 
Log Message:
Tag with only the upstream version, not the Debian revision.

Delete the CVS tag before setting it, so that if a file was removed between
two taggings it does not keep the tag.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/distrib/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	12 Nov 2003 21:39:04 -0000	1.8
--- Makefile	10 Dec 2003 19:16:52 -0000	1.9
***************
*** 1,7 ****
  # Get the version from the debian changelog.
! VERSION = ${shell expr "`head -1 ../debian/changelog`" : '.*(\(.*\))'}
! TAG = $(shell echo -n "version_$(VERSION)" | tr -c -- "-_a-zA-Z0-9" "_")
  
- DEBVERSION = ${shell expr "$(VERSION)" : '.*-\([0-9]\)'}
  DEB = nice_${VERSION}_all.deb
  
--- 1,9 ----
  # Get the version from the debian changelog.
! FULL_DEB_VERSION = ${shell expr "`head -1 ../debian/changelog`" : '.*(\(.*\))'}
! VERSION = ${shell expr "$(FULL_DEB_VERSION)" : '\(.*\)-[^-]*'}
! DEBIAN_REVISION = ${shell expr "$(FULL_DEB_VERSION)" : '.*-\([^-]*\)'}
! 
! CVS_TAG = $(shell echo -n "version_$(VERSION)" | tr -c -- "-_a-zA-Z0-9" "_")
  
  DEB = nice_${VERSION}_all.deb
  
***************
*** 29,34 ****
  	@echo Creating Debian package version ${VERSION}
  	rm -rf $(BUILDROOT) $(BUILDROOT).orig
! 	cd .. && cvs tag -F $(TAG)
! 	CVSROOT=$(CVSROOT) cvs export -d $(BUILDROOT).orig -r $(TAG) Nice
  	mv -f $(BUILDROOT).orig/debian $(BUILDROOT).orig-debian
  	find $(BUILDROOT).orig -name '.cvsignore' | xargs rm
--- 31,36 ----
  	@echo Creating Debian package version ${VERSION}
  	rm -rf $(BUILDROOT) $(BUILDROOT).orig
! 	cd .. && cvs tag -d $(CVS_TAG) && cvs tag $(CVS_TAG)
! 	CVSROOT=$(CVSROOT) cvs export -d $(BUILDROOT).orig -r $(CVS_TAG) Nice
  	mv -f $(BUILDROOT).orig/debian $(BUILDROOT).orig-debian
  	find $(BUILDROOT).orig -name '.cvsignore' | xargs rm

[Nice-commit] Nice NEWS,1.5,1.6

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

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

Modified Files:
	NEWS 
Log Message:
Made the Emacs mode work on XEmacs, which probably also fixes problems with
recent versions of GNU Emacs.


Index: NEWS
===================================================================
RCS file: /cvsroot/nice/Nice/NEWS,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NEWS	8 Dec 2003 20:54:23 -0000	1.5
--- NEWS	10 Dec 2003 14:31:19 -0000	1.6
***************
*** 37,40 ****
--- 37,41 ----
      risk of an accidental ';' changing the meaning of a statement. Empty 
      statements are very rarely needed, and can easily be replaced by '{}'.
+   * The Emacs mode is updated to work with recent versions of GNU and XEmacs.
    * Bug fixes (accessing static fields of an superclass or interface, 
      compilation of polymorphic tuples, captured 'this' in initializer, 

[Nice-commit] Nice/lib/emacs nice-mode.el,1.31,1.32

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

Update of /cvsroot/nice/Nice/lib/emacs
In directory sc8-pr-cvs1:/tmp/cvs-serv20006/lib/emacs

Modified Files:
	nice-mode.el 
Log Message:
Made the Emacs mode work on XEmacs, which probably also fixes problems with
recent versions of GNU Emacs.


Index: nice-mode.el
===================================================================
RCS file: /cvsroot/nice/Nice/lib/emacs/nice-mode.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** nice-mode.el	31 Jul 2003 18:45:35 -0000	1.31
--- nice-mode.el	10 Dec 2003 14:31:19 -0000	1.32
***************
*** 51,55 ****
  (defconst nice-extension-regexp "\\.nice$")
  
! (defvar nice-compile-buffer "*Nice*"
    "Name of buffer fo Nice compilations")
  
--- 51,55 ----
  (defconst nice-extension-regexp "\\.nice$")
  
! (defvar nice-compilation-buffer "*Nice*"
    "Name of buffer fo Nice compilations")
  
***************
*** 321,327 ****
  (defconst c-Nice-comment-start-regexp "/\\(/\\|[*][*]?\\)")
  
  (defconst c-Nice-class-key
    (concat
!    "\\(" c-protection-key "\\s +\\)?"
     "\\(interface\\|class\\|device\\)\\s +"
     c-symbol-key                         ;name of the class
--- 321,329 ----
  (defconst c-Nice-comment-start-regexp "/\\(/\\|[*][*]?\\)")
  
+ (defconst c-Nice-protection-key "\\<\\(public\\|private\\)\\>")
+ 
  (defconst c-Nice-class-key
    (concat
!    "\\(" c-Nice-protection-key "\\s +\\)?"
     "\\(interface\\|class\\|device\\)\\s +"
     c-symbol-key                         ;name of the class
***************
*** 425,428 ****
--- 427,431 ----
    ;(make-local-variable 'compilation-exit-message-function)
    (setq compilation-exit-message-function 'nice-compilation-exit)
+   (setq compilation-finish-function 'nice-compilation-finish-function)
  
    (local-set-key "\C-c\C-b" 'nice-compile-buffer)
***************
*** 498,503 ****
      (if nice-process
          (delete-process nice-process))
!     (if (get-buffer nice-compile-buffer)
!         (kill-buffer nice-compile-buffer))
      (save-buffer)
  
--- 501,506 ----
      (if nice-process
          (delete-process nice-process))
!     (if (get-buffer nice-compilation-buffer)
!         (kill-buffer nice-compilation-buffer))
      (save-buffer)
  
***************
*** 519,523 ****
      (setq default-directory nice-directory)
  
!     (setq nice-compile-buffer (compile-internal cmd "No more errors"))
  
      ;; Start process
--- 522,526 ----
      (setq default-directory nice-directory)
  
!     (setq nice-compilation-buffer (compile-internal cmd "No more errors"))
  
      ;; Start process
***************
*** 526,539 ****
      ;(setq nice-compiling t)
      ;; Display the compilation buffer
!     ;(display-buffer nice-compile-buffer)
    )
  )
  
! (defun nice-compilation-exit (process-status exit-status exit-message)
    (cond 
!     ((eq exit-status 0) 
!      (let ((win (get-buffer-window nice-compile-buffer)))
!        (if win (delete-window win)))
!      '("successful" . "OK"))
      ((eq exit-status 1) '("Compiler bug" . "Bug"))
      ((eq exit-status 2) (save-excursion (next-error) '("error" . "error")))
--- 529,550 ----
      ;(setq nice-compiling t)
      ;; Display the compilation buffer
!     ;(display-buffer nice-compilation-buffer)
    )
  )
  
! (defun nice-remove-empty (l)
!   (if l 
!       (if (equal (car l) "") 
! 	  (nice-remove-empty (cdr l)) (cons (car l) (nice-remove-empty (cdr l))))
!     nil))
! 
! (defun nice-compilation-exit (process-status exit-status &optional exit-message)
! ; XEmacs (21.4) does not seem to always provide exit-message
! ; and its exit-status is a string like "Exited with status code X".
!   (let ((exit-status 
! 	 (if (integerp exit-status) exit-status
! 	   (string-to-number (car (last (nice-remove-empty (split-string exit-status))))))))
    (cond 
!     ((eq exit-status 0) '("successful" . "OK"))
      ((eq exit-status 1) '("Compiler bug" . "Bug"))
      ((eq exit-status 2) (save-excursion (next-error) '("error" . "error")))
***************
*** 541,544 ****
--- 552,564 ----
      (t '("Unknown exit status" . ""))
    ) 
+ ))
+ 
+ (defun nice-compilation-finish-function (buffer result)
+   "Handle the end of a Nice compilation."
+   (let ((ok 
+ 	 (if (integerp result)
+ 	     (eq result 0)
+ 	     (not (string-match "abnormally" result)))))
+     (if ok (delete-window (get-buffer-window buffer))))
  )
  
***************
*** 546,550 ****
    "Find next Nice error."
    (interactive)
!   (let ((buffer (get-buffer nice-compile-buffer))
          start file l1 c1 l2 c2)
      (if (not buffer)
--- 566,570 ----
    "Find next Nice error."
    (interactive)
!   (let ((buffer (get-buffer nice-compilation-buffer))
          start file l1 c1 l2 c2)
      (if (not buffer)
***************
*** 675,679 ****
  ;; Return the root a of package given a file of the package
  (defun nice-root (file)
!   (let* ((spl (split-string file "/"))
  	 (pkg (split-string (nice-buffer-pkg-name) "[.]"))
  	 (nlevels (length pkg)))
--- 695,700 ----
  ;; Return the root a of package given a file of the package
  (defun nice-root (file)
! ; Under XEmacs (21.4), split-string returns leading and trailing "" elements.
!   (let* ((spl (nice-remove-empty (split-string file "/")))
  	 (pkg (split-string (nice-buffer-pkg-name) "[.]"))
  	 (nlevels (length pkg)))
***************
*** 1189,1193 ****
    (let (process
          (default-directory dir))
!     (setq process (apply #'start-process "nice" nice-compile-buffer (car cmd) (cdr cmd)))
      (set-process-filter process 'nice-process-filter)
      (set-process-sentinel process 'nice-process-sentinel)
--- 1210,1214 ----
    (let (process
          (default-directory dir))
!     (setq process (apply #'start-process "nice" nice-compilation-buffer (car cmd) (cdr cmd)))
      (set-process-filter process 'nice-process-filter)
      (set-process-sentinel process 'nice-process-sentinel)
***************
*** 1265,1269 ****
    (if (string-match "^[0-9]+$" name)
        (save-excursion
!         (set-buffer nice-compile-buffer)
          (goto-char (point-max))
          (if (nice-search-backward
--- 1286,1290 ----
    (if (string-match "^[0-9]+$" name)
        (save-excursion
!         (set-buffer nice-compilation-buffer)
          (goto-char (point-max))
          (if (nice-search-backward

[Nice-commit] Nice/web new.xsl,1.14,1.15

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

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

Modified Files:
	new.xsl 
Log Message:
Added icon for development.


Index: new.xsl
===================================================================
RCS file: /cvsroot/nice/Nice/web/new.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** new.xsl	12 Nov 2003 17:52:00 -0000	1.14
--- new.xsl	9 Dec 2003 18:25:45 -0000	1.15
***************
*** 179,183 ****
          <table border="0" cellpadding="3" cellspacing="1" width="100%">
           <tr>
!           <td bgcolor="#cccccc">
             &nbsp;<span class="title">Development</span>
            </td>
--- 179,183 ----
          <table border="0" cellpadding="3" cellspacing="1" width="100%">
           <tr>
!           <td bgcolor="#cccccc"><img width="48" height="48" align="middle" src="images/dev-48.png" alt="."/>
             &nbsp;<span class="title">Development</span>
            </td>

[Nice-commit] Nice/web/images dev-48.png,NONE,1.1

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

Update of /cvsroot/nice/Nice/web/images
In directory sc8-pr-cvs1:/tmp/cvs-serv18392/web/images

Added Files:
	dev-48.png 
Log Message:
Added icon for development.


--- NEW FILE: dev-48.png ---
(This appears to be a binary file; contents omitted.)