livetext 0.8.96 → 0.8.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61efdb7cdd7d3a5c6597796d18922ba7f405c7b421a35d7b8708031a3a1d56c3
-  data.tar.gz: f6452c5a4bc7c1c28154774e9847a6502072be8e63ecb33ba6e85799452c10a0
+  metadata.gz: 42bc8ee5bb8b06789cb472fb038081a29fb00fce64583248ffe15f66cd88b9c8
+  data.tar.gz: 7a4acc91072072ae4dffe193ce4e410ecd7251ebe323fb3c038f76e8da5ee6d9
 SHA512:
-  metadata.gz: cc2c1c48f54e7411a9f6571256fa8ba1612d7e056010440a86be6d4038b1593c3771032f9305024d9fa0adfdc6543893a0f4183b435c22aab66cd40684b679e8
-  data.tar.gz: d45545ba38eec5669650e7171c285acc1627599fadce73cb80b5c3c7b38e9ef01be1d12ca4bbfd54e89d8e9c6b8e45b7779b7685cdb46812b64a5f6dae6471f4
+  metadata.gz: bd8c49581292b3fbf9a25849f0a3403f29dc73ac4e81bb115ef471a5fab413665e32d763b67571f6ecf095b273b36acdc61ff1790c5522d00c3b9de676395e38
+  data.tar.gz: 4573738653920bd64d296e3f9d65f909a10bf438942dabb0b92aac07a2f0d207e33bf5ed00ea5d89db8adcdd9fa655846f936c3ef11e19b13e14b005a53f8896

data/lib/formatline.rb

@@ -51,13 +51,11 @@ class FormatLine
     loop do 
       case curr
         when Escape; grab; add curr; grab; add curr
-# puts "Found #{curr.inspect}"
         when "$"
           dollar
         when "*", "_", "`", "~"
           marker curr
           add curr
-#         grab
         when LF
           break if @i >= line.size - 1
         when nil

data/lib/functions.rb

@@ -22,7 +22,6 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
   end
 
   def rand(param=nil)
-# STDERR.puts "param = #{param.inspect}"
     n1, n2 = param.split.map(&:to_i)
     ::Kernel.rand(n1..n2).to_s
   end

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.96"
+  VERSION = "0.8.97"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -34,6 +34,14 @@ class Livetext
   Space = " "
   Sigil = "." # Can't change yet
 
+  def self.rx(str, space=nil)
+    Regexp.compile("^" + Regexp.escape(str) + "#{space}")
+  end
+
+  Comment  = rx(Sigil, Livetext::Space)
+  Dotcmd   = rx(Sigil)
+  Ddotcmd  = /^ *\$\.[A-Za-z]/
+
   def initialize(output = ::STDOUT)
     @source = nil
     @_mixins = []
@@ -63,18 +71,14 @@ class Livetext
     _setvar(:File, file)
   end
 
-  def process_line(line)
+  def process_line(line)  # FIXME inefficient?
     nomarkup = true
-    # FIXME inefficient
-    comment  = rx(Sigil, Livetext::Space)  # apply these in order
-    dotcmd   = rx(Sigil)
-    ddotcmd  = /^ *\$\.[A-Za-z]/
-    case line
-      when comment
+    case line  # must apply these in order
+      when Comment
         handle_scomment(line)
-      when dotcmd
+      when Dotcmd
         handle_dotcmd(line)
-      when ddotcmd
+      when Ddotcmd
         indent = line.index("$") + 1
         @indentation.push(indent)
         line.sub!(/^ *\$/, "")
@@ -97,7 +101,23 @@ class Livetext
     end
   end
 
-  def xform_file(file)
+  # EXPERIMENTAL and incomplete
+  def xform(*args, file: nil, text: nil, vars: nil)
+    case
+      when file && text.nil?
+        xform_file(file)
+      when file.nil? && text
+      when file.nil? && text.nil?
+        raise "Must specify file or text"
+      when file && text
+        raise "Cannot specify file and text"
+    end
+    self.process_file(file)
+    self.body
+  end
+
+  def xform_file(file, vars: nil)
+    Livetext::Vars.replace(vars) unless vars.nil?
     self.process_file(file)
     self.body
   end
@@ -106,7 +126,7 @@ class Livetext
     _setfile!("(string)")
     @output = ::Livetext.output
     enum = text.each_line
-    front = text.match(/.*?\n/).to_a.first.chomp
+    front = text.match(/.*?\n/).to_a.first.chomp  rescue "..."
     @main.source(enum, "STDIN: '#{front}...'", 0)
     loop do 
       line = @main.nextline
@@ -135,8 +155,8 @@ class Livetext
   rescue => err
     puts "process_text: err = #{err}"
 #   puts err.backtrace.join("\n")
-  puts @body
-  @body = ""
+    puts @body
+    @body = ""
     return @body
   end
 
@@ -176,18 +196,13 @@ class Livetext
     @main.finalize if @main.respond_to? :finalize
   end
 
-  def rx(str, space=nil)
-    Regexp.compile("^" + Regexp.escape(str) + "#{space}")
-  end
-
   def handle_scomment(line)
   end
 
   def _check_name(name)
     @main._error! "Name '#{name}' is not permitted" if @main._disallowed?(name)
-    name = "_def" if name == "def"
-    name = "_include" if name == "include"
     @main._error! "Mismatched 'end'" if name == "end"
+    name = "_" + name if %w[def include].include?(name)
     name
   end
 
@@ -211,8 +226,8 @@ class Livetext
     result
   rescue => err
     @main._error!(err)
-  puts @body
-  @body = ""
+    puts @body
+    @body = ""
     return @body
   end
 

data/lib/processor.rb

@@ -34,7 +34,6 @@ class Livetext
 
     def _error!(err, abort=true, trace=false)
       where = @sources.last || @save_location
-#     puts "-- body = "
       puts @parent.body
       STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
       STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace

data/lib/standard.rb

@@ -99,7 +99,6 @@ EOS
     eval str
   rescue => err
     _error!(err)
-#   puts @body
   end
 
   def set
@@ -109,7 +108,6 @@ EOS
     # FIXME *Must* allow for vars/functions
     assigns.each do |a| 
       var, val = a.split("=")
-# STDERR.puts "-- var=val  #{[var, val].inspect}"
       var.strip!
       val.strip!
       val = val[1..-2] if val[0] == ?" && val[-1] == ?"
@@ -222,17 +220,6 @@ EOS
     end
     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
-# STDERR.puts "HERE: #{var} = #{s2.chomp.inspect}"
     @parent._setvar(var, s2.chomp)
     _optional_blank_line
   end
@@ -263,7 +250,6 @@ EOS
     # like include, but search upward as needed
     file = @_args.first
 		file = _seek(file)
-# STDERR.puts "---- _seek found: #{file.inspect}"
     _error!(file, "No such include file '#{file}'") unless file
     @parent.process_file(file)
     _optional_blank_line

data/lib/userapi.rb

@@ -45,9 +45,7 @@ module Livetext::UserAPI
   end
 
   def _end?(str)
-    str = str.dup
-    str.gsub!(/^ */, "")
-    return true if str == ".end" || str == "$.end"
+    return true if str == ".end" || str =~ / *\$\.end/
     return false
   end
 
@@ -70,24 +68,19 @@ module Livetext::UserAPI
   end
 
   def _body(raw=false)
-    lines = []
-#   @save_location = @sources.last
+    lines = []      #   @save_location = @sources.last
     end_found = false
     loop do
       @line = nextline
       break if @line.nil?
       @line.chomp!
-# STDERR.puts "LINE = #{@line.inspect}"
-      if _end?(@line)
-        end_found = true
-        break 
-      end
-      next if _comment?(@line)
-      # FIXME Will cause problem with $. ?
+      end_found = _end?(@line)
+      break if end_found 
+      next if _comment?(@line)  # FIXME Will cause problem with $. ?
       @line = _format(@line) unless raw
       lines << @line 
     end
-    raise "this stupid error again" unless end_found
+
     _optional_blank_line
     if block_given?
       lines.each {|line| yield line }   # FIXME what about $. ?

data/plugin/tutorial.rb

@@ -9,14 +9,9 @@ def section
 end
 
 def code
-# _out "<pre>"
   first = true  # dumb hack! fixes blank space
   _body do |line| 
-    if first
-      tag = "<pre>"
-      first = false
-    else
-    end
+    tag, first = "<pre>", false if first
     _out "#{tag}   #{::CGI.escape_html(line)}"   # indentation
   end
   _out "</pre>"
@@ -34,7 +29,7 @@ def inout
   t1 = t1.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
   t2 = t2.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
 
-  puts <<-HTML
+  _out <<-HTML
     <table width=80% cellpadding=4>
     <tr>
       <td width=50%><b>Input</b></td>
@@ -58,7 +53,7 @@ def put_table(src, exp)
   t1 = t1.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
   t2 = t2.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
 
-  puts <<-HTML
+  _out <<-HTML
     <font size=+1>
     <table width=80% cellpadding=4>
     <tr>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.96
+  version: 0.8.97
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com