@@ -32,7 +32,7 @@ class FuTreeDSLInterpreter extends Fu { function symStr($node) { return $node->value(); } function symFn($node) { return with(new $this)->body($node); } function symNodeOf($node) { return n($this->evaluate($node)); } - function symExpr($node) { return eval('return ' . $node->value() . ';'); } + function symExpr($node) { return eval('return ' . join(NL, $node->values()) . ';'); } function symCall($node) { return $this->evaluate($node)->output($this->output)->call(); } function symThisFn() { return $this; } lib/tree_dsl.php @@ -49,7 +49,10 @@ class WriteSpec extends DSLInterpreterSpec { class ExprSpec extends DSLInterpreterSpec { function _should_evaluate_php_and_return_result() { - _($this->subj->run(n('expr', n('join("/", array("a", "b"))'))))->shouldBe('a/b'); } } + _($this->subj->run(n('expr', n('join("/", array("a", "b"))'))))->shouldBe('a/b'); } + + function _should_allow_multiple_lines_of_php_joined_with_nl() { + _($this->subj->run(n('expr', n('"foo'), n('bar"'))))->shouldBe("foo\nbar"); } } class IfSpec extends DSLInterpreterSpec { spec/tree_dsl.php aa045bee1170185d33ef0ddf5bf99d42d6a37325 ole oliver.saunders@gmail.com http://github.com/olliesaunders/fluidics/commit/e000b15d43b38a2adb4b880beb5cd905fc30ab91 e000b15d43b38a2adb4b880beb5cd905fc30ab91 2009-11-08T09:41:42-08:00 2009-11-08T09:41:42-08:00 Tree DSL: expr now allows multiple lines of expression. 59ae7ce45a869ebd1ceaf379e0dfae3186bc13e5 ole oliver.saunders@gmail.com