lib/puppet/parser/ast/match_operator.rb in puppet-0.25.5 vs lib/puppet/parser/ast/match_operator.rb in puppet-2.6.0

@@ -1,31 +1,28 @@
 require 'puppet'
 require 'puppet/parser/ast/branch'
 
 class Puppet::Parser::AST
-    class MatchOperator < AST::Branch
+  class MatchOperator < AST::Branch
 
-        attr_accessor :lval, :rval, :operator
+    attr_accessor :lval, :rval, :operator
 
-        # Iterate across all of our children.
-        def each
-            [@lval,@rval].each { |child| yield child }
-        end
+    # Iterate across all of our children.
+    def each
+      [@lval,@rval].each { |child| yield child }
+    end
 
-        # Returns a boolean which is the result of the boolean operation
-        # of lval and rval operands
-        def evaluate(scope)
-            lval = @lval.safeevaluate(scope)
+    # Returns a boolean which is the result of the boolean operation
+    # of lval and rval operands
+    def evaluate(scope)
+      lval = @lval.safeevaluate(scope)
 
-            return @operator == "=~" if rval.evaluate_match(lval, scope)
-            return @operator == "!~"
-        end
+      return(rval.evaluate_match(lval, scope) ? @operator == "=~" : @operator == "!~")
+    end
 
-        def initialize(hash)
-            super
+    def initialize(hash)
+      super
 
-            unless %w{!~ =~}.include?(@operator)
-                raise ArgumentError, "Invalid regexp operator %s" % @operator
-            end
-        end
+      raise ArgumentError, "Invalid regexp operator #{@operator}" unless %w{!~ =~}.include?(@operator)
     end
+  end
 end