@@ -6,10 +6,10 @@ class Sawdust extends Fu { function run($body) { $this->topLevelScope = with(new SawdustScope); return $this->topLevelScope->body($body)->defs($this->fnsFromNames(array('at'))) - ->call(null, new FuTreeWriter); } + ->call(null, with(new FuStruct)->output(new FuTreeWriter)); } # struct is hacky? function fnsFromNames($names) { - $fns = array(); + $fns = new ArrayObject; foreach ($names as $name) { $fnClass = "SawdustFn$name"; $fns[$name] = with(new $fnClass)->scope($this->topLevelScope); } @@ -19,11 +19,15 @@ class Sawdust extends Fu { class SawdustScope extends Fu { - var $body, $defs = array(), $macros = array(), $scope, $output; + var $body, $defs, $macros, $scope, $output; - function call($params, $output) { + function __construct() { + $this->defs = new ArrayObject; + $this->macros = new ArrayObject; } + + function call($params, $scope) { $this->params = $params; - $this->output = $output; + $this->output = $scope->output; $node = $this->body; $returnValue = null; while ($node) { @@ -32,8 +36,8 @@ class SawdustScope extends Fu { return $returnValue; } function evalSym($node) { - if ($scope = $this->scopeOfMacro($name = $node->value())) { - return $scope->macros[$name]->scope($this)->call($node->firstInner(), $this->output); } + if ($macro = $this->macro($name = $node->value())) { + return $macro->scope($this)->call($node->firstInner(), $this); } if ($scope = $this->scopeOfDef($name)) { return $scope->defs[$name]; } return $this->symIncomprisable($node); } @@ -46,8 +50,8 @@ class SawdustScope extends Fu { if ($this->scope) { return $this->scope->{__FUNCTION__}($name); } } // Retrieves the first instance, looking back through scopes, that has macro of `$name` defined. - function scopeOfMacro($name) { - if (array_key_exists($name, $this->macros)) { return $this; } + function macro($name) { + if (isset($this->macros[$name])) { return $this->macros[$name]; } if ($this->scope) { return $this->scope->{__FUNCTION__}($name); } } function symIncomprisable($node) { @@ -77,11 +81,14 @@ class SawdustScope extends Fu { function symDefMacro($node) { return $this->macros[$node->value()] = with(new $this)->body($node->next()); } + function symDefInline($node) { + return $this->macros[$node->value()] = with(new SawdustInline)->body($node->next()); } + function symCall($node) { $fn = $node; $params = new FuBranchWriter; while ($node = $node->next) { $params->write(n($this->evalSym($node))); } - return $this->evalSym($fn)->call($params->first(), $this->output); } + return $this->evalSym($fn)->call($params->first(), $this); } function symIf($node) { if (fuTrue($this->evalSym($node))) { return $this->evalSym($node->next()); } @@ -96,6 +103,13 @@ class SawdustScope extends Fu { $this->output->popOut(); } return $written; } } +class SawdustInline extends SawdustScope { + + function call($params, $scope) { + $this->defs = $scope->defs; + $this->macros = $scope->macros; + return parent::call($params, $scope); } } + class SawdustFnAt extends SawdustScope { - function call($params, $output) { + function call($params, $scope) { return $params->next()->value()->at($params->value()); } } \ No newline at end of file lib/sawdust.php @@ -47,20 +47,12 @@ class TinyIncomprisablesSpec extends SawdustSpec { class WriteSpec extends SawdustSpec { - function _should_eval_first_param_and_create_node_from_evaluation_return() { - $this->subj->run(n('write', n('node', n('foo')))); - _($this->subj->output())->shouldEqual(n('foo')); } + function _should_eval_first_param_treewrite_it_and_return_first_written() { + _($this->subj->run($this->write('foo')))->shouldEqual(n('foo')); } function _should_eval_remaining_args_with_successive_writes_appending_inners_of_last_written() { - $this->subj->run(n('write', n('node', n('foo')), $this->write('bar'), $this->write('zim'))); - _($this->subj->output())->shouldEqual(n('foo', n('bar'), n('zim'))); } - - function _should_be_able_to_write_a_whole_tree() { - $this->subj->run(n('write', n('node', $tree = n('foo', n('bar'), n('zim'))))); - _($this->subj->output())->shouldEqual($tree); } - - function _should_return_written_value() { - _($this->subj->run(n('write', n('node', n('foo')))))->shouldEqual(n('foo')); } } + $tree = n('write', n('node', n('foo')), $this->write('bar'), $this->write('zim')); + _($this->subj->run($tree))->shouldEqual(n('foo', n('bar'), n('zim'))); } } class ExprSpec extends SawdustSpec { @@ -159,20 +151,37 @@ class LexicalScopeSpec extends SawdustSpec { class MacrosSpec extends SawdustSpec { + function name() { return 'defMacro'; } + function _should_be_called_by_normal_evaluation() { _($this->subj->run( - nList(n('defMacro', $this->undefed(), n('true')), $this->undefed())))->shouldBe(true); } + nList(n($this->name(), $this->undefed(), n('true')), $this->undefed())))->shouldBe(true); } function _params_to_macro_should_not_be_evaluated() { _($this->subj->run( - nList(n('defMacro', $this->undefed(), n('params')), $this->undefed(n('true'))))) + nList(n($this->name(), $this->undefed(), n('params')), $this->undefed(n('true'))))) ->shouldEqual(n('true')); } - function _defs_created_inside_a_macro_should_be_scoped_to_the_macro() { - $tree = nList(n('defMacro', $this->undefed(), n('def', n('foo'), n('true'))), n('foo')); + function _defs_created_inside_macro_should_be_scoped_to_the_macro() { + $tree = nList( + n($this->name(), $this->undefed(), n('def', n('foo'), n('true'))), + $this->undefed(), n('foo')); if (_($err = rescue(array($this->subj, 'run'), array($tree)))->shouldNotBe(null)) { _($err->msg())->shouldBe('Undefined symbol'); } } } +class InlineMarcosSpec extends MacrosSpec { + + function name() { return 'defInline'; } + + # Canceling this one. + function _defs_created_inside_macro_should_be_scoped_to_the_macro() { } + + function _defs_created_inside_macro_should_be_defed_in_the_current_scope() { + $tree = nList( + n($this->name(), $this->undefed(), n('def', n('foo'), n('true'))), + $this->undefed(), n('foo')); + _($this->subj->run($tree))->shouldBe(true); } } + class IncomprisableRetrieverSpec extends SawdustSpec { function _should_eval_an_incomprisable() { spec/sawdust.php 3d6fff0fc5320da90c4056dfe1b27c468e5ce7da ole oliver.saunders@gmail.com http://github.com/olliesaunders/fluidics/commit/3e483e8b5c9a6e2318a64e6160dbf86847bb4923 3e483e8b5c9a6e2318a64e6160dbf86847bb4923 2009-11-10T05:37:36-08:00 2009-11-10T05:02:24-08:00 Sawdust: Added inline macros. 1bf8cbcbd01ba54a2b251db0e932cf303dbe30bf ole oliver.saunders@gmail.com