tp_plus 0.0.73 → 0.0.74

data/lib/tp_plus/nodes/io_node.rb

@@ -1,30 +1,31 @@
-module TPPlus
-  module Nodes
-    class IONode
-      attr_accessor :comment
-      def initialize(type, id)
-        @type    = type
-        @id      = id.to_i
-        @comment = ""
-      end
-
-      def requires_mixed_logic?(context)
-        ["F","SO","SI","DI"].include?(@type) ? true : false
-      end
-
-      def result
-        "#{@type}[#{@id}:#{@comment}]"
-      end
-
-      def eval(context, options={})
-        s = result
-
-        if options[:disable_mixed_logic]
-          s = "#{s}=ON"
-        end
-
-        options[:force_parens] ? "(#{s})" : s
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class IONode
+      attr_accessor :comment
+      attr_reader :id
+      def initialize(type, id)
+        @type    = type
+        @id      = id.to_i
+        @comment = ""
+      end
+
+      def requires_mixed_logic?(context)
+        ["F","SO","SI","DI"].include?(@type) ? true : false
+      end
+
+      def result
+        "#{@type}[#{@id}:#{@comment}]"
+      end
+
+      def eval(context, options={})
+        s = result
+
+        if options[:disable_mixed_logic]
+          s = "#{s}=ON"
+        end
+
+        options[:force_parens] ? "(#{s})" : s
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/jump_node.rb

@@ -1,23 +1,23 @@
-module TPPlus
-  module Nodes
-    class JumpNode 
-      def initialize(identifier)
-        @identifier = identifier
-      end
-
-      def requires_mixed_logic?(context)
-        false
-      end
-
-      def can_be_inlined?
-        true
-      end
-
-      def eval(context,options={})
-        raise "Label (#{@identifier}) not found" if context.labels[@identifier.to_sym].nil?
-
-        "JMP LBL[#{context.labels[@identifier.to_sym]}]"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class JumpNode 
+      def initialize(identifier)
+        @identifier = identifier
+      end
+
+      def requires_mixed_logic?(context)
+        false
+      end
+
+      def can_be_inlined?
+        true
+      end
+
+      def eval(context,options={})
+        raise "Label (#{@identifier}) not found" if context.labels[@identifier.to_sym].nil?
+
+        "JMP LBL[#{context.labels[@identifier.to_sym]}]"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/label_definition_node.rb

@@ -1,21 +1,21 @@
-module TPPlus
-  module Nodes
-    class LabelDefinitionNode
-      attr_reader :identifier
-      def initialize(identifier)
-        @identifier = identifier
-      end
-
-      def long_identifier_comment(context)
-        return "" unless @identifier.length > 16
-
-        " ;\n! #{@identifier}"
-      end
-
-      def eval(context)
-        #context.add_label(@identifier)
-        "LBL[#{context.labels[@identifier.to_sym]}:#{@identifier[0,16]}]#{long_identifier_comment(context)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class LabelDefinitionNode
+      attr_reader :identifier
+      def initialize(identifier)
+        @identifier = identifier
+      end
+
+      def long_identifier_comment(context)
+        return "" unless @identifier.length > 16
+
+        " ;\n! #{@identifier}"
+      end
+
+      def eval(context)
+        #context.add_label(@identifier)
+        "LBL[#{context.labels[@identifier.to_sym]}:#{@identifier[0,16]}]#{long_identifier_comment(context)}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/motion_node.rb

@@ -1,62 +1,62 @@
-module TPPlus
-  module Nodes
-    class MotionNode
-      def initialize(type, destination, modifiers)
-        @type = type
-        @destination = destination
-        @modifiers = modifiers
-      end
-
-      def prefix
-        case @type
-        when "linear_move"
-          "L"
-        when "joint_move"
-          "J"
-        when "circular_move"
-          "C"
-        else
-          raise "Unsupported motion"
-        end
-      end
-
-      def speed_node
-        @speed_node ||= @modifiers.select {|m| m.is_a? SpeedNode }.first
-      end
-
-      def termination_node
-        @termination_node ||= @modifiers.select {|m| m.is_a? TerminationNode }.first
-      end
-
-      def actual_modifiers
-        @actual_modifiers ||= @modifiers.reject {|m| m.is_a? SpeedNode}.reject {|m| m.is_a? TerminationNode }
-      end
-
-      def modifiers_string(context)
-        return "" unless actual_modifiers.any?
-
-        strings_array = [""] << actual_modifiers.map { |m| m.eval(context) }
-        @modifiers_string = strings_array.join(" ")
-      end
-
-      def speed_valid?(context)
-        case @type
-        when "linear_move"
-          return true if speed_node.eval(context) == "max_speed"
-
-          ["mm/sec"].include? speed_node.units
-        when "joint_move"
-          return false if speed_node.eval(context) == "max_speed"
-
-          ["%"].include? speed_node.units
-        end
-      end
-
-      def eval(context)
-        raise "Speed is invalid for motion type" unless speed_valid?(context)
-
-        "#{prefix} #{@destination.eval(context)} #{speed_node.eval(context)} #{termination_node.eval(context)}#{modifiers_string(context)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class MotionNode
+      def initialize(type, destination, modifiers)
+        @type = type
+        @destination = destination
+        @modifiers = modifiers
+      end
+
+      def prefix
+        case @type
+        when "linear_move"
+          "L"
+        when "joint_move"
+          "J"
+        when "circular_move"
+          "C"
+        else
+          raise "Unsupported motion"
+        end
+      end
+
+      def speed_node
+        @speed_node ||= @modifiers.select {|m| m.is_a? SpeedNode }.first
+      end
+
+      def termination_node
+        @termination_node ||= @modifiers.select {|m| m.is_a? TerminationNode }.first
+      end
+
+      def actual_modifiers
+        @actual_modifiers ||= @modifiers.reject {|m| m.is_a? SpeedNode}.reject {|m| m.is_a? TerminationNode }
+      end
+
+      def modifiers_string(context)
+        return "" unless actual_modifiers.any?
+
+        strings_array = [""] << actual_modifiers.map { |m| m.eval(context) }
+        @modifiers_string = strings_array.join(" ")
+      end
+
+      def speed_valid?(context)
+        case @type
+        when "linear_move"
+          return true if speed_node.eval(context) == "max_speed"
+
+          ["mm/sec"].include? speed_node.units
+        when "joint_move"
+          return false if speed_node.eval(context) == "max_speed"
+
+          ["%"].include? speed_node.units
+        end
+      end
+
+      def eval(context)
+        raise "Speed is invalid for motion type" unless speed_valid?(context)
+
+        "#{prefix} #{@destination.eval(context)} #{speed_node.eval(context)} #{termination_node.eval(context)}#{modifiers_string(context)}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/namespace_node.rb

@@ -1,16 +1,16 @@
-module TPPlus
-  module Nodes
-    class NamespaceNode
-      attr_reader :block
-      def initialize(name, block)
-        @name = name
-        @block = block
-      end
-
-      def eval(context)
-        context.add_namespace(@name, @block)
-        nil
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class NamespaceNode
+      attr_reader :block
+      def initialize(name, block)
+        @name = name
+        @block = block
+      end
+
+      def eval(context)
+        context.add_namespace(@name, @block)
+        nil
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/namespaced_var_node.rb

@@ -1,38 +1,38 @@
-module TPPlus
-  module Nodes
-    class NamespacedVarNode
-      attr_reader :namespaces
-      def initialize(namespaces, var_node)
-        @namespaces = namespaces
-        @var_node   = var_node
-      end
-
-      def namespace(context)
-        @context = context
-        @namespaces.each do |ns|
-          if @context.get_namespace(ns)
-            @context = @context.get_namespace(ns)
-          end
-        end
-
-        @context
-      end
-
-      def identifier
-        @var_node.identifier
-      end
-
-      def target_node(context)
-        @var_node.target_node(namespace(context))
-      end
-
-      def requires_mixed_logic?(context)
-        @var_node.requires_mixed_logic?(namespace(context))
-      end
-
-      def eval(context,options={})
-        @var_node.eval(namespace(context), options)
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class NamespacedVarNode
+      attr_reader :namespaces
+      def initialize(namespaces, var_node)
+        @namespaces = namespaces
+        @var_node   = var_node
+      end
+
+      def namespace(context)
+        @context = context
+        @namespaces.each do |ns|
+          if @context.get_namespace(ns)
+            @context = @context.get_namespace(ns)
+          end
+        end
+
+        @context
+      end
+
+      def identifier
+        @var_node.identifier
+      end
+
+      def target_node(context)
+        @var_node.target_node(namespace(context))
+      end
+
+      def requires_mixed_logic?(context)
+        @var_node.requires_mixed_logic?(namespace(context))
+      end
+
+      def eval(context,options={})
+        @var_node.eval(namespace(context), options)
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/numreg_node.rb

@@ -1,25 +1,26 @@
-module TPPlus
-  module Nodes
-    class NumregNode
-      attr_accessor :comment
-      def initialize(id)
-        @id = id
-        @comment = ""
-      end
-
-      def requires_mixed_logic?(context)
-        false
-      end
-
-      def comment_string
-        return "" if @comment == ""
-
-        ":#{@comment}"
-      end
-
-      def eval(context,options={})
-        "R[#{@id}#{comment_string}]"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class NumregNode
+      attr_accessor :comment
+      attr_reader :id
+      def initialize(id)
+        @id = id
+        @comment = ""
+      end
+
+      def requires_mixed_logic?(context)
+        false
+      end
+
+      def comment_string
+        return "" if @comment == ""
+
+        ":#{@comment}"
+      end
+
+      def eval(context,options={})
+        "R[#{@id}#{comment_string}]"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/offset_node.rb

@@ -1,27 +1,27 @@
-module TPPlus
-  module Nodes
-    class OffsetNode
-      def initialize(type, var)
-        @type = type
-        @var = var
-      end
-
-      def name
-        case @type.downcase
-        when "offset"
-          "Offset"
-        when "tool_offset"
-          "Tool_Offset"
-        when "vision_offset"
-          "VOFFSET"
-        else
-          raise "Invalid type"
-        end
-      end
-
-      def eval(context)
-        "#{name},#{@var.eval(context)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class OffsetNode
+      def initialize(type, var)
+        @type = type
+        @var = var
+      end
+
+      def name
+        case @type.downcase
+        when "offset"
+          "Offset"
+        when "tool_offset"
+          "Tool_Offset"
+        when "vision_offset"
+          "VOFFSET"
+        else
+          raise "Invalid type"
+        end
+      end
+
+      def eval(context)
+        "#{name},#{@var.eval(context)}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/operator_node.rb

@@ -1,72 +1,78 @@
-module TPPlus
-  module Nodes
-    class OperatorNode
-      attr_reader :string
-      def initialize(string)
-        @string = string
-      end
-
-      def bang?
-        @string == "!"
-      end
-
-      def requires_mixed_logic?(context)
-        case @string
-        when "&&", "||", "!"
-          true
-        else
-          false
-        end
-      end
-
-      def boolean?
-        case @string
-        when "&&", "||", "!"#, "==", "<>", ">", ">=", "<", "<="
-          true
-        else
-          false
-        end
-      end
-
-      def eval(context,options={})
-        if options[:opposite]
-          case @string
-          when "=="
-            "<>"
-          when "!=", "<>"
-            "="
-          when ">"
-            "<="
-          when "<"
-            ">="
-          when ">="
-            "<"
-          when "<="
-            ">"
-          when "!"
-            ""
-          when "||"
-            " AND "
-          when "&&"
-            " OR "
-          end
-        else
-          case @string
-          when "=="
-            "="
-          when "!="
-            "<>"
-          when "&&"
-            " AND "
-          when "||"
-            " OR "
-          when "%"
-            " MOD "
-          else
-            "#{@string}"
-          end
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class OperatorNode
+      attr_reader :string
+      def initialize(string)
+        @string = string
+      end
+
+      def bang?
+        @string == "!"
+      end
+
+      def requires_mixed_logic?(context)
+        case @string
+        when "&&", "||", "!"
+          true
+        else
+          false
+        end
+      end
+
+      def boolean?
+        case @string
+        when "&&", "||", "!"#, "==", "<>", ">", ">=", "<", "<="
+          true
+        else
+          false
+        end
+      end
+
+      def eval(context,options={})
+        if options[:opposite]
+          case @string
+          when "=="
+            "<>"
+          when "!=", "<>"
+            "="
+          when ">"
+            "<="
+          when "<"
+            ">="
+          when ">="
+            "<"
+          when "<="
+            ">"
+          when "!"
+            ""
+          when "||"
+            " AND "
+          when "&&"
+            " OR "
+          when "DIV"
+            " MOD "
+          else
+            "#{@string}"
+          end
+        else
+          case @string
+          when "=="
+            "="
+          when "!="
+            "<>"
+          when "&&"
+            " AND "
+          when "||"
+            " OR "
+          when "%"
+            " MOD "
+          when "DIV"
+            " DIV "
+          else
+            "#{@string}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/paren_expression_node.rb

@@ -0,0 +1,17 @@
+module TPPlus
+  module Nodes
+    class ParenExpressionNode
+      def initialize(x)
+        @x = x
+      end
+
+      def requires_mixed_logic?(context)
+        @x.requires_mixed_logic?(context)
+      end
+
+      def eval(context, options={})
+        "(#{@x.eval(context, options)})"
+      end
+    end
+  end
+end