livetext 0.9.23 → 0.9.26

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.23
+  version: 0.9.26
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-03-05 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -27,26 +27,31 @@ files:
 - imports/pyggish.rb
 - imports/tutorial.rb
 - lib/cmdargs.rb
-- lib/errors.rb
-- lib/formatline.rb
-- lib/funcall.rb
-- lib/functions.rb
-- lib/global_helpers.rb
-- lib/handler.rb
-- lib/handler/import.rb
-- lib/helpers.rb
-- lib/html.rb
 - lib/livetext.rb
-- lib/parser.rb
-- lib/parser/file.rb
-- lib/parser/general.rb
-- lib/parser/mixin.rb
-- lib/parser/set.rb
-- lib/parser/string.rb
-- lib/parsing.rb
-- lib/processor.rb
-- lib/standard.rb
-- lib/userapi.rb
+- lib/livetext/errors.rb
+- lib/livetext/formatline.rb
+- lib/livetext/funcall.rb
+- lib/livetext/functions.rb
+- lib/livetext/global_helpers.rb
+- lib/livetext/handler.rb
+- lib/livetext/handler/import.rb
+- lib/livetext/handler/mixin.rb
+- lib/livetext/helpers.rb
+- lib/livetext/html.rb
+- lib/livetext/lineparser.rb
+- lib/livetext/more.rb
+- lib/livetext/parser.rb
+- lib/livetext/parser/general.rb
+- lib/livetext/parser/set.rb
+- lib/livetext/parser/string.rb
+- lib/livetext/parsing.rb
+- lib/livetext/paths.rb
+- lib/livetext/processor.rb
+- lib/livetext/reopen.rb
+- lib/livetext/skeleton.rb
+- lib/livetext/standard.rb
+- lib/livetext/userapi.rb
+- lib/livetext/version.rb
 - livetext.gemspec
 - plugin/bookish.rb
 - plugin/calibre.rb
@@ -56,8 +61,12 @@ files:
 - plugin/tutorial.rb
 - test/all.rb
 - test/snapshots.rb
+- test/snapshots/basic_formatting/actual-error.txt
+- test/snapshots/basic_formatting/actual-output.txt
+- test/snapshots/basic_formatting/err-sdiff.txt
 - test/snapshots/basic_formatting/expected-error.txt
 - test/snapshots/basic_formatting/expected-output.txt
+- test/snapshots/basic_formatting/out-sdiff.txt
 - test/snapshots/basic_formatting/source.lt3
 - test/snapshots/block_comment/expected-error.txt
 - test/snapshots/block_comment/expected-output.txt
@@ -72,18 +81,14 @@ files:
 - test/snapshots/def_method/expected-error.txt
 - test/snapshots/def_method/expected-output.txt
 - test/snapshots/def_method/source.lt3
-- test/snapshots/error_inc_line_num/OUT
-- test/snapshots/error_inc_line_num/actual-error.txt
-- test/snapshots/error_inc_line_num/actual-output.txt
+- test/snapshots/error_inc_line_num/README.txt
 - test/snapshots/error_inc_line_num/expected-output.txt
 - test/snapshots/error_inc_line_num/file2.lt3
 - test/snapshots/error_inc_line_num/match-error.txt
 - test/snapshots/error_inc_line_num/source.lt3
-- test/snapshots/error_invalid_name/actual-error.txt
-- test/snapshots/error_invalid_name/actual-output.txt
 - test/snapshots/error_invalid_name/expected-output.txt
+- test/snapshots/error_invalid_name/foo
 - test/snapshots/error_invalid_name/match-error.txt
-- test/snapshots/error_invalid_name/out-sdiff.txt
 - test/snapshots/error_invalid_name/source.lt3
 - test/snapshots/error_line_num/expected-output.txt
 - test/snapshots/error_line_num/match-error.txt
@@ -91,32 +96,20 @@ files:
 - test/snapshots/error_mismatched_end/expected-output.txt
 - test/snapshots/error_mismatched_end/match-error.txt
 - test/snapshots/error_mismatched_end/source.lt3
-- test/snapshots/error_missing_end/actual-error.txt
-- test/snapshots/error_missing_end/actual-output.txt
 - test/snapshots/error_missing_end/expected-output.txt
 - test/snapshots/error_missing_end/match-error.txt
-- test/snapshots/error_missing_end/out-sdiff.txt
 - test/snapshots/error_missing_end/source.lt3
 - test/snapshots/error_name_not_permitted/expected-output.txt
 - test/snapshots/error_name_not_permitted/match-error.txt
 - test/snapshots/error_name_not_permitted/source.lt3
-- test/snapshots/error_no_such_copy/actual-error.txt
-- test/snapshots/error_no_such_copy/actual-output.txt
 - test/snapshots/error_no_such_copy/expected-output.txt
 - test/snapshots/error_no_such_copy/match-error.txt
-- test/snapshots/error_no_such_copy/out-sdiff.txt
 - test/snapshots/error_no_such_copy/source.lt3
-- test/snapshots/error_no_such_inc/actual-error.txt
-- test/snapshots/error_no_such_inc/actual-output.txt
 - test/snapshots/error_no_such_inc/expected-output.txt
 - test/snapshots/error_no_such_inc/match-error.txt
-- test/snapshots/error_no_such_inc/out-sdiff.txt
 - test/snapshots/error_no_such_inc/source.lt3
-- test/snapshots/error_no_such_mixin/actual-error.txt
-- test/snapshots/error_no_such_mixin/actual-output.txt
 - test/snapshots/error_no_such_mixin/expected-output.txt
 - test/snapshots/error_no_such_mixin/match-error.txt
-- test/snapshots/error_no_such_mixin/out-sdiff.txt
 - test/snapshots/error_no_such_mixin/source.lt3
 - test/snapshots/example_alpha/expected-error.txt
 - test/snapshots/example_alpha/expected-output.txt
@@ -149,8 +142,12 @@ files:
 - test/snapshots/more_complex_vars/expected-error.txt
 - test/snapshots/more_complex_vars/expected-output.txt
 - test/snapshots/more_complex_vars/source.lt3
+- test/snapshots/more_functions/actual-error.txt
+- test/snapshots/more_functions/actual-output.txt
+- test/snapshots/more_functions/err-sdiff.txt
 - test/snapshots/more_functions/expected-error.txt
 - test/snapshots/more_functions/expected-output.txt
+- test/snapshots/more_functions/out-sdiff.txt
 - test/snapshots/more_functions/source.lt3
 - test/snapshots/predef_vars/expected-error.txt
 - test/snapshots/predef_vars/match-output.txt
@@ -178,8 +175,12 @@ files:
 - test/snapshots/simple_mixin/expected-output.txt
 - test/snapshots/simple_mixin/simple_mixin.rb
 - test/snapshots/simple_mixin/source.lt3
+- test/snapshots/simple_vars/actual-error.txt
+- test/snapshots/simple_vars/actual-output.txt
+- test/snapshots/simple_vars/err-sdiff.txt
 - test/snapshots/simple_vars/expected-error.txt
 - test/snapshots/simple_vars/expected-output.txt
+- test/snapshots/simple_vars/out-sdiff.txt
 - test/snapshots/simple_vars/source.lt3
 - test/snapshots/single_raw_line/expected-error.txt
 - test/snapshots/single_raw_line/expected-output.txt
@@ -188,10 +189,18 @@ files:
 - test/snapshots/table_with_heredocs/expected-error.txt
 - test/snapshots/table_with_heredocs/expected-output.txt
 - test/snapshots/table_with_heredocs/source.lt3
+- test/snapshots/var_into_func/actual-error.txt
+- test/snapshots/var_into_func/actual-output.txt
+- test/snapshots/var_into_func/err-sdiff.txt
+- test/snapshots/var_into_func/expected-error.txt
+- test/snapshots/var_into_func/expected-output.txt
+- test/snapshots/var_into_func/out-sdiff.txt
+- test/snapshots/var_into_func/source.lt3
 - test/testlines.rb
 - test/unit/all.rb
 - test/unit/formatline.rb
 - test/unit/html.rb
+- test/unit/lineparser.rb
 - test/unit/parser.rb
 - test/unit/parser/all.rb
 - test/unit/parser/general.rb
@@ -200,6 +209,7 @@ files:
 - test/unit/parser/string.rb
 - test/unit/standard.rb
 - test/unit/stringparser.rb
+- test/unit/tokenizer.rb
 homepage: https://github.com/Hal9000/livetext
 licenses:
 - Ruby

data/lib/funcall.rb

@@ -1,93 +0,0 @@
-# p __FILE__
-
-require_relative 'livetext'
-# require_relative 'formatline'
-
-# Parse function calls
-
-module Livetext::FormatLine::FunCall
-
-  include Livetext::ParsingConstants
-
-  def grab_colon_param
-    grab  # grab :
-    param = ""
-    loop do 
-      case lookahead
-        when Escape
-          grab
-          param << lookahead
-          grab
-        when Space, LF, nil; break
-      else
-        param << lookahead
-        grab
-      end
-    end
-
-    param = nil if param.empty?
-    param
-  end
-
-  def grab_bracket_param
-    grab # [
-    param = ""
-    loop do 
-      case lookahead
-        when Escape
-          grab
-          param << lookahead
-          grab
-        when "]", LF, nil
-          break
-      else
-        param << lookahead
-        grab
-      end
-    end
-    add peek
-    grab
-    param = nil if param.empty?
-    param
-  end
-
-  def funcall(name, param)
-    err = "[Error evaluating $$#{name}(#{param})]"
-    func_name = name  # "func_" + name.to_s
-    result = 
-      if self.send?(func_name, param)  # self.respond_to?(func_name)
-        # do nothing
-      else
-        fobj = ::Livetext::Functions.new
-        fobj.send(name, param) rescue err
-      end
-    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
-  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
-    end
-  end
-
-end

data/lib/parser/file.rb

@@ -1,6 +0,0 @@
-
-# Hmm. not today?
-
-class Livetext::ParseFile
-
-end

data/lib/parser/mixin.rb

@@ -1,34 +0,0 @@
-require_relative '../helpers'  # FIXME This seems wrong
-
-make_exception(:NoEqualSign,     "Error: no equal sign found")
-
-class Livetext::ParseMixin
-  include Livetext::Helpers
-
-  def initialize(name)
-    @name = name
-    @file = find_file(name, ".rb", "plugin")
-  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)
-    newmod   # return actual module
-  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
-
-end
-

data/lib/userapi.rb

@@ -1,164 +0,0 @@
-# p __FILE__
-
-require_relative 'formatline'
-
-# UserAPI deals mostly with user-level methods.
-
-module Livetext::UserAPI
-
-  # FIXME I am tired of all my leading underscores...
-  # FIXME Q: Could this be converted into a class?? What about its
-  # interaction thru instance vars?
-
-  def setvar(var, val)
-    str, sym = var.to_s, var.to_sym
-    Livetext::Vars[str] = val
-    Livetext::Vars[sym] = val
-  end
-
-  def _check_existence(file, msg)
-    _error! msg unless File.exist?(file)
-  end
-
-  def _source
-    @input
-  end
-
-  def _args
-    @_args = _format(@_data).chomp.split
-    if block_given?
-      @_args.each {|arg| yield arg }
-    else
-      @_args
-    end
-  end
-
-  def _vars
-    @_vars.dup
-  end
-
-  def _optional_blank_line
-    peek = peek_nextline
-    return if peek.nil?
-    @line = nextline if peek =~ /^ *$/
-  end
-
-  def _comment?(str)
-    sigil = Livetext::Sigil
-    c1 = sigil + Livetext::Space
-    c2 = sigil + sigil + Livetext::Space
-    str.index(c1) == 0 || str.index(c2) == 0
-  end
-
-  def _trailing?(char)
-    return true if ["\n", " ", nil].include?(char)
-    return false
-  end
-
-  def _end?(str)
-    return true if str == ".end" || str =~ / *\$\.end/
-    return false
-  end
-
-  def _raw_body(tag = "__EOF__")
-    lines = []
-#   @save_location = @sources.last
-    loop do
-      @line = nextline
-      break if @line.nil?
-      break if @line.chomp.strip == tag
-      lines << @line
-    end
-    _optional_blank_line
-    if block_given?
-      lines.each {|line| yield line }
-    else
-      lines
-    end
-    lines
-  end
-
-  def _body(raw=false)
-    lines = []
-    end_found = false
-    loop do
-      @line = nextline
-      break if @line.nil?
-      @line.chomp!
-      break if _end?(@line)
-      next if _comment?(@line)
-      @line = _format(@line) unless raw
-      lines << @line 
-    end
-
-    raise "Expected .end, found end of file" unless _end?(@line)
-
-    _optional_blank_line
-    if block_given?
-      lines.each {|line| yield line }   # FIXME what about $. ?
-    else
-      lines
-    end
-  end
-
-  def _body_text(raw=false)
-    _raw_body.join("\n")
-  end
-
-  def _raw_body!
-    _raw_body(Livetext::Sigil).join("\n")
-  end
-
-  def _handle_escapes(str, set)
-    str = str.dup
-    set.each_char do |ch|
-      str.gsub!("\\#{ch}", ch)
-    end
-    str
-  end
-
-  def _format(line)
-    return "" if line == "\n" || line.nil?
-    line2 = Livetext::FormatLine.parse!(line)
-    line.replace(line2)
-    line
-  end
-
-  def _passthru(line)
-    return if @_nopass
-    _out "<p>" if line == "\n" and ! @_nopara
-    line = _format(line)
-    _out line
-  end
-
-  def _out(str = "", file = nil)
-    return if str.nil?
-    if file.nil?   # FIXME  do this elsewhere?
-      @parent.body << str 
-      @parent.body << "\n" unless str.end_with?("\n")
-    else
-      file.puts str
-    end
-  end
-
-  def _out!(str = "")
-    @parent.body << str  # no newline
-  end
-
-  def _puts(*args)
-    @output.puts *args 
-  end
-
-  def _print(*args)
-    @output.print *args 
-  end
-
-  def _debug=(val)
-    @_debug = val
-  end
-
-  def _debug(*args)
-    TTY.puts *args if @_debug
-  end
-
-end

data/test/snapshots/error_inc_line_num/actual-output.txt

@@ -1,17 +0,0 @@
-This is my 
-source file
-which includes file2 here:
-  This is file2
-  which has an error
-  about an unknown command
-  in line 5
-This is my 
-source file
-which includes file2 here:
-  This is file2
-  which has an error
-  about an unknown command
-  in line 5
-<p>
-
-  And this is file2 line 7.

data/test/snapshots/error_invalid_name/actual-error.txt

@@ -1,10 +0,0 @@
-/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:146:in `check_disallowed': Error: name 'to_s' is invalid (DisallowedName)
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:142:in `dot_def'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:101:in `handle_dotcmd'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:79:in `process_line'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:63:in `block in process_file'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:60:in `loop'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:60:in `process_file'
-	from ../../../bin/livetext:86:in `block in <main>'
-	from ../../../bin/livetext:57:in `loop'
-	from ../../../bin/livetext:57:in `<main>'

data/test/snapshots/error_invalid_name/out-sdiff.txt

@@ -1,6 +0,0 @@
-ACTUAL                                                      | EXPECTED                                                    
-                                                            > This file has
-                                                            > a defined method
-                                                            > that is invalid:
-                                                            > <p>
-                                                            >

data/test/snapshots/error_missing_end/actual-error.txt

@@ -1,10 +0,0 @@
-/Users/Hal/Dropbox/topx/git/livetext/lib/userapi.rb:92:in `_body': Expected .end, found end of file (RuntimeError)
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:48:in `comment'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:101:in `handle_dotcmd'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:79:in `process_line'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:63:in `block in process_file'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:60:in `loop'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:60:in `process_file'
-	from ../../../bin/livetext:86:in `block in <main>'
-	from ../../../bin/livetext:57:in `loop'
-	from ../../../bin/livetext:57:in `<main>'

data/test/snapshots/error_missing_end/out-sdiff.txt

@@ -1,6 +0,0 @@
-ACTUAL                                                      | EXPECTED                                                    
-                                                            > Blah
-                                                            > blah
-                                                            > <p>
-                                                            >
-                                                            >

data/test/snapshots/error_no_such_copy/actual-error.txt

@@ -1,10 +0,0 @@
-/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:150:in `check_file_exists': Error: file 'nosuchfile.txt' not found (FileNotFound)
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:255:in `copy'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:101:in `handle_dotcmd'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:79:in `process_line'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:63:in `block in process_file'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:60:in `loop'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:60:in `process_file'
-	from ../../../bin/livetext:86:in `block in <main>'
-	from ../../../bin/livetext:57:in `loop'
-	from ../../../bin/livetext:57:in `<main>'

data/test/snapshots/error_no_such_copy/out-sdiff.txt

@@ -1,5 +0,0 @@
-ACTUAL                                                      | EXPECTED                                                    
-                                                            > Make sure a
-                                                            > nonexistent file with .copy
-                                                            > gives an error.
-                                                            > <p>

data/test/snapshots/error_no_such_inc/actual-error.txt

@@ -1,10 +0,0 @@
-/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:150:in `check_file_exists': Error: file 'nosuchinc.lt3' not found (FileNotFound)
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:209:in `dot_include'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:101:in `handle_dotcmd'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:79:in `process_line'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:63:in `block in process_file'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:60:in `loop'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:60:in `process_file'
-	from ../../../bin/livetext:86:in `block in <main>'
-	from ../../../bin/livetext:57:in `loop'
-	from ../../../bin/livetext:57:in `<main>'

data/test/snapshots/error_no_such_inc/out-sdiff.txt

@@ -1,6 +0,0 @@
-ACTUAL                                                      | EXPECTED                                                    
-                                                            > Make sure 
-                                                            > a nonexistent include
-                                                            > will give an error.
-                                                            > <p>
-                                                            >

data/test/snapshots/error_no_such_mixin/actual-error.txt

@@ -1,13 +0,0 @@
-/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:36:in `find_file': No such mixin 'nosuchthing' (RuntimeError)
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/parser/mixin.rb:12:in `initialize'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/parser/mixin.rb:16:in `new'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/parser/mixin.rb:16:in `get_module'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:234:in `mixin'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:101:in `handle_dotcmd'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:79:in `process_line'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:63:in `block in process_file'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:60:in `loop'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:60:in `process_file'
-	from ../../../bin/livetext:86:in `block in <main>'
-	from ../../../bin/livetext:57:in `loop'
-	from ../../../bin/livetext:57:in `<main>'

data/test/snapshots/error_no_such_mixin/out-sdiff.txt

@@ -1,6 +0,0 @@
-ACTUAL                                                      | EXPECTED                                                    
-                                                            > Test that
-                                                            > we give an error
-                                                            > when a mixin does not
-                                                            > exist:
-                                                            > <p>