tp_plus 0.0.73 → 0.0.74

data/lib/tp_plus/nodes/time_node.rb

@@ -1,24 +1,24 @@
-module TPPlus
-  module Nodes
-    class TimeNode
-      def initialize(type, time, action)
-        @type = type
-        @time = time
-        @action = action
-      end
-
-      def type
-        case @type.downcase
-        when "time_before"
-          "TB"
-        when "time_after"
-          "TA"
-        end
-      end
-
-      def eval(context)
-        "#{type} #{@time.eval(context,as_string: true)}sec,#{@action.eval(context)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class TimeNode
+      def initialize(type, time, action)
+        @type = type
+        @time = time
+        @action = action
+      end
+
+      def type
+        case @type.downcase
+        when "time_before"
+          "TB"
+        when "time_after"
+          "TA"
+        end
+      end
+
+      def eval(context)
+        "#{type} #{@time.eval(context,as_string: true)}sec,#{@action.eval(context)}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/timer_method_node.rb

@@ -1,37 +1,37 @@
-module TPPlus
-  module Nodes
-    class TimerMethodNode
-      def initialize(method, target)
-        @method = method
-        @target = target
-      end
-
-      def requires_mixed_logic?(context)
-        true
-      end
-
-      def can_be_inlined?
-        false
-      end
-
-      def timer(context)
-        @timer ||= @target.eval(context)
-      end
-
-      def eval(context,options={})
-        case @method
-        when :start
-          "#{timer(context)}=START"
-        when :stop
-          "#{timer(context)}=STOP"
-        when :reset
-          "#{timer(context)}=RESET"
-        when :restart
-          "#{timer(context)}=STOP ;\n#{timer(context)}=RESET ;\n#{timer(context)}=START"
-        else
-          raise "Invalid timer method (#{@method})"
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class TimerMethodNode
+      def initialize(method, target)
+        @method = method
+        @target = target
+      end
+
+      def requires_mixed_logic?(context)
+        true
+      end
+
+      def can_be_inlined?
+        false
+      end
+
+      def timer(context)
+        @timer ||= @target.eval(context)
+      end
+
+      def eval(context,options={})
+        case @method
+        when "start"
+          "#{timer(context)}=START"
+        when "stop"
+          "#{timer(context)}=STOP"
+        when "reset"
+          "#{timer(context)}=RESET"
+        when "restart"
+          "#{timer(context)}=STOP ;\n#{timer(context)}=RESET ;\n#{timer(context)}=START"
+        else
+          raise "Invalid timer method (#{@method})"
+        end
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/timer_node.rb

@@ -1,21 +1,16 @@
-module TPPlus
-  module Nodes
-    class TimerNode
-      attr_accessor :comment
-      def initialize(id)
-        @id = id
-        @comment = ""
-      end
-
-      def comment_string
-        return "" if @comment == ""
-
-        ":#{comment}"
-      end
-
-      def eval(context, options={})
-        "TIMER[#{@id}#{comment_string}]"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class TimerNode
+      attr_accessor :comment
+      attr_reader :id
+      def initialize(id)
+        @id = id
+        @comment = ""
+      end
+
+      def eval(context, options={})
+        "TIMER[#{@id}]" # FANUC does not like timer comments
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/units_node.rb

@@ -1,20 +1,20 @@
-module TPPlus
-  module Nodes
-    class UnitsNode
-      def initialize(s)
-        @s = s
-      end
-
-      def eval(context)
-        case @s
-        when "mm/s"
-          "mm/sec"
-        when "%"
-          "%"
-        else
-          raise "Unknown unit: #{@s}"
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class UnitsNode
+      def initialize(s)
+        @s = s
+      end
+
+      def eval(context)
+        case @s
+        when "mm/s"
+          "mm/sec"
+        when "%"
+          "%"
+        else
+          raise "Unknown unit: #{@s}"
+        end
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/use_node.rb

@@ -1,21 +1,21 @@
-module TPPlus
-  module Nodes
-    class UseNode
-      def initialize(type, value)
-        @type = type
-        @value = value
-      end
-
-      def eval(context)
-        case @type
-        when "use_uframe"
-          "UFRAME_NUM=#{@value.eval(context)}"
-        when "use_utool"
-          "UTOOL_NUM=#{@value.eval(context)}"
-        when "use_payload"
-          "PAYLOAD[#{@value.eval(context)}]"
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class UseNode
+      def initialize(type, value)
+        @type = type
+        @value = value
+      end
+
+      def eval(context)
+        case @type
+        when "use_uframe"
+          "UFRAME_NUM=#{@value.eval(context)}"
+        when "use_utool"
+          "UTOOL_NUM=#{@value.eval(context)}"
+        when "use_payload"
+          "PAYLOAD[#{@value.eval(context)}]"
+        end
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/user_alarm_node.rb

@@ -1,15 +1,16 @@
-module TPPlus
-  module Nodes
-    class UserAlarmNode
-      attr_accessor :comment
-      def initialize(id)
-        @id = id
-        @comment = ""
-      end
-
-      def eval(context, options={})
-        "UALM[#{@id}]"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class UserAlarmNode
+      attr_accessor :comment
+      attr_reader :id
+      def initialize(id)
+        @id = id
+        @comment = ""
+      end
+
+      def eval(context, options={})
+        "UALM[#{@id}]"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/var_method_node.rb

@@ -1,23 +1,23 @@
-module TPPlus
-  module Nodes
-    class VarMethodNode
-      attr_reader :identifier
-      def initialize(identifier, method)
-        @identifier = identifier
-        @method = method
-      end
-
-      def requires_mixed_logic?(context)
-        node(context).requires_mixed_logic?(context)
-      end
-
-      def node(context)
-        context.get_var(@identifier)
-      end
-
-      def eval(context,options={})
-        node(context).eval(context,options.merge(method:@method))
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class VarMethodNode
+      attr_reader :identifier
+      def initialize(identifier, method)
+        @identifier = identifier
+        @method = method || {}
+      end
+
+      def requires_mixed_logic?(context)
+        node(context).requires_mixed_logic?(context)
+      end
+
+      def node(context)
+        context.get_var(@identifier)
+      end
+
+      def eval(context,options={})
+        node(context).eval(context,options.merge(@method))
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/var_node.rb

@@ -1,39 +1,39 @@
-module TPPlus
-  module Nodes
-    class VarNode
-      attr_reader :identifier
-      def initialize(identifier)
-        @identifier = identifier
-      end
-
-      def target_node(context)
-        constant? ? context.get_constant(@identifier) : context.get_var(@identifier)
-      end
-
-      def constant?
-        @identifier.upcase == @identifier
-      end
-
-      def requires_mixed_logic?(context)
-        target_node(context).requires_mixed_logic?(context)
-      end
-
-      def with_parens(s, options)
-        return s unless options[:as_condition]
-
-        "(#{s})"
-      end
-
-      def eval(context,options={})
-        return target_node(context).eval(context) if constant?
-
-        s = ""
-        if options[:opposite]
-          s += "!"
-        end
-
-        with_parens(s + target_node(context).eval(context, options), options)
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class VarNode
+      attr_reader :identifier
+      def initialize(identifier)
+        @identifier = identifier
+      end
+
+      def target_node(context)
+        constant? ? context.get_constant(@identifier) : context.get_var(@identifier)
+      end
+
+      def constant?
+        @identifier.upcase == @identifier
+      end
+
+      def requires_mixed_logic?(context)
+        target_node(context).requires_mixed_logic?(context)
+      end
+
+      def with_parens(s, options)
+        return s unless options[:as_condition]
+
+        "(#{s})"
+      end
+
+      def eval(context,options={})
+        return target_node(context).eval(context) if constant?
+
+        s = ""
+        if options[:opposite]
+          s += "!"
+        end
+
+        with_parens(s + target_node(context).eval(context, options), options)
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/vision_register_node.rb

@@ -1,21 +1,22 @@
-module TPPlus
-  module Nodes
-    class VisionRegisterNode
-      attr_accessor :comment
-      def initialize(id)
-        @id = id
-        @comment = ""
-      end
-
-      def comment_string
-        return "" if @comment == ""
-
-        ":#{@comment}"
-      end
-
-      def eval(context,options={})
-        "VR[#{@id}#{comment_string}]"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class VisionRegisterNode
+      attr_accessor :comment
+      attr_reader :id
+      def initialize(id)
+        @id = id
+        @comment = ""
+      end
+
+      def comment_string
+        return "" if @comment == ""
+
+        ":#{@comment}"
+      end
+
+      def eval(context,options={})
+        "VR[#{@id}#{comment_string}]"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/wait_for_node.rb

@@ -1,54 +1,54 @@
-module TPPlus
-  module Nodes
-    class WaitForNode
-      def initialize(time, units)
-        @time = time
-        @units = units
-      end
-
-      def units_valid?
-        ["s","ms"].include?(@units)
-      end
-
-      # 2 decimal places and remove leading 0s
-      def time(context)
-        if @time.eval(context).is_a?(String)
-          case @units
-          when "s"
-            @time.eval(context)
-          else
-            raise "Invalid units"
-          end
-        else
-          ("%.2f" % case @units
-          when "s"
-            @time.eval(context)
-          when "ms"
-            @time.eval(context).to_f / 1000
-          end).sub(/^0+/, "") + "(sec)"
-        end
-      end
-
-      def can_be_inlined?
-        false
-      end
-
-      def expression
-        case @units
-        when "s"
-          @time
-        when "ms"
-          e = ExpressionNode.new(@time,"/",DigitNode.new(1000))
-          e.grouped = true
-          e
-        end
-      end
-
-      def eval(context)
-        raise "Invalid units" unless units_valid?
-
-        "WAIT #{time(context)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class WaitForNode
+      def initialize(time, units)
+        @time = time
+        @units = units
+      end
+
+      def units_valid?
+        ["s","ms"].include?(@units)
+      end
+
+      # 2 decimal places and remove leading 0s
+      def time(context)
+        if @time.eval(context).is_a?(String)
+          case @units
+          when "s"
+            @time.eval(context)
+          else
+            raise "Invalid units"
+          end
+        else
+          ("%.2f" % case @units
+          when "s"
+            @time.eval(context)
+          when "ms"
+            @time.eval(context).to_f / 1000
+          end).sub(/^0+/, "") + "(sec)"
+        end
+      end
+
+      def can_be_inlined?
+        false
+      end
+
+      def expression
+        case @units
+        when "s"
+          @time
+        when "ms"
+          e = ExpressionNode.new(@time,"/",DigitNode.new(1000))
+          e.grouped = true
+          e
+        end
+      end
+
+      def eval(context)
+        raise "Invalid units" unless units_valid?
+
+        "WAIT #{time(context)}"
+      end
+    end
+  end
+end