tp_plus 0.0.73 → 0.0.74

data/lib/tp_plus/nodes/pause_node.rb

@@ -1,9 +1,9 @@
-module TPPlus
-  module Nodes
-    class PauseNode
-      def eval(context)
-        "PAUSE"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class PauseNode
+      def eval(context)
+        "PAUSE"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/position_data_node.rb

@@ -1,50 +1,64 @@
-module TPPlus
-  module Nodes
-    class PositionDataNode
-      attr_reader :hash
-      def initialize(hash)
-        @hash = hash
-        @ids  = []
-      end
-
-      def valid?
-        return false unless @hash[:positions].is_a?(Array)
-        return false if @hash[:positions].map {|p| position_valid?(p) == false }.any?
-
-        true
-      end
-
-      def position_valid?(position_hash)
-        return false if @ids.include?(position_hash[:id])
-        @ids.push(position_hash[:id])
-
-        return false unless position_hash[:group].is_a?(Fixnum)
-        return false unless position_hash[:uframe].is_a?(Fixnum)
-        return false unless position_hash[:utool].is_a?(Fixnum)
-        return false unless position_hash[:config].is_a?(Hash)
-        return false unless boolean?(position_hash[:config][:flip])
-        return false unless boolean?(position_hash[:config][:up])
-        return false unless boolean?(position_hash[:config][:top])
-        return false unless position_hash[:config][:turn_counts].is_a?(Array)
-        return false unless position_hash[:config][:turn_counts].length == 3
-        return false if position_hash[:config][:turn_counts].map {|tc| tc.is_a?(Fixnum) == false }.any?
-        return false unless position_hash[:components].is_a?(Hash)
-        [:x,:y,:z,:w,:p,:r].each do |component|
-          return false unless position_hash[:components][component].is_a?(Float)
-        end
-
-        true
-      end
-
-      def boolean?(thing)
-        thing.is_a?(TrueClass) || thing.is_a?(FalseClass)
-      end
-
-      def eval(context, options={})
-        raise "Invalid position data" unless valid?
-        context.position_data = @hash
-        nil
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class PositionDataNode
+      attr_reader :hash
+      def initialize(hash)
+        @hash = hash
+        @ids  = []
+      end
+
+      def valid?
+        return false unless @hash[:positions].is_a?(Array)
+        return false if @hash[:positions].map {|p| position_valid?(p) == false }.any?
+
+        true
+      end
+
+      def position_valid?(position_hash)
+        return false if @ids.include?(position_hash[:id])
+        @ids.push(position_hash[:id])
+
+        position_hash[:mask].select {|q|
+          !mask_valid?(q)
+        }.empty?
+      end
+
+      def mask_valid?(position_hash)
+        return false unless position_hash[:group].is_a?(Fixnum)
+        return false unless position_hash[:uframe].is_a?(Fixnum)
+        return false unless position_hash[:utool].is_a?(Fixnum)
+
+        if position_hash[:config].is_a?(Hash)
+          return false unless boolean?(position_hash[:config][:flip])
+          return false unless boolean?(position_hash[:config][:up])
+          return false unless boolean?(position_hash[:config][:top])
+          return false unless position_hash[:config][:turn_counts].is_a?(Array)
+          return false unless position_hash[:config][:turn_counts].length == 3
+          return false if position_hash[:config][:turn_counts].map {|tc| tc.is_a?(Fixnum) == false }.any?
+          return false unless position_hash[:components].is_a?(Hash)
+          [:x,:y,:z,:w,:p,:r].each do |component|
+            return false unless position_hash[:components][component].is_a?(Float)
+          end
+        else
+          # must be joint representation
+          return false unless position_hash[:components].is_a?(Hash)
+          position_hash[:components].each do |component|
+            return false unless component[1].is_a?(Float)
+          end
+        end
+
+        true
+      end
+
+      def boolean?(thing)
+        thing.is_a?(TrueClass) || thing.is_a?(FalseClass)
+      end
+
+      def eval(context, options={})
+        raise "Invalid position data" unless valid?
+        context.position_data = @hash
+        nil
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/position_node.rb

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

data/lib/tp_plus/nodes/posreg_node.rb

@@ -1,48 +1,64 @@
-module TPPlus
-  module Nodes
-    class PosregNode
-
-      COMPONENTS = {
-        "x" => 1,
-        "y" => 2,
-        "z" => 3,
-        "w" => 4,
-        "p" => 5,
-        "r" => 6
-      }
-
-      attr_accessor :comment
-      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 requires_mixed_logic?(context)
-        false
-      end
-
-      def eval(context,options={})
-        options[:method] ||= ""
-        raise "Invalid component" unless component_valid?(options[:method])
-
-        "PR[#{@id}#{component(options[:method])}#{comment_string}]"
-      end
-    end
-  end
-end
+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

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
+      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
+      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/set_skip_node.rb

@@ -0,0 +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

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
+      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
+      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
+      def initialize(s)
+        @s = s
+      end
+
+      def eval(context)
+        "'#{@s}'"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/string_register_node.rb

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

data/lib/tp_plus/nodes/termination_node.rb

@@ -1,18 +1,23 @@
-module TPPlus
-  module Nodes
-    class TerminationNode
-      def initialize(value)
-        @value = value
-      end
-
-      def eval(context)
-        if @value.is_a? DigitNode
-          "CNT#{@value.eval(context)}"
-        else
-          # for registers
-          "CNT #{@value.eval(context)}"
-        end
-      end
-    end
-  end
-end
+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

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
+      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] ;