livetext 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eb62fbb6a80a7c5f209a38632b6017bde607bcc
-  data.tar.gz: 6d598d34f8909fd4be5d33a483b4e9e84871a020
+  metadata.gz: 2b30201fdbfb90ab4042db07a2e2e13b8de01b4e
+  data.tar.gz: a7c1883fcd37443c7c2071cb3ca0f6ad96032d81
 SHA512:
-  metadata.gz: 3cf0a897527ee72bc908efa172fc8f46f53b45f765a75360db7c98dd19ac4d4d2111ba63f1ecb3bf7b01c4c2629f064f103323164bc5ea8f21c8af1ab4dfad86
-  data.tar.gz: 2337e79b8c029ba8d2a1b4cf6da4dae0600a5e6c19dce6d77f29756eb92cb19ca5320a2fc490529a9556874f2c10ba946270f97763f254bfc37960866bbfe4c2
+  metadata.gz: 9900907abf9f428f946177f7f5a74d396d6d507e00df40595c4edf9165c7ee0b03de1364321f95f4d324ab87265d600a60e5410adc68529b759248c757ae9997
+  data.tar.gz: 7fcaba27222d017d48304d77c1ee8f78fd38e11573f5f77be0d1e52d18a62c5db774e423e0d02dedd7792176e1fb9fbc4e6239ef0f2b6c1b5bcc953a51f421f0

data/lib/formatline.rb

@@ -46,7 +46,8 @@ class FormatLine
 
   def funcall(name, param)
     fobj = ::Livetext::Functions.new
-    fobj.param = param
+    ::Livetext::Functions.param = param
+# STDERR.puts "Calling '#{name}' with '#{param}'"
     fobj.send(name)
   end
 
@@ -56,6 +57,7 @@ class FormatLine
   end
 
   def fcall
+#   puts "Calling funcall: #@name(#@param)"
     @buffer << funcall(@fname, @param)
     @fname, @param = "", ""
   end

data/lib/functions.rb

@@ -3,11 +3,13 @@ require 'standard'  # FIXME
 class Livetext::Functions    # Functions will go here... user-def AND pre-def??
   Formats = ::Livetext::Standard::SimpleFormats
 
-  def initialize
-    @param = nil
+  @param = nil
+
+  def self.param
+    @param
   end
 
-  def param=(str)
+  def self.param=(str)
     @param = str
   end
 
@@ -20,9 +22,10 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
   end
 
   def simple_format(*args)
-    @param ||= "NO PARAMETER"
+    param = self.class.param
+    param ||= "NO PARAMETER"
     pairs = Formats.values_at(*args)
-    str = @param.dup
+    str = param.dup
     pairs.reverse.each do |pair|
       str = "#{pair.first}#{str}#{pair.last}"
     end

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.11"
+  VERSION = "0.8.12"
 end
 
 require 'fileutils'

data/lib/standard.rb

@@ -42,7 +42,7 @@ module Livetext::Standard
     funcname = @_args[0]
     _error! "Illegal name '#{funcname}'" if _disallowed?(funcname)
     func_def = <<-EOS
-      def #{funcname}
+      def #{funcname}(*args)
         #{_body_text(true)}
       end
     EOS

data/lib/userapi.rb

@@ -38,6 +38,7 @@ module Livetext::UserAPI
   end
 
   def _end?(str, sigil=".")
+    return false if str.nil?
     cmd = sigil + "end"
     return false if str.index(cmd) != 0 
     return false unless _trailing?(str[5])
@@ -65,6 +66,7 @@ module Livetext::UserAPI
     @save_location = @sources.last
     loop do
       @line = nextline
+      raise if @line.nil?
       break if _end?(@line, sigil)
       next if _comment?(@line, sigil)   # FIXME?
       @line = _formatting(@line) unless raw
@@ -77,7 +79,7 @@ module Livetext::UserAPI
       lines
     end
   rescue => err
-    p err, err.backtrace
+    # FIXME
     _error!("Expecting .end, found end of file")
   end
 

data/test/data/error_missing_end/source.lt3

@@ -1,3 +1,4 @@
+.backtrace
 Blah
 blah
 

data/test/data/functions/source.lt3

@@ -6,23 +6,6 @@ here...
 "Eureka!"
 .end
 
-.func sign
-  str = @_data
-  out = ""
-  wide = str.length + 2
-  out << " "*4 + "+"
-  wide.times { out << "-" }
-  out << "\n" + " "*4
-  out << "| #{str} |\n"
-  out << " "*4 + "+"
-  wide.times { out << "-" }
-  out << "\n\n "
-  STDERR.puts out
-  out
-.end
-
 I am calling $$myfunc here...
 Let's see 
 what happens.
-
-Now I'm trying to make $$sign[A SIGN HERE]...

data/test/sdtest

@@ -0,0 +1,6 @@
+
+sdiff test/data/$1/expected-output.txt /tmp/$1--actual-output.txt
+
+echo ==========
+
+sdiff test/data/$1/expected-error.txt /tmp/$1--actual-error.txt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -124,6 +124,7 @@ files:
 - test/data/single_raw_line/expected-output.txt
 - test/data/single_raw_line/source.lt3
 - test/newtest
+- test/sdtest
 - test/test.rb
 - test/try.lt
 - test/try2.lt