@@ -68,7 +68,12 @@ public class FlowControlBehavior {
wherePlace = Message.getEvaluatedArgument(place, context);
}
- Object originalValue = realPlace.sendTo(context, wherePlace);
+ Object originalValue = null;
+ try {
+ originalValue = realPlace.sendTo(context, wherePlace);
+ } catch(Throwable e) {
+ originalValue = null;
+ }
if(realPlace.getArguments().size() != 0) {
String newName = realPlace.getName() + "=";
@@ -96,10 +101,24 @@ public class FlowControlBehavior {
if(realPlace.getArguments().size() != 0) {
String newName = realPlace.getName() + "=";
List<Object> arguments = new ArrayList<Object>(realPlace.getArguments());
- arguments.add(context.runtime.createMessage(Message.wrap(IokeObject.as(value))));
- context.runtime.newMessageFrom(realPlace, newName, arguments).sendTo(context, wherePlace);
+
+ if(value == null) {
+ if(newName.equals("cell=")) {
+ context.runtime.removeCellMessage.sendTo(context, wherePlace, new ArrayList<Object>(realPlace.getArguments()));
+ } else {
+ arguments.add(context.runtime.createMessage(Message.wrap(context.runtime.nil)));
+ context.runtime.newMessageFrom(realPlace, newName, arguments).sendTo(context, wherePlace);
+ }
+ } else {
+ arguments.add(context.runtime.createMessage(Message.wrap(IokeObject.as(value))));
+ context.runtime.newMessageFrom(realPlace, newName, arguments).sendTo(context, wherePlace);
+ }
} else {
- IokeObject.assign(wherePlace, realPlace.getName(), value, context, message);
+ if(value == null) {
+ IokeObject.removeCell(wherePlace, context, message, realPlace.getName());
+ } else {
+ IokeObject.assign(wherePlace, realPlace.getName(), value, context, message);
+ }
}
} catch(Throwable e) {}
}
src/main/ioke/lang/FlowControlBehavior.java
@@ -117,6 +117,8 @@ public class Runtime {
public IokeObject inspectMessage = newMessage("inspect");
public IokeObject noticeMessage = newMessage("notice");
+ public IokeObject removeCellMessage = newMessage("removeCell!");
+
public IokeObject plusMessage = newMessage("+");
public IokeObject minusMessage = newMessage("-");
public IokeObject multMessage = newMessage("*");
src/main/ioke/lang/Runtime.java
@@ -52,6 +52,22 @@ describe(DefaultBehavior,
error!("non-local yay!")))
Text fluxie2 wowsie should == 13
)
+
+ it("should bind a new place temporarily, and then remove it",
+ X = Origin mimic
+ let(X testOfLetMethod, method(42),
+ X testOfLetMethod should == 42
+ )
+ X cellNames should not include(:testOfLetMethod)
+ )
+
+ it("should bind a new place with cell temporarily, and then remove it",
+ X = Origin mimic
+ let(X cell(:testOfLetMethod2), method(42),
+ X testOfLetMethod2 should == 42
+ )
+ X cellNames should not include(:testOfLetMethod2)
+ )
)
)
)
test/let_spec.ik
e29457890a4f2ea2871679647039250f267cdd7b
Ola Bini
olabini
ola.bini@gmail.com
http://github.com/olabini/ioke/commit/8af3954df7961b3f594c73db5059310469e45df5
8af3954df7961b3f594c73db5059310469e45df5
2009-01-10T06:05:14-08:00
2009-01-10T06:05:14-08:00
Make it possible to assign a place that doesn't exist, and then have it disappear again. This allows temporary overriding in the manner of categories, for specific cells
5e68c8bea39ca8af1ab1f8091ac97655948b6ce8
Ola Bini
olabini
ola.bini@gmail.com