livetext 0.9.14 → 0.9.15

data/test/unit/parser/mixin.rb

@@ -3,7 +3,7 @@ require 'minitest/autorun'
 
 require_relative '../../../lib/parser/set'
 
-ParseSet = Livetext::ParseSet
+# ParseSet = Livetext::ParseSet
 
 class TestParseSet < MiniTest::Test
 

data/test/unit/parser/set.rb

@@ -13,7 +13,7 @@ class TestParseSet < MiniTest::Test
   def teardown
   end
 
-  def test_one_unquoted
+  def ztest_one_unquoted
     set = ParseSet.new('my_var_123 = 789').parse
     pair = set.first
     assert_equal pair, %w[my_var_123 789]
@@ -23,37 +23,38 @@ class TestParseSet < MiniTest::Test
     assert_equal pair, %w[var_234 naked_string]
   end
 
-  def test_one_single_quoted
+  def ztest_one_single_quoted
     set = ParseSet.new("fancy.var.name = 'simple string'").parse
     pair = set.first
     assert_equal pair, ["fancy.var.name", "simple string"]
   end
 
-  def test_one_double_quoted
+  def ztest_one_double_quoted
     set = ParseSet.new('fancy.var2 = "another string"').parse
     pair = set.first
     assert_equal pair, ["fancy.var2", "another string"]
   end
 
-  def test_multiple_unquoted
+  def ztest_multiple_unquoted
+puts __method__
     pair1, pair2 = ParseSet.new("this=345, that=678").parse
     assert_equal pair1, %w[this 345]
     assert_equal pair2, %w[that 678]
   end
 
-  def test_multiple_unquoted_quoted
+  def ztest_multiple_unquoted_quoted
     pair1, pair2 = ParseSet.new('alpha = 567, beta = "oh well"').parse
     assert_equal pair1, %w[alpha 567]
     assert_equal pair2, ["beta", "oh well"]
   end
 
-  def test_quote_embedded_comma
+  def ztest_quote_embedded_comma
     set = ParseSet.new('gamma = "oh, well"').parse
     pair = set.first
     assert_equal pair, ["gamma", "oh, well"]
   end
 
-  def test_get_var
+  def ztest_get_var
     @parse = ParseSet.new("foo=345")
     assert_equal @parse.get_var, "foo"
     @parse = ParseSet.new("foo = 345")
@@ -78,7 +79,7 @@ class TestParseSet < MiniTest::Test
     assert_raises(BadVariableName) { @parse.get_var }
   end
 
-  def test_skip_equal
+  def ztest_skip_equal
     @parse = ParseSet.new("=")
     assert_nil @parse.skip_equal
     @parse = ParseSet.new("   = ")
@@ -96,7 +97,7 @@ class TestParseSet < MiniTest::Test
     assert_raises(NoEqualSign) { @parse.skip_equal }
   end
 
-  def test_quoted_value
+  def ztest_quoted_value
     @parse = ParseSet.new(%['this'])
     assert_equal @parse.quoted_value, "this"
     @parse = ParseSet.new(%["that"])
@@ -118,7 +119,7 @@ class TestParseSet < MiniTest::Test
     #  - allow (escaped?) comma in quoted string
   end
 
-  def test_unquoted_value
+  def ztest_unquoted_value
     # Note: an unquoted value is still a string!
     @parse = ParseSet.new(%[342 ])
     assert_equal @parse.unquoted_value, "342"
@@ -139,7 +140,7 @@ class TestParseSet < MiniTest::Test
 
   # BUG: FormatLine doesn't know variables in this context!
 
-  def xtest_4
+  def xtest_4  # FIXME
     set = ParseSet.new("file = $File").parse
     assert_equal set.first, "file"
     assert set.last !~ /undefined/
@@ -148,10 +149,16 @@ class TestParseSet < MiniTest::Test
   # BUG: ...or functions.
   # (Additional bug: Failing silently seems wrong.)
 
-  def xtest_5
+  def xtest_5  # FIXME
     set = ParseSet.new("date = $$date").parse
     assert_equal set.first, "date"
     assert set.last =~ /^\d\d.\d\d.\d\d/
   end
 
+  def test_two_strings
+    line = %[bday="May_31", date="5/31"]
+    set = ParseSet.new(line).parse
+    assert set == [["bday", "May_31"], ["date", "5/31"]]
+  end
+
 end

data/test/unit/parser/string.rb

@@ -35,14 +35,14 @@ class TestStringParser < MiniTest::Test
     assert_equal @many.i, 0
   end
 
-  def test_next
-    assert_nil @zero.next
+  def test_grab
+    assert_nil @zero.grab
     assert_equal @zero.i, 0      # nothing happens
     
-    assert_equal @one.next, "x"
+    assert_equal @one.grab, "x"
     assert_equal @one.i, 1
 
-    assert_equal @many.next, "T"
+    assert_equal @many.grab, "T"
     refute @many.eos, "EOS was true for #{@many.inspect}"
     assert_equal @many.i, 1
   end
@@ -53,19 +53,19 @@ class TestStringParser < MiniTest::Test
     refute @many.eos?
   end
 
-  def test_next_eos
-    @zero.next
+  def test_grab_eos
+    @zero.grab
     assert @zero.eos?
     
-    @one.next
+    @one.grab
     assert @one.eos?
-    @one.next
+    @one.grab
     assert @one.eos?
 
-    @many.next
+    @many.grab
     refute @many.eos?
     count = @many.len    # doesn't make sense??
-    count.times { @many.next }
+    count.times { @many.grab }
     assert @many.eos?
   end
 
@@ -75,8 +75,8 @@ class TestStringParser < MiniTest::Test
     assert_equal @many.peek, @strN[0]
   end
 
-  def test_next_peek
-    char1 = @zero.next
+  def test_grab_peek
+    char1 = @zero.grab
     char2 = @zero.peek
     assert_nil char1
     assert_nil char2
@@ -87,7 +87,7 @@ class TestStringParser < MiniTest::Test
     refute @one.last?    # FIXME??
     char1 = @one.peek
     refute @one.last?    # FIXME??
-    char2 = @one.next
+    char2 = @one.grab
     char3 = @one.peek
     assert char1
     assert char2 == char1
@@ -97,7 +97,7 @@ class TestStringParser < MiniTest::Test
     assert @one.eos?     # FIXME??
 
     char1 = @many.peek
-    char2 = @many.next
+    char2 = @many.grab
     char3 = @many.peek
     assert char1
     assert char2 == char1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -20,6 +20,7 @@ files:
 - "./README.lt3"
 - "./README.md"
 - bin/livetext
+- lib/cmdargs.rb
 - lib/errors.rb
 - lib/formatline.rb
 - lib/functions.rb
@@ -28,6 +29,7 @@ files:
 - lib/livetext.rb
 - lib/livetext/importable.rb
 - lib/parser.rb
+- lib/parser/file.rb
 - lib/parser/general.rb
 - lib/parser/import.rb
 - lib/parser/mixin.rb
@@ -47,8 +49,6 @@ files:
 - test/affirm/lm-kbks.lt
 - test/all.rb
 - test/cleanup
-- test/formatting-tests.rb
-- test/formatting.rb
 - test/newtest
 - test/sdtest
 - test/snapshots.rb
@@ -59,6 +59,7 @@ files:
 - test/snapshots/block_comment/expected-error.txt
 - test/snapshots/block_comment/expected-output.txt
 - test/snapshots/block_comment/source.lt3
+- test/snapshots/clusion.txt
 - test/snapshots/comments_ignored_1/expected-error.txt
 - test/snapshots/comments_ignored_1/expected-output.txt
 - test/snapshots/comments_ignored_1/source.lt3
@@ -70,12 +71,18 @@ 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/actual-error.txt
+- test/snapshots/error_inc_line_num/actual-output.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/out-sdiff.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/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
@@ -83,20 +90,32 @@ 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
@@ -105,7 +124,6 @@ files:
 - test/snapshots/example_alpha2/expected-output.txt
 - test/snapshots/example_alpha2/source.lt3
 - test/snapshots/fixit
-- test/snapshots/formatting-tests.txt
 - test/snapshots/functions/expected-error.txt
 - test/snapshots/functions/expected-output.txt
 - test/snapshots/functions/source.lt3
@@ -129,6 +147,14 @@ files:
 - test/snapshots/simple_copy/expected-output.txt
 - test/snapshots/simple_copy/simplefile.inc
 - test/snapshots/simple_copy/source.lt3
+- test/snapshots/simple_import/actual-error.txt
+- test/snapshots/simple_import/actual-output.txt
+- test/snapshots/simple_import/err-sdiff.txt
+- test/snapshots/simple_import/expected-error.txt
+- test/snapshots/simple_import/expected-output.txt
+- test/snapshots/simple_import/out-sdiff.txt
+- test/snapshots/simple_import/simple_import.rb
+- test/snapshots/simple_import/source.lt3
 - test/snapshots/simple_include/expected-error.txt
 - test/snapshots/simple_include/expected-output.txt
 - test/snapshots/simple_include/simplefile.inc
@@ -149,6 +175,7 @@ files:
 - test/snapshots/table_with_heredocs/source.lt3
 - test/testlines.rb
 - test/unit/all.rb
+- test/unit/formatline.rb
 - test/unit/html.rb
 - test/unit/parser.rb
 - test/unit/parser/all.rb

data/test/formatting-tests.rb

@@ -1,35 +0,0 @@
-require 'minitest/autorun'
-
-require_relative '../lib/livetext'
-
-# Just another testing class. Chill.
-
-class TestingLivetext < MiniTest::Test
-
-  TestLines = []
-
-  items = []
-  formatting_tests = File.open("formatting-tests.txt")
-  loop do 
-    4.times { items << formatting_tests.gets.chomp }
-    # Blank line terminates each "stanza"
-    raise "Oops? #{items.inspect}" unless items.last.empty?
-    TestLines << items
-    break if formatting_tests.eof?
-  end
-
-  TestLines.each.with_index do |item, num|
-    msg, src, exp, blank = *item
-    define_method("test_formatting_#{num}") do
-      actual = FormatLine.parse!(src)
-      # FIXME could simplify assert logic?
-      if exp[0] == "/" # regex!   FIXME doesn't honor %r[...]
-        exp = Regexp.compile(exp[1..-2])   # skip slashes
-        assert_match(exp, actual, msg)
-      else
-        assert_equal(exp, actual, msg)
-      end
-    end
-  end
-end
-

data/test/formatting.rb

@@ -1,103 +0,0 @@
-require 'minitest/autorun'
-
-require_relative '../lib/livetext'
-
-class TestingLivetext < MiniTest::Test
-
-  TTY = File.open("/dev/tty","w")
-
-  dir  = ARGV.first == "cmdline" ? "../" : ""
-  Data = "#{dir}test/data"
-
-  TestLines = []
-
-  Dir.chdir `livetext --path`.chomp if ARGV.first == "cmdline"
-
-  Dir.chdir(Data)
-
-  f = File.open("lines.txt")
-  loop do 
-    item = []
-    4.times { item << f.gets.chomp }
-    raise "Oops? #{item.inspect}" unless item.last == ""
-    TestLines << item
-    break if f.eof?
-  end
-
-  if File.size("subset.txt") #  == 0
-    puts "Defining via TestLines"
-    TestLines.each.with_index do |item, i|
-      msg, src, exp, blank = *item
-      define_method("test_formatting_#{i}") do
-        actual = FormatLine.parse!(src)
-        if exp[0] == "/" # regex!
-          exp = Regexp.compile(exp[1..-2])   # skip slashes
-          assert_match(exp, actual, msg)
-        else
-          assert_equal(exp, actual, msg)
-        end
-      end
-    end
-  end
-
-  TestDirs = Dir.entries(".").reject {|f| ! File.directory?(f) } - %w[. ..]
-  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)
-    end
-  end
-
-  def green(str)
-    "" + str + ""
-  end
-
-  def red(str)
-    "" + str + ""
-  end
-
-  def external_files(base)
-    Dir.chdir(base) do
-      src, out, exp = "source.lt3", "/tmp/#{base}--actual-output.txt", "expected-output.txt"
-      err, erx = "/tmp/#{base}--actual-error.txt", "expected-error.txt"
-      cmd = "livetext #{src} >#{out} 2>#{err}"
-      system(cmd)
-      output, expected, errors, errexp = File.read(out), File.read(exp), File.read(err), File.read(erx)
-
-      out_ok = output == expected
-      err_ok = errors == errexp
-      nout = output.split("\n").size
-      nexp = expected.split("\n").size
-      bad_out = "--- Expected (#{nexp} lines): \n#{green(expected)}\n--- Output (#{nout} lines):  \n#{red(output)}\n"
-      bad_err = "--- Error Expected: \n#{green(errexp)}\n--- Error Output:  \n#{red(errors)}\n"
-
-      assert(out_ok, bad_out)
-      assert(err_ok, bad_err)
-      # only on success
-      system("rm -f #{out} #{err}") if out_ok && err_ok
-    end
-  end
-
-end
-
-
-=begin
-
-You can add any ordinary test method above. But so far, all these tests simply 
-call external_files.
-
-The external_files method works this way: 
-  - If the test (caller) method is test_my_silly_feature, then we will
-    look for a directory called data/my_silly_feature
-  - In here, there must be a source.lt3, expected-output.txt, and expected-error.txt
-  - Technically, any of these can be empty
-  - We run livetext on the source and compare actual vs expected (stdout, stderr)
-  - The "real" output gets checked first
-  - Of course, both must compare correctly for the test to pass
-
-=end
-

data/test/snapshots/formatting-tests.txt

@@ -1,124 +0,0 @@
-Check output of $$date
-Today is $$date, I guess
-/Today is \d\d\d\d-\d\d-\d\d, I guess/
-
-Check output of $$time
-Tick tock, it's $$time right now
-/Tick tock, it's \d\d:\d\d:\d\d right now/
-
-Trying $$b function, no param
-This is $$b being called
-This is <b>NO PARAMETER</b> being called
-
-Trying $$b function, brackets
-This is $$b[bold text] being called
-This is <b>bold text</b> being called
-
-Trying $$b function, unterminated brackets
-This is $$b[bold text being called
-This is <b>bold text being called</b>
-
-Trying $$b function, colon param
-This is $$b:token being called
-This is <b>token</b> being called
-
-Try $$i
-There is $$i[some text] here
-There is <i>some text</i> here
-
-Try $$t
-There is $$t[some text] here
-There is <font size=+1><tt>some text</tt></font> here
-
-Try $$s
-There is $$s[some text] here
-There is <strike>some text</strike> here
-
-Try $$bi
-There is $$bi[some text] here
-There is <b><i>some text</i></b> here
-
-Try $$bt
-There is $$bt[some text] here
-There is <b><font size=+1><tt>some text</tt></font></b> here
-
-Try $$bs
-There is $$bs[some text] here
-There is <b><strike>some text</strike></b> here
-
-Try $$it
-There is $$it[some text] here
-There is <i><font size=+1><tt>some text</tt></font></i> here
-
-Try $$is
-There is $$is[some text] here
-There is <i><strike>some text</strike></i> here
-
-Try $$ts
-There is $$ts[some text] here
-There is <font size=+1><tt><strike>some text</strike></tt></font> here
-
-Try $$bit
-There is $$bit[some text] here
-There is <b><i><font size=+1><tt>some text</tt></font></i></b> here
-
-Try $$bis
-There is $$bis[some text] here
-There is <b><i><strike>some text</strike></i></b> here
-
-Try $$bts
-There is $$bts[some text] here
-There is <b><font size=+1><tt><strike>some text</strike></tt></font></b> here
-
-Try $$its
-There is $$its[some text] here
-There is <i><font size=+1><tt><strike>some text</strike></tt></font></i> here
-
-Try $$bits 
-There is $$bits[some text] here
-There is <b><i><font size=+1><tt><strike>some text</strike></tt></font></i></b> here
-
-Escaped brackets inside bracketed function parameter
-Here is an $$t[\[:array, :expression\]] with escapes.
-Here is an <font size=+1><tt>[:array, :expression]</tt></font> with escapes.
-
-Escape brackets inside *
-There are brackets *[\[\]] here
-There are brackets <b>[]</b> here
-
-Escape brackets inside _
-There are brackets _[\[\]] here
-There are brackets <i>[]</i> here
-
-Escape brackets inside `
-There are brackets `[\[\]] here
-There are brackets <font size=+1><tt>[]</tt></font> here
-
-Escape brackets inside ~
-There are brackets ~[\[\]] here
-There are brackets <strike>[]</strike> here
-
-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
-
-Line has escaped underscores
-This has some\_escaped\_underscores
-This has some_escaped_underscores
-
-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)
-