diff options
author | Luke Kanies <luke@madstop.com> | 2007-10-05 00:07:38 -0500 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2007-10-05 00:07:38 -0500 |
commit | 0e336bf62b818aaa31fcc323ab5d31e5eb92eb46 (patch) | |
tree | 2f29d3e668aad2cade6059c74cbba60d60873561 /lib/puppet/parser/interpreter.rb | |
parent | 1fa591287a4ab921cec628aa0c5bf58d61fbdef2 (diff) | |
download | puppet-0e336bf62b818aaa31fcc323ab5d31e5eb92eb46.tar.gz puppet-0e336bf62b818aaa31fcc323ab5d31e5eb92eb46.tar.xz puppet-0e336bf62b818aaa31fcc323ab5d31e5eb92eb46.zip |
This commit is focused on getting the 'puppet' executable
to work. As a result, it involves a lot of integration-level
testing, and a lot of small design changes to make the code
actually work.
In particular, indirections can now have default termini,
so that configurations and facts default to their code terminus
Also, I've removed the ability to manually control whether
ast nodes are used. I might need to add it back in later,
but if so it will be in the form of a global setting,
rather than the previous system of passing it through 10 different
classes. Instead, the parser detects whether there are AST nodes
defined and requires them if so or ignores them if not.
About 75 tests are still failing in the main set of tests,
but it's going to be a long slog to get them working --
there are significant design issues around them, as most of
the failures are a result of tests trying to emulate both the
client and server sides of a connection, which normally would
have different fact termini but in this case must have the same
terminus just because they're in the same process and are global.
The next step, then, is to figure that process out, thus finding a way
to make this all work.
Diffstat (limited to 'lib/puppet/parser/interpreter.rb')
-rw-r--r-- | lib/puppet/parser/interpreter.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index 0b8c035ba..8c727118c 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -26,7 +26,7 @@ class Puppet::Parser::Interpreter # evaluate our whole tree def compile(node) raise Puppet::ParseError, "Could not parse configuration; cannot compile" unless env_parser = parser(node.environment) - return Puppet::Parser::Compile.new(node, env_parser, :ast_nodes => usenodes?).compile + return Puppet::Parser::Compile.new(node, env_parser).compile end # create our interpreter @@ -53,11 +53,6 @@ class Puppet::Parser::Interpreter @parsers = {} end - # Should we parse ast nodes? - def usenodes? - defined?(@usenodes) and @usenodes - end - private # Create a new parser object and pre-parse the configuration. |