tp_plus 0.0.73 → 0.0.74

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
+      def eval(context)
+        "ABORT"
+      end
+    end
+  end
+end

data/lib/tp_plus/nodes/address_node.rb

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

data/lib/tp_plus/nodes/argument_node.rb

@@ -1,19 +1,20 @@
-module TPPlus
-  module Nodes
-    class ArgumentNode
-      attr_accessor :comment
-      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
+      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,45 @@
-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
+      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

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

data/lib/tp_plus/nodes/conditional_node.rb

@@ -1,54 +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 eval(context, options={})
-        return InlineConditionalNode.new(@type,@condition,@true_block.first).eval(context) if can_be_inlined?
-
-        if @false_block.empty?
-          "IF #{@condition.eval(context,opposite: opposite?, as_condition: true)},JMP LBL[#{true_label(context)}] ;\n#{true_block(context)}LBL[#{true_label(context)}]"
-        else
-          # could be if-else or unless-else
-          "IF #{@condition.eval(context,opposite: opposite?, as_condition: true)},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
+      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