livetext 0.9.23 → 0.9.26

data/lib/livetext/more.rb

@@ -0,0 +1,158 @@
+
+# Class Livetext reopened (top level).
+
+class Livetext
+
+  include Helpers
+
+  class Variables
+    def initialize(hash = {})
+      @vars = {}
+      hash.each_pair {|k, v| @vars[k.to_sym] = v }
+    end
+  
+    def [](var)
+      @vars[var.to_sym]
+    end
+
+    def []=(var, value)
+      @vars[var.to_sym] = value
+    end
+  end
+
+  Vars = Variables.new
+
+  TTY = ::File.open("/dev/tty", "w")
+
+  attr_reader :main, :sources
+  attr_accessor :nopass, :nopara
+  attr_accessor :body, :indentation
+
+  class << self
+    attr_accessor :output      # bad solution?
+  end
+
+  def vars
+    @_vars
+  end
+
+  def self.interpolate(str)
+    parse = Livetext::LineParser.new(str)
+    parse.var_func_parse
+  end
+
+  def self.customize(mix: [], call: [], vars: {})
+    obj = self.new
+    mix  = Array(mix)
+    call = Array(call)
+    mix.each {|lib| obj.mixin(lib) }
+    call.each {|cmd| obj.main.send(cmd[1..-1]) }  # ignores leading dot, no param
+    vars.each_pair {|var, val| obj.setvar(var, val.to_s) }
+    obj
+  end
+
+  def peek_nextline
+    @main.peek_nextline  # delegate
+  end
+
+  def nextline
+    @main.nextline       # delegate
+  end
+
+  def sources
+    @main.sources        # delegate
+  end
+
+  def save_location
+    @save_location  # delegate
+  end
+
+  def save_location=(where)
+    @save_location = where  # delegate
+  end
+
+  def dump(file = nil)   # not a dot command!
+    file ||= ::STDOUT
+    file.puts @body
+  rescue => err
+    TTY.puts "#dump had an error: #{err.inspect}"
+  end
+
+  def graceful_error(err)
+    dump
+    raise err
+  end
+
+  def customize(mix: [], call: [], vars: {})
+    mix  = Array(mix)
+    call = Array(call)
+    mix.each {|lib| mixin(lib) }
+    call.each {|cmd| @main.send(cmd[1..-1]) }  # ignores leading dot, no param
+    vars.each_pair {|var, val| @api.setvar(var, val.to_s) }
+    self
+  end
+
+  def initialize(output = ::STDOUT)
+    @source = nil
+    @_mixins = []
+    @_imports = []
+    @_outdir = "."
+    @no_puts = output.nil?
+    @body = ""
+    @main = Processor.new(self, output)
+    @indentation = [0]
+    @_vars = Livetext::Vars
+    @api = UserAPI.new(self)
+    initial_vars
+  end
+
+  def api
+    @api
+  end
+
+  def initial_vars
+    # Other predefined variables (see also setfile)
+    @api.setvar(:User, `whoami`.chomp)
+    @api.setvar(:Version, Livetext::VERSION)
+  end
+
+  def transform(text)
+    setfile!("(string)")
+    enum = text.each_line
+    front = text.match(/.*?\n/).to_a.first.chomp rescue ""
+    @main.source(enum, "STDIN: '#{front}...'", 0)
+    loop do 
+      line = @main.nextline
+      break if line.nil?
+      process_line(line)
+    end
+    result = @body
+#   @body = ""
+    result
+  end
+
+  # EXPERIMENTAL and incomplete
+  def xform(*args, file: nil, text: nil, vars: {})
+    case
+      when file && text.nil?
+        xform_file(file)
+      when file.nil? && text
+        transform(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?
+    @_vars.replace(vars) unless vars.nil?
+    self.process_file(file)
+    self.body
+  end
+
+end
+

data/lib/{parser.rb → livetext/parser.rb}

@@ -1,7 +1,4 @@
-# p __FILE__
-
 
 require_relative 'parser/string'
 require_relative 'parser/general'
 require_relative 'parser/set'
-require_relative 'parser/mixin'

data/lib/{parsing.rb → livetext/parsing.rb}

@@ -1,5 +1,3 @@
-# p __FILE__
-
 
 # Constants for parsing
 

data/lib/livetext/paths.rb

@@ -0,0 +1,13 @@
+# Reopening for paths... do differently?
+
+class Livetext
+  def self.get_path(dir = "")
+    path = File.join(File.dirname(__FILE__), dir)
+    File.expand_path(path)
+  end
+
+  Path    = self.get_path
+  Plugins = self.get_path("../plugin")
+  Imports = self.get_path("../imports")
+end
+

data/lib/{processor.rb → livetext/processor.rb}

@@ -1,5 +1,3 @@
-# p __FILE__
-
 
 # Class Processor does the actual work of processing input.
 
@@ -8,7 +6,6 @@ class Processor
   GenericError = Class.new(StandardError)
 
   include Livetext::Standard
-  include Livetext::UserAPI
 
   Disallowed = 
      %i[ __binding__        __id__            __send__          class
@@ -26,15 +23,22 @@ class Processor
          instance_variable_get                instance_variable_set
          remove_instance_variable             instance_variables ]
 
+  attr_reader :parent, :sources
+
   def initialize(parent, output = nil)
     @parent = parent
-    @_nopass = false
-    @_nopara = false
+    @nopass = false
+    @nopara = false
     # Meh?
     @output = ::Livetext.output = (output || File.open("/dev/null", "w"))
     @sources = []
     @indentation = @parent.indentation
     @_mixins = []
+    @_imports = []
+  end
+
+  def api
+    @parent.api   # FIXME Is this weird??
   end
 
   def output=(io)
@@ -46,14 +50,16 @@ class Processor
   end
 
   def _error!(err, raise_error=false, trace=false)   # FIXME much bullshit happens here
-    where = @sources.last || @save_location
+    where = @sources.last || @live.save_location
     error "Error: #{err} (at #{where[1]} line #{where[2]})"
     error(err.backtrace) rescue nil
     raise GenericError.new("Error: #{err}") if raise_error
   end
 
   def disallowed?(name)
-    Disallowed.include?(name.to_sym)
+    flag = Disallowed.include?(name.to_sym)
+# api.tty "disa name = #{name.inspect} flag = #{flag}"
+    flag
   end
 
   def source(enum, file, line)
@@ -61,11 +67,15 @@ class Processor
   end
 
   def peek_nextline
-    line = @sources.last[0].peek
+    return nil if @sources.empty?
+    source = @sources.last
+    line = source[0].peek
+    line
   rescue StopIteration
     @sources.pop
     nil
   rescue => err
+    TTY.puts "#{__method__}: RESCUE err = #{err.inspect}"
     nil
   end
 

data/lib/livetext/reopen.rb

@@ -0,0 +1,12 @@
+# Reopen for convenience... do differently
+
+class Object
+  def send?(meth, *args)
+    if self.respond_to?(meth)
+      self.send(meth, *args)
+    else
+      return nil
+    end
+  end
+end
+

data/lib/livetext/skeleton.rb

@@ -0,0 +1,22 @@
+require_relative 'parser/string'    # FIXME eh, should fix this
+
+# Class Livetext skeleton (top level).
+
+class Livetext
+  module Handler
+  end
+
+  module ParsingConstants
+  end
+
+  class LineParser < StringParser
+    module FunCall
+    end
+  end
+
+  class FormatLine < StringParser
+    module FunCall
+    end
+  end
+end
+