intar 2.12 → 2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0b8c82a2fd61d3a7fe7be7078c4cf96b37dabd18c00c25ad84a51cb34d06445
-  data.tar.gz: c8045ce6959c1fda974eec564229bbe95b2adf2acd9470c650863f4e405f7adf
+  metadata.gz: dfabe8ba50f5502971175b8ec48582e1c24d68b75cf164ed10b7b1545b8ed1ec
+  data.tar.gz: 376905c4c3f81b252662f6df9803ad8bd9038475c8ccc5c9adc6f79239f5c3c8
 SHA512:
-  metadata.gz: a3a6d77c597107d260b723a107feae4049a31c81654b420169ef4ec6db55eaa1e23e47f9357f74b9d80308439acfb39da6d14c3d68a09be992d3636b99caf1ca
-  data.tar.gz: 950d148dc9e33d4d840c3d9187de1db39ebc0b2cabc046f334c8474202f180b4db9e0a65e8f9086f7856f3a858cc5fafae11ffe7f4788a0f77bdef9385ee0d0d
+  metadata.gz: 9cf36852e6c4387d6eb85ac8b9dafaced557033bc7be3004eae58ea22529155d08cd7e213d9cfb5a3f630e8ac84b04113e35d39a5f811388c1dcc339b56fc9b0
+  data.tar.gz: 156c61b56e014f810f45da42a7500a9ce6b5f937b090eb3d2f6e591c786441b0f51ffb0c5c353ba56e7ece4d9205546f6a9fad48d3bda726b6b6970f2e5ac102

data/README

@@ -23,9 +23,9 @@ after this in Irb and in Intar:
 
 === Subcommands
 
-  obj.method &      enter a sub-Intar
-  obj.each &        enter multiple sub-Intars
-  obj.method &x     enter a sub-Intar with variable x
+  obj.method !      enter a sub-Intar
+  obj.each !        enter multiple sub-Intars
+  obj.method !x     enter a sub-Intar with variable x
 
   \q                exit from the innermost sub-Intar
   \q!               exit from the innermost sub-Intar loop

data/lib/intar/prompt.rb

@@ -3,7 +3,7 @@
 #
 
 require "supplement"
-require "readline"
+require "reline"
 
 
 class Intar
@@ -12,23 +12,23 @@ class Intar
 
     def initialize histfile: nil, limit: nil
       @limit = limit.nonzero?
-      Readline::HISTORY.clear
+      Reline::HISTORY.clear
       @new = 0
     end
 
     def push text
-      Readline.pre_input_hook = proc {
-        Readline.insert_text text
-        Readline.redisplay
+      Reline.pre_input_hook = proc {
+        Reline.insert_text text
+        Reline.redisplay
       }
       nil
     end
 
     def ask prompt
       begin
-        Readline.readline prompt
+        Reline.readline prompt
       ensure
-        Readline.pre_input_hook = nil
+        Reline.pre_input_hook = nil
       end
     rescue Interrupt
       puts
@@ -39,21 +39,21 @@ class Intar
     end
 
     def last
-      Readline::HISTORY[-1] unless Readline::HISTORY.empty?
+      Reline::HISTORY[-1] unless Reline::HISTORY.empty?
     end
 
     def scan_history
-      i = Readline::HISTORY.length
+      i = Reline::HISTORY.length
       while i > 0 do
         i -= 1
-        yield Readline::HISTORY[i]
+        yield Reline::HISTORY[i]
       end
     end
 
     def push_history item
       item.empty? and return
       last != item or return
-      Readline::HISTORY.push item
+      Reline::HISTORY.push item
       @new += 1
     end
 
@@ -61,14 +61,14 @@ class Intar
       with_filepath filepath do |p|
         read_file_if p do |f|
           h = []
-          @new.times { h.push Readline::HISTORY.pop }
-          Readline::HISTORY.clear
+          @new.times { h.push Reline::HISTORY.pop }
+          Reline::HISTORY.clear
           f.each_line { |l|
             l.chomp!
             l.sub! "\r", "\n"
-            Readline::HISTORY.push l
+            Reline::HISTORY.push l
           }
-          Readline::HISTORY.push h.pop while h.any?
+          Reline::HISTORY.push h.pop while h.any?
         end
         nil
       end
@@ -86,9 +86,9 @@ class Intar
           end
           File.open p, "w" do |f|
             old.each { |l| f.puts l }
-            i = Readline::HISTORY.length - @new
-            while i < Readline::HISTORY.length do
-              l = Readline::HISTORY[ i].sub "\n", "\r"
+            i = Reline::HISTORY.length - @new
+            while i < Reline::HISTORY.length do
+              l = Reline::HISTORY[ i].sub "\n", "\r"
               f.puts l
               i += 1
             end
@@ -99,8 +99,8 @@ class Intar
     end
 
     def limit_history max
-      n = Readline::HISTORY.length - max
-      n.times { Readline::HISTORY.shift }
+      n = Reline::HISTORY.length - max
+      n.times { Reline::HISTORY.shift }
       @new > max and @new = max
       nil
     end

data/lib/intar/version.rb

@@ -4,7 +4,7 @@
 
 class Intar
 
-  VERSION = "2.12".freeze
+  VERSION = "2.14".freeze
 
 end
 

data/lib/intar.rb

@@ -40,9 +40,7 @@ everywhere inside your Ruby program.
 
 
 class Object
-  def intar_binding
-    binding
-  end
+  def empty_binding ; binding ; end
 end
 
 
@@ -50,15 +48,21 @@ class Intar
 
   class <<self
 
-    def open obj = nil, **params
+    def open obj = main, **params
       i = new obj, **params
       yield i
     end
 
-    def run obj = nil, **params
+    def run obj = main, **params
       open obj, **params do |i| i.run end
     end
 
+    private
+
+    def main
+      TOPLEVEL_BINDING.eval "self"
+    end
+
   end
 
 
@@ -74,25 +78,33 @@ class Intar
     histmax:    500,
   }
 
-  @@current = nil
 
-  attr_reader :params, :prompt, :depth, :n, :binding
+  private
+
+  @@prev = nil
+
+  SET_BINDING = "proc { |_| _.instance_eval { binding } }"
+
   def initialize obj = nil, **params
-    @obj = obj.nil? ? (eval "self", TOPLEVEL_BINDING) : obj
-    if @@current then
-      @params  = @@current.params
-      @prompt  = @@current.prompt
-      @depth   = @@current.depth + 1
-      @binding = @@current.binding
+    @obj = obj
+    @n = 1
+    if @@prev then
+      @params = @@prev.params
+      @prompt = @@prev.prompt
+      @depth  = @@prev.depth + 1
+      sb      = @@prev.execute SET_BINDING
     else
       @params = DEFAULTS.dup.update params
       @prompt = Prompt.new
-      @depth = 0
-      @binding = @obj.intar_binding
+      @depth  = 0
+      sb      = empty_binding.eval SET_BINDING
     end
-    @n = 1
+    @binding = sb.call @obj
   end
 
+  public
+
+  attr_reader :params, :prompt, :depth, :n, :obj
 
   class Clear  < Exception ; end
   class Quit   < Exception ; end
@@ -103,7 +115,7 @@ class Intar
   def run
     handle_history do
       set_current do
-        oldset = eval OLDSET, @binding
+        execute OLD_INIT
         loop do
           l = readline
           l or break
@@ -135,15 +147,17 @@ class Intar
             r = $!
             show_exception
           end
-          oldset.call r, @n
+          (execute OLD_SET).call r, @n
           @n += 1
         end
+      ensure
+        execute OLD_INIT
       end
     end
   end
 
   def execute code
-    eval code, @binding, "#{self.class}/execute"
+    @binding.eval code, @file||"#{self.class}/execute"
   end
 
   def set_var name, val
@@ -154,10 +168,10 @@ class Intar
   private
 
   def eval_line l
-    ls = l.sub %r/\s+&(\w+)?\s*\z/ do
+    ls = l.sub %r/\s+!(\w+)?\s*\z/ do
       <<~EOT
         \ do |obj|
-          Intar.open #{"obj " unless $1}do |i|
+          Intar.open #{$1 ? "self" : "obj"} do |i|
             #{"# " unless $1}i.set_var "#$1", obj
             i.run
           end
@@ -166,7 +180,7 @@ class Intar
         end
       EOT
     end
-    @redir.redirect_output do eval ls, @binding, @file end
+    @redir.redirect_output do execute ls end
   end
 
   def handle_history
@@ -183,10 +197,10 @@ class Intar
   end
 
   def set_current
-    old, @@current = @@current, self
+    old, @@prev = @@prev, self
     yield
   ensure
-    @@current = old
+    @@prev = old
   end
 
   def find_redirect line
@@ -196,8 +210,11 @@ class Intar
   end
 
 
-  OLDSET = <<~EOT
+  OLD_INIT = <<~EOT
     _, __, ___ = nil, nil, nil
+  EOT
+
+  OLD_SET = <<~EOT
     proc { |r,n|
       Array === __ or __ = []
       Hash === ___ or ___ = {}
@@ -331,7 +348,7 @@ class Intar
   def eval_param l
     eot = "EOT0001"
     eot.succ! while l[ eot]
-    l = eval "<<#{eot}\n#{l}\n#{eot}", @binding, @file
+    l = execute "<<#{eot}\n#{l}\n#{eot}"
     l.strip!
     l.notempty?
   end
@@ -549,7 +566,7 @@ class Intar
     x or raise Failed, "No input file given."
     l = File.read x
     @redir.redirect_output do
-      eval l, @binding, x
+      @binding.eval l, x
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intar
 version: !ruby/object:Gem::Version
-  version: '2.12'
+  version: '2.14'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2023-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appl
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: reline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: 'This is a lean replacement for Irb.
 
   '