livetext 0.9.25 → 0.9.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f447e149e6724975184b8db2c51ff59c58752c3cb5b4037bb86fb1f355015a6
-  data.tar.gz: 9740fc3b2bb98e92c91c523656f270a66132d882fbcaa9b1a803294d1e10a65a
+  metadata.gz: 1744d4ccec6a1c997c1f37660276d9bbd13bc458b612e00ff90de5f0eab93261
+  data.tar.gz: 0ce2af2ed7e189f8128a94c93468f9044fdef6a044c4e551655ece97b6eaa3da
 SHA512:
-  metadata.gz: 1ee34071fde07e45b13d8f13aa9889d2b060651901acd8e3876071121ea5222c8bc4b83162c30f772c53fe92e07ea7bada3f28be0c75994f1ad21bcdacbb2905
-  data.tar.gz: ce9ed1ac2cd624818b775d19681a406f0a4c43c2a0b9a7f6f8c1f8fb9834b91301a2b65c10d1faa0c4b664a1abcb741c570d1745d996537f4d438e97b65e3f56
+  metadata.gz: 497f2e381f4ee255dc2b336fb6f287e136858e4d8daf96e6f652c321013d68e13139f41507e532bb1a57dd85b41afd6e8b5b6a35ce8f9cbb2b5b38eb7ccbde51
+  data.tar.gz: c5fcb435da4ee42395872a91f27ed5f2a1f67273f70b7e7bfdafe781b90a3170203bae9536ffd9dfb0e9af14e3cd0fde7a543c17e9aecdea1983fb4be8d74fd9

data/imports/bookish.rb

@@ -187,8 +187,7 @@ module Bookish
       cells = line.split(delim)
       api.out "<tr>"
       cells.each.with_index do |cell, i| 
-        api.out "  <td width=#{maxw}% valign=top>" + 
-              "#{cell}</td>"
+        api.out "  <td width=#{maxw[i]}% valign=top>#{cell}</td>"
       end
       api.out "</tr>"
     end

data/lib/livetext/errors.rb

@@ -13,3 +13,6 @@ def make_exception(sym, str, target_class = Object)
   end
 end
 
+make_exception(:EndWithoutOpening, "Error: found .end with no opening command")
+make_exception(:UnknownMethod,     "Error: name '%1' is unknown")
+

data/lib/livetext/formatline.rb

@@ -20,14 +20,21 @@ class Livetext::FormatLine < StringParser
 
   def self.parse!(line)
     return nil if line.nil?
-    x = self.new(line.chomp)
+    line.chomp!
+    x = self.new(line)
+::Livetext::TTY.puts "\n-- string: #{line.inspect}" if $testme
     t = x.tokenize
-    x.evaluate
+::Livetext::TTY.puts "\n-- Tokens: #{t.inspect}" if $testme
+    result = x.evaluate
+::Livetext::TTY.puts "\n-- result: #{result.inspect}\n " if $testme
+    result
   end
 
   def tokenize
     loop do 
-      case peek
+      ch = peek
+::Livetext::TTY.puts "\n-- #{__method__}: ch1 = #{ch.inspect}\n " if $testme
+      case ch
         when Escape; grab; add peek; grab
         when "$"
           dollar
@@ -41,6 +48,64 @@ class Livetext::FormatLine < StringParser
         else
           add peek
       end
+      ch = grab
+#     add ch
+::Livetext::TTY.puts "\n-- #{__method__}: !!! ch2 = #{ch.inspect}\n " if $testme
+    end
+    add_token(:str)
+    @tokenlist
+  end
+
+  def parse_formatting
+    loop do 
+      case peek
+        when Escape; grab; add peek; grab
+        when "*", "_", "`", "~"
+          marker peek
+          add peek
+        when LF
+          break if eos?
+        when nil
+          break
+        else
+          add peek
+      end
+      grab
+    end
+    add_token(:str)
+    @tokenlist
+  end
+
+  def self.get_vars
+    grab
+    case peek
+      when LF, " ", nil
+        add "$"
+        add_token :str
+      when "$"; double_dollar
+#     when "."; dollar_dot
+      when /[A-Za-z]/
+        add_token :str
+        var = peek + grab_alpha_dot
+        add_token(:var, var)
+    else 
+      add "$" + peek
+      add_token(:str)
+    end
+  end
+
+  def self.parse_var_func   # FIXME Hmm...
+    loop do 
+      case peek
+        when "$"
+          dollar
+        when LF
+          break if eos?
+        when nil
+          break
+        else
+          add peek
+      end
       grab
     end
     add_token(:str)
@@ -60,7 +125,7 @@ class Livetext::FormatLine < StringParser
     loop do
       char = self.grab
       break if char == LF || char == nil
-      self.handle_escaping if char == Escape
+      self.escaped if char == Escape
       self.dollar if char == "$"  # Could be $$
       self.add char
     end
@@ -76,7 +141,7 @@ class Livetext::FormatLine < StringParser
     loop do
       char = x.grab
       break if char == LF || char == nil
-      x.handle_escaping if char == Escape
+      x.escaped if char == Escape
       x.dollar if char == "$"  # Could be $$
       x.add char
     end
@@ -85,9 +150,20 @@ class Livetext::FormatLine < StringParser
     result
   end
 
-  def handle_escaping
-    grab
-    add grab
+  def self.parse_variables(str)
+    return nil if str.nil?
+    x = self.new(str.chomp)
+    char = x.peek
+    loop do
+      char = x.grab
+      break if char == LF || char == nil
+      x.escaped if char == Escape
+      x.dollar if char == "$"  # Could be $$
+      x.add char
+    end
+    x.add_token(:str)
+    result = x.evaluate
+    result
   end
 
   def embed(sym, str)
@@ -151,20 +227,31 @@ class Livetext::FormatLine < StringParser
   end
 
   def dollar
-    grab
-    case peek
-      when LF;  add "$";  add_token :str
-      when " "; add "$ "; add_token :str
-      when nil; add "$";  add_token :str
+    ch = grab         # "$"
+::Livetext::TTY.puts "\n-- #{__method__}: ch1 = #{ch.inspect}\n  self = #{self.inspect}" if $testme
+    ch = peek
+::Livetext::TTY.puts "\n-- #{__method__}: ch2 = #{ch.inspect}\n  self = #{self.inspect}" if $testme
+    case ch
+      when " "
+::Livetext::TTY.puts "\n-- #{__method__}: (space)" if $testme
+        add "$ "
+        add_token :str
+      when LF, nil
+::Livetext::TTY.puts "\n-- #{__method__}: (LF/nil)" if $testme
+        add "$"
+        add_token :str
       when "$"; double_dollar
 #     when "."; dollar_dot
       when /[A-Za-z]/
+::Livetext::TTY.puts "\n-- #{__method__}: (Alpha)" if $testme
         add_token :str
         var = peek + grab_alpha_dot
         add_token(:var, var)
     else 
-      add "$" + peek
-      add_token(:string)
+      ch = grab         # "$"
+::Livetext::TTY.puts "\n-- ch3 = #{ch.inspect}\n  self = #{self.inspect}" if $testme
+      add "$" + ch 
+      add_token(:str)
     end
   end
 

data/lib/livetext/funcall.rb

@@ -3,6 +3,90 @@ require_relative '../livetext'
 
 # Parse function calls
 
+module Livetext::LineParser::FunCall
+
+  include Livetext::ParsingConstants
+
+  def param_loop(char)
+    param = ""
+    loop do
+      case peek
+        when Escape
+          param << escaped
+        when char, LF, nil
+          break
+      else
+        param << grab
+      end
+    end
+    param = nil if param.empty?
+    param
+  end
+
+  def grab_colon_param
+    grab  # grab :
+    param = param_loop(Space)
+  end
+
+  def grab_bracket_param
+    grab # [
+    param = param_loop("]")
+    grab  # "]"
+    param
+  end
+
+  def funcall(name, param)
+    err = "[Error evaluating $$#{name}(#{param})]"
+    result = 
+      if self.send?(name, param)
+        # do nothing
+      else
+        fobj = ::Livetext::Functions.new
+        fobj.send(name, param) rescue err
+      end
+    result.to_s
+  end
+
+  def grab_func_with_param
+    add_token(:str, @token)
+    func = grab_alpha
+    add_token(:func, func)
+    param = grab_func_param    # may be null/missing
+    param
+  end
+
+  def double_dollar
+    case peek
+      when Space;   add_token :string, "$$ "; grab
+      when LF, nil; add "$$ "; add_token :str
+      when Alpha;   param = grab_func_with_param
+      else          grab; add_token :str, "$$" + peek
+    end
+  end
+
+  def grab_func_param
+    case peek
+      when "["
+        param = grab_bracket_param
+        add_token(:brackets, param)
+      when ":"
+        param = grab_colon_param
+        add_token(:colon, param)
+    else  # do nothing
+    end
+  end
+
+  def escaped
+    grab        # Eat the backslash
+    ch = grab   # Take next char
+    ch
+  end
+
+end
+
+
+# FIXME...
+
 module Livetext::FormatLine::FunCall
 
   include Livetext::ParsingConstants
@@ -10,13 +94,13 @@ module Livetext::FormatLine::FunCall
   def param_loop(char)
     param = ""
     loop do
-      case lookahead
+      case peek
         when Escape
           param << escaped
         when char, LF, nil
           break
       else
-        param << lookahead
+        param << peek
         grab
       end
     end

data/lib/livetext/global_helpers.rb

@@ -2,6 +2,7 @@
 module GlobalHelpers
 
   def check_disallowed(name)
+api.tty "GLOBAL cdis"
     raise DisallowedName(name) if disallowed?(name)
   end
 
@@ -34,4 +35,8 @@ module GlobalHelpers
 	  return nil
   end
 
+  def cwd_root?
+    File.dirname(File.expand_path(".")) == "/"
+  end
+
 end

data/lib/livetext/handler/import.rb

@@ -1,6 +1,8 @@
 
 require_relative '../helpers'
 
+# Handle a .import
+
 class Livetext::Handler::Import
   include Livetext::Helpers
   include GlobalHelpers
@@ -34,11 +36,5 @@ class Livetext::Handler::Import
     newmod   # return actual module
   end
 
-  private
-
-  def cwd_root?
-    File.dirname(File.expand_path(".")) == "/"
-  end
-
 end
 

data/lib/livetext/handler/mixin.rb

@@ -1,6 +1,8 @@
 
 require_relative '../helpers'
 
+# Handle a .mixin
+
 class Livetext::Handler::Mixin
   include Livetext::Helpers
   include GlobalHelpers
@@ -27,11 +29,5 @@ class Livetext::Handler::Mixin
     [modname, "module ::#{modname}; #{meths}\nend"]
   end
 
-  private
-
-  def cwd_root?
-    File.dirname(File.expand_path(".")) == "/"
-  end
-
 end
 

data/lib/livetext/helpers.rb

@@ -55,8 +55,10 @@ module Livetext::Helpers
     base  = "#{name}#{ext}"
     paths.each do |path|
       file = path + base
+::Livetext::TTY.puts  "   Checking: #{file}"
       return file if File.exist?(file)
     end
+::Livetext::TTY.puts  "   ...oops"
     return nil
   end
 
@@ -92,12 +94,12 @@ module Livetext::Helpers
   def process_line(line)
     success = true
     case line  # must apply these in order
-      when Comment
-        success = handle_scomment(line)
-      when DotCmd
-        success = handle_dotcmd(line)
-      when DollarDot
-        success = handle_dollar_dot
+    when Comment
+      success = handle_scomment(line)
+    when DotCmd
+      success = handle_dotcmd(line)
+    when DollarDot
+      success = handle_dollar_dot
     else
       api.passthru(line)  # must succeed?
     end
@@ -117,14 +119,11 @@ module Livetext::Helpers
     # FIXME Add cmdargs stuff... depends on name, etc.
     retval = @main.send(name)
     retval
-# rescue NoMethodError => err
-#   graceful_error(err)
   rescue => err
     graceful_error(err)
   end
 
   def handle_dotcmd(line, indent = 0)
-#   TTY.puts ">>> #{__method__} in #{__FILE__}" #  if ENV['debug']
     indent = @indentation.last # top of stack
     line = line.sub(/# .*$/, "")   # FIXME Could be problematic?
     name = get_name(line)
@@ -159,8 +158,7 @@ module Livetext::Helpers
   end
 
   def check_file_exists(file)
-#   raise FileNotFound(file) unless File.exist?(file)
-     return File.exist?(file)
+    return File.exist?(file)
   end
 
   def set_variables(pairs)