tp_plus 0.0.77 → 0.0.87

data/lib/tp_plus/nodes/for_node.rb

@@ -1,20 +1,20 @@
-module TPPlus
-  module Nodes
-    class ForNode
-      def initialize(var_node, initial_value_node, final_value_node, block)
-        @var_node           = var_node
-        @initial_value_node = initial_value_node
-        @final_value_node   = final_value_node
-        @block              = block.flatten.reject {|n| n.is_a?(TerminatorNode) }
-      end
-
-      def block(context)
-        @s ||= @block.inject("") {|s,n| s << "#{n.eval(context)} ;\n" }
-      end
-
-      def eval(context)
-        "FOR #{@var_node.eval(context)}=#{@initial_value_node.eval(context)} TO #{@final_value_node.eval(context)} ;\n#{block(context)}ENDFOR"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class ForNode < BaseNode
+      def initialize(var_node, initial_value_node, final_value_node, block)
+        @var_node           = var_node
+        @initial_value_node = initial_value_node
+        @final_value_node   = final_value_node
+        @block              = block.flatten.reject {|n| n.is_a?(TerminatorNode) }
+      end
+
+      def block(context)
+        @s ||= @block.inject("") {|s,n| s << "#{n.eval(context)} ;\n" }
+      end
+
+      def eval(context)
+        "FOR #{@var_node.eval(context)}=#{@initial_value_node.eval(context)} TO #{@final_value_node.eval(context)} ;\n#{block(context)}ENDFOR"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/header_node.rb

@@ -1,27 +1,27 @@
-module TPPlus
-  module Nodes
-    class HeaderNode
-      def initialize(type, value)
-        @type  = type
-        @value = value
-      end
-
-      def eval(context, options={})
-        case @type
-        when "TP_IGNORE_PAUSE"
-          context.header_data[:ignore_pause] = @value
-        when "TP_COMMENT"
-          context.header_data[:comment] = @value
-        when "TP_GROUPMASK"
-          context.header_data[:group_mask] = @value
-        when "TP_SUBTYPE"
-          context.header_data[:subtype] = @value.to_sym
-        else
-          raise "Unsupported TP Header value (#{@type})"
-        end
-
-        nil
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class HeaderNode < BaseNode
+      def initialize(type, value)
+        @type  = type
+        @value = value
+      end
+
+      def eval(context, options={})
+        case @type
+        when "TP_IGNORE_PAUSE"
+          context.header_data[:ignore_pause] = @value
+        when "TP_COMMENT"
+          context.header_data[:comment] = @value
+        when "TP_GROUPMASK"
+          context.header_data[:group_mask] = @value
+        when "TP_SUBTYPE"
+          context.header_data[:subtype] = @value.to_sym
+        else
+          raise "Unsupported TP Header value (#{@type})"
+        end
+
+        nil
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/indirect_node.rb

@@ -1,51 +1,27 @@
-module TPPlus
-  module Nodes
-    class IndirectNode
-      def initialize(type, target)
-        @type = type
-        @target = target
-      end
-
-      def string
-        case @type
-        when :position
-          "P"
-        when :position_register
-          "PR"
-        when :flag
-          "F"
-        when :timer
-          "TIMER"
-        when :register
-          "R"
-        when :user_alarm
-          "UALM"
-        when :user_frame
-          "UFRAME"
-        else
-          raise "Invalid indirect type"
-        end
-      end
-
-      def requires_mixed_logic?(context)
-        case @type
-        when :flag#, :timer
-          true
-        else
-          false
-        end
-      end
-
-      def eval(context,options={})
-        s = "#{string}[#{@target.eval(context)}]"
-        if options[:opposite]
-          s = "!#{s}"
-        end
-        if options[:as_condition]
-          s = "(#{s})"
-        end
-        s
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class IndirectNode < BaseNode
+      def initialize(type, target)
+        @type   = type
+        @target = target
+      end
+
+      def requires_mixed_logic?(context)
+        return true if @type == :f
+
+        false
+      end
+
+      def eval(context,options={})
+        s = "#{@type.upcase}[#{@target.eval(context)}]"
+        if options[:opposite]
+          s = "!#{s}"
+        end
+        if options[:as_condition]
+          s = "(#{s})"
+        end
+        s
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/inline_conditional_node.rb

@@ -1,40 +1,36 @@
-module TPPlus
-  module Nodes
-    class InlineConditionalNode
-      attr_reader :condition_node
-      def initialize(type, condition, block)
-        @type           = type
-        @condition_node = condition
-        @block          = block
-      end
-
-      def condition_requires_mixed_logic?(context)
-        @condition_node.is_a?(VarNode) ||
-          @condition_node.is_a?(NamespacedVarNode) ||
-          @condition_node.requires_mixed_logic?(context)
-      end
-
-      def block_requires_mixed_logic?(context)
-        @block.requires_mixed_logic?(context)
-      end
-
-      def can_be_inlined?
-        false
-      end
-
-      def condition(context,options={})
-        options[:opposite] ||= @type == "unless"
-
-        if condition_requires_mixed_logic?(context) || block_requires_mixed_logic?(context)
-          "(#{@condition_node.eval(context, options)})"
-        else
-          @condition_node.eval(context, options)
-        end
-      end
-
-      def eval(context)
-        "IF #{condition(context)},#{@block.eval(context,mixed_logic:true)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class InlineConditionalNode < BaseNode
+      attr_reader :condition_node
+      def initialize(type, condition, block)
+        @type           = type
+        @condition_node = condition
+        @block          = block
+      end
+
+      def condition_requires_mixed_logic?(context)
+        @condition_node.is_a?(VarNode) ||
+          @condition_node.is_a?(NamespacedVarNode) ||
+          @condition_node.requires_mixed_logic?(context)
+      end
+
+      def block_requires_mixed_logic?(context)
+        @block.requires_mixed_logic?(context)
+      end
+
+      def condition(context,options={})
+        options[:opposite] ||= @type == "unless"
+
+        if condition_requires_mixed_logic?(context) || block_requires_mixed_logic?(context)
+          "(#{@condition_node.eval(context, options)})"
+        else
+          @condition_node.eval(context, options)
+        end
+      end
+
+      def eval(context)
+        "IF #{condition(context)},#{@block.eval(context,mixed_logic:true)}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/io_method_node.rb

@@ -1,55 +1,55 @@
-module TPPlus
-  module Nodes
-    class IOMethodNode
-      def initialize(method, target,options={})
-        @method = method
-        @target = target
-        @init_options = options
-      end
-
-      def requires_mixed_logic?(context)
-        true
-      end
-
-      def can_be_inlined?
-        true
-      end
-
-      def on_off(value,options={})
-        options[:mixed_logic] ? "(#{value})" : value
-      end
-
-      def pulse_time(context)
-        "%.1f" % case @init_options[:pulse_units]
-        when "s"
-          @init_options[:pulse_time].eval(context)
-        when "ms"
-          @init_options[:pulse_time].eval(context).to_f / 1000
-        else
-          raise "Invalid pulse units"
-        end
-      end
-
-      def pulse_extra(context)
-        return "" if @init_options[:pulse_time].nil?
-
-        ",#{pulse_time(context)}sec"
-      end
-
-      def eval(context,options={})
-        options[:mixed_logic] = true if @target.requires_mixed_logic?(context)
-
-        case @method
-        when "turn_on"
-          "#{@target.eval(context)}=#{on_off("ON",options)}"
-        when "turn_off"
-          "#{@target.eval(context)}=#{on_off("OFF",options)}"
-        when "toggle"
-          "#{@target.eval(context)}=(!#{@target.eval(context)})"
-        when "pulse"
-          "#{@target.eval(context)}=PULSE#{pulse_extra(context)}"
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class IOMethodNode < BaseNode
+      def initialize(method, target,options={})
+        @method = method
+        @target = target
+        @init_options = options
+      end
+
+      def requires_mixed_logic?(context)
+        true
+      end
+
+      def can_be_inlined?
+        true
+      end
+
+      def on_off(value,options={})
+        options[:mixed_logic] ? "(#{value})" : value
+      end
+
+      def pulse_time(context)
+        "%.1f" % case @init_options[:pulse_units]
+        when "s"
+          @init_options[:pulse_time].eval(context)
+        when "ms"
+          @init_options[:pulse_time].eval(context).to_f / 1000
+        else
+          raise "Invalid pulse units"
+        end
+      end
+
+      def pulse_extra(context)
+        return "" if @init_options[:pulse_time].nil?
+
+        ",#{pulse_time(context)}sec"
+      end
+
+      def eval(context,options={})
+        options[:mixed_logic] = true if @target.requires_mixed_logic?(context)
+
+        case @method
+        when "turn_on"
+          "#{@target.eval(context)}=#{on_off("ON",options)}"
+        when "turn_off"
+          "#{@target.eval(context)}=#{on_off("OFF",options)}"
+        when "toggle"
+          "#{@target.eval(context)}=(!#{@target.eval(context)})"
+        when "pulse"
+          "#{@target.eval(context)}=PULSE#{pulse_extra(context)}"
+        end
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/io_node.rb

@@ -1,31 +1,31 @@
-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
+module TPPlus
+  module Nodes
+    class IONode < BaseNode
+      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/jpos_node.rb

@@ -0,0 +1,13 @@
+module TPPlus
+  module Nodes
+    class JPOSNode
+      def initialize(var)
+        @var = var
+      end
+
+      def eval(context, options={})
+        "#{@var.eval(context, options)}=JPOS"
+      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 < BaseNode
+      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 < BaseNode
+      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/lpos_node.rb

@@ -0,0 +1,13 @@
+module TPPlus
+  module Nodes
+    class LPOSNode
+      def initialize(var)
+        @var = var
+      end
+
+      def eval(context, options={})
+        "#{@var.eval(context, options)}=LPOS"
+      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 < BaseNode
+      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