livetext 0.8.79 → 0.8.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b10afcc4cb31c7ee535b019ad71dceb81642288b
-  data.tar.gz: 31071b49e22b3a45638588cfc626364e47a1c205
+SHA256:
+  metadata.gz: 326f2e6a0599793edfe3db620a0e00a68516422615962fbb6cb0b814ceff04da
+  data.tar.gz: 2d58bd744f5756c4b844d1127e29c079a6e35cb1ae9999f79bce2dc2aac14062
 SHA512:
-  metadata.gz: 6174fa5fd3f5c0b4169adf59f89fe8aa438d324819ddb382210cf6e1ef3a4f26a2120f69d9c3fd8d85dcd709a081cdfb6ba35a68ae1be2c94958c95751718678
-  data.tar.gz: 2ff43baa577625b28d82b7ba2dcfaee894216124de6ed60c4252369dd28f158dc94141954d7b92243acd57469eee9f6e6af319bf691900bc3c82a705c916496c
+  metadata.gz: a6662f81750092b1c51388c98f2ed72c282a7f295ad1a6d9e26f11536567515e15776b1b760ed7134783ed63f3eaa8754a871b05a8cd1e76b71522377973ff95
+  data.tar.gz: e0d711da1a52bb922fc2a07f9e1aee454bf759cb2d48eb49763f896001a6a95e5a18b1ddabaebd4709dbc8a582286f41075800856d47963d5349e303af36c955

data/lib/formatline.rb

@@ -40,7 +40,7 @@ class FormatLine
   def self.parse!(line, context = nil)
     return nil if line.nil?
     x = self.new(line.chomp, context)
-t = x.tokenize(line)
+    t = x.tokenize(line)
     x.evaluate    # (context)
   end
 
@@ -79,8 +79,6 @@ t = x.tokenize(line)
       break if token.nil? 
       sym, val = *token
       case sym
-        when :ddot
-          return [@out, val]
         when :str
           @out << val unless val == "\n"   # BUG
         when :var
@@ -100,7 +98,7 @@ t = x.tokenize(line)
       end
       token = gen.next
     end
-    [@out, nil]
+    @out
   end
 
   def curr
@@ -191,7 +189,7 @@ t = x.tokenize(line)
       when " "; add "$ "; add_token :str
       when nil; add "$";  add_token :str
       when "$"; double_dollar
-      when "."; dollar_dot
+#     when "."; dollar_dot
       when /[A-Za-z]/
        add_token :str
         var = curr + grab_alpha
@@ -220,9 +218,9 @@ t = x.tokenize(line)
     end
   end
 
-  def dollar_dot
-    add_token :ddot, @line[@i..-1]
-  end
+# def dollar_dot
+#   add_token :ddot, @line[@i..-1]
+# end
 
   def marker(char)
     add_token :str

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.79"
+  VERSION = "0.8.80"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -22,7 +22,7 @@ class Livetext
 
   attr_reader :main, :context
   attr_accessor :no_puts
-  attr_accessor :body
+  attr_accessor :body, :indentation
 
   # FIXME - phase out stupid 'parameters' method
 
@@ -41,6 +41,7 @@ class Livetext
     @no_puts = output.nil?
     @body = ""
     @main = Processor.new(self, output)
+    @indentation = [0]
   end
 
   def process_line(line, context=nil)
@@ -48,15 +49,22 @@ class Livetext
     @context = context
     nomarkup = true
     # FIXME inefficient
-    scomment  = rx(Sigil, Livetext::Space)  # apply these in order
-    sname     = rx(Sigil)
-    if line =~ scomment
-      handle_scomment(line)
-    elsif line =~ sname 
-      handle_dotcmd(line)
+    comment  = rx(Sigil, Livetext::Space)  # apply these in order
+    dotcmd   = rx(Sigil)
+    ddotcmd  = /^ *\$\.[A-Za-z]/
+    case line
+      when comment
+        handle_scomment(line)
+      when dotcmd
+        handle_dotcmd(line)
+      when ddotcmd
+        indent = line.index("$") + 1
+        @indentation.push(indent)
+        line.sub!(/^ *\$/, "")
+        handle_dotcmd(line)
+        indentation.pop
     else
       @main._passthru(line, context)
-      # Can output extra line(s) in $. scenario
     end
   end
 
@@ -161,7 +169,8 @@ class Livetext
     name = _check_name(name)
   end
 
-  def handle_dotcmd(line)
+  def handle_dotcmd(line, indent = 0)
+    indent = @indentation.last # top of stack
     name = _get_name(line)
     result = nil
     if @main.respond_to?(name)

data/lib/processor.rb

@@ -24,6 +24,7 @@ class Livetext
       # Meh?
       @output = ::Livetext.output = (output || File.open("/dev/null", "w"))
       @sources = []
+      @indentation = @parent.indentation
     end
 
     def output=(io)
@@ -34,7 +35,7 @@ class Livetext
       where = @sources.last || @save_location
       puts @parent.body
       STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
-      STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
+#     STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
       exit if abort
     end
 

data/lib/standard.rb

@@ -165,11 +165,22 @@ module Livetext::Standard
 
   def heredoc
     var = @_args[0]
-# STDERR.puts "var = #{var.inspect}"
     str = _body_text
-# STDERR.puts "str = #{str.inspect}"
-    Livetext::Vars[var] = str
-# STDERR.puts "vars = #{Livetext::Vars.inspect}"
+    indent = @parent.indentation.last
+    indented = " " * indent
+    #  s2 = ""
+    #  str.each_line do |line|
+    #    if line.start_with?(indented)
+    #      line.replace(line[indent..-1])
+    #    else
+    #      STDERR.puts "Error? heredoc not indented?"
+    #      return
+    #    end
+    #    s2 << line
+    #  end
+    s2 = str
+    Livetext::Vars[var.to_sym] = s2
+    Livetext::Vars[var] = s2           # FIXME
     _optional_blank_line
   end
 
@@ -200,7 +211,6 @@ module Livetext::Standard
     meths = grab_file(file)
     modname = name.gsub("/","_").capitalize
     string = "module ::#{modname}\n#{meths}\nend"
-# puts string   # .inspect
     eval(string)
     newmod = Object.const_get("::" + modname)
     self.extend(newmod)

data/lib/userapi.rb

@@ -37,8 +37,11 @@ module Livetext::UserAPI
   end
 
   def _end?(str)
+    indent = ""
+    indent = " " * (@parent.indentation.last - 1)
+    indent << "$" unless indent.empty?
     return false if str.nil?
-    cmd = Livetext::Sigil + "end"
+    cmd = indent + Livetext::Sigil + "end"
     return false if str.index(cmd) != 0 
     return false unless _trailing?(str[5])
     return true
@@ -80,8 +83,8 @@ module Livetext::UserAPI
       lines
     end
   rescue => err
-p err.inspect
-puts err.backtrace
+  p err.inspect
+  puts err.backtrace
     _error!("Expecting .end, found end of file")
   end
 
@@ -102,32 +105,17 @@ puts err.backtrace
   end
 
   def _format(line, context = nil)
-    return ["", nil] if line == "\n"
-    l2 = FormatLine.parse!(line, context)
-    line1, line2 = *l2
-    line.replace(line1) unless line.nil?
+    return "" if line == "\n"
+    line2 = FormatLine.parse!(line, context)
+    line.replace(line2) unless line.nil?
     line
   end
 
-  def _format!(line, context = nil)
-    return ["", nil] if line == "\n"
-    l2 = FormatLine.parse!(line, context)
-    # maybe move fix back toward parse! ?
-    line1, line2 = *l2
-    line2 = line2.dup
-    line.replace(line1) unless line.nil?
-    line2 = @parent.handle_dotcmd(line2) unless line2.nil?
-    [line, line2]
-  end
-
   def _passthru(line, context = nil)
     return if @_nopass
     _out "<p>" if line == "\n" and ! @_nopara
-    line, line2 = *_format!(line, context)
-p line
-p line2
+    line = _format(line, context)
     _out line
-    _out line2
   end
 
   def _out(str = "")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.79
+  version: 0.8.80
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-28 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A smart processor for text