livetext 0.8.93 → 0.8.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f54d0984df3ed72f1e75e93088d4df2287d00baad296c0002da2c558fca79e
-  data.tar.gz: 6190f65650f8680d9e72093913667d336a7998fbefd3c4d1ae2409004d86d38c
+  metadata.gz: 3e03684f43c00dc08a44a65d67d2e768f722bb676ffadd84ad39e464c538f831
+  data.tar.gz: 7aa534fd733a6ec1d0315a4a534ff2a7027a28dcec2f3ca4da272bdfcca09d9d
 SHA512:
-  metadata.gz: 4e87c966f8ad0b0200135e70c6f07f7b73d898fa9081b50fce3f06c05eda799cdfa8d02d189ecea5fe080040aa878e543a55e8ab369600945e4c1594eae7807a
-  data.tar.gz: edb16b91ac8501388e3aecb72b96a99b3ff09f7b9d23d09a65b0e4668b94df35f7e1818eb8943519849711042bb8f5dfd413d98fc4cab4496124ef57b6f26203
+  metadata.gz: 2df6ccff1729ed6ac747a42f210389eb0cee162189bf707e9ebb6eaf7b2c36ee58464ee33e2dc4b5e0e940253707a7a124786d710dfc98441dedcbfeba1ed7e4
+  data.tar.gz: bbfb6363c513dde5d0c505ffa0c06231c045708cbe6357036a466a5fffff8cd31eb33540282d2263dba2dda8e25b7412fd68346f8f427b7b1fde44dcf49ca46d

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.93"
+  VERSION = "0.8.94"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -195,11 +195,14 @@ return @body
 
   def handle_dotcmd(line, indent = 0)
     indent = @indentation.last # top of stack
-    name = _get_name(line)
+    name = _get_name(line).to_sym
     result = nil
     if @main.respond_to?(name)
       result = @main.send(name)
     else
+      TTY.puts "version = #{Livetext::VERSION}"
+      TTY.puts "#{(@main.methods - Object.methods).sort.inspect}"
+      TTY.puts name.inspect
       @main._error! "Name '#{name}' is unknown"
       return
     end

data/lib/standard.rb

@@ -162,7 +162,7 @@ EOS
     # FIXME *Must* allow for vars/functions
     assigns.each do |a| 
       var, val = a.split("=")
-STDERR.puts "-- var=val  #{[var, val].inspect}"
+# STDERR.puts "-- var=val  #{[var, val].inspect}"
       var.strip!
       val.strip!
       val = val[1..-2] if val[0] == ?" && val[-1] == ?"
@@ -173,6 +173,83 @@ STDERR.puts "-- var=val  #{[var, val].inspect}"
     _optional_blank_line
   end
 
+  def _assign_get_var(c, e)
+    name = c
+    loop do 
+      c = e.peek
+      case c
+        when /[a-zA-Z_\.0-9]/
+          name << e.next
+          next
+        when / =/ 
+          return name
+      else
+        raise "Error: did not expect #{c.inspect} in variable name"
+      end
+    end
+    raise "Error: loop ended parsing variable name"
+  end
+
+  def _assign_skip_equal(e)
+    loop { break if e.peek != " "; e.next }
+    if e.peek == "="
+      e.next  # skip spaces too
+      loop { break if e.peek != " "; e.next }
+    else
+      raise "Error: expect equal sign"
+    end
+  end
+
+  def _quoted_value(quote, e)
+    value = ""
+    loop do 
+      c = e.next
+      break if c == quote
+      value << c
+    end
+    value
+  end
+
+  def _unquoted_value(e)
+    value = ""
+    loop do 
+      c = e.next
+      break if c == " " || c == ","
+      value << c
+    end
+    value
+  end
+
+  def _assign_get_value
+    c = e.peek
+    value = ""
+    case c
+      when ?", ?'
+        value = _quoted_value(c, e)
+    else
+      value = _unquoted_value(e)
+    end
+    c = e.peek
+    value
+  end
+
+  def set_NEW
+    line = _data.dup  # dup needed?
+    e = line.each_char  # enum
+    loop do 
+      c = e.next
+      case c
+        when /a-z/i
+          _assign_get_var(c, e)
+          _assign_skip_equal
+        when " "
+          next
+      else
+        raise "set: Huh? line = #{line}"
+      end
+    end
+  end
+
   def variables
     _body.each do |line|
       next if line.strip.empty?
@@ -231,7 +308,7 @@ STDERR.puts "-- var=val  #{[var, val].inspect}"
     # like include, but search upward as needed
     file = @_args.first
 		file = _seek(file)
-STDERR.puts "---- _seek found: #{file.inspect}"
+# STDERR.puts "---- _seek found: #{file.inspect}"
     _error!(file, "No such include file '#{file}'") unless file
     @parent.process_file(file)
     _optional_blank_line
@@ -303,9 +380,7 @@ STDERR.puts "---- _seek found: #{file.inspect}"
     meths = grab_file(file)
     modname = name.gsub("/","_").capitalize
     string = "module ::#{modname}; #{meths}\nend"
-# puts "==========="
-# string.each_line.with_index {|line, i| puts "#{'%3d' % (i+1)} : #{line}" }
-# puts "==========="
+
     eval(string)
     newmod = Object.const_get("::" + modname)
     self.extend(newmod)

data/lib/userapi.rb

@@ -59,7 +59,7 @@ module Livetext::UserAPI
 
   def _raw_body(tag = "__EOF__")
     lines = []
-    @save_location = @sources.last
+#   @save_location = @sources.last
     loop do
       @line = nextline
       break if @line.nil?
@@ -77,7 +77,7 @@ module Livetext::UserAPI
 
   def _body(raw=false)
     lines = []
-    @save_location = @sources.last
+#   @save_location = @sources.last
     end_found = false
     loop do
       @line = nextline

metadata

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