livetext 0.9.48 → 0.9.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91574e23cbcbe19d5c06d7c1fbbe8fbbe33ca29b06511da502b532bbb28519c6
-  data.tar.gz: 553612fc90e8a6f3676158c3e98997415d0b568fb811fc9d273f8a2ae47478b0
+  metadata.gz: 8776c069073a940abd8ba05f8a16f30422eef3f1bb1e4c80faf61ec5708e163e
+  data.tar.gz: 9362abfe17f905ce154a940722f7cd15310549e3edaee35cd598c70df783a8e8
 SHA512:
-  metadata.gz: 909f58be5cd6ee9d11262bb7213d2fab733d379ac678953c0e0225486cdc7a24152b8f5e5b208f2522bf4ea629abd9597c14b3cce1988b19c89b3b92d96f729b
-  data.tar.gz: e6e9aaec3cba4d466601d9b4d2f2d96bbb3c3697640684d96c23d70b41843d6a5674a4f41e659355df45a72c59842f7e91df44c76455a430425836db17f1e8e7
+  metadata.gz: eccc4cded320e34b4d6db33eaee2cd3b6a0293e0e0907c6498d31fa2da1fe8d672ad3d7acae6160f858c8f0cd6e8f1302d647b00b8d3b1c1645d4cce53897d65
+  data.tar.gz: 8bf1348d9f97446d6f201e52b5759594a8f2608880bcefd4cbcb4b07a0e6d9934f4bf9f0b7a54f94524c6b932fa0999bd920fb23154d6c95fc052e00de949941

data/lib/livetext/core.rb

@@ -55,6 +55,7 @@ class Livetext
     @no_puts = output.nil?
     @body = ""
     @main = Processor.new(self, output)  # nil = make @main its own parent??
+    @parent = @main
     @indentation = [0]
     @_vars = Livetext::Vars
     @api = UserAPI.new(self)
@@ -86,14 +87,16 @@ class Livetext
   end
 
   def inspect
+   api_abbr  = @api ? "(non-nil)" : "(not shown)"
+   main_abbr = @main ? "(non-nil)" : "(not shown)"
     "Livetext:\n" + 
     "  source = #{@source.inspect}\n" +
     "  mixins = #{@_mixins.inspect}\n" + 
     "  import = #{@_mixins.inspect}\n" + 
-    "  main   = (not shown)\n" + 
+    "  main   = #{main_abbr}\n" + 
     "  indent = #{@indentation.inspect}\n" + 
     "  vars   = #{@_vars.inspect}\n" + 
-    "  api    = (not shown)\n" +
+    "  api    = #{api_abbr}\n" +
     "  body   = (#{@body.size} bytes)"
   end
 

data/lib/livetext/helpers.rb

@@ -73,7 +73,6 @@ module Livetext::Helpers
 ## FIXME process_file[!] should call process[_text] ?
 
   def process_file(fname, btrace=false)
-checkpoint "fname = #{fname.inspect}"
     unless File.exist?(fname)
       api.dump
       raise FileNotFound(fname) 
@@ -126,7 +125,6 @@ checkpoint "fname = #{fname.inspect}"
     api.data = data0.dup   # should permit _ in function names at least
     args0 = data0.split
     api.args = args0.dup
-checkpoint "name = #{name} args = #{args0.inspect}"
     retval = @main.send(name)  # , *args)      # was 125
     retval
   rescue => err
@@ -173,7 +171,7 @@ checkpoint "name = #{name} args = #{args0.inspect}"
     friendly_error DisallowedName(name) if disallowed?(name)
   end
 
-  def check_file_exists(file)
+  def file_exists?(file)
     return File.exist?(file)
   end
 

data/lib/livetext/standard.rb

@@ -11,6 +11,7 @@ make_exception(:FileNotFound,     "Error: file '%1' not found")
 # Module Standard comprises most of the standard or "common" methods.
 
 module Livetext::Standard
+  include Livetext::GlobalHelpers
   include Livetext::Helpers
 
   TTY = ::File.open("/dev/tty", "w")
@@ -211,8 +212,8 @@ module Livetext::Standard
       str = api.format(line.chomp)
       rhs << str + "<br>\n"
     end
-    indent = @parent.indentation.last
-    indented = " " * indent
+    # indent = @parent.indentation.last
+    # indented = " " * indent
     api.setvar(var, rhs.chomp)
     api.optional_blank_line
   end
@@ -225,8 +226,8 @@ module Livetext::Standard
       str = api.format(line.chomp)
       rhs << str + "\n"
     end
-    indent = @parent.indentation.last
-    indented = " " * indent
+    # indent = @parent.indentation.last
+    # indented = " " * indent
     api.setvar(var, rhs.chomp)
     api.optional_blank_line
   end
@@ -256,7 +257,6 @@ module Livetext::Standard
   def dot_include(args = nil, body = nil)   # dot command
     file = api.expand_variables(api.args.first)  # allows for variables
     check_file_exists(file)
-checkpoint 
     @parent.process_file(file)
     api.optional_blank_line
   end
@@ -299,7 +299,7 @@ checkpoint
 
   def copy(args = nil, body = nil)
     file = api.args.first
-    ok = check_file_exists(file)
+    ok = file_exists?(file)
 
     self.parent.graceful_error FileNotFound(file) unless ok   # FIXME seems weird?
       api.out grab_file(file)

data/lib/livetext/userapi.rb

@@ -15,6 +15,7 @@ class Livetext::UserAPI
 
   def initialize(live)  # Livetext::UserAPI
     @live = live
+    @parent = live   # FIXME experiment related to runeblog error
     @vars = live.vars
     @html = Livetext::HTML.new(self)
     @expander = Livetext::Expansion.new(live)

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.48"
+  VERSION = "0.9.49"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.48
+  version: 0.9.49
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-25 00:00:00.000000000 Z
+date: 2024-11-07 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com