livetext 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c91ce7a249cbd6ed27e1f538022a9e3fbc6d435
-  data.tar.gz: 99a2002ac810d323423651ebcd9a0a9964ccb12a
+  metadata.gz: 67d7f430d05e96f3d8a7f941cce5cb20b5f9a1d7
+  data.tar.gz: 4bf62b576d115e8e2f80e03c917d9d360d05a0d6
 SHA512:
-  metadata.gz: 6c7f6358e3f32cd1a5e2cf0e7fb915a6eca1add56f4cbbeee43c51f929a134d66fc8ff34aaeb80df22f4b900d8d9fe0501c9593bfcb36acf1983b4dd53ee62c3
-  data.tar.gz: 9e4074bc5af1c26d961852dd057bf63e10b6d3d0a334095644bac488e02d715d2c8cda4551593da9c394c5997c709b03b084d8422ae8a78286bda6b4328f146b
+  metadata.gz: 8bb6d2b83ac80efa2ebf276861cabab2e594fc3923268738a4ec3bbe5a270c41616dea66d16cfec9e296903f36982304850d40fddd32c1a37b49d5946ca2eaf5
+  data.tar.gz: 35c02e07571eb774e4d50a6fe388266c18b2303500e87410351dabc370043589e73a037270fdf267dbba94ce087b6e8a4876cc73d1f18624bc94b9b5c1c2dba6

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end
 
 require 'fileutils'
@@ -152,7 +152,8 @@ class Livetext
   end
 
   def handle_sname(line, sigil=".")
-    name = _get_name(line, sigil=".")
+    name = _get_name(line, sigil)
+#   STDERR.puts name.inspect
     unless @main.respond_to?(name)
       @main._error! "Name '#{name}' is unknown"
       return

data/lib/standard.rb

@@ -43,7 +43,7 @@ module Livetext::Standard
     _error! "Illegal name '#{funcname}'" if _disallowed?(funcname)
     func_def = <<-EOS
       def #{funcname}
-        #{_body_text}
+        #{_body_text(true)}
       end
     EOS
     Livetext::Functions.class_eval func_def
@@ -142,7 +142,7 @@ module Livetext::Standard
     name = @_args[0]
     str = "def #{name}\n"
     raise "Illegal name '#{name}'" if _disallowed?(name)
-    str += _raw_body!
+    str += _body_text(true)
     str += "end\n"
     eval str
   rescue => err
@@ -205,6 +205,7 @@ module Livetext::Standard
   end
 
   def r
+  STDERR.puts "@_data = #{@_data.inspect}"
     _puts @_data  # No processing at all
   end
 

data/lib/userapi.rb

@@ -60,14 +60,15 @@ module Livetext::UserAPI
     end
   end
 
-  def _body(sigil=".")
+  def _body(raw=false, sigil=".")
     lines = []
     @save_location = @sources.last
     loop do
       @line = nextline
       break if _end?(@line, sigil)
       next if _comment?(@line, sigil)   # FIXME?
-      lines << _formatting(@line)
+      @line = _formatting(@line) unless raw
+      lines << @line
     end
     _optional_blank_line
     if block_given?
@@ -79,7 +80,7 @@ module Livetext::UserAPI
     _error!("Expecting .end, found end of file")
   end
 
-  def _body_text(sigil=".")
+  def _body_text(raw=false, sigil=".")
     _body(sigil).join("\n")
   end
 

data/test/data/example_alpha/source.lt3

@@ -1,5 +1,7 @@
+.backtrace
+
 .def alpha
-   text = _body_text
+   text = _body.to_a.join
    text.gsub!(/\n/, " ")
    words = text.split.sort
    words.each {|w| _puts "    #{w}" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Hal Fulton