livetext 0.9.07 → 0.9.08

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb9d448129a6a48466dee41a2775829697a98a99126b934a2a2836c83a078363
-  data.tar.gz: 42ff4b5f39db113b4e4abf9c4c2d57d1210cf4fe4bf93e582c2f9725f93ef53c
+  metadata.gz: f983f97d1e649079c9ae7b8c059c099eb3fb4b70b3df8afa026aefad4009f83e
+  data.tar.gz: 5efeb66838ae1b36dff234d548e0835f6617af739c653d9e6af8888c68b09c02
 SHA512:
-  metadata.gz: 14d559a7f7f1856300d47c2a6e0d1ba820d5b1bf45c40629547187670442f520a8b111aa2136b638ab4ae4c0a02ed42bcf2e3f040e1f1564685041108822a81c
-  data.tar.gz: 9f74fe5f520c98e562159f7616ab8bb75582ee580fa0192c2841dfc893a34e2ef199bff80248bd18dbb25531f297ff3176f3fc138ccbe9dc312e56091999bc75
+  metadata.gz: 957fccd4430db4bd5dfcaa889829e753b180ee9a48635ba88769dd6e2645768cbff293c887d6202dcfc58474deaa56bc03ce18973f612ec138b85db636909988
+  data.tar.gz: 18c66b6647b1bd78c75b5bf4c7d0b7b5649fc2f403b1013dedec8a7e0203fa0758ef17f5fd7f731705a9428ac993e8a449b6092b551a4708d84bf13848bdfd1b

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.9.07"
+  VERSION = "0.9.08"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -126,6 +126,7 @@ class Livetext
       when Comment
         handle_scomment(line)
       when Dotcmd
+        STDERR.puts "line = #{line.inspect}"
         handle_dotcmd(line)
       when Ddotcmd
         indent = line.index("$") + 1
@@ -184,6 +185,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 +194,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,8 +230,10 @@ class Livetext
     end
     result
   rescue => err
+    STDERR.puts "Error was: #{err.inspect} (calling @main._error!)"
+    STDERR.puts err.backtrace
     @main._error!(err)
-    puts @body
+    # puts @body
     @body = ""
     return @body
   end

data/lib/processor.rb

@@ -35,7 +35,8 @@ 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]})"
+      STDERR.puts "[lib/processor] Error: #{err}"  #  (at #{where[1]} line #{where[2]})"
+      raise "lib/processor error!"
       STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
       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}'")
+    _check_existence(file, "No such include file #{file.inspect}")
     @parent.process_file(file)
     _optional_blank_line
   end
@@ -348,7 +384,7 @@ EOS
         Dir.chdir("..") { mixin }
         return
       else
-        STDERR.puts "No such mixin '#{name}"
+        STDERR.puts "No such mixin '#{name}'"
         puts @body
         exit!
       end

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/expected-err-line1match.txt

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

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_missing_end/expected-err-line1match.txt

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

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_inc/expected-err-line1match.txt

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

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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.07
+  version: 0.9.08
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -53,34 +53,32 @@ 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/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/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

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)