livetext 0.9.07 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb9d448129a6a48466dee41a2775829697a98a99126b934a2a2836c83a078363
-  data.tar.gz: 42ff4b5f39db113b4e4abf9c4c2d57d1210cf4fe4bf93e582c2f9725f93ef53c
+  metadata.gz: 2f49173986fc8a17fc77f35032e823f4818d404007d5aacd2d3d5a4a74f19e02
+  data.tar.gz: 61c0eab54d60c23abe0c27a6b8adc16f621e35c347253b557f07ffc80b31f80e
 SHA512:
-  metadata.gz: 14d559a7f7f1856300d47c2a6e0d1ba820d5b1bf45c40629547187670442f520a8b111aa2136b638ab4ae4c0a02ed42bcf2e3f040e1f1564685041108822a81c
-  data.tar.gz: 9f74fe5f520c98e562159f7616ab8bb75582ee580fa0192c2841dfc893a34e2ef199bff80248bd18dbb25531f297ff3176f3fc138ccbe9dc312e56091999bc75
+  metadata.gz: '07389bbd1154d200f6f56b0373c0459bf140baeefa370d789224f2dedd53fe5120f0f7116e2c9d1381ff07a48f945786bb8e5f3478ac9002aea0f9443f61f579'
+  data.tar.gz: 12829e57528407a55f842f8ad8de77b47396cb6fffb22d76feaf8d98d644ebf00fc50d447a24f453026980a7cb7631443e11f9f7d67121ce9529d583ef85e513

data/bin/livetext

@@ -72,7 +72,6 @@ loop do
       @backtrace = true
     when "-m", "--mixin"
       mod = ARGV.shift
-STDERR.puts "Got mod: #{mod}"
       x.mixin(ARGV.shift)
       next
     when "-s", "--stdin"

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.9.07"
+  VERSION = "0.9.11"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -74,6 +74,10 @@ 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
@@ -126,6 +130,7 @@ class Livetext
       when Comment
         handle_scomment(line)
       when Dotcmd
+#       STDERR.puts "line = #{line.inspect}"
         handle_dotcmd(line)
       when Ddotcmd
         indent = line.index("$") + 1
@@ -169,7 +174,7 @@ class Livetext
     self.body
   end
 
-  def xform_file(file)  # , vars: {})
+  def xform_file(file, vars: nil)
     Livetext::Vars.replace(vars) unless vars.nil?
     @_vars.replace(vars) unless vars.nil?
     self.process_file(file)
@@ -184,6 +189,7 @@ class Livetext
     enum = text.each
     @backtrace = btrace
     @main.source(enum, fname, 0)
+    line = nil
     loop do 
       line = @main.nextline
       break if line.nil?
@@ -192,6 +198,7 @@ class Livetext
     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 = ""
@@ -227,7 +234,9 @@ class Livetext
     end
     result
   rescue => err
-    @main._error!(err)
+    STDERR.puts "Error: #{err.inspect}"
+    STDERR.puts err.backtrace
+    # @main._error!(err)
     puts @body
     @body = ""
     return @body

data/lib/processor.rb

@@ -34,9 +34,12 @@ class Livetext
 
     def _error!(err, abort=true, trace=false)
       where = @sources.last || @save_location
-      puts @parent.body
-      STDERR.puts "Error: #{err} " # (at #{where[1]} line #{where[2]})"
+      # puts @parent.body
+      # puts "[lib/processor] Error: #{err}"
+      # puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
+      STDERR.puts "[lib/processor] Error: #{err}"  #  (at #{where[1]} line #{where[2]})"
       STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
+      # raise "lib/processor error!" # FIXME
       exit if abort
     end
 

data/lib/standard.rb

@@ -43,9 +43,11 @@ module Livetext::Standard
     _error! "Illegal name '#{funcname}'" if _disallowed?(funcname)
     func_def = <<-EOS
       def #{funcname}(param)
-        #{_body_text(true)}
+        #{_body.to_a.join("\n")}
       end
 EOS
+    _optional_blank_line
+    
     Livetext::Functions.class_eval func_def
   end
 
@@ -223,6 +225,26 @@ EOS
     end
   end
 
+  def variables!  # cwd, not FileDir - weird, fix later
+    prefix = _args[0]
+    file = _args[1]
+    prefix = nil if prefix == "-"  # FIXME dumb hack
+    if file
+      here = ""  # different for ! version
+      lines = File.readlines(here + file)
+    else
+      lines = _body
+    end
+    lines.map! {|x| x.sub(/# .*/, "").strip }  # strip comments
+    lines.each do |line|
+      next if line.strip.empty?
+      var, val = line.split(" ", 2)
+      val = FormatLine.var_func_parse(val)
+      var = prefix + "." + var if prefix
+      @parent._setvar(var, val)
+    end
+  end
+
   def variables
     prefix = _args[0]
     file = _args[1]
@@ -247,13 +269,21 @@ EOS
     eval _data.chomp
   end
 
+  def heredoc!   # adds <br>...
+    _heredoc(true)
+  end
+
   def heredoc
+    _heredoc
+  end
+
+  def _heredoc(bang=false)
     var = @_args[0]
     str = _body.join("\n")
     s2 = ""
     str.each_line do |s|
       str = FormatLine.var_func_parse(s.chomp)
-      s2 << str # + "<br>"
+      s2 << str + "<br>"
     end
     indent = @parent.indentation.last
     indented = " " * indent
@@ -278,8 +308,10 @@ EOS
         break if value
       end
 		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
 	
@@ -287,21 +319,25 @@ EOS
     # like include, but search upward as needed
     file = @_args.first
 		file = _seek(file)
-    _error!(file, "No such include file '#{file}'") unless file
+    _error!("No such include file #{file.inspect}") unless file
     @parent.process_file(file)
     _optional_blank_line
+  rescue => err
+    STDERR.puts ".seek error - #{err}"
+    STDERR.puts err.inspect
+	  return nil
   end
 
   def in_out  # FIXME dumb name!
     file, dest = *@_args
-    _check_existence(file, "No such include file '#{file}'")
+    _check_existence(file, "No such include file #{file.inspect}")
     @parent.process_file(file, dest)
     _optional_blank_line
   end
 
   def _include
-    file = @_args.first
-    _check_existence(file, "No such include file '#{file}'")
+    file = _format(@_args.first)  # allows for variables
+    _check_existence(file, "No such include file #{file.inspect}")
     @parent.process_file(file)
     _optional_blank_line
   end
@@ -348,9 +384,10 @@ EOS
         Dir.chdir("..") { mixin }
         return
       else
-        STDERR.puts "No such mixin '#{name}"
-        puts @body
-        exit!
+        raise "No such mixin '#{name}'"
+        # STDERR.puts "No such mixin '#{name}'"
+        # puts @body
+        # exit!
       end
     end
 

data/lib/userapi.rb

@@ -93,10 +93,10 @@ module Livetext::UserAPI
     else
       lines
     end
-  rescue => err
-    str = err.inspect + "\n"
-    str << err.backtrace.map {|x| "  " + x }.join("\n")
-    _error!(str)
+# rescue => err
+#   str = err.inspect + "\n"
+#   str << err.backtrace.map {|x| "  " + x }.join("\n")
+#   _error!(str)
   end
 
   def _body_text(raw=false)

data/test/data/block_comment/source.lt3

@@ -4,9 +4,9 @@ a comment
 .end
 abc 123
 xyz
-.comment     # and this is an extra-useless comment
+.comment
 And so is this.
-.end         # comment of dubious nature
+.end
 
 one
 more

data/test/data/error_inc_line_num/FOO

@@ -0,0 +1,21 @@
+[lib/processor] Error: Name 'foobar' is unknown
+Error was: #<RuntimeError: lib/processor error!> (calling @main._error!)
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/processor.rb:41:in `_error!'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:228:in `handle_dotcmd'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:130:in `process_line'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:192:in `block in process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `loop'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/standard.rb:341:in `_include'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:226:in `handle_dotcmd'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:130:in `process_line'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:192:in `block in process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `loop'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:88:in `block in <top (required)>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `loop'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `<top (required)>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `load'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `<main>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `eval'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `<main>'

data/test/data/error_inc_line_num/expected-err-line1match.txt

@@ -0,0 +1 @@
+Error: Name 'foobar' is unknown

data/test/data/error_inc_line_num/expected-output.txt

@@ -5,3 +5,9 @@ which includes file2 here:
   which has an error
   about an unknown command
   in line 5
+<p>
+
+  And this is file2 line 7.
+And here we are
+back in the
+original file.

data/test/data/error_invalid_name/expected-err-line1match.txt

@@ -1 +1 @@
-Error: Illegal name 'to_s' (at source.lt3 line 5)
+Error: Illegal name 'to_s'

data/test/data/error_mismatched_end/expected-err-line1match.txt

@@ -0,0 +1 @@
+Error: Mismatched 'end'

data/test/data/error_mismatched_end/expected-output.txt

@@ -4,3 +4,5 @@ without something
 beginning a block:
 <p>
 
+foo bar
+baz

data/test/data/error_missing_end/ERR

@@ -0,0 +1,32 @@
+[lib/processor] Error: #<RuntimeError: Expected .end, found end of file>
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/userapi.rb:88:in `_body'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/standard.rb:32:in `comment'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:226:in `handle_dotcmd'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:130:in `process_line'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:192:in `block in process_file'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `loop'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `process_file'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:88:in `block in <top (required)>'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `loop'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `<top (required)>'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `load'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `<main>'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `eval'
+  /Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `<main>'
+Error was: #<RuntimeError: lib/processor error!> (calling @main._error!)
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/processor.rb:41:in `_error!'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/userapi.rb:99:in `rescue in _body'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/userapi.rb:75:in `_body'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/standard.rb:32:in `comment'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:226:in `handle_dotcmd'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:130:in `process_line'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:192:in `block in process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `loop'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/lib/livetext.rb:189:in `process_file'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:88:in `block in <top (required)>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `loop'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.08/bin/livetext:57:in `<top (required)>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `load'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/livetext:23:in `<main>'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `eval'
+/Users/Hal/.rvm/gems/ruby-2.7.0/bin/ruby_executable_hooks:24:in `<main>'

data/test/data/error_missing_end/expected-err-line1match.txt

@@ -0,0 +1 @@
+Error: #<RuntimeError: Expected .end, found end of file>

data/test/data/error_missing_end/expected-output.txt

@@ -2,3 +2,4 @@ Blah
 blah
 <p>
 
+

data/test/data/error_name_not_permitted/expected-error.txt

@@ -1 +1 @@
-Error: Name 'class' is not permitted (at source.lt3 line 4)
+Error: Name 'class' is not permitted

data/test/data/error_no_such_copy/expected-err-line1match.txt

@@ -0,0 +1 @@
+Error: No such file 'nosuchfile.txt' to copy

data/test/data/error_no_such_copy/expected-output.txt

@@ -3,3 +3,7 @@ nonexistent file with .copy
 gives an error.
 <p>
 
+<p>
+
+Nothing to
+see here.

data/test/data/error_no_such_copy/source.lt3

@@ -1,3 +1,4 @@
+.debug
 Make sure a
 nonexistent file with .copy
 gives an error.

data/test/data/error_no_such_inc/expected-err-line1match.txt

@@ -0,0 +1 @@
+Error: No such include file 'nosuchinc.lt3'

data/test/data/error_no_such_inc/expected-output.txt

@@ -3,3 +3,7 @@ a nonexistent include
 will give an error.
 <p>
 
+<p>
+
+Nothing to
+see here.

data/test/data/error_no_such_mixin/expected-err-line1match.txt

@@ -0,0 +1 @@
+No such mixin 'nosuchthing'

data/test/data/error_no_such_mixin/expected-output.txt

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

data/test/data/functions/source.lt3

@@ -3,7 +3,7 @@ some functions
 here...
 
 .func myfunc
-"Eureka!"
+  "Eureka!"
 .end
 
 I am calling $$myfunc here...

data/test/data/lines.txt

@@ -118,3 +118,7 @@ Doubled underscore, midline
 This is __doubled, it seems
 This is <i>doubled</i>, it seems
 
+Underscore inside parens
+This is (_italicized and parenthesized)
+This is (<i>italicized</i> and parenthesized)
+

data/test/data/predef_vars/expected-output.txt

@@ -0,0 +1,6 @@
+Here we go...
+File = source.lt3
+FileDir = /Users/Hal/Dropbox/topx/git/livetext/test/data/predef_vars
+User = Hal
+Version = 0.9.11
+NoSuchVar = [NoSuchVar is undefined]

data/test/data/predef_vars/source.lt3

@@ -0,0 +1,6 @@
+Here we go...
+File = $File
+FileDir = $FileDir
+User = $User
+Version = $Version
+NoSuchVar = $NoSuchVar

data/test/test.rb

@@ -18,7 +18,7 @@ class TestingLivetext < MiniTest::Test
 
   TestLines = []
 
-  Dir.chdir `livetext --path`.chomp if ARGV.first == "cmdline"
+  Dir.chdir `livetext --path`.chomp.chomp if ARGV.first == "cmdline"
 
   Dir.chdir(Data)
 
@@ -31,7 +31,7 @@ class TestingLivetext < MiniTest::Test
     break if f.eof?
   end
 
-  if File.size("subset.txt") #  == 0
+  if File.size("subset.txt")  == 0
     puts "Defining via TestLines"
     TestLines.each.with_index do |item, i|
       msg, src, exp, blank = *item
@@ -51,8 +51,6 @@ class TestingLivetext < MiniTest::Test
   selected = File.readlines("subset.txt").map(&:chomp)
   Subset   = selected.empty? ? TestDirs : selected
 
-# puts "Subset = #{Subset.inspect}"
-
   Subset.each do |tdir|
     define_method("test_#{tdir}") do
       external_files(tdir)
@@ -60,11 +58,11 @@ class TestingLivetext < MiniTest::Test
   end
 
   def green(str)
-    "" + str + ""
+    "" + str.to_s + ""
   end
 
   def red(str)
-    "" + str + ""
+    "" + str.to_s + ""
   end
 
   def external_files(base)
@@ -85,14 +83,14 @@ class TestingLivetext < MiniTest::Test
 
       if File.exist?(expout_regex)
         rx_out = /#{Regexp.escape(File.read(expout_regex).chomp)}/
-        expected = "(match test)"
+        expected = rx_out # "(match test)"
       else
         expected = File.read(exp)
       end
 
       if File.exist?(experr_regex)
         rx_err = /#{Regexp.escape(File.read(experr_regex).chomp)}/
-        errexp = "(match test)"
+        errexp = rx_err  # "(match test)"
       else
         errexp = File.read(erx)
       end

data/test/testlines.rb

@@ -8,20 +8,30 @@ require 'formatline'
 input = ARGV.first || "test/data/lines.txt"
 data = File.readlines(input)
 
-data.each_slice(4) do |lines|
+pass = fail = 0
+data.each_slice(4).with_index do |lines, i|
   title, input, expected, blank = *lines
+  lnum = i*4 + 1
   input.chomp!
   expected.chomp!
   expected = eval(expected) if expected[0] == "/"
   
-  puts "-----------------------------"
-  print "Test:      #{title}"
 
   actual = FormatLine.parse!(input)
-  next if expected === actual
+  if expected === actual
+    pass += 1
+#   puts "PASS:      #{title}"
+    next
+  end
 
-  puts "Input:     #{input}"
+  fail += 1
+  puts "----------------------------- (line #{lnum})"
+  puts "Test:  #{title}"
+  puts "Input: #{input}"
   puts "  #{red('FAIL Expected: ')} #{expected.inspect}"
   puts "  #{red('     Actual  : ')} #{actual.inspect}"
   puts 
 end
+
+puts
+puts "#{pass} passes   #{fail} fails"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.07
+  version: 0.9.11
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2021-12-04 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -53,34 +53,34 @@ files:
 - test/data/def_method/expected-error.txt
 - test/data/def_method/expected-output.txt
 - test/data/def_method/source.lt3
-- test/data/error_inc_line_num/expected-error.txt
+- test/data/error_inc_line_num/FOO
+- test/data/error_inc_line_num/expected-err-line1match.txt
 - test/data/error_inc_line_num/expected-output.txt
 - test/data/error_inc_line_num/file2.lt3
 - test/data/error_inc_line_num/source.lt3
 - test/data/error_invalid_name/expected-err-line1match.txt
-- test/data/error_invalid_name/expected-error.txt
 - test/data/error_invalid_name/expected-output.txt
 - test/data/error_invalid_name/source.lt3
 - test/data/error_line_num/expected-err-line1match.txt
-- test/data/error_line_num/expected-error.txt
 - test/data/error_line_num/expected-output.txt
 - test/data/error_line_num/source.lt3
-- test/data/error_mismatched_end/expected-error.txt
+- test/data/error_mismatched_end/expected-err-line1match.txt
 - test/data/error_mismatched_end/expected-output.txt
 - test/data/error_mismatched_end/source.lt3
-- test/data/error_missing_end/expected-error.txt
+- test/data/error_missing_end/ERR
+- test/data/error_missing_end/expected-err-line1match.txt
 - test/data/error_missing_end/expected-output.txt
 - test/data/error_missing_end/source.lt3
 - test/data/error_name_not_permitted/expected-error.txt
 - test/data/error_name_not_permitted/expected-output.txt
 - test/data/error_name_not_permitted/source.lt3
-- test/data/error_no_such_copy/expected-error.txt
+- test/data/error_no_such_copy/expected-err-line1match.txt
 - test/data/error_no_such_copy/expected-output.txt
 - test/data/error_no_such_copy/source.lt3
-- test/data/error_no_such_inc/expected-error.txt
+- test/data/error_no_such_inc/expected-err-line1match.txt
 - test/data/error_no_such_inc/expected-output.txt
 - test/data/error_no_such_inc/source.lt3
-- test/data/error_no_such_mixin/expected-error.txt
+- test/data/error_no_such_mixin/expected-err-line1match.txt
 - test/data/error_no_such_mixin/expected-output.txt
 - test/data/error_no_such_mixin/source.lt3
 - test/data/example_alpha/expected-error.txt
@@ -100,6 +100,9 @@ files:
 - test/data/more_complex_vars/expected-error.txt
 - test/data/more_complex_vars/expected-output.txt
 - test/data/more_complex_vars/source.lt3
+- test/data/predef_vars/expected-error.txt
+- test/data/predef_vars/expected-output.txt
+- test/data/predef_vars/source.lt3
 - test/data/raw_lines/expected-error.txt
 - test/data/raw_lines/expected-output.txt
 - test/data/raw_lines/source.lt3
@@ -129,7 +132,6 @@ files:
 - test/data/table_with_heredocs/expected-error.txt
 - test/data/table_with_heredocs/expected-output.txt
 - test/data/table_with_heredocs/source.lt3
-- test/extratests.txt
 - test/formatting.rb
 - test/newtest
 - test/sdtest

data/test/data/error_inc_line_num/expected-error.txt

@@ -1 +0,0 @@
-Error: Name 'foobar' is unknown (at file2.lt3 line 5)

data/test/data/error_invalid_name/expected-error.txt

@@ -1 +0,0 @@
-Error: Illegal name 'to_s' (at source.lt3 line 5)

data/test/data/error_line_num/expected-error.txt

@@ -1 +0,0 @@
-Error: Name 'foobar' is unknown (at source.lt3 line 4)

data/test/data/error_mismatched_end/expected-error.txt

@@ -1 +0,0 @@
-Error: Mismatched 'end' (at source.lt3 line 6)

data/test/data/error_missing_end/expected-error.txt

@@ -1 +0,0 @@
-Error: Expecting .end, found end of file (at source.lt3 line 6)

data/test/data/error_no_such_copy/expected-error.txt

@@ -1 +0,0 @@
-Error: No such file 'nosuchfile.txt' to copy (at source.lt3 line 5)

data/test/data/error_no_such_inc/expected-error.txt

@@ -1 +0,0 @@
-Error: No such include file 'nosuchinc.lt3' (at source.lt3 line 5)

data/test/data/error_no_such_mixin/expected-error.txt

@@ -1 +0,0 @@
-Error: No such mixin 'nosuchthing' (at source.lt3 line 6)

data/test/extratests.txt

@@ -1,20 +0,0 @@
-Line starts with underscore
-_This for example
-<i>This</i> for example
-
-Line starts with double underscore
-__This, for example
-<i>This,</i> for example
-
-Line has embedded underscores
-This has some_embedded_underscores
-This has some_embedded_underscores
-
-Doubled underscore, midline
-This is __doubled, it seems
-This is <i>doubled,</i> it seems
-
-Line has escaped underscores
-This has some\_escaped\_underscores
-This has some_escaped_underscores
-