tp_plus 0.0.77 → 0.0.87

data/lib/tp_plus/interpreter.rb

@@ -1,152 +1,152 @@
-require_relative 'parser'
-
-module TPPlus
-  class Interpreter
-    attr_accessor :line_count, :nodes, :position_data, :header_data
-    attr_reader :labels, :variables, :constants, :namespaces, :source_line_count
-    def initialize
-      @line_count    = 0
-      @nodes         = []
-      @labels        = {}
-      @namespaces    = {}
-      @variables     = {}
-      @constants     = {}
-      @position_data = {}
-      @header_data   = {}
-      @current_label = 99
-    end
-
-    def load_environment(string)
-      scanner = TPPlus::Scanner.new
-      parser = TPPlus::Parser.new(scanner, self)
-      scanner.scan_setup(string)
-      parser.parse
-      eval
-    rescue RuntimeError => e
-      raise "Runtime error in environment on line #{@source_line_count}:\n#{e}"
-    end
-
-    def next_label
-      @current_label += 1
-    end
-
-    def add_namespace(name, block)
-      if @namespaces[name.to_sym].nil?
-        @namespaces[name.to_sym] = TPPlus::Namespace.new(name, block)
-      else
-        @namespaces[name.to_sym].reopen!(block)
-      end
-    end
-
-    def add_label(identifier)
-      raise "Label @#{identifier} already defined" if @labels[identifier.to_sym]
-      @labels[identifier.to_sym] = next_label
-    end
-
-    def add_var(identifier, node)
-      raise "Variable #{identifier} already defined" if @variables[identifier.to_sym]
-
-      @variables[identifier.to_sym] = node
-      node.comment = identifier
-    end
-
-    def add_constant(identifier, node)
-      raise "Constant #{identifier} already defined" if @constants[identifier.to_sym]
-
-      @constants[identifier.to_sym] = node
-    end
-
-    def get_namespace(identifier)
-      if ns = @namespaces[identifier.to_sym]
-        return ns
-      end
-
-      false
-    end
-
-    def get_var(identifier)
-      raise "Variable (#{identifier}) not defined" if @variables[identifier.to_sym].nil?
-
-      @variables[identifier.to_sym]
-    end
-
-    def get_constant(identifier)
-      raise "Constant (#{identifier}) not defined" if @constants[identifier.to_sym].nil?
-
-      @constants[identifier.to_sym]
-    end
-
-    def define_labels
-      @nodes.select {|n| n.is_a? Nodes::LabelDefinitionNode}.each do |n|
-        add_label(n.identifier)
-      end
-    end
-
-    def pos_section
-      return "" if @position_data.empty?
-      return "" if @position_data[:positions].empty?
-
-      @position_data[:positions].inject("") do |s,p|
-        s << %(P[#{p[:id]}:"#{p[:comment]}"]{\n)
-
-        p[:mask].each do |q|
-          s << pos_return(q)
-        end
-
-        s << %(\n};\n)
-      end
-    end
-
-    def pos_return(position_hash)
-      s = ""
-      if position_hash[:config].is_a?(Hash)
-        s << %(   GP#{position_hash[:group]}:
-  UF : #{position_hash[:uframe]}, UT : #{position_hash[:utool]},  CONFIG : '#{position_hash[:config][:flip] ? 'F' : 'N'} #{position_hash[:config][:up] ? 'U' : 'D'} #{position_hash[:config][:top] ? 'T' : 'B'}, #{position_hash[:config][:turn_counts].join(', ')}',
-  X = #{position_hash[:components][:x]} mm, Y = #{position_hash[:components][:y]} mm, Z = #{position_hash[:components][:z]} mm,
-  W = #{position_hash[:components][:w]} deg, P = #{position_hash[:components][:p]} deg, R = #{position_hash[:components][:r]} deg)
-      else
-        s << %(   GP#{position_hash[:group]}:
-  UF : #{position_hash[:uframe]}, UT : #{position_hash[:utool]})
-        if position_hash[:components].is_a?(Hash)
-          position_hash[:components].each_with_index do |key, joint|
-            s << %(, \n)
-            s << %(\tJ#{key} = #{joint[1]} deg)
-          end
-          s << %(\n)
-        end
-      end
-
-      return s
-    end
-
-    def eval
-      s = ""
-      last_node = nil
-
-      define_labels
-
-      @source_line_count = 0
-
-      @nodes.each do |n|
-        @source_line_count += 1 unless n.is_a?(Nodes::TerminatorNode) && !last_node.is_a?(Nodes::TerminatorNode)
-        raise if n.is_a?(String)
-
-        res = n.eval(self)
-
-        # preserve whitespace
-        if n.is_a?(Nodes::TerminatorNode) && last_node.is_a?(Nodes::TerminatorNode)
-          s += " ;\n"
-        end
-        last_node = n
-        # end preserve whitespace
-
-        next if res.nil?
-
-        s += "#{res} ;\n"
-      end
-      s
-    rescue RuntimeError => e
-      raise "Runtime error on line #{@source_line_count}:\n#{e}"
-    end
-  end
-end
+require_relative 'parser'
+
+module TPPlus
+  class Interpreter
+    attr_accessor :line_count, :nodes, :position_data, :header_data
+    attr_reader :labels, :variables, :constants, :namespaces, :source_line_count
+    def initialize
+      @line_count    = 0
+      @nodes         = []
+      @labels        = {}
+      @namespaces    = {}
+      @variables     = {}
+      @constants     = {}
+      @position_data = {}
+      @header_data   = {}
+      @current_label = 99
+    end
+
+    def load_environment(string)
+      scanner = TPPlus::Scanner.new
+      parser = TPPlus::Parser.new(scanner, self)
+      scanner.scan_setup(string)
+      parser.parse
+      eval
+    rescue RuntimeError => e
+      raise "Runtime error in environment on line #{@source_line_count}:\n#{e}"
+    end
+
+    def next_label
+      @current_label += 1
+    end
+
+    def add_namespace(name, block)
+      if @namespaces[name.to_sym].nil?
+        @namespaces[name.to_sym] = TPPlus::Namespace.new(name, block)
+      else
+        @namespaces[name.to_sym].reopen!(block)
+      end
+    end
+
+    def add_label(identifier)
+      raise "Label @#{identifier} already defined" if @labels[identifier.to_sym]
+      @labels[identifier.to_sym] = next_label
+    end
+
+    def add_var(identifier, node)
+      raise "Variable #{identifier} already defined" if @variables[identifier.to_sym]
+
+      @variables[identifier.to_sym] = node
+      node.comment = identifier
+    end
+
+    def add_constant(identifier, node)
+      raise "Constant #{identifier} already defined" if @constants[identifier.to_sym]
+
+      @constants[identifier.to_sym] = node
+    end
+
+    def get_namespace(identifier)
+      if ns = @namespaces[identifier.to_sym]
+        return ns
+      end
+
+      false
+    end
+
+    def get_var(identifier)
+      raise "Variable (#{identifier}) not defined" if @variables[identifier.to_sym].nil?
+
+      @variables[identifier.to_sym]
+    end
+
+    def get_constant(identifier)
+      raise "Constant (#{identifier}) not defined" if @constants[identifier.to_sym].nil?
+
+      @constants[identifier.to_sym]
+    end
+
+    def define_labels
+      @nodes.select {|n| n.is_a? Nodes::LabelDefinitionNode}.each do |n|
+        add_label(n.identifier)
+      end
+    end
+
+    def pos_section
+      return "" if @position_data.empty?
+      return "" if @position_data[:positions].empty?
+
+      @position_data[:positions].inject("") do |s,p|
+        s << %(P[#{p[:id]}:"#{p[:comment]}"]{\n)
+
+        p[:mask].each do |q|
+          s << pos_return(q)
+        end
+
+        s << %(\n};\n)
+      end
+    end
+
+    def pos_return(position_hash)
+      s = ""
+      if position_hash[:config].is_a?(Hash)
+        s << %(   GP#{position_hash[:group]}:
+  UF : #{position_hash[:uframe]}, UT : #{position_hash[:utool]},  CONFIG : '#{position_hash[:config][:flip] ? 'F' : 'N'} #{position_hash[:config][:up] ? 'U' : 'D'} #{position_hash[:config][:top] ? 'T' : 'B'}, #{position_hash[:config][:turn_counts].join(', ')}',
+  X = #{position_hash[:components][:x]} mm, Y = #{position_hash[:components][:y]} mm, Z = #{position_hash[:components][:z]} mm,
+  W = #{position_hash[:components][:w]} deg, P = #{position_hash[:components][:p]} deg, R = #{position_hash[:components][:r]} deg)
+      else
+        s << %(   GP#{position_hash[:group]}:
+  UF : #{position_hash[:uframe]}, UT : #{position_hash[:utool]})
+        if position_hash[:components].is_a?(Hash)
+          position_hash[:components].each_with_index do |key, joint|
+            s << %(, \n)
+            s << %(\tJ#{key} = #{joint[1]} deg)
+          end
+          s << %(\n)
+        end
+      end
+
+      return s
+    end
+
+    def eval
+      s = ""
+      last_node = nil
+
+      define_labels
+
+      @source_line_count = 0
+
+      @nodes.each do |n|
+        @source_line_count += 1 unless n.is_a?(Nodes::TerminatorNode) && !last_node.is_a?(Nodes::TerminatorNode)
+        raise if n.is_a?(String)
+
+        res = n.eval(self)
+
+        # preserve whitespace
+        if n.is_a?(Nodes::TerminatorNode) && last_node.is_a?(Nodes::TerminatorNode)
+          s += " ;\n"
+        end
+        last_node = n
+        # end preserve whitespace
+
+        next if res.nil?
+
+        s += "#{res} ;\n"
+      end
+      s
+    rescue RuntimeError => e
+      raise "Runtime error on line #{@source_line_count}:\n#{e}"
+    end
+  end
+end

data/lib/tp_plus/namespace.rb

@@ -1,66 +1,66 @@
-module TPPlus
-  class Namespace
-    def initialize(name, block)
-      @name       = name
-      @block      = block
-      @namespaces = {}
-      @variables  = {}
-      @constants  = {}
-
-      define!
-    end
-
-    def define!
-      @block.flatten.select {|n| [TPPlus::Nodes::DefinitionNode, TPPlus::Nodes::NamespaceNode].include? n.class }.each do |node|
-        node.eval(self)
-      end
-    end
-
-    def reopen!(block)
-      @block = block
-      define!
-    end
-
-    def add_constant(identifier, node)
-      raise "Constant (#{identifier}) already defined within namespace #{@name}" unless @constants[identifier.to_sym].nil?
-
-      @constants[identifier.to_sym] = node
-    end
-
-    def add_namespace(identifier, block)
-      if @namespaces[identifier.to_sym].nil?
-        @namespaces[identifier.to_sym] = TPPlus::Namespace.new("#{@name} #{identifier}", block)
-      else
-        @namespaces[identifier.to_sym].reopen!(block)
-      end
-    end
-
-    def add_var(identifier, node)
-      raise "Variable (#{identifier}) already defined within namespace #{@name}" unless @variables[identifier.to_sym].nil?
-
-      @variables[identifier.to_sym] = node
-      node.comment = "#{@name} #{identifier}"
-    end
-
-    def get_constant(identifier)
-      raise "Constant (#{identifier}) not defined within namespace #{@name}" if @constants[identifier.to_sym].nil?
-
-      @constants[identifier.to_sym]
-    end
-
-    def get_var(identifier)
-      return get_constant(identifier) if identifier.upcase == identifier
-      raise "Variable (#{identifier}) not defined within namespace #{@name}" if @variables[identifier.to_sym].nil?
-
-      @variables[identifier.to_sym]
-    end
-
-    def get_namespace(identifier)
-      if ns = @namespaces[identifier.to_sym]
-        return ns
-      end
-
-      false
-    end
-  end
-end
+module TPPlus
+  class Namespace
+    def initialize(name, block)
+      @name       = name
+      @block      = block
+      @namespaces = {}
+      @variables  = {}
+      @constants  = {}
+
+      define!
+    end
+
+    def define!
+      @block.flatten.select {|n| [TPPlus::Nodes::DefinitionNode, TPPlus::Nodes::NamespaceNode].include? n.class }.each do |node|
+        node.eval(self)
+      end
+    end
+
+    def reopen!(block)
+      @block = block
+      define!
+    end
+
+    def add_constant(identifier, node)
+      raise "Constant (#{identifier}) already defined within namespace #{@name}" unless @constants[identifier.to_sym].nil?
+
+      @constants[identifier.to_sym] = node
+    end
+
+    def add_namespace(identifier, block)
+      if @namespaces[identifier.to_sym].nil?
+        @namespaces[identifier.to_sym] = TPPlus::Namespace.new("#{@name} #{identifier}", block)
+      else
+        @namespaces[identifier.to_sym].reopen!(block)
+      end
+    end
+
+    def add_var(identifier, node)
+      raise "Variable (#{identifier}) already defined within namespace #{@name}" unless @variables[identifier.to_sym].nil?
+
+      @variables[identifier.to_sym] = node
+      node.comment = "#{@name} #{identifier}"
+    end
+
+    def get_constant(identifier)
+      raise "Constant (#{identifier}) not defined within namespace #{@name}" if @constants[identifier.to_sym].nil?
+
+      @constants[identifier.to_sym]
+    end
+
+    def get_var(identifier)
+      return get_constant(identifier) if identifier.upcase == identifier
+      raise "Variable (#{identifier}) not defined within namespace #{@name}" if @variables[identifier.to_sym].nil?
+
+      @variables[identifier.to_sym]
+    end
+
+    def get_namespace(identifier)
+      if ns = @namespaces[identifier.to_sym]
+        return ns
+      end
+
+      false
+    end
+  end
+end

data/lib/tp_plus/nodes/abort_node.rb

@@ -1,9 +1,9 @@
-module TPPlus
-  module Nodes
-    class AbortNode
-      def eval(context)
-        "ABORT"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class AbortNode < BaseNode
+      def eval(context)
+        "ABORT"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/acc_node.rb

@@ -1,19 +1,19 @@
-module TPPlus
-  module Nodes
-    class AccNode
-      def initialize(value)
-        @value = value
-      end
-
-      def eval(context)
-        val = @value.eval(context)
-        case val
-        when Integer
-          "ACC#{val}"
-        else
-          "ACC #{val}"
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class AccNode < BaseNode
+      def initialize(value)
+        @value = value
+      end
+
+      def eval(context)
+        val = @value.eval(context)
+        case val
+        when Integer
+          "ACC#{val}"
+        else
+          "ACC #{val}"
+        end
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/address_node.rb

@@ -1,22 +1,22 @@
-module TPPlus
-  module Nodes
-    class AddressNode
-      attr_reader :id
-      def initialize(id)
-        @id = id
-      end
-
-      def requires_mixed_logic?(context)
-        false
-      end
-
-      def node(context)
-        context.get_var(@id)
-      end
-
-      def eval(context,options={})
-        node(context).id.to_s
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class AddressNode < BaseNode
+      attr_reader :id
+      def initialize(id)
+        @id = id
+      end
+
+      def requires_mixed_logic?(context)
+        false
+      end
+
+      def node(context)
+        context.get_var(@id)
+      end
+
+      def eval(context,options={})
+        node(context).id.to_s
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/argument_node.rb

@@ -1,20 +1,20 @@
-module TPPlus
-  module Nodes
-    class ArgumentNode
-      attr_accessor :comment
-      attr_reader :id
-      def initialize(id)
-        @id = id
-        @comment = comment
-      end
-
-      def requires_mixed_logic?(context)
-        true
-      end
-
-      def eval(context,options={})
-        "AR[#{@id}]"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class ArgumentNode < BaseNode
+      attr_accessor :comment
+      attr_reader :id
+      def initialize(id)
+        @id = id
+        @comment = comment
+      end
+
+      def requires_mixed_logic?(context)
+        true
+      end
+
+      def eval(context,options={})
+        "AR[#{@id}]"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/assignment_node.rb

@@ -1,45 +1,52 @@
-module TPPlus
-  module Nodes
-    class AssignmentNode
-      attr_reader :identifier, :assignable
-      def initialize(identifier,assignable)
-        @identifier = identifier
-        @assignable = assignable
-      end
-
-      def assignable_string(context,options={})
-        if @assignable.is_a?(ExpressionNode)
-          options[:mixed_logic] = true if @assignable.contains_expression?
-          options[:mixed_logic] = true if @assignable.op.requires_mixed_logic?(context)
-          options[:mixed_logic] = true if @assignable.op.boolean?
-          options[:mixed_logic] = true if @assignable.boolean_result?
-        else
-          options[:mixed_logic] = true if @assignable.requires_mixed_logic?(context)
-          options[:mixed_logic] = true if @identifier.requires_mixed_logic?(context)
-        end
-
-        if options[:mixed_logic]
-          "(#{@assignable.eval(context)})"
-        else
-          @assignable.eval(context)
-        end
-      end
-
-      def requires_mixed_logic?(context)
-        true
-      end
-
-      def can_be_inlined?
-        true
-      end
-
-      def identifier_string(context)
-        @identifier.eval(context)
-      end
-
-      def eval(context,options={})
-        "#{identifier_string(context)}=#{assignable_string(context,options)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class AssignmentNode < BaseNode
+      attr_reader :identifier, :assignable
+      def initialize(identifier,assignable)
+        @identifier = identifier
+        @assignable = assignable
+      end
+
+      def assignable_string(context,options={})
+        if @assignable.is_a?(ExpressionNode)
+          options[:mixed_logic] = true if @assignable.contains_expression?
+          options[:mixed_logic] = true if @assignable.op.requires_mixed_logic?(context)
+          options[:mixed_logic] = true if @assignable.op.boolean?
+          options[:mixed_logic] = true if @assignable.boolean_result?
+          # this is a hack that fixes issue #12
+          # PR[a]=PR[b]+PR[c]+PR[d] (no parens)
+          if @identifier.is_a? VarNode
+            options[:mixed_logic] = false if @identifier.target_node(context).is_a? PosregNode
+          end
+        elsif @assignable.is_a?(VarNode)
+          options[:mixed_logic] = true if @assignable.target_node(context).is_a? IONode
+        else
+          options[:mixed_logic] = true if @assignable.requires_mixed_logic?(context)
+          options[:mixed_logic] = true if @identifier.requires_mixed_logic?(context)
+        end
+
+        if options[:mixed_logic]
+          "(#{@assignable.eval(context)})"
+        else
+          @assignable.eval(context)
+        end
+      end
+
+      def requires_mixed_logic?(context)
+        true
+      end
+
+      def can_be_inlined?
+        true
+      end
+
+      def identifier_string(context)
+        @identifier.eval(context)
+      end
+
+      def eval(context,options={})
+        "#{identifier_string(context)}=#{assignable_string(context,options)}"
+      end
+    end
+  end
+end