livetext 0.8.80 → 0.8.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 326f2e6a0599793edfe3db620a0e00a68516422615962fbb6cb0b814ceff04da
-  data.tar.gz: 2d58bd744f5756c4b844d1127e29c079a6e35cb1ae9999f79bce2dc2aac14062
+  metadata.gz: ef8d4d20d509f85b02f3bec9fd06a3e9d6f54968b634b386bea7baa1c84eeb47
+  data.tar.gz: 926e1b7cf4f8e0aa1b9ee13bea39a31d59a79a606bcd13d5dcb3135d02a23c6b
 SHA512:
-  metadata.gz: a6662f81750092b1c51388c98f2ed72c282a7f295ad1a6d9e26f11536567515e15776b1b760ed7134783ed63f3eaa8754a871b05a8cd1e76b71522377973ff95
-  data.tar.gz: e0d711da1a52bb922fc2a07f9e1aee454bf759cb2d48eb49763f896001a6a95e5a18b1ddabaebd4709dbc8a582286f41075800856d47963d5349e303af36c955
+  metadata.gz: d8b95158a230fba31c2d0226e8bec2d778ae9a569c9cb9fd0af97b6b5788dcb6618adcf52777d383d1a4cab1d140dafe5f3a257693c48fe6c51ca9050a7d9cd3
+  data.tar.gz: 9d27ab12a8166ca694fd9248a3c7e37b62dec3642a00090f3ae71718785bb4f1ab74f1113afc9c89aaf44cade6c7084a63abce9f2bded440b5723cd33d958e78

data/lib/formatline.rb

@@ -27,6 +27,7 @@ class FormatLine
   end
 
   attr_reader :out
+  attr_reader :tokenlist
 
   def initialize(line, context=nil)
     context ||= binding
@@ -54,7 +55,10 @@ class FormatLine
         when "*", "_", "`", "~"
           marker curr
           add curr
-        when LF, nil
+#         grab
+        when LF
+          break if @i >= line.size - 1
+        when nil
           break
         else
           add curr
@@ -65,6 +69,29 @@ class FormatLine
     @tokenlist
   end
 
+  def self.var_func_parse(str, context = nil)
+    return nil if str.nil?
+    x = self.new(str.chomp, context)
+#   t = x.tokenize(line)
+    x.grab
+    loop do 
+      case x.curr
+        when Escape; x.go; x.add x.curr; x.grab
+        when "$"
+          x.dollar
+        when LF, nil
+          break
+        else
+          x.add x.curr
+      end
+      x.grab
+    end
+    x.add_token(:str)
+    # built tokenlist
+#  x.tokenlist.each {|pair| puts "  #{pair.inspect}" }
+    x.evaluate    # (context)
+  end
+
   def embed(sym, str)
     pre, post = SimpleFormats[sym]
     pre + str + post
@@ -89,9 +116,11 @@ class FormatLine
           if [:colon, :brackets].include? arg[0] 
             arg = gen.next  # for real
             param = arg[1]
+            param = FormatLine.var_func_parse(param)
           end
           @out << funcall(val, param)
         when :b, :i, :t, :s
+          val = FormatLine.var_func_parse(val)
           @out << embed(sym, val)
       else
         add_token :str

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.80"
+  VERSION = "0.8.81"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 

data/lib/processor.rb

@@ -48,10 +48,12 @@ class Livetext
     end
 
     def peek_nextline
-      @sources.last[0].peek
+      line = @sources.last[0].peek
     rescue StopIteration
       @sources.pop
       nil
+    rescue 
+      nil
     end
 
     def nextline

data/lib/standard.rb

@@ -67,9 +67,9 @@ module Livetext::Standard
   def banner
     str = _format(@_data)
     n = str.length - 1
-    _errout "-"*n
-    _errout str
-    _errout "-"*n
+    puts "-"*n
+    puts str
+    puts "-"*n
   end
 
   def quit
@@ -143,7 +143,7 @@ module Livetext::Standard
     str = "def #{name}\n"
     raise "Illegal name '#{name}'" if _disallowed?(name)
     str += _body_text(true)
-    str += "end\n"
+    str += "\nend\n"
     eval str
   rescue => err
     _error!(err)
@@ -153,10 +153,14 @@ module Livetext::Standard
   def set
     assigns = @_data.chomp.split(/, */)
     # Do a better way?
+    # FIXME *Must* allow for vars/functions
     assigns.each do |a| 
       var, val = a.split("=")
-      val = val[1..-2] if val[0] == ?" and val[-1] == ?"
-      val = val[1..-2] if val[0] == ?' and val[-1] == ?'
+      var.strip!
+      val.strip!
+      val = val[1..-2] if val[0] == ?" && val[-1] == ?"
+      val = val[1..-2] if val[0] == ?' && val[-1] == ?'
+      val = FormatLine.var_func_parse(val)
       Livetext::Vars[var.to_sym] = val
       Livetext::Vars[var] = val         # FIXME
     end
@@ -166,6 +170,10 @@ module Livetext::Standard
   def heredoc
     var = @_args[0]
     str = _body_text
+    s2 = ""
+    str.each_line do |s|
+      s2 << s.chomp + "<br>"
+    end
     indent = @parent.indentation.last
     indented = " " * indent
     #  s2 = ""
@@ -178,9 +186,8 @@ module Livetext::Standard
     #    end
     #    s2 << line
     #  end
-    s2 = str
     Livetext::Vars[var.to_sym] = s2
-    Livetext::Vars[var] = s2           # FIXME
+    Livetext::Vars[var] = s2.chomp      # FIXME?
     _optional_blank_line
   end
 
@@ -211,6 +218,9 @@ module Livetext::Standard
     meths = grab_file(file)
     modname = name.gsub("/","_").capitalize
     string = "module ::#{modname}\n#{meths}\nend"
+# puts "==========="
+# string.each_line.with_index {|line, i| puts "#{'%3d' % (i+1)} : #{line}" }
+# puts "==========="
     eval(string)
     newmod = Object.const_get("::" + modname)
     self.extend(newmod)

data/lib/userapi.rb

@@ -21,7 +21,9 @@ module Livetext::UserAPI
   end
 
   def _optional_blank_line
-    @line = nextline if peek_nextline =~ /^ *$/
+    peek = peek_nextline
+    return if peek.nil?
+    @line = nextline if peek =~ /^ *$/
   end
 
   def _comment?(str)
@@ -38,8 +40,10 @@ module Livetext::UserAPI
 
   def _end?(str)
     indent = ""
-    indent = " " * (@parent.indentation.last - 1)
-    indent << "$" unless indent.empty?
+#   n = @parent.indentation.last - 1
+#   n = 0 if n < 0  # Gahhh FIXM
+#   indent = " " * n
+#   indent << "$" unless indent.empty?
     return false if str.nil?
     cmd = indent + Livetext::Sigil + "end"
     return false if str.index(cmd) != 0 
@@ -67,15 +71,22 @@ module Livetext::UserAPI
   def _body(raw=false)
     lines = []
     @save_location = @sources.last
+    end_found = false
     loop do
       @line = nextline
-      raise if @line.nil?
-      break if _end?(@line)
+# puts "--- loop: @line = #{@line.inspect}"
+      break if @line.nil?
+      @line.chomp!
+      if _end?(@line)
+        end_found = true
+        break 
+      end
       next if _comment?(@line)
       # FIXME Will cause problem with $. ?
       @line = _format(@line) unless raw
       lines << @line 
     end
+    raise unless end_found
     _optional_blank_line
     if block_given?
       lines.each {|line| yield line }   # FIXME what about $. ?
@@ -83,13 +94,13 @@ 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
 
   def _body_text(raw=false)
-    _body(Livetext::Sigil).join("")
+    _body(Livetext::Sigil).join("\n")
   end
 
   def _raw_body!

metadata

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