summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/lexer.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-17 21:27:26 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-09-17 21:27:26 +0000
commita345931bccd2809aee35dcdaf6a3ef1d21db8c26 (patch)
treef2b8bbf7006f162f0fb19a4e3398b38dae9ea010 /lib/puppet/parser/lexer.rb
parenta8bdada4acadd2d5c0a08dd1c9d1a4fe5232e061 (diff)
downloadpuppet-a345931bccd2809aee35dcdaf6a3ef1d21db8c26.tar.gz
puppet-a345931bccd2809aee35dcdaf6a3ef1d21db8c26.tar.xz
puppet-a345931bccd2809aee35dcdaf6a3ef1d21db8c26.zip
Successfully parsed my entire converted cfengine configuration; these are all fixes for bugs i found as a result. I have not tried to execute the configuration yet.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@687 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser/lexer.rb')
-rw-r--r--lib/puppet/parser/lexer.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb
index bc1e99f65..371960c91 100644
--- a/lib/puppet/parser/lexer.rb
+++ b/lib/puppet/parser/lexer.rb
@@ -41,8 +41,8 @@ module Puppet
%r{\?} => :QMARK,
%r{\\} => :BACKSLASH,
%r{=>} => :FARROW,
- %r{[a-z]\w*} => :NAME,
- %r{[A-Z]\w*} => :TYPE,
+ %r{[a-z][-\w]*} => :NAME,
+ %r{[A-Z][-\w]*} => :TYPE,
%r{[0-9]+} => :NUMBER,
%r{\$\w+} => :VARIABLE
}