summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorBrice Figureau <brice-puppet@daysofwonder.com>2008-10-28 14:17:12 +0100
committerBrice Figureau <brice-puppet@daysofwonder.com>2008-10-29 10:30:38 +0100
commit2d37f09aa093b10cb64b9b649f0066217c53d48f (patch)
tree77a08abb35ab5bdb669e4829f71837a4922601a3 /lib/puppet
parent9f30306d2c768bad3327ecb7748669afb10cd4aa (diff)
downloadpuppet-2d37f09aa093b10cb64b9b649f0066217c53d48f.tar.gz
puppet-2d37f09aa093b10cb64b9b649f0066217c53d48f.tar.xz
puppet-2d37f09aa093b10cb64b9b649f0066217c53d48f.zip
Fix #1402 - Allow multiline comments
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/parser/lexer.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb
index 9226434da..dd6c29d9f 100644
--- a/lib/puppet/parser/lexer.rb
+++ b/lib/puppet/parser/lexer.rb
@@ -157,6 +157,11 @@ class Puppet::Parser::Lexer
TOKENS.add_token :COMMENT, %r{#.*}, :skip => true
+ TOKENS.add_token :MLCOMMENT, %r{/\*(.*?)\*/}m do |lexer, value|
+ lexer.line += value.count("\n")
+ [nil,nil]
+ end
+
TOKENS.add_token :RETURN, "\n", :skip => true, :incr_line => true, :skip_text => true
TOKENS.add_token :SQUOTE, "'" do |lexer, value|