summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/lexer.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-05-13 18:27:22 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-05-13 18:27:22 +0000
commit9e9ef1acc6231254e52b96257ed1e81475d2d1bc (patch)
treedb3fec56ad53ee8741c1c07e56e4f965e1f24320 /lib/puppet/parser/lexer.rb
parent8ed666a7c202420d4bc59cea77f3bd0bec95cc11 (diff)
downloadpuppet-9e9ef1acc6231254e52b96257ed1e81475d2d1bc.tar.gz
puppet-9e9ef1acc6231254e52b96257ed1e81475d2d1bc.tar.xz
puppet-9e9ef1acc6231254e52b96257ed1e81475d2d1bc.zip
The "collectable" syntax now works end-to-end -- the parser correctly recognizes it, the AST objects retain the settings, the scopes do the right conversion, the interpreter stores them all in the database, and then it strips the collectable objects out before sending the object list to the client
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1189 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser/lexer.rb')
-rw-r--r--lib/puppet/parser/lexer.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb
index e3fc9ded7..65a513624 100644
--- a/lib/puppet/parser/lexer.rb
+++ b/lib/puppet/parser/lexer.rb
@@ -34,6 +34,9 @@ module Puppet
%r{,} => :COMMA,
%r{\.} => :DOT,
%r{:} => :COLON,
+ %r{@} => :AT,
+ %r{<\|} => :LCOLLECT,
+ %r{\|>} => :RCOLLECT,
%r{;} => :SEMIC,
%r{\?} => :QMARK,
%r{\\} => :BACKSLASH,