livetext 0.9.25 → 0.9.26

data/lib/livetext/userapi.rb

@@ -1,10 +1,16 @@
 
-require_relative 'formatline'
+# require_relative 'formatline'   # FIXME  meh, because of #format
+require_relative 'lineparser'     # FIXME  meh, because of #format
 
 # Encapsulate the UserAPI as a class
 
 class Livetext::UserAPI
 
+  KBD = File.new("/dev/tty", "r")
+  TTY = File.new("/dev/tty", "w")
+
+  DotSpace = ". "  # Livetext::Sigil + Livetext::Space
+
   attr_accessor :data, :args
 
   def initialize(live)
@@ -12,11 +18,16 @@ class Livetext::UserAPI
     @vars = live.vars
   end
 
+  def api
+    @live.api
+  end
+
+  def dot
+    @live
+  end
+
   def setvar(var, val)
-    # FIXME don't like this...
-    str, sym = var.to_s, var.to_sym
-    Livetext::Vars[str] = val
-    Livetext::Vars[sym] = val
+    Livetext::Vars[var] = val  # Now indifferent and "safe"
   end
 
   def check_existence(file, msg)
@@ -24,6 +35,7 @@ class Livetext::UserAPI
   end
 
   def data=(value)
+# TTY.puts "in #{__FILE__}: api = #{@live.api.inspect}"
     @data = value
     @args = format(@data).chomp.split
   end
@@ -45,9 +57,7 @@ class Livetext::UserAPI
   end
 
   def comment?(str)
-    sigil = Livetext::Sigil
-    c1 = sigil + Livetext::Space
-    str.index(c1) == 0
+    str.index(DotSpace) == 0
   end
 
   def trailing?(char)
@@ -110,8 +120,7 @@ class Livetext::UserAPI
 
   def format(line)
     return "" if line == "\n" || line.nil?
-    line2 = Livetext::FormatLine.parse!(line)
-#   line.replace(line2)
+    line2 = Livetext::LineParser.parse!(line)
     line2
   end
 
@@ -133,6 +142,14 @@ class Livetext::UserAPI
     @live.body << str  # no newline
   end
 
+  def tty(*args)
+    TTY.puts *args
+  end
+
+  def err(*args)
+    STDERR.puts *args
+  end
+
   def puts(*args)
     @live.output.puts *args 
   end

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.25"
+  VERSION = "0.9.26"
 end

data/lib/livetext.rb

@@ -9,160 +9,11 @@ require_relative 'livetext/errors'
 require_relative 'livetext/standard'
 require_relative 'livetext/functions'
 require_relative 'livetext/userapi'
-require_relative 'livetext/formatline'
+# require_relative 'livetext/formatline'
+require_relative 'livetext/lineparser'
 require_relative 'livetext/processor'
 require_relative 'livetext/helpers'
 require_relative 'livetext/handler'
 
-
-
-make_exception(:EndWithoutOpening, "Error: found .end with no opening command")
-make_exception(:UnknownMethod,     "Error: name '%1' is unknown")
-
-# Class Livetext reopened (top level).
-
-class Livetext
-
-  include Helpers
-
-  Vars = {}
-
-TTY = ::File.open("/dev/tty", "w")
-
-  attr_reader :main, :sources
-  attr_accessor :nopass, :nopara
-  attr_accessor :body, :indentation
-
-  class << self
-    attr_accessor :output      # bad solution?
-  end
-
-  def vars
-    @_vars
-  end
-
-  def self.interpolate(str)
-    # FIXME There are issues here...
-    # Livetext::FormatLine.var_func_parse(str)
-    parse = Livetext::FormatLine.new(str)
-    parse.var_func_parse
-  end
-
-  def self.customize(mix: [], call: [], vars: {})
-    obj = self.new
-    mix  = Array(mix)
-    call = Array(call)
-    mix.each {|lib| obj.mixin(lib) }
-    call.each {|cmd| obj.main.send(cmd[1..-1]) }  # ignores leading dot, no param
-    vars.each_pair {|var, val| obj.setvar(var, val.to_s) }
-    obj
-  end
-
-  def peek_nextline
-    @main.peek_nextline  # delegate
-  end
-
-  def nextline
-    @main.nextline       # delegate
-  end
-
-  def sources
-    @main.sources        # delegate
-  end
-
-  def save_location
-    @save_location  # delegate
-  end
-
-  def save_location=(where)
-    @save_location = where  # delegate
-  end
-
-  def dump(file = nil)   # not a dot command!
-    file ||= ::STDOUT
-    file.puts @body
-  rescue => err
-    TTY.puts "#dump had an error: #{err.inspect}"
-  end
-
-  def graceful_error(err)
-    dump
-    raise err
-  end
-
-  def customize(mix: [], call: [], vars: {})
-    mix  = Array(mix)
-    call = Array(call)
-    mix.each {|lib| mixin(lib) }
-    call.each {|cmd| @main.send(cmd[1..-1]) }  # ignores leading dot, no param
-    vars.each_pair {|var, val| setvar(var, val.to_s) }
-    self
-  end
-
-  def initialize(output = ::STDOUT)
-    @source = nil
-    @_mixins = []
-    @_imports = []
-    @_outdir = "."
-    @no_puts = output.nil?
-    @body = ""
-    @main = Processor.new(self, output)
-    @indentation = [0]
-    @_vars = Livetext::Vars
-    initial_vars
-    @api = UserAPI.new(self)
-  end
-
-  def api
-    @api
-  end
-
-  def interpolate(str)
-  end
-
-  def initial_vars
-    # Other predefined variables (see also setfile)
-    setvar(:User, `whoami`.chomp)
-    setvar(:Version, Livetext::VERSION)
-  end
-
-  def transform(text)
-    setfile!("(string)")
-    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)
-    end
-    result = @body
-#   @body = ""
-    result
-  end
-
-  # EXPERIMENTAL and incomplete
-  def xform(*args, file: nil, text: nil, vars: {})
-    case
-      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
-        raise "Cannot specify file and text"
-    end
-    self.process_file(file)
-    self.body
-  end
-
-  def xform_file(file, vars: nil)
-    Livetext::Vars.replace(vars) unless vars.nil?
-    @_vars.replace(vars) unless vars.nil?
-    self.process_file(file)
-    self.body
-  end
-
-end
+require_relative 'livetext/more'
 

data/test/snapshots/basic_formatting/actual-output.txt

@@ -0,0 +1,13 @@
+Here are examples of <b>boldface</b>
+and <i>italics</i>
+and <font size=+1><tt>code</tt></font>
+as well as <b>ore complex</b>*examples 
+of <i>talicized text</i>
+and <font size=+1><tt>ode font</tt></font>
+<p>
+
+Here are some random punctuation marks:
+; # . * * ` ` @ % ^ & $
+<p>
+
+No need to escape these:  * * `

data/test/snapshots/basic_formatting/err-sdiff.txt

@@ -0,0 +1 @@
+ACTUAL                                                      | EXPECTED                                                    

data/test/snapshots/basic_formatting/out-sdiff.txt

@@ -0,0 +1,14 @@
+ACTUAL                                                      | EXPECTED                                                    
+Here are examples of <b>boldface</b>                        | Here are examples of <b>boldface</b> 
+and <i>italics</i>                                            and <i>italics</i>
+and <font size=+1><tt>code</tt></font>                        and <font size=+1><tt>code</tt></font>
+as well as <b>ore complex</b>*examples                      | as well as <b>more complex</b> examples 
+of <i>talicized text</i>                                    | of <i>italicized text</i>
+and <font size=+1><tt>ode font</tt></font>                  | and <font size=+1><tt>code font</tt></font>.
+<p>                                                           <p>
+
+Here are some random punctuation marks:                       Here are some random punctuation marks:
+; # . * * ` ` @ % ^ & $                                     | ; # . * _ ` : @ % ^ & $
+<p>                                                           <p>
+
+No need to escape these:  * * `                             | No need to escape these:  * _ `

data/test/snapshots/error_invalid_name/foo

@@ -0,0 +1,5 @@
+T
+a
+t
+<p>
+

data/test/snapshots/import_bookish/expected-output.txt

@@ -1,10 +1,10 @@
 <table cellpadding=2>
 <tr>
-  <td width=[0, 0]% valign=top>this</td>
-  <td width=[0, 0]% valign=top>that</td>
+  <td width=0% valign=top>this</td>
+  <td width=0% valign=top>that</td>
 </tr>
 <tr>
-  <td width=[0, 0]% valign=top>foo</td>
-  <td width=[0, 0]% valign=top>bar</td>
+  <td width=0% valign=top>foo</td>
+  <td width=0% valign=top>bar</td>
 </tr>
 </table>

data/test/snapshots/more_functions/actual-output.txt

@@ -0,0 +1,37 @@
+Testing some more functions here...
+<p>
+
+Here I am calling a function  with 
+a colon parameter...
+<p>
+
+<p>
+
+Next let's <b>do</b>*something with our parameter:
+<p>
+
+I'll call these variants...
+<p>
+
+"Motel" spelled backwards is letom :)
+<p>
+
+"lamina" reversed is animal
+<p>
+
+I can also use the erutaef tekcarb here.
+<p>
+
+If I don't use a parameter for [Error evaluating $$reverse()] - it gives
+me an error. (Bug or feature??)
+<p>
+
+What if a function doesn't use parameters at all, but
+we pass them? Hmm...
+<p>
+
+Now we succeed and succeed some more
+and finally we succeed in life.
+<p>
+
+But can we succeed, when our beds are burning?

data/test/snapshots/more_functions/err-sdiff.txt

@@ -0,0 +1 @@
+ACTUAL                                                      | EXPECTED                                                    

data/test/snapshots/more_functions/expected-output.txt

@@ -7,7 +7,7 @@ a colon parameter...
 
 <p>
 
-Next let's <b>do*</b> something with our parameter:
+Next let's <b>do</b> something with our parameter:
 <p>
 
 I'll call these variants...

data/test/snapshots/more_functions/out-sdiff.txt

@@ -0,0 +1,38 @@
+ACTUAL                                                      | EXPECTED                                                    
+Testing some more functions here...                           Testing some more functions here...
+<p>                                                           <p>
+
+Here I am calling a function  with                            Here I am calling a function  with 
+a colon parameter...                                          a colon parameter...
+<p>                                                           <p>
+
+<p>                                                           <p>
+
+Next let's <b>do</b>*something with our parameter:          | Next let's <b>do</b> something with our parameter:
+<p>                                                           <p>
+
+I'll call these variants...                                   I'll call these variants...
+<p>                                                           <p>
+
+"Motel" spelled backwards is letom :)                         "Motel" spelled backwards is letom :)
+<p>                                                           <p>
+
+"lamina" reversed is animal                                   "lamina" reversed is animal
+<p>                                                           <p>
+
+I can also use the erutaef tekcarb here.                      I can also use the erutaef tekcarb here.
+<p>                                                           <p>
+
+If I don't use a parameter for [Error evaluating $$reverse(   If I don't use a parameter for [Error evaluating $$reverse(
+me an error. (Bug or feature??)                               me an error. (Bug or feature??)
+<p>                                                           <p>
+
+What if a function doesn't use parameters at all, but         What if a function doesn't use parameters at all, but
+we pass them? Hmm...                                          we pass them? Hmm...
+<p>                                                           <p>
+
+Now we succeed and succeed some more                          Now we succeed and succeed some more
+and finally we succeed in life.                               and finally we succeed in life.
+<p>                                                           <p>
+
+But can we succeed, when our beds are burning?                But can we succeed, when our beds are burning?

data/test/snapshots/more_functions/source.lt3

@@ -10,7 +10,7 @@ Here I am calling a function $$just_do_it:foobar with
 a colon parameter...
 
 
-Next let's *do* something with our parameter:
+Next let's *do something with our parameter:
 
 .func reverse
   param.reverse   # just reverse it

data/test/snapshots/simple_vars/actual-output.txt

@@ -0,0 +1,6 @@
+Just
+some text.
+Hi, there.
+GulliverFoyle is my name, and Terra is my nation.
+I'm GulliverFoyle, from Terra
+That's all.

data/test/snapshots/simple_vars/err-sdiff.txt

@@ -0,0 +1 @@
+ACTUAL                                                      | EXPECTED                                                    

data/test/snapshots/simple_vars/out-sdiff.txt

@@ -0,0 +1,7 @@
+ACTUAL                                                      | EXPECTED                                                    
+Just                                                          Just
+some text.                                                    some text.
+Hi, there.                                                    Hi, there.
+GulliverFoyle is my name, and Terra is my nation.             GulliverFoyle is my name, and Terra is my nation.
+I'm GulliverFoyle, from Terra                               | I'm GulliverFoyle, from Terra.
+That's all.                                                   That's all.

data/test/snapshots/subset.txt

@@ -62,6 +62,8 @@ h This file specifies which snapshots will/won't be run.
 # intraline formatting
 
    basic_formatting         #  
+   test_formatting_34       # 
+   test_formatting_35       # 
 
 # Errors
 

data/test/snapshots/var_into_func/actual-output.txt

@@ -0,0 +1,16 @@
+<p>
+
+Testing STILL more functions here...
+<p>
+
+<p>
+
+Now... let's try passing a variable to a function. Will this work??
+<p>
+
+Variable \regal is regal, which reversed is ahpla$
+<p>
+
+That's all.
+<p>
+

data/test/snapshots/var_into_func/err-sdiff.txt

@@ -0,0 +1 @@
+ACTUAL                                                      | EXPECTED                                                    

data/test/snapshots/var_into_func/expected-output.txt

@@ -0,0 +1,16 @@
+<p>
+
+Testing STILL more functions here...
+<p>
+
+<p>
+
+Now... let's try passing a variable to a function. Will this work??
+<p>
+
+Variable $alpha is regal, which reversed is lager
+<p>
+
+That's all.
+<p>
+

data/test/snapshots/var_into_func/out-sdiff.txt

@@ -0,0 +1,17 @@
+ACTUAL                                                      | EXPECTED                                                    
+<p>                                                           <p>
+
+Testing STILL more functions here...                          Testing STILL more functions here...
+<p>                                                           <p>
+
+<p>                                                           <p>
+
+Now... let's try passing a variable to a function. Will thi   Now... let's try passing a variable to a function. Will thi
+<p>                                                           <p>
+
+Variable \regal is regal, which reversed is ahpla$          | Variable $alpha is regal, which reversed is lager
+<p>                                                           <p>
+
+That's all.                                                   That's all.
+<p>                                                           <p>
+

data/test/snapshots/var_into_func/source.lt3

@@ -0,0 +1,16 @@
+
+Testing STILL more functions here...
+
+
+.func reverse
+  param.reverse   # just reverse it
+.end
+
+Now... let's try passing a variable to a function. Will this work??
+
+.set alpha = regal
+
+Variable \$alpha is $alpha, which reversed is $$reverse:$alpha
+
+That's all.
+

data/test/unit/all.rb

@@ -1,4 +1,6 @@
 
 require_relative 'standard'
 require_relative 'parser'      # nested
-require_relative 'formatline'
+# require_relative 'formatline'
+require_relative 'lineparser'
+require_relative 'tokenizer'