diff options
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/ast/branch.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/grammar.ra | 4 | ||||
| -rw-r--r-- | lib/puppet/parser/parser.rb | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/puppet/parser/ast/branch.rb b/lib/puppet/parser/ast/branch.rb index deb8dbadd..941c00a68 100644 --- a/lib/puppet/parser/ast/branch.rb +++ b/lib/puppet/parser/ast/branch.rb @@ -31,7 +31,7 @@ class Puppet::Parser::AST @children.each { |child| unless child.is_a?(AST) raise Puppet::DevError, - "child %s is not an ast" % child + "child %s is a %s instead of ast" % [child, child.class] end } end diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index bd32f2c5b..4ed100159 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -606,13 +606,13 @@ argumentlist: nothing result = val[1] } | LPAREN arguments RPAREN { - if val[1].is_a?(AST::ASTArray) + if val[1].instance_of?(AST::ASTArray) result = val[1] else result = AST::ASTArray.new( :line => @lexer.line, :file => @lexer.file, - :children => [val[0]] + :children => [val[1]] ) end } diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb index 43fa51119..7ec7ae29b 100644 --- a/lib/puppet/parser/parser.rb +++ b/lib/puppet/parser/parser.rb @@ -29,7 +29,7 @@ module Puppet class Parser < Racc::Parser -module_eval <<'..end grammar.ra modeval..id3b98377f5e', 'grammar.ra', 703 +module_eval <<'..end grammar.ra modeval..id6f2ed69196', 'grammar.ra', 703 attr_reader :file attr_accessor :files @@ -144,7 +144,7 @@ def string=(string) end # $Id$ -..end grammar.ra modeval..id3b98377f5e +..end grammar.ra modeval..id6f2ed69196 ##### racc 1.4.4 generates ### @@ -1327,13 +1327,13 @@ module_eval <<'.,.,', 'grammar.ra', 607 module_eval <<'.,.,', 'grammar.ra', 618 def _reduce_82( val, _values, result ) - if val[1].is_a?(AST::ASTArray) + if val[1].instance_of?(AST::ASTArray) result = val[1] else result = AST::ASTArray.new( :line => @lexer.line, :file => @lexer.file, - :children => [val[0]] + :children => [val[1]] ) end result |