summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-08-02 20:54:59 -0700
committermarkus <markus@AVA-351181.(none)>2010-08-03 15:19:34 -0700
commit37568bdd3f8cc3514eb9d0bf0eae3302686bc13d (patch)
tree1f4042a15444adfe01a82ce786b3055904cdb357 /lib
parent449315a2c705df2396852462a1d1e14774b9f117 (diff)
downloadpuppet-37568bdd3f8cc3514eb9d0bf0eae3302686bc13d.tar.gz
puppet-37568bdd3f8cc3514eb9d0bf0eae3302686bc13d.tar.xz
puppet-37568bdd3f8cc3514eb9d0bf0eae3302686bc13d.zip
[#4423] class { shouldn't get stored on the namespace stack
The new syntax for instantiating parameterized classes was confusing the lexer's notion of namespaces. This is a simple fix to prevent that syntax from polluting the namespaces.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/parser/lexer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb
index aa04f17a0..24999bf4e 100644
--- a/lib/puppet/parser/lexer.rb
+++ b/lib/puppet/parser/lexer.rb
@@ -483,7 +483,7 @@ class Puppet::Parser::Lexer
yield [final_token.name, token_value]
if @previous_token
- namestack(value) if @previous_token.name == :CLASS
+ namestack(value) if @previous_token.name == :CLASS and value != '{'
if @previous_token.name == :DEFINE
if indefine?