livetext 0.9.23 → 0.9.26

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/raw_lines/expected-output.txt

@@ -8,6 +8,4 @@ Ordinary line... plus two blank lines:
 No formatting: *foo `foo _foo ~foo
 No variables: $alpha $beta
 No functions: $$this $$that
-<p>
-
 That's all.

data/test/snapshots/simple_import/simple_import.rb

@@ -1,5 +1,5 @@
 module SimpleImport
   def hello_world
-    _out "Hello, world."
+    api.out "Hello, world."
   end
 end

data/test/snapshots/simple_mixin/simple_mixin.rb

@@ -1,3 +1,3 @@
 def hello_world
-  _out "Hello, world."
+  api.out "Hello, world."
 end

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/single_raw_line/expected-output.txt

@@ -5,6 +5,4 @@ without interpretation:
 .comment This is not a real comment.
 This is not _italics or *boldface
 This is not a $variable reference
-<p>
-
 That's all.

data/test/snapshots/subset.txt

@@ -24,14 +24,14 @@ h This file specifies which snapshots will/won't be run.
 
 # import/include/mixin, others...
 
-x  error_no_such_inc        # Output BEFORE error doesn't get passed through ("leading" output)
-x  error_no_such_copy       # ^ Same behavior as  error_no_such_inc
-x  error_no_such_mixin      # ^ Same behavior as error_missing_end
+   error_no_such_inc        # Output BEFORE error doesn't get passed through ("leading" output)
+   error_no_such_copy       # ^ Same behavior as  error_no_such_inc
+   error_no_such_mixin      # ^ Same behavior as error_missing_end
    simple_copy              #                    
    simple_import            # 
    simple_include           #                            
    simple_mixin             #                            
-x  import                   # "Leading" output doesn't get generated (same as error_no_such_inc)
+   import                   # "Leading" output doesn't get generated (same as error_no_such_inc)
    import2                  # 
    mixin_bookish            # 
    import_bookish           # 
@@ -62,15 +62,17 @@ x  import                   # "Leading" output doesn't get generated (same as er
 # intraline formatting
 
    basic_formatting         #  
+   test_formatting_34       # 
+   test_formatting_35       # 
 
 # Errors
 
    error_line_num           #  
    error_mismatched_end     #  
    error_name_not_permitted #  
-x  error_invalid_name       # ^ Same behavior as error_no_such_inc
-x  error_missing_end        # Output is duplicated somehow. Look for: puts @body or puts @main.body
-x  error_inc_line_num       # Forgot what's wrong here
+   error_invalid_name       # ^ Same behavior as error_no_such_inc
+   error_missing_end        # Output is duplicated somehow. Look for: puts @body or puts @main.body
+   error_inc_line_num       # Forgot what's wrong here
 
 # functions
 

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/snapshots.rb

@@ -1,3 +1,12 @@
+require 'simplecov'            # These two lines must go first
+SimpleCov.use_merging(true)
+SimpleCov.start  do
+  puts "SimpleCov: Snapshots"
+  add_filter "/test/"
+  enable_coverage :branch
+  primary_coverage :branch
+end
+
 require 'minitest/autorun'
 
 require_relative '../lib/livetext'
@@ -7,10 +16,10 @@ Snapshots...
 
 NOTE that the external_files method has been replaced by the Snapshot class.
 
-You can add any ordinary test method above. But so far, most of these tests simply 
+You can add any ordinary test method above. But so far, most of these tests simply
 call Snapshot.new
 
-It works this way: 
+It works this way:
   - If the test (caller) method is test_my_silly_feature, then we will
     look for a directory called snapshots/my_silly_feature
   - In here, there must be a source.lt3
@@ -20,12 +29,12 @@ It works this way:
   - The expected-* files are "literal" data
       * compared byte-for-byte
       * watch spaces and bad regexes, etc. #duh
-      * each of these files corresponds to a single assertion 
-  - A match-* file has two entries per line: 
+      * each of these files corresponds to a single assertion
+  - A match-* file has two entries per line:
       * a ONE-BASED line number (in actual-* file)
       * a String OR a Regexp (to match against that line)
       * If there is nonsense here, it currently isn't caught
-      * each of these files MAY correspond to many assertions 
+      * each of these files MAY correspond to many assertions
   - We run livetext on the source and compare actual vs expected (stdout, stderr)
   - The error output gets checked first (expected or match), THEN standard output
   - Of course, both must compare correctly for the test to pass
@@ -62,7 +71,7 @@ class TestingLivetext < MiniTest::Test
     TestDirs = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
 
     Specified = []
-    Args.each do |name| 
+    Args.each do |name|
       which = TestDirs.select {|tdir| Regexp.new(name) =~ tdir }
       which.each {|item| Specified << item }
     end
@@ -112,7 +121,7 @@ class TestingLivetext < MiniTest::Test
       end
       unless @excluded.empty?
         puts "\nExcluded:\n "
-        @excluded.each.with_index do |name, num| 
+        @excluded.each.with_index do |name, num|
           printf "  %-20s %s\n", name, @reasons[num]
         end
         puts

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'