livetext 0.9.08 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f983f97d1e649079c9ae7b8c059c099eb3fb4b70b3df8afa026aefad4009f83e
-  data.tar.gz: 5efeb66838ae1b36dff234d548e0835f6617af739c653d9e6af8888c68b09c02
+  metadata.gz: 8f9a5d4be00258f23687ca280b306794cb67f2e7c89ba1a453c60dfd59f4268d
+  data.tar.gz: 423d1901855f09e06f5448008e12095713110d1d4dc8ba4f31ddf871319d2bb3
 SHA512:
-  metadata.gz: 957fccd4430db4bd5dfcaa889829e753b180ee9a48635ba88769dd6e2645768cbff293c887d6202dcfc58474deaa56bc03ce18973f612ec138b85db636909988
-  data.tar.gz: 18c66b6647b1bd78c75b5bf4c7d0b7b5649fc2f403b1013dedec8a7e0203fa0758ef17f5fd7f731705a9428ac993e8a449b6092b551a4708d84bf13848bdfd1b
+  metadata.gz: dfd42d9206980d3819e45fc174baf74378c01d13e61c8a8ce58f00bc3d3b7889b1bace1b74076c5491657978e704b55e6f82543e57ffdaa128993f6ec584c5e9
+  data.tar.gz: 570a8c6f92f4baaadad6c946871910e7ae2107741bef4212e16e7a49e90e1f929a8149c9f99553319a811eb42a6ce37fff0e15b8985235b91858f800d3ca77be

data/bin/livetext

@@ -72,7 +72,6 @@ loop do
       @backtrace = true
     when "-m", "--mixin"
       mod = ARGV.shift
-STDERR.puts "Got mod: #{mod}"
       x.mixin(ARGV.shift)
       next
     when "-s", "--stdin"

data/lib/errors.rb

@@ -0,0 +1,13 @@
+
+# More later?
+
+def make_exception(sym, str, target_class = Object)
+  return if target_class.constants.include?(sym)
+  target_class.const_set(sym, StandardError.dup)
+  define_method(sym) do |*args|
+    msg = str.dup
+    args.each.with_index {|arg, i| msg.sub!("%#{i+1}", arg) }
+    target_class.class_eval(sym.to_s).new(msg)
+  end
+end
+

data/lib/formatline.rb

@@ -1,3 +1,6 @@
+# Class FormatLine handles the parsing of comments, dot commands, and 
+# simple formatting characters.
+
 class FormatLine
   SimpleFormats     = {}
   SimpleFormats[:b] = %w[<b> </b>]
@@ -395,11 +398,6 @@ class FormatLine
 
   #####
 
-  def showme(tag)
-    char = @line[@cc]
-    puts "--- #{tag}: ch=#{@ch.inspect} next=#{@next.inspect} (cc=#@cc:#{char.inspect})   out=#{@out.inspect}"
-  end
-
   def embedded?
     ! (['"', "'", " ", nil].include? prev)
   end

data/lib/functions.rb

@@ -1,6 +1,10 @@
-require 'standard'  # FIXME
 
-class Livetext::Functions    # Functions will go here... user-def AND pre-def??
+require_relative 'standard'  # FIXME?
+
+# Class Functions is where '$$func' functions are stored dynamically... 
+# user-def AND pre-def??
+
+class Livetext::Functions
   Formats = ::Livetext::Standard::SimpleFormats
 
   @param = nil

data/lib/helpers.rb

@@ -0,0 +1,21 @@
+
+module Helpers
+
+  def check_disallowed(name)
+    # raise "Illegal name '#{name}'" if _disallowed?(name)
+    # FIXME use custom exception
+    raise DisallowedName, name if _disallowed?(name)
+  end
+
+  def check_file_exists(file)
+    raise FileNotFound(file) unless File.exist?(file)
+  end
+
+  def set_variables(pairs)
+    pairs.each do |pair|
+      var, value = *pair
+      @parent._setvar(var, value)
+    end
+  end
+
+end

data/lib/html.rb

@@ -0,0 +1,32 @@
+module HTMLHelper
+
+  def wrapped(str, *tags)   # helper
+    open, close = open_close_tags(*tags)
+    open + str + close
+  end
+
+  def wrapped!(str, tag, **extras)    # helper
+    open, close = open_close_tags(tag)
+    extras.each_pair do |name, value|
+      open.sub!(">", " #{name}='#{value}'>")
+    end
+    open + str + close
+  end
+
+  def wrap(*tags)     # helper
+    open, close = open_close_tags(*tags)
+    _out open
+    yield
+    _out close
+  end
+
+  def open_close_tags(*tags)
+    open, close = "", ""
+    tags.each do |tag|
+      open << "<#{tag}>"
+      close.prepend("</#{tag}>")
+    end
+    [open, close]
+  end
+
+end

data/lib/livetext/importable.rb

@@ -0,0 +1,2 @@
+class LiveText::Importable
+end

data/lib/livetext.rb

@@ -1,34 +1,48 @@
+# Class Livetext skeleton (top level).
+
 class Livetext
-  VERSION = "0.9.08"
+  VERSION = "0.9.13"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
-require 'fileutils'
+# $LOAD_PATH << Livetext::Path
 
-$: << Livetext::Path
+require 'fileutils'
 
-require 'functions'
-require 'userapi'
-require 'standard'
-require 'formatline'
-require 'processor'
+require_relative 'errors'
+require_relative 'functions'
+require_relative 'userapi'
+require_relative 'standard'
+require_relative 'formatline'
+require_relative 'processor'
 
 Plugins = File.expand_path(File.join(File.dirname(__FILE__), "../plugin"))
 
 TTY = ::File.open("/dev/tty", "w")
 
+# Class Livetext reopened (top level).
+
 class Livetext
+
   Vars = {}
 
+  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]/
+
   attr_reader :main
   attr_accessor :no_puts
   attr_accessor :body, :indentation
 
-  # FIXME - phase out stupid 'parameters' method
-
   class << self
-    attr_accessor :parameters  # from outside world (process_text)
-    attr_accessor :output      # both bad solutions?
+    attr_accessor :output      # bad solution?
   end
 
   def vars
@@ -54,17 +68,6 @@ class Livetext
     self
   end
 
-  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 = []
@@ -74,6 +77,10 @@ class Livetext
     @main = Processor.new(self, output)
     @indentation = [0]
     @_vars = Livetext::Vars
+   
+    # Other predefined variables (see also _setfile)
+    _setvar(:User, `whoami`.chomp)
+    _setvar(:Version, Livetext::VERSION)
   end
 
   def _parse_colon_args(args, hash)  # really belongs in livetext
@@ -111,9 +118,14 @@ class Livetext
   end
 
   def _setfile(file)
-    _setvar(:File, file)
-    dir = File.dirname(File.expand_path(file))
-    _setvar(:FileDir, dir)
+    if file
+      _setvar(:File, file)
+      dir = File.dirname(File.expand_path(file))
+      _setvar(:FileDir, dir)
+    else
+      _setvar(:File,    "[no file]")
+      _setvar(:FileDir, "[no dir]")
+    end
   end
 
   def _setfile!(file)
@@ -126,7 +138,6 @@ class Livetext
       when Comment
         handle_scomment(line)
       when Dotcmd
-        STDERR.puts "line = #{line.inspect}"
         handle_dotcmd(line)
       when Ddotcmd
         indent = line.index("$") + 1
@@ -170,7 +181,7 @@ class Livetext
     self.body
   end
 
-  def xform_file(file)  # , vars: {})
+  def xform_file(file, vars: nil)
     Livetext::Vars.replace(vars) unless vars.nil?
     @_vars.replace(vars) unless vars.nil?
     self.process_file(file)
@@ -181,7 +192,7 @@ class Livetext
 
   def process_file(fname, btrace=false)
     _setfile(fname)
-    text = File.readlines(fname)
+    text = File.readlines(fname)   # FIXME currently causes failure
     enum = text.each
     @backtrace = btrace
     @main.source(enum, fname, 0)
@@ -193,28 +204,23 @@ class Livetext
     end
     val = @main.finalize if @main.respond_to? :finalize
     @body
-  rescue => err
-    STDERR.puts "[process_file] fname = #{fname.inspect}\n    line = #{line.inspect}"
-    STDERR.puts "ERROR #{err} in process_file"
-    err.backtrace.each {|x| STDERR.puts "   " + x }
-    @body = ""
+ rescue => err
+   STDERR.puts "[process_file] fname = #{fname.inspect}\n    line = #{line.inspect}"
+   STDERR.puts "ERROR #{err} in process_file"
+   err.backtrace.each {|x| STDERR.puts "   " + x }
+   # @body = ""
   end
 
   def handle_scomment(line)
   end
 
-  def _check_name(name)
-    @main._error! "Name '#{name}' is not permitted" if @main._disallowed?(name)
-    @main._error! "Mismatched 'end'" if name == "end"
-    name = "_" + name if %w[def include].include?(name)
-    name
-  end
-
   def _get_name(line)
     name, data = line.split(" ", 2)
     name = name[1..-1]  # chop off sigil
+    name = "_" + name if %w[include def].include?(name)
     @main.data = data
-    name = _check_name(name)
+    @main.check_disallowed(name)
+    name
   end
 
   def handle_dotcmd(line, indent = 0)
@@ -230,10 +236,10 @@ class Livetext
     end
     result
   rescue => err
-    STDERR.puts "Error was: #{err.inspect} (calling @main._error!)"
-    STDERR.puts err.backtrace
-    @main._error!(err)
-    # puts @body
+    STDERR.puts "Error: #{err.inspect}"
+    # STDERR.puts err.backtrace
+    # @main._error!(err)
+    puts @body
     @body = ""
     return @body
   end

data/lib/parser/general.rb

@@ -0,0 +1,38 @@
+
+require_relative '../livetext'
+require_relative 'string'
+
+make_exception(:MismatchedQuotes, "Error: mismatched quotes")
+make_exception(:NilValue,         "Error: nil value")
+make_exception(:NullString,       "Error: null string")
+make_exception(:ExpectedString,   "Error: expected a string")
+
+class Livetext::ParseMisc < StringParser
+
+  def initialize(str)
+    super
+  end
+
+  def strip_quotes
+    raise NullString if @line.empty?
+    start, stop = @line[0], @line[-1]
+    return @line unless %['"].include?(start)
+    raise MismatchedQuotes if start != stop
+    @line[1..-2]
+  end
+
+  def self.parse_vars(lines, prefix: nil)
+    lines.map! {|line| line.sub(/# .*/, "").strip }  # strip comments
+    pairs = []
+    lines.each do |line|
+      next if line.strip.empty?
+      var, value = line.split(" ", 2)
+      val = FormatLine.var_func_parse(value)
+      var = prefix + "." + var if prefix
+      pairs << [var, value]
+    end
+    pairs
+  end
+
+end
+

data/lib/parser/import.rb

@@ -0,0 +1,17 @@
+
+require '../livetext/importable'
+
+make_exception(:BadVariableName, "Error: invalid variable name")
+make_exception(:NoEqualSign,     "Error: no equal sign found")
+
+# FIXME probably belongs elsewhere?
+
+class Livetext::ParseImport
+  def use_import(name)
+    require name
+    include name
+    init = "init_#{name}"
+    self.send(init) if self.respond_to? init
+  end
+end
+

data/lib/parser/mixin.rb

@@ -0,0 +1,46 @@
+require_relative '../livetext'
+require_relative 'string'
+
+make_exception(:BadVariableName, "Error: invalid variable name")
+make_exception(:NoEqualSign,     "Error: no equal sign found")
+
+# FIXME probably belongs elsewhere?
+
+class Livetext::ParseMixin   # < StringParser
+
+#   def self.parse(str)
+#     self.new(str).parse
+#   end
+# 
+#   def initialize(line)
+#     super
+#   end
+
+  def cwd_root?
+    File.dirname(File.expand_path(".")) == "/"
+  end
+
+  def find_mixin(name)
+    file = "#{Plugins}/" + name.downcase + ".rb"
+    return file if File.exist?(file)
+
+    file = "./#{name}.rb"
+    return file if File.exist?(file)
+
+    raise "No such mixin '#{name}'" if cwd_root?
+    Dir.chdir("..") { find_mixin(name) }
+  end
+
+  def use_mixin(name, file)
+    modname = name.gsub("/","_").capitalize
+    meths = grab_file(file)
+    string = "module ::#{modname}; #{meths}\nend"
+    eval(string)
+    newmod = Object.const_get("::" + modname)
+    self.extend(newmod)
+    init = "init_#{name}"
+    self.send(init) if self.respond_to? init
+  end
+
+end
+

data/lib/parser/set.rb

@@ -0,0 +1,136 @@
+
+require_relative '../livetext'
+require_relative 'string'
+
+make_exception(:BadVariableName, "Error: invalid variable name")
+make_exception(:NoEqualSign,     "Error: no equal sign found")
+
+class Livetext::ParseSet < StringParser
+
+  attr_reader :line, :eos, :i, :len
+
+  def self.parse(str)
+    self.new(str).parse
+  end
+
+  def initialize(line)
+    super
+  end
+
+  def parse
+    pairs = []
+
+    loop do
+      skip_spaces
+      char = self.peek
+      break if eos?   # end of string
+      raise "Expected alpha to start var name" unless char =~ /[a-z]/i
+      pairs << assignment
+      skip_spaces
+      char = self.peek
+      break if eos?   # end of string
+      case char
+        when nil  # end of string
+        when ","
+          self.next  # skip comma
+      else
+        raise "Expected comma or end of string (found #{char.inspect})"
+      end
+    end
+    pairs
+  end
+
+  def assignment   # one single var=value
+    pair = nil
+    var = value = nil
+    return if eos?
+    var = get_var
+    skip_equal
+    value = get_value
+    value = FormatLine.var_func_parse(value)
+    pair = [var, value]
+    pair
+  end
+
+  def get_var
+    name = ""
+    loop do
+      char = self.peek
+      break if eos?   # end of string
+      case char
+        when /[a-zA-Z_\.0-9]/
+          name << self.next
+          next
+        when /[ =]/
+          return name
+      else
+        raise BadVariableName, char, name
+      end
+    end
+    raise NoEqualSign
+  end
+
+  def skip_equal
+    found = false
+    skip_spaces
+    raise NoEqualSign unless self.peek == "="
+    found = true
+    self.next  # skip =... spaces too
+    self.skip_spaces
+    peek = self.peek
+    return peek  # just for testing
+  rescue StopIteration
+    raise NoEqualSign unless found
+    return nil
+  end
+
+  def escaped
+    self.next   # skip backslash
+    self.next   # return following char
+  end
+
+  make_exception(:BadQuotedString, "Bad quoted string: %1")
+
+  def quoted_value
+    quote = self.next   # opening quote...
+    value = ""
+    char = nil
+    loop do
+      char = self.peek
+      break if self.eos?
+      break if char == quote
+      char = escaped if char == "\\"
+      value << char
+      char = self.next
+    end
+    if char == quote
+      char = self.next
+      return value
+    end
+    raise BadQuotedString, quote + value
+  end
+
+  def unquoted_value
+# puts "#{__method__}: #{@line.inspect}  i = #@i   peek = #{self.peek.inspect}"
+    value = ""
+    loop do
+      char = self.peek
+      break if self.eos?
+      break if char == " " || char == ","
+      value << char
+      char = self.next
+    end
+    value
+  end
+
+  def quote?(char)
+    char == ?" || char == ?'
+  end
+
+  def get_value
+    char = self.peek
+    value = quote?(char) ?  quoted_value : unquoted_value
+    value
+  end
+end
+

data/lib/parser/string.rb

@@ -0,0 +1,55 @@
+class StringParser
+
+  attr_reader :line, :eos, :i, :len
+
+  def initialize(line)
+    raise NilValue if line.nil?
+    raise ExpectedString unless String === line
+#   raise NullString if line.empty?
+    @line = line
+    @len = @line.length
+    @eos = @len == 0 ? true : false
+    @i = 0
+  end
+
+  def next
+    return nil if @eos
+    char = @line[@i]
+    @i += 1
+    @eos = true if @i > @len
+    char
+  end
+
+  def last?
+    @i > @len - 1
+  end
+
+  def eos?
+    @eos = true if last? # duh?
+    @eos
+  end
+
+  def peek
+    return nil if @eos
+    @line[@i]
+  end
+
+  def skip_spaces
+    loop do
+      break if peek != " "
+      break if eos?
+      self.next
+    end
+  end
+
+end
+
+=begin
+  skip
+  next! skip! peek!(?)
+  expect_alpha
+  expect_number
+  skip_spaces
+  expect_eos
+=end
+

data/lib/parser.rb

@@ -0,0 +1,5 @@
+
+require_relative 'parser/string'
+require_relative 'parser/general'
+require_relative 'parser/set'
+require_relative 'parser/mixin'

data/lib/processor.rb

@@ -1,21 +1,27 @@
+# Class Livetext is the actual top-level class.
+
 class Livetext
 
+  # Class Processor does the actual work of processing input.
+
   class Processor
+
+    GenericError = Class.new(StandardError)
+
     include Livetext::Standard
     include Livetext::UserAPI
 
-    Disallowed = [:nil?, :===, :=~, :!~, :eql?, :hash, :<=>, 
-                  :class, :singleton_class, :clone, :dup, :taint, :tainted?, 
-                  :untaint, :untrust, :untrusted?, :trust, :freeze, :frozen?, 
-                  :to_s, :inspect, :methods, :singleton_methods, :protected_methods, 
-                  :private_methods, :public_methods, :instance_variables, 
-                  :instance_variable_get, :instance_variable_set, 
-                  :instance_variable_defined?, :remove_instance_variable, 
-                  :instance_of?, :kind_of?, :is_a?, :tap, :send, :public_send, 
-                  :respond_to?, :extend, :display, :method, :public_method, 
-                  :singleton_method, :define_singleton_method, :object_id, :to_enum, 
-                  :enum_for, :pretty_inspect, :==, :equal?, :!, :!=, :instance_eval, 
-                  :instance_exec, :__send__, :__id__, :__binding__]
+    Disallowed = %i[ !  !=  !~  <=>  ==  ===   =~         __binding__   __id__    __send__   class
+                     clone      define_singleton_method   display       dup      enum_for    eql?       
+                     equal?     extend      freeze        frozen?       hash     inspect     instance_eval          
+                     instance_exec          instance_of?  instance_variable_defined?         
+                     instance_variable_get  instance_variable_set       instance_variables   is_a?          
+                     kind_of?               method        methods       nil?                 object_id          
+                     pretty_inspect         private_methods             protected_methods    public_method          
+                     public_methods         public_send                 remove_instance_variable          
+                     respond_to?            send          singleton_class                    singleton_method          
+                     singleton_methods      taint         tainted?      tap                  to_enum          
+                     to_s                   trust         untaint       untrust              untrusted?]
 
     def initialize(parent, output = nil)
       @parent = parent
@@ -32,13 +38,15 @@ class Livetext
       @output = io
     end
 
-    def _error!(err, abort=true, trace=false)
+    def _error!(err, raise_error=false, trace=false)   # FIXME much bullshit happens here
       where = @sources.last || @save_location
-      puts @parent.body
-      STDERR.puts "[lib/processor] Error: #{err}"  #  (at #{where[1]} line #{where[2]})"
-      raise "lib/processor error!"
+      # puts @parent.body
+      # puts "[lib/processor] Error: #{err}"
+      # puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
+      STDERR.puts "Error: #{err}"  #  (at #{where[1]} line #{where[2]})"
       STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
-      exit if abort
+      # raise "lib/processor error!" # FIXME
+      raise GenericError.new("Error: #{err}") if raise_error
     end
 
     def _disallowed?(name)
@@ -54,7 +62,7 @@ class Livetext
     rescue StopIteration
       @sources.pop
       nil
-    rescue 
+    rescue => err
       nil
     end