livetext 0.9.14 → 0.9.15

data/lib/livetext.rb

@@ -1,7 +1,7 @@
 # Class Livetext skeleton (top level).
 
 class Livetext
-  VERSION = "0.9.14"
+  VERSION = "0.9.15"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -9,13 +9,13 @@ end
 
 require 'fileutils'
 
-require 'helpers'
 require_relative 'errors'
 require_relative 'functions'
 require_relative 'userapi'
 require_relative 'standard'
 require_relative 'formatline'
 require_relative 'processor'
+require_relative 'helpers'
 
 Plugins = File.expand_path(File.join(File.dirname(__FILE__), "../plugin"))
 
@@ -31,16 +31,6 @@ 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
@@ -60,16 +50,17 @@ class Livetext
     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) }
+    vars.each_pair {|var, val| obj.setvar(var, val.to_s) }
     obj
   end
 
   def customize(mix: [], call: [], vars: {})
     mix  = Array(mix)
     call = Array(call)
+    # FIXME HF won't this break??
     mix.each {|lib| mixin(lib) }
     call.each {|cmd| @main.send(cmd[1..-1]) }  # ignores leading dot, no param
-    vars.each_pair {|var, val| _setvar(var, val.to_s) }
+    vars.each_pair {|var, val| setvar(var, val.to_s) }
     self
   end
 
@@ -82,81 +73,17 @@ 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
-    h2 = hash.dup
-    e = args.each
-    loop do
-      arg = e.next.chop.to_sym
-      raise "_parse_args: #{arg} is unknown" unless hash.keys.include?(arg)
-      h2[arg] = e.next
-    end
-    h2 = h2.reject {|k,v| v.nil? }
-    h2.each_pair {|k, v| raise "#{k} has no value" if v.empty? }
-    h2
-  end
-
-  def _get_arg(name, args)  # really belongs in livetext
-    raise "(#{name}) Expected an array" unless args.is_a? Array
-    raise "(#{name}) Expected an arg" if args.empty?
-    raise "(#{name}) Too many args: #{args.inspect}" if args.size > 1
-    val = args[0]
-    raise "Expected an argument '#{name}'" if val.nil?
-    val
-  end
-
-  def mixin(mod)
-    @main._mixin(mod)
-  end
-
-  def _setvar(var, val)
-    str, sym = var.to_s, var.to_sym
-    Livetext::Vars[str] = val
-    Livetext::Vars[sym] = val
-    @_vars[str] = val
-    @_vars[sym] = val
+    initial_vars
   end
 
-  def _setfile(file)
-    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)
-    _setvar(:File, file)
-  end
-
-  def process_line(line)  # FIXME inefficient?
-    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
-    else
-      @main._passthru(line)
-    end
+  def initial_vars
+    # Other predefined variables (see also setfile)
+    setvar(:User, `whoami`.chomp)
+    setvar(:Version, Livetext::VERSION)
   end
 
   def transform(text)
-    _setfile!("(string)")
+    setfile!("(string)")
     enum = text.each_line
     front = text.match(/.*?\n/).to_a.first.chomp rescue ""
     @main.source(enum, "STDIN: '#{front}...'", 0)
@@ -193,62 +120,5 @@ class Livetext
     self.body
   end
 
-## FIXME process_file[!] should call process[_text]
-
-  def process_file(fname, btrace=false)
-    _setfile(fname)
-    text = File.readlines(fname)
-    enum = text.each
-    @backtrace = btrace
-    @main.source(enum, fname, 0)
-    line = nil
-    loop do 
-      line = @main.nextline
-      break if line.nil?
-      process_line(line)
-    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 = ""
-  end
-
-  def handle_scomment(line)
-  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
-    @main.check_disallowed(name)
-    name
-  end
-
-  def handle_dotcmd(line, indent = 0)
-    indent = @indentation.last # top of stack
-    line = line.sub(/# .*$/, "")
-    name = _get_name(line).to_sym
-    result = nil
-    case
-      when name == :end   # special case
-        puts @body
-        raise EndWithoutOpening()
-      when @main.respond_to?(name)
-        result = @main.send(name)
-    else
-      @main._error! "Name '#{name}' is unknown"
-      return
-    end
-    result
-  rescue => err
-    puts @body  # earlier correct output, not flushed yet
-    STDERR.puts "Error: #{err.inspect}"
-    STDERR.puts err.backtrace
-  end
-
 end
 

data/lib/parser/file.rb

@@ -0,0 +1,8 @@
+
+require_relative '../livetext'
+
+# Hmm. not today?
+
+class Livetext::ParseFile
+
+end

data/lib/parser/mixin.rb

@@ -1,4 +1,5 @@
 require_relative '../livetext'
+require_relative '../helpers'
 require_relative 'string'
 
 make_exception(:BadVariableName, "Error: invalid variable name")
@@ -10,30 +11,42 @@ class Livetext::ParseMixin   # < StringParser
 
   include Helpers
 
+  def initialize(name)
+    @name = name
+    @file = find_file(name)
+  end
+
+  def self.get_module(name)
+    parse = self.new(name)
+    modname, code = parse.read_mixin
+    eval(code)   # Avoid in the future
+    newmod = Object.const_get("::" + modname)
+    # return actual module
+    newmod
+  end
+
+  def read_mixin
+    modname = @name.gsub("/","_").capitalize
+    meths = grab_file(@file)
+    [modname, "module ::#{modname}; #{meths}\nend"]
+  end
+
+  private
+
   def cwd_root?
     File.dirname(File.expand_path(".")) == "/"
   end
 
-  def find_mixin(name)
-    file = "#{Plugins}/" + name.downcase + ".rb"
+  def find_file(name, ext=".rb")
+    base = "./#{name}#{ext}"
+    file = "#{Plugins}/#{base}"
     return file if File.exist?(file)
 
-    file = "./#{name}.rb"
+    file = base
     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
+    Dir.chdir("..") { find_file(name) }
   end
 
 end

data/lib/parser/set.rb

@@ -17,22 +17,31 @@ class Livetext::ParseSet < StringParser
     super
   end
 
+  def wtf(note="")
+    TTY.puts "| PARSER: @i = #@i   @len = #@len"
+    TTY.puts "|#{note}"
+    TTY.puts "| [" + @line.gsub(" ", "_") + "]"
+    TTY.print "|  "    # 0-based (one extra space)
+    @i.times { TTY.print "-" }
+    TTY.puts "^"
+    TTY.puts
+  end
+
   def parse
     pairs = []
-
+    char = nil
     loop do
-      skip_spaces
-      char = self.peek
       break if eos?   # end of string
+      char = skip_spaces
       raise "Expected alpha to start var name" unless char =~ /[a-z]/i
       pairs << assignment
-      skip_spaces
-      char = self.peek
+      char = skip_spaces
       break if eos?   # end of string
       case char
         when nil  # end of string
         when ","
-          self.next  # skip comma
+          char = grab  # skip comma
+          char = skip_spaces
       else
         raise "Expected comma or end of string (found #{char.inspect})"
       end
@@ -47,7 +56,7 @@ class Livetext::ParseSet < StringParser
     var = get_var
     skip_equal
     value = get_value
-    value = FormatLine.var_func_parse(value)
+    value = FormatLine.var_func_parse(value)    # FIXME broken now?
     pair = [var, value]
     pair
   end
@@ -55,11 +64,11 @@ class Livetext::ParseSet < StringParser
   def get_var
     name = ""
     loop do
-      char = self.peek
+      char = peek
       break if eos?   # end of string
       case char
         when /[a-zA-Z_\.0-9]/
-          name << self.next
+          name << grab
           next
         when /[ =]/
           return name
@@ -73,11 +82,10 @@ class Livetext::ParseSet < StringParser
   def skip_equal
     found = false
     skip_spaces
-    raise NoEqualSign unless self.peek == "="
+    raise NoEqualSign unless peek == "="
     found = true
-    self.next  # skip =... spaces too
-    self.skip_spaces
-    peek = self.peek
+    grab         # skip =
+    skip_spaces  # skip spaces too
     return peek  # just for testing
   rescue StopIteration
     raise NoEqualSign unless found
@@ -85,40 +93,41 @@ class Livetext::ParseSet < StringParser
   end
 
   def escaped
-    self.next   # skip backslash
-    self.next   # return following char
+    grab   # skip backslash
+    grab   # return following char
   end
 
   make_exception(:BadQuotedString, "Bad quoted string: %1")
 
   def quoted_value
-    quote = self.next   # opening quote...
+    quote = grab   # opening quote...
     value = ""
     char = nil
     loop do
-      char = self.peek
-      break if self.eos?
+      char = grab
+      break if eos?
       break if char == quote
+#     break if char.nil?
       char = escaped if char == "\\"
       value << char
-      char = self.next
     end
     if char == quote
-      char = self.next
+      # char = grab
       return value
     end
     raise BadQuotedString, quote + value
   end
 
   def unquoted_value
-# puts "#{__method__}: #{@line.inspect}  i = #@i   peek = #{self.peek.inspect}"
+    char = nil
     value = ""
     loop do
-      char = self.peek
-      break if self.eos?
+      char = peek
+      break if eos?  #     FIXME oops???
+#     break if char.nil?
       break if char == " " || char == ","
       value << char
-      char = self.next
+      char = grab
     end
     value
   end
@@ -128,8 +137,8 @@ class Livetext::ParseSet < StringParser
   end
 
   def get_value
-    char = self.peek
-    value = quote?(char) ?  quoted_value : unquoted_value
+    char = peek
+    value = quote?(char) ? quoted_value : unquoted_value
     value
   end
 end

data/lib/parser/string.rb

@@ -5,14 +5,13 @@ class StringParser
   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
+  def grab
     return nil if @eos
     char = @line[@i]
     @i += 1
@@ -20,6 +19,19 @@ class StringParser
     char
   end
 
+  def ungrab
+    @i -= 1    # FIXME what about eos...?
+  end
+
+  def next!
+    @line[@i + 1]
+  end
+
+  def prev
+    return nil if @i <= 0
+    @line[@i-1]
+  end
+
   def last?
     @i > @len - 1
   end
@@ -35,11 +47,14 @@ class StringParser
   end
 
   def skip_spaces
+    char = nil
     loop do
-      break if peek != " "
+      char = peek
       break if eos?
-      self.next
+      break if char != " "
+      grab
     end
+    char
   end
 
 end

data/lib/processor.rb

@@ -45,7 +45,7 @@ class Livetext
       raise GenericError.new("Error: #{err}") if raise_error
     end
 
-    def _disallowed?(name)
+    def disallowed?(name)
       Disallowed.include?(name.to_sym)
     end
 
@@ -71,8 +71,5 @@ class Livetext
       @sources.pop
       nil
     end
-
-
   end
-
 end