lib/puppetdb/astnode.rb in ruby-puppetdb-2.0.2 vs lib/puppetdb/astnode.rb in ruby-puppetdb-2.0.3

@@ -84,11 +84,11 @@
       ret
     when :booleanop
       [value.to_s, *evaluate_children(mode)]
     when :subquery
       mode.push :subquery
-      ret = subquery(mode.last, value + 's', children[0].evaluate(mode))
+      ret = subquery(mode[-2], value + 's', children[0].evaluate(mode))
       mode.pop
       ret
     when :regexp_node_match
       mode.push :regexp
       ret = ['~', 'certname', Regexp.escape(value.evaluate(mode))]
@@ -121,10 +121,10 @@
       if !regexp && value[:type].capitalize == 'Class'
         title = capitalize_class(value[:title].evaluate)
       else
         title = value[:title].evaluate
       end
-      ret = subquery(mode.last, :resources,
+      ret = subquery(mode[-2], :resources,
                      ['and',
                       ['=', 'type', capitalize_class(value[:type])],
                       [regexp ? '~' : '=', 'title', title],
                       ['=', 'exported', value[:exported]],
                       *evaluate_children(mode)])