diff options
Diffstat (limited to 'lib/puppet/parser/parser_support.rb')
| -rw-r--r-- | lib/puppet/parser/parser_support.rb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb index f2fd710cf..e63483050 100644 --- a/lib/puppet/parser/parser_support.rb +++ b/lib/puppet/parser/parser_support.rb @@ -74,9 +74,7 @@ class Puppet::Parser::Parser end except = Puppet::ParseError.new(message) except.line = @lexer.line - if @lexer.file - except.file = @lexer.file - end + except.file = @lexer.file if @lexer.file raise except end @@ -90,9 +88,7 @@ class Puppet::Parser::Parser unless file =~ /\.pp$/ file = file + ".pp" end - unless FileTest.exist?(file) - raise Puppet::Error, "Could not find file #{file}" - end + raise Puppet::Error, "Could not find file #{file}" unless FileTest.exist?(file) end raise Puppet::AlreadyImportedError, "Import loop detected" if known_resource_types.watching_file?(file) @@ -171,9 +167,7 @@ class Puppet::Parser::Parser except = Puppet::ParseError.new(error) except.line = @lexer.line - if @lexer.file - except.file = @lexer.file - end + except.file = @lexer.file if @lexer.file raise except end @@ -181,9 +175,7 @@ class Puppet::Parser::Parser # how should I do error handling here? def parse(string = nil) return parse_ruby_file if self.file =~ /\.rb$/ - if string - self.string = string - end + self.string = string if string begin @yydebug = false main = yyparse(@lexer,:scan) |