livetext 0.9.24 → 0.9.27

data/imports/pyggish.rb

@@ -83,21 +83,21 @@ module Pyggish
   end
 
   def fragment
-    lang = @_args.empty? ? :elixir : @_args.first.to_sym   # ruby or elixir
-    @_args = []
+    lang = api.args.empty? ? :elixir : api.args.first.to_sym   # ruby or elixir
+    api.args = []
     send(lang)
-    _out "\n"
+    api.out "\n"
   end
 
   def code       # FIXME ?
     text = ""   
-    _body {|line| _out "    " + line }
+    api.body {|line| api.out "    " + line }
   end
 
   def mono
-    _out "<pre>"
-    _body {|line| _out "    " + line }
-    _out "</pre>"
+    api.out "<pre>"
+    api.body {|line| api.out "    " + line }
+    api.out "</pre>"
   end
 
   def create_code_styles
@@ -145,28 +145,28 @@ module Pyggish
   end
 
   def ruby
-    file = @_args.first 
+    file = api.args.first 
     if file.nil?
       code = "  # Ruby code\n\n"
-      _body {|line| code << "  " + line + "\n" }
+      api.body {|line| code << "  " + line + "\n" }
     else
       code = "# Ruby code\n\n" + ::File.read(file)
     end
 
     html = format_ruby(code)
-    _out html
+    api.out html
   end
 
   def elixir
-    file = @_args.first 
+    file = api.args.first 
     if file.nil?
       code = ""
-      _body {|line| code << "  " + line + "\n" }
+      api.body {|line| code << "  " + line + "\n" }
     else
       code = ::File.read(file)
     end
 
     html = format_elixir(code)
-    _out html
+    api.out html
   end
 end

data/imports/tutorial.rb

@@ -7,22 +7,22 @@ module Tutorial
 
   def title(args = nil, body = nil)
     h1
-    _optional_blank_line
+    api.optional_blank_line
   end
 
   def section(args = nil, body = nil)
     h3
-    _optional_blank_line
+    api.optional_blank_line
   end
 
   def code(args = nil, body = nil)
     first = true  # dumb hack! fixes blank space
-    _body do |line| 
+    api.body do |line| 
       tag, first = "<pre>", false if first
-      _out "#{tag}   #{escape_html(line)}"   # indentation
+      api.out "#{tag}   #{escape_html(line)}"   # indentation
     end
-    _out "</pre>"
-    _optional_blank_line
+    api.out "</pre>"
+    api.optional_blank_line
   end
 
   def rx(str)
@@ -30,14 +30,14 @@ module Tutorial
   end
 
   def inout(args = nil, body = nil)
-    src, out = _args
+    src, out = api.args
     t1 = ::File.readlines(src) rescue (abort "t1 = #{src}")
     t2 = ::File.readlines(out) rescue (abort "t2 = #{out}")
     # To pacify markdown for README (FIXME later)
     t1 = t1.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
     t2 = t2.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
 
-    _out <<-HTML
+    api.out <<-HTML
       <table width=80% cellpadding=4>
       <tr>
         <td width=50%><b>Input</b></td>
@@ -53,7 +53,7 @@ module Tutorial
       </tr>
       </table>
     HTML
-    _optional_blank_line
+    api.optional_blank_line
   end
 
   def put_table(src, exp)
@@ -62,7 +62,7 @@ module Tutorial
     t1 = t1.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
     t2 = t2.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
 
-    _out <<-HTML
+    api.out <<-HTML
       <font size=+1>
       <table width=80% cellpadding=4>
       <tr>
@@ -83,13 +83,13 @@ module Tutorial
   end
 
   def testcase(args = nil, body = nil)
-    name = _args.first
-    _out "\n<font size=+1><b>Test: </font><font size=+2><tt>#{name}</tt></font></b></h3><br>"
+    name = api.args.first
+    api.out "\n<font size=+1><b>Test: </font><font size=+2><tt>#{name}</tt></font></b></h3><br>"
     src, exp = "test/snapshots/#{name}/source.lt3", "test/snapshots/#{name}/expected-output.txt"
-    @_args = [src, exp]   # Better way to do this??
+    api.args = [src, exp]   # Better way to do this??
     put_table(src, exp)
-    _out "<br>"
-    _optional_blank_line
+    api.out "<br>"
+    api.optional_blank_line
   end
 end
 

data/lib/cmdargs.rb

@@ -1,4 +1,3 @@
-# p __FILE__
 
 require_relative 'livetext'
 
@@ -80,13 +79,13 @@ class Livetext::CmdData
   def check_num_args(num)
     num_range = /(\d{0,2})(\.\.)(\d{0,2})/   # Not "really" right...
     min, max = 0, 9999
-    md = num_range.match(@nargs).to_a
+    mdata = num_range.match(@nargs).to_a
     bad_args = nil
     case 
       when @nargs == ":N"          # arbitrary
         # max already set
-      when md[2] == ".."           # range: 4..6 1.. ..4
-        vmin, vmax = md.values_at(1, 2)
+      when mdata[2] == ".."           # range: 4..6 1.. ..4
+        vmin, vmax = mdata.values_at(1, 2)
         min = Integer(vmin) unless vmin.empty?
         max = Integer(vmax) unless vmax.empty?
         min, max = Integer(min), Integer(max)
@@ -100,4 +99,8 @@ class Livetext::CmdData
     raise "Expected #{num} args but found #{@args.size}!" if bad_args
   end
 
+  def strip_comments(str)
+    str.sub!(/ # .*/, "")
+  end
+
 end

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

@@ -1,5 +1,3 @@
-# p __FILE__
-
 
 # More later?
 
@@ -10,8 +8,11 @@ def make_exception(sym, str, target_class = Object)
   define_method(sym) do |*args|
     args = [] unless args.first
     msg = str.dup
-    args.each.with_index {|arg, i| msg.sub!("%#{i+1}", arg) }
+    args.each.with_index {|arg, i| msg.sub!("%#{i+1}", arg.to_s) }
     target_class.class_eval(klass.to_s).new(msg)
   end
 end
 
+make_exception(:EndWithoutOpening, "Error: found .end with no opening command")
+make_exception(:UnknownMethod,     "Error: name '%1' is unknown")
+

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

@@ -1,23 +1,22 @@
 
-require_relative 'livetext'
+require_relative '../livetext'
 
 # Parse function calls
 
-module Livetext::FormatLine::FunCall
+module Livetext::LineParser::FunCall
 
   include Livetext::ParsingConstants
 
   def param_loop(char)
     param = ""
     loop do
-      case lookahead
+      case peek
         when Escape
           param << escaped
         when char, LF, nil
           break
       else
-        param << lookahead
-        grab
+        param << grab
       end
     end
     param = nil if param.empty?
@@ -38,9 +37,9 @@ module Livetext::FormatLine::FunCall
 
   def funcall(name, param)
     err = "[Error evaluating $$#{name}(#{param})]"
-    func_name = name  # "func_" + name.to_s
+    name = name.gsub(/\./, "__")
     result = 
-      if self.send?(func_name, param)  # self.respond_to?(func_name)
+      if self.send?(name, param)
         # do nothing
       else
         fobj = ::Livetext::Functions.new
@@ -49,32 +48,35 @@ module Livetext::FormatLine::FunCall
     result.to_s
   end
 
-  def double_dollar
-    case lookahead
-      when Space; add_token :string, "$$ "; grab; return
-      when LF, nil; add "$$"; add_token :str
-      when Alpha
-        add_token(:str, @token)
-        func = grab_alpha
-        add_token(:func, func)
-        param = grab_func_param    # may be null/missing
-      else
-        grab; add_token :str, "$$" + peek; return
-    end
+  def grab_func_with_param
+    add_token(:str, @token)
+    func = grab_alpha
+    add_token(:func, func)
+    param = grab_func_param(grab)    # may be null/missing
+    param
   end
 
-  def grab_func_param
-    case lookahead
-      when "["
-        param = grab_bracket_param
-        add_token(:brackets, param)
-      when ":"
-        param = grab_colon_param
-        add_token(:colon, param)
-    else  # do nothing
+  def double_dollar
+    case peek
+      when Space;   add_token :string, "$$ "; grab
+      when LF, nil; add "$$ "; add_token :str
+      when Alpha;   param = grab_func_with_param
+      else          grab; add_token :str, "$$" + peek
     end
   end
 
+#   def grab_func_param
+#     case peek
+#       when "["
+#         param = grab_bracket_param
+#         add_token(:brackets, param)
+#       when ":"
+#         param = grab_colon_param
+#         add_token(:colon, param)
+#     else  # do nothing
+#     end
+#   end
+
   def escaped
     grab        # Eat the backslash
     ch = grab   # Take next char
@@ -82,3 +84,4 @@ module Livetext::FormatLine::FunCall
   end
 
 end
+

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

@@ -1,5 +1,3 @@
-# p __FILE__
-
 
 # Class Functions is where '$$func' functions are stored dynamically... 
 # user-def AND pre-def??

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

@@ -1,14 +1,13 @@
-# p __FILE__
-
 
 module GlobalHelpers
 
   def check_disallowed(name)
+api.tty "GLOBAL cdis"
     raise DisallowedName(name) if disallowed?(name)
   end
 
   def check_file_exists(file)
-    raise FileNotFound(file) unless File.exist?(file)
+    graceful_error FileNotFound(file) unless File.exist?(file)
   end
 
   def grab_file(fname)
@@ -36,4 +35,8 @@ module GlobalHelpers
 	  return nil
   end
 
+  def cwd_root?
+    File.dirname(File.expand_path(".")) == "/"
+  end
+
 end

data/lib/{handler → livetext/handler}/import.rb

@@ -1,6 +1,8 @@
 
 require_relative '../helpers'
 
+# Handle a .import
+
 class Livetext::Handler::Import
   include Livetext::Helpers
   include GlobalHelpers
@@ -23,21 +25,16 @@ class Livetext::Handler::Import
     name
   end
 
-  def self.get_module(filename)
+  def self.get_module(filename, parent)
+# TTY.puts "#{__method__}: filename = #{filename.inspect}"
     handler = self.new(filename)
+    parent.graceful_error FileNotFound(filename) if handler.file.nil?
     @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/{handler → livetext/handler}/mixin.rb

@@ -1,19 +1,22 @@
 
 require_relative '../helpers'
 
+# Handle a .mixin
+
 class Livetext::Handler::Mixin
   include Livetext::Helpers
   include GlobalHelpers
 
   attr_reader :file
 
-  def initialize(name)
+  def initialize(name, parent)
     @name = name
     @file = find_file(name, ".rb", "plugin")
+    parent.graceful_error FileNotFound(name) if @file.nil?
   end
 
-  def self.get_module(filename)
-    handler = self.new(filename)
+  def self.get_module(filename, parent)
+    handler = self.new(filename, parent)
     modname, code = handler.read_mixin
     eval(code)   # Avoid in the future
     newmod = Object.const_get("::" + modname)
@@ -26,11 +29,5 @@ class Livetext::Handler::Mixin
     [modname, "module ::#{modname}; #{meths}\nend"]
   end
 
-  private
-
-  def cwd_root?
-    File.dirname(File.expand_path(".")) == "/"
-  end
-
 end
 

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

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

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

@@ -9,6 +9,14 @@ module Livetext::Helpers
   ESCAPING = { "'" => ''', '&' => '&', '"' => '"',
                '<' => '&lt;', '>' => '&gt;' }
 
+  def friendly_error(err)
+    return graceful_error(err) if self.respond_to?(:graceful_error)
+    return self.parent.graceful_error(err) if self.respond_to?(:parent)
+    raise err
+  rescue => myerr
+    TTY.puts "--- Warning: friendly_error #{myerr.inspect}"
+  end
+
   def escape_html(string)
     enc = string.encoding
     unless enc.ascii_compatible?
@@ -37,24 +45,21 @@ module Livetext::Helpers
   end
 
   def debug(*args)
-    puts(*args) if $debug
+    puts(*args) if ENV['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}/"), "./"]
+    paths = [Livetext::Path.sub(/lib.livetext/, "#{which}/"), "./"]
     base  = "#{name}#{ext}"
     paths.each do |path|
       file = path + base
+::Livetext::TTY.puts  "   Checking: #{file}"
       return file if File.exist?(file)
     end
-
-    raise "No such mixin '#{name}'"
-
-    # # Really want to search upward??
-    # raise "No such mixin '#{name}'" if cwd_root?
-    # Dir.chdir("..") { find_file(name) }
+::Livetext::TTY.puts  "   ...oops"
+    return nil
   end
 
   def self.rx(str, space=nil)
@@ -62,12 +67,13 @@ module Livetext::Helpers
   end
 
   Comment   = rx(Sigil, Space)
-  Dotcmd    = rx(Sigil)
+  DotCmd    = rx(Sigil)
   DollarDot = /^ *\$\.[A-Za-z]/
 
-## FIXME process_file[!] should call process[_text]
+## FIXME process_file[!] should call process[_text] ?
 
   def process_file(fname, btrace=false)
+    graceful_error FileNotFound(fname) unless File.exist?(fname)
     setfile(fname)
     text = File.readlines(fname)
     enum = text.each
@@ -77,81 +83,64 @@ module Livetext::Helpers
     loop do
       line = @main.nextline
       break if line.nil?
-      process_line(line)
+      success = process_line(line)
+      break unless success
     end
     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
+    return true
   end
 
   def process_line(line)
-    nomarkup = true
+    success = true
     case line  # must apply these in order
-      when Comment
-        handle_scomment(line)
-      when Dotcmd
-        handle_dotcmd(line)
-      when DollarDot
-        handle_dollar_dot
+    when Comment
+      success = handle_scomment(line)
+    when DotCmd
+      success = handle_dotcmd(line)
+    when DollarDot
+      success = handle_dollar_dot
     else
-      @main._passthru(line)
+      api.passthru(line)  # must succeed?
     end
+    success
   end
 
   def handle_dollar_dot
     indent = line.index("$") + 1
     @indentation.push(indent)
     line.sub!(/^ *\$/, "")
-    handle_dotcmd(line)
+    success = handle_dotcmd(line)
     indentation.pop
+    success
+  end
+
+  def invoke_dotcmd(name)
+    # FIXME Add cmdargs stuff... depends on name, etc.
+    retval = @main.send(name)
+    retval
+  rescue => err
+    graceful_error(err)
   end
 
   def handle_dotcmd(line, indent = 0)
     indent = @indentation.last # top of stack
-    line = line.sub(/# .*$/, "")
-    name = get_name(line).to_sym
-    result = nil
+    line = line.sub(/# .*$/, "")   # FIXME Could be problematic?
+    name = get_name(line)
+    success = true  # Be optimistic...  :P
     case
       when name == :end   # special case
-        puts @body
-        raise EndWithoutOpening()
+        graceful_error 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."
+        success = invoke_dotcmd(name)
     else
-      puts @body  # earlier correct output, not flushed yet
-      raise "Name '#{name}' is unknown"
-      return
+      graceful_error UnknownMethod(name)
     end
-    result
+    success
   end
 
   def handle_scomment(line)
+    return true
   end
 
   def get_name(line)
@@ -160,15 +149,16 @@ module Livetext::Helpers
     name = "dot_" + name if %w[include def].include?(name)
     @main.check_disallowed(name)
     @main.data = data
-    name
+    @main.api.data = data
+    name.to_sym
   end
 
   def check_disallowed(name)
-    raise DisallowedName(name) if disallowed?(name)
+    friendly_error DisallowedName(name) if disallowed?(name)
   end
 
   def check_file_exists(file)
-    raise FileNotFound(file) unless File.exist?(file)
+    return File.exist?(file)
   end
 
   def set_variables(pairs)
@@ -180,6 +170,9 @@ module Livetext::Helpers
 
   def grab_file(fname)
     File.read(fname)
+  rescue
+    ::STDERR.puts "Can't find #{fname.inspect} \n "
+	  return nil
   end
 
   def search_upward(file)
@@ -204,7 +197,7 @@ module Livetext::Helpers
   end
 
   def include_file(file)
-    @_args = [file]
+    api.args = [file]
     dot_include
   end
 

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

@@ -1,4 +1,3 @@
-# p __FILE__
 
 module HTMLHelper
 
@@ -17,9 +16,9 @@ module HTMLHelper
 
   def wrap(*tags)     # helper
     open, close = open_close_tags(*tags)
-    _out open
+    api.out open
     yield
-    _out close
+    api.out close
   end
 
   def open_close_tags(*tags)