nice-commit Mailing List for The Nice Programming Language (Page 15)
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: Arjan B. <ar...@us...> - 2005-03-12 00:25:21
|
Update of /cvsroot/nice/Nice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3157/Nice Modified Files: NEWS Log Message: Integer literal changes. Index: NEWS =================================================================== RCS file: /cvsroot/nice/Nice/NEWS,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** NEWS 9 Mar 2005 22:56:46 -0000 1.69 --- NEWS 12 Mar 2005 00:25:11 -0000 1.70 *************** *** 41,44 **** --- 41,46 ---- * Added instanceof on option types. For instance 'x instanceof ?String' is equivalent to 'x == null || x instanceof String'. + * Added binary integer literals. Examples: '0B1011' '0b1010_0000_0101_1111'. + * Bug fixes (negative int hex literals, ...) -- |
|
From: Daniel B. <bo...@us...> - 2005-03-12 00:19:28
|
Update of /cvsroot/nice/Nice/testsuite/compiler/syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1390/testsuite/compiler/syntax Modified Files: expressions.testsuite Log Message: Moved binary literal tests with other literal tests. Index: expressions.testsuite =================================================================== RCS file: /cvsroot/nice/Nice/testsuite/compiler/syntax/expressions.testsuite,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** expressions.testsuite 6 Oct 2004 08:23:28 -0000 1.9 --- expressions.testsuite 12 Mar 2005 00:19:16 -0000 1.10 *************** *** 29,32 **** --- 29,35 ---- assert 1_000.000_1d == 1000.0001d; + assert 0xFF == 0b11111111; + assert 0xF000 == 0B1111_0000_0000_0000; + /// PASS let a = new A(_b: 0); |
|
From: Daniel B. <bo...@us...> - 2005-03-12 00:19:27
|
Update of /cvsroot/nice/Nice/testsuite/compiler/expressions/operators/numeric In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1390/testsuite/compiler/expressions/operators/numeric Modified Files: conversion.testsuite Log Message: Moved binary literal tests with other literal tests. Index: conversion.testsuite =================================================================== RCS file: /cvsroot/nice/Nice/testsuite/compiler/expressions/operators/numeric/conversion.testsuite,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** conversion.testsuite 11 Mar 2005 21:32:02 -0000 1.5 --- conversion.testsuite 12 Mar 2005 00:19:16 -0000 1.6 *************** *** 50,56 **** void foo(int) {} void foo(double) {} - - /// PASS - assert 0xFF == 0b11111111; - assert 0xF000 == 0B1111_0000_0000_0000; - --- 50,51 ---- |
|
From: Arjan B. <ar...@us...> - 2005-03-12 00:02:08
|
Update of /cvsroot/nice/Nice/src/bossa/syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29079/F:/nice/src/bossa/syntax Modified Files: constant.nice Log Message: Fix handling of non decimal litetal int/long distinction. Index: constant.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/constant.nice,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** constant.nice 11 Mar 2005 21:32:01 -0000 1.12 --- constant.nice 12 Mar 2005 00:01:55 -0000 1.13 *************** *** 105,109 **** try { ! long value = parseInteger(removeUnderscores(rep)); mlsub.typing.Polytype type; --- 105,109 ---- try { ! (long value, boolean isDecimal) = parseInteger(removeUnderscores(rep)); mlsub.typing.Polytype type; *************** *** 129,132 **** --- 129,147 ---- object = value; } + else if (!isLong && !isDecimal && (-(1L << 32) ) < value < (1L << 32)) + { // handle 32 bit bin/hex literals which don't fit in a int + if (value > 0) + value = (1L << 32) - value; + else + value = (1L << 32) + value; + + type = nice.tools.typing.PrimitiveType.intPolytype; + tc = nice.tools.typing.PrimitiveType.intTC; + object = value; + } + else if (!isLong && !isDecimal) + { // a non decimal long must be explicit + throw User.error(representation, rep + " is too large for an int literal"); + } else { *************** *** 164,168 **** ! private long parseInteger(String rep) { int radix = 10; --- 179,183 ---- ! private (long, boolean) parseInteger(String rep) { int radix = 10; *************** *** 206,210 **** result = -result; ! return result; } --- 221,225 ---- result = -result; ! return (result, radix == 10); } |
|
From: Daniel B. <bo...@us...> - 2005-03-11 23:20:53
|
Update of /cvsroot/nice/Nice/regtest/coreJava In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18264/regtest/coreJava Modified Files: coreJava.code Log Message: Check that 0xFFFFFFFF is an int. Index: coreJava.code =================================================================== RCS file: /cvsroot/nice/Nice/regtest/coreJava/coreJava.code,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** coreJava.code 10 Mar 2005 14:08:59 -0000 1.31 --- coreJava.code 11 Mar 2005 23:20:43 -0000 1.32 *************** *** 47,50 **** --- 47,55 ---- p("" + j); + { + int x = 0xFFFFFFFF; + p("" + x); + } + p("" + (i++)); p("" + i); |
|
From: Daniel B. <bo...@us...> - 2005-03-11 22:23:42
|
Update of /cvsroot/nice/Nice/src/nice/tools/visibility In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3513/src/nice/tools/visibility Modified Files: flat.nice Log Message: Removed useless assertion. Index: flat.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/nice/tools/visibility/flat.nice,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** flat.nice 11 Mar 2005 17:35:48 -0000 1.1 --- flat.nice 11 Mar 2005 22:23:32 -0000 1.2 *************** *** 29,34 **** while (s != null) { - assert this != null; - ?List<Sym> temp = s.map[key]; if (temp != null) --- 29,32 ---- |
|
From: Arjan B. <ar...@us...> - 2005-03-11 21:32:27
|
Update of /cvsroot/nice/Nice/testsuite/compiler/expressions/operators/numeric In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22573/F:/nice/testsuite/compiler/expressions/operators/numeric Modified Files: conversion.testsuite Log Message: Implemented binary literals like '0b1111000'. Index: conversion.testsuite =================================================================== RCS file: /cvsroot/nice/Nice/testsuite/compiler/expressions/operators/numeric/conversion.testsuite,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** conversion.testsuite 11 Jun 2003 12:21:25 -0000 1.4 --- conversion.testsuite 11 Mar 2005 21:32:02 -0000 1.5 *************** *** 50,51 **** --- 50,56 ---- void foo(int) {} void foo(double) {} + + /// PASS + assert 0xFF == 0b11111111; + assert 0xF000 == 0B1111_0000_0000_0000; + |
|
From: Arjan B. <ar...@us...> - 2005-03-11 21:32:14
|
Update of /cvsroot/nice/Nice/src/bossa/syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22573/F:/nice/src/bossa/syntax Modified Files: constant.nice Log Message: Implemented binary literals like '0b1111000'. Index: constant.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/constant.nice,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** constant.nice 17 Jan 2005 13:16:57 -0000 1.11 --- constant.nice 11 Mar 2005 21:32:01 -0000 1.12 *************** *** 182,185 **** --- 182,190 ---- radix = 16; } + else if (rep.startsWith("0b", index) || rep.startsWith("0B", index)) + { + index += 2; + radix = 2; + } else if (rep.startsWith("#", index)) { |
|
From: Arjan B. <ar...@us...> - 2005-03-11 21:32:14
|
Update of /cvsroot/nice/Nice/src/bossa/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22573/F:/nice/src/bossa/parser Modified Files: Parser.jj Log Message: Implemented binary literals like '0b1111000'. Index: Parser.jj =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v retrieving revision 1.316 retrieving revision 1.317 diff -C2 -d -r1.316 -r1.317 *** Parser.jj 10 Mar 2005 14:08:58 -0000 1.316 --- Parser.jj 11 Mar 2005 21:32:00 -0000 1.317 *************** *** 268,271 **** --- 268,272 ---- | <HEX_LITERAL> (["l","L"])? | <OCTAL_LITERAL> (["l","L"])? + | <BIN_LITERAL> (["l","L"])? > | *************** *** 275,278 **** --- 276,282 ---- | < #OCTAL_LITERAL: "0" (["0"-"7","_"])* > + | + < #BIN_LITERAL: "0" ["b","B"] (["0","1","_"])+ > + } |
|
From: Daniel B. <bo...@us...> - 2005-03-11 18:05:04
|
Update of /cvsroot/nice/Nice/src/nice/tools/visibility In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31269/src/nice/tools/visibility Modified Files: api.nice Log Message: Display scope names. Index: api.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/nice/tools/visibility/api.nice,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** api.nice 6 Mar 2005 12:55:56 -0000 1.1 --- api.nice 11 Mar 2005 18:04:48 -0000 1.2 *************** *** 34,37 **** --- 34,39 ---- void addImplicitOpen(Scope<Sym>); + toString() = name; + private MultiMap<String, Sym> map = new MultiMap(); private MultiMap<String, Sym> publicMap = new MultiMap(); |
|
From: Daniel B. <bo...@us...> - 2005-03-11 17:36:34
|
Update of /cvsroot/nice/Nice/src/nice/tools/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23334/src/nice/tools/compiler Modified Files: interface.nice Log Message: Each module (and package) now has its own Scope. All symbols are still public, but only visible to packages that import their englobing package. Index: interface.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/nice/tools/compiler/interface.nice,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** interface.nice 14 Jan 2005 18:53:51 -0000 1.9 --- interface.nice 11 Mar 2005 17:35:50 -0000 1.10 *************** *** 21,24 **** --- 21,25 ---- import bossa.modules; + import mlsub.compilation; void compile(Compilation compilation, String mainPackage, |
|
From: Daniel B. <bo...@us...> - 2005-03-11 17:36:32
|
Update of /cvsroot/nice/Nice/src/nice/tools/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23334/src/nice/tools/doc Modified Files: main.nice Log Message: Each module (and package) now has its own Scope. All symbols are still public, but only visible to packages that import their englobing package. Index: main.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/nice/tools/doc/main.nice,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** main.nice 8 Feb 2005 10:41:39 -0000 1.9 --- main.nice 11 Mar 2005 17:35:50 -0000 1.10 *************** *** 8,14 **** import nice.doc; import nice.tools.compiler; import nice.tools.compiler.console; ! import bossa.modules.*; /** --- 8,15 ---- import nice.doc; + import nice.getopt; import nice.tools.compiler; import nice.tools.compiler.console; ! import bossa.modules; /** |
|
From: Daniel B. <bo...@us...> - 2005-03-11 17:36:30
|
Update of /cvsroot/nice/Nice/src/nice/tools/repository/publish In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23334/src/nice/tools/repository/publish Modified Files: main.nice Log Message: Each module (and package) now has its own Scope. All symbols are still public, but only visible to packages that import their englobing package. Index: main.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/nice/tools/repository/publish/main.nice,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.nice 24 Feb 2005 16:38:24 -0000 1.2 --- main.nice 11 Mar 2005 17:35:49 -0000 1.3 *************** *** 20,24 **** --- 20,26 ---- import nice.tools.repository; + import nice.tools.compiler; import nice.tools.compiler.console; + import nice.tools.unit; import nice.tools.unit.console; |
|
From: Daniel B. <bo...@us...> - 2005-03-11 17:36:29
|
Update of /cvsroot/nice/Nice/src/nice/tools/unit/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23334/src/nice/tools/unit/console Modified Files: main.nice Log Message: Each module (and package) now has its own Scope. All symbols are still public, but only visible to packages that import their englobing package. Index: main.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/nice/tools/unit/console/main.nice,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** main.nice 24 Feb 2005 16:38:23 -0000 1.4 --- main.nice 11 Mar 2005 17:35:48 -0000 1.5 *************** *** 3,6 **** --- 3,7 ---- import nice.tools.unit; import nice.doc; + import nice.getopt; void main(String[] args) |
|
From: Daniel B. <bo...@us...> - 2005-03-11 17:36:27
|
Update of /cvsroot/nice/Nice/testsuite/compiler/visibility/expressions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23334/testsuite/compiler/visibility/expressions Modified Files: public.testsuite Log Message: Each module (and package) now has its own Scope. All symbols are still public, but only visible to packages that import their englobing package. Index: public.testsuite =================================================================== RCS file: /cvsroot/nice/Nice/testsuite/compiler/visibility/expressions/public.testsuite,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** public.testsuite 6 Mar 2005 13:12:46 -0000 1.1 --- public.testsuite 11 Mar 2005 17:35:45 -0000 1.2 *************** *** 1,3 **** ! /// FAIL bug /// package a /// Toplevel --- 1,3 ---- ! /// FAIL /// package a /// Toplevel *************** *** 30,31 **** --- 30,58 ---- /// package d import c,b {} + + /// PASS + // Check that methods in the package do not hide methods with the same name + // in imported packages. + /// package a + /// Toplevel + class A<T> { public T[] elements; } + /// package b import a + new B(elements: new int[0]).size(); + /// Toplevel + class B<T> extends A<T> { + int size() = this.elements.size(); + } + + + /// PASS + // Check that methods in the package do not hide methods with the same name + // in imported packages. + /// package a + /// Toplevel + class A {} + public void foo(A a) {} + + /// package b import a + /// Toplevel + class X { A a; } + void foo(X x) = foo(x.a); |
|
From: Daniel B. <bo...@us...> - 2005-03-11 17:36:27
|
Update of /cvsroot/nice/Nice/testsuite/compiler/typing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23334/testsuite/compiler/typing Modified Files: inference.testsuite Log Message: Each module (and package) now has its own Scope. All symbols are still public, but only visible to packages that import their englobing package. Index: inference.testsuite =================================================================== RCS file: /cvsroot/nice/Nice/testsuite/compiler/typing/inference.testsuite,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** inference.testsuite 22 Nov 2004 23:21:06 -0000 1.10 --- inference.testsuite 11 Mar 2005 17:35:46 -0000 1.11 *************** *** 132,136 **** println( L1[0] ); ! /// PASS let testmap = new HashMap(); for(s : testmap.mapKeys()) --- 132,138 ---- println( L1[0] ); ! /// PASS bug skip ! // This bug chaotically depends on factors like symbol treatment order, ! // so we skip it for now to avoid spurious result changes let testmap = new HashMap(); for(s : testmap.mapKeys()) *************** *** 232,237 **** toString(Cell c) = c.value.toString; ! /// PASS // bug #923429 simplified let table1 = new HashMap(); let table2 = new HashMap(); --- 234,241 ---- toString(Cell c) = c.value.toString; ! /// PASS bug skip // bug #923429 simplified + // This bug chaotically depends on factors like symbol treatment order, + // so we skip it for now to avoid spurious result changes let table1 = new HashMap(); let table2 = new HashMap(); |
|
From: Daniel B. <bo...@us...> - 2005-03-11 17:36:24
|
Update of /cvsroot/nice/Nice/src/bossa/syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23334/src/bossa/syntax Modified Files: typedef.nice tools.nice scope.nice retypedMethod.nice overloadedsymbol.nice methodbody.nice javaclass.nice javaMethod.nice dispatch.java.bootstrap Node.java Module.java Log Message: Each module (and package) now has its own Scope. All symbols are still public, but only visible to packages that import their englobing package. Index: dispatch.java.bootstrap =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/dispatch.java.bootstrap,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** dispatch.java.bootstrap 6 Mar 2005 01:34:26 -0000 1.54 --- dispatch.java.bootstrap 11 Mar 2005 17:35:52 -0000 1.55 *************** *** 28,32 **** public static void resetJavaClasses() {} ! public static VarScope createGlobalVarScope() { return null; } --- 28,32 ---- public static void resetJavaClasses() {} ! public static VarScope createGlobalVarScope(int dummy, nice.tools.visibility.Scope scope) { return null; } Index: methodbody.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/methodbody.nice,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** methodbody.nice 6 Mar 2005 01:34:26 -0000 1.13 --- methodbody.nice 11 Mar 2005 17:35:52 -0000 1.14 *************** *** 255,259 **** resolvePatterns(notNull(typeScope), module.scope, formals); ! symbols = notNull(scope).lookup(name); } --- 255,259 ---- resolvePatterns(notNull(typeScope), module.scope, formals); ! symbols = module.scope.lookup(name); } Index: scope.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/scope.nice,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** scope.nice 6 Mar 2005 12:55:57 -0000 1.5 --- scope.nice 11 Mar 2005 17:35:52 -0000 1.6 *************** *** 22,26 **** private Scope<VarSymbol> impl = new Scope(name: "", parent: null); ! addSymbol(VarSymbol sym) = impl.add(sym.getName().toString(), sym); removeSymbol(VarSymbol sym) = impl.remove(sym.getName().toString(), sym); --- 22,27 ---- private Scope<VarSymbol> impl = new Scope(name: "", parent: null); ! addSymbol(VarSymbol sym) = ! impl.add(sym.getName().toString(), sym, visibility: general); removeSymbol(VarSymbol sym) = impl.remove(sym.getName().toString(), sym); *************** *** 31,42 **** // If there is any method by that name waiting, load it. ! loadJavaMethods(s, this); ! ! let res = impl[s]; ! if (res == null) ! return Collections.EMPTY_LIST; ! else ! return new LinkedList(res); } --- 32,40 ---- // If there is any method by that name waiting, load it. ! loadJavaMethods(s); ! // Return all visible symbols with the given name, without preference ! // for those in the current module or package. ! return impl.getFlat(s); } *************** *** 49,52 **** --- 47,55 ---- } + VarScope createGlobalVarScope(int, Scope<VarSymbol> scope) + { + return new GlobalVarScope(impl: scope); + } + /** The global, toplevel type scope. *************** *** 129,133 **** return res; ! return cast(lookupJavaClass(notNull(name), loc, Module.javaScope)); } } --- 132,136 ---- return res; ! return cast(lookupJavaClass(notNull(name), loc)); } } Index: overloadedsymbol.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/overloadedsymbol.nice,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** overloadedsymbol.nice 17 Jan 2005 13:16:57 -0000 1.15 --- overloadedsymbol.nice 11 Mar 2005 17:35:52 -0000 1.16 *************** *** 456,460 **** } ! List<VarSymbol> removeNonMinimal(List<VarSymbol> symbols) { List<VarSymbol> removed = new ArrayList(); --- 456,460 ---- } ! List<VarSymbol> removeNonMinimal(Collection<VarSymbol> symbols) { List<VarSymbol> removed = new ArrayList(); Index: retypedMethod.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/retypedMethod.nice,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** retypedMethod.nice 6 Mar 2005 01:34:26 -0000 1.8 --- retypedMethod.nice 11 Mar 2005 17:35:52 -0000 1.9 *************** *** 291,295 **** private void removeFromScope(MethodDeclaration m) { ! Module.javaScope.removeSymbol(m.getSymbol()); unregisterDispatchTest(m); } --- 291,296 ---- private void removeFromScope(MethodDeclaration m) { ! let sym = m.getSymbol(); ! Node.compilation.javaScope.remove(sym.getName().toString(), sym); unregisterDispatchTest(m); } Index: typedef.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/typedef.nice,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** typedef.nice 6 Mar 2005 01:34:26 -0000 1.20 --- typedef.nice 11 Mar 2005 17:35:51 -0000 1.21 *************** *** 56,59 **** --- 56,68 ---- this.createTC(); + // Add the symbol immediately, to make sure another one is not created + // for the same (bytecode) class. + try { + Node.getGlobalTypeScope().addSymbol(tc); + } + catch(TypeScope.DuplicateName e){ + User.error(this.location(), e.getMessage()); + } + typeParametersVariances = null; *************** *** 131,135 **** tcToTypeDef.put(tc, this); mlsub.typing.Typing.introduce(tc); - this.addTypeSymbol(tc); } --- 140,143 ---- Index: javaMethod.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/javaMethod.nice,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** javaMethod.nice 6 Mar 2005 01:34:26 -0000 1.9 --- javaMethod.nice 11 Mar 2005 17:35:52 -0000 1.10 *************** *** 208,212 **** * to make them available to the nice code. */ ! void fetchMethods(mlsub.typing.TypeConstructor tc, gnu.bytecode.ClassType classType, VarScope scope) { try { --- 208,212 ---- * to make them available to the nice code. */ ! void fetchMethods(mlsub.typing.TypeConstructor tc, gnu.bytecode.ClassType classType) { try { *************** *** 215,219 **** for (?gnu.bytecode.Field f = classType.getFields(); f != null; f = f.getNext()) if (retyped.get(f) == null) ! addJavaSymbol(f, makeJavaFieldAccess(f), scope); for (?gnu.bytecode.Method m = classType.getMethods(); m != null; m = m.getNext()) --- 215,219 ---- for (?gnu.bytecode.Field f = classType.getFields(); f != null; f = f.getNext()) if (retyped.get(f) == null) ! addJavaSymbol(f, makeJavaFieldAccess(f)); for (?gnu.bytecode.Method m = classType.getMethods(); m != null; m = m.getNext()) *************** *** 301,305 **** /** Called when the given name is going to be needed. */ ! void loadJavaMethods(String name, VarScope scope) { ?List<gnu.bytecode.Method> methods = knownMethods.get(name); --- 301,305 ---- /** Called when the given name is going to be needed. */ ! void loadJavaMethods(String name) { ?List<gnu.bytecode.Method> methods = knownMethods.get(name); *************** *** 316,329 **** continue; ! addJavaSymbol(m, makeJavaMethod(m, false), scope); } } ! void addJavaSymbol(gnu.bytecode.AttrContainer m, ?MethodDeclaration def, VarScope scope) { if (def == null) return; ! scope.addSymbol(def.getSymbol()); retyped.put(m, def); } --- 316,330 ---- continue; ! addJavaSymbol(m, makeJavaMethod(m, false)); } } ! void addJavaSymbol(gnu.bytecode.AttrContainer m, ?MethodDeclaration def) { if (def == null) return; ! Node.compilation.javaScope.add ! (def.getName().toString(), def.getSymbol(), visibility: general); retyped.put(m, def); } Index: javaclass.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/javaclass.nice,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** javaclass.nice 6 Mar 2005 01:34:26 -0000 1.7 --- javaclass.nice 11 Mar 2005 17:35:52 -0000 1.8 *************** *** 59,63 **** let old = setTypeConstructorForJavaClass ! (definition.compilation(), definition.getTC(), classType); if (old != null) --- 59,63 ---- let old = setTypeConstructorForJavaClass ! (definition.getTC(), classType, definition.compilation()); if (old != null) *************** *** 72,76 **** return; ! fetchMethods(definition.getTC(), cast(definition.getJavaType()), Module.javaScope); } --- 72,76 ---- return; ! fetchMethods(definition.getTC(), cast(definition.getJavaType())); } *************** *** 86,90 **** */ ?mlsub.typing.TypeConstructor setTypeConstructorForJavaClass ! (bossa.modules.Compilation compilation, mlsub.typing.TypeConstructor tc, gnu.bytecode.Type type) = compilation.javaTypeConstructors.put(type, tc); --- 86,91 ---- */ ?mlsub.typing.TypeConstructor setTypeConstructorForJavaClass ! (mlsub.typing.TypeConstructor tc, gnu.bytecode.Type type, ! bossa.modules.Compilation compilation) = compilation.javaTypeConstructors.put(type, tc); *************** *** 115,120 **** mlsub.typing.TypeConstructor createJavaType ! (bossa.modules.Compilation compilation, String className, ! gnu.bytecode.Type javaType, VarScope scope) { if (bossa.util.Debug.javaTypes) --- 116,122 ---- mlsub.typing.TypeConstructor createJavaType ! (String className, ! gnu.bytecode.Type javaType, ! bossa.modules.Compilation compilation) { if (bossa.util.Debug.javaTypes) *************** *** 208,212 **** if (javaType instanceof gnu.bytecode.ClassType) ! fetchMethods(res, javaType, scope); return res; --- 210,214 ---- if (javaType instanceof gnu.bytecode.ClassType) ! fetchMethods(res, javaType); return res; *************** *** 235,240 **** } ! ?mlsub.typing.TypeConstructor lookupJavaClass(String className, ?Location loc, ! VarScope scope) { let classType = nice.tools.code.TypeImport.lookup(className, loc); --- 237,241 ---- } ! ?mlsub.typing.TypeConstructor lookupJavaClass(String className, ?Location loc) { let classType = nice.tools.code.TypeImport.lookup(className, loc); *************** *** 248,251 **** return compilation.javaTypeConstructors.get(classType); ! return createJavaType(compilation, classType.getName(), classType, scope); } --- 249,252 ---- return compilation.javaTypeConstructors.get(classType); ! return createJavaType(classType.getName(), classType, compilation); } Index: tools.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/tools.nice,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** tools.nice 8 Mar 2005 19:33:19 -0000 1.106 --- tools.nice 11 Mar 2005 17:35:52 -0000 1.107 *************** *** 164,167 **** --- 164,168 ---- native mlsub.typing.Polytype Expression.getType(); GlobalTypeScope getGlobalTypeScope() = native GlobalTypeScope Node.getGlobalTypeScope(); + bossa.modules.Compilation compilation() = native Node.compilation; <T> String map(String, String, String, T[]) = native String bossa.util.Util.map(String, String, String, Object[]); <T> String map(String, String, String, ?Collection<T>) = native String bossa.util.Util.map(String, String, String, Collection); *************** *** 189,192 **** --- 190,194 ---- List<VarSymbol> globalLookup(VarScope, LocatedString) = native List VarScope.globalLookup(LocatedString); Map<gnu.bytecode.Type,mlsub.typing.TypeConstructor> javaTypeConstructors(bossa.modules.Compilation ) = native bossa.modules.Compilation.javaTypeConstructors; + Scope<VarSymbol> javaScope(bossa.modules.Compilation) = native bossa.modules.Compilation.javaScope; ?LocatedString name(Symbol) = native Symbol.name; ?mlsub.typing.TypeConstructor associatedTC(mlsub.typing.Interface) = native mlsub.typing.TypeConstructor mlsub.typing.Interface.associatedTC(); *************** *** 219,223 **** gnu.expr.QuoteExp QuoteExp_undefined_exp() = native gnu.expr.QuoteExp.undefined_exp; GlobalVarScope scope(Module) = native Module.scope; - GlobalVarScope javaScope() = native Module.javaScope; void addSymbol(VarScope, VarSymbol) = native void VarScope.addSymbol(Symbol); --- 221,224 ---- Index: Node.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Node.java,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** Node.java 6 Mar 2005 12:55:57 -0000 1.69 --- Node.java 11 Mar 2005 17:35:52 -0000 1.70 *************** *** 118,135 **** */ - private static TypeScope globalTypeScope; public static final TypeScope getGlobalTypeScope() { ! return globalTypeScope; } public static final bossa.modules.Package getGlobalTypeScopeModule() { ! return globalTypeScope.getPackage(); } public static mlsub.typing.TypeConstructor globalTypeScopeLookup(String name, Location loc) { ! return globalTypeScope.globalLookup(name, loc); } --- 118,134 ---- */ public static final TypeScope getGlobalTypeScope() { ! return compilation.globalTypeScope; } public static final bossa.modules.Package getGlobalTypeScopeModule() { ! return compilation.globalTypeScope.getPackage(); } public static mlsub.typing.TypeConstructor globalTypeScopeLookup(String name, Location loc) { ! return compilation.globalTypeScope.globalLookup(name, loc); } *************** *** 143,149 **** { compilation = pkg.getCompilation(); ! globalTypeScope = dispatch.createGlobalTypeScope(); } ! globalTypeScope.setPackage(pkg); } --- 142,149 ---- { compilation = pkg.getCompilation(); ! if (compilation.globalTypeScope == null) ! compilation.globalTypeScope = dispatch.createGlobalTypeScope(); } ! compilation.globalTypeScope.setPackage(pkg); } *************** *** 151,155 **** { setPackage(pkg); ! buildScope(null, globalTypeScope); } --- 151,155 ---- { setPackage(pkg); ! buildScope(null, compilation.globalTypeScope); } *************** *** 179,183 **** this.scope = outer; this.scope.addSymbols(varSymbols); ! typeOuter = globalTypeScope; this.typeScope = typeOuter; break; --- 179,183 ---- this.scope = outer; this.scope.addSymbols(varSymbols); ! typeOuter = compilation.globalTypeScope; this.typeScope = typeOuter; break; *************** *** 305,309 **** } catch(UserError ex){ ! globalTypeScope.getPackage().getCompilation().error(ex); } } --- 305,309 ---- } catch(UserError ex){ ! compilation.globalTypeScope.getPackage().getCompilation().error(ex); } } Index: Module.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Module.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Module.java 6 Mar 2005 01:34:26 -0000 1.25 --- Module.java 11 Mar 2005 17:35:52 -0000 1.26 *************** *** 25,37 **** String name; ! static VarScope javaScope; ! ! public Module(bossa.modules.Package pkg, String name, VarScope scope) { this.pkg = pkg; this.name = name; ! this.scope = scope; ! ! javaScope = scope; } --- 25,34 ---- String name; ! public Module(bossa.modules.Package pkg, String name, ! nice.tools.visibility.Scope scope) { this.pkg = pkg; this.name = name; ! this.scope = dispatch.createGlobalVarScope(0, scope); } |
|
From: Daniel B. <bo...@us...> - 2005-03-11 17:36:08
|
Update of /cvsroot/nice/Nice/src/bossa/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23334/src/bossa/modules Modified Files: Package.java Content.java Compilation.nice Compilation.java Log Message: Each module (and package) now has its own Scope. All symbols are still public, but only visible to packages that import their englobing package. Index: Compilation.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/modules/Compilation.nice,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Compilation.nice 6 Mar 2005 01:34:27 -0000 1.31 --- Compilation.nice 11 Mar 2005 17:35:54 -0000 1.32 *************** *** 16,19 **** --- 16,20 ---- import nice.tools.locator; import nice.tools.repository; + import nice.tools.visibility; /** *************** *** 55,59 **** Map<String,Package> packages = new HashMap(); Map<String,mlsub.typing.TypeConstructor> javaTypeConstructors = new HashMap(); ! bossa.syntax.VarScope globalScope = cast(null); void setMainPackage(String packageName) --- 56,63 ---- Map<String,Package> packages = new HashMap(); Map<String,mlsub.typing.TypeConstructor> javaTypeConstructors = new HashMap(); ! nice.tools.visibility.Scope</*VarSymbol*/bossa.syntax.Symbol> javaScope = ! new nice.tools.visibility.Scope(name: "java", parent: null); ! ! bossa.syntax.TypeScope globalTypeScope = cast(null); void setMainPackage(String packageName) Index: Package.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/modules/Package.java,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** Package.java 6 Mar 2005 01:34:27 -0000 1.138 --- Package.java 11 Mar 2005 17:35:53 -0000 1.139 *************** *** 74,79 **** compilation.packages.put(name.toString(), this); ! if (compilation.globalScope == null) ! compilation.globalScope = bossa.syntax.dispatch.createGlobalVarScope(); source = compilation.locator.find(this); --- 74,78 ---- compilation.packages.put(name.toString(), this); ! packageScope = new nice.tools.visibility.Scope(getName(), null); source = compilation.locator.find(this); *************** *** 102,106 **** if (!name.toString().equals("nice.lang") && !Debug.ignorePrelude) imports.add(new LocatedString("nice.lang", ! bossa.util.Location.nowhere())); setOpens(opens); --- 101,105 ---- if (!name.toString().equals("nice.lang") && !Debug.ignorePrelude) imports.add(new LocatedString("nice.lang", ! bossa.util.Location.nowhere())); setOpens(opens); *************** *** 108,112 **** List p = this.getImports(); for (Iterator i = p.iterator(); i.hasNext();) ! source.someImportModified(((Package) i.next()).lastModification()); } --- 107,118 ---- List p = this.getImports(); for (Iterator i = p.iterator(); i.hasNext();) ! { ! Package imported = (Package) i.next(); ! source.someImportModified(imported.lastModification()); ! if (imported != this) ! packageScope.addImplicitOpen(imported.packageScope); ! } ! ! packageScope.addImplicitOpen(compilation.javaScope); } *************** *** 194,198 **** { LocatedString s = (LocatedString) i.next(); ! importedPackages.add(make(s, compilation, false)); } } --- 200,206 ---- { LocatedString s = (LocatedString) i.next(); ! Package p = make(s, compilation, false); ! if (! importedPackages.contains(p)) ! importedPackages.add(p); } } *************** *** 834,837 **** --- 842,847 ---- bossa.syntax.Module compiledModule = null; + nice.tools.visibility.Scope packageScope; + /** @return true if this package was loaded from an interface file, Index: Compilation.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/modules/Compilation.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Compilation.java 6 Mar 2005 01:34:27 -0000 1.11 --- Compilation.java 11 Mar 2005 17:35:54 -0000 1.12 *************** *** 37,41 **** public java.util.Map javaTypeConstructors; ! bossa.syntax.VarScope globalScope; } --- 37,42 ---- public java.util.Map javaTypeConstructors; ! nice.tools.visibility.Scope javaScope; ! public bossa.syntax.TypeScope globalTypeScope; } Index: Content.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/modules/Content.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Content.java 6 Mar 2005 01:34:27 -0000 1.18 --- Content.java 11 Mar 2005 17:35:54 -0000 1.19 *************** *** 69,73 **** else { ! pkg.compiledModule = new bossa.syntax.Module(pkg, pkg.getName(), pkg.compilation.globalScope); readers = compiled.getDefinitions(); } --- 69,74 ---- else { ! pkg.compiledModule = ! new bossa.syntax.Module(pkg, pkg.getName(), pkg.packageScope); readers = compiled.getDefinitions(); } *************** *** 113,118 **** bossa.util.Location.setCurrentFile(unit.file); ! bossa.syntax.Module module = pkg.compiledModule != null ? ! pkg.compiledModule : new bossa.syntax.Module(pkg, unit.name, pkg.compilation.globalScope); Definition.currentModule = module; --- 114,129 ---- bossa.util.Location.setCurrentFile(unit.file); ! bossa.syntax.Module module; ! ! if (pkg.compiledModule != null) ! module = pkg.compiledModule; ! else ! { ! nice.tools.visibility.Scope scope = ! new nice.tools.visibility.Scope(unit.name, pkg.packageScope); ! ! module = new bossa.syntax.Module(pkg, unit.name, scope); ! } ! Definition.currentModule = module; |
|
From: Daniel B. <bo...@us...> - 2005-03-11 17:35:57
|
Update of /cvsroot/nice/Nice/src/nice/tools/visibility In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23334/src/nice/tools/visibility Added Files: flat.nice Log Message: Each module (and package) now has its own Scope. All symbols are still public, but only visible to packages that import their englobing package. --- NEW FILE: flat.nice --- /**************************************************************************/ /* N I C E */ /* A high-level object-oriented research language */ /* (c) Daniel Bonniot 2005 */ /* */ /* 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.visibility; /** Flat lookup mode. In this mode, symbols in the current scope do not shadow <i>visibile</i> symbols in imported scopes. @author Daniel Bonniot (bo...@us...) */ <Sym> List<Sym> getFlat(Scope<Sym> this, String key) { List<Sym> res = new LinkedList(); ?Scope<Sym> s = this; while (s != null) { assert this != null; ?List<Sym> temp = s.map[key]; if (temp != null) res.addAll(temp); for (o : s.opens) { temp = o.publicMap[key]; if (temp != null) res.addAll(temp); } s = s.parent; } return res; } |
|
From: Arjan B. <ar...@us...> - 2005-03-10 23:42:49
|
Update of /cvsroot/nice/Nice/src/bossa/syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11888/F:/nice/src/bossa/syntax Modified Files: symbol.nice Log Message: Fix error message for static fields. Index: symbol.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/symbol.nice,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** symbol.nice 1 Mar 2005 22:51:12 -0000 1.14 --- symbol.nice 10 Mar 2005 23:42:38 -0000 1.15 *************** *** 325,328 **** --- 325,334 ---- if (this.isFieldAccess()) { + if (this.isStaticFieldAccess()) + { + let JavaFieldAccess f = cast(this.getFieldAccessMethod()); + return notNull(name) + " is a field of class " + f.className; + } + if (arguments.size() == 0) return notNull(name) + " is not defined"; |
|
From: Daniel B. <bo...@us...> - 2005-03-10 14:09:11
|
Update of /cvsroot/nice/Nice/regtest/coreJava In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22023/regtest/coreJava Modified Files: coreJava.code Log Message: Fixed "long" assignment operators: <<=, >>= and >>>= Index: coreJava.code =================================================================== RCS file: /cvsroot/nice/Nice/regtest/coreJava/coreJava.code,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** coreJava.code 6 Oct 2004 16:14:02 -0000 1.30 --- coreJava.code 10 Mar 2005 14:08:59 -0000 1.31 *************** *** 87,90 **** --- 87,110 ---- p("" + (j >> 3)); + j = 123000000000L; + j <<= 1; p("" + j); + j >>= 1; p("" + j); + j >>>= 1; p("" + j); + + j = -123000000000L; + j <<= 1; p("" + j); + j >>= 1; p("" + j); + j >>>= 1; p("" + j); + + i = 123; + i <<= 1; p("" + i); + i >>= 1; p("" + i); + i >>>= 1; p("" + i); + + i = -123; + i <<= 1; p("" + i); + i >>= 1; p("" + i); + i >>>= 1; p("" + i); + // floats float x = 0.1f; |
|
From: Daniel B. <bo...@us...> - 2005-03-10 14:09:08
|
Update of /cvsroot/nice/Nice/src/bossa/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22023/src/bossa/parser Modified Files: Parser.jj Log Message: Fixed "long" assignment operators: <<=, >>= and >>>= Index: Parser.jj =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v retrieving revision 1.315 retrieving revision 1.316 diff -C2 -d -r1.315 -r1.316 *** Parser.jj 9 Mar 2005 21:50:18 -0000 1.315 --- Parser.jj 10 Mar 2005 14:08:58 -0000 1.316 *************** *** 2710,2714 **** { if(op.image.length()!=1) ! e2=bossa.syntax.dispatch.createCallExp(symb(op.image.substring(0, 1),op),e1,e2); e1=bossa.syntax.dispatch.createAssignExp(e1,e2); --- 2710,2715 ---- { if(op.image.length()!=1) ! e2=bossa.syntax.dispatch.createCallExp ! (symb(op.image.substring(0, op.image.length()-1),op),e1,e2); e1=bossa.syntax.dispatch.createAssignExp(e1,e2); |
|
From: Arjan B. <ar...@us...> - 2005-03-09 22:56:59
|
Update of /cvsroot/nice/Nice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7376/Nice Modified Files: NEWS Log Message: Make option Instanceof really work. Index: NEWS =================================================================== RCS file: /cvsroot/nice/Nice/NEWS,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** NEWS 7 Mar 2005 20:52:55 -0000 1.68 --- NEWS 9 Mar 2005 22:56:46 -0000 1.69 *************** *** 39,42 **** --- 39,44 ---- ... } + * Added instanceof on option types. For instance 'x instanceof ?String' + is equivalent to 'x == null || x instanceof String'. -- |
|
From: Arjan B. <ar...@us...> - 2005-03-09 21:50:31
|
Update of /cvsroot/nice/Nice/testsuite/compiler/typing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20185/F:/nice/testsuite/compiler/typing Modified Files: dti.testsuite Log Message: Make option Instanceof really work. Index: dti.testsuite =================================================================== RCS file: /cvsroot/nice/Nice/testsuite/compiler/typing/dti.testsuite,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** dti.testsuite 8 Mar 2005 19:33:20 -0000 1.9 --- dti.testsuite 9 Mar 2005 21:50:19 -0000 1.10 *************** *** 293,294 **** --- 293,300 ---- assert a.y == 1; + + /// FAIL + //no nullness inference on option instanceof + ?B x = null; + if (x instanceof ?B) + assert x. /*/// FAIL HERE*/ x == 1; |
|
From: Arjan B. <ar...@us...> - 2005-03-09 21:50:31
|
Update of /cvsroot/nice/Nice/src/bossa/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20185/F:/nice/src/bossa/parser Modified Files: Parser.jj Log Message: Make option Instanceof really work. Index: Parser.jj =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v retrieving revision 1.314 retrieving revision 1.315 diff -C2 -d -r1.314 -r1.315 *** Parser.jj 9 Mar 2005 14:47:46 -0000 1.314 --- Parser.jj 9 Mar 2005 21:50:18 -0000 1.315 *************** *** 2077,2081 **** else sym = symb(t); ! return bossa.syntax.dispatch.createCallExp(symb(t), res, type); } ] { return res; } --- 2077,2081 ---- else sym = symb(t); ! return bossa.syntax.dispatch.createCallExp(sym, res, type); } ] { return res; } |
23 messages has been excluded from this view by a project administrator.
