@@ -8,5 +8,4 @@ - HbFloat#round (precision?) - HbString - toNumber (toInt? toFloat?) - - succ, pred - rand() (seems like it should be static, but that's not possible right now...) TODO @@ -4,7 +4,7 @@ <property name="build" location="bin"/> <target name="compile"> <mkdir dir="${build}"/> - <javac srcdir="${src}" destdir="${build}"/> + <javac srcdir="${src}" destdir="${build}" debug="true"/> </target> <target name="create_run_jar" depends="compile"> <jar destfile="${basedir}/hobbes.jar" filesetmanifest="mergewithoutmain"> build.xml @@ -1,11 +1,3 @@ -# TODO: -# - Range#toSet -# - Int % Int => Int -# - String#toNumber -# - String#split(',') => ['',''] -# - catch NoSuchElementException => throw KeyboardInterrupt -# - real option parser - class Board { def init(values) { @values = values examples/sudoku.hb hobbes.sh @@ -102,7 +102,7 @@ public class Debugger extends Interpreter { for(SourceLine l: file.getFollowingLines(tree.getLine().getLineNo(),SURR_LINES)) System.out.println(" " + l.show()); } else { - System.out.println(evalFunc(command,null).realToString()); + System.out.println(evalFunc(command,null).show()); } } } src/hobbes/interpreter/Debugger.java @@ -96,8 +96,10 @@ public class Interpreter { try { HbObject result = run(tree); String toReturn = null; - if(result != null) + if(result != null) { toReturn = result.show(); + getCurrentFrame().getScope().assignForce("_",result); + } return toReturn; } catch(ErrorWrapper e) { handleError(e); @@ -227,7 +229,7 @@ public class Interpreter { throws ErrorWrapper, HbError, Continue, Break { HbFunction func = (HbFunction)eval(call.getFuncExpr()); String funcRepr = func instanceof HbAnonymousFunction ? - func.hbToString().getValue() : + func.show() : ((HbNamedFunction)func).getName(); HbObject[] args = evalArgs(call.getArgs(),func, funcRepr,call.getParenLoc()); @@ -252,7 +254,7 @@ public class Interpreter { // push frame try { pushFrame(new NormalFunctionFrame(new Scope(this,getCurrentFrame().getScope()), - func.realToString(),parenLoc)); + func.show(),parenLoc)); } catch (HbStackOverflow e) { throw new ErrorWrapper(e,parenLoc); } @@ -321,11 +323,17 @@ public class Interpreter { throw new ErrorWrapper(e,parenLoc); } if(func.getName().equals("print")) { - System.out.println(args[0].realToString()); + if(args[0].getHbClass().hasMethod("toString")) + System.out.println(args[0].realToString()); + else + System.out.println(args[0].show()); popFrame(); return objSpace.getNil(); } else if(func.getName().equals("get_input")) { - System.out.print(args[0].realToString()); + if(args[0].getHbClass().hasMethod("toString")) + System.out.print(args[0].realToString()); + else + System.out.print(args[0].show()); Scanner in = new Scanner(System.in); popFrame(); try { @@ -356,7 +364,7 @@ public class Interpreter { HbObject lastResult = null; while(s.hasNext()) { try { - tokenizer.addLine(f.addLine(s.next())); + tokenizer.addLine(f.addLine(s.nextLine())); if(tokenizer.isReady()) { SyntaxNode tree = parser.parse(tokenizer.getTokens()); lastResult = run(tree); @@ -440,7 +448,7 @@ public class Interpreter { try { hobbesClass = (HbClass)eval(expr.getClassVar()); } catch(ClassCastException e) { - throw new ErrorWrapper(new HbNotAClassError(this,className), + throw new ErrorWrapper(new HbTypeError(this,className + " is not a class"), expr.getClassVar().getOrigin().getStart()); } // get Java class @@ -782,7 +790,8 @@ public class Interpreter { if(sc instanceof HbClass) superclass = ((HbClass)sc).getName(); else - throw new ErrorWrapper(new HbNotAClassError(this,def.getSuperclass().getName()), + throw new ErrorWrapper(new HbTypeError(this,def.getSuperclass().getName() + + " is not a class"), def.getSuperclass().getOrigin().getStart()); } if(!superclass.equals("Object") && objSpace.getBuiltinClasses().contains(superclass)) src/hobbes/interpreter/Interpreter.java @@ -67,7 +67,6 @@ public class ObjectSpace { addNativeClass(HbReadOnlyError.class); addNativeClass(HbKeyError.class); addNativeClass(HbTypeError.class); - addNativeClass(HbNotAClassError.class); // set builtin classes for(String className: classes.keySet()) builtinClasses.add(className); src/hobbes/interpreter/ObjectSpace.java @@ -40,7 +40,7 @@ public class HbAnonymousFunction extends HbFunction { } public String getRepr() throws ErrorWrapper, HbError, Continue, Break { - return realToString(); + return show(); } @HobbesMethod(name="toString") src/hobbes/values/HbAnonymousFunction.java @@ -14,9 +14,14 @@ public class HbFalse extends HbObject { return this; } + @HobbesMethod(name="show") + public HbString hbShow() { + return getObjSpace().getString("false"); + } + @HobbesMethod(name="toString") public HbString hbToString() { - return getObjSpace().getString("false"); + return hbShow(); } } src/hobbes/values/HbFalse.java @@ -22,8 +22,8 @@ public class HbFloat extends HbObject { return value; } - @HobbesMethod(name="toString") - public HbString hbToString() { + @HobbesMethod(name="show") + public HbString hbShow() { return getObjSpace().getString(String.valueOf(value)); } src/hobbes/values/HbFloat.java @@ -29,8 +29,8 @@ public class HbInt extends HbObject { return "<Int val=" + getValue() + ">"; } - @HobbesMethod(name="toString") - public HbString hbToString() { + @HobbesMethod(name="show") + public HbString hbShow() { return getObjSpace().getString(String.valueOf(value)); } src/hobbes/values/HbInt.java @@ -47,8 +47,8 @@ public class HbList extends HbObject { return newList; } - @HobbesMethod(name="toString") - public HbString hbToString() throws ErrorWrapper, HbError, Continue, Break { + @HobbesMethod(name="show") + public HbString hbShow() throws ErrorWrapper, HbError, Continue, Break { StringBuilder repr = new StringBuilder("["); Iterator<HbObject> it = elements.iterator(); while(it.hasNext()) { src/hobbes/values/HbList.java @@ -14,9 +14,14 @@ public class HbNil extends HbObject { return getObjSpace().getFalse(); } + @HobbesMethod(name="show") + public HbString hbShow() { + return getObjSpace().getString("nil"); + } + @HobbesMethod(name="toString") public HbString hbToString() { - return getObjSpace().getString("nil"); + return hbShow(); } } src/hobbes/values/HbNil.java @@ -62,16 +62,6 @@ public class HbObject extends Throwable { return call("==",new HbObject[]{other}) == getObjSpace().getTrue(); } - @HobbesMethod(name="toString") - public HbString hbToString() throws ErrorWrapper, HbError, Continue, Break { - StringBuilder repr = new StringBuilder("<"); - repr.append(getHbClass().getName()); - repr.append("@"); - repr.append(getId()); - repr.append(">"); - return getObjSpace().getString(repr.toString()); - } - @HobbesMethod(name="is_a?",numArgs=1) public HbObject isA(HbObject klass) throws HbArgumentError { if(klass instanceof HbClass) { @@ -80,16 +70,30 @@ public class HbObject extends Throwable { throw new HbArgumentError(getInterp(),"is_a?",klass,"Class"); } - public String realToString() throws ErrorWrapper, HbError, Continue, Break { - HbObject repr = call("toString"); + public String show() throws ErrorWrapper, HbError, Continue, Break { + HbObject repr = call("show"); if(repr instanceof HbString) return ((HbString)repr).getValue(); else - throw new HbTypeError(getInterp(),"toString must return a String"); + throw new HbTypeError(getInterp(),"show() must return a String"); } - public String show() throws ErrorWrapper, HbError, Continue, Break { - return realToString(); + @HobbesMethod(name="show") + public HbString hbShow() throws ErrorWrapper, HbError, Continue, Break { + StringBuilder repr = new StringBuilder("<"); + repr.append(getHbClass().getName()); + repr.append("@"); + repr.append(getId()); + repr.append(">"); + return getObjSpace().getString(repr.toString()); + } + + public String realToString() throws ErrorWrapper, HbError, Continue, Break { + HbObject result = call("toString"); + if(result instanceof HbString) + return ((HbString)result).getValue(); + else + throw new HbTypeError(getInterp(),"toString() must return a String"); } public HbObject call(String methodName, HbObject[] args) throws ErrorWrapper, HbError, src/hobbes/values/HbObject.java @@ -60,9 +60,9 @@ public class HbRange extends HbObject { public HbString hbToString() throws ErrorWrapper, HbError, Continue, Break { StringBuilder repr = new StringBuilder(); repr.append("<Range "); - repr.append(start.realToString()); + repr.append(start.show()); repr.append(" to "); - repr.append(end.realToString()); + repr.append(end.show()); repr.append(">"); return getObjSpace().getString(repr); } @@ -102,6 +102,14 @@ public class HbRange extends HbObject { return toReturn; } + @HobbesMethod(name="toSet") + public HbSet toSet() throws ErrorWrapper, HbError, Continue, Break { + HbSet toReturn = new HbSet(getInterp()); + for(HbObject cur=start; cur.lt(end) || cur.eq(end); cur=cur.call("succ")) + toReturn.add(cur); + return toReturn; + } + public IterImp iterator() { return new IterImp(start,end); } src/hobbes/values/HbRange.java @@ -87,8 +87,8 @@ public class HbSet extends HbObject { elements.put(obj,getObjSpace().getTrue()); } - @HobbesMethod(name="toString") - public HbString hbToString() throws ErrorWrapper, HbError, Continue, Break { + @HobbesMethod(name="show") + public HbString hbShow() throws ErrorWrapper, HbError, Continue, Break { StringBuilder repr = new StringBuilder("{"); Iterator<HbObject> it = elements.getKeys().iterator(); while(it.hasNext()) { src/hobbes/values/HbSet.java @@ -4,8 +4,8 @@ import hobbes.interpreter.Interpreter; public class HbStackOverflow extends HbError { - public HbStackOverflow(Interpreter o) { - super(o, null); + public HbStackOverflow(Interpreter i) { + super(i, null); } } src/hobbes/values/HbStackOverflow.java @@ -18,10 +18,6 @@ public class HbString extends HbObject { this(i,""); } - public HbString(Interpreter i, Character val) { - this(i,val.toString()); - } - public HbString(Interpreter i, String val) { super(i); value = val; @@ -49,8 +45,9 @@ public class HbString extends HbObject { return "<String@" + getId() + " val=" + getValue() + ">"; } - public String show() { - return "'" + sanitizedValue() + "'"; + @HobbesMethod(name="show") + public HbString hbShow() { + return getObjSpace().getString("'" + sanitizedValue() + "'"); } @HobbesMethod(name="toString") @@ -100,7 +97,7 @@ public class HbString extends HbObject { @HobbesMethod(name="+",numArgs=1) public HbString plus(HbObject other) throws HbError, ErrorWrapper, Continue, Break { - return getObjSpace().getString(getValue() + other.realToString()); + return getObjSpace().getString(getValue() + other.show()); } @HobbesMethod(name="*",numArgs=1) src/hobbes/values/HbString.java @@ -9,9 +9,14 @@ public class HbTrue extends HbObject { super(o); } + @HobbesMethod(name="show") + public HbString hbShow() { + return getObjSpace().getString("true"); + } + @HobbesMethod(name="toString") public HbString hbToString() { - return getObjSpace().getString("true"); + return hbShow(); } } src/hobbes/values/HbTrue.java src/hobbes/values/HbNotAClassError.java 07565b9bc253b9d329e7ee02281d72f22701db13 Pete Vilter bonasaurus1@gmail.com http://github.com/bonasaurus1/hobbes/commit/905a1ba67bec908e99b3627a6fef47e1b1f41685 905a1ba67bec908e99b3627a6fef47e1b1f41685 2009-06-19T08:59:50-07:00 2009-06-19T08:59:50-07:00 fixed string repr stuff. closes #84 9fb43b015596334a131c50019aa5c8493835c711 Pete Vilter bonasaurus1@gmail.com