lib/modl/parser/evaluator.rb in modl-0.3.2 vs lib/modl/parser/evaluator.rb in modl-0.3.3
- old
+ new
@@ -1,12 +1,12 @@
-module Modl
+module MODL
module Parser
# Evaluate a conditional expression
class Evaluator
# Evaluate the given condition
def self.evaluate(global, condition)
- return false if global.nil? || !global.is_a?(GlobalParseContext) || !condition.is_a?(Modl::Parser::Parsed::ParsedCondition)
+ return false if global.nil? || !global.is_a?(GlobalParseContext) || !condition.is_a?(MODL::Parser::Parsed::ParsedCondition)
start = 0
if condition.text
value1, success = value(global, condition.text)
else
@@ -63,11 +63,11 @@
end
def self.value(global, k)
success = false
if k.is_a?(String) && k.include?('%')
- value1, _ignore = Modl::Parser::RefProcessor.deref(k, global)
+ value1, _ignore = MODL::Parser::RefProcessor.deref(k, global)
success = true
elsif k.is_a?(FalseClass)
value1 = false
success = true
elsif k.is_a?(TrueClass)
@@ -94,11 +94,11 @@
def evaluate_old
result = false
if @key
if @key.include?('%')
- value1, _ignore = Modl::Parser::RefProcessor.deref(@key, @global)
+ value1, _ignore = MODL::Parser::RefProcessor.deref(@key, @global)
else
key = @key
ikey = key.to_i
if ikey.to_s == key
index_val = @global.index[ikey]
@@ -111,10 +111,10 @@
end
end
@values.each do |value|
value2 = value.text
- value2, _ignore = Modl::Parser::RefProcessor.deref(value2, @global) if value2.is_a?(String) && value2.include?('%')
+ value2, _ignore = MODL::Parser::RefProcessor.deref(value2, @global) if value2.is_a?(String) && value2.include?('%')
value2 = @global.pair(value.text).text if @global.pair(value.text)
case @operator
when '='
wild = value2.is_a?(String) && value2.include?('*') ? true : false