livetext 0.9.22 → 0.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d2ff056cfc390401ec0517a7a74bb0eadf9128fff5eaff5c60a548775bdde9f
-  data.tar.gz: c76d7b425e3c19b0c44c752ff5705757415f60ee1d2647b538cfb9e6eb263ec3
+  metadata.gz: 8b1fc83442ee9361739a1d0024eebcaa342b3d75242824d0127644a03c2a6d12
+  data.tar.gz: c6bb5f661e43f438b65f40d4cb3b7f71a7ebb8a87951d6c157f932d418c0ea4a
 SHA512:
-  metadata.gz: bc98e86fdc72cbe0441ad2b80cbff64d3afbf4cae68eaba12e6e84ba5dd51913e6cdc9c687678782db61f64796347a2cf5d149e2eb74c4ed436634efa0c8b9fb
-  data.tar.gz: e6359fd712953b1579bb36d56b5dfd9546963064e4a5f08165ccf4a61dcc1de0a52374a15d7f038e63fe9ff00f25a5d3c0febdac501fea067399bf3c682075eb
+  metadata.gz: 17ac68b8a91831199d1e6effaca85add11311251cbf6388214219768ebba937198cebc6fe314bed95d8b5c8ddabf86672601be274fbfe26601a6622c899049e6
+  data.tar.gz: cce50c49518fc8440ba7295d9d7bd6d711307115106b8f707d3b2f7a2f38a470b6a21f0dfa4ca2345329621e9c400dab9ea7758b4ad68cf345201dea2fcc970c

data/README.lt3

@@ -1,5 +1,5 @@
-.icanhaz tutorial
-.icanhaz markdown
+.import tutorial
+.import markdown
 
 . copy basic.css
 

data/imports/tutorial.rb

@@ -3,7 +3,7 @@ require 'helpers'
 # Created as an "ad hoc" lib for generating the README
 
 module Tutorial
-  include Helpers
+  include Livetext::Helpers
 
   def title(args = nil, body = nil)
     h1

data/lib/cmdargs.rb

@@ -1,3 +1,5 @@
+# p __FILE__
+
 require_relative 'livetext'
 
 =begin

data/lib/errors.rb

@@ -1,3 +1,5 @@
+# p __FILE__
+
 
 # More later?
 

data/lib/formatline.rb

@@ -1,30 +1,14 @@
+# p __FILE__
+
+require_relative 'parsing'
+require_relative 'funcall'
+
 # Class FormatLine handles the parsing of comments, dot commands, and 
 # simple formatting characters.
 
-class FormatLine < StringParser
-  SimpleFormats     = {}
-  SimpleFormats[:b] = %w[<b> </b>]
-  SimpleFormats[:i] = %w[<i> </i>]
-  SimpleFormats[:t] = ["<font size=+1><tt>", "</tt></font>"]
-  SimpleFormats[:s] = %w[<strike> </strike>]
-
-  BITS = SimpleFormats.keys
- 
-  Null   = ""
-  Space  = " "
-  Alpha  = /[A-Za-z]/
-  AlNum  = /[A-Za-z0-9_]/
-  LF     = "\n"
-  LBrack = "["
-
-  Blank   = [" ", nil, "\n"]
-  Punc    = [")", ",", ".", " ", "\n"]
-  NoAlpha = /[^A-Za-z0-9_]/
-  NoAlphaDot = /[^.A-Za-z0-9_]/
-  Param   = ["]", "\n", nil]
-  Escape  = "\\"   # not an ESC char
-
-  Syms = { "*" => :b, "_" => :i, "`" => :t, "~" => :s }
+class Livetext::FormatLine < StringParser
+  include Livetext::ParsingConstants
+  include Livetext::FormatLine::FunCall
 
   attr_reader :out
   attr_reader :tokenlist
@@ -39,7 +23,6 @@ class FormatLine < StringParser
     return nil if line.nil?
     x = self.new(line.chomp)
     t = x.tokenize
-# TTY.puts "tokens = \n#{t.inspect}\n "
     x.evaluate
   end
 
@@ -47,7 +30,7 @@ class FormatLine < StringParser
 #   add grab
     loop do 
       case peek
-        when Escape; grab; add peek; grab; #  add peek  # <-- last is an error??
+        when Escape; grab; add peek; grab
         when "$"
           dollar
         when "*", "_", "`", "~"
@@ -82,7 +65,7 @@ class FormatLine < StringParser
       char = x.grab
       break if char == LF || char == nil
       x.handle_escaping if char == Escape
-      x.dollar if char == "$"
+      x.dollar if char == "$"  # Could be $$
       x.add char
     end
     x.add_token(:str)
@@ -121,18 +104,6 @@ class FormatLine < StringParser
     @out
   end
 
-  def grab_func_param
-    case lookahead
-      when "["
-        param = grab_bracket_param
-        add_token(:brackets, param)
-      when ":"
-        param = grab_colon_param
-        add_token(:colon, param)
-    else  # do nothing
-    end
-  end
-
   def add(str)
     @token << str unless str.nil?
   end
@@ -185,20 +156,6 @@ class FormatLine < StringParser
     end
   end
 
-  def double_dollar
-    case lookahead
-      when Space; add_token :string, "$$ "; grab; return
-      when LF, nil; add "$$"; add_token :str
-      when Alpha
-        add_token(:str, @token)
-        func = grab_alpha
-        add_token(:func, func)
-        param = grab_func_param    # may be null/missing
-      else
-        grab; add_token :str, "$$" + peek; return
-    end
-  end
-
 # def dollar_dot
 #   add_token :ddot, @line[@i..-1]
 # end
@@ -309,19 +266,6 @@ class FormatLine < StringParser
     ::STDERR.puts "ERR = #{err}\n#{err.backtrace}"
   end
 
-  def funcall(name, param)
-    err = "[Error evaluating $$#{name}(#{param})]"
-    func_name = name  # "func_" + name.to_s
-    result = 
-      if self.send?(func_name, param)  # self.respond_to?(func_name)
-        # do nothing
-      else
-        fobj = ::Livetext::Functions.new
-        fobj.send(name, param) rescue err
-      end
-    result.to_s
-  end
-
   def varsub(name)
     result = Livetext::Vars[name] || "[#{name} is undefined]"
     result
@@ -333,48 +277,6 @@ class FormatLine < StringParser
 
   private 
 
-  def grab_colon_param
-    grab  # grab :
-    param = ""
-    loop do 
-      case lookahead
-        when Escape
-          grab
-          param << lookahead
-          grab
-        when Space, LF, nil; break
-      else
-        param << lookahead
-        grab
-      end
-    end
-
-    param = nil if param.empty?
-    param
-  end
-
-  def grab_bracket_param
-    grab # [
-    param = ""
-    loop do 
-      case lookahead
-        when Escape
-          grab
-          param << lookahead
-          grab
-        when "]", LF, nil
-          break
-      else
-        param << lookahead
-        grab
-      end
-    end
-    add peek
-    grab
-    param = nil if param.empty?
-    param
-  end
-
   def eval_bits(sym, val)
     val = Livetext.interpolate(val)
     @out << embed(sym, val)

data/lib/funcall.rb

@@ -0,0 +1,93 @@
+# p __FILE__
+
+require_relative 'livetext'
+# require_relative 'formatline'
+
+# Parse function calls
+
+module Livetext::FormatLine::FunCall
+
+  include Livetext::ParsingConstants
+
+  def grab_colon_param
+    grab  # grab :
+    param = ""
+    loop do 
+      case lookahead
+        when Escape
+          grab
+          param << lookahead
+          grab
+        when Space, LF, nil; break
+      else
+        param << lookahead
+        grab
+      end
+    end
+
+    param = nil if param.empty?
+    param
+  end
+
+  def grab_bracket_param
+    grab # [
+    param = ""
+    loop do 
+      case lookahead
+        when Escape
+          grab
+          param << lookahead
+          grab
+        when "]", LF, nil
+          break
+      else
+        param << lookahead
+        grab
+      end
+    end
+    add peek
+    grab
+    param = nil if param.empty?
+    param
+  end
+
+  def funcall(name, param)
+    err = "[Error evaluating $$#{name}(#{param})]"
+    func_name = name  # "func_" + name.to_s
+    result = 
+      if self.send?(func_name, param)  # self.respond_to?(func_name)
+        # do nothing
+      else
+        fobj = ::Livetext::Functions.new
+        fobj.send(name, param) rescue err
+      end
+    result.to_s
+  end
+
+  def double_dollar
+    case lookahead
+      when Space; add_token :string, "$$ "; grab; return
+      when LF, nil; add "$$"; add_token :str
+      when Alpha
+        add_token(:str, @token)
+        func = grab_alpha
+        add_token(:func, func)
+        param = grab_func_param    # may be null/missing
+      else
+        grab; add_token :str, "$$" + peek; return
+    end
+  end
+
+  def grab_func_param
+    case lookahead
+      when "["
+        param = grab_bracket_param
+        add_token(:brackets, param)
+      when ":"
+        param = grab_colon_param
+        add_token(:colon, param)
+    else  # do nothing
+    end
+  end
+
+end

data/lib/functions.rb

@@ -1,5 +1,5 @@
+# p __FILE__
 
-require_relative 'standard'  # FIXME  umm, why is this necessary??
 
 # Class Functions is where '$$func' functions are stored dynamically... 
 # user-def AND pre-def??

data/lib/global_helpers.rb

@@ -0,0 +1,39 @@
+# p __FILE__
+
+
+module GlobalHelpers
+
+  def check_disallowed(name)
+    raise DisallowedName(name) if disallowed?(name)
+  end
+
+  def check_file_exists(file)
+    raise FileNotFound(file) unless File.exist?(file)
+  end
+
+  def grab_file(fname)
+    File.read(fname)
+  end
+
+  def search_upward(file)
+    value = nil
+    return file if File.exist?(file)
+
+    count = 1
+    loop do
+      front = "../" * count
+      count += 1
+      here = Pathname.new(front).expand_path.dirname.to_s
+      break if here == "/"
+      path = front + file
+      value = path if File.exist?(path)
+      break if value
+    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
+
+end

data/lib/handler/import.rb

@@ -1,6 +1,10 @@
 
+require_relative '../helpers'
+require_relative '../global_helpers'
+
 class Livetext::Handler::Import
-  include Helpers
+  include Livetext::Helpers
+  include GlobalHelpers
 
   attr_reader :file
 
@@ -9,15 +13,23 @@ class Livetext::Handler::Import
     @file = find_file(name)
   end
 
-  def self.get_module(name)
-    handler = self.new(name)
-    const1 = Object.constants
+  def self.get_mod_name
+    file = File.new(@file + ".rb")
+    str = nil
+    file.each_line do |line| 
+      str = line
+      break if str =~ /^module /
+    end
+    junk, name, junk2 = str.split
+    name
+  end
+
+  def self.get_module(filename)
+    handler = self.new(filename)
     @file = handler.file.sub(/.rb$/, "")
     require @file   # + ".rb"
-    const2 = Object.constants
-    names = (const2 - const1)
-    abort "Expected ONE new constant: #{names.inspect}" if names.size != 1
-    modname = names.first.to_s
+    modname = get_mod_name
+# TTY.puts "modname = #{modname.inspect}"
     newmod = Object.const_get("::" + modname)
     newmod   # return actual module
   end
@@ -28,8 +40,5 @@ class Livetext::Handler::Import
     File.dirname(File.expand_path(".")) == "/"
   end
 
-  def fname2module(name)
-  end
-
 end
 

data/lib/handler.rb

@@ -1 +1,3 @@
+# p __FILE__
+
 require_relative 'handler/import'

data/lib/helpers.rb

@@ -1,5 +1,7 @@
+# p __FILE__
 
-module Helpers
+
+module Livetext::Helpers
 
   Space = " "
   Sigil = "." # Can't change yet
@@ -23,8 +25,10 @@ module Helpers
     string.gsub(/['&\"<>]/, ESCAPING)
   end
 
-  def find_file(name, ext=".rb")
-    paths = [Livetext::Path.sub(/lib/, "imports/"), "./"]
+  def find_file(name, ext=".rb", which="imports")
+    failed = "#{__method__}: expected 'imports' or 'plugin'"
+    raise failed unless %w[imports plugin].include?(which)
+    paths = [Livetext::Path.sub(/lib/, "#{which}/"), "./"]
     base  = "#{name}#{ext}"
     paths.each do |path|
       file = path + base
@@ -61,7 +65,11 @@ module Helpers
       process_line(line)
     end
     val = @main.finalize rescue nil
-    @body
+    @body    # FIXME?   @body.join("\n")  # array
+  rescue StandardError => err
+# TTY.puts ">>> rescue in process_file!! (helpers)"
+#     TTY.puts @body
+    raise err
   end
 
   def process_line(line)

data/lib/html.rb

@@ -1,3 +1,5 @@
+# p __FILE__
+
 module HTMLHelper
 
   def wrapped(str, *tags)   # helper

data/lib/livetext.rb

@@ -1,11 +1,23 @@
+# p __FILE__
+
+require_relative 'parser/string'
+
 # Class Livetext skeleton (top level).
 
 class Livetext
-  VERSION = "0.9.22"
+  VERSION = "0.9.23"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 
   module Handler
   end
+
+  module ParsingConstants
+  end
+
+  class FormatLine < StringParser
+    module FunCall
+    end
+  end
 end
 
 require 'fileutils'
@@ -21,14 +33,15 @@ class Object
 end
 
 require_relative 'errors'
+require_relative 'standard'
 require_relative 'functions'
 require_relative 'userapi'
-require_relative 'standard'
 require_relative 'formatline'
 require_relative 'processor'
 require_relative 'helpers'
 require_relative 'handler'
 
+
 Plugins = File.expand_path(File.join(File.dirname(__FILE__), "../plugin"))
 Imports = File.expand_path(File.join(File.dirname(__FILE__), "../imports"))
 
@@ -57,6 +70,11 @@ class Livetext
     Livetext::Vars.dup
   end
 
+  def self.interpolate(str)
+    # FIXME There are issues here...
+    Livetext::FormatLine.var_func_parse(str)
+  end
+
   def self.customize(mix: [], call: [], vars: {})
     obj = self.new
     mix  = Array(mix)
@@ -88,6 +106,9 @@ class Livetext
     initial_vars
   end
 
+  def interpolate(str)
+  end
+
   def initial_vars
     # Other predefined variables (see also setfile)
     setvar(:User, `whoami`.chomp)

data/lib/parser/file.rb

@@ -1,6 +1,4 @@
 
-require_relative '../livetext'
-
 # Hmm. not today?
 
 class Livetext::ParseFile

data/lib/parser/general.rb

@@ -1,7 +1,4 @@
 
-require_relative '../livetext'
-require_relative 'string'
-
 make_exception(:MismatchedQuotes, "Error: mismatched quotes")
 make_exception(:NilValue,         "Error: nil value")
 make_exception(:NullString,       "Error: null string")

data/lib/parser/mixin.rb

@@ -1,15 +1,13 @@
-require_relative '../livetext'
-require_relative '../helpers'
-require_relative 'string'
+require_relative '../helpers'  # FIXME This seems wrong
 
 make_exception(:NoEqualSign,     "Error: no equal sign found")
 
 class Livetext::ParseMixin
-  include Helpers
+  include Livetext::Helpers
 
   def initialize(name)
     @name = name
-    @file = find_file(name)
+    @file = find_file(name, ".rb", "plugin")
   end
 
   def self.get_module(name)
@@ -17,8 +15,7 @@ class Livetext::ParseMixin
     modname, code = parse.read_mixin
     eval(code)   # Avoid in the future
     newmod = Object.const_get("::" + modname)
-    # return actual module
-    newmod
+    newmod   # return actual module
   end
 
   def read_mixin
@@ -33,6 +30,5 @@ class Livetext::ParseMixin
     File.dirname(File.expand_path(".")) == "/"
   end
 
-
 end
 

data/lib/parser/set.rb

@@ -1,7 +1,4 @@
 
-require_relative '../livetext'
-require_relative 'string'
-
 make_exception(:BadVariableName, "Error: invalid variable name")
 make_exception(:NoEqualSign,     "Error: no equal sign found")
 

data/lib/parser.rb

@@ -1,3 +1,5 @@
+# p __FILE__
+
 
 require_relative 'parser/string'
 require_relative 'parser/general'

data/lib/parsing.rb

@@ -0,0 +1,31 @@
+# p __FILE__
+
+
+# Constants for parsing
+
+module Livetext::ParsingConstants
+  SimpleFormats     = {}
+  SimpleFormats[:b] = %w[<b> </b>]
+  SimpleFormats[:i] = %w[<i> </i>]
+  SimpleFormats[:t] = ["<font size=+1><tt>", "</tt></font>"]
+  SimpleFormats[:s] = %w[<strike> </strike>]
+
+  BITS = SimpleFormats.keys
+ 
+  Null   = ""
+  Space  = " "
+  Alpha  = /[A-Za-z]/
+  AlNum  = /[A-Za-z0-9_]/
+  LF     = "\n"
+  LBrack = "["
+
+  Blank   = [" ", nil, "\n"]
+  Punc    = [")", ",", ".", " ", "\n"]
+  NoAlpha = /[^A-Za-z0-9_]/
+  NoAlphaDot = /[^.A-Za-z0-9_]/
+  Param   = ["]", "\n", nil]
+  Escape  = "\\"   # not an ESC char
+
+  Syms = { "*" => :b, "_" => :i, "`" => :t, "~" => :s }
+
+end