tp_plus 0.0.77 → 0.0.87

data/lib/tp_plus/nodes/posreg_node.rb

@@ -1,64 +1,64 @@
-module TPPlus
-  module Nodes
-    class PosregNode
-
-      COMPONENTS = {
-        "x" => 1,
-        "y" => 2,
-        "z" => 3,
-        "w" => 4,
-        "p" => 5,
-        "r" => 6,
-      }
-
-      GROUPS = {
-        "gp1" => "GP1",
-        "gp2" => "GP2",
-        "gp3" => "GP3",
-        "gp4" => "GP4",
-        "gp5" => "GP5"
-      }
-
-      attr_accessor :comment
-      attr_reader :id
-      def initialize(id)
-        @id = id
-        @comment = ""
-      end
-
-      def comment_string
-        return "" if @comment == ""
-
-        ":#{@comment}"
-      end
-
-      def component(m)
-        return "" if m == ""
-
-        ",#{COMPONENTS[m]}"
-      end
-
-      def component_valid?(c)
-        [""].concat(COMPONENTS.keys).include? c
-      end
-
-      def component_groups?(c)
-        [""].concat(GROUPS.keys).include? c
-      end
-
-      def requires_mixed_logic?(context)
-        false
-      end
-
-      def eval(context,options={})
-        options[:method] ||= ""
-
-        group_string = GROUPS["gp" + options[:group].eval(context).to_s] + ":" if options[:group]
-
-        raise "Invalid component" unless component_valid?(options[:method]) || component_groups?(options[:group])
-
-        "PR[#{group_string}#{@id}#{component(options[:method])}#{comment_string}]"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class PosregNode < BaseNode
+
+      COMPONENTS = {
+        "x" => 1,
+        "y" => 2,
+        "z" => 3,
+        "w" => 4,
+        "p" => 5,
+        "r" => 6,
+      }
+
+      GROUPS = {
+        "gp1" => "GP1",
+        "gp2" => "GP2",
+        "gp3" => "GP3",
+        "gp4" => "GP4",
+        "gp5" => "GP5"
+      }
+
+      attr_accessor :comment
+      attr_reader :id
+      def initialize(id)
+        @id = id
+        @comment = ""
+      end
+
+      def comment_string
+        return "" if @comment == ""
+
+        ":#{@comment}"
+      end
+
+      def component(m)
+        return "" if m == ""
+
+        ",#{COMPONENTS[m]}"
+      end
+
+      def component_valid?(c)
+        [""].concat(COMPONENTS.keys).include? c
+      end
+
+      def component_groups?(c)
+        [""].concat(GROUPS.keys).include? c
+      end
+
+      def requires_mixed_logic?(context)
+        false
+      end
+
+      def eval(context,options={})
+        options[:method] ||= ""
+
+        group_string = GROUPS["gp" + options[:group].eval(context).to_s] + ":" if options[:group]
+
+        raise "Invalid component" unless component_valid?(options[:method]) || component_groups?(options[:group])
+
+        "PR[#{group_string}#{@id}#{component(options[:method])}#{comment_string}]"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/raise_node.rb

@@ -1,13 +1,13 @@
-module TPPlus
-  module Nodes
-    class RaiseNode
-      def initialize(target)
-        @target = target
-      end
-
-      def eval(context, options={})
-        "#{@target.eval(context)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class RaiseNode < BaseNode
+      def initialize(target)
+        @target = target
+      end
+
+      def eval(context, options={})
+        "#{@target.eval(context)}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/real_node.rb

@@ -1,27 +1,27 @@
-module TPPlus
-  module Nodes
-    class RealNode
-      def initialize(value)
-        @value = value
-      end
-
-      def requires_mixed_logic?(context)
-        false
-      end
-
-      def eval(context,options={})
-        val = if options[:as_string]
-          ("%.2f" % @value).sub(/^0/,'')
-        else
-          @value
-        end
-
-        if @value < 0
-          "(#{val})"
-        else
-          val
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class RealNode < BaseNode
+      def initialize(value)
+        @value = value
+      end
+
+      def requires_mixed_logic?(context)
+        false
+      end
+
+      def eval(context,options={})
+        val = if options[:as_string]
+          ("%.2f" % @value).sub(/^0/,'')
+        else
+          @value
+        end
+
+        if @value < 0
+          "(#{val})"
+        else
+          val
+        end
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/return_node.rb

@@ -0,0 +1,9 @@
+module TPPlus
+  module Nodes
+    class ReturnNode < BaseNode
+      def eval(context)
+        "END"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/set_skip_node.rb

@@ -1,14 +1,14 @@
-module TPPlus
-  module Nodes
-    # for setting skip conditions
-    class SetSkipNode
-      def initialize(value)
-        @value  = value
-      end
-
-      def eval(context)
-        "SKIP CONDITION #{@value.eval(context, disable_mixed_logic: true)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    # for setting skip conditions
+    class SetSkipNode < BaseNode
+      def initialize(value)
+        @value  = value
+      end
+
+      def eval(context)
+        "SKIP CONDITION #{@value.eval(context, disable_mixed_logic: true)}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/skip_node.rb

@@ -1,22 +1,22 @@
-module TPPlus
-  module Nodes
-    class SkipNode
-      def initialize(target, lpos_pr)
-        @target = target
-        @lpos_pr = lpos_pr
-      end
-
-      def lpos_pr(context)
-        return "" if @lpos_pr.nil?
-
-        ",#{@lpos_pr.eval(context)}=LPOS"
-      end
-
-      def eval(context)
-        raise "Label (#{@target}) not found" if context.labels[@target.to_sym].nil?
-
-        "Skip,LBL[#{context.labels[@target.to_sym]}]#{lpos_pr(context)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class SkipNode < BaseNode
+      def initialize(target, lpos_pr)
+        @target = target
+        @lpos_pr = lpos_pr
+      end
+
+      def lpos_pr(context)
+        return "" if @lpos_pr.nil?
+
+        ",#{@lpos_pr.eval(context)}=LPOS"
+      end
+
+      def eval(context)
+        raise "Label (#{@target}) not found" if context.labels[@target.to_sym].nil?
+
+        "Skip,LBL[#{context.labels[@target.to_sym]}]#{lpos_pr(context)}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/speed_node.rb

@@ -1,29 +1,29 @@
-module TPPlus
-  module Nodes
-    class SpeedNode
-      def initialize(speed_hash)
-        @speed_hash = speed_hash
-      end
-
-      def speed(context)
-        @speed_hash[:speed].eval(context)
-      end
-
-      def units
-        case @speed_hash[:units]
-        when "mm/s"
-          "mm/sec"
-        else
-          @speed_hash[:units]
-        end
-      end
-
-
-      def eval(context)
-        return @speed_hash[:speed] if @speed_hash[:units].nil?
-
-        "#{speed(context)}#{units}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class SpeedNode < BaseNode
+      def initialize(speed_hash)
+        @speed_hash = speed_hash
+      end
+
+      def speed(context)
+        @speed_hash[:speed].eval(context)
+      end
+
+      def units
+        case @speed_hash[:units]
+        when "mm/s"
+          "mm/sec"
+        else
+          @speed_hash[:units]
+        end
+      end
+
+
+      def eval(context)
+        return @speed_hash[:speed] if @speed_hash[:units].nil?
+
+        "#{speed(context)}#{units}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/string_node.rb

@@ -1,13 +1,13 @@
-module TPPlus
-  module Nodes
-    class StringNode
-      def initialize(s)
-        @s = s
-      end
-
-      def eval(context)
-        "'#{@s}'"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class StringNode < BaseNode
+      def initialize(s)
+        @s = s
+      end
+
+      def eval(context)
+        "'#{@s}'"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/string_register_node.rb

@@ -1,26 +1,26 @@
-module TPPlus
-  module Nodes
-    class StringRegisterNode
-      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={})
-        "SR[#{@id}#{comment_string}]"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class StringRegisterNode < BaseNode
+      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={})
+        "SR[#{@id}#{comment_string}]"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/termination_node.rb

@@ -1,23 +1,23 @@
-module TPPlus
-  module Nodes
-    class TerminationNode
-      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)
+        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

data/lib/tp_plus/nodes/terminator_node.rb

@@ -1,16 +1,16 @@
-module TPPlus
-  module Nodes
-    class TerminatorNode
-      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
-      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,37 +1,33 @@
-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 < 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
-      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