livetext 0.8.82 → 0.8.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7041923b573f219f9840264ca00ae087c195e8bb40740b99708f1dd997faebdd
-  data.tar.gz: a64013d7d8e8028628bd0ef460e51dcfc98769e53fa76bcd9fb6f35f4638b468
+  metadata.gz: 236395813414f363d90340dc5e0977daee51ba47bc758d613ed3fa2b419e2cfd
+  data.tar.gz: 70c2eab78b98933073b13c95c2b4855803573731ca151a4e07faaa618233f125
 SHA512:
-  metadata.gz: d66daf9414ba6168414d115e86d7695fe9f4f5bca8f6d04960b3c7b95dbb79f9ac1beb8a079f3c75e3501c0a67745ccd565339a6e10b41c479d499aebf3b6e57
-  data.tar.gz: 8b2fe0da41d71a410e0b0386cf2f7b344c459f1619cde8df33729f6f63455465bf4f9d1804dc2ecb893544e62b819491fef56e8606339dfa0fe7f4a8cf4b4275
+  metadata.gz: 2017af970244166cdec4d15e08cf3e76fe86b1cef4f344386ff3023e78576dc6ddc245b49fe7f27f4645c67a19f154ca594758e83a21097a6c5322e2bf45a70c
+  data.tar.gz: dd4d20cebb6f20e660898a03817987260d134a55b00885c97306f3e4f7c2c2caccdd6e3b5017b31326eeb8973a48cc27020e9508afbd5f2b4c2e11599a110ccd

data/bin/livetext

@@ -79,7 +79,7 @@ loop do
       lib = ARGV.shift
       system("cp #{lib} #{Livetext::Path}/../plugin/")
     when Object
-      x.process_file(arg, @backtrace)
+      x.process_file(arg)  # , @backtrace)
   end
 end
 

data/lib/formatline.rb

@@ -31,20 +31,18 @@ class FormatLine
   attr_reader :out
   attr_reader :tokenlist
 
-  def initialize(line, context=nil)
-    context ||= binding
-    @context = context
+  def initialize(line)
     @line = line
     @i = -1
     @token = Null.dup
     @tokenlist = []
   end
 
-  def self.parse!(line, context = nil)
+  def self.parse!(line)
     return nil if line.nil?
-    x = self.new(line.chomp, context)
+    x = self.new(line.chomp)
     t = x.tokenize(line)
-    x.evaluate    # (context)
+    x.evaluate
   end
 
   def tokenize(line)
@@ -71,10 +69,9 @@ class FormatLine
     @tokenlist
   end
 
-  def self.var_func_parse(str, context = nil)
+  def self.var_func_parse(str)
     return nil if str.nil?
-    x = self.new(str.chomp, context)
-#   t = x.tokenize(line)
+    x = self.new(str.chomp)
     x.grab
     loop do 
       case x.curr
@@ -89,9 +86,7 @@ class FormatLine
       x.grab
     end
     x.add_token(:str)
-    # built tokenlist
-#  x.tokenlist.each {|pair| puts "  #{pair.inspect}" }
-    x.evaluate    # (context)
+    x.evaluate
   end
 
   def embed(sym, str)
@@ -327,9 +322,7 @@ class FormatLine
         self.send("func_" + name.to_s, param)
       else
         fobj = ::Livetext::Functions.new
-        ::Livetext::Functions.param = param        # is this 
-        ::Livetext::Functions.context = @context   #   screwed up???
-        fobj.send(name)
+        fobj.send(name, param)
       end
     result
   end

data/lib/functions.rb

@@ -4,40 +4,35 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
   Formats = ::Livetext::Standard::SimpleFormats
 
   @param = nil
-  @context = nil
 
   class << self
-    attr_accessor :param, :context
+    attr_accessor :param   # kill this?
   end
 
-  def date
+  def date(param=nil)
     Time.now.strftime("%F")
   end
 
-  def time
+  def time(param=nil)
     Time.now.strftime("%T")
   end
 
-  def link
-    param = self.class.param
+  def link(param=nil)
     text, url = param.split("|", 2)  # reverse these?
     "<a href='#{url}'>#{text}</a>"
   end
 
-  def br
-    n = self.class.param 
-    n = "1" if n.empty?
+  def br(n="1")
     n = n.to_i
     "<br>"*n
   end
 
-  def yt
+  def yt(param)
     param = self.class.param
     "https://www.youtube.com/watch?v=#{param}"
   end
 
-  def simple_format(*args)
-    param = self.class.param
+  def simple_format(param=nil, *args)
     param ||= "NO PARAMETER"
     pairs = Formats.values_at(*args)
     str = param.dup
@@ -47,20 +42,20 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
     str
   end
 
-  def b;    simple_format(:b); end
-  def i;    simple_format(:i); end
-  def t;    simple_format(:t); end
-  def s;    simple_format(:s); end
-  def bi;   simple_format(:b, :i); end
-  def bt;   simple_format(:b, :t); end
-  def bs;   simple_format(:b, :s); end
-  def it;   simple_format(:i, :t); end
-  def is;   simple_format(:i, :s); end
-  def ts;   simple_format(:t, :s); end
-  def bit;  simple_format(:b, :i, :t); end
-  def bis;  simple_format(:b, :i, :s); end
-  def bts;  simple_format(:b, :t, :s); end
-  def its;  simple_format(:i, :t, :s); end
-  def bits; simple_format(:b, :i, :t, :s); end
+  def b(param=nil);    simple_format(param, :b); end
+  def i(param=nil);    simple_format(param, :i); end
+  def t(param=nil);    simple_format(param, :t); end
+  def s(param=nil);    simple_format(param, :s); end
+  def bi(param=nil);   simple_format(param, :b, :i); end
+  def bt(param=nil);   simple_format(param, :b, :t); end
+  def bs(param=nil);   simple_format(param, :b, :s); end
+  def it(param=nil);   simple_format(param, :i, :t); end
+  def is(param=nil);   simple_format(param, :i, :s); end
+  def ts(param=nil);   simple_format(param, :t, :s); end
+  def bit(param=nil);  simple_format(param, :b, :i, :t); end
+  def bis(param=nil);  simple_format(param, :b, :i, :s); end
+  def bts(param=nil);  simple_format(param, :b, :t, :s); end
+  def its(param=nil);  simple_format(param, :i, :t, :s); end
+  def bits(param=nil); simple_format(param, :b, :i, :t, :s); end
 
 end

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.82"
+  VERSION = "0.8.83"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -20,7 +20,7 @@ TTY = ::File.open("/dev/tty", "w")
 class Livetext
   Vars = {}
 
-  attr_reader :main, :context
+  attr_reader :main
   attr_accessor :no_puts
   attr_accessor :body, :indentation
 
@@ -44,9 +44,22 @@ class Livetext
     @indentation = [0]
   end
 
-  def process_line(line, context=nil)
-    context ||= binding
-    @context = context
+  def _setvar(var, val)
+    str, sym = var.to_s, var.to_sym
+    Livetext::Vars[str] = val
+    Livetext::Vars[sym] = val
+  end
+
+  def _setfile(file)
+    _setvar(:File, file)
+    _setvar(:FileDir, File.expand_path(file))
+  end
+
+  def _setfile!(file)
+    _setvar(:File, file)
+  end
+
+  def process_line(line)
     nomarkup = true
     # FIXME inefficient
     comment  = rx(Sigil, Livetext::Space)  # apply these in order
@@ -64,11 +77,12 @@ class Livetext
         handle_dotcmd(line)
         indentation.pop
     else
-      @main._passthru(line, context)
+      @main._passthru(line)
     end
   end
 
   def process(text)
+    _setfile!("(string)")
     enum = text.each_line
     front = text.match(/.*?\n/).to_a.first.chomp
     @main.source(enum, "STDIN: '#{front}...'", 0)
@@ -80,6 +94,7 @@ class Livetext
   end
 
   def transform(text)
+    _setfile!("(string)")
     @output = ::Livetext.output
     enum = text.each_line
     front = text.match(/.*?\n/).to_a.first.chomp
@@ -95,6 +110,7 @@ class Livetext
 ## FIXME don't need process *and* process_text
 
   def process_text(text)
+    _setfile!("(string)")
     text = text.split("\n") if text.is_a? String
     enum = text.each
     @backtrace = false
@@ -103,7 +119,7 @@ class Livetext
     loop do 
       line = @main.nextline
       break if line.nil?
-      process_line(line, context)
+      process_line(line)
     end
     val = @main.finalize if @main.respond_to? :finalize
     val
@@ -115,9 +131,8 @@ class Livetext
 
 ## FIXME process_file[!] should call process[_text]
 
-  def process_file(fname, context=nil)
-    context ||= binding
-    @context = context
+  def process_file(fname)
+    _setfile(fname)
     raise "No such file '#{fname}' to process" unless File.exist?(fname)
     text = File.readlines(fname)
     enum = text.each
@@ -126,14 +141,14 @@ class Livetext
     loop do 
       line = @main.nextline
       break if line.nil?
-# STDERR.puts "LINE: #{line.inspect}"
-      process_line(line, context)
+      process_line(line)
     end
     val = @main.finalize if @main.respond_to? :finalize
     val
   end
 
   def process_file!(fname, backtrace=false)
+    _setfile(fname)
     raise "No such file '#{fname}' to process" unless File.exist?(fname)
     @main.output = StringIO.new
     enum = File.readlines(fname).each

data/lib/standard.rb

@@ -42,7 +42,7 @@ module Livetext::Standard
     funcname = @_args[0]
     _error! "Illegal name '#{funcname}'" if _disallowed?(funcname)
     func_def = <<-EOS
-      def #{funcname}(*args)
+      def #{funcname}(param)
         #{_body_text(true)}
       end
     EOS
@@ -161,8 +161,7 @@ module Livetext::Standard
       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
+      @parent._setvar(var, val)
     end
     _optional_blank_line
   end
@@ -186,8 +185,7 @@ module Livetext::Standard
     #    end
     #    s2 << line
     #  end
-    Livetext::Vars[var.to_sym] = s2
-    Livetext::Vars[var] = s2.chomp      # FIXME?
+    @parent._setvar(var, s2.chomp)
     _optional_blank_line
   end
 
@@ -198,6 +196,17 @@ module Livetext::Standard
     _optional_blank_line
   end
 
+  def inherit
+    file = @_args.first
+    upper = "../#{file}"
+    good = (File.exist?(upper) || File.exist?(file))
+    _error!("File #{file} not found (local or parent)") unless good
+
+    @parent.process_file(upper) if File.exist?(upper)
+    @parent.process_file(file)  if File.exist?(file)
+    _optional_blank_line
+  end
+
   def include!    # FIXME huh?
     file = @_args.first
     return unless File.exist?(file)
@@ -212,7 +221,14 @@ module Livetext::Standard
     file = "#{Plugins}/" + name.downcase + ".rb"
     return if @_mixins.include?(name)
     file = "./#{name}.rb" unless File.exist?(file)
-    _check_existence(file, "No such mixin '#{name}'")
+    if File.exist?(file)
+      # Just keep going...
+    else
+      if File.expand_path(".") != "/"
+        Dir.chdir("..") { mixin }
+        return
+      end
+    end
 
     @_mixins << name
     meths = grab_file(file)

data/lib/userapi.rb

@@ -74,7 +74,6 @@ module Livetext::UserAPI
     end_found = false
     loop do
       @line = nextline
-# puts "--- loop: @line = #{@line.inspect}"
       break if @line.nil?
       @line.chomp!
       if _end?(@line)
@@ -115,17 +114,17 @@ module Livetext::UserAPI
     str
   end
 
-  def _format(line, context = nil)
+  def _format(line)
     return "" if line == "\n"
-    line2 = FormatLine.parse!(line, context)
+    line2 = FormatLine.parse!(line)
     line.replace(line2) unless line.nil?
     line
   end
 
-  def _passthru(line, context = nil)
+  def _passthru(line)
     return if @_nopass
     _out "<p>" if line == "\n" and ! @_nopara
-    line = _format(line, context)
+    line = _format(line)
     _out line
   end
 

data/test/data/functions/source.lt3

@@ -14,8 +14,7 @@ Functions can take a parameter in brackets
 (which it can parse itself as needed):
 
 .func mean
-  list = self.class.param
-  list = list.split(",").map(&:to_f)
+  list = param.split(",").map(&:to_f)
   sum = list.inject(0, :+)
   avg = sum / list.size.to_f
   avg.to_s

metadata

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