tp_plus 0.0.73 → 0.0.74

data/lib/tp_plus/nodes/definition_node.rb

@@ -1,22 +1,22 @@
-module TPPlus
-  module Nodes
-    class DefinitionNode
-      attr_reader :identifier, :assignable
-      def initialize(identifier,assignable)
-        @identifier = identifier
-        @assignable = assignable
-      end
-
-      def eval(context)
-        if @assignable.is_a?(DigitNode) || @assignable.is_a?(RealNode)
-          raise "Constants must be defined with all CAPS" unless @identifier.upcase == @identifier
-
-          context.add_constant(@identifier, @assignable)
-        else
-          context.add_var(@identifier, @assignable)
-        end
-        nil
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class DefinitionNode
+      attr_reader :identifier, :assignable
+      def initialize(identifier,assignable)
+        @identifier = identifier
+        @assignable = assignable
+      end
+
+      def eval(context)
+        if @assignable.is_a?(DigitNode) || @assignable.is_a?(RealNode)
+          raise "Constants must be defined with all CAPS" unless @identifier.upcase == @identifier
+
+          context.add_constant(@identifier, @assignable)
+        else
+          context.add_var(@identifier, @assignable)
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/digit_node.rb

@@ -1,21 +1,22 @@
-module TPPlus
-  module Nodes
-    class DigitNode
-      def initialize(value)
-        @value = value
-      end
-
-      def requires_mixed_logic?(context)
-        false
-      end
-
-      def eval(context, options={})
-        if @value < 0
-          "(#{@value})"
-        else
-          @value
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class DigitNode
+      attr_reader :value
+      def initialize(value)
+        @value = value
+      end
+
+      def requires_mixed_logic?(context)
+        false
+      end
+
+      def eval(context, options={})
+        if @value < 0
+          "(#{@value})"
+        else
+          @value
+        end
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/empty_stmt_node.rb

@@ -0,0 +1,9 @@
+module TPPlus
+  module Nodes
+    class EmptyStmtNode
+      def eval(context, options={})
+        ""
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/eval_node.rb

@@ -1,13 +1,13 @@
-module TPPlus
-  module Nodes
-    class EvalNode
-      def initialize(string)
-        @string = string
-      end
-
-      def eval(context)
-        @string
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class EvalNode
+      def initialize(string)
+        @string = string
+      end
+
+      def eval(context)
+        @string
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/expression_node.rb

@@ -1,65 +1,68 @@
-module TPPlus
-  module Nodes
-    class ExpressionNode
-      attr_reader :left_op, :op, :right_op
-      attr_accessor :grouped
-      def initialize(left_op, op_string, right_op)
-        @left_op  = left_op
-        @op       = OperatorNode.new(op_string)
-        @right_op = right_op
-      end
-
-      def requires_mixed_logic?(context)
-        contains_expression? ||
-          @grouped ||
-          [@op, @left_op, @right_op].map { |op|
-            next if op.nil?
-            op.requires_mixed_logic?(context)
-          }.any?
-      end
-
-      def contains_expression?
-        [@left_op, @right_op].map {|op| op.is_a? ExpressionNode }.any?
-      end
-
-      def boolean_result?
-        case @op.string
-        when "&&","||","!","==","<>",">",">=","<","<="
-          true
-        else
-          false
-        end
-      end
-
-      def with_parens(string, context, options={})
-        return string unless options[:force_parens] || options[:as_condition] && requires_mixed_logic?(context)
-
-        "(#{string})"
-      end
-
-      def string_val(context, options={})
-        if @op.bang?
-          # this is for skip conditions, which do not
-          # support mixed logic
-          if options[:disable_mixed_logic]
-            "#{@left_op.eval(context)}=OFF"
-          else
-            "#{@op.eval(context,options)}#{@left_op.eval(context)}"
-          end
-        else
-          if @op.boolean? && options[:opposite]
-            "!#{@left_op.eval(context)}#{@op.eval(context,options)}!#{@right_op.eval(context)}"
-          else
-            "#{@left_op.eval(context)}#{@op.eval(context,options)}#{@right_op.eval(context)}"
-          end
-        end
-      end
-
-      def eval(context,options={})
-        options[:force_parens] = true if @grouped
-
-        with_parens(string_val(context, options), context, options)
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class ExpressionNode
+      attr_reader :left_op, :op, :right_op
+      def initialize(left_op, op_string, right_op)
+        @left_op  = left_op
+        @op       = OperatorNode.new(op_string)
+        @right_op = right_op
+      end
+
+      def grouped?
+        return false if @right_op.nil? # this is for NOT (!) operator
+
+        @left_op.is_a?(ParenExpressionNode) || @right_op.is_a?(ParenExpressionNode)
+      end
+
+      def requires_mixed_logic?(context)
+        contains_expression? ||
+          grouped? ||
+          [@op, @left_op, @right_op].map { |op|
+            next if op.nil?
+            op.requires_mixed_logic?(context)
+          }.any?
+      end
+
+      def contains_expression?
+        [@left_op, @right_op].map {|op| op.is_a? ExpressionNode }.any? ||
+          [@left_op, @right_op].map { |op| op.is_a? ParenExpressionNode }.any?
+      end
+
+      def boolean_result?
+        case @op.string
+        when "&&","||","!","==","<>",">",">=","<","<="
+          true
+        else
+          false
+        end
+      end
+
+      def string_val(context, options={})
+        if @op.bang?
+          # this is for skip conditions, which do not
+          # support mixed logic
+          if options[:disable_mixed_logic]
+            "#{@left_op.eval(context)}=OFF"
+          else
+            "#{@op.eval(context,options)}#{@left_op.eval(context)}"
+          end
+        else
+          if @op.boolean?
+            # if operator is &&, || or !, we flip the operator and the operands
+            "#{@left_op.eval(context,options)}#{@op.eval(context, options)}#{@right_op.eval(context, options)}"
+          else
+            # flip the operator if options[:opposite]
+            # flip the operands only if opposite and the operand is an expression
+            "#{@left_op.eval(context, opposite: (@left_op.is_a?(ExpressionNode) && options[:opposite]))}#{@op.eval(context, options)}#{@right_op.eval(context, opposite: (@right_op.is_a?(ExpressionNode) && options[:opposite]))}"
+          end
+        end
+      end
+
+      def eval(context,options={})
+        options[:force_parens] = true if grouped?
+
+        string_val(context, options)
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/for_node.rb

@@ -1,20 +1,20 @@
-module TPPlus
-  module Nodes
-    class ForNode
-      def initialize(var_node, initial_value_node, final_value_node, block)
-        @var_node           = var_node
-        @initial_value_node = initial_value_node
-        @final_value_node   = final_value_node
-        @block              = block.flatten.reject {|n| n.is_a?(TerminatorNode) }
-      end
-
-      def block(context)
-        @s ||= @block.inject("") {|s,n| s << "#{n.eval(context)} ;\n" }
-      end
-
-      def eval(context)
-        "FOR #{@var_node.eval(context)}=#{@initial_value_node.eval(context)} TO #{@final_value_node.eval(context)} ;\n#{block(context)}ENDFOR"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class ForNode
+      def initialize(var_node, initial_value_node, final_value_node, block)
+        @var_node           = var_node
+        @initial_value_node = initial_value_node
+        @final_value_node   = final_value_node
+        @block              = block.flatten.reject {|n| n.is_a?(TerminatorNode) }
+      end
+
+      def block(context)
+        @s ||= @block.inject("") {|s,n| s << "#{n.eval(context)} ;\n" }
+      end
+
+      def eval(context)
+        "FOR #{@var_node.eval(context)}=#{@initial_value_node.eval(context)} TO #{@final_value_node.eval(context)} ;\n#{block(context)}ENDFOR"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/header_node.rb

@@ -1,27 +1,27 @@
-module TPPlus
-  module Nodes
-    class HeaderNode
-      def initialize(type, value)
-        @type  = type
-        @value = value
-      end
-
-      def eval(context, options={})
-        case @type
-        when "TP_IGNORE_PAUSE"
-          context.header_data[:ignore_pause] = @value
-        when "TP_COMMENT"
-          context.header_data[:comment] = @value
-        when "TP_GROUPMASK"
-          context.header_data[:group_mask] = @value
-        when "TP_SUBTYPE"
-          context.header_data[:subtype] = @value.to_sym
-        else
-          raise "Unsupported TP Header value (#{@type})"
-        end
-
-        nil
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class HeaderNode
+      def initialize(type, value)
+        @type  = type
+        @value = value
+      end
+
+      def eval(context, options={})
+        case @type
+        when "TP_IGNORE_PAUSE"
+          context.header_data[:ignore_pause] = @value
+        when "TP_COMMENT"
+          context.header_data[:comment] = @value
+        when "TP_GROUPMASK"
+          context.header_data[:group_mask] = @value
+        when "TP_SUBTYPE"
+          context.header_data[:subtype] = @value.to_sym
+        else
+          raise "Unsupported TP Header value (#{@type})"
+        end
+
+        nil
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/indirect_node.rb

@@ -1,49 +1,51 @@
-module TPPlus
-  module Nodes
-    class IndirectNode
-      def initialize(type, target)
-        @type = type
-        @target = target
-      end
-
-      def string
-        case @type
-        when :position
-          "P"
-        when :position_register
-          "PR"
-        when :flag
-          "F"
-        when :timer
-          "TIMER"
-        when :register
-          "R"
-        when :user_alarm
-          "UALM"
-        else
-          raise "Invalid indirect type"
-        end
-      end
-
-      def requires_mixed_logic?(context)
-        case @type
-        when :flag#, :timer
-          true
-        else
-          false
-        end
-      end
-
-      def eval(context,options={})
-        s = "#{string}[#{@target.eval(context)}]"
-        if options[:opposite]
-          s = "!#{s}"
-        end
-        if options[:as_condition]
-          s = "(#{s})"
-        end
-        s
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class IndirectNode
+      def initialize(type, target)
+        @type = type
+        @target = target
+      end
+
+      def string
+        case @type
+        when :position
+          "P"
+        when :position_register
+          "PR"
+        when :flag
+          "F"
+        when :timer
+          "TIMER"
+        when :register
+          "R"
+        when :user_alarm
+          "UALM"
+        when :user_frame
+          "UFRAME"
+        else
+          raise "Invalid indirect type"
+        end
+      end
+
+      def requires_mixed_logic?(context)
+        case @type
+        when :flag#, :timer
+          true
+        else
+          false
+        end
+      end
+
+      def eval(context,options={})
+        s = "#{string}[#{@target.eval(context)}]"
+        if options[:opposite]
+          s = "!#{s}"
+        end
+        if options[:as_condition]
+          s = "(#{s})"
+        end
+        s
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/inline_conditional_node.rb

@@ -1,40 +1,40 @@
-module TPPlus
-  module Nodes
-    class InlineConditionalNode
-      attr_reader :condition_node
-      def initialize(type, condition, block)
-        @type           = type
-        @condition_node = condition
-        @block          = block
-      end
-
-      def condition_requires_mixed_logic?(context)
-        @condition_node.is_a?(VarNode) ||
-          @condition_node.is_a?(NamespacedVarNode) ||
-          @condition_node.requires_mixed_logic?(context)
-      end
-
-      def block_requires_mixed_logic?(context)
-        @block.requires_mixed_logic?(context)
-      end
-
-      def can_be_inlined?
-        false
-      end
-
-      def condition(context,options={})
-        options[:opposite] ||= @type == "unless"
-
-        if condition_requires_mixed_logic?(context) || block_requires_mixed_logic?(context)
-          "(#{@condition_node.eval(context, options)})"
-        else
-          @condition_node.eval(context, options)
-        end
-      end
-
-      def eval(context)
-        "IF #{condition(context)},#{@block.eval(context,mixed_logic:true)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class InlineConditionalNode
+      attr_reader :condition_node
+      def initialize(type, condition, block)
+        @type           = type
+        @condition_node = condition
+        @block          = block
+      end
+
+      def condition_requires_mixed_logic?(context)
+        @condition_node.is_a?(VarNode) ||
+          @condition_node.is_a?(NamespacedVarNode) ||
+          @condition_node.requires_mixed_logic?(context)
+      end
+
+      def block_requires_mixed_logic?(context)
+        @block.requires_mixed_logic?(context)
+      end
+
+      def can_be_inlined?
+        false
+      end
+
+      def condition(context,options={})
+        options[:opposite] ||= @type == "unless"
+
+        if condition_requires_mixed_logic?(context) || block_requires_mixed_logic?(context)
+          "(#{@condition_node.eval(context, options)})"
+        else
+          @condition_node.eval(context, options)
+        end
+      end
+
+      def eval(context)
+        "IF #{condition(context)},#{@block.eval(context,mixed_logic:true)}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/io_method_node.rb

@@ -1,55 +1,55 @@
-module TPPlus
-  module Nodes
-    class IOMethodNode
-      def initialize(method, target,options={})
-        @method = method
-        @target = target
-        @init_options = options
-      end
-
-      def requires_mixed_logic?(context)
-        true
-      end
-
-      def can_be_inlined?
-        true
-      end
-
-      def on_off(value,options={})
-        options[:mixed_logic] ? "(#{value})" : value
-      end
-
-      def pulse_time(context)
-        "%.1f" % case @init_options[:pulse_units]
-        when "s"
-          @init_options[:pulse_time].eval(context)
-        when "ms"
-          @init_options[:pulse_time].eval(context).to_f / 1000
-        else
-          raise "Invalid pulse units"
-        end
-      end
-
-      def pulse_extra(context)
-        return "" if @init_options[:pulse_time].nil?
-
-        ",#{pulse_time(context)}sec"
-      end
-
-      def eval(context,options={})
-        options[:mixed_logic] = true if @target.requires_mixed_logic?(context)
-
-        case @method
-        when "turn_on"
-          "#{@target.eval(context)}=#{on_off("ON",options)}"
-        when "turn_off"
-          "#{@target.eval(context)}=#{on_off("OFF",options)}"
-        when "toggle"
-          "#{@target.eval(context)}=(!#{@target.eval(context)})"
-        when "pulse"
-          "#{@target.eval(context)}=PULSE#{pulse_extra(context)}"
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class IOMethodNode
+      def initialize(method, target,options={})
+        @method = method
+        @target = target
+        @init_options = options
+      end
+
+      def requires_mixed_logic?(context)
+        true
+      end
+
+      def can_be_inlined?
+        true
+      end
+
+      def on_off(value,options={})
+        options[:mixed_logic] ? "(#{value})" : value
+      end
+
+      def pulse_time(context)
+        "%.1f" % case @init_options[:pulse_units]
+        when "s"
+          @init_options[:pulse_time].eval(context)
+        when "ms"
+          @init_options[:pulse_time].eval(context).to_f / 1000
+        else
+          raise "Invalid pulse units"
+        end
+      end
+
+      def pulse_extra(context)
+        return "" if @init_options[:pulse_time].nil?
+
+        ",#{pulse_time(context)}sec"
+      end
+
+      def eval(context,options={})
+        options[:mixed_logic] = true if @target.requires_mixed_logic?(context)
+
+        case @method
+        when "turn_on"
+          "#{@target.eval(context)}=#{on_off("ON",options)}"
+        when "turn_off"
+          "#{@target.eval(context)}=#{on_off("OFF",options)}"
+        when "toggle"
+          "#{@target.eval(context)}=(!#{@target.eval(context)})"
+        when "pulse"
+          "#{@target.eval(context)}=PULSE#{pulse_extra(context)}"
+        end
+      end
+    end
+  end
+end