Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1:/tmp/cvs-serv828/src/bossa/syntax
Modified Files:
SuperExp.java JavaClasses.java
Log Message:
Added paragraph about the news file and the development version.
Index: SuperExp.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/SuperExp.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SuperExp.java 9 Dec 2003 15:21:05 -0000 1.13
--- SuperExp.java 12 Dec 2003 14:53:30 -0000 1.14
***************
*** 136,151 ****
catch(Types.NotIntroducedClassException ex ) {}
! if (superTC == null)
{
! // Our safe bet is to assert that the argument is
! // above Object
! superTC = JavaClasses.object
! (currentMethod.firstArgument().variance.arity());
}
-
- constraint = addLeq
- (type.getConstraint(),
- new Pattern[]{new Pattern(superTC, false)},
- monotype.domain());
}
}
--- 136,152 ----
catch(Types.NotIntroducedClassException ex ) {}
! if (superTC != null)
! constraint = addLeq
! (type.getConstraint(),
! new Pattern[]{new Pattern(superTC, false)},
! monotype.domain());
! else
{
! // Our safe bet is to assert that the argument is Object.
! Monotype[] domain = (Monotype[]) monotype.domain().clone();
! domain[0] = bossa.syntax.Monotype.sure(TopMonotype.instance);
! monotype = new FunType(domain, monotype.codomain());
! constraint = type.getConstraint();
}
}
}
Index: JavaClasses.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/JavaClasses.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** JavaClasses.java 28 Nov 2003 14:01:30 -0000 1.41
--- JavaClasses.java 12 Dec 2003 14:53:30 -0000 1.42
***************
*** 511,533 ****
****************************************************************/
- /****************************************************************
- * List of TCs for java.lang.Object: one per variance.
- ****************************************************************/
-
- private static final Vector objects = new Vector(5);
-
- static TypeConstructor object(int arity)
- {
- if(arity>=objects.size())
- objects.setSize(arity+1);
-
- TypeConstructor res = (TypeConstructor) objects.get(arity);
- if(res==null)
- {
- res = make(compilation, "java.lang.Object", gnu.bytecode.Type.pointer_type);
- }
- return res;
- }
-
/** The current compilation. This is not thread safe! */
static bossa.modules.Compilation compilation;
--- 511,514 ----
|
