nice-commit Mailing List for The Nice Programming Language (Page 45)
Brought to you by:
bonniot
Menu
▾
▴
nice-commit — Changes sent to CVS
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(60) |
Mar
(125) |
Apr
(183) |
May
(140) |
Jun
(227) |
Jul
(141) |
Aug
(181) |
Sep
(75) |
Oct
(89) |
Nov
(187) |
Dec
(162) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(69) |
Feb
(197) |
Mar
(98) |
Apr
(26) |
May
(10) |
Jun
(85) |
Jul
(88) |
Aug
(79) |
Sep
(80) |
Oct
(81) |
Nov
(53) |
Dec
(109) |
| 2005 |
Jan
(68) |
Feb
(77) |
Mar
(232) |
Apr
(79) |
May
(37) |
Jun
(37) |
Jul
(3) |
Aug
(18) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(10) |
Feb
|
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(1) |
Dec
(9) |
| 2007 |
Jan
(2) |
Feb
(8) |
Mar
(2) |
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
|
Nov
(17) |
Dec
(6) |
| 2008 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Daniel B. <bo...@us...> - 2004-06-30 11:58:39
|
Update of /cvsroot/nice/Nice/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5953/web Modified Files: .htaccess Log Message: Released 0.9.8 Index: .htaccess =================================================================== RCS file: /cvsroot/nice/Nice/web/.htaccess,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** .htaccess 9 Mar 2004 11:36:17 -0000 1.18 --- .htaccess 30 Jun 2004 11:58:30 -0000 1.19 *************** *** 1,6 **** Redirect /Wiki http://nice.sourceforge.net/cgi-bin/twiki/view ! Redirect /Nice.tar http://prdownloads.sourceforge.net/nice/Nice-0.9.7-unix.tar.gz ! Redirect /Nice-source.tar.gz http://prdownloads.sourceforge.net/nice/Nice-0.9.7-source.tar.gz ! Redirect /Nice.zip http://prdownloads.sourceforge.net/nice/Nice-0.9.7-windows.zip ! Redirect /nice.deb http://prdownloads.sourceforge.net/nice/nice_0.9.7-1_all.deb ! Redirect /nice.rpm http://prdownloads.sourceforge.net/nice/Nice-0.9.7-1.noarch.rpm --- 1,6 ---- Redirect /Wiki http://nice.sourceforge.net/cgi-bin/twiki/view ! Redirect /Nice.tar http://prdownloads.sourceforge.net/nice/Nice-0.9.8-unix.tar.gz ! Redirect /Nice-source.tar.gz http://prdownloads.sourceforge.net/nice/Nice-0.9.8-source.tar.gz ! Redirect /Nice.zip http://prdownloads.sourceforge.net/nice/Nice-0.9.8-windows.zip ! Redirect /nice.deb http://prdownloads.sourceforge.net/nice/nice_0.9.8-1_all.deb ! Redirect /nice.rpm http://prdownloads.sourceforge.net/nice/Nice-0.9.8-1.noarch.rpm |
|
From: Daniel B. <bo...@us...> - 2004-06-30 10:15:36
|
Update of /cvsroot/nice/Nice/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20673/debian Modified Files: rules control Log Message: Build with ant 1.6 Index: control =================================================================== RCS file: /cvsroot/nice/Nice/debian/control,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** control 4 Mar 2004 10:40:29 -0000 1.18 --- control 30 Jun 2004 10:15:27 -0000 1.19 *************** *** 3,7 **** Priority: optional Maintainer: Daniel Bonniot <bo...@us...> ! Build-Depends-Indep: debhelper (>> 3.0.0), jikes-classpath (>= 1:1.18), kaffe (>= 1:1.1.1), javacc, groff, libant1.5-java Standards-Version: 3.6.1 --- 3,7 ---- Priority: optional Maintainer: Daniel Bonniot <bo...@us...> ! Build-Depends-Indep: debhelper (>> 3.0.0), jikes-classpath (>= 1:1.18), kaffe (>= 1:1.1.1), javacc, groff, libant1.6-java Standards-Version: 3.6.1 Index: rules =================================================================== RCS file: /cvsroot/nice/Nice/debian/rules,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** rules 20 Feb 2004 17:45:40 -0000 1.9 --- rules 30 Jun 2004 10:15:27 -0000 1.10 *************** *** 24,28 **** # Ask javac to produce optimized code, but no debugging info # so that the package is smaller. ! $(MAKE) complete JAVAC_FLAGS="-O" java="kaffe" javac="jikes-classpath" NICE_ANTJAR=/usr/share/java/ant-1.5.jar #/usr/bin/docbook-to-man debian/nice.sgml > nice.1 --- 24,28 ---- # Ask javac to produce optimized code, but no debugging info # so that the package is smaller. ! $(MAKE) complete JAVAC_FLAGS="-O" java="kaffe" javac="jikes-classpath" NICE_ANTJAR=/usr/share/java/ant-1.6.jar #/usr/bin/docbook-to-man debian/nice.sgml > nice.1 |
|
From: Daniel B. <bo...@us...> - 2004-06-30 09:49:08
|
Update of /cvsroot/nice/Nice/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16851/debian Modified Files: changelog Log Message: Fix format. Index: changelog =================================================================== RCS file: /cvsroot/nice/Nice/debian/changelog,v retrieving revision 1.239 retrieving revision 1.240 diff -C2 -d -r1.239 -r1.240 *** changelog 29 Jun 2004 19:00:26 -0000 1.239 --- changelog 30 Jun 2004 09:48:58 -0000 1.240 *************** *** 1,3 **** ! nice (0.9.8-1) * New upstream version. --- 1,3 ---- ! nice (0.9.8-1) unstable; urgency=low * New upstream version. |
|
From: Daniel B. <bo...@us...> - 2004-06-30 09:42:44
|
Update of /cvsroot/nice/Nice/testsuite/compiler/designByContract In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15997/testsuite/compiler/designByContract Modified Files: methods.testsuite Log Message: Set context for 'this' variable. Index: methods.testsuite =================================================================== RCS file: /cvsroot/nice/Nice/testsuite/compiler/designByContract/methods.testsuite,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** methods.testsuite 29 Jun 2004 19:27:32 -0000 1.6 --- methods.testsuite 30 Jun 2004 09:42:33 -0000 1.7 *************** *** 85,89 **** assert ok; ! /// PASS bug /// Toplevel class A { ?int foo; } --- 85,94 ---- assert ok; ! /// PASS ! // bug #982048 ! // Use of 'this' in a contract ! ! bar(new A(foo: null)); ! /// Toplevel class A { ?int foo; } |
|
From: Daniel B. <bo...@us...> - 2004-06-30 09:42:44
|
Update of /cvsroot/nice/Nice/src/nice/tools/code In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15997/src/nice/tools/code Modified Files: Gen.java Log Message: Set context for 'this' variable. Index: Gen.java =================================================================== RCS file: /cvsroot/nice/Nice/src/nice/tools/code/Gen.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Gen.java 21 Jun 2004 11:48:24 -0000 1.19 --- Gen.java 30 Jun 2004 09:42:34 -0000 1.20 *************** *** 197,201 **** gnu.expr.Declaration d; if (isThis) ! d = new Declaration(parameterName); else d = lexp.addDeclaration(parameterName); --- 197,204 ---- gnu.expr.Declaration d; if (isThis) ! { ! d = new Declaration(parameterName); ! d.context = lexp; ! } else d = lexp.addDeclaration(parameterName); |
|
From: Arjan B. <ar...@us...> - 2004-06-29 19:27:44
|
Update of /cvsroot/nice/Nice/testsuite/compiler/designByContract In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29548/F:/nice/testsuite/compiler/designByContract Modified Files: methods.testsuite Log Message: Testcase for bug #982048. Index: methods.testsuite =================================================================== RCS file: /cvsroot/nice/Nice/testsuite/compiler/designByContract/methods.testsuite,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** methods.testsuite 28 Nov 2003 13:52:08 -0000 1.5 --- methods.testsuite 29 Jun 2004 19:27:32 -0000 1.6 *************** *** 84,85 **** --- 84,90 ---- } catch(AssertionFailed e) { ok = true; } assert ok; + + /// PASS bug + /// Toplevel + class A { ?int foo; } + void bar(A a) requires a.foo == null || notNull(a.foo) >= 0 {} |
|
From: Daniel B. <bo...@us...> - 2004-06-29 19:00:38
|
Update of /cvsroot/nice/Nice/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23418/debian Modified Files: changelog Log Message: Closed 0.9.8 Index: changelog =================================================================== RCS file: /cvsroot/nice/Nice/debian/changelog,v retrieving revision 1.238 retrieving revision 1.239 diff -C2 -d -r1.238 -r1.239 *** changelog 8 Mar 2004 18:19:46 -0000 1.238 --- changelog 29 Jun 2004 19:00:26 -0000 1.239 *************** *** 1,2 **** --- 1,8 ---- + nice (0.9.8-1) + + * New upstream version. + + -- Daniel Bonniot <bo...@us...> Tue, 29 Jun 2004 21:00:00 +0200 + nice (0.9.7-1) unstable; urgency=low |
|
From: Daniel B. <bo...@us...> - 2004-06-29 18:57:37
|
Update of /cvsroot/nice/Nice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22661 Modified Files: NEWS Log Message: Closed 0.9.8 Index: NEWS =================================================================== RCS file: /cvsroot/nice/Nice/NEWS,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** NEWS 21 Jun 2004 11:48:25 -0000 1.36 --- NEWS 29 Jun 2004 18:57:20 -0000 1.37 *************** *** 17,26 **** several Java interfaces declaring that same method, like java.io.ObjectOutputStream.flush() ! * Reduced compilation time and memory consumption. * Smaller generated bytecode. * Fixed native compilation using gcj. It used to block when gcj produced too much output. ! -- nice (0.9.7) --- 17,26 ---- several Java interfaces declaring that same method, like java.io.ObjectOutputStream.flush() ! * Reduced compilation time (about 20%) and memory consumption. * Smaller generated bytecode. * Fixed native compilation using gcj. It used to block when gcj produced too much output. ! -- Tue, 29 Jun 2004 20:53:03 +0200 nice (0.9.7) |
|
From: Daniel B. <bo...@us...> - 2004-06-29 18:54:58
|
Update of /cvsroot/nice/Nice/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/bin Modified Files: nicec.bat nicec Log Message: Start the JVM with 8MB of memory, to reduce initial garbage collection. Index: nicec.bat =================================================================== RCS file: /cvsroot/nice/Nice/bin/nicec.bat,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** nicec.bat 16 Feb 2004 13:52:57 -0000 1.15 --- nicec.bat 29 Jun 2004 18:54:49 -0000 1.16 *************** *** 15,19 **** :gotNice ! java -classpath %NICEPATH%\nice.jar;%CLASSPATH% nice.tools.compiler.console.fun --runtime=%NICEPATH%\nice.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 :end --- 15,19 ---- :gotNice ! java -Xms8M -classpath %NICEPATH%\nice.jar;%CLASSPATH% nice.tools.compiler.console.fun --runtime=%NICEPATH%\nice.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 :end Index: nicec =================================================================== RCS file: /cvsroot/nice/Nice/bin/nicec,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** nicec 16 Feb 2004 12:41:45 -0000 1.37 --- nicec 29 Jun 2004 18:54:49 -0000 1.38 *************** *** 35,39 **** ## Parsing special command line arguments ! java=${JAVA-java} scriptName="$0" progname=`basename $scriptName` --- 35,39 ---- ## Parsing special command line arguments ! java=${JAVA-java -Xms8M} scriptName="$0" progname=`basename $scriptName` |
|
From: Arjan B. <ar...@us...> - 2004-06-29 18:38:28
|
Update of /cvsroot/nice/Nice/src/mlsub/typing/lowlevel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18035/F:/nice/src/mlsub/typing/lowlevel Modified Files: Engine.java K0.java Log Message: Make bossa.util not depend mlsub.typing. Index: K0.java =================================================================== RCS file: /cvsroot/nice/Nice/src/mlsub/typing/lowlevel/K0.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** K0.java 26 Mar 2004 16:15:39 -0000 1.22 --- K0.java 29 Jun 2004 18:38:18 -0000 1.23 *************** *** 46,50 **** * Debugging ***********************************************************************/ ! public static boolean debugK0 = S.debugK0; private static int IDs = 0; private int ID = IDs++; --- 46,50 ---- * Debugging ***********************************************************************/ ! public static boolean debugK0 = bossa.util.Debug.K0; private static int IDs = 0; private int ID = IDs++; Index: Engine.java =================================================================== RCS file: /cvsroot/nice/Nice/src/mlsub/typing/lowlevel/Engine.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Engine.java 22 Apr 2004 10:09:29 -0000 1.33 --- Engine.java 29 Jun 2004 18:38:18 -0000 1.34 *************** *** 1087,1090 **** } ! public static boolean dbg; } --- 1087,1090 ---- } ! public static boolean dbg = bossa.util.Debug.engine; } |
|
From: Arjan B. <ar...@us...> - 2004-06-29 18:38:28
|
Update of /cvsroot/nice/Nice/src/mlsub/typing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18035/F:/nice/src/mlsub/typing Modified Files: Enumeration.java Polytype.java Typing.java Log Message: Make bossa.util not depend mlsub.typing. Index: Enumeration.java =================================================================== RCS file: /cvsroot/nice/Nice/src/mlsub/typing/Enumeration.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Enumeration.java 23 Mar 2004 20:28:43 -0000 1.12 --- Enumeration.java 29 Jun 2004 18:38:18 -0000 1.13 *************** *** 471,474 **** } ! public static boolean linkDbg; } --- 471,474 ---- } ! public static boolean linkDbg = bossa.util.Debug.linkTests; } Index: Polytype.java =================================================================== RCS file: /cvsroot/nice/Nice/src/mlsub/typing/Polytype.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Polytype.java 16 Jun 2004 10:00:35 -0000 1.23 --- Polytype.java 29 Jun 2004 18:38:18 -0000 1.24 *************** *** 349,352 **** private Monotype monotype; ! public static boolean noSimplify; } --- 349,352 ---- private Monotype monotype; ! public static boolean noSimplify = bossa.util.Debug.noSimplify; } Index: Typing.java =================================================================== RCS file: /cvsroot/nice/Nice/src/mlsub/typing/Typing.java,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Typing.java 24 Mar 2004 23:44:24 -0000 1.39 --- Typing.java 29 Jun 2004 18:38:18 -0000 1.40 *************** *** 665,668 **** } ! public static boolean dbg; } --- 665,668 ---- } ! public static boolean dbg = bossa.util.Debug.typing; } |
|
From: Arjan B. <ar...@us...> - 2004-06-29 18:38:27
|
Update of /cvsroot/nice/Nice/src/bossa/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18035/F:/nice/src/bossa/util Modified Files: Debug.java Log Message: Make bossa.util not depend mlsub.typing. Index: Debug.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/util/Debug.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Debug.java 2 Feb 2004 19:21:11 -0000 1.18 --- Debug.java 29 Jun 2004 18:38:16 -0000 1.19 *************** *** 90,104 **** alwaysDumpStack = getBoolean("debug.alwaysDumpStack", false), ! ignorePrelude = getBoolean("debug.ignorePrelude", false); ! ! static ! { ! mlsub.typing.lowlevel.K0.debugK0 = Debug.K0; ! mlsub.typing.lowlevel.Engine.dbg = Debug.engine; ! mlsub.typing.Typing.dbg = Debug.typing; ! mlsub.typing.Enumeration.linkDbg = Debug.linkTests; ! mlsub.typing.Polytype.noSimplify = getBoolean("debug.noSimplify", false); ! } ! public static final String defaultFile = props.getProperty("debug.defaultFile", null); --- 90,96 ---- alwaysDumpStack = getBoolean("debug.alwaysDumpStack", false), ! ignorePrelude = getBoolean("debug.ignorePrelude", false), ! noSimplify = getBoolean("debug.noSimplify", false); ! public static final String defaultFile = props.getProperty("debug.defaultFile", null); |
|
From: Arjan B. <ar...@us...> - 2004-06-29 16:37:05
|
Update of /cvsroot/nice/Nice/src/bossa/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27033/F:/nice/src/bossa/util Modified Files: Location.java Log Message: Make bossa.util not depend nice.tools.util. Index: Location.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/util/Location.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Location.java 29 Jun 2004 15:13:52 -0000 1.27 --- Location.java 29 Jun 2004 16:36:54 -0000 1.28 *************** *** 121,130 **** public java.io.File getFile() { return file; } public String toString() { if (file == null) return ""; else ! return nice.tools.util.System.prettyPrint(file); } --- 121,136 ---- public java.io.File getFile() { return file; } + private static final String home = java.lang.System.getProperty("user.home"); + public String toString() { if (file == null) return ""; + + String name = file.toString(); + if (name != null && name.startsWith(home)) + return "~" + name.substring(home.length()); else ! return name; } |
|
From: Arjan B. <ar...@us...> - 2004-06-29 15:14:38
|
Update of /cvsroot/nice/Nice/src/bossa/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8932/F:/nice/src/bossa/util Modified Files: Location.java Log Message: Make bossa.util not depend on bossa.parser. Index: Location.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/util/Location.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Location.java 25 Aug 2003 18:09:10 -0000 1.26 --- Location.java 29 Jun 2004 15:13:52 -0000 1.27 *************** *** 15,20 **** import java.util.*; - import bossa.parser.Token; - /** Represents a portion of the input file. --- 15,18 ---- *************** *** 49,63 **** } ! public static Location make (Token t) ! { ! return make(t.beginLine, t.beginColumn, t.endLine, t.endColumn); ! } ! ! /** ! Return a location that goes from start to end. ! */ ! public static Location make (Token start, Token end) { ! return make(start.beginLine, start.beginColumn, end.endLine, end.endColumn); } --- 47,53 ---- } ! public static Location make(int startLine, int startColumn) { ! return make(currentFile, startLine, startColumn, -1, -1); } |
|
From: Arjan B. <ar...@us...> - 2004-06-29 15:14:03
|
Update of /cvsroot/nice/Nice/src/bossa/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8932/F:/nice/src/bossa/parser Modified Files: Parser.jj Loader.java Log Message: Make bossa.util not depend on bossa.parser. Index: Parser.jj =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v retrieving revision 1.245 retrieving revision 1.246 diff -C2 -d -r1.245 -r1.246 *** Parser.jj 24 Jun 2004 14:01:29 -0000 1.245 --- Parser.jj 29 Jun 2004 15:13:48 -0000 1.246 *************** *** 39,43 **** private static IdentExp symb(String name, Token t, boolean quoted) { ! return new IdentExp(new LocatedString(name, Location.make(t),quoted)); } private static IdentExp symb(String name, Token t) --- 39,43 ---- private static IdentExp symb(String name, Token t, boolean quoted) { ! return new IdentExp(new LocatedString(name, makeLocation(t),quoted)); } private static IdentExp symb(String name, Token t) *************** *** 60,63 **** --- 60,75 ---- throw ex; } + + private static Location makeLocation(Token t) + { + return Location.make(t.beginLine, t.beginColumn, t.endLine, t.endColumn); + } + + private static Location makeLocation(Token start, Token end) + { + return Location.make(start.beginLine, start.beginColumn, end.endLine, end.endColumn); + } + + } PARSER_END(Parser) *************** *** 401,405 **** { t=<IDENT> ! { return new LocatedString(t.image, Location.make(t)); } } --- 413,417 ---- { t=<IDENT> ! { return new LocatedString(t.image, makeLocation(t)); } } *************** *** 420,424 **** name=<BACKQUOTEDSTRING> { res = new LocatedString(name.image.substring(1, name.image.length() - 1), ! Location.make(name), true); } | res = ident() --- 432,436 ---- name=<BACKQUOTEDSTRING> { res = new LocatedString(name.image.substring(1, name.image.length() - 1), ! makeLocation(name), true); } | res = ident() *************** *** 457,461 **** )* ! { return new LocatedString(image.toString(), Location.make(start, t)); } } --- 469,473 ---- )* ! { return new LocatedString(image.toString(), makeLocation(start, t)); } } *************** *** 473,477 **** { image.append(".").append(t.image); } )+ ! { return new LocatedString(image.toString(), Location.make(start, t)); } } --- 485,489 ---- { image.append(".").append(t.image); } )+ ! { return new LocatedString(image.toString(), makeLocation(start, t)); } } *************** *** 499,503 **** { t = <FLOATING_POINT_LITERAL> ! { return new LocatedString(t.image, Location.make(t)); } } --- 511,515 ---- { t = <FLOATING_POINT_LITERAL> ! { return new LocatedString(t.image, makeLocation(t)); } } *************** *** 506,510 **** { t = <INTEGER_LITERAL> ! { return new LocatedString(t.image, Location.make(t)); } } --- 518,522 ---- { t = <INTEGER_LITERAL> ! { return new LocatedString(t.image, makeLocation(t)); } } *************** *** 572,576 **** } | { boolean sure = false; } ! [ t="Any" { User.warning(Location.make(t), "The 'Any' keyword is deprecated, leave it away."); } | "!" { sure = true; } ] --- 584,588 ---- } | { boolean sure = false; } ! [ t="Any" { User.warning(makeLocation(t), "The 'Any' keyword is deprecated, leave it away."); } | "!" { sure = true; } ] *************** *** 660,664 **** return new MonotypeConstructor(t,new TypeParameters(p), ! Location.make(first, last)); } } --- 672,676 ---- return new MonotypeConstructor(t,new TypeParameters(p), ! makeLocation(first, last)); } } *************** *** 691,697 **** Monotype res; if (domain != null) ! res = new TupleType(domain, Location.make(start, end)); else ! res = new TypeIdent(new LocatedString("void",Location.make(start, end))); res.nullness = res.absent; --- 703,709 ---- Monotype res; if (domain != null) ! res = new TupleType(domain, makeLocation(start, end)); else ! res = new TypeIdent(new LocatedString("void",makeLocation(start, end))); res.nullness = res.absent; *************** *** 770,774 **** | start="alike" [ "<" p=monotypes() ">" ] ! { res=new Alike(p, Location.make(start)); } { res.nullness = res.absent; } | --- 782,786 ---- | start="alike" [ "<" p=monotypes() ">" ] ! { res=new Alike(p, makeLocation(start)); } { res.nullness = res.absent; } | *************** *** 824,828 **** ( "," part = ParameterTuplePart(statements, types) { parts.add(part); } )+ last=")" ! { Monotype t = new TupleType(types, Location.make(first, last)); t.nullness = Monotype.absent; monotypes.add(t); --- 836,840 ---- ( "," part = ParameterTuplePart(statements, types) { parts.add(part); } )+ last=")" ! { Monotype t = new TupleType(types, makeLocation(first, last)); t.nullness = Monotype.absent; monotypes.add(t); *************** *** 863,872 **** { if (id == null) { ident = new LocatedString("tuple_arg_" + first.beginLine + "_" + first.beginColumn, ! Location.make(first, last)); } else { ident = id; } Expression exp = AssignExp.create(new TupleExp(parts),new IdentExp(ident)); ! exp.setLocation(Location.make(first,last)); statements.add(new ExpressionStmt(exp)); ! t = new TupleType(types, Location.make(first, last)); t.nullness = Monotype.absent; if (val != null) --- 875,884 ---- { if (id == null) { ident = new LocatedString("tuple_arg_" + first.beginLine + "_" + first.beginColumn, ! makeLocation(first, last)); } else { ident = id; } Expression exp = AssignExp.create(new TupleExp(parts),new IdentExp(ident)); ! exp.setLocation(makeLocation(first,last)); statements.add(new ExpressionStmt(exp)); ! t = new TupleType(types, makeLocation(first, last)); t.nullness = Monotype.absent; if (val != null) *************** *** 1167,1171 **** if (prefix != Constraint.True && atoms.size() > 0) throw bossa.util.User.error ! (Location.make(start), "Constraints on type parameters should all be specified in the prefix constraint"); MonotypeVar[] b = (MonotypeVar[]) binders.toArray(new MonotypeVar[binders.size()]); --- 1179,1183 ---- if (prefix != Constraint.True && atoms.size() > 0) throw bossa.util.User.error ! (makeLocation(start), "Constraints on type parameters should all be specified in the prefix constraint"); MonotypeVar[] b = (MonotypeVar[]) binders.toArray(new MonotypeVar[binders.size()]); *************** *** 1593,1597 **** { t="null" ! { return NullExp.create(Location.make(t)); } } --- 1605,1609 ---- { t="null" ! { return NullExp.create(makeLocation(t)); } } *************** *** 1599,1604 **** { Token t; } { ! t = "true" { return ConstantExp.makeBoolean(true, Location.make(t)); } ! | t = "false" { return ConstantExp.makeBoolean(false, Location.make(t)); } } --- 1611,1616 ---- { Token t; } { ! t = "true" { return ConstantExp.makeBoolean(true, makeLocation(t)); } ! | t = "false" { return ConstantExp.makeBoolean(false, makeLocation(t)); } } *************** *** 1632,1636 **** { return ConstantExp.makeChar (new LocatedString(t.image.substring(1, t.image.length() - 1), ! Location.make(t))); } } --- 1644,1648 ---- { return ConstantExp.makeChar (new LocatedString(t.image.substring(1, t.image.length() - 1), ! makeLocation(t))); } } *************** *** 1683,1687 **** arguments = arguments(false) { e = new NewExp(classe, arguments); ! e.setLocation(Location.make(t)); return e; } --- 1695,1699 ---- arguments = arguments(false) { e = new NewExp(classe, arguments); ! e.setLocation(makeLocation(t)); return e; } *************** *** 1736,1745 **** { if (ident == null) { name = new LocatedString("tuple_arg_" + first.beginLine + "_" + first.beginColumn, ! Location.make(first, last)); } else { name = ident; } Expression exp = AssignExp.create(new TupleExp(parts),new IdentExp(name)); ! exp.setLocation(Location.make(first,last)); statements.add(new ExpressionStmt(exp)); ! type = new TupleType(types, Location.make(first, last)); type.nullness = Monotype.absent; return new MonoSymbol(name, type); --- 1748,1757 ---- { if (ident == null) { name = new LocatedString("tuple_arg_" + first.beginLine + "_" + first.beginColumn, ! makeLocation(first, last)); } else { name = ident; } Expression exp = AssignExp.create(new TupleExp(parts),new IdentExp(name)); ! exp.setLocation(makeLocation(first,last)); statements.add(new ExpressionStmt(exp)); ! type = new TupleType(types, makeLocation(first, last)); type.nullness = Monotype.absent; return new MonoSymbol(name, type); *************** *** 1918,1922 **** e1=ConditionalExpression() [ ! { e1.setLocation(Location.make(first, getToken(0))); } op=AssignmentOperator() e2=Expression() --- 1930,1934 ---- e1=ConditionalExpression() [ ! { e1.setLocation(makeLocation(first, getToken(0))); } op=AssignmentOperator() e2=Expression() *************** *** 1931,1935 **** { last=getToken(0); ! e1.setLocation(Location.make(first, last)); return e1; } --- 1943,1947 ---- { last=getToken(0); ! e1.setLocation(makeLocation(first, last)); return e1; } *************** *** 1963,1967 **** [ "?" e1=Expression() start=":" e2=ConditionalExpression() ! { e2.setLocation(Location.make(start, getToken(0))); res=new IfExp(res,e1,e2); } ] --- 1975,1979 ---- [ "?" e1=Expression() start=":" e2=ConditionalExpression() ! { e2.setLocation(makeLocation(start, getToken(0))); res=new IfExp(res,e1,e2); } ] *************** *** 2055,2059 **** e1=CallExp.create(symb("&&",t),e1,CallExp.create(symb(t),e3,e2)); if (t.image.charAt(0) != t_prev.image.charAt(0)) ! User.error(Location.make(t), "All chained comparisons should be in the same direction"); } e3 = e2; --- 2067,2071 ---- e1=CallExp.create(symb("&&",t),e1,CallExp.create(symb(t),e3,e2)); if (t.image.charAt(0) != t_prev.image.charAt(0)) ! User.error(makeLocation(t), "All chained comparisons should be in the same direction"); } e3 = e2; *************** *** 2174,2178 **** res=PrimaryPrefix() ( res=PrimarySuffix(res) )* ! { res.setLocation(Location.make(first, getToken(0))); return res; } } --- 2186,2190 ---- res=PrimaryPrefix() ( res=PrimarySuffix(res) )* ! { res.setLocation(makeLocation(first, getToken(0))); return res; } } *************** *** 2358,2362 **** ) { ! res.setLocation(Location.make(first, getToken(0))); return res; } --- 2370,2374 ---- ) { ! res.setLocation(makeLocation(first, getToken(0))); return res; } *************** *** 2395,2399 **** last = getToken(0); Statement res = new Block(statements); ! res.setLocation(Location.make(first, last)); return res; } --- 2407,2411 ---- last = getToken(0); Statement res = new Block(statements); ! res.setLocation(makeLocation(first, last)); return res; } *************** *** 2479,2483 **** "=" e=Expression() ";" { Expression exp = AssignExp.create(new TupleExp(parts), e); ! exp.setLocation(Location.make(first,last)); return new ExpressionStmt(exp); } } --- 2491,2495 ---- "=" e=Expression() ";" { Expression exp = AssignExp.create(new TupleExp(parts), e); ! exp.setLocation(makeLocation(first,last)); return new ExpressionStmt(exp); } } *************** *** 2587,2591 **** { last = getToken(0); ! e1.setLocation(Location.make(first, last)); return new ExpressionStmt(e1); } --- 2599,2603 ---- { last = getToken(0); ! e1.setLocation(makeLocation(first, last)); return new ExpressionStmt(e1); } *************** *** 2617,2621 **** { last = getToken(0); ! e1.setLocation(Location.make(first, last)); return new ExpressionStmt(e1); } --- 2629,2633 ---- { last = getToken(0); ! e1.setLocation(makeLocation(first, last)); return new ExpressionStmt(e1); } *************** *** 2632,2636 **** | { Token op; Expression e2; ! e1.setLocation(Location.make(first, getToken(0))); } op=AssignmentOperator() --- 2644,2648 ---- | { Token op; Expression e2; ! e1.setLocation(makeLocation(first, getToken(0))); } op=AssignmentOperator() *************** *** 2659,2663 **** ifExp = new IfExp(cond, new StatementExp(s1), (s2 == null ? null : new StatementExp(s2))); ! ifExp.setLocation(Location.make(first, getToken(0))); return new ExpressionStmt(ifExp); } --- 2671,2675 ---- ifExp = new IfExp(cond, new StatementExp(s1), (s2 == null ? null : new StatementExp(s2))); ! ifExp.setLocation(makeLocation(first, getToken(0))); return new ExpressionStmt(ifExp); } *************** *** 2677,2681 **** ifExp = new IfExp(cond, new StatementExp(s1), (s2 == null ? null : new StatementExp(s2))); ! ifExp.setLocation(Location.make(first, getToken(0))); return new ExpressionStmt(ifExp); } --- 2689,2693 ---- ifExp = new IfExp(cond, new StatementExp(s1), (s2 == null ? null : new StatementExp(s2))); ! ifExp.setLocation(makeLocation(first, getToken(0))); return new ExpressionStmt(ifExp); } *************** *** 2736,2740 **** t=":" container=Expression() ")" body=Statement() ! { return LoopStmt.forInLoop(vartype,var,Location.make(t),container,body); } } --- 2748,2752 ---- t=":" container=Expression() ")" body=Statement() ! { return LoopStmt.forInLoop(vartype,var,makeLocation(t),container,body); } } *************** *** 2779,2783 **** { Statement res = new ReturnStmt(val); ! res.setLocation(Location.make(t)); return res; } --- 2791,2795 ---- { Statement res = new ReturnStmt(val); ! res.setLocation(makeLocation(t)); return res; } Index: Loader.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/parser/Loader.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Loader.java 20 Feb 2004 13:10:30 -0000 1.26 --- Loader.java 29 Jun 2004 15:13:51 -0000 1.27 *************** *** 86,90 **** token = token.next; ! User.error(Location.make(token), removeLocation(e.getMessage())); } else --- 86,91 ---- token = token.next; ! User.error(Location.make(token.beginLine, token.beginColumn), ! removeLocation(e.getMessage())); } else |
|
From: Arjan B. <ar...@us...> - 2004-06-27 23:37:33
|
Update of /cvsroot/nice/Nice/testsuite/compiler/typing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1445/F:/nice/testsuite/compiler/typing Modified Files: instanceof.testsuite Log Message: Improved error message for typeExpressions. Index: instanceof.testsuite =================================================================== RCS file: /cvsroot/nice/Nice/testsuite/compiler/typing/instanceof.testsuite,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** instanceof.testsuite 28 May 2004 21:29:20 -0000 1.20 --- instanceof.testsuite 27 Jun 2004 23:37:25 -0000 1.21 *************** *** 321,328 **** }); ! /// PASS bug <T,U | U <: T> U narrow(T obj) { ! if (obj instanceof U) return obj; else --- 321,329 ---- }); ! /// FAIL ! /// Toplevel <T,U | U <: T> U narrow(T obj) { ! if (obj instanceof /* /// FAIL HERE */U) return obj; else |
|
From: Arjan B. <ar...@us...> - 2004-06-27 23:37:33
|
Update of /cvsroot/nice/Nice/src/bossa/syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1445/F:/nice/src/bossa/syntax Modified Files: analyse.nice Log Message: Improved error message for typeExpressions. Index: analyse.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/analyse.nice,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** analyse.nice 25 Feb 2004 11:23:28 -0000 1.101 --- analyse.nice 27 Jun 2004 23:37:24 -0000 1.102 *************** *** 620,625 **** if (type == null) ! throw new bossa.util.UserError(name, "Class " + name + " is not declared"); ! e.value = type; e.representedType = bossa.syntax.Node.getGlobalTypeScope(). --- 620,629 ---- if (type == null) ! { ! if (info.lookupType(name) instanceof MonotypeVar) ! throw new bossa.util.UserError(name, "A type variable cannot be used here"); ! else ! throw new bossa.util.UserError(name, "Class " + name + " is not declared"); ! } e.value = type; e.representedType = bossa.syntax.Node.getGlobalTypeScope(). |
|
From: Arjan B. <ar...@us...> - 2004-06-27 20:33:14
|
Update of /cvsroot/nice/Nice/testsuite/compiler/expressions/arrays In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv934/F:/nice/testsuite/compiler/expressions/arrays Modified Files: compilation.testsuite Log Message: Changed compilation of generic arrays sets fixes bug #921206. Index: compilation.testsuite =================================================================== RCS file: /cvsroot/nice/Nice/testsuite/compiler/expressions/arrays/compilation.testsuite,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** compilation.testsuite 11 Feb 2004 12:46:39 -0000 1.10 --- compilation.testsuite 27 Jun 2004 20:33:06 -0000 1.11 *************** *** 118,119 **** --- 118,123 ---- assert la[0] == 1; assert la[1] == 2; + + /// PASS + let a = new byte[6].fill(int i => byte(i)); + assert a[5] == 5; |
|
From: Arjan B. <ar...@us...> - 2004-06-27 20:33:14
|
Update of /cvsroot/nice/Nice/stdlib/nice/lang/inline In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv934/F:/nice/stdlib/nice/lang/inline Modified Files: ArraySetOp.java Log Message: Changed compilation of generic arrays sets fixes bug #921206. Index: ArraySetOp.java =================================================================== RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/inline/ArraySetOp.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ArraySetOp.java 8 Oct 2003 16:19:04 -0000 1.5 --- ArraySetOp.java 27 Jun 2004 20:33:06 -0000 1.6 *************** *** 70,74 **** private static Method reflectSet = ! ClassType.make("java.lang.reflect.Array").getDeclaredMethod("set", 3); public Type getReturnType (Expression[] args) --- 70,74 ---- private static Method reflectSet = ! ClassType.make("nice.lang.rawArray").getDeclaredMethod("Array_set", 3); public Type getReturnType (Expression[] args) |
|
From: Arjan B. <ar...@us...> - 2004-06-27 20:33:14
|
Update of /cvsroot/nice/Nice/stdlib/nice/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv934/F:/nice/stdlib/nice/lang Modified Files: rawArray.java Log Message: Changed compilation of generic arrays sets fixes bug #921206. Index: rawArray.java =================================================================== RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/rawArray.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** rawArray.java 27 Jun 2004 16:10:24 -0000 1.15 --- rawArray.java 27 Jun 2004 20:33:05 -0000 1.16 *************** *** 93,97 **** { Object res = get(index); ! Array.set(value, index, element); return res; } --- 93,97 ---- { Object res = get(index); ! Array_set(value, index, element); return res; } |
|
From: Daniel B. <bo...@us...> - 2004-06-27 17:34:44
|
Update of /cvsroot/nice/Nice/stdlib/nice/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1487 Modified Files: collections.nice Log Message: Fix the parameter names in the implementation of foreach. Index: collections.nice =================================================================== RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/collections.nice,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** collections.nice 27 Jun 2004 10:00:29 -0000 1.69 --- collections.nice 27 Jun 2004 17:34:34 -0000 1.70 *************** *** 129,136 **** ****************************************************************/ ! <T> foreach(co...@ja...llection, func) { ! for (T elem : coll) ! func(elem); } --- 129,136 ---- ****************************************************************/ ! <T> foreach(col...@ja...llection, action) { ! for (T elem : collection) ! action(elem); } |
|
From: Arjan B. <ar...@us...> - 2004-06-27 16:10:36
|
Update of /cvsroot/nice/Nice/stdlib/nice/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19009/F:/nice/stdlib/nice/lang Modified Files: rawArray.java Log Message: More flexible variant of reflect.Array.set() (not used yet) Index: rawArray.java =================================================================== RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/rawArray.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** rawArray.java 11 Feb 2004 12:46:39 -0000 1.14 --- rawArray.java 27 Jun 2004 16:10:24 -0000 1.15 *************** *** 409,411 **** --- 409,444 ---- } } + + /**************************************************************** + * Utility functions + ****************************************************************/ + + /** + Variant of java.lang.reflect.Array.set that is more flexible about how + the primitive values are boxed. + */ + public static void Array_set(Object array, int index, Object value) + { + if (array instanceof Object[]) + ((Object[])array)[index] = value; + else if (array instanceof int[]) + ((int[])array)[index] = ((Number)value).intValue(); + else if (array instanceof byte[]) + ((byte[])array)[index] = ((Number)value).byteValue(); + else if (array instanceof long[]) + ((long[])array)[index] = ((Number)value).longValue(); + else if (array instanceof char[]) + ((char[])array)[index] = ((Character)value).charValue(); + else if (array instanceof boolean[]) + ((boolean[])array)[index] = ((Boolean)value).booleanValue(); + else if (array instanceof double[]) + ((double[])array)[index] = ((Number)value).doubleValue(); + else if (array instanceof float[]) + ((float[])array)[index] = ((Number)value).floatValue(); + else if (array instanceof short[]) + ((short[])array)[index] = ((Number)value).shortValue(); + else + throw new IllegalArgumentException(); + } + } |
|
From: Daniel B. <bo...@us...> - 2004-06-27 10:00:41
|
Update of /cvsroot/nice/Nice/stdlib/nice/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17449/stdlib/nice/lang Modified Files: collections.nice Log Message: Nicedoc comment for foreach. Index: collections.nice =================================================================== RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/collections.nice,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** collections.nice 22 Jun 2004 09:51:24 -0000 1.68 --- collections.nice 27 Jun 2004 10:00:29 -0000 1.69 *************** *** 24,28 **** ****************************************************************/ ! <T> void foreach(Collection<T> coll, T->void func); // Backward compatibility. `iter` will probably be removed sometime. <T> void iter(Collection<T> coll, T->void func) = coll.foreach(func); --- 24,32 ---- ****************************************************************/ ! /** ! Perform <code>action</code> on each element of <code>collection</code>. ! */ ! <T> void foreach(Collection<T> collection, T->void action); ! // Backward compatibility. `iter` will probably be removed sometime. <T> void iter(Collection<T> coll, T->void func) = coll.foreach(func); |
|
From: Daniel B. <bo...@us...> - 2004-06-27 09:22:09
|
Update of /cvsroot/nice/Nice/stdlib/nice/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11854/stdlib/nice/lang Modified Files: strings.nice Log Message: Replaced join by a generic version on Collection<T>. Contributed by Andy Glover. Index: strings.nice =================================================================== RCS file: /cvsroot/nice/Nice/stdlib/nice/lang/strings.nice,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** strings.nice 20 Mar 2004 11:26:13 -0000 1.16 --- strings.nice 27 Jun 2004 09:22:00 -0000 1.17 *************** *** 95,115 **** /** ! * Join a collection of strings together, interspersing <code>separator</code> * among them. * ! * @param strings the strings to join ! * @param separator the separator string to place between each * string and the one before it */ ! String join(Collection<String> strings, String separator) { StringBuffer buff = new StringBuffer(); ! Iterator<String> it = strings.iterator(); ! while(it.hasNext()) { ! buff.append(it.next()); ! if (it.hasNext()) ! buff.append(separator); } return buff.toString(); } --- 95,118 ---- /** ! * Represent the elements of a collection, interspersing <code>separator</code> * among them. * ! * @param collection the collection to join ! * @param separator the separator string to place between each * string and the one before it */ ! <T> String join (Collection<T> collection, String value = " ") { StringBuffer buff = new StringBuffer(); ! let size = collection.size(); ! var x = 0; ! ! for (T elem : collection) { ! buff.append(elem); ! if(++x < size) ! buff.append(value); } + return buff.toString(); } |
|
From: Daniel B. <bo...@us...> - 2004-06-26 10:47:42
|
Update of /cvsroot/nice/Nice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25295 Modified Files: Makefile Log Message: Ship libs (nice.functional) with the compiler. Index: Makefile =================================================================== RCS file: /cvsroot/nice/Nice/Makefile,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** Makefile 8 Mar 2004 14:40:38 -0000 1.143 --- Makefile 26 Jun 2004 10:47:33 -0000 1.144 *************** *** 45,49 **** stable: clean bootstrap compiler1 testengine archiveOld ! complete: stable compiler2 tools archive2 fixpoint: complete compiler3 archive3 world: fixpoint check test --- 45,49 ---- stable: clean bootstrap compiler1 testengine archiveOld ! complete: stable compiler2 tools libs archive2 fixpoint: complete compiler3 archive3 world: fixpoint check test *************** *** 203,206 **** --- 203,210 ---- $(NICEC1) nice.tools.unit.console + libs: + @echo "Building libraries..." + $(NICEC1) nice.functional + testengine: @echo "Building the testsuite engine..." |
23 messages has been excluded from this view by a project administrator.
