[Nice-commit] Nice/src/bossa/syntax NiceClass.java,1.95,1.96 compilation.nice,1.3,1.4 constructor.ni
Brought to you by:
bonniot
Menu
▾
▴
[Nice-commit] Nice/src/bossa/syntax NiceClass.java,1.95,1.96 compilation.nice,1.3,1.4 constructor.nice,1.4,1.5 customConstructor.nice,1.9,1.10 dispatch.java.bootstrap,1.49,1.50 dispatchTest.nice,1.4,1.5 importedconstructor.nice,1.7,1.8 methodImplementation.nice,1.6,1.7 niceMethod.nice,1.8,1.9 niceclass.nice,1.12,1.13 super.nice,1.7,1.8 tools.nice,1.90,1.91 typedef.nice,1.8,1.9 TypeDefinition.java,1.1,NONE
|
From: Arjan B. <ar...@us...> - 2005-01-04 21:24:12
|
Update of /cvsroot/nice/Nice/src/bossa/syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20863/F:/nice/src/bossa/syntax Modified Files: NiceClass.java compilation.nice constructor.nice customConstructor.nice dispatch.java.bootstrap dispatchTest.nice importedconstructor.nice methodImplementation.nice niceMethod.nice niceclass.nice super.nice tools.nice typedef.nice Removed Files: TypeDefinition.java Log Message: Removed some superfluous conversion constructs. Index: customConstructor.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/customConstructor.nice,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** customConstructor.nice 2 Jan 2005 02:20:59 -0000 1.9 --- customConstructor.nice 4 Jan 2005 21:20:39 -0000 1.10 *************** *** 23,27 **** Statement body; ! ?NiceClass classe = null; private ?VarScope thisScope = null; private ?TypeScope thisTypeScope = null; --- 23,27 ---- Statement body; ! ?CNiceClass classe = null; private ?VarScope thisScope = null; private ?TypeScope thisTypeScope = null; *************** *** 45,49 **** let tc = Node.getGlobalTypeScope().globalLookup(className); addConstructor(tc, this); ! classe = NiceClass.get(tc); if (classe == null) --- 45,49 ---- let tc = Node.getGlobalTypeScope().globalLookup(className); addConstructor(tc, this); ! classe = getNiceClass(tc); if (classe == null) Index: dispatchTest.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/dispatchTest.nice,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dispatchTest.nice 2 Jan 2005 02:20:59 -0000 1.4 --- dispatchTest.nice 4 Jan 2005 21:20:39 -0000 1.5 *************** *** 243,247 **** return null; ! let NiceClass nc = cast(def.getImplementation()); return nc.getClassExp().getClassType(); } --- 243,247 ---- return null; ! let CNiceClass nc = cast(def.getImplementation()); return nc.getClassExp().getClassType(); } Index: compilation.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/compilation.nice,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** compilation.nice 30 Dec 2004 18:49:01 -0000 1.3 --- compilation.nice 4 Jan 2005 21:20:39 -0000 1.4 *************** *** 108,112 **** Iterator<Alternative> i = sortedAlternatives.iterator(); Alternative a = i.next(); ! NiceClass c = declaringClass(m, a); i.remove(); --- 108,112 ---- Iterator<Alternative> i = sortedAlternatives.iterator(); Alternative a = i.next(); ! CNiceClass c = declaringClass(m, a); i.remove(); *************** *** 139,143 **** } ! private NiceClass declaringClass(JavaMethod m, Alternative alt) { ?mlsub.typing.TypeConstructor firstArgument = alt.getPatterns()[0].getTC(); --- 139,143 ---- } ! private CNiceClass declaringClass(JavaMethod m, Alternative alt) { ?mlsub.typing.TypeConstructor firstArgument = alt.getPatterns()[0].getTC(); Index: NiceClass.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/NiceClass.java,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** NiceClass.java 25 Nov 2004 19:28:18 -0000 1.95 --- NiceClass.java 4 Jan 2005 21:20:24 -0000 1.96 *************** *** 35,76 **** abstract public LocatedString getName(); - abstract TypeDefinition getDefinition(); - - abstract public boolean isInterface(); - - static NiceClass get(TypeConstructor tc) - { - TypeDefinition res = bossa.syntax.dispatch.getTypeDefinition(tc); - if (res != null && res.getImplementation() instanceof NiceClass) - return ((NiceClass) res.getImplementation()); - else - return null; - } - - public static NiceClass get(mlsub.typing.Monotype type) - { - if (! nice.tools.typing.Types.isSure(type)) - return null; - - return get(nice.tools.typing.Types.constructor(type)); - } - - // FIXME change to MethodSymbol once this is converted to nice - abstract void addConstructorCallSymbol(VarSymbol sym); - - abstract public void addField(MonoSymbol sym, Expression value, - boolean isFinal, boolean isTransient, boolean isVolatile, String docString); - - abstract gnu.expr.Expression getInitializer(); - abstract public gnu.expr.ClassExp createClassExp(); - abstract public gnu.expr.ClassExp getClassExp(); - - abstract void precompile(); - - /** This native method is redefined for this Nice class. */ - abstract public gnu.expr.Expression addJavaMethod(gnu.expr.LambdaExp method); - /** Returns an expression to call a super method from outside a class method. --- 35,40 ---- *************** *** 81,88 **** stub. */ - abstract gnu.expr.Expression callSuperMethod(gnu.bytecode.Method superMethod); - abstract public Definition importMethod(gnu.bytecode.Method method); - - abstract public mlsub.typing.Monotype[] getTypeParameters(); } --- 45,48 ---- Index: niceclass.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/niceclass.nice,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** niceclass.nice 3 Jan 2005 01:24:28 -0000 1.12 --- niceclass.nice 4 Jan 2005 21:20:39 -0000 1.13 *************** *** 59,72 **** getName() = definition.getName(); ! getDefinition() = definition; ! getTypeParameters() = definition.getTypeParameters(); ! addField(sym, value, isFinal, isTransient, isVolatile, docString) { if (this.isInterface()) bossa.util.User.error(sym, "An interface cannot have a field."); ! if (isFinal && notNull(sym).getName().toString().equals("serialVersionUID")) { if (value instanceof ConstantExp && value.value instanceof Long) --- 59,73 ---- getName() = definition.getName(); ! TypeDefinition getDefinition() = definition; ! public mlsub.typing.Monotype[] getTypeParameters() = definition.getTypeParameters(); ! public void addField(MonoSymbol sym, ?Expression value, boolean isFinal, ! boolean isTransient, boolean isVolatile, ?String docString) { if (this.isInterface()) bossa.util.User.error(sym, "An interface cannot have a field."); ! if (isFinal && sym.getName().toString().equals("serialVersionUID")) { if (value instanceof ConstantExp && value.value instanceof Long) *************** *** 81,85 **** throw bossa.util.User.error(sym, "A field cannot be final and volatile"); ! fields.add(new NewField(declaringClass: this, sym: notNull(sym), value: value, isFinal_: isFinal, isVolatile: isVolatile, isTransient: isTransient, docString: docString)); --- 82,86 ---- throw bossa.util.User.error(sym, "A field cannot be final and volatile"); ! fields.add(new NewField(declaringClass: this, sym: sym, value: value, isFinal_: isFinal, isVolatile: isVolatile, isTransient: isTransient, docString: docString)); *************** *** 102,113 **** } ! isInterface() = definition instanceof InterfaceDefinition; ?CNiceClass getParent() { ! return cast(NiceClass.get(definition.getSuperClass())); } ! addConstructorCallSymbol(sym) { constructors.add(cast(sym)); --- 103,119 ---- } ! public boolean isInterface() = definition instanceof InterfaceDefinition; ?CNiceClass getParent() { ! let superTC = definition.getSuperClass(); ! if (superTC == null) ! return null; ! ! return getNiceClass(superTC); } ! // FIXME change to MethodSymbol once this is converted to nice ! void addConstructorCallSymbol(VarSymbol sym) { constructors.add(cast(sym)); *************** *** 243,247 **** } ! getInitializer() { if (initializerMethod != null) --- 249,253 ---- } ! ?gnu.expr.Expression getInitializer() { if (initializerMethod != null) *************** *** 368,372 **** } ! getClassExp() = classe; /** --- 374,378 ---- } ! public gnu.expr.ClassExp getClassExp() = classe; /** *************** *** 458,467 **** let supTC = definition.getSuperClass(); ! let ?NiceClass sup = (supTC == null) ? null : NiceClass.get(supTC); List<(?MethodDeclaration, List<Parameter>)> res; if (sup == null) res = this.getNativeConstructorParameters(cast(supTC)); else ! res = cast(sup).getParentConstructorParameters(typeParameters, constraints); /** --- 464,473 ---- let supTC = definition.getSuperClass(); ! let ?CNiceClass sup = (supTC == null) ? null : getNiceClass(supTC); List<(?MethodDeclaration, List<Parameter>)> res; if (sup == null) res = this.getNativeConstructorParameters(cast(supTC)); else ! res = sup.getParentConstructorParameters(typeParameters, constraints); /** *************** *** 571,575 **** } ! precompile() { // We have to do this after resolution, so that bytecode types are known, --- 577,581 ---- } ! void precompile() { // We have to do this after resolution, so that bytecode types are known, *************** *** 629,633 **** /** This native method is redefined for this Nice class. */ ! addJavaMethod(method) = classe.addMethod(method); private gnu.expr.LambdaExp createJavaMethod(String name, --- 635,639 ---- /** This native method is redefined for this Nice class. */ ! public gnu.expr.Expression addJavaMethod(gnu.expr.LambdaExp method) = classe.addMethod(method); private gnu.expr.LambdaExp createJavaMethod(String name, *************** *** 648,652 **** stub. */ ! callSuperMethod(superMethod) { gnu.expr.Expression[] params = cast(new gnu.expr.Expression --- 654,658 ---- stub. */ ! gnu.expr.Expression callSuperMethod(gnu.bytecode.Method superMethod) { gnu.expr.Expression[] params = cast(new gnu.expr.Expression *************** *** 731,735 **** } ! NiceClass createNiceClass(TypeDefinition cdef) = new CNiceClass(definition: cdef); private TypeSymbol asTypeSymbol(mlsub.typing.Monotype type) --- 737,741 ---- } ! CNiceClass createNiceClass(TypeDefinition cdef) = new CNiceClass(definition: cdef); private TypeSymbol asTypeSymbol(mlsub.typing.Monotype type) *************** *** 753,754 **** --- 759,777 ---- return new gnu.expr.QuoteExp(nice.tools.code.Types.javaType(tc)); } + + ?CNiceClass getNiceClass(TypeConstructor tc) + { + let res = getTypeDefinition(tc); + if (res != null && res.getImplementation() instanceof NiceClass) + return cast(res.getImplementation()); + else + return null; + } + + public ?CNiceClass getNiceClass(mlsub.typing.Monotype type) + { + if (! nice.tools.typing.Types.isSure(type)) + return null; + + return getNiceClass(nice.tools.typing.Types.constructor(type)); + } \ No newline at end of file Index: niceMethod.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/niceMethod.nice,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** niceMethod.nice 3 Jan 2005 01:24:28 -0000 1.8 --- niceMethod.nice 4 Jan 2005 21:20:39 -0000 1.9 *************** *** 361,370 **** // Try to compile the dispatch method as a member method if possible. ! ?NiceClass receiver; if (argTypes.length == 0) receiver = null; else { ! receiver = NiceClass.get(def.getArgTypes()[0]); // JVM interfaces cannot contain code. --- 361,370 ---- // Try to compile the dispatch method as a member method if possible. ! ?CNiceClass receiver; if (argTypes.length == 0) receiver = null; else { ! receiver = getNiceClass(def.getArgTypes()[0]); // JVM interfaces cannot contain code. Index: tools.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/tools.nice,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** tools.nice 3 Jan 2005 01:24:28 -0000 1.90 --- tools.nice 4 Jan 2005 21:20:40 -0000 1.91 *************** *** 223,229 **** ?mlsub.typing.Constraint getConstraint(mlsub.typing.Polytype) = native mlsub.typing.Constraint mlsub.typing.Polytype.getConstraint(); mlsub.typing.AtomicConstraint[?] AtomicConstraint_substitute(java.util.Map<mlsub.typing.TypeSymbol,mlsub.typing.TypeSymbol>, AtomicConstraint[?]) = native mlsub.typing.AtomicConstraint[] mlsub.typing.AtomicConstraint.substitute(java.util.Map, mlsub.typing.AtomicConstraint[]); - ?gnu.expr.Expression getInitializer(NiceClass) = native gnu.expr.Expression NiceClass.getInitializer(); - void addConstructorCallSymbol(NiceClass, VarSymbol) = native void NiceClass.addConstructorCallSymbol(VarSymbol); - gnu.expr.Expression callSuperMethod(NiceClass, gnu.bytecode.Method) = native gnu.expr.Expression NiceClass.callSuperMethod(gnu.bytecode.Method); Module module(Definition) = native Definition.module; ?Definition importMethod(NiceClass, gnu.bytecode.Method) = native Definition NiceClass.importMethod(gnu.bytecode.Method); --- 223,226 ---- *************** *** 237,242 **** ?Variance makeVariance(List<int>) = native Variance MethodContainer.makeVariance(List); List<AtomicConstraint> getAtoms(Constraint) = native List Constraint.getAtoms(); - ?mlsub.typing.Interface getAssociatedInterface(TypeDefinition) = native mlsub.typing.Interface TypeDefinition.getAssociatedInterface(); - ?mlsub.typing.Polytype getConstrainedType(TypeDefinition) = native mlsub.typing.Polytype TypeDefinition.getConstrainedType(); mlsub.typing.Monotype[?] resolve(TypeMap, Monotype[?]) = native mlsub.typing.Monotype[] Monotype.resolve(TypeMap, Monotype[]); MethodContainer.Constraint MethodContainer$Constraint(TypeSymbol[], List<AtomicConstraint>, ?mlsub.typing.Monotype[], Location) --- 234,237 ---- Index: typedef.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/typedef.nice,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** typedef.nice 20 Dec 2004 16:05:19 -0000 1.8 --- typedef.nice 4 Jan 2005 21:20:51 -0000 1.9 *************** *** 30,34 **** */ ! public abstract class CTypeDefinition extends TypeDefinition { Modifiers modifiers = new Modifiers(); --- 30,34 ---- */ ! public abstract class TypeDefinition extends MethodContainer { Modifiers modifiers = new Modifiers(); *************** *** 71,75 **** } ! isConcrete() = !modifiers.isAbstract(); implementsJavaInterface(name) --- 71,75 ---- } ! boolean isConcrete() = !modifiers.isAbstract(); implementsJavaInterface(name) *************** *** 86,90 **** getTypeSymbol() = tc; ! getAssociatedInterface() = null; getSuperClass() = null; --- 86,90 ---- getTypeSymbol() = tc; ! ?mlsub.typing.Interface getAssociatedInterface() = null; getSuperClass() = null; *************** *** 92,96 **** getSuperClassDefinition() = null; ! getTC() = tc; getImplementedInterfaces() --- 92,96 ---- getSuperClassDefinition() = null; ! mlsub.typing.TypeConstructor getTC() = tc; getImplementedInterfaces() *************** *** 143,147 **** } ! getLocalScope() { TypeScope localScope = notNull(typeScope); --- 143,147 ---- } ! TypeScope getLocalScope() { TypeScope localScope = notNull(typeScope); *************** *** 178,182 **** or null if this class has no constraint on its type parameters. */ ! getConstrainedType() { ?mlsub.typing.Constraint cst = this.getResolvedConstraint(); --- 178,182 ---- or null if this class has no constraint on its type parameters. */ ! ?mlsub.typing.Polytype getConstrainedType() { ?mlsub.typing.Constraint cst = this.getResolvedConstraint(); *************** *** 341,345 **** } ! typecheckClass() { notNull(implementation).typecheck(); --- 341,345 ---- } ! void typecheckClass() { notNull(implementation).typecheck(); *************** *** 351,358 **** } ! precompile() { let impl = implementation; ! if (impl != null && impl instanceof NiceClass) impl.precompile(); } --- 351,358 ---- } ! void precompile() { let impl = implementation; ! if (impl != null && impl instanceof CNiceClass) impl.precompile(); } *************** *** 366,370 **** Called instead of compile if the package is up-to-date. */ ! recompile() { notNull(implementation).recompile(); --- 366,370 ---- Called instead of compile if the package is up-to-date. */ ! void recompile() { notNull(implementation).recompile(); *************** *** 427,431 **** getInterfaces() = interfaces.toArray(); ! addInterfaceImplementation(itf) { if (itf != null) --- 427,431 ---- getInterfaces() = interfaces.toArray(); ! void addInterfaceImplementation(?Interface itf) { if (itf != null) *************** *** 435,439 **** getJavaInterfaces() = javaInterfaces; ! setJavaType(javaType) { if (javaType == null) --- 435,439 ---- getJavaInterfaces() = javaInterfaces; ! void setJavaType(?gnu.bytecode.Type javaType) { if (javaType == null) *************** *** 444,455 **** } ! getJavaType() = notNull(javaType); ! setImplementation(implementation) { this.implementation = implementation; } ! getImplementation() = notNull(implementation); getBytecodeFlags() = modifiers.getBits(); --- 444,455 ---- } ! gnu.bytecode.Type getJavaType() = notNull(javaType); ! public void setImplementation(ClassImplementation implementation) { this.implementation = implementation; } ! ClassImplementation getImplementation() = notNull(implementation); getBytecodeFlags() = modifiers.getBits(); *************** *** 459,463 **** * Definition for a class */ ! class ClassDefinition extends CTypeDefinition { // Super class --- 459,463 ---- * Definition for a class */ ! class ClassDefinition extends TypeDefinition { // Super class *************** *** 538,542 **** * Definition for an interface */ ! class InterfaceDefinition extends CTypeDefinition { ?mlsub.typing.Interface associatedInterface = null; --- 538,542 ---- * Definition for an interface */ ! class InterfaceDefinition extends TypeDefinition { ?mlsub.typing.Interface associatedInterface = null; *************** *** 709,712 **** --- 709,728 ---- tcToTypeDef.get( itf.associatedTC() ); + //used in mlsub.typing.Enumeration + public ?mlsub.typing.Constraint getTypeDefResolvedConstraint(mlsub.typing.TypeConstructor tc) + { + let def = getTypeDefinition(tc); + if (def == null) + return null; + + return def.getResolvedConstraint(); + } + + //used in mlsub.typing.Enumeration + public mlsub.typing.Monotype[] getTypeDefTypeParameters(mlsub.typing.TypeConstructor tc) + { + return notNull(getTypeDefinition(tc)).getTypeParameters(); + } + /** Returns a monotype based on this tc, provided that the class *************** *** 715,719 **** ?mlsub.typing.Monotype getTypeWithTC(TypeConstructor tc) { ! ?CTypeDefinition def = cast(getTypeDefinition(tc)); if (def == null) --- 731,735 ---- ?mlsub.typing.Monotype getTypeWithTC(TypeConstructor tc) { ! ?TypeDefinition def = cast(getTypeDefinition(tc)); if (def == null) *************** *** 744,748 **** ?mlsub.typing.Monotype getTypeWithTC(TypeConstructor tc, mlsub.typing.Monotype[] sourceParams ) { ! ?CTypeDefinition def = cast(getTypeDefinition(tc)); if (def == null) --- 760,764 ---- ?mlsub.typing.Monotype getTypeWithTC(TypeConstructor tc, mlsub.typing.Monotype[] sourceParams ) { ! ?TypeDefinition def = cast(getTypeDefinition(tc)); if (def == null) *************** *** 784,788 **** // Variance lookup ! getVariance(CTypeDefinition t) { int arity = getVariance(t.implementations); --- 800,804 ---- // Variance lookup ! getVariance(TypeDefinition t) { int arity = getVariance(t.implementations); Index: methodImplementation.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/methodImplementation.nice,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** methodImplementation.nice 2 Jan 2005 02:20:59 -0000 1.6 --- methodImplementation.nice 4 Jan 2005 21:20:39 -0000 1.7 *************** *** 15,30 **** import bossa.util.*; - /* - import nice.tools.typing.Types; - import nice.tools.code.Gen; - import mlsub.typing.Typing; - import mlsub.typing.TypeConstructor; - import mlsub.typing.Monotype; - import mlsub.typing.MonotypeVar; - import gnu.bytecode.*; - import bossa.util.Debug; - import bossa.util.User; - */ - /** An implementation of a method --- 15,18 ---- *************** *** 211,215 **** return; ! NiceClass c = cast(def.getImplementation()); gnu.expr.Expression[] params = cast(new gnu.expr.Expression[arity]); --- 199,203 ---- return; ! CNiceClass c = cast(def.getImplementation()); gnu.expr.Expression[] params = cast(new gnu.expr.Expression[arity]); --- TypeDefinition.java DELETED --- Index: super.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/super.nice,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** super.nice 2 Jan 2005 02:20:59 -0000 1.7 --- super.nice 4 Jan 2005 21:20:39 -0000 1.8 *************** *** 169,173 **** // the base method), a call to super is emited. { ! let NiceClass nc = cast(notNull(getTypeDefinition(notNull(currentMethod).firstArgument())).getImplementation()); code = nc.callSuperMethod(notNull(superMethod)); } --- 169,173 ---- // the base method), a call to super is emited. { ! let CNiceClass nc = cast(notNull(getTypeDefinition(notNull(currentMethod).firstArgument())).getImplementation()); code = nc.callSuperMethod(notNull(superMethod)); } Index: importedconstructor.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/importedconstructor.nice,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** importedconstructor.nice 3 Jan 2005 01:24:28 -0000 1.7 --- importedconstructor.nice 4 Jan 2005 21:20:39 -0000 1.8 *************** *** 86,90 **** } ! public ?ImportedConstructor loadImportedConstructor(NiceClass def, gnu.bytecode.Method method) { if (! method.isConstructor()) --- 86,90 ---- } ! public ?ImportedConstructor loadImportedConstructor(CNiceClass def, gnu.bytecode.Method method) { if (! method.isConstructor()) Index: dispatch.java.bootstrap =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/dispatch.java.bootstrap,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** dispatch.java.bootstrap 2 Jan 2005 02:20:59 -0000 1.49 --- dispatch.java.bootstrap 4 Jan 2005 21:20:39 -0000 1.50 *************** *** 26,34 **** public static void resetConstructorsMap() {} - static boolean instantiableTC(mlsub.typing.TypeConstructor tc) - { return false; } - - public static void loadJavaMethods(String name) {} - public static mlsub.typing.TypeConstructor lookupJavaClass(String className, bossa.util.Location loc) { return null; } --- 26,29 ---- *************** *** 42,58 **** { return null;} - static Expression analyse(Expression e, VarScope v, TypeScope t) - { return null; } - - static Expression analyse(Expression e, Info i) - { return null; } - - static void typecheck(Expression e) {} - public static void resetTypeDefinitionMappings() {} ! public static TypeDefinition getTypeDefinition(mlsub.typing.TypeConstructor tc) { return null; } public static mlsub.typing.Monotype getTypeWithTC(mlsub.typing.TypeConstructor tc, mlsub.typing.Monotype[] sourceParams ) { return null; } --- 37,48 ---- { return null;} public static void resetTypeDefinitionMappings() {} ! public static mlsub.typing.Constraint getTypeDefResolvedConstraint(mlsub.typing.TypeConstructor tc) { return null; } + public static mlsub.typing.Monotype[] getTypeDefTypeParameters(mlsub.typing.TypeConstructor tc) + { return null; } + public static mlsub.typing.Monotype getTypeWithTC(mlsub.typing.TypeConstructor tc, mlsub.typing.Monotype[] sourceParams ) { return null; } *************** *** 63,66 **** public static void _printStackTraceWithSourceInfo(Throwable t) {} } - - class Info {} --- 53,54 ---- Index: constructor.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/constructor.nice,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** constructor.nice 3 Jan 2005 01:24:28 -0000 1.4 --- constructor.nice 4 Jan 2005 21:20:39 -0000 1.5 *************** *** 23,27 **** abstract class Constructor extends MethodDeclaration { ! NiceClass classe; final boolean isDefault; --- 23,27 ---- abstract class Constructor extends MethodDeclaration { ! CNiceClass classe; final boolean isDefault; |
