This is functional syntactically but not yet through the whole system, because of the changes made to how resource types are managed. See the next commit for that fix.
Signed-off-by: Luke Kanies <[email protected]> --- lib/puppet/parser/grammar.ra | 5 +---- lib/puppet/parser/parser.rb | 7 ++----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index 5dbf6f4..0aa31e5 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -657,7 +657,7 @@ hostclass: CLASS classname argumentlist classparent LBRACE statements RBRACE { @lexer.commentpop # Our class gets defined in the parent namespace, not our own. @lexer.namepop - newclass classname(val[1]), :arguments => val[2], :code => val[5], :parent => val[3], :line => val[0][:line] + newclass classname(val[1]), :arguments => val[2], :parent => val[3], :code => val[5], :line => val[0][:line] result = nil } | CLASS classname argumentlist classparent LBRACE RBRACE { @lexer.commentpop @@ -795,9 +795,6 @@ module Puppet class AlreadyImportedError < ImportError; end end -Puppet[:typecheck] = true -Puppet[:paramcheck] = true - ---- inner ---- # It got too annoying having code in a file that needs to be compiled. diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb index 2f7d754..a1d2341 100644 --- a/lib/puppet/parser/parser.rb +++ b/lib/puppet/parser/parser.rb @@ -17,14 +17,11 @@ module Puppet class AlreadyImportedError < ImportError; end end -Puppet[:typecheck] = true -Puppet[:paramcheck] = true - module Puppet module Parser class Parser < Racc::Parser -module_eval(<<'...end grammar.ra/module_eval...', 'grammar.ra', 802) +module_eval(<<'...end grammar.ra/module_eval...', 'grammar.ra', 799) # It got too annoying having code in a file that needs to be compiled. require 'puppet/parser/parser_support' @@ -2083,7 +2080,7 @@ module_eval(<<'.,.,', 'grammar.ra', 656) @lexer.commentpop # Our class gets defined in the parent namespace, not our own. @lexer.namepop - newclass classname(val[1]), :arguments => val[2], :code => val[5], :parent => val[3], :line => val[0][:line] + newclass classname(val[1]), :arguments => val[2], :parent => val[3], :code => val[5], :line => val[0][:line] result = nil result -- 1.6.1 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
