livetext 0.9.20 → 0.9.24

data/lib/global_helpers.rb

@@ -0,0 +1,39 @@
+# p __FILE__
+
+
+module GlobalHelpers
+
+  def check_disallowed(name)
+    raise DisallowedName(name) if disallowed?(name)
+  end
+
+  def check_file_exists(file)
+    raise FileNotFound(file) unless File.exist?(file)
+  end
+
+  def grab_file(fname)
+    File.read(fname)
+  end
+
+  def search_upward(file)
+    value = nil
+    return file if File.exist?(file)
+
+    count = 1
+    loop do
+      front = "../" * count
+      count += 1
+      here = Pathname.new(front).expand_path.dirname.to_s
+      break if here == "/"
+      path = front + file
+      value = path if File.exist?(path)
+      break if value
+    end
+    ::STDERR.puts "Cannot find #{file.inspect} from #{Dir.pwd}" unless value
+	  return value
+  rescue
+    ::STDERR.puts "Can't find #{file.inspect} from #{Dir.pwd}"
+	  return nil
+  end
+
+end

data/lib/handler/import.rb

@@ -0,0 +1,43 @@
+
+require_relative '../helpers'
+
+class Livetext::Handler::Import
+  include Livetext::Helpers
+  include GlobalHelpers
+
+  attr_reader :file
+
+  def initialize(name)
+    @name = name
+    @file = find_file(name)
+  end
+
+  def self.get_mod_name
+    file = File.new(@file + ".rb")
+    str = nil
+    file.each_line do |line| 
+      str = line
+      break if str =~ /^module /
+    end
+    junk, name, junk2 = str.split
+    name
+  end
+
+  def self.get_module(filename)
+    handler = self.new(filename)
+    @file = handler.file.sub(/.rb$/, "")
+    require @file   # + ".rb"
+    modname = get_mod_name
+# TTY.puts "modname = #{modname.inspect}"
+    newmod = Object.const_get("::" + modname)
+    newmod   # return actual module
+  end
+
+  private
+
+  def cwd_root?
+    File.dirname(File.expand_path(".")) == "/"
+  end
+
+end
+

data/lib/{parser → handler}/mixin.rb

@@ -1,29 +1,28 @@
-require_relative '../livetext'
+
 require_relative '../helpers'
-require_relative 'string'
 
-make_exception(:NoEqualSign,     "Error: no equal sign found")
+class Livetext::Handler::Mixin
+  include Livetext::Helpers
+  include GlobalHelpers
 
-class Livetext::ParseMixin
-  include Helpers
+  attr_reader :file
 
   def initialize(name)
     @name = name
-    @file = find_file(name)
+    @file = find_file(name, ".rb", "plugin")
   end
 
-  def self.get_module(name)
-    parse = self.new(name)
-    modname, code = parse.read_mixin
+  def self.get_module(filename)
+    handler = self.new(filename)
+    modname, code = handler.read_mixin
     eval(code)   # Avoid in the future
     newmod = Object.const_get("::" + modname)
-    # return actual module
-    newmod
+    newmod   # return actual module
   end
 
   def read_mixin
     modname = @name.gsub("/","_").capitalize
-    meths = grab_file(@file)
+    meths = grab_file(@file)  # already has .rb?
     [modname, "module ::#{modname}; #{meths}\nend"]
   end
 
@@ -33,6 +32,5 @@ class Livetext::ParseMixin
     File.dirname(File.expand_path(".")) == "/"
   end
 
-
 end
 

data/lib/handler.rb

@@ -1 +1,4 @@
-require_relative 'handler/icanhaz'
+# p __FILE__
+
+require_relative 'handler/import'
+require_relative 'handler/mixin'

data/lib/helpers.rb

@@ -1,9 +1,14 @@
 
-module Helpers
+require_relative 'global_helpers'
+
+module Livetext::Helpers
 
   Space = " "
   Sigil = "." # Can't change yet
 
+  ESCAPING = { "'" => ''', '&' => '&', '"' => '"',
+               '<' => '&lt;', '>' => '&gt;' }
+
   def escape_html(string)
     enc = string.encoding
     unless enc.ascii_compatible?
@@ -12,16 +17,33 @@ module Helpers
         enc = Encoding::Converter.asciicompat_encoding(enc)
         string = enc ? string.encode(enc) : string.b
       end
-      table = Hash[TABLE_FOR_ESCAPE_HTML__.map {|pair|pair.map {|s|s.encode(enc)}}]
+      table = Hash[ESCAPING.map {|pair|pair.map {|s|s.encode(enc)}}]
       string = string.gsub(/#{"['&\"<>]".encode(enc)}/, table)
       string.encode!(origenc) if origenc
       return string
     end
-    string.gsub(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
+    string.gsub(/['&\"<>]/, ESCAPING)
+  end
+
+  def showme(obj, tag = "")
+    whence = caller[0]
+    file, line, meth = whence.split(":")
+    file = File.basename(file)
+    meth = meth[4..-2]
+    tag << " =" if tag
+    hide_class = [true, false, nil].include?(obj)
+    klass = hide_class ? "" : "(#{obj.class}) "
+    puts " #{tag} #{klass}#{obj.inspect}  in ##{meth}  [#{file} line #{line}]"
   end
 
-  def find_file(name, ext=".rb")
-    paths = [Livetext::Path.sub(/lib/, "imports/"), "./"]
+  def debug(*args)
+    puts(*args) if $debug
+  end
+
+  def find_file(name, ext=".rb", which="imports")
+    failed = "#{__method__}: expected 'imports' or 'plugin'"
+    raise failed unless %w[imports plugin].include?(which)
+    paths = [Livetext::Path.sub(/lib/, "#{which}/"), "./"]
     base  = "#{name}#{ext}"
     paths.each do |path|
       file = path + base
@@ -39,9 +61,9 @@ module Helpers
     Regexp.compile("^" + Regexp.escape(str) + "#{space}")
   end
 
-  Comment  = rx(Sigil, Space)
-  Dotcmd   = rx(Sigil)
-  Ddotcmd  = /^ *\$\.[A-Za-z]/
+  Comment   = rx(Sigil, Space)
+  Dotcmd    = rx(Sigil)
+  DollarDot = /^ *\$\.[A-Za-z]/
 
 ## FIXME process_file[!] should call process[_text]
 
@@ -52,33 +74,41 @@ module Helpers
     @backtrace = btrace
     @main.source(enum, fname, 0)
     line = nil
-    loop do 
+    loop do
       line = @main.nextline
       break if line.nil?
       process_line(line)
     end
-    val = @main.finalize if @main.respond_to? :finalize
-    @body
+    val = @main.finalize rescue nil
+    @body    # FIXME?   @body.join("\n")  # array
+  rescue StandardError => err
+# TTY.puts ">>> rescue in process_file!!"
+#     TTY.puts @body
+    raise err
   end
 
-  def process_line(line)  # FIXME inefficient?
+  def process_line(line)
     nomarkup = true
     case line  # must apply these in order
       when Comment
         handle_scomment(line)
       when Dotcmd
         handle_dotcmd(line)
-      when Ddotcmd
-        indent = line.index("$") + 1
-        @indentation.push(indent)
-        line.sub!(/^ *\$/, "")
-        handle_dotcmd(line)
-        indentation.pop
+      when DollarDot
+        handle_dollar_dot
     else
       @main._passthru(line)
     end
   end
 
+  def handle_dollar_dot
+    indent = line.index("$") + 1
+    @indentation.push(indent)
+    line.sub!(/^ *\$/, "")
+    handle_dotcmd(line)
+    indentation.pop
+  end
+
   def handle_dotcmd(line, indent = 0)
     indent = @indentation.last # top of stack
     line = line.sub(/# .*$/, "")
@@ -90,6 +120,29 @@ module Helpers
         raise EndWithoutOpening()
       when @main.respond_to?(name)
         result = @main.send(name)
+
+        # NOTE: The above line is where the magic happens!
+        # A name like 'foobar' results in an invocation of
+        # @main.foobar (where @main is a Processor, and any
+        # new methods (e.g. from a mixin) are added to @main
+        #
+        # So all the functionality from _args and _raw_args
+        # and _data (among others?) will be encapsulated in
+        # 'some' kind of PORO which handles access to all
+        # these things as well as the 'body' between the
+        # command and its corresponding .end
+        #
+        # The 'body' functionality is so commonly used, I plan
+        # to pass it in separately as needed (even though the
+        # args object should make it available also).
+        #
+        # Every method corresponding to a dot commmand will
+        # get args and body passed in as needed. Every one of
+        # the signatures already has (args = nil, body = nil)
+        # but nothing is being passed in that way yet.
+        #
+        # Refer to lib/cmdargs.rb for more! This is *strictly*
+        # experimental and a "work in progress."
     else
       puts @body  # earlier correct output, not flushed yet
       raise "Name '#{name}' is unknown"
@@ -105,8 +158,8 @@ module Helpers
     name, data = line.split(" ", 2)
     name = name[1..-1]  # chop off sigil
     name = "dot_" + name if %w[include def].include?(name)
-    @main.data = data
     @main.check_disallowed(name)
+    @main.data = data
     name
   end
 
@@ -143,10 +196,10 @@ module Helpers
       value = path if File.exist?(path)
       break if value
     end
-    STDERR.puts "Cannot find #{file.inspect} from #{Dir.pwd}" unless value
+    ::STDERR.puts "Cannot find #{file.inspect} from #{Dir.pwd}" unless value
 	  return value
   rescue
-    STDERR.puts "Can't find #{file.inspect} from #{Dir.pwd}"
+    ::STDERR.puts "Can't find #{file.inspect} from #{Dir.pwd}"
 	  return nil
   end
 

data/lib/html.rb

@@ -1,3 +1,5 @@
+# p __FILE__
+
 module HTMLHelper
 
   def wrapped(str, *tags)   # helper

data/lib/livetext.rb

@@ -1,26 +1,46 @@
+
+require_relative 'parser/string'
+
 # Class Livetext skeleton (top level).
 
 class Livetext
-  VERSION = "0.9.20"
+  VERSION = "0.9.24"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 
   module Handler
   end
-end
 
-# $LOAD_PATH << Livetext::Path
+  module ParsingConstants
+  end
+
+  class FormatLine < StringParser
+    module FunCall
+    end
+  end
+end
 
 require 'fileutils'
 
+class Object
+  def send?(meth, *args)
+    if self.respond_to?(meth)
+      self.send(meth, *args)
+    else
+      return nil
+    end
+  end
+end
+
 require_relative 'errors'
+require_relative 'standard'
 require_relative 'functions'
 require_relative 'userapi'
-require_relative 'standard'
 require_relative 'formatline'
 require_relative 'processor'
 require_relative 'helpers'
 require_relative 'handler'
 
+
 Plugins = File.expand_path(File.join(File.dirname(__FILE__), "../plugin"))
 Imports = File.expand_path(File.join(File.dirname(__FILE__), "../imports"))
 
@@ -46,7 +66,12 @@ class Livetext
   end
 
   def vars
-    Livetext::Vars.dup
+    @_vars
+  end
+
+  def self.interpolate(str)
+    # FIXME There are issues here...
+    Livetext::FormatLine.var_func_parse(str)
   end
 
   def self.customize(mix: [], call: [], vars: {})
@@ -62,8 +87,7 @@ class Livetext
   def customize(mix: [], call: [], vars: {})
     mix  = Array(mix)
     call = Array(call)
-    # FIXME HF won't this break??
-    mix.each {|lib| mixin(lib) }
+    mix.each {|lib| mixin(lib) }  # FIXME HF won't this break??
     call.each {|cmd| @main.send(cmd[1..-1]) }  # ignores leading dot, no param
     vars.each_pair {|var, val| setvar(var, val.to_s) }
     self
@@ -81,6 +105,9 @@ class Livetext
     initial_vars
   end
 
+  def interpolate(str)
+  end
+
   def initial_vars
     # Other predefined variables (see also setfile)
     setvar(:User, `whoami`.chomp)

data/lib/parser/file.rb

@@ -1,6 +1,4 @@
 
-require_relative '../livetext'
-
 # Hmm. not today?
 
 class Livetext::ParseFile

data/lib/parser/general.rb

@@ -1,7 +1,4 @@
 
-require_relative '../livetext'
-require_relative 'string'
-
 make_exception(:MismatchedQuotes, "Error: mismatched quotes")
 make_exception(:NilValue,         "Error: nil value")
 make_exception(:NullString,       "Error: null string")
@@ -27,7 +24,7 @@ class Livetext::ParseGeneral < StringParser
     lines.each do |line|
       next if line.strip.empty?
       var, value = line.split(" ", 2)
-      val = FormatLine.var_func_parse(value)
+      val = Livetext.interpolate(value)
       var = prefix + "." + var if prefix
       pairs << [var, value]
     end

data/lib/parser/set.rb

@@ -1,7 +1,4 @@
 
-require_relative '../livetext'
-require_relative 'string'
-
 make_exception(:BadVariableName, "Error: invalid variable name")
 make_exception(:NoEqualSign,     "Error: no equal sign found")
 
@@ -31,8 +28,8 @@ class Livetext::ParseSet < StringParser
     pairs = []
     char = nil
     loop do
-      break if eos?   # end of string
       char = skip_spaces
+      break if eos?   # end of string
       raise "Expected alpha to start var name" unless char =~ /[a-z]/i
       pairs << assignment
       char = skip_spaces
@@ -56,7 +53,7 @@ class Livetext::ParseSet < StringParser
     var = get_var
     skip_equal
     value = get_value
-    value = FormatLine.var_func_parse(value)    # FIXME broken now?
+    value = Livetext.interpolate(value)
     pair = [var, value]
     pair
   end
@@ -107,7 +104,6 @@ class Livetext::ParseSet < StringParser
       char = grab
       break if eos?
       break if char == quote
-#     break if char.nil?
       char = escaped if char == "\\"
       value << char
     end
@@ -123,8 +119,7 @@ class Livetext::ParseSet < StringParser
     value = ""
     loop do
       char = peek
-      break if eos?  #     FIXME oops???
-#     break if char.nil?
+      break if eos?
       break if char == " " || char == ","
       value << char
       char = grab

data/lib/parser/string.rb

@@ -15,15 +15,16 @@ class StringParser
     return nil if @eos
     char = @line[@i]
     @i += 1
-    @eos = true if @i > @len
+    check_eos
     char
   end
 
   def ungrab
-    @i -= 1    # FIXME what about eos...?
+    @i -= 1
+    check_eos
   end
 
-  def next!
+  def lookahead
     @line[@i + 1]
   end
 
@@ -32,12 +33,7 @@ class StringParser
     @line[@i-1]
   end
 
-  def last?
-    @i > @len - 1
-  end
-
   def eos?
-    @eos = true if last? # duh?
     @eos
   end
 
@@ -52,16 +48,21 @@ class StringParser
       char = peek
       break if eos?
       break if char != " "
-      grab
+      char = grab
     end
     char
   end
 
+  private
+
+  def check_eos
+    @eos = @i >= @len
+  end
 end
 
 =begin
   skip
-  next! skip! peek!(?)
+  lookahead skip! peek!(?)
   expect_alpha
   expect_number
   skip_spaces

data/lib/parser.rb

@@ -2,4 +2,3 @@
 require_relative 'parser/string'
 require_relative 'parser/general'
 require_relative 'parser/set'
-require_relative 'parser/mixin'

data/lib/parsing.rb

@@ -0,0 +1,31 @@
+# p __FILE__
+
+
+# Constants for parsing
+
+module Livetext::ParsingConstants
+  SimpleFormats     = {}
+  SimpleFormats[:b] = %w[<b> </b>]
+  SimpleFormats[:i] = %w[<i> </i>]
+  SimpleFormats[:t] = ["<font size=+1><tt>", "</tt></font>"]
+  SimpleFormats[:s] = %w[<strike> </strike>]
+
+  BITS = SimpleFormats.keys
+ 
+  Null   = ""
+  Space  = " "
+  Alpha  = /[A-Za-z]/
+  AlNum  = /[A-Za-z0-9_]/
+  LF     = "\n"
+  LBrack = "["
+
+  Blank   = [" ", nil, "\n"]
+  Punc    = [")", ",", ".", " ", "\n"]
+  NoAlpha = /[^A-Za-z0-9_]/
+  NoAlphaDot = /[^.A-Za-z0-9_]/
+  Param   = ["]", "\n", nil]
+  Escape  = "\\"   # not an ESC char
+
+  Syms = { "*" => :b, "_" => :i, "`" => :t, "~" => :s }
+
+end