nice-commit — Changes sent to CVS

[Nice-commit] Nice/testsuite/lib/nice/lang prelude.testsuite,1.1,1.2

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

Update of /cvsroot/nice/Nice/testsuite/lib/nice/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv5757/testsuite/lib/nice/lang

Modified Files:
	prelude.testsuite 
Log Message:
Do not rely on having only one method named toString in the global scope.


Index: prelude.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/lib/nice/lang/prelude.testsuite,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** prelude.testsuite	12 Feb 2003 16:13:05 -0000	1.1
--- prelude.testsuite	20 May 2003 14:48:09 -0000	1.2
***************
*** 1,2 ****
  /// PASS
!   assert [ 1 ].map(toString)[0].equals("1");
--- 1,2 ----
  /// PASS
!   assert [ 1 ].map(int i => toString(i))[0].equals("1");

[Nice-commit] Nice/src/bossa/parser Parser.jj,1.172,1.173

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

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

Modified Files:
	Parser.jj 
Log Message:
Made method declarations inside classes be listed as toplevel definitions.

As a side effect, closes #736280.


Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -d -r1.172 -r1.173
*** Parser.jj	12 May 2003 12:40:45 -0000	1.172
--- Parser.jj	19 May 2003 18:49:56 -0000	1.173
***************
*** 1005,1014 ****
  }
  
! ClassDefinition classDefinition():
  {
    ClassDefinition res;
    LocatedString name;
    MethodContainer.Constraint parameters;
-   List fields=new ArrayList(),methods=null;
    List l;
    List typeParametersVariances = new ArrayList(0);
--- 1005,1013 ----
  }
  
! ClassDefinition classDefinition(List definitions):
  {
    ClassDefinition res;
    LocatedString name;
    MethodContainer.Constraint parameters;
    List l;
    List typeParametersVariances = new ArrayList(0);
***************
*** 1050,1053 ****
--- 1049,1053 ----
     { NiceClass impl = new NiceClass(res); }
     // internal fields and methods
+    { List fields = new ArrayList(), methods = null; }
     (
        LOOKAHEAD( getField(null, null) )
***************
*** 1073,1078 ****
     "}"
     {
!      impl.setFieldsAndMethods(fields, methods);
       res.setImplementation(impl);
     }
    | 
--- 1073,1080 ----
     "}"
     {
!      impl.setFields(fields);
       res.setImplementation(impl);
+      if (methods != null)
+        definitions.addAll(methods);
     }
    | 
***************
*** 1482,1486 ****
  }
  
! Definition definition():
  {
      Definition res;
--- 1484,1488 ----
  }
  
! Definition definition(List definitions):
  {
      Definition res;
***************
*** 1497,1501 ****
    | 
      LOOKAHEAD ( classDefinitionLookahead() )
!     res=classDefinition()
    | 
      LOOKAHEAD( methodBodyDefinitionLookahead() )
--- 1499,1503 ----
    | 
      LOOKAHEAD ( classDefinitionLookahead() )
!     res=classDefinition(definitions)
    | 
      LOOKAHEAD( methodBodyDefinitionLookahead() )
***************
*** 1514,1518 ****
  {
    ( 
!    d = definition() { definitions.add(d); } 
    )*
    <EOF> 
--- 1516,1520 ----
  {
    ( 
!    d = definition(definitions) { definitions.add(d); } 
    )*
    <EOF> 

[Nice-commit] Nice/src/bossa/syntax NiceClass.java,1.44,1.45

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

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

Modified Files:
	NiceClass.java 
Log Message:
Made method declarations inside classes be listed as toplevel definitions.

As a side effect, closes #736280.


Index: NiceClass.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/NiceClass.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** NiceClass.java	22 Apr 2003 17:56:09 -0000	1.44
--- NiceClass.java	19 May 2003 18:49:56 -0000	1.45
***************
*** 46,50 ****
    public String getName() { return definition.getName().toString(); }
  
!   public void setFieldsAndMethods(List fields, List methods) 
    {
      if (fields == null || fields.size() == 0)
--- 46,50 ----
    public String getName() { return definition.getName().toString(); }
  
!   public void setFields(List fields) 
    {
      if (fields == null || fields.size() == 0)
***************
*** 65,71 ****
  	  }
        }
-     
-     if(methods != null)
-       this.methods = definition.addChildren(methods);
    }
  
--- 65,68 ----
***************
*** 194,208 ****
    }
  
-   void resolveBody()
-   {
-     if (methods != null)
-       for (Iterator i = methods.iterator(); i.hasNext();)
- 	{
- 	  Object child = i.next();
- 	  if (child instanceof ToplevelFunction)
- 	    ((ToplevelFunction) child).resolveBody();
- 	}
-   }
- 
    /****************************************************************
     * Type checking
--- 191,194 ----
***************
*** 258,262 ****
         + "}\n\n"
         );
-     Definition.printInterface(methods, s);
    }
    
--- 244,247 ----
***************
*** 442,453 ****
    public void compile()
    {
-     if (methods != null)
-       for (Iterator i = methods.iterator(); i.hasNext();)
- 	{
- 	  Object child = i.next();
- 	  if (child instanceof ToplevelFunction)
- 	    ((ToplevelFunction) child).compile();
- 	}
- 
      recompile();
    }
--- 427,430 ----
***************
*** 562,565 ****
  
    private Field[] fields;
-   private List methods;
  }
--- 539,541 ----

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

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

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

Modified Files:
	optionalParameters.testsuite 
Log Message:
Made method declarations inside classes be listed as toplevel definitions.

As a side effect, closes #736280.


Index: optionalParameters.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/optionalParameters.testsuite,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** optionalParameters.testsuite	12 May 2003 18:00:39 -0000	1.5
--- optionalParameters.testsuite	19 May 2003 18:49:55 -0000	1.6
***************
*** 123,126 ****
--- 123,136 ----
  
  /// PASS
+   /// Toplevel
+ class A {
+   int aint;
+   alike f() {
+     return this.adjust();
+   }
+   alike adjust(int aint = this.aint)  = this;
+ }
+ 
+ /// PASS
    assert new A(x: 13).getValue() == 13;
  

[Nice-commit] Nice/src/bossa/syntax typecheck.nice,1.67,1.68 tools.nice,1.20,1.21

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

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

Modified Files:
	typecheck.nice tools.nice 
Log Message:
Fixed var declarations with inferred types whose value is an overloaded symbol.

Precise error location for loops whose condition is not a boolean.


Index: typecheck.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/typecheck.nice,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** typecheck.nice	16 May 2003 00:09:02 -0000	1.67
--- typecheck.nice	16 May 2003 12:05:15 -0000	1.68
***************
*** 42,46 ****
    
    try{
!     e.value = checkAssignment(to.getType(), notNull(e.value));
    }
    catch(TypingEx t){
--- 42,47 ----
    
    try{
!     e.value = notNull(e.value).resolveOverloading(to.getType());
!     checkAssignment(to.getType(), notNull(e.value));
    }
    catch(TypingEx t){
***************
*** 51,55 ****
          {
  	  let unsureType = makeUnsure(variable.type);
! 	  e.value = checkAssignment(new mlsub.typing.Polytype(unsureType), notNull(e.value));
  
  	  // It is OK to assign the variable with a null value.
--- 52,56 ----
          {
  	  let unsureType = makeUnsure(variable.type);
! 	  checkAssignment(new mlsub.typing.Polytype(unsureType), notNull(e.value));
  
  	  // It is OK to assign the variable with a null value.
***************
*** 373,377 ****
  
    try{
!     condition = checkAssignment(PrimitiveType.boolPolytype, condition);
      e.condition = condition;
    }
--- 374,379 ----
  
    try{
!     condition = condition.resolveOverloading(PrimitiveType.boolPolytype);
!     checkAssignment(PrimitiveType.boolPolytype, condition);
      e.condition = condition;
    }
***************
*** 461,466 ****
  {
    try{
!     e.variable = checkAssignment(notNull(PrimitiveType.longPolytype), 
! 				 notNull(e.variable));
    }
    catch(TypingEx t){
--- 463,468 ----
  {
    try{
!     e.variable = notNull(e.variable).resolveOverloading(PrimitiveType.longPolytype);
!     checkAssignment(PrimitiveType.longPolytype, notNull(e.variable));
    }
    catch(TypingEx t){
***************
*** 566,569 ****
--- 568,572 ----
      {
        value.typecheck();
+       decl.value = value = value.noOverloading();
        target.type = checkMonomorphic(value.getType(), decl);
      }
***************
*** 571,575 ****
      {
        try{
! 	decl.value = checkAssignment(new mlsub.typing.Polytype(type), value);
        } 
        catch(TypingEx t){
--- 574,580 ----
      {
        try{
! 	mlsub.typing.Polytype polytype = new mlsub.typing.Polytype(type);
! 	decl.value = value = value.resolveOverloading(polytype);
! 	checkAssignment(polytype, value);
        } 
        catch(TypingEx t){
***************
*** 618,622 ****
    ?Expression whileExp = l.whileExp;
    if (whileExp != null)
!     l.whileExp = checkAssignment(PrimitiveType.boolPolytype, whileExp);
  
    enterIf();
--- 623,639 ----
    ?Expression whileExp = l.whileExp;
    if (whileExp != null)
!     {
!       l.whileExp = whileExp = whileExp.resolveOverloading(PrimitiveType.boolPolytype);
!       try {
! 	checkAssignment(PrimitiveType.boolPolytype, whileExp);
!       }
!       catch(TypingEx t) {
! 	if (notNullError(t, l, whileExp.toString()))
!       throw new bossa.util.UserError
!       (whileExp, 
!        "The condition must be a boolean.\n" + 
!        whileExp + " has type " + whileExp.getType());
!       }
!     }
  
    enterIf();
***************
*** 719,731 ****
  /**
     Checks that right can be assigned to a variable of type left.
!    Returns a new expression to be used instead of right,
!    since overloading resolution is done on the expected type.
  */
! Expression checkAssignment(mlsub.typing.Polytype left, Expression right)
  {
!   Expression val = notNull(right.resolveOverloading(left));
!   typecheck(val);
!   Typing.leq(val.getType(), left);
!   return val;
  }
  
--- 736,748 ----
  /**
     Checks that right can be assigned to a variable of type left.
! 
!    Overloading resolution must already have taken place (it cannot be done 
!    here, since the new value needs to be returned, which would not work
!    when a typing error is thrown).
  */
! void checkAssignment(mlsub.typing.Polytype left, Expression right)
  {
!   typecheck(right);
!   Typing.leq(right.getType(), left);
  }
  

Index: tools.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/tools.nice,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tools.nice	29 Apr 2003 01:02:01 -0000	1.20
--- tools.nice	16 May 2003 12:05:15 -0000	1.21
***************
*** 110,113 ****
--- 110,114 ----
  Block newBlock(?Statement[] statements) = native new Block(Statement[]);
  mlsub.typing.Polytype boolPolytype() = native PrimitiveType.boolPolytype;
+ mlsub.typing.Polytype longPolytype() = native PrimitiveType.longPolytype;
  
  // Local Variables:

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

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

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

Added Files:
	var.testsuite 
Log Message:
Fixed var declarations with inferred types whose value is an overloaded symbol.

Precise error location for loops whose condition is not a boolean.


--- NEW FILE: var.testsuite ---
/// PASS
  /// Toplevel
class A {
  ?String cache;

  void get() {
    var c = cache;
  }
}

class B {
  ?(String, int) cache;

  void get() {
    var c = cache;
  }
}

/// FAIL
  /// Toplevel
class A {
  ?String cache;

  void get() {
    var c = cache;
  }
}

class B {
  ?(String, int) cache;

  void get() {
    var ?boolean c = cache;
  }
}

[Nice-commit] Nice/testsuite/compiler/statements/loops typing.testsuite,1.1,1.2

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

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

Modified Files:
	typing.testsuite 
Log Message:
Makes sure a non-boolean condition is reported at the exact location 
of the error.


Index: typing.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/statements/loops/typing.testsuite,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** typing.testsuite	28 Jan 2003 18:54:40 -0000	1.1
--- typing.testsuite	16 May 2003 11:46:01 -0000	1.2
***************
*** 1,2 ****
  /// FAIL
!   for (int i = 0; i; i++) {}
--- 1,2 ----
  /// FAIL
!   for (int i = 0; /* /// FAIL HERE */ i; i++) {}

[Nice-commit] Nice/external .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
Ignore nice-bootstrap.jar


--- NEW FILE: .cvsignore ---
nice-bootstrap.jar

[Nice-commit] Nice/stdlib/nice/lang prelude.nice,1.28,1.29 java.nice,1.22,1.23

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

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

Modified Files:
	prelude.nice java.nice 
Log Message:
Added the clone method.

Moved the getProperties retyping where it belongs, in java.nice.


Index: prelude.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/prelude.nice,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** prelude.nice	3 May 2003 15:37:53 -0000	1.28
--- prelude.nice	16 May 2003 00:18:10 -0000	1.29
***************
*** 107,112 ****
  <Any T> Class getClass(!T) = native Class Object.getClass();
  
! java.util.Properties<String,String> getProperties() = 
!   native java.util.Properties java.lang.System.getProperties();
  
  /****************************************************************
--- 107,118 ----
  <Any T> Class getClass(!T) = native Class Object.getClass();
  
! /** 
!     This function will throw CloneNotSupportedException if the argument
!     does not implement java.lang.Cloneable.
! 
!     We will give a stricter type later when we can uniformly describe
!     cloneable classes of arbitrary variances.
! */
! <T> T clone(T) = native Object java.lang.Object.clone();
  
  /****************************************************************

Index: java.nice
===================================================================
RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/java.nice,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** java.nice	4 May 2003 16:45:28 -0000	1.22
--- java.nice	16 May 2003 00:18:11 -0000	1.23
***************
*** 57,60 ****
--- 57,63 ----
    native String StringBuffer.substring(int, int);
  
+ java.util.Properties<String,String> getProperties() = 
+   native java.util.Properties java.lang.System.getProperties();
+ 
  //               PACKAGE: java.text
  

[Nice-commit] Nice/testsuite/lib/nice/lang clone.testsuite,NONE,1.1 arrays.testsuite,1.2,1.3

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

Update of /cvsroot/nice/Nice/testsuite/lib/nice/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv31596/testsuite/lib/nice/lang

Modified Files:
	arrays.testsuite 
Added Files:
	clone.testsuite 
Log Message:
Added the clone method.


--- NEW FILE: clone.testsuite ---
/// PASS bug
  let a1 = new A(x: 1);
  let a2 = a1.clone();
  assert a2 != a1;
  assert a2.x == 1;
  a2.x = 2;
  assert a1.x == 1 && a2.x == 2;

  /// Toplevel
final class A implements Cloneable
{
  int x;

  clone() = new A(x: this.x);
}

Index: arrays.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/lib/nice/lang/arrays.testsuite,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** arrays.testsuite	5 May 2003 14:08:12 -0000	1.2
--- arrays.testsuite	16 May 2003 00:15:02 -0000	1.3
***************
*** 19,20 ****
--- 19,28 ----
    /// Toplevel
  class Array<T> {}
+ 
+ /// PASS
+   int[] i = [ 1 ];
+   int[] j = i.clone();
+   assert i != j;
+   assert j[0] == 1;
+   j[0] = 2;
+   assert i[0] == 1 && j[0] == 2;

[Nice-commit] Nice/src/bossa/syntax typecheck.nice,1.66,1.67

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

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

Modified Files:
	typecheck.nice 
Log Message:
Resolve overloaded values for let variables.


Index: typecheck.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/typecheck.nice,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** typecheck.nice	9 May 2003 13:17:03 -0000	1.66
--- typecheck.nice	16 May 2003 00:09:02 -0000	1.67
***************
*** 587,590 ****
--- 587,591 ----
  {
    typecheck(decl.value);
+   decl.value = notNull(decl.value).noOverloading();
    mlsub.typing.Polytype type = notNull(decl.value).getType();
    notNull(decl.left).type = type;

[Nice-commit] Nice/testsuite/compiler/statements/variables let.testsuite,NONE,1.1

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

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

Added Files:
	let.testsuite 
Log Message:
Resolve overloaded values for let variables.


--- NEW FILE: let.testsuite ---
/// PASS
  /// Toplevel
class A {
  ?String cache;

  void get() {
    let c = cache;
  }
}

class B {
  ?(String, int) cache;

  void get() {
    let c = cache;
  }
}

[Nice-commit] Nice/web install.xml,1.8,1.9

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

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

Modified Files:
	install.xml 
Log Message:
Clearer presentation of the list of systems, one per line.
Also added cute logos!


Index: install.xml
===================================================================
RCS file: /cvsroot/nice/Nice/web/install.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** install.xml	25 Jul 2002 13:35:52 -0000	1.8
--- install.xml	14 May 2003 15:44:08 -0000	1.9
***************
*** 14,27 ****
  <keywords>nice, compiler, install, windows, debian, linux, unix</keywords>
  
- <section>
  <para>
  Select your system:
  <link linkend="deb">Debian</link>
! <link linkend="rpm">Redhat or Mandrake Linux (rpm)</link>
  <link linkend="unix">Unix</link>
  <link linkend="win">Windows</link>
  <link linkend="other">Other</link>
  </para>
! </section>
  
  <section id="deb"><title>Debian Linux</title>
--- 14,74 ----
  <keywords>nice, compiler, install, windows, debian, linux, unix</keywords>
  
  <para>
  Select your system:
+ 
+ <itemizedlist>
+ 
+ <listitem><para>
+ <inlinemediaobject><imageobject>
+ <imagedata fileref="images/debian.png"/>
+ </imageobject></inlinemediaobject>
+ 
  <link linkend="deb">Debian</link>
! 
! </para></listitem>
! <listitem><para>
! 
! <inlinemediaobject><imageobject>
! <imagedata fileref="images/redhat.png"/>
! </imageobject></inlinemediaobject>
! 
! <link linkend="rpm">Redhat or 
! <inlinemediaobject><imageobject>
! <imagedata fileref="images/mandrake.png"/>
! </imageobject></inlinemediaobject>
! Mandrake Linux (rpm)</link>
! 
! </para></listitem>
! <listitem><para>
! 
! <inlinemediaobject><imageobject>
! <imagedata fileref="images/linux.png"/>
! </imageobject></inlinemediaobject>
! 
  <link linkend="unix">Unix</link>
+ 
+ </para></listitem>
+ <listitem><para>
+ 
+ <inlinemediaobject><imageobject>
+ <imagedata fileref="images/win32.png"/>
+ </imageobject></inlinemediaobject>
+ 
  <link linkend="win">Windows</link>
+ 
+ </para></listitem>
+ <listitem><para>
+ 
+ <inlinemediaobject><imageobject>
+ <imagedata fileref="images/unknown.png"/>
+ </imageobject></inlinemediaobject>
+ 
  <link linkend="other">Other</link>
+ 
+ </para></listitem>
+ </itemizedlist>
+ 
  </para>
! 
  
  <section id="deb"><title>Debian Linux</title>

[Nice-commit] Nice/web/images debian.png,NONE,1.1 linux.png,NONE,1.1 macos.png,NONE,1.1 mandrake.png,NONE,1.1 redhat.png,NONE,1.1 unknown.png,NONE,1.1 win32.png,NONE,1.1

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

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

Added Files:
	debian.png linux.png macos.png mandrake.png redhat.png 
	unknown.png win32.png 
Log Message:
Logos for different OSes

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

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

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

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

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

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

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

[Nice-commit] Nice/distrib Makefile,1.5,1.6

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

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

Modified Files:
	Makefile 
Log Message:
Fixed the zip file generation.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/distrib/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	6 May 2003 13:25:12 -0000	1.5
--- Makefile	14 May 2003 14:43:39 -0000	1.6
***************
*** 6,10 ****
  DEB = nice_${VERSION}_all.deb
  
! BUILDROOT = ${CURDIR}/nice-$(VERSION)
  
  BUILTSOURCEFILE = nice_$(VERSION).orig.tar.gz
--- 6,11 ----
  DEB = nice_${VERSION}_all.deb
  
! BUILDROOT = nice-$(VERSION)
! BUILDDIR = ${CURDIR}/$(BUILDROOT)
  
  BUILTSOURCEFILE = nice_$(VERSION).orig.tar.gz
***************
*** 62,68 ****
  	mkdir ${ZIP_ROOT}
  	../bin/nicec --man | groff -mandoc -Thtml - > ${ZIP_ROOT}/nicec.html
! 	ln -sf ${BUILDROOT}/bin/nicec.bat ${BUILDROOT}/share/java/nice.jar ${BUILDROOT}/web/Readme.txt ${ZIP_ROOT}
  	mkdir -p ${ZIP_ROOT}/Emacs
! 	ln -sf ${BUILDROOT}/lib/emacs/*.el ${ZIP_ROOT}/Emacs
  	-rm ${ZIPFILE}
  	cd tmp && zip -r ../${ZIPFILE} Nice
--- 63,69 ----
  	mkdir ${ZIP_ROOT}
  	../bin/nicec --man | groff -mandoc -Thtml - > ${ZIP_ROOT}/nicec.html
! 	ln -sf ${BUILDDIR}/bin/nicec.bat ${BUILDDIR}/share/java/nice.jar ${BUILDDIR}/web/Readme.txt ${ZIP_ROOT}
  	mkdir -p ${ZIP_ROOT}/Emacs
! 	ln -sf ${BUILDDIR}/lib/emacs/*.el ${ZIP_ROOT}/Emacs
  	-rm ${ZIPFILE}
  	cd tmp && zip -r ../${ZIPFILE} Nice

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

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

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

Modified Files:
	abstractInterfaces.testsuite 
Log Message:
A slightly more complex case.


Index: abstractInterfaces.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/typing/abstractInterfaces.testsuite,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** abstractInterfaces.testsuite	17 Feb 2003 15:10:24 -0000	1.2
--- abstractInterfaces.testsuite	14 May 2003 14:40:26 -0000	1.3
***************
*** 38,39 ****
--- 38,50 ----
    class A implements I {}
    f(x@A) = new A();
+ 
+ /// PASS
+   /// Toplevel
+ 
+   abstract interface I {
+     alike f();
+   }
+   abstract class A finally implements I {}
+   class B extends A {}
+   f(x@B) { A res = new B(); return res; }
+ 

[Nice-commit] Nice/debian changelog,1.161,1.162

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

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

Modified Files:
	changelog 
Log Message:
Added the fix about declaration of multiple variables.

Closed 0.8


Index: changelog
===================================================================
RCS file: /cvsroot/nice/Nice/debian/changelog,v
retrieving revision 1.161
retrieving revision 1.162
diff -C2 -d -r1.161 -r1.162
*** changelog	12 May 2003 18:00:40 -0000	1.161
--- changelog	14 May 2003 14:39:12 -0000	1.162
***************
*** 1,11 ****
! nice (0.8.0) unstable; urgency=low
  
    * Stable version, based on 0.7.9
    * Bugfixes (some cases of optional parameters, allowing arbitrarily nested
      tuples on the left side of an assignment, recursion for local functions,
!     allow method parameter's default values to refer to this when the method
!     is declared inside a class).
  
!  --
  
  nice (0.7.9) unstable; urgency=low
--- 1,11 ----
! nice (0.8) unstable; urgency=low
  
    * Stable version, based on 0.7.9
    * Bugfixes (some cases of optional parameters, allowing arbitrarily nested
      tuples on the left side of an assignment, recursion for local functions,
!     allow method parameter's default values to refer to 'this' when the method
!     is declared inside a class, declaration of multiple local variables).
  
!  -- Daniel Bonniot <bo...@us...>  Wed, 14 May 2003 16:30:15 +0200
  
  nice (0.7.9) unstable; urgency=low

[Nice-commit] Nice/bin nicec.bat,1.8,1.9

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

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

Modified Files:
	nicec.bat 
Log Message:
minor thing

Index: nicec.bat
===================================================================
RCS file: /cvsroot/nice/Nice/bin/nicec.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** nicec.bat	13 May 2003 13:11:19 -0000	1.8
--- nicec.bat	13 May 2003 13:58:45 -0000	1.9
***************
*** 33,37 ****
  
  echo You must set the NICE environment variable to point to the directory you've installed nice in e.g.
! echo set NICE=C:\programs\nice	(note: do not add a ';' at the end) 
  echo You can do it by modifying Autoexec.bat or in the system settings.
  goto end
--- 33,38 ----
  
  echo You must set the NICE environment variable to point to the directory you've installed nice in e.g.
! echo set NICE=C:\programs\nice	
! echo (note: do not add a ';' at the end) 
  echo You can do it by modifying Autoexec.bat or in the system settings.
  goto end

[Nice-commit] Nice/bin nicec.bat,1.7,1.8

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

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

Modified Files:
	nicec.bat 
Log Message:
Added default locations of the nice.jar

Index: nicec.bat
===================================================================
RCS file: /cvsroot/nice/Nice/bin/nicec.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** nicec.bat	12 May 2003 11:22:53 -0000	1.7
--- nicec.bat	13 May 2003 13:11:19 -0000	1.8
***************
*** 11,14 ****
--- 11,35 ----
  if not "%NICE%" == "" goto gotNice
  
+ rem -- try some standard places
+ 
+ set NICE=c:\nice
+ if exist %NICE%\nice.jar goto gotNice
+ 
+ set NICE=c:\Program Files\nice
+ if exist %NICE%\nice.jar goto gotNice
+ 
+ set NICE=c:\programs\nice
+ if exist %NICE%\nice.jar goto gotNice
+ 
+ set NICE=d:\nice
+ if exist %NICE%\nice.jar goto gotNice
+ 
+ set NICE=d:\Program Files\nice
+ if exist %NICE%\nice.jar goto gotNice
+ 
+ set NICE=d:\programs\nice
+ if exist %NICE%\nice.jar goto gotNice
+ 
+ 
  echo You must set the NICE environment variable to point to the directory you've installed nice in e.g.
  echo set NICE=C:\programs\nice	(note: do not add a ';' at the end) 

[Nice-commit] Nice/debian changelog,1.160,1.161

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

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

Modified Files:
	changelog 
Log Message:
Allow method parameter's default values to refer to this when the method
is declared inside a class.


Index: changelog
===================================================================
RCS file: /cvsroot/nice/Nice/debian/changelog,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** changelog	12 May 2003 11:11:44 -0000	1.160
--- changelog	12 May 2003 18:00:40 -0000	1.161
***************
*** 3,7 ****
    * Stable version, based on 0.7.9
    * Bugfixes (some cases of optional parameters, allowing arbitrarily nested
!     tuples on the left side of an assignment, recursion for local functions).
  
   --
--- 3,9 ----
    * Stable version, based on 0.7.9
    * Bugfixes (some cases of optional parameters, allowing arbitrarily nested
!     tuples on the left side of an assignment, recursion for local functions,
!     allow method parameter's default values to refer to this when the method
!     is declared inside a class).
  
   --

[Nice-commit] Nice/src/bossa/syntax Node.java,1.54,1.55 FormalParameters.java,1.23,1.24

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

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

Modified Files:
	Node.java FormalParameters.java 
Log Message:
Allow method parameter's default values to refer to this when the method
is declared inside a class.


Index: Node.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Node.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Node.java	11 Nov 2002 20:14:50 -0000	1.54
--- Node.java	12 May 2003 18:00:39 -0000	1.55
***************
*** 53,56 ****
--- 53,65 ----
    }
    
+   void addFirstChild(Node n)
+   {
+     if (n==null)
+       Internal.error("null child in Node.addChild for node "+this);
+ 
+     if (children == null) children=new ArrayList();
+     children.add(0, n);
+   }
+   
    final Node child(Node n)
    {

Index: FormalParameters.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/FormalParameters.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** FormalParameters.java	30 Apr 2003 18:55:31 -0000	1.23
--- FormalParameters.java	12 May 2003 18:00:40 -0000	1.24
***************
*** 272,276 ****
      
      parameters[0] = new NamedParameter(type, thisName);
!     addChild(parameters[0]);
    }
  
--- 272,278 ----
      
      parameters[0] = new NamedParameter(type, thisName);
!     // We need to add it as the first child, because the order
!     // is used when refering to previous parameters inside default values.
!     addFirstChild(parameters[0]);
    }
  

[Nice-commit] Nice/testsuite/compiler/methods optionalParameters.testsuite,1.4,1.5

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

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

Modified Files:
	optionalParameters.testsuite 
Log Message:
Allow method parameter's default values to refer to this when the method
is declared inside a class.


Index: optionalParameters.testsuite
===================================================================
RCS file: /cvsroot/nice/Nice/testsuite/compiler/methods/optionalParameters.testsuite,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** optionalParameters.testsuite	12 May 2003 11:11:44 -0000	1.4
--- optionalParameters.testsuite	12 May 2003 18:00:39 -0000	1.5
***************
*** 121,122 ****
--- 121,132 ----
    }
  }
+ 
+ /// PASS
+   assert new A(x: 13).getValue() == 13;
+ 
+   /// Toplevel
+   class A 
+   {
+     int x;
+     int getValue(int v = this.x) = v;
+   }

[Nice-commit] tester cvs,NONE,1.1

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

Update of /cvsroot/nice/tester
In directory sc8-pr-cvs1:/tmp/cvs-serv8830

Added Files:
	cvs 
Log Message:
Retry the cvs export a few times, since sourceforge is hiccuping these days.

Test can now also answer SKIP and IMPOSSIBLE.


--- NEW FILE: cvs ---
#! /bin/sh

# Wrapper for cvs, that retries seevral times in case of failure

# Usage:
#   cvs <module name>

# Try at most 10 times times, in case the cvs server is busy
tries=0

while ! cvs -d:pserver:anonymous@$CVS_SOURCEFORGE:/cvsroot/nice export \
    -rHEAD "$@"; do

  tries=`expr $tries + 1`

  if [ $tries -ge 10 ]; then 
      # Signal that we failed because of a network problem
      exit 1
  fi

  echo "$tries failures"
  sleep 30
done

[Nice-commit] tester run,1.7,1.8 Swing.test,1.2,1.3 Project,1.5,1.6 Flow4j.test,1.2,1.3

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

Update of /cvsroot/nice/tester
In directory sc8-pr-cvs1:/tmp/cvs-serv7747

Modified Files:
	run Swing.test Project Flow4j.test 
Log Message:
Retry the cvs export a few times, since sourceforge is hiccuping these days.

Test can now also answer SKIP and IMPOSSIBLE.


Index: run
===================================================================
RCS file: /cvsroot/nice/tester/run,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** run	7 May 2003 15:29:12 -0000	1.7
--- run	12 May 2003 17:00:25 -0000	1.8
***************
*** 75,83 ****
  	echo "======================"
  	echo ""
! 	if $test; then
! 	    echo "$testname OK"  >> $config.res
! 	else
! 	    echo "$testname FAILURE"  >> $config.res
! 	fi
      done
  
--- 75,93 ----
  	echo "======================"
  	echo ""
! 
! 	set +e
! 	$test
! 	code=$?
! 	set -e
!         {
! 	    echo -n "$testname "
! 	    case "$code" in
! 		0) echo "OK"         ;;
! 		1) echo "FAILURE"    ;;
! 		2) echo "SKIP"       ;;
! 		3) echo "IMPOSSIBLE" ;;
! 		*) echo "OTHER"      ;;
! 	    esac
! 	} >> $config.res
      done
  

Index: Swing.test
===================================================================
RCS file: /cvsroot/nice/tester/Swing.test,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Swing.test	26 Apr 2003 22:42:35 -0000	1.2
--- Swing.test	12 May 2003 17:00:25 -0000	1.3
***************
*** 2,8 ****
  
  if [ ! -r swing ]; then
!   cvs -d:pserver:anonymous@$CVS_SOURCEFORGE:/cvsroot/nice export -rHEAD swing
  fi
  cd swing
  
! CLASSPATH=${NICE_JAR} ant clean-all compile-common
--- 2,14 ----
  
  if [ ! -r swing ]; then
! 
!   ../cvs swing || exit 3
! 
  fi
+ 
  cd swing
  
! if ! CLASSPATH=${NICE_JAR} ant clean-all compile-common; then
!     # The test failed
!     exit 1
! fi

Index: Project
===================================================================
RCS file: /cvsroot/nice/tester/Project,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Project	7 May 2003 09:50:51 -0000	1.5
--- Project	12 May 2003 17:00:25 -0000	1.6
***************
*** 5,10 ****
  
  if [ ! -r Nice ]; then
!   cvs -d:pserver:anonymous@$CVS_SOURCEFORGE:/cvsroot/nice export -rHEAD Nice
!   wget -O Nice/external/nice-bootstrap.jar http://nice.sf.net/nice.jar
  fi
  
--- 5,10 ----
  
  if [ ! -r Nice ]; then
!   ../cvs Nice || exit 3
!   wget -O Nice/external/nice-bootstrap.jar http://nice.sf.net/nice.jar || exit 3
  fi
  

Index: Flow4j.test
===================================================================
RCS file: /cvsroot/nice/tester/Flow4j.test,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Flow4j.test	28 Apr 2003 11:10:55 -0000	1.2
--- Flow4j.test	12 May 2003 17:00:25 -0000	1.3
***************
*** 5,8 ****
--- 5,13 ----
  set -e
  
+ if [ ${JDK_VERSION} ] && expr "${JDK_VERSION}" '<' 1.4.0 >/dev/null; then
+     echo "JDK 1.4 needed for the Flow4j test. Skipping."
+     exit 2
+ fi
+ 
  if [ ! -r flow4j ]; then
    if [ ! -r flow4j-src-0.5.tar.gz ]; then

[Nice-commit] Nice/src/bossa/parser Parser.jj,1.171,1.172

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

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

Modified Files:
	Parser.jj 
Log Message:
Fix: make it possible again to declare more than two local variables in one declaration. (broken since syntax change of local vars)

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -d -r1.171 -r1.172
*** Parser.jj	9 May 2003 15:28:29 -0000	1.171
--- Parser.jj	12 May 2003 12:40:45 -0000	1.172
***************
*** 2382,2386 ****
      [ "=" e=Expression() ] 
      { res = new Block.LocalVariable(id,type,false,e); }
!     ( LOOKAHEAD( "," <IDENT> ( "=" | ";" ) ) 
        "," id=ident() {e=null;} [ "=" e=Expression() ] { res.addNext(id,e); } )*
    |
--- 2382,2386 ----
      [ "=" e=Expression() ] 
      { res = new Block.LocalVariable(id,type,false,e); }
!     ( LOOKAHEAD( "," <IDENT> ( "=" | ";" | ",") ) 
        "," id=ident() {e=null;} [ "=" e=Expression() ] { res.addNext(id,e); } )*
    |
***************
*** 2406,2410 ****
        [ "=" e=Expression() ] 
        { res = new Block.LocalVariable(id,type,constant,e); }
!       ( LOOKAHEAD( "," <IDENT> ( "=" | ";") ) 
          "," id=ident() {e=null;} [ "=" e=Expression() ] { res.addNext(id,e); } )*
      )
--- 2406,2410 ----
        [ "=" e=Expression() ] 
        { res = new Block.LocalVariable(id,type,constant,e); }
!       ( LOOKAHEAD( "," <IDENT> ( "=" | ";" | ",") ) 
          "," id=ident() {e=null;} [ "=" e=Expression() ] { res.addNext(id,e); } )*
      )