[Nice-commit] Nice/src/bossa/syntax call.nice,NONE,1.1 Contract.java,1.8,1.9 Expression.java,1.56,1.
Brought to you by:
bonniot
Menu
▾
▴
[Nice-commit] Nice/src/bossa/syntax call.nice,NONE,1.1 Contract.java,1.8,1.9 Expression.java,1.56,1.57 analyse.nice,1.107,1.108 assign.nice,1.1,1.2 dispatch.java.bootstrap,1.17,1.18 loop.nice,1.1,1.2 new.nice,1.1,1.2 overloadedsymbol.nice,1.2,1.3 tools.nice,1.43,1.44 typecheck.nice,1.107,1.108 CallExp.java,1.95,NONE
|
From: Arjan B. <ar...@us...> - 2004-08-05 10:45:42
|
Update of /cvsroot/nice/Nice/src/bossa/syntax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30128/F:/nice/src/bossa/syntax Modified Files: Contract.java Expression.java analyse.nice assign.nice dispatch.java.bootstrap loop.nice new.nice overloadedsymbol.nice tools.nice typecheck.nice Added Files: call.nice Removed Files: CallExp.java Log Message: Converted CallExp to nice code. Index: analyse.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/analyse.nice,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** analyse.nice 30 Jul 2004 19:08:45 -0000 1.107 --- analyse.nice 5 Aug 2004 10:45:29 -0000 1.108 *************** *** 512,518 **** if (sym.isNonStaticFieldAccess() && Node.thisExp != null) { ! CallExp res = new CallExp ! (createOverloadedSymbolExp(symbols, notNull(e.ident)), ! new Arguments([new Arguments.Argument(Node.thisExp)])); res.setLocation(e.location()); return res; --- 512,517 ---- if (sym.isNonStaticFieldAccess() && Node.thisExp != null) { ! CallExp res = new CallExp(function: createOverloadedSymbolExp(symbols, notNull(e.ident)), ! arguments: new Arguments([new Arguments.Argument(Node.thisExp)])); res.setLocation(e.location()); return res; *************** *** 522,528 **** { // Make an implicit call to fetch the static field's value. ! CallExp res = new CallExp ! (createOverloadedSymbolExp(symbols, notNull(e.ident)), ! Arguments.noArguments()); res.setLocation(e.location()); return res; --- 521,526 ---- { // Make an implicit call to fetch the static field's value. ! CallExp res = new CallExp(function: createOverloadedSymbolExp(symbols, notNull(e.ident)), ! arguments: Arguments.noArguments()); res.setLocation(e.location()); return res; --- CallExp.java DELETED --- Index: Expression.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Expression.java,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** Expression.java 3 Aug 2004 14:36:05 -0000 1.56 --- Expression.java 5 Aug 2004 10:45:29 -0000 1.57 *************** *** 104,118 **** /** - * Resolves overloading, taking into account the parameters - * the expressions is applied to. - * - * @return the resolved expression. Doesn't return if OR is not possible. - */ - Expression resolveOverloading(CallExp callExp) - { - return this; - } - - /** * Resolve overloading, assuming that this expression * should have some Type. --- 104,107 ---- Index: typecheck.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/typecheck.nice,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** typecheck.nice 4 Aug 2004 08:45:45 -0000 1.107 --- typecheck.nice 5 Aug 2004 10:45:30 -0000 1.108 *************** *** 28,31 **** --- 28,39 ---- ****************************************************************/ + /** + * Resolves overloading, taking into account the parameters + * the expressions is applied to. + * + * @return the resolved expression. Doesn't return if OR is not possible. + */ + Expression resolveOverloading(Expression exp, CallExp callExp) = exp; + typecheck(null(Expression)) {} Index: tools.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/tools.nice,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** tools.nice 4 Aug 2004 18:36:09 -0000 1.43 --- tools.nice 5 Aug 2004 10:45:30 -0000 1.44 *************** *** 283,287 **** List<VarSymbol> findJavaMethods(?gnu.bytecode.ClassType, String, int) = native List JavaClasses.findJavaMethods(gnu.bytecode.ClassType,java.lang.String,int); List<VarSymbol> findJavaMethods(?gnu.bytecode.ClassType, String) = native List JavaClasses.findJavaMethods(gnu.bytecode.ClassType,java.lang.String); - Arguments arguments(CallExp) = native CallExp.arguments; TypeParameters TypeParameters(List<Monotype>) = native new bossa.syntax.TypeParameters(List); Block Block(List<Statement>) = native new bossa.syntax.Block(List); --- 283,286 ---- Index: loop.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/loop.nice,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** loop.nice 28 Jul 2004 14:40:33 -0000 1.1 --- loop.nice 5 Aug 2004 10:45:30 -0000 1.2 *************** *** 141,150 **** } ! let getiter = CallExp.create(new IdentExp(new LocatedString("forIterator", loc)), container); let iter = new LocatedString(loc.uniqueIdentifier("for_in_iter_"), loc); let init = new Block.LocalVariable(iter, itertype, true, getiter); let iterexp = new IdentExp(iter); ! let cond = CallExp.create(new IdentExp(new LocatedString("hasNext", loc)), iterexp); ! let getvar = CallExp.create(new IdentExp(new LocatedString("next", loc)), iterexp); let assign = new Block.LocalVariable(varName, vartype, true, getvar); let loop = createWhileLoop(cond, new Block(new LinkedList([assign, body]))); --- 141,150 ---- } ! let getiter = createCallExp(new IdentExp(new LocatedString("forIterator", loc)), container); let iter = new LocatedString(loc.uniqueIdentifier("for_in_iter_"), loc); let init = new Block.LocalVariable(iter, itertype, true, getiter); let iterexp = new IdentExp(iter); ! let cond = createCallExp(new IdentExp(new LocatedString("hasNext", loc)), iterexp); ! let getvar = createCallExp(new IdentExp(new LocatedString("next", loc)), iterexp); let assign = new Block.LocalVariable(varName, vartype, true, getvar); let loop = createWhileLoop(cond, new Block(new LinkedList([assign, body]))); Index: new.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/new.nice,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** new.nice 4 Aug 2004 18:36:09 -0000 1.1 --- new.nice 5 Aug 2004 10:45:30 -0000 1.2 *************** *** 91,94 **** public Expression createNewExp(TypeIdent ti, Arguments arguments) { ! return new NewExp(null, arguments, ti: ti); } \ No newline at end of file --- 91,94 ---- public Expression createNewExp(TypeIdent ti, Arguments arguments) { ! return new NewExp(function: cast(null), arguments: arguments, ti: ti); } \ No newline at end of file Index: overloadedsymbol.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/overloadedsymbol.nice,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** overloadedsymbol.nice 29 Jul 2004 18:30:08 -0000 1.2 --- overloadedsymbol.nice 5 Aug 2004 10:45:30 -0000 1.3 *************** *** 128,132 **** s.getClonedType(), arguments.getUsedArguments(s)); ! ?mlsub.typing.Polytype t = CallExp.wellTyped(s.getClonedType(), argsType); if (t == null) --- 128,132 ---- s.getClonedType(), arguments.getUsedArguments(s)); ! ?mlsub.typing.Polytype t = wellTyped(s.getClonedType(), argsType); if (t == null) *************** *** 166,170 **** let res = symbols[0]; // store the formal argument types for later use together with the type ! callExp.setComputedType(arguments.types.get(res), nice.tools.typing.Types.parameters(res.getClonedType())); res.releaseClonedType(); --- 166,170 ---- let res = symbols[0]; // store the formal argument types for later use together with the type ! callExp.setComputedType(notNull(arguments.types.get(res)), nice.tools.typing.Types.parameters(res.getClonedType())); res.releaseClonedType(); *************** *** 328,335 **** if (Node.thisExp != null) try { ! let res = new CallExp ! (createOverloadedSymbolExp(fieldAccesses, ident, true), //Arguments.noArguments()); ! new Arguments([new Arguments.Argument(Node.thisExp)])); res.setLocation(ident.location()); --- 328,334 ---- if (Node.thisExp != null) try { ! let res = new CallExp(function: createOverloadedSymbolExp(fieldAccesses, ident, true), //Arguments.noArguments()); ! arguments: new Arguments([new Arguments.Argument(Node.thisExp)])); res.setLocation(ident.location()); Index: assign.nice =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/assign.nice,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** assign.nice 28 Jul 2004 14:40:33 -0000 1.1 --- assign.nice 5 Aug 2004 10:45:30 -0000 1.2 *************** *** 40,44 **** // Rewrite "get(e, i) = v" into "set(e, i, v)" if (to instanceof CallExp && "get".equals(notNull(to.function).toString())) ! return CallExp.create( new IdentExp(new LocatedString("set", notNull(to.function).location())), to.arguments.getExp(0), --- 40,44 ---- // Rewrite "get(e, i) = v" into "set(e, i, v)" if (to instanceof CallExp && "get".equals(notNull(to.function).toString())) ! return createCallExp( new IdentExp(new LocatedString("set", notNull(to.function).location())), to.arguments.getExp(0), --- NEW FILE: call.nice --- /**************************************************************************/ /* N I C E */ /* A high-level object-oriented research language */ /* (c) Daniel Bonniot 2004 */ /* */ /* 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 bossa.syntax; import bossa.util.*; /** A function call. */ public class CallExp extends Expression { Expression function; Arguments arguments; /** true iff the first argument was written before the application: e.f(x) */ final boolean infix = false; /** true iff this call was made using brackets (i.e. not like 'x.f'). */ public final boolean hasBrackets = true; /** Class this static method is defined in, or null */ ?gnu.bytecode.ClassType declaringClass = null; ExpLocalVariable[?] localVars = null; /** The type of the function, constrained by the actual arguments. */ private ?mlsub.typing.Polytype instanciatedDomain = null; private boolean overloadingResolved = false; /**************************************************************** * Overloading resolution ****************************************************************/ void resolveOverloading() { // do not resolve twice if (overloadingResolved) return; overloadingResolved = true; arguments.noOverloading(); function = function.resolveOverloading(this); function.checkSpecialRequirements(cast(arguments.computedExpressions)); // make sure computedExpressions is valid. this.getType(); // Allow expressions to know in what context they are used. // Important for litteral arrays and tuples. Expression.adjustToExpectedType(cast(arguments.computedExpressions), nice.tools.typing.Types.parameters(function.getType())); } computeType() { this.resolveOverloading(); if (type == null) // function should be a function abstraction here // no default arguments { this.setComputedType(notNull(getTypeAndReportErrors(this.location(), function, arguments.inOrder())), null); arguments.computedExpressions = cast(arguments.inOrder()); } } /** @param argTypes The types of the formal arguments of the function, in the same polymorphic instance as the computed type. */ void setComputedType(mlsub.typing.Polytype type, mlsub.typing.Monotype[?] argTypes) { this.type = type; if (! type.isMonomorphic() && argTypes != null) { /* We construct the instantiated version of the function type: the type of the function, constrained by the actual arguments. Then we simplify it. It is useful to constrain the arguments to have the expected bytecode types. */ instanciatedDomain = new mlsub.typing.Polytype(type.getConstraint(), new mlsub.typing.TupleType(argTypes)); instanciatedDomain = notNull(instanciatedDomain).cloneType(); // By default, a polytype is supposed to be simplified. notNull(instanciatedDomain).setNotSimplified(); notNull(instanciatedDomain).simplify(); } if (! type.trySimplify()) User.warning(this, "This call might have a type error, or this might be a bug in the compiler. \nPlease contact bo...@us..."); } isAssignable() { this.resolveOverloading(); return function.isFieldAccess(); } /** @return the FieldAccess if this expression resolves to a field, which is true if it is the application a of FieldAccess to an object value. Returns null otherwise. */ getField() { this.resolveOverloading(); return function.getFieldAccessMethod(); } /**************************************************************** * Code generation ****************************************************************/ compile() { ?gnu.expr.LetExp firstLetExp = null; ?gnu.expr.Expression letExpRes = null; if (localVars != null) { for(int i = notNull(localVars).length-1; i >= 0; i--) { gnu.expr.Expression[] eVal = cast(new gnu.expr.Expression[1]); gnu.expr.LetExp letExp = new gnu.expr.LetExp(eVal); eVal[0] = notNull(notNull(localVars)[i].variable).compile(letExp); if (i == notNull(localVars).length-1) { firstLetExp = letExp; } else { letExp.setBody(letExpRes); } letExpRes = letExp; } } gnu.expr.Expression res; if (function.isFieldAccess()) res = function.getFieldAccessMethod().compileAccess(this.compileParams()); else res = new gnu.expr.ApplyExp(function.generateCodeInCallPosition(), this.compileParams()); this.location().write(res); if (firstLetExp != null) { firstLetExp.setBody(res); res = notNull(letExpRes); } return nice.tools.code.EnsureTypeProc.ensure(res, nice.tools.code.Types.javaType(type)); } private gnu.expr.Expression[] compileParams() { bossa.syntax.Expression[] compexps = cast(arguments.computedExpressions); gnu.expr.Expression[] params = Expression.compile(compexps); // Make sure the arguments have the expected bytecode type, // matching the instantiated type of the (polymorphic) function. mlsub.typing.Monotype[?] domain = null; if (instanciatedDomain != null) { mlsub.typing.TupleType mtype = cast(notNull(instanciatedDomain).getMonotype()); domain = mtype.getComponents(); } if (domain != null) for (int i = 0; i < params.length; i++) params[i] = nice.tools.code.EnsureTypeProc.ensure (params[i], nice.tools.code.Types.javaType(domain[i])); return params; } compileAssign(gnu.expr.Expression value) { if (!function.isFieldAccess()) Internal.error(this, "Assignment to a call that is not a field access"); FieldAccess access = function.getFieldAccessMethod(); if (access.isFinal()) User.error(this, "Field " + access + " is final"); if (arguments.size() == 0) return access.compileAssign(value); if (arguments.size() == 1) return access.compileAssign(arguments.getExp(0).generateCode(), value); Internal.error(this, "A field access should have 0 or 1 parameter"); return cast(null); } toString() { if (!infix) return function.toString(Printable.parsable) + arguments; if (declaringClass == null) return arguments.getExp(0) + "." + function + arguments.toStringInfix(); if (function instanceof SymbolExp) { SymbolExp func = cast(function); Definition def = func.getSymbol().getDefinition(); if (def instanceof RetypedJavaMethod) return func.toString() + arguments; if (def instanceof JavaFieldAccess) return notNull(declaringClass).getName() + "." + def.fieldName + arguments; } return notNull(declaringClass).getName() + "." + function + arguments; } } public Expression createCallExp(Expression function, Expression param1) { let res = new CallExp(function:function, arguments:new Arguments([new Arguments.Argument(param1)])); res.setLocation(function.location()); return res; } public Expression createCallExp(Expression function, Expression param1, Expression param2) { let res = new CallExp(function:function, arguments:new Arguments([new Arguments.Argument(param1), new Arguments.Argument(param2)])); res.setLocation(function.location()); return res; } public Expression createCallExp(Expression function, Expression param1, Expression param2, Expression param3) { let res = new CallExp(function:function, arguments:new Arguments([new Arguments.Argument(param1), new Arguments.Argument(param2), new Arguments.Argument(param3)])); res.setLocation(function.location()); return res; } public Expression createCallExp(Expression func, Arguments args, boolean infix, boolean hasBrackets) { return new CallExp(function: func, arguments: args, infix: infix, hasBrackets: hasBrackets); } public Expression createCallExp(Expression func, Arguments args) { return new CallExp(function: func, arguments: args); } public void addBlockArgument(Expression callexp, Statement block, LocatedString name) { let CallExp exp = cast(callexp); exp.arguments.add(createFunExp(bossa.syntax.Constraint.True, [], block), name); } ?mlsub.typing.Polytype wellTyped(mlsub.typing.Polytype funt, mlsub.typing.Polytype[] parameters) { try{ return getType(funt, parameters, true); } catch(ReportErrorEx e){} catch(mlsub.typing.TypingEx e){} catch(mlsub.typing.BadSizeEx e){} return null; } ?mlsub.typing.Polytype getTypeAndReportErrors(bossa.util.Location loc, Expression function, Expression[] parameters) { mlsub.typing.Polytype[] paramTypes = Expression.getType(parameters); try{ return getType(function.getType(), paramTypes, false); } catch(BadSizeEx e){ User.error(loc, function.toString(Printable.detailed) + " expects " + e.expected + " parameters, " + "not " + e.actual); } catch(ReportErrorEx e){ User.error(loc, e.getMessage()); } catch(TypingEx e){ if (Typing.dbg) bossa.util.Debug.println(e.getMessage()); if (function.isFieldAccess()) { // There must be just one parameter in a field access User.error(loc, parameters[0] + " has no field " + function); } else { let end = "not within the domain of function \"" + function +"\""; if (parameters.length >= 2) User.error(loc,"Parameters \n"+ Util.map("(",", ",")",parameters) + "\n of types \n" + Util.map("(",",\n ",")",paramTypes) + "\n are "+end); else User.error(loc,"Parameter "+ Util.map("",", ","",parameters) + " of type " + Util.map("",", ","",paramTypes) + " is "+end); } } return null; } /** @param tentative whether we only want to check if the call is valid (as during overloading resolution). */ private mlsub.typing.Polytype getType(mlsub.typing.Polytype type, mlsub.typing.Polytype[] parameters, boolean tentative) { mlsub.typing.Monotype m = type.getMonotype(); // Check that the function cannot be null if (m.head() == null) throw new ReportErrorEx("Nullness check"); try{ mlsub.typing.Typing.leq(m.head(), PrimitiveType.sureTC); } catch(TypingEx ex) { throw new ReportErrorEx("This function may be null"); } m = nice.tools.typing.Types.rawType(m); // The function might not be of a functional kind. // Only usefull for null? // First reset the kind, that comes from a previous typing. if (m.getKind() == mlsub.typing.lowlevel.Engine.variablesConstraint) m.setKind(null); if (m.getKind() == null) m.setKind(mlsub.typing.FunTypeKind.get(parameters.length)); m = m.equivalent(); if (!(m instanceof mlsub.typing.FunType)) throw new ReportErrorEx("Not a function"); mlsub.typing.FunType funt = m; let dom = funt.domain(); let ?mlsub.typing.Constraint cst = type.getConstraint(); let doEnter = true; //Constraint.hasBinders(cst); if (doEnter) mlsub.typing.Typing.enter(tentative); boolean ok = false; try { try{ mlsub.typing.Constraint.enter(cst); } catch(mlsub.typing.TypingEx e) { throw new ReportErrorEx("The conditions for using this function are not fullfiled"); } if (mlsub.typing.Typing.dbg) { bossa.util.Debug.println("Parameters:\n" + Util.map("",", ","\n",parameters)); bossa.util.Debug.println("Domain:\n" + Util.map("",", ","\n",dom)); } mlsub.typing.Typing.in(parameters, dom); ok = true; } finally{ if(doEnter) // If we are in tentative mode and the call is valid, then // we make the effects last (that's only important when there are // existential type variables in the context). mlsub.typing.Typing.leave(tentative, tentative && ok); } return mlsub.typing.Polytype.apply(cst, funt, parameters); } class ReportErrorEx extends Exception {} Index: Contract.java =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Contract.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Contract.java 25 Feb 2004 11:23:29 -0000 1.8 --- Contract.java 5 Aug 2004 10:45:29 -0000 1.9 *************** *** 27,31 **** public void addRequire(Expression condition) { ! pre.add(CallExp.create(symbol(assertName, condition), condition)); requireRepr.append(condition).append(','); } --- 27,31 ---- public void addRequire(Expression condition) { ! pre.add(bossa.syntax.dispatch.createCallExp(symbol(assertName, condition), condition)); requireRepr.append(condition).append(','); } *************** *** 33,37 **** public void addRequire(Expression condition, Expression name) { ! pre.add(CallExp.create(symbol(assertName, condition), condition, name)); requireRepr.append(condition).append(':').append(name).append(','); } --- 33,37 ---- public void addRequire(Expression condition, Expression name) { ! pre.add(bossa.syntax.dispatch.createCallExp(symbol(assertName, condition), condition, name)); requireRepr.append(condition).append(':').append(name).append(','); } *************** *** 39,43 **** public void addEnsure(Expression condition) { ! post.add(CallExp.create(symbol(assertName, condition), condition)); ensureRepr.append(condition); } --- 39,43 ---- public void addEnsure(Expression condition) { ! post.add(bossa.syntax.dispatch.createCallExp(symbol(assertName, condition), condition)); ensureRepr.append(condition); } *************** *** 45,49 **** public void addEnsure(Expression condition, Expression name) { ! post.add(CallExp.create(symbol(assertName, condition), condition, name)); ensureRepr.append(condition).append(':').append(name).append(','); } --- 45,49 ---- public void addEnsure(Expression condition, Expression name) { ! post.add(bossa.syntax.dispatch.createCallExp(symbol(assertName, condition), condition, name)); ensureRepr.append(condition).append(':').append(name).append(','); } Index: dispatch.java.bootstrap =================================================================== RCS file: /cvsroot/nice/Nice/src/bossa/syntax/dispatch.java.bootstrap,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** dispatch.java.bootstrap 4 Aug 2004 18:36:09 -0000 1.17 --- dispatch.java.bootstrap 5 Aug 2004 10:45:30 -0000 1.18 *************** *** 31,34 **** --- 31,51 ---- { return null; } + public static Expression createCallExp(Expression function, Expression param1) + { return null; } + + public static Expression createCallExp(Expression function, Expression param1, Expression param2) + { return null; } + + public static Expression createCallExp(Expression function, Expression param1, Expression param2, Expression param3) + { return null; } + + public static Expression createCallExp(Expression func, Arguments args, boolean infix, boolean hasBrackets) + { return null; } + + public static Expression createCallExp(Expression func, Arguments args) + { return null; } + + public static void addBlockArgument(Expression callexp, Statement block, LocatedString name) {} + public static gnu.bytecode.Method getImplementationAbove(JavaMethod decl, gnu.bytecode.ClassType firstArg) { return null; } |
