intar 2.15 → 2.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33d3b8a846784d28dd22d4d7b2bc8ae58885e80581457b5de57974db4bb86967
-  data.tar.gz: 7ce97b2ca8e36d0eb8ba68ce289c36e9de94f7a479c6b4ed24f6529030d621a9
+  metadata.gz: 65941b687800d76ae7bba2e690b56ba94f30ca1ccd78650db345a0fb8cc60891
+  data.tar.gz: 231b81799431f3a33b00139f57b3c83f42a261238d1c46342a349fafbfea3e68
 SHA512:
-  metadata.gz: ba549858060a566243199d3404a5231e1496ace0fd5f2ffa0336d55b4bf528a355ea78c0294de80027bf243a4d0c0f4c25159caa942f0d9db1fae1a2b10bce22
-  data.tar.gz: 827d0d193fcdf092e3b5c79b0e67dca0763e1ee46f34cd70f70a0921d117729191017895219eaf2ce93a5e0a2144172f2bbcaeff221314b45a1dd7ae2856b4bf
+  metadata.gz: 9c2732ba6af248d47aeb7d29ee98de5ae78c4cec84ba20865c15740ac6b0d9b1b688d05a1f72d34c44874267d7ac0477980707a29840280721b425729d30b3c5
+  data.tar.gz: '0285277cabae513ff717d452f8017c7dfade0e80c3c7648633c066cbeca70b4d695bd73e1230f8f3aaaa83211bcb632a6cd64906c803a09b30a48c01097b2a5f'

data/README

@@ -23,15 +23,17 @@ 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 do &       enter a sub-Intar
+  obj.method { &        enter a sub-Intar
+  obj.each { &          enter multiple sub-Intars
+  obj.method { |x| &    enter a sub-Intar with variable x
+  obj.method { |x,y| &  enter a sub-Intar with multiple variables
 
-  \q                exit from the innermost sub-Intar
-  \q!               exit from the innermost sub-Intar loop
-  \q!!              exit from all levels
+  \q                    exit from the innermost sub-Intar
+  \q!                   exit from the innermost sub-Intar loop
+  \q!!                  exit from all levels
 
-  \h                get a list of all subcommands
+  \h                    get a list of all subcommands
 
 
 

data/lib/intar/version.rb

@@ -4,7 +4,7 @@
 
 class Intar
 
-  VERSION = "2.15".freeze
+  VERSION = "2.16.1".freeze
 
 end
 

data/lib/intar.rb

@@ -116,6 +116,7 @@ class Intar
     handle_history do
       set_current do
         execute OLD_INIT
+        r = nil
         loop do
           l = readline
           l or break
@@ -150,6 +151,7 @@ class Intar
           (execute OLD_SET).call r, @n
           @n += 1
         end
+        r
       ensure
         execute OLD_INIT
       end
@@ -168,19 +170,35 @@ class Intar
   private
 
   def eval_line l
-    ls = l.sub %r/\s+\+>(\w+)?\s*\z/ do
-      <<~EOT
-        \ do |obj|
-          Intar.open #{$1 ? "self" : "obj"} do |i|
-            #{"# " unless $1}i.set_var "#$1", obj
-            i.run
-          end
-        rescue Intar::Break
-          break
+    if l =~ %r/\s*(?:\{|\bdo)\s*(?:\|([a-z0-9_,]*)\|)?\s*&\z/ then
+      cmd = $`
+      argl = $1
+      if argl.notempty? then
+        s = (argl.split ",").map { |a|
+          break unless a =~ /\A[a-z][a-z0-9_]*\z/
+          %Q((_i.set_var "#{a}", #{a}))
+        }
+        if s then
+          sets = s.join "; "
+          iobj = "self"
         end
-      EOT
+      else
+        argl = iobj = "obj"
+      end
+      if iobj then
+        l = cmd + <<~EOT
+          \ do |#{argl}|
+            Intar.open #{iobj} do |_i|
+              #{sets}
+              _i.run
+            end
+          rescue Intar::Break
+            break
+          end
+        EOT
+      end
     end
-    @redir.redirect_output do execute ls end
+    @redir.redirect_output do execute l end
   end
 
   def handle_history

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intar
 version: !ruby/object:Gem::Version
-  version: '2.15'
+  version: 2.16.1
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appl
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby and some small Gems; Readline
-rubygems_version: 3.4.20
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Interactive Ruby