tp_plus 0.0.77 → 0.0.87

data/lib/tp_plus/nodes/base_node.rb

@@ -0,0 +1,9 @@
+module TPPlus
+  module Nodes
+    class BaseNode
+      def can_be_inlined?
+        false
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/call_node.rb

@@ -1,34 +1,34 @@
-module TPPlus
-  module Nodes
-    class CallNode
-      attr_reader :args
-      def initialize(program_name, args, options={})
-        @program_name = program_name
-        @args = args
-        @async = options[:async]
-      end
-
-      def requires_mixed_logic?(context)
-        false
-      end
-
-      def async?
-        @async
-      end
-
-      def args_string(context)
-        return "" unless @args.any?
-
-        "(" + @args.map {|a| a.eval(context) }.join(",") + ")"
-      end
-
-      def can_be_inlined?
-        true
-      end
-
-      def eval(context,options={})
-        "#{async? ? "RUN" : "CALL"} #{@program_name.upcase}#{args_string(context)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class CallNode < BaseNode
+      attr_reader :args
+      def initialize(program_name, args, options={})
+        @program_name = program_name
+        @args = args
+        @async = options[:async]
+      end
+
+      def requires_mixed_logic?(context)
+        false
+      end
+
+      def async?
+        @async
+      end
+
+      def args_string(context)
+        return "" unless @args.any?
+
+        "(" + @args.map {|a| a.eval(context) }.join(",") + ")"
+      end
+
+      def can_be_inlined?
+        true
+      end
+
+      def eval(context,options={})
+        "#{async? ? "RUN" : "CALL"} #{@program_name.upcase}#{args_string(context)}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/case_condition_node.rb

@@ -1,26 +1,26 @@
-module TPPlus
-  module Nodes
-    class CaseConditionNode
-      def initialize(condition, block)
-        @condition = condition
-        @block = block
-      end
-
-      def eval(context, options={})
-        options[:no_indent] ||= false
-
-        s = ""
-        if !options[:no_indent]
-          s += "       "
-        end
-
-        if @condition
-          s += "=#{@condition.eval(context)},#{@block.eval(context)}"
-        else
-          s += "ELSE,#{@block.eval(context)}"
-        end
-        s
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class CaseConditionNode < BaseNode
+      def initialize(condition, block)
+        @condition = condition
+        @block = block
+      end
+
+      def eval(context, options={})
+        options[:no_indent] ||= false
+
+        s = ""
+        if !options[:no_indent]
+          s += "       "
+        end
+
+        if @condition
+          s += "=#{@condition.eval(context)},#{@block.eval(context)}"
+        else
+          s += "ELSE,#{@block.eval(context)}"
+        end
+        s
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/case_node.rb

@@ -1,33 +1,33 @@
-module TPPlus
-  module Nodes
-    class CaseNode
-      def initialize(var, conditions, else_condition)
-        @var = var
-        @conditions = conditions
-        @else_condition = else_condition
-      end
-
-      def else_condition(context)
-        return "" if @else_condition.nil?
-
-        " ;\n#{@else_condition.eval(context)}"
-      end
-
-      def other_conditions(context)
-        return "" if @conditions.empty?
-
-        s = " ;\n"
-        @conditions.reject! {|c| c.nil? }.each do |c|
-          s += c.eval(context)
-          s += " ;\n" unless c == @conditions.last
-        end
-
-        s
-      end
-
-      def eval(context)
-        "SELECT #{@var.eval(context)}#{@conditions.shift.eval(context, no_indent: true)}#{other_conditions(context)}#{else_condition(context)}"
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class CaseNode < BaseNode
+      def initialize(var, conditions, else_condition)
+        @var = var
+        @conditions = conditions
+        @else_condition = else_condition
+      end
+
+      def else_condition(context)
+        return "" if @else_condition.nil?
+
+        " ;\n#{@else_condition.eval(context)}"
+      end
+
+      def other_conditions(context)
+        return "" if @conditions.empty?
+
+        s = " ;\n"
+        @conditions.reject! {|c| c.nil? }.each do |c|
+          s += c.eval(context)
+          s += " ;\n" unless c == @conditions.last
+        end
+
+        s
+      end
+
+      def eval(context)
+        "SELECT #{@var.eval(context)}#{@conditions.shift.eval(context, no_indent: true)}#{other_conditions(context)}#{else_condition(context)}"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/comment_node.rb

@@ -1,22 +1,18 @@
-module TPPlus
-  module Nodes
-    class CommentNode
-      def initialize(text)
-        @text = text[1,text.length]
-      end
-
-      def can_be_inlined?
-        false
-      end
-
-      def eval(context)
-        s = ""
-        width = 29
-        @text.scan(/\S.{0,#{width}}\S(?=\s|$)|\S+/).each do |piece|
-          s += "! #{piece} ;\n"
-        end
-        s[0,s.length-3]
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class CommentNode < BaseNode
+      def initialize(text)
+        @text = text[1,text.length]
+      end
+
+      def eval(context)
+        s = ""
+        width = 29
+        @text.scan(/\S.{0,#{width}}\S(?=\s|$)|\S+/).each do |piece|
+          s += "! #{piece} ;\n"
+        end
+        s[0,s.length-3]
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/conditional_node.rb

@@ -1,60 +1,60 @@
-module TPPlus
-  module Nodes
-    class ConditionalNode
-      def initialize(type,condition,true_block,false_block)
-        @type        = type
-        @condition   = condition
-        @true_block  = true_block.flatten.reject  {|n| n.is_a? TerminatorNode }
-        @false_block = false_block.flatten.reject {|n| n.is_a? TerminatorNode }
-      end
-
-      def true_label(context)
-        @true_label ||= context.next_label
-      end
-
-      def end_label(context)
-        @end_label ||= context.next_label
-      end
-
-      def true_block(context)
-        @t ||= string_for(@true_block,context)
-      end
-
-      def false_block(context)
-        @f ||= string_for(@false_block,context)
-      end
-
-      def string_for(block,context)
-        block.inject("") {|s,n| s << "#{n.eval(context)} ;\n" }
-      end
-
-      def can_be_inlined?
-        return false unless @false_block.empty?
-        return false unless @true_block.length == 1
-
-        @true_block.first.can_be_inlined?
-      end
-
-      def opposite?
-        @type == "if"
-      end
-
-      def parens(s, context)
-        return s unless @condition.requires_mixed_logic?(context) || !@condition.is_a?(ExpressionNode)
-
-        "(#{s})"
-      end
-
-      def eval(context, options={})
-        return InlineConditionalNode.new(@type,@condition,@true_block.first).eval(context) if can_be_inlined?
-
-        if @false_block.empty?
-          "IF #{parens(@condition.eval(context,opposite: opposite?), context)},JMP LBL[#{true_label(context)}] ;\n#{true_block(context)}LBL[#{true_label(context)}]"
-        else
-          # could be if-else or unless-else
-          "IF #{parens(@condition.eval(context,opposite: opposite?), context)},JMP LBL[#{true_label(context)}] ;\n#{true_block(context)}JMP LBL[#{end_label(context)}] ;\nLBL[#{true_label(context)}] ;\n#{false_block(context)}LBL[#{end_label(context)}]"
-        end
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class ConditionalNode < BaseNode
+      def initialize(type,condition,true_block,false_block)
+        @type        = type
+        @condition   = condition
+        @true_block  = true_block.flatten.reject  {|n| n.is_a? TerminatorNode }
+        @false_block = false_block.flatten.reject {|n| n.is_a? TerminatorNode }
+      end
+
+      def true_label(context)
+        @true_label ||= context.next_label
+      end
+
+      def end_label(context)
+        @end_label ||= context.next_label
+      end
+
+      def true_block(context)
+        @t ||= string_for(@true_block,context)
+      end
+
+      def false_block(context)
+        @f ||= string_for(@false_block,context)
+      end
+
+      def string_for(block,context)
+        block.inject("") {|s,n| s << "#{n.eval(context)} ;\n" }
+      end
+
+      def can_be_inlined?
+        return false unless @false_block.empty?
+        return false unless @true_block.length == 1
+
+        @true_block.first.can_be_inlined?
+      end
+
+      def opposite?
+        @type == "if"
+      end
+
+      def parens(s, context)
+        return s unless @condition.requires_mixed_logic?(context) || !@condition.is_a?(ExpressionNode)
+
+        "(#{s})"
+      end
+
+      def eval(context, options={})
+        return InlineConditionalNode.new(@type,@condition,@true_block.first).eval(context) if can_be_inlined?
+
+        if @false_block.empty?
+          "IF #{parens(@condition.eval(context,opposite: opposite?), context)},JMP LBL[#{true_label(context)}] ;\n#{true_block(context)}LBL[#{true_label(context)}]"
+        else
+          # could be if-else or unless-else
+          "IF #{parens(@condition.eval(context,opposite: opposite?), context)},JMP LBL[#{true_label(context)}] ;\n#{true_block(context)}JMP LBL[#{end_label(context)}] ;\nLBL[#{true_label(context)}] ;\n#{false_block(context)}LBL[#{end_label(context)}]"
+        end
+      end
+    end
+  end
+end

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 < BaseNode
+      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,22 +1,22 @@
-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
+module TPPlus
+  module Nodes
+    class DigitNode < BaseNode
+      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

@@ -1,9 +1,9 @@
-module TPPlus
-  module Nodes
-    class EmptyStmtNode
-      def eval(context, options={})
-        ""
-      end
-    end
-  end
-end
+module TPPlus
+  module Nodes
+    class EmptyStmtNode < BaseNode
+      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 < BaseNode
+      def initialize(string)
+        @string = string
+      end
+
+      def eval(context)
+        @string
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/expression_node.rb

@@ -1,68 +1,68 @@
-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
+module TPPlus
+  module Nodes
+    class ExpressionNode < BaseNode
+      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