tp_plus 0.0.87 → 0.0.88

data/lib/tp_plus/nodes/termination_node.rb

@@ -1,23 +1,29 @@
-module TPPlus
-  module Nodes
-    class TerminationNode < BaseNode
-      def initialize(value)
-        @value = value
-      end
-
-      def eval(context)
-        val = @value.eval(context)
-        case val
-        when Integer
-          "CNT#{val}"
-        else
-          if val[0] == "R"
-            "CNT #{val}"
-          else
-            "FINE"
-          end
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class TerminationNode < BaseNode
+      def initialize(value)
+        @value = value
+      end
+
+      def eval(context)
+        case @value
+        when DigitNode
+          "CNT#{@value.eval(context)}"
+        when VarNode
+          if @value.constant?
+            val = @value.eval(context)
+            if val[0] == "(" # negative
+              "FINE"
+            else
+              "CNT#{val}"
+            end
+          else
+            "CNT #{@value.eval(context)}"
+          end
+        else
+          raise "invalid term"
+        end
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/terminator_node.rb

@@ -1,16 +1,16 @@
-module TPPlus
-  module Nodes
-    class TerminatorNode < BaseNode
-      def eval(context)
-        nil
-      end
-    end
-  end
-end
-
-# IF R[1:foo]<>1,JMP LBL[100] ;
-# R[1:foo]=2 ;
-# JMP LBL[101] ;
-# LBL[100] ;
-# R[1:foo]=1 ;
-# LBL[101] ;
+module TPPlus
+  module Nodes
+    class TerminatorNode < BaseNode
+      def eval(context)
+        nil
+      end
+    end
+  end
+end
+
+# IF R[1:foo]<>1,JMP LBL[100] ;
+# R[1:foo]=2 ;
+# JMP LBL[101] ;
+# LBL[100] ;
+# R[1:foo]=1 ;
+# LBL[101] ;

data/lib/tp_plus/nodes/time_node.rb

@@ -1,24 +1,24 @@
-module TPPlus
-  module Nodes
-    class TimeNode < BaseNode
-      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 < BaseNode
+      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,33 +1,33 @@
-module TPPlus
-  module Nodes
-    class TimerMethodNode < BaseNode
-      def initialize(method, target)
-        @method = method
-        @target = target
-      end
-
-      def requires_mixed_logic?(context)
-        true
-      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 < BaseNode
+      def initialize(method, target)
+        @method = method
+        @target = target
+      end
+
+      def requires_mixed_logic?(context)
+        true
+      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,16 +1,16 @@
-module TPPlus
-  module Nodes
-    class TimerNode < BaseNode
-      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
+module TPPlus
+  module Nodes
+    class TimerNode < BaseNode
+      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/unary_expression_node.rb

@@ -1,39 +1,40 @@
-module TPPlus
-  module Nodes
-    class UnaryExpressionNode < BaseNode
-      attr_reader :op, :x
-      def initialize(op, x)
-        @op = OperatorNode.new(op)
-        @x = x
-      end
-
-      def grouped?
-        false
-      end
-
-      def requires_mixed_logic?(context)
-        true
-      end
-
-      def contains_expression?
-        false
-      end
-
-      def boolean_result?
-        false
-      end
-
-      def eval(context,options={})
-        if options[:opposite]
-          options[:opposite] = false #VarNode.eval() with options[:opposite] will add a !
-          @x.eval(context, options)
-        elsif options[:disable_mixed_logic]
-          options[:disable_mixed_logic] = false
-          "#{@x.eval(context, options)}=OFF"
-        else
-          "#{@op.eval(context, options)}#{@x.eval(context, options)}"
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class UnaryExpressionNode < BaseNode
+      attr_reader :op, :x
+      def initialize(op, x)
+        @op = OperatorNode.new(op)
+        @x = x
+      end
+
+      def grouped?
+        false
+      end
+
+      def requires_mixed_logic?(context)
+        true
+      end
+
+      def contains_expression?
+        true
+      end
+
+      def boolean_result?
+        false
+      end
+
+      def eval(context,options={})
+        if options[:opposite]
+          new_options = options.dup
+          new_options.delete(:opposite) # VarNode.eval() with opposite will add a !
+          @x.eval(context, new_options)
+        elsif options[:disable_mixed_logic]
+          options[:disable_mixed_logic] = false
+          "#{@x.eval(context, options)}=OFF"
+        else
+          "#{@op.eval(context, options)}#{@x.eval(context, options)}"
+        end
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/units_node.rb

@@ -1,20 +1,20 @@
-module TPPlus
-  module Nodes
-    class UnitsNode < BaseNode
-      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 < BaseNode
+      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 < BaseNode
-      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 < BaseNode
+      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,16 +1,16 @@
-module TPPlus
-  module Nodes
-    class UserAlarmNode < BaseNode
-      attr_accessor :comment
-      attr_reader :id
-      def initialize(id)
-        @id = id
-        @comment = ""
-      end
-
-      def eval(context, options={})
-        "UALM[#{@id}]"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class UserAlarmNode < BaseNode
+      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 < BaseNode
-      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
+module TPPlus
+  module Nodes
+    class VarMethodNode < BaseNode
+      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 < BaseNode
-      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 < BaseNode
+      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,22 +1,22 @@
-module TPPlus
-  module Nodes
-    class VisionRegisterNode < BaseNode
-      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
+module TPPlus
+  module Nodes
+    class VisionRegisterNode < BaseNode
+      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