@@ -3,12 +3,13 @@ require_once dirname(__FILE__) . '/tree.php'; class FuTreeDSLInterpreter extends Fu { - var $body, $output; + var $body, $defs = array(), $output; function evaluate($node) { - if (method_exists($this, $method = 'sym' . $node->value())) { + if (method_exists($this, $method = 'sym' . $name = $node->value())) { return call(array($this, $method), array($node->firstInner())); } - throw err('Undefined symbol')->ofName($node->value()); } + if (array_key_exists($name, $this->defs)) { return $this->defs[$name]; } + throw err('Undefined symbol')->ofName($name); } function run($body) { $this->output = new FuTreeWriter; @@ -36,6 +37,9 @@ class FuTreeDSLInterpreter extends Fu { function symCall($node) { return $this->evaluate($node)->output($this->output)->call(); } function symThisFn() { return $this; } + function symDef($node) { + return $this->defs[$node->value()] = ($v = $node->next()) ? $this->evaluate($v) : null; } + function symIf($node) { if (fuTrue($this->evaluate($node))) { return $this->evaluate($node->next()); } if ($node = $node->next()->next()) { lib/tree_dsl.php @@ -97,4 +97,20 @@ class FnSpec extends DSLInterpreterSpec { _($this->subj->run(n('thisFn')))->shouldBe($this->subj); _($this->subj->run( n('call', n('fn', n('null'), n('thisFn'))))->body()) - ->shouldEqual(nList(n('null'), n('thisFn'))); } } \ No newline at end of file + ->shouldEqual(nList(n('null'), n('thisFn'))); } } + +class DefSpec extends DSLInterpreterSpec { + + function _should_define_new_sym_with_name_of_1st_and_value_of_2nd() { + _($this->subj->run( + nList(n('def', $this->undefed(), n('true')), $this->undefed())))->shouldBe(true); + _($this->subj->run( + nList(n('def', $this->undefed(), n('false')), $this->undefed())))->shouldBe(false); } + + function _should_return_value_of_definition() { + _($this->subj->run(n('def', $this->undefed(), n('false'))))->shouldBe(false); + _($this->subj->run(n('def', $this->undefed(), n('true'))))->shouldBe(true); } + + function _should_define_new_sym_as_null_of_2nd_omitted() { + _($this->subj->run(n('def', $this->undefed())))->shouldBe(null); + _($this->subj->run(nList(n('def', $this->undefed()), $this->undefed())))->shouldBe(null); } } \ No newline at end of file spec/tree_dsl.php a4645b5db5f5fde6d299d724b2308453ff3f24dd ole oliver.saunders@gmail.com http://github.com/olliesaunders/fluidics/commit/da90dd033166dcd31d960f00cc279b3824680e04 da90dd033166dcd31d960f00cc279b3824680e04 2009-11-09T03:46:05-08:00 2009-11-09T03:46:01-08:00 Tree DSL: Added def, not completely lexical yet. c047940ab0c642493a5456c5539200502464e8c8 ole oliver.saunders@gmail.com