nice-commit — Changes sent to CVS

[Nice-commit] Nice/stdlib/nice/lang Native.java,1.14,1.15

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

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

Modified Files:
	Native.java 
Log Message:
Changed the license in Native.java to LGPL.

Index: Native.java
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/Native.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Native.java	23 Mar 2003 00:05:48 -0000	1.14
--- Native.java	27 Sep 2003 11:51:52 -0000	1.15
***************
*** 2,11 ****
  /*                                N I C E                                 */
  /*             A high-level object-oriented research language             */
! /*                        (c) Daniel Bonniot 2000                         */
  /*                                                                        */
! /*  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.                                   */
  /*                                                                        */
  /**************************************************************************/
--- 2,11 ----
  /*                                N I C E                                 */
  /*             A high-level object-oriented research language             */
! /*                        (c) Daniel Bonniot 2003                         */
  /*                                                                        */
! /*  This package is free software; you can redistribute it and/or modify  */
! /*  it under the terms of the GNU Lesser General Public License as        */
! /*  published by the Free Software Foundation; either version 2 of the    */
! /*  License, or (at your option) any later version.                       */
  /*                                                                        */
  /**************************************************************************/

[Nice-commit] swing/src/nice/ui/common SwingSupport.nice,1.3,1.4

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

Update of /cvsroot/nice/swing/src/nice/ui/common
In directory sc8-pr-cvs1:/tmp/cvs-serv8497/D:/nice/nice/ui/common

Modified Files:
	SwingSupport.nice 
Log Message:
Making NiceSwing compile again with the latest compiler.

Index: SwingSupport.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/SwingSupport.nice,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SwingSupport.nice	13 Nov 2002 02:22:29 -0000	1.3
--- SwingSupport.nice	27 Sep 2003 00:03:33 -0000	1.4
***************
*** 100,105 ****
  class javax.swing.text.AbstractDocument implements UndoableEditListenerHandler;
  class javax.swing.table.TableColumn implements PropertyChangeListenerHandler;
! class javax.swing.table.TableColumnModel implements TableColumnModelListenerHandler;
! class javax.swing.table.TableModel implements TableModelListenerHandler;
  class javax.swing.tree.DefaultTreeSelectionModel implements PropertyChangeListenerHandler;
  class javax.swing.tree.DefaultTreeSelectionModel implements TreeSelectionListenerHandler;
--- 100,105 ----
  class javax.swing.text.AbstractDocument implements UndoableEditListenerHandler;
  class javax.swing.table.TableColumn implements PropertyChangeListenerHandler;
! interface javax.swing.table.TableColumnModel implements TableColumnModelListenerHandler;
! interface javax.swing.table.TableModel implements TableModelListenerHandler;
  class javax.swing.tree.DefaultTreeSelectionModel implements PropertyChangeListenerHandler;
  class javax.swing.tree.DefaultTreeSelectionModel implements TreeSelectionListenerHandler;

[Nice-commit] Nice/src/bossa/link Alternative.java,1.43,1.44 Dispatch.java,1.62,1.63

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

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

Modified Files:
	Alternative.java Dispatch.java 
Log Message:
fix for bug #803972, incorrect error messages by dispatch tests of integer comparisons.

Index: Alternative.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/Alternative.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Alternative.java	3 Sep 2003 22:32:10 -0000	1.43
--- Alternative.java	26 Sep 2003 23:12:36 -0000	1.44
***************
*** 126,129 ****
--- 126,137 ----
    }
  
+   boolean containsTypeMatchingValue()
+   {
+     for(int i = 0; i < patterns.length; i++)
+       if (patterns[i].atTypeMatchingValue())
+ 	return true;
+ 
+     return false;
+   }
  
    /****************************************************************

Index: Dispatch.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/link/Dispatch.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** Dispatch.java	11 Sep 2003 20:56:35 -0000	1.62
--- Dispatch.java	26 Sep 2003 23:12:36 -0000	1.63
***************
*** 235,239 ****
  	  if (first == null)
  	    first = a;
! 	  else if (!Alternative.less(first, a))
  	    {
  	      failed = true;
--- 235,240 ----
  	  if (first == null)
  	    first = a;
! 	  else if (!Alternative.less(first, a) &&
! 		   !a.containsTypeMatchingValue())
  	    {
  	      failed = true;

[Nice-commit] Nice/src/bossa/syntax Pattern.java,1.71,1.72

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

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

Modified Files:
	Pattern.java 
Log Message:
fix for bug #803972, incorrect error messages by dispatch tests of integer comparisons.

Index: Pattern.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Pattern.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** Pattern.java	11 Sep 2003 20:50:27 -0000	1.71
--- Pattern.java	26 Sep 2003 23:12:36 -0000	1.72
***************
*** 385,394 ****
  
      if (this.atEnum() && that.atEnum())
!       return this.atValue.toString().compareTo(that.atValue.toString()) < 0;
  
      if (this.atIntCompare() && that.atIntCompare())
        {
  	if (this.atLess() != that.atLess())
! 	  return atLess();
  
          long val = this.atValue.longValue();
--- 385,394 ----
  
      if (this.atEnum() && that.atEnum())
!       return false;
  
      if (this.atIntCompare() && that.atIntCompare())
        {
  	if (this.atLess() != that.atLess())
! 	  return false;
  
          long val = this.atValue.longValue();
***************
*** 842,844 ****
--- 842,845 ----
    public boolean atIntCompare() { return compareKind > 0;}
    public boolean atLess() { return compareKind == LT || compareKind == LE; }
+   public boolean atTypeMatchingValue() { return atEnum() || atIntCompare(); }
  }

[Nice-commit] Nice/testsuite/compiler/native synchronized.testsuite,1.2,1.3

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

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

Modified Files:
	synchronized.testsuite 
Log Message:
fix for bug #807462 resolving overloading in synchronized statement.

Index: synchronized.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/native/synchronized.testsuite,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** synchronized.testsuite	21 Oct 2002 17:14:36 -0000	1.2
--- synchronized.testsuite	17 Sep 2003 00:14:06 -0000	1.3
***************
*** 26,27 ****
--- 26,43 ----
    }
  }
+ 
+ /// PASS
+   /// Toplevel
+   class SharedBuffer {}
+ 
+   class Producer extends Thread {
+     SharedBuffer buffer;
+     run() { } 
+   }
+ 
+   class Consumer extends Thread {
+     SharedBuffer buffer;
+     run() {
+       synchronized(buffer) { }
+     } 
+   }

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

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

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

Modified Files:
	typecheck.nice 
Log Message:
fix for bug #807462 resolving overloading in synchronized statement.

Index: typecheck.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/typecheck.nice,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** typecheck.nice	30 Aug 2003 15:53:33 -0000	1.77
--- typecheck.nice	17 Sep 2003 00:14:06 -0000	1.78
***************
*** 724,727 ****
--- 724,728 ----
  typecheck(s@SynchronizedStmt)
  {
+   s.object = notNull(s.object).noOverloading();
    mlsub.typing.Polytype type = notNull(s.object).getType();
    if (isPrimitive(type))

[Nice-commit] Nice/stdlib/nice/lang prelude.nice,1.33,1.34

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

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

Modified Files:
	prelude.nice 
Log Message:
Added retypings for wait and notify.

Index: prelude.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/prelude.nice,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** prelude.nice	26 Aug 2003 16:07:58 -0000	1.33
--- prelude.nice	16 Sep 2003 18:38:11 -0000	1.34
***************
*** 98,103 ****
  }
  
- 
- 
  <T> int hashCode(!T) = native int Object.hashCode();
  
--- 98,101 ----
***************
*** 105,108 ****
--- 103,112 ----
  <Any T> String valueOf(T) = native String String.valueOf(Object);
  <Any T> Class getClass(!T) = native Class Object.getClass();
+ 
+ <Any T> void wait(!T) = native void Object.wait();
+ <Any T> void wait(!T, long) = native void Object.wait(long);
+ <Any T> void wait(!T, long, int) = native void Object.wait(long, int);
+ <Any T> void notify(!T) = native void Object.notify();
+ <Any T> void notifyAll(!T) = native void Object.notifyAll();
  
  /** 

[Nice-commit] Nice/src/bossa/syntax AbstractInterfaceImplementation.java,1.3,1.4

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

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

Modified Files:
	AbstractInterfaceImplementation.java 
Log Message:
Implemented the difference between classes and interface when implementing an abstract interface.

Index: AbstractInterfaceImplementation.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/AbstractInterfaceImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractInterfaceImplementation.java	17 Feb 2003 15:42:03 -0000	1.3
--- AbstractInterfaceImplementation.java	15 Sep 2003 22:29:21 -0000	1.4
***************
*** 30,36 ****
    final LocatedString interfaceName;
    final boolean _finally;
  
    public AbstractInterfaceImplementation
!     (LocatedString className, LocatedString interfaceName, boolean _finally)
    {
      super(className, Node.none);
--- 30,38 ----
    final LocatedString interfaceName;
    final boolean _finally;
+   final boolean _interface;
  
    public AbstractInterfaceImplementation
!     (LocatedString className, LocatedString interfaceName, boolean _finally,
! 		boolean _interface)
    {
      super(className, Node.none);
***************
*** 39,42 ****
--- 41,45 ----
      this.interfaceName = interfaceName;
      this._finally = _finally;
+     this._interface = _interface;
    }
  
***************
*** 47,50 ****
--- 50,63 ----
    {
      classTC = new TypeIdent(className).resolveToTC(typeScope);
+ 
+     if (TypeConstructors.isInterface(classTC))
+       {
+         if (!_interface) User.error(this, ""+classTC+" is not an class");
+       }
+     else
+       {
+         if (_interface) User.error(this, ""+classTC+" is not an interface");
+       }
+ 
      TypeIdent ident = new TypeIdent
        (new LocatedString(module.getName() + '.' + interfaceName.content, 
***************
*** 71,75 ****
    public void printInterface(java.io.PrintWriter w)
    {
!     w.print("class ");
      w.print(classTC);
      w.print(" implements ");
--- 84,92 ----
    public void printInterface(java.io.PrintWriter w)
    {
!     if (_interface)
!       w.print("interface ");
!     else 
!       w.print("class ");
! 
      w.print(classTC);
      w.print(" implements ");

[Nice-commit] Nice/debian changelog,1.209,1.210

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

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

Modified Files:
	changelog 
Log Message:
Implemented the difference between classes and interface when implementing an abstract interface.

Index: changelog
===================================================================
RCS file: /cvsroot/nice/Nice/debian/changelog,v
retrieving revision 1.209
retrieving revision 1.210
diff -C2 -d -r1.209 -r1.210
*** changelog	13 Sep 2003 00:43:06 -0000	1.209
--- changelog	15 Sep 2003 22:29:21 -0000	1.210
***************
*** 1,2 ****
--- 1,9 ----
+ nice (0.9.3) unstable; urgency=low
+ 
+   * Existing interfaces can like classes implement abstract interfaces:
+       interface packagename.SomeInterface implements AbstractInterface;
+ 
+  --
+ 
  nice (0.9.2) unstable; urgency=low
  

[Nice-commit] Nice/testsuite/compiler/abstractInterfaces existingClass.testsuite,1.3,1.4

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

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

Modified Files:
	existingClass.testsuite 
Log Message:
Implemented the difference between classes and interface when implementing an abstract interface.

Index: existingClass.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/abstractInterfaces/existingClass.testsuite,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** existingClass.testsuite	17 Feb 2003 15:40:59 -0000	1.3
--- existingClass.testsuite	15 Sep 2003 22:29:21 -0000	1.4
***************
*** 60,61 ****
--- 60,76 ----
    class java.io.File implements I;
    f(f...@ja...le) = new java.io.File("foo");
+ 
+ /// PASS
+   /// Toplevel
+   abstract interface AI {}
+   interface java.io.FileFilter implements AI;
+ 
+ /// FAIL
+   /// Toplevel
+   abstract interface AI {}
+   class java.io.FileFilter implements AI;
+ 
+ /// FAIL
+   /// Toplevel
+   abstract interface AI {}
+   interface java.lang.Object implements AI;

[Nice-commit] Nice/src/bossa/parser Parser.jj,1.207,1.208

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

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

Modified Files:
	Parser.jj 
Log Message:
Implemented the difference between classes and interface when implementing an abstract interface.

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** Parser.jj	11 Sep 2003 20:50:27 -0000	1.207
--- Parser.jj	15 Sep 2003 22:29:21 -0000	1.208
***************
*** 1065,1074 ****
    LocatedString className, interfaceName;
    boolean _finally = false;
  }
  {
!   "class" className=fullyQualifiedName()
    [ "finally" { _finally = true; } ]
    "implements" interfaceName=ident() ";"
!   { return new AbstractInterfaceImplementation(className, interfaceName, _finally); }
  }
  
--- 1065,1078 ----
    LocatedString className, interfaceName;
    boolean _finally = false;
+   boolean _interface = false;
  }
  {
!   ( "class" | "interface" {_interface = true;} )
!   className=fullyQualifiedName()
    [ "finally" { _finally = true; } ]
    "implements" interfaceName=ident() ";"
!   { return new AbstractInterfaceImplementation(className, interfaceName,
! 		_finally, _interface);
!   }
  }
  
***************
*** 1423,1427 ****
      res=interfaceDefinition()
    |
!     LOOKAHEAD( "class" fullyQualifiedName() )
      res=abstractInterfaceImplementation()
    | 
--- 1427,1431 ----
      res=interfaceDefinition()
    |
!     LOOKAHEAD( ("class" | "interface") fullyQualifiedName() )
      res=abstractInterfaceImplementation()
    | 

[Nice-commit] Nice/web .htaccess,1.11,1.12

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

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

Modified Files:
	.htaccess 
Log Message:
Released 0.9.2


Index: .htaccess
===================================================================
RCS file: /cvsroot/nice/Nice/web/.htaccess,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** .htaccess	25 Aug 2003 22:27:14 -0000	1.11
--- .htaccess	13 Sep 2003 04:51:11 -0000	1.12
***************
*** 1,5 ****
  Redirect /Wiki http://nice.sourceforge.net/cgi-bin/twiki/view 
! Redirect /Nice.tar http://prdownloads.sourceforge.net/nice/Nice-0.9.1-unix.tar.gz 
! Redirect /Nice.zip http://prdownloads.sourceforge.net/nice/Nice-0.9.1-windows.zip 
! Redirect /nice.deb http://prdownloads.sourceforge.net/nice/nice_0.9.1_all.deb 
! Redirect /nice.rpm http://prdownloads.sourceforge.net/nice/Nice-0.9.1-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.2-unix.tar.gz 
! Redirect /Nice.zip http://prdownloads.sourceforge.net/nice/Nice-0.9.2-windows.zip 
! Redirect /nice.deb http://prdownloads.sourceforge.net/nice/nice_0.9.2_all.deb 
! Redirect /nice.rpm http://prdownloads.sourceforge.net/nice/Nice-0.9.2-1.noarch.rpm

[Nice-commit] Nice/debian changelog,1.208,1.209

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

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

Modified Files:
	changelog 
Log Message:
Closed 0.9.2


Index: changelog
===================================================================
RCS file: /cvsroot/nice/Nice/debian/changelog,v
retrieving revision 1.208
retrieving revision 1.209
diff -C2 -d -r1.208 -r1.209
*** changelog	11 Sep 2003 20:50:28 -0000	1.208
--- changelog	13 Sep 2003 00:43:06 -0000	1.209
***************
*** 39,43 ****
      for global variables, ...)
  
!  --
  
  nice (0.9.1) unstable; urgency=low
--- 39,43 ----
      for global variables, ...)
  
!  -- Daniel Bonniot <bo...@us...>  Sat, 13 Sep 2003 02:40:46 +0200
  
  nice (0.9.1) unstable; urgency=low

[Nice-commit] Nice/src/bossa/syntax DefaultMethodImplementation.java,1.1,1.2 ClassDefinition.java,1.94,1.95

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

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

Modified Files:
	DefaultMethodImplementation.java ClassDefinition.java 
Log Message:
Provide public accessors for tools working on Nice source.


Index: DefaultMethodImplementation.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/DefaultMethodImplementation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DefaultMethodImplementation.java	11 Sep 2003 20:51:46 -0000	1.1
--- DefaultMethodImplementation.java	13 Sep 2003 00:39:53 -0000	1.2
***************
*** 22,26 ****
  import bossa.util.User;
  
! class DefaultMethodImplementation extends MethodImplementation
  {
    DefaultMethodImplementation 
--- 22,26 ----
  import bossa.util.User;
  
! public class DefaultMethodImplementation extends MethodImplementation
  {
    DefaultMethodImplementation 

Index: ClassDefinition.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/ClassDefinition.java,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** ClassDefinition.java	24 Aug 2003 18:07:28 -0000	1.94
--- ClassDefinition.java	13 Sep 2003 00:39:53 -0000	1.95
***************
*** 38,42 ****
    }
  
!   static class Interface extends ClassDefinition
    {
      Interface(LocatedString name, 
--- 38,42 ----
    }
  
!   public static class Interface extends ClassDefinition
    {
      Interface(LocatedString name, 
***************
*** 188,192 ****
    }
  
!   static class Class extends ClassDefinition
    {
      Class(LocatedString name, 
--- 188,192 ----
    }
  
!   public static class Class extends ClassDefinition
    {
      Class(LocatedString name, 
***************
*** 246,251 ****
--- 246,272 ----
      TypeConstructor getSuperClass() { return superClass; }
  
+     public ClassDefinition.Class getSuperClassDefinition()
+     {
+       return (ClassDefinition.Class) ClassDefinition.get(superClass);
+     }
+ 
      mlsub.typing.Interface[] getInterfaces() { return impl; }
  
+     public ClassDefinition.Interface[] getImplementedInterfaces()
+     {
+       if (impl == null) return null;
+       List res = new LinkedList();
+ 
+       for (int i = 0; i < impl.length; i++)
+         { 
+           Object itf = ClassDefinition.get(impl[i].associatedTC());
+           if (itf != null)
+             res.add(itf);
+         }
+ 
+       return (ClassDefinition.Interface[])
+         res.toArray(new ClassDefinition.Interface[res.size()]);
+     }
+ 
      void resolveClass()
      {
***************
*** 265,275 ****
  	}
  
!       // Resolve the superclass first.
!       if (superClass != null)
! 	{
! 	  ClassDefinition d = ClassDefinition.get(superClass);
! 	  if (d != null)
! 	    d.resolve();
! 	}
  
        super.resolveClass();
--- 286,292 ----
  	}
  
!       ClassDefinition d = getSuperClassDefinition();
!       if (d != null)
!         d.resolve();
  
        super.resolveClass();

[Nice-commit] Nice/src/nice/tools/compiler load.nice,NONE,1.1 java.nice,NONE,1.1

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

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

Added Files:
	load.nice java.nice 
Log Message:
API to load Nice sources without compiling them.


--- NEW FILE: load.nice ---
/**************************************************************************/
/*                                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;

/**
   Load packages, and resolve the identifiers, but do not compile them.

   @author Daniel Bonniot (bo...@us...)
 */

List<bossa.modules.Package> load(Compilation compilation, String mainPackage)
{
  ?Throwable uncaughtException = null;

  try {

    bossa.modules.Package.currentCompilation = compilation;

    if (compilation.runtimeFile == null)
      compilation.runtimeFile = getNiceRuntime();
    nice.tools.code.TypeImport.setRuntime(compilation.runtimeFile);
    compilation.setMainPackage(mainPackage);

    // We know that the Modules are in fact Packages
    return cast(flatten(load(compilation)));
  }
  catch(bossa.util.UserError e){
    bossa.util.Internal.warning("user error only caught in main"); 
    compilation.listener.error(e.location, notNull(e.message));
  }
  catch(ExceptionInInitializerError e){
    uncaughtException = e.getException();
  }
  catch(Throwable e){
    uncaughtException = e;
  }

  if (uncaughtException != null)
    {
      let stackTrace = new java.io.StringWriter(500);
      uncaughtException.printStackTrace(new java.io.PrintWriter(stackTrace));

      compilation.listener.bug
      (/*stackTrace:*/ stackTrace.toString(),
       /*url:*/ 
         "http://sourceforge.net/tracker/?func=add&group_id=12788&atid=112788"
      );

      throw uncaughtException;
    }
  else
    throw new bossa.modules.Exit();
}

--- NEW FILE: java.nice ---
/**************************************************************************/
/*                                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;

/**
   Retypings.

   @author Daniel Bonniot (bo...@us...)
 */

import bossa.syntax.*;

List<Definition> definitions(AST) = native List AST.definitions();

[Nice-commit] Nice/src/mlsub/compilation load.nice,NONE,1.1 make.nice,1.23,1.24

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

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

Modified Files:
	make.nice 
Added Files:
	load.nice 
Log Message:
API to load Nice sources without compiling them.


--- NEW FILE: load.nice ---
/**************************************************************************/
/*                                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 mlsub.compilation;

/**
   Load modules, and resolve the identifiers, but do not compile them.

   @author Daniel Bonniot (bo...@us...)
 */

void loadComponent(Compilation compilation, List<Module> modules)
{
  modules.foreach(Module m => m.scope());
  modules.foreach(Module m => m.load());

  notNull(compilation.root).freezeGlobalContext();

  try {
    modules.foreach(Module m => m.typedResolve());
  }
  finally {
    notNull(compilation.root).unfreezeGlobalContext();
  }

  modules.foreach(Module m => m.localResolve());
}

List<List<Module>> load(mlsub.compilation.Compilation compilation)
{
  List<List<Module>> sccs =
    stronglyConnectedComponents
      (notNull(compilation.root), Module m => m.getRequirements());

  sccs.foreach(List<Module> scc => 
	       loadComponent(compilation, scc));

  return sccs;
}

Index: make.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/compilation/make.nice,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** make.nice	17 Jul 2003 23:10:37 -0000	1.23
--- make.nice	13 Sep 2003 00:39:02 -0000	1.24
***************
*** 24,41 ****
  		      boolean doLink)
  {
-   modules.foreach(Module m => m.scope());
-   modules.foreach(Module m => m.load());
- 
-   notNull(compilation.root).freezeGlobalContext();
- 
-   try {
-     modules.foreach(Module m => m.typedResolve());
-   }
-   finally {
-     notNull(compilation.root).unfreezeGlobalContext();
-   }
- 
-   modules.foreach(Module m => m.localResolve());
- 
    notNull(compilation.root).freezeGlobalContext();
  
--- 24,27 ----
***************
*** 54,60 ****
  void make(mlsub.compilation.Compilation compilation)
  {
!   List<List<Module>> sccs =
!     stronglyConnectedComponents
!       (notNull(compilation.root), Module m => m.getRequirements());
  
    sccs.foreach(List<Module> scc => 
--- 40,44 ----
  void make(mlsub.compilation.Compilation compilation)
  {
!   List<List<Module>> sccs = load(compilation);
  
    sccs.foreach(List<Module> scc => 

[Nice-commit] Nice/src/bossa/modules Package.java,1.97,1.98

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

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

Modified Files:
	Package.java 
Log Message:
Provide public accessors for tools working on Nice source.


Index: Package.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/modules/Package.java,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** Package.java	11 Sep 2003 20:50:27 -0000	1.97
--- Package.java	12 Sep 2003 23:20:41 -0000	1.98
***************
*** 823,826 ****
--- 823,831 ----
    }
    
+   public AST getDefinitions()
+   {
+     return ast;
+   }
+ 
    public LocatedString name;
    

[Nice-commit] Nice/src/bossa/syntax AST.java,1.50,1.51

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

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

Modified Files:
	AST.java 
Log Message:
Provide public accessors for tools working on Nice source.


Index: AST.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/AST.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** AST.java	11 Sep 2003 20:50:27 -0000	1.50
--- AST.java	12 Sep 2003 23:20:41 -0000	1.51
***************
*** 38,41 ****
--- 38,46 ----
    }
  
+   public List definitions()
+   {
+     return children;
+   }
+ 
    private void findElements()
    {

[Nice-commit] Nice/stdlib/nice/lang java.nice,1.37,1.38

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

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

Modified Files:
	java.nice 
Log Message:
Added Comparable.compareTo


Index: java.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/java.nice,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** java.nice	11 Sep 2003 15:57:49 -0000	1.37
--- java.nice	12 Sep 2003 22:27:13 -0000	1.38
***************
*** 67,70 ****
--- 67,73 ----
    native Enumeration Properties.propertyNames();
  
+ <java.lang.Comparable T> int compareTo(T,T) =
+  native int java.lang.Comparable.compareTo(Object);
+ 
  //               PACKAGE: java.text
  

[Nice-commit] Nice/src/bossa/syntax TypeMaper.java,1.5,1.6

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

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

Modified Files:
	TypeMaper.java 
Log Message:
Produce a localized error message when there is an ambiguity about which
class a short class name refers to.


Index: TypeMaper.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/TypeMaper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TypeMaper.java	16 Sep 2002 13:43:48 -0000	1.5
--- TypeMaper.java	12 Sep 2003 21:35:25 -0000	1.6
***************
*** 19,23 ****
  
     @version $Date$
!    @author Daniel Bonniot (d.b...@ma...)
  */
  public class TypeMaper implements TypeMap
--- 19,23 ----
  
     @version $Date$
!    @author Daniel Bonniot (bo...@us...)
  */
  public class TypeMaper implements TypeMap
***************
*** 34,47 ****
    public TypeSymbol lookup(LocatedString name)
    {
!     return lookup(name.toString());
    }
  
    public TypeSymbol lookup(String name)
    {
      TypeSymbol res = (TypeSymbol) nice.tools.ast.dispatch.get(inner, name);
      if (res != null)
        return res;
      else
!       return global.lookup(name);
    }
  }
--- 34,52 ----
    public TypeSymbol lookup(LocatedString name)
    {
!     return lookup(name.toString(), name.location());
    }
  
    public TypeSymbol lookup(String name)
    {
+     return lookup(name, null);
+   }
+ 
+   public TypeSymbol lookup(String name, bossa.util.Location loc)
+   {
      TypeSymbol res = (TypeSymbol) nice.tools.ast.dispatch.get(inner, name);
      if (res != null)
        return res;
      else
!       return global.lookup(name, loc);
    }
  }

[Nice-commit] Nice/testsuite/compiler/native import.testsuite,1.2,1.3

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

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

Modified Files:
	import.testsuite 
Log Message:
Produce a localized error message when there is an ambiguity about which
class a short class name refers to.


Index: import.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/native/import.testsuite,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** import.testsuite	11 Nov 2002 20:14:34 -0000	1.2
--- import.testsuite	12 Sep 2003 21:35:24 -0000	1.3
***************
*** 16,17 ****
--- 16,23 ----
    import java.text.*;
    class AttributedCharacterIterator = native AttributedCharacterIterator;
+ 
+ /// FAIL
+   /*/// FAIL HERE*/ Date d;
+   /// Toplevel
+   import java.util.*;
+   import java.sql.*;

[Nice-commit] Nice Makefile,1.129,1.130

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

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

Modified Files:
	Makefile 
Log Message:
Take into account the names of the classes generated by newer versions of 
javacc.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/Makefile,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** Makefile	12 Sep 2003 11:57:08 -0000	1.129
--- Makefile	12 Sep 2003 18:04:43 -0000	1.130
***************
*** 125,129 ****
  clean:
  	rm -f src/nice/tools/compiler/console.jar
! 	-rm -rf classes classes-inline share/java src/bossa/parser/{Parse*.java,Token*.java,ASCII_*.java}
  	find "${TOP}" \( -name "*.class" -o -name "*.nicei" -o -name "*~" \) -exec rm {} \;
  
--- 125,129 ----
  clean:
  	rm -f src/nice/tools/compiler/console.jar
! 	-rm -rf classes classes-inline share/java src/bossa/parser/{Parse*.java,Token*.java,*CharStream.java}
  	find "${TOP}" \( -name "*.class" -o -name "*.nicei" -o -name "*~" \) -exec rm {} \;
  

[Nice-commit] Nice/src/bossa/parser .cvsignore,1.1,1.2

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

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

Modified Files:
	.cvsignore 
Log Message:
Take into account the names of the classes generated by newer versions of 
javacc.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	24 Sep 2001 17:37:55 -0000	1.1
--- .cvsignore	12 Sep 2003 18:04:42 -0000	1.2
***************
*** 1,3 ****
! ASCII_UCodeESC_CharStream.java
  ParseException.java
  Parser.java
--- 1,3 ----
! JavaCharStream.java
  ParseException.java
  Parser.java

[Nice-commit] Nice .cvsignore,1.9,1.10

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

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

Modified Files:
	.cvsignore 
Log Message:
Ignore classes-inline, which is used during the bootstrap.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/nice/Nice/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** .cvsignore	21 Oct 2002 17:49:34 -0000	1.9
--- .cvsignore	12 Sep 2003 18:03:19 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  Nice-*.zip
  classes
+ classes-inline
  doc
  share

[Nice-commit] swing/src/nice/ui/common SwingListenerDecorators.nice,1.3,1.4

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

Update of /cvsroot/nice/swing/src/nice/ui/common
In directory sc8-pr-cvs1:/tmp/cvs-serv10093/src/nice/ui/common

Modified Files:
	SwingListenerDecorators.nice 
Log Message:
Removed duplicate function (that is wrong, and now fails because of ambiguity 
with the replacement of functions by methods in the compiler).


Index: SwingListenerDecorators.nice
===================================================================
RCS file: /cvsroot/nice/swing/src/nice/ui/common/SwingListenerDecorators.nice,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SwingListenerDecorators.nice	13 Nov 2002 02:22:29 -0000	1.3
--- SwingListenerDecorators.nice	12 Sep 2003 15:23:14 -0000	1.4
***************
*** 355,375 ****
  
     
- public <TreeModelListenerHandler H> void addTreeModelListener
-   (H this,
-    TreeModelEvent ?-> void treeNodesChanged = null,
-    TreeModelEvent ?-> void treeNodesInserted = null,
-    TreeModelEvent ?-> void treeNodesRemoved = null,
-    TreeModelEvent ?-> void treeStructureChanged = null
-    )
- {
- 	this.addNiceTreeModelListener
- 	  (new NiceTreeModelListener
-   	  (treeNodesChanged: treeNodesChanged,
-   	   treeNodesInserted: treeNodesInserted,
-   	   treeNodesRemoved: treeNodesRemoved,
-   	   treeStructureChanged: treeStructureChanged
-   	   ));
- }
- 
  public <TreeWillExpandListenerHandler H> void addTreeWillExpandListener
    (H this,  
--- 355,358 ----
***************
*** 463,465 ****
         ancestorRemoved: ancestorRemoved
         ));
! }
\ No newline at end of file
--- 446,448 ----
         ancestorRemoved: ancestorRemoved
         ));
! }