livetext 0.8.97 → 0.8.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42bc8ee5bb8b06789cb472fb038081a29fb00fce64583248ffe15f66cd88b9c8
-  data.tar.gz: 7a4acc91072072ae4dffe193ce4e410ecd7251ebe323fb3c038f76e8da5ee6d9
+  metadata.gz: 00f683f16256558d0502dbc0a5a9011579bdfead42ad47f917a625ba3a7797bf
+  data.tar.gz: d4d83f4c157fa9f0db83adb1d98a03b87f810e4c5ee7b38fc554d926cce8cfac
 SHA512:
-  metadata.gz: bd8c49581292b3fbf9a25849f0a3403f29dc73ac4e81bb115ef471a5fab413665e32d763b67571f6ecf095b273b36acdc61ff1790c5522d00c3b9de676395e38
-  data.tar.gz: 4573738653920bd64d296e3f9d65f909a10bf438942dabb0b92aac07a2f0d207e33bf5ed00ea5d89db8adcdd9fa655846f936c3ef11e19b13e14b005a53f8896
+  metadata.gz: dbc69eef5f3b013c94c3a9bc424ca811f78bb656c2f63328b065f1ccbb9e6ad1f138dde746ab11c71ae0f459ebc52a0c5b64f4831ac8043357e01b6b30147b26
+  data.tar.gz: d84a5d9b0c177e70163574208593248d1e4c87e252101a6a4e011e8b26369b0ddee8ca44eef3fa4c8beed0feb3581cd67570bf675305cb7a321606d03b3d2c98

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.97"
+  VERSION = "0.8.98"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -52,6 +52,28 @@ class Livetext
     @indentation = [0]
   end
 
+def _parse_colon_args(args, hash)  # really belongs in livetext
+  h2 = hash.dup
+  e = args.each
+  loop do
+    arg = e.next.chop.to_sym
+    raise "_parse_args: #{arg} is unknown" unless hash.keys.include?(arg)
+    h2[arg] = e.next
+  end
+  h2 = h2.reject {|k,v| v.nil? }
+  h2.each_pair {|k, v| raise "#{k} has no value" if v.empty? }
+  h2
+end
+
+def _get_arg(name, args)  # really belongs in livetext
+  raise "(#{name}) Expected an array" unless args.is_a? Array
+  raise "(#{name}) Expected an arg" if args.empty?
+  raise "(#{name}) Too many args: #{args.inspect}" if args.size > 1
+  val = args[0]
+  raise "Expected an argument '#{name}'" if val.nil?
+  val
+end
+
   def mixin(mod)
     @main._mixin(mod)
   end
@@ -89,16 +111,19 @@ class Livetext
     end
   end
 
-  def process(text)
+  def transform(text)
     _setfile!("(string)")
     enum = text.each_line
-    front = text.match(/.*?\n/).to_a.first.chomp
+    front = text.match(/.*?\n/).to_a.first.chomp rescue ""
     @main.source(enum, "STDIN: '#{front}...'", 0)
     loop do 
       line = @main.nextline
       break if line.nil?
       process_line(line)
     end
+    result = @body
+    @body = ""
+    result
   end
 
   # EXPERIMENTAL and incomplete
@@ -107,6 +132,7 @@ class Livetext
       when file && text.nil?
         xform_file(file)
       when file.nil? && text
+        transform(text)
       when file.nil? && text.nil?
         raise "Must specify file or text"
       when file && text
@@ -122,43 +148,43 @@ class Livetext
     self.body
   end
 
-  def transform(text)
-    _setfile!("(string)")
-    @output = ::Livetext.output
-    enum = text.each_line
-    front = text.match(/.*?\n/).to_a.first.chomp  rescue "..."
-    @main.source(enum, "STDIN: '#{front}...'", 0)
-    loop do 
-      line = @main.nextline
-      break if line.nil?
-      process_line(line)  # transform_line ???
-    end
-    @body
-  end
+#  def transform(text)
+#    _setfile!("(string)")
+#    @output = ::Livetext.output
+#    enum = text.each_line
+#    front = text.match(/.*?\n/).to_a.first.chomp  rescue "..."
+#    @main.source(enum, "STDIN: '#{front}...'", 0)
+#    loop do 
+#      line = @main.nextline
+#      break if line.nil?
+#      process_line(line)  # transform_line ???
+#    end
+#    @body
+#  end
 
 ## FIXME don't need process *and* process_text
 
-  def process_text(text)
-    _setfile!("(string)")
-    text = text.split("\n") if text.is_a? String
-    enum = text.each
-    @backtrace = false
-    front = text[0].chomp
-    @main.source(enum, "(text): '#{front}...'", 0)
-    loop do 
-      line = @main.nextline
-      break if line.nil?
-      process_line(line)
-    end
-    val = @main.finalize if @main.respond_to? :finalize
-    val
-  rescue => err
-    puts "process_text: err = #{err}"
-#   puts err.backtrace.join("\n")
-    puts @body
-    @body = ""
-    return @body
-  end
+#  def process_text(text)
+#    _setfile!("(string)")
+#    text = text.split("\n") if text.is_a? String
+#    enum = text.each
+#    @backtrace = false
+#    front = text[0].chomp
+#    @main.source(enum, "(text): '#{front}...'", 0)
+#    loop do 
+#      line = @main.nextline
+#      break if line.nil?
+#      process_line(line)
+#    end
+#    val = @main.finalize if @main.respond_to? :finalize
+#    val
+#  rescue => err
+#    puts "process_text: err = #{err}"
+##   puts err.backtrace.join("\n")
+#    puts @body
+#    @body = ""
+#    return @body
+#  end
 
 ## FIXME process_file[!] should call process[_text]
 
@@ -181,20 +207,20 @@ class Livetext
     @body = ""
   end
 
-  def process_file!(fname, backtrace=false)
-    _setfile(fname)
-    raise "No such file '#{fname}' to process" unless File.exist?(fname)
-    @main.output = StringIO.new
-    enum = File.readlines(fname).each
-    @backtrace = backtrace
-    @main.source(enum, fname, 0)
-    loop do 
-      line = @main.nextline
-      break if line.nil?
-      process_line(line)
-    end
-    @main.finalize if @main.respond_to? :finalize
-  end
+#  def process_file!(fname, backtrace=false)
+#    _setfile(fname)
+#    raise "No such file '#{fname}' to process" unless File.exist?(fname)
+#    @main.output = StringIO.new
+#    enum = File.readlines(fname).each
+#    @backtrace = backtrace
+#    @main.source(enum, fname, 0)
+#    loop do 
+#      line = @main.nextline
+#      break if line.nil?
+#      process_line(line)
+#    end
+#    @main.finalize if @main.respond_to? :finalize
+#  end
 
   def handle_scomment(line)
   end
@@ -215,6 +241,7 @@ class Livetext
 
   def handle_dotcmd(line, indent = 0)
     indent = @indentation.last # top of stack
+line = line.sub(/# .*$/, "")
     name = _get_name(line).to_sym
     result = nil
     if @main.respond_to?(name)

data/lib/standard.rb

@@ -307,7 +307,7 @@ EOS
     if File.exist?(file)
       # Just keep going...
     else
-      if File.expand_path(".").dirname != "/"
+      if File.dirname(File.expand_path(".")) != "/"
         Dir.chdir("..") { mixin }
         return
       else

data/test/data/block_comment/source.lt3

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

data/test/data/copy_is_raw/source.lt3

@@ -1,4 +1,4 @@
 A copy command 
 does not interpret its input:
-.copy rawtext.inc
+.copy rawtext.inc     # another useless comment
 That's all.

data/test/data/def_method/source.lt3

@@ -1,11 +1,11 @@
 .backtrace
 abc
 123
-.def foobar
+.def foobar     # yet another experimental comment
 ::STDERR.puts "This is the"
 ::STDERR.puts "foobar method"
 .end
 xyz
-.foobar
+.foobar     # and still another
 xyzzy
 123

data/test/data/simple_vars/source.lt3

@@ -3,5 +3,5 @@ some text.
 .set name=GulliverFoyle, nation=Terra
 Hi, there.
 $name is my name, and $nation is my nation.
-I'm $name, from $nation.
+I'm $name, from $nation\.
 That's all.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.97
+  version: 0.8.98
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com