@@ -10,13 +10,17 @@ class FuTreeDSLInterpreter extends Fu { return call(array($this, $method), array($node->firstInner())); } throw err('Undefined direction')->ofName($node->value()); } - function dirInform($node) { $this->information[] = $this->evaluate($node); } + function dirTrue() { return true; } + function dirFalse() { return false; } + function dirNode($node) { return $node; } + function dirStr($node) { return $node->value(); } + function dirExpr($node) { return eval('return ' . $node->value() . ';'); } - function dirTrue() { return true; } - function dirFalse() { return false; } + function dirInform($node) { $this->information[] = $this->evaluate($node); } - function dirStr($node) { return $node->value(); } - function dirNode($node) { return $node; } + function dirIf($node) { + if (fuTrue($this->evaluate($node))) { return $this->evaluate($node->next()); } + return $this->evaluate($node->next()->next()); } function dirWrite($node) { $written = $this->output->write($this->evaluate($node)); lib/tree_dsl.php @@ -2,9 +2,10 @@ require_once dirname(__FILE__) . '/lib/tree.php'; require_once dirname(__FILE__) . '/../lib/tree_dsl.php'; -class InterpreterSpec extends PweSpec { +class DSLInterpreterSpec extends PweSpec { + function beforeEach() { $this->subj = new FuTreeDSLInterpreter; } } - function beforeEach() { $this->subj = new FuTreeDSLInterpreter; } +class InterpreterSpec extends DSLInterpreterSpec { function _should_return_null_for_empty_tree() { _($this->subj->run(null))->shouldBe(null); } @@ -25,9 +26,7 @@ class InterpreterSpec extends PweSpec { _($this->subj->run($tree))->shouldBe(null); _($this->subj->information())->shouldBe(array($expected)); } } -class WriteDirectionSpec extends PweSpec { - - function beforeEach() { $this->subj = new FuTreeDSLInterpreter; } +class WriteDirectionSpec extends DSLInterpreterSpec { function _should_eval_first_param_and_create_node_from_evaluation_return() { _($this->subj->run(n('write', n('node', n('foo')))))->shouldEqual(n('foo')); } @@ -42,4 +41,25 @@ class WriteDirectionSpec extends PweSpec { function _should_be_able_to_write_a_whole_tree() { $tree = n('write', n('node', n('foo', n('bar'), n('zim')))); - _($this->subj->run($tree))->shouldEqual(n('foo', n('bar'), n('zim'))); } } \ No newline at end of file + _($this->subj->run($tree))->shouldEqual(n('foo', n('bar'), n('zim'))); } } + +class ExprDirectionSpec extends DSLInterpreterSpec { + + function _should_evaluate_php() { + $this->subj->run(n('inform', n('expr', n('join("/", array((string)2*4, "foo"))')))); + _($this->subj->information())->shouldBe(array('8/foo')); } } + +class IfDirectionSpec extends DSLInterpreterSpec { + + function _should_evaluate_2nd_and_return_result_if_1st_evaluates_true() { + $this->subj->run(n('inform', n('if', n('true'), n('str', n('foo')), n('str', n('bar'))))); + _($this->subj->information())->shouldBe(array('foo')); } + + function _should_evaluate_3nd_and_return_result_if_1st_evaluates_false() { + $this->subj->run(n('inform', n('if', n('false'), n('str', n('foo')), n('str', n('bar'))))); + _($this->subj->information())->shouldBe(array('bar')); } + + function _should_not_have_silly_php_definition_of_false() { + $tree = n('inform', n('if', n('expr', n('array()')), n('str', n('foo')), n('str', n('bar')))); + $this->subj->run($tree); + _($this->subj->information())->shouldBe(array('foo')); } } \ No newline at end of file spec/tree_dsl.php 93b71c411f05f3b384e61e7adbe337fb577a8b9e ole oliver.saunders@gmail.com http://github.com/olliesaunders/fluidics/commit/29697bab5f121a3536b251f6e99141f4b7d5b93f 29697bab5f121a3536b251f6e99141f4b7d5b93f 2009-11-08T00:43:19-08:00 2009-11-08T00:43:19-08:00 Tree DSL: Added if and expr directions. d2bf9ef44bbe1348f5fd5336ddd0ae55ecc9939d ole oliver.saunders@gmail.com