@@ -1,3 +1,4 @@ +#!/usr/bin/hobbes class Board { def init(values) { @values = values examples/sudoku.hb hobbes.jar hobbes.sh @@ -54,10 +54,18 @@ public class HbObject extends Throwable { return call(">",new HbObject[]{other}) == getObjSpace().getTrue(); } + public boolean gte(HbObject other) throws ErrorWrapper, HbError, Continue, Break { + return gt(other) || eq(other); + } + public boolean lt(HbObject other) throws ErrorWrapper, HbError, Continue, Break { return call("<",new HbObject[]{other}) == getObjSpace().getTrue(); } + public boolean lte(HbObject other) throws ErrorWrapper, HbError, Continue, Break { + return lt(other) || eq(other); + } + public boolean eq(HbObject other) throws ErrorWrapper, HbError, Continue, Break { return call("==",new HbObject[]{other}) == getObjSpace().getTrue(); } src/hobbes/values/HbObject.java @@ -56,6 +56,38 @@ public class HbRange extends HbObject { return end; } + @HobbesMethod(name="overlaps?",numArgs=1) + public HbObject hbOverlaps(HbObject other) throws ErrorWrapper, HbError, Continue, Break { + if(other instanceof HbRange) { + return getObjSpace().getBool(overlaps((HbRange)other)); + } else { + throw new HbArgumentError(getInterp(),"overlaps?",other,"Range"); + } + } + + public boolean overlaps(HbRange other) throws ErrorWrapper, HbError, Continue, Break { + return this.getEnd().gte(((HbRange)other).getStart()); + } + + @HobbesMethod(name="overlap",numArgs=1) + public HbObject overlap(HbObject other) throws ErrorWrapper, HbError, Continue, Break { + if(other instanceof HbRange) { + if(overlaps((HbRange)other)) { + return new HbRange(getInterp(),((HbRange)other).getStart(),this.getEnd()); + } else + return getObjSpace().getNil(); + } else + throw new HbArgumentError(getInterp(),"overlap",other,"Range"); + } + + @HobbesMethod(name="contains?",numArgs=1) + public HbObject contains(HbObject obj) throws ErrorWrapper, HbError, Continue, Break { + if(obj.getHbClass().getName().equals(getStart().getHbClass().getName())) { + return getObjSpace().getBool(obj.gte(getStart()) && obj.lte(getEnd())); + } else + throw new HbArgumentError(getInterp(),"contains?",obj,getStart().getHbClass().getName()); + } + @HobbesMethod(name="==",numArgs=1) public HbObject equalTo(HbObject other) throws ErrorWrapper, HbError, Continue, Break { if(other instanceof HbRange) @@ -119,6 +151,16 @@ public class HbRange extends HbObject { return toReturn; } + @HobbesMethod(name="map",numArgs=1) + public HbSet map(HbObject func) throws ErrorWrapper, HbError, Continue, Break { + return toSet().map(func); + } + + @HobbesMethod(name="filter",numArgs=1) + public HbSet filter(HbObject func) throws ErrorWrapper, HbError, Continue, Break { + return toSet().filter(func); + } + public IterImp iterator() { return new IterImp(start,end); } src/hobbes/values/HbRange.java @@ -105,6 +105,35 @@ public class HbSet extends HbObject implements Iterable<HbObject> { return list; } + @HobbesMethod(name="map",numArgs=1) + public HbSet map(HbObject func) throws ErrorWrapper, HbError, Continue, Break { + if(func instanceof HbFunction) { + HbSet newSet = new HbSet(getInterp()); + for(HbObject elem: this) { + HbObject result = getInterp().callFunc((HbFunction)func, + new HbObject[]{elem},null); + newSet.add(result); + } + return newSet; + } else + throw new HbArgumentError(getInterp(),"map",func,"AnonymousFunction"); + } + + @HobbesMethod(name="filter",numArgs=1) + public HbSet filter(HbObject func) throws ErrorWrapper, HbError, Continue, Break { + if(func instanceof HbFunction) { + HbSet newSet = new HbSet(getInterp()); + for(HbObject elem: this) { + HbObject result = getInterp().callFunc((HbFunction)func, + new HbObject[]{elem},null); + if(result == getObjSpace().getTrue()) + newSet.add(result); + } + return newSet; + } else + throw new HbArgumentError(getInterp(),"filter",func,"AnonymousFunction"); + } + @HobbesMethod(name="each",numArgs=1) public void each(HbObject func) throws ErrorWrapper, HbError, Continue, Break { if(func instanceof HbFunction) { src/hobbes/values/HbSet.java 4799b621bc797e6f98523398a4f4a96e865a533f Pete Vilter bonasaurus1@gmail.com http://github.com/bonasaurus1/hobbes/commit/34cdd6032a41e1bcfd439c5bb4e23c51390a50bd 34cdd6032a41e1bcfd439c5bb4e23c51390a50bd 2009-06-26T15:29:01-07:00 2009-06-26T15:29:01-07:00 Range bread and butter, Set#map, filter. Closes #96 1904331132bcc64aba21ac36daa6d02fa196bd8b Pete Vilter bonasaurus1@gmail.com