gloo 0.3.0 → 0.4.0

data/lib/gloo/expr/expression.rb

@@ -7,97 +7,89 @@
 module Gloo
   module Expr
     class Expression
-      
+
       # Create the expression from a list of tokens.
-      def initialize tokens
+      def initialize( tokens )
         @tokens = tokens
         @symbols = []
         @left = nil
         @right = nil
         @op = nil
       end
-      
+
       # Evaluate the expression and return the value.
       def evaluate
         identify_tokens
-        
+
         @symbols.each do |sym|
           if sym.is_a? Gloo::Core::Op
             @op = sym
-          elsif @left == nil
+          elsif @left.nil?
             @left = sym
           else
             @right = sym
           end
-          
+
           perform_op if @left && @right
         end
-        
-        if @left.is_a? Gloo::Core::Literal 
-          return @left.value
-        elsif @left.is_a? Gloo::Core::Pn
-          return resolve_ref @left
-        else
-          return @left
-        end
+
+        return @left.value if @left.is_a? Gloo::Core::Literal
+        return resolve_ref @left if @left.is_a? Gloo::Core::Pn
+
+        return @left
       end
-      
+
       # Perform the operation.
       def perform_op
-        @op = Gloo::Core::Op.default_op unless @op
+        @op ||= Gloo::Core::Op.default_op
         l = evaluate_sym @left
         r = evaluate_sym @right
         @left = @op.perform l, r
         @right = nil
         @op = nil
       end
-      
+
       # Evaluate the symbol and get a simple value.
-      def evaluate_sym sym
-        if sym.is_a? Gloo::Core::Literal
-          return sym.value
-        elsif sym.is_a? Gloo::Core::Pn
-          return resolve_ref sym
-        else
-          return sym
-        end
+      def evaluate_sym( sym )
+        return sym.value if sym.is_a? Gloo::Core::Literal
+        return resolve_ref sym if sym.is_a? Gloo::Core::Pn
+
+        return sym
       end
-      
+
       # resolve an object reference and get the value.
-      def resolve_ref ref
-				return ref.src if ref.is_color?
+      def resolve_ref( ref )
+        return ref.src if ref.named_color?
 
         ob = ref.resolve
         return ob.value if ob
       end
-      
+
       # Identify each token in the list.
       def identify_tokens
         @tokens.each do |o|
           @symbols << identify_token( o )
         end
-        
+
         # @symbols.each do |o|
         #   puts o.class.name
         # end
       end
-      
-      # 
+
+      #
       # Identify the tokens and create appropriate symbols.
-      # 
-      def identify_token token
-        if Gloo::Core::Op.is_op?( token )
-          return Gloo::Core::Op.create_op( token )
-        end
-        
-        return LBoolean.new( token ) if LBoolean.is_boolean?( token )
-        return LInteger.new( token ) if LInteger.is_integer?( token )
-        return LString.new( token ) if LString.is_string?( token )
-        
+      #
+      def identify_token( token )
+        return Gloo::Core::Op.create_op( token ) if Gloo::Core::Op.op?( token )
+
+        return LBoolean.new( token ) if LBoolean.boolean?( token )
+        return LInteger.new( token ) if LInteger.integer?( token )
+        return LString.new( token ) if LString.string?( token )
+
         # last chance: an Object reference
         return Gloo::Core::Pn.new( token )
       end
-      
+
     end
   end
 end

data/lib/gloo/expr/l_boolean.rb

@@ -7,20 +7,21 @@
 module Gloo
   module Expr
     class LBoolean < Gloo::Core::Literal
-            
+
       # Is the given token a boolean?
-      def self.is_boolean? token
-        return Gloo::Objs::Boolean.is_boolean? token
+      def self.boolean?( token )
+        return Gloo::Objs::Boolean.boolean? token
       end
-      
+
       # Set the value, converting to an boolean.
-      def set_value value
+      def set_value( value )
         @value = Gloo::Objs::Boolean.coerse_to_bool value
       end
 
       # Get string representation
       def to_s
-        return "false" unless @value
+        return 'false' unless @value
+
         return @value.to_s
       end
 

data/lib/gloo/expr/l_integer.rb

@@ -7,16 +7,17 @@
 module Gloo
   module Expr
     class LInteger < Gloo::Core::Literal
-            
+
       # Is the given token an integer?
-      def self.is_integer? token
+      def self.integer?( token )
         return true if token.is_a? Integer
+
         s = token.strip
         return s.to_i.to_s == s
       end
-      
+
       # Set the value, converting to an integer.
-      def set_value value
+      def set_value( value )
         @value = value.to_i
       end
 

data/lib/gloo/expr/l_string.rb

@@ -7,47 +7,45 @@
 module Gloo
   module Expr
     class LString < Gloo::Core::Literal
-            
+
       # Set the value, triming opening and closing
       # quotations if necessary.
-      def set_value value
+      def set_value( value )
         @value = value
         return unless value
+
         @value = LString.strip_quotes( @value )
       end
-      
+
       # Is the given token a string?
-      def self.is_string? token
+      def self.string?( token )
         return false unless token.is_a? String
         return true if token.start_with?( '"' )
         return true if token.start_with?( "'" )
+
         return false
       end
 
-      # 
+      #
       # Given a string with leading and trailing quotes,
       # strip them out.
-      # 
-      def self.strip_quotes str
+      #
+      def self.strip_quotes( str )
         if str.start_with?( '"' )
           str = str[ 1..-1 ]
-          if str.end_with?( '"' )
-            str = str[ 0..-2 ]
-          end
+          str = str[ 0..-2 ] if str.end_with?( '"' )
           return str
         elsif str.start_with?( "'" )
           str = str[ 1..-1 ]
-          if str.end_with?( "'" )
-            str = str[ 0..-2 ]
-          end
+          str = str[ 0..-2 ] if str.end_with?( "'" )
           return str
         end
       end
-            
+
       def to_s
         return self.value
       end
-      
+
     end
   end
 end

data/lib/gloo/expr/op_div.rb

@@ -9,12 +9,10 @@ module Gloo
     class OpDiv < Gloo::Core::Op
 
       # Perform the operation and return the result.
-      def perform left, right
-        if left.is_a? Integer
-          return left / right.to_i
-        end
+      def perform( left, right )
+        return left / right.to_i if left.is_a? Integer
       end
-      
+
     end
   end
 end

data/lib/gloo/expr/op_minus.rb

@@ -9,12 +9,10 @@ module Gloo
     class OpMinus < Gloo::Core::Op
 
       # Perform the operation and return the result.
-      def perform left, right
-        if left.is_a? Integer
-          return left - right.to_i
-        end
+      def perform( left, right )
+        return left - right.to_i if left.is_a? Integer
       end
-      
+
     end
   end
 end

data/lib/gloo/expr/op_mult.rb

@@ -9,12 +9,10 @@ module Gloo
     class OpMult < Gloo::Core::Op
 
       # Perform the operation and return the result.
-      def perform left, right
-        if left.is_a? Integer
-          return left * right.to_i
-        end
+      def perform( left, right )
+        return left * right.to_i if left.is_a? Integer
       end
-      
+
     end
   end
 end

data/lib/gloo/expr/op_plus.rb

@@ -9,14 +9,12 @@ module Gloo
     class OpPlus < Gloo::Core::Op
 
       # Perform the operation and return the result.
-      def perform left, right
-        if left.is_a? String
-          return left + right.to_s
-        elsif left.is_a? Integer
-          return left + right.to_i
-        end
+      def perform( left, right )
+        return left + right.to_s if left.is_a? String
+
+        return left + right.to_i if left.is_a? Integer
       end
-      
+
     end
   end
 end

data/lib/gloo/objs/basic/boolean.rb

@@ -7,88 +7,86 @@
 module Gloo
   module Objs
     class Boolean < Gloo::Core::Obj
-      
-      KEYWORD = 'boolean'
-      KEYWORD_SHORT = 'bool'
-      TRUE = 'true'
-      FALSE = 'false'
 
-      # 
+      KEYWORD = 'boolean'.freeze
+      KEYWORD_SHORT = 'bool'.freeze
+      TRUE = 'true'.freeze
+      FALSE = 'false'.freeze
+
+      #
       # The name of the object type.
-      # 
+      #
       def self.typename
         return KEYWORD
       end
 
-      # 
+      #
       # The short name of the object type.
-      # 
+      #
       def self.short_typename
         return KEYWORD_SHORT
       end
 
-      # 
+      #
       # Set the value with any necessary type conversions.
-      # 
-      def set_value new_value
+      #
+      def set_value( new_value )
         self.value = Gloo::Objs::Boolean.coerse_to_bool( new_value )
       end
-      
-      # 
+
+      #
       # Coerse the new value to a boolean value.
-      # 
-      def self.coerse_to_bool new_value
-        if new_value.nil?
-          return false
-        elsif new_value.class.name == "String"
+      #
+      def self.coerse_to_bool( new_value )
+        return false if new_value.nil?
+
+        if new_value.class.name == 'String'
           return true if new_value.strip.downcase == TRUE
           return false if new_value.strip.downcase == FALSE
           return true if new_value.strip.downcase == 't'
           return false if new_value.strip.downcase == 'f'
-        elsif new_value.class.name == "Integer"
-          return false if new_value == 0
-          return true
-        else
-          return new_value == true
+        elsif new_value.class.name == 'Integer'
+          return new_value.zero? ? false : true
         end
+
+        return new_value == true
       end
-      
-      # 
+
+      #
       # Is the given token a boolean?
-      # 
-      def self.is_boolean? token
+      #
+      def self.boolean?( token )
         return true if token == true
         return true if token == false
-        if token.class.name == "String"
+
+        if token.class.name == 'String'
           return true if token.strip.downcase == TRUE
           return true if token.strip.downcase == FALSE
         end
         return false
       end
 
-      
-      # 
+      #
       # Get the value for display purposes.
-      # 
+      #
       def value_display
         return value ? TRUE : FALSE
       end
 
-      
       # ---------------------------------------------------------------------
       #    Messages
       # ---------------------------------------------------------------------
 
-      # 
+      #
       # Get a list of message names that this object receives.
-      # 
+      #
       def self.messages
-        return super + [ "not", "true", "false" ]
+        return super + %w[not true false]
       end
-      
+
       # Set the value to the opposite of what it is.
       def msg_not
-        v = ! value
+        v = !value
         set_value v
         $engine.heap.it.set_to v
         return v
@@ -108,6 +106,33 @@ module Gloo
         return false
       end
 
+      # ---------------------------------------------------------------------
+      #    Help
+      # ---------------------------------------------------------------------
+
+      #
+      # Get help for this object type.
+      #
+      def self.help
+        return <<~TEXT
+          BOOLEAN OBJECT TYPE
+            NAME: boolean
+            SHORTCUT: bool
+
+          DESCRIPTION
+            A boolean value.
+            Value will be either true or false.
+
+          CHILDREN
+            None
+
+          MESSAGES
+            not - Set the boolean to the opposite of what it is now.
+            true - Set the boolean to true.
+            false - Set the boolean to false.
+        TEXT
+      end
+
     end
   end
 end