livetext 0.9.21 → 0.9.22

data/lib/standard.rb

@@ -101,7 +101,7 @@ module Livetext::Standard
   end
 
   def errout(args = nil, body = nil)
-    STDERR.puts @_data.chomp
+    ::STDERR.puts @_data.chomp
     _optional_blank_line
   end
 
@@ -225,32 +225,25 @@ module Livetext::Standard
 
   def mixin(args = nil, body = nil)
     name = @_args.first   # Expect a module name
+# TTY.puts "#{__method__}: name = #{name}"
     return if @_mixins.include?(name)
     @_mixins << name
-    mod = Livetext::ParseMixin.get_module(name)  # FIXME??
+    mod = Livetext::ParseMixin.get_module(name)
+# TTY.puts "#{__method__}: mod  = #{mod.inspect}"
     self.extend(mod)
     init = "init_#{name}"
-    self.send(init) if self.respond_to? init
+    self.send(init) rescue nil  # if self.respond_to? init
     _optional_blank_line
   end
 
-  def icanhaz(args = nil, body = nil)
+  def import(args = nil, body = nil)
     name = @_args.first   # Expect a module name
     return if @_mixins.include?(name)
     @_mixins << name
-    mod = Livetext::Handler::ICanHaz.get_module(name)  # FIXME??
+    mod = Livetext::Handler::Import.get_module(name)
     self.extend(mod)
     init = "init_#{name}"
-    self.send(init) if self.respond_to? init
-    _optional_blank_line
-  end
-
-  def import(args = nil, body = nil)
-    name = @_args.first   # Expect a module name
-    return if @_mixins.include?(name)
-    @_mixins << name
-    mod = Livetext::ParseImport.get_module(name)
-    parse.use_import(name)
+    self.send(init) rescue nil  # if self.respond_to? init
     _optional_blank_line
   end
 
@@ -367,4 +360,11 @@ module Livetext::Standard
     _out out
   end
 
+  def reflection   # strictly experimental!
+    list = self.methods
+    obj  = Object.instance_methods
+    diff = (list - obj).sort
+    _out "#{diff.size} methods:"
+    _out diff.inspect
+  end
 end

data/lib/userapi.rb

@@ -1,11 +1,13 @@
-# User API
-
 require_relative 'formatline'
 
 # UserAPI deals mostly with user-level methods.
 
 module Livetext::UserAPI
 
+  # FIXME I am tired of all my leading underscores...
+  # FIXME Q: Could this be converted into a class?? What about its
+  # interaction thru instance vars?
+
   def setvar(var, val)
     str, sym = var.to_s, var.to_sym
     Livetext::Vars[str] = val

data/plugin/bookish.rb

@@ -18,7 +18,7 @@ def h2; _out "<h2>#{@_data}</h2>"; end
 def h3; _out "<h3>#{@_data}</h3>"; end
 
 def alpha_columns(args = nil, body = nil)
-  n = @_args.first.to_i   # FIXME: what if missing?
+  n = @_args.first.to_i   # FIXME: what if it's missing?
   words = []
   _body do |line| 
     words << line.chomp
@@ -50,8 +50,8 @@ def _slug(str)
   s2
 end
 
-
 # FIXME duplicated?
+
 def image(args = nil, body = nil)
   name = @_args[0]
   _out "<img src='#{name}'></img>"
@@ -67,7 +67,6 @@ def figure(args = nil, body = nil)
 end
 
 def chapter(args = nil, body = nil)
-# _errout("chapter")
   @chapter = @_args.first.to_i
   @sec = @sec2 = 0
   title = @_data.split(" ",2)[1]
@@ -108,7 +107,7 @@ def sec(args = nil, body = nil)
   next_output
   _out "<h3>#@section #{title}</h3>\n"
 rescue => err
-  STDERR.puts "#{err}\n#{err.backtrace}"
+  ::STDERR.puts "#{err}\n#{err.backtrace}"
   exit
 end
 
@@ -275,7 +274,7 @@ def quote(args = nil, body = nil)
   _body {|line| _out line }
   _out "</blockquote>"
 rescue => err
-  STDERR.puts "#{err}\n#{err.backtrace}"
+  ::STDERR.puts "#{err}\n#{err.backtrace}"
   exit
 end
 

data/plugin/pyggish.rb

@@ -1,59 +1,56 @@
 require 'rouge'
 
-  def self.pyg_change(code, klass, style)
-    color = style[0..6]
-    modifier = style[8]
-    mod_open = modifier ? "<#{modifier}>" : ""
-    mod_close = modifier ? "</#{modifier}>" : ""
-    rx = /<span class="#{klass}">(?<cname>[^<]+?)<\/span>/
-    loop do
-      md = rx.match(code)
-      break if md.nil?
-      str = md[:cname]
-      result = code.sub!(rx, "<font color=#{color}>#{mod_open}#{str}#{mod_close}</font>")
-      break if result.nil?
-    end
-  end
-
-  def self._codebar_color(lexer)
-    color = case lexer
-      when :elixir
-        "#fc88fc"
-      when :ruby
-        "#fc8888"
-      else
-        raise "Unknown lexer"
-    end
+# FIXME This whole file has a weird vibe. It has dead code and 
+# also exposes methods that are not dot commands...
+
+def self.pyg_change(code, klass, style)
+  color = style[0..6]
+  modifier = style[8]
+  mod_open = modifier ? "<#{modifier}>" : ""
+  mod_close = modifier ? "</#{modifier}>" : ""
+  rx = /<span class="#{klass}">(?<cname>[^<]+?)<\/span>/
+  loop do
+    md = rx.match(code)
+    break if md.nil?
+    str = md[:cname]
+    result = code.sub!(rx, "<font color=#{color}>#{mod_open}#{str}#{mod_close}</font>")
+    break if result.nil?
   end
+end
 
-  def self.pyg_finalize(code, lexer=:elixir)
-    Styles.each_pair {|klass, style| pyg_change(code, klass, style) }
-File.open("debug-pf1", "w") {|f| f.puts code }
-    code.sub!(/<pre>/, "<pre>\n")
-    code.gsub!(/<span class="[np]">/, "")
-    code.gsub!(/<\/span>/, "")
-    color = _codebar_color(lexer)
-    code.sub!(/<td class="linenos"/, "<td width=2%></td><td width=5% bgcolor=#{color}")
-    code.gsub!(/<td/, "<td valign=top ")
-    code.gsub!(/ class="[^"]*?"/, "")    # Get rid of remaining Pygments CSS
-File.open("debug-pf2", "w") {|f| f.puts code }
-    lines = code.split("\n")
-#   lines.each {|line| line << "\n" }
-    n1 = lines.index {|x| x =~ /<pre>/ }
-    n2 = lines.index {|x| x =~ /<\/pre>/ }
-    # FIXME ?
-    n1 ||= 0
-    n2 ||= -1
-    lines[n1].sub!(/ 1$/, "  1 ")
-    (n1+1).upto(n2) {|n| lines[n].replace(" " + lines[n] + " ") }
-    code = lines.join("\n")
-File.open("debug-pf3", "w") {|f| f.puts code }
-    code
+def self._codebar_color(lexer)
+  color = case lexer
+    when :elixir
+      "#fc88fc"
+    when :ruby
+      "#fc8888"
+    else
+      raise "Unknown lexer"
   end
+end
 
+def self.pyg_finalize(code, lexer=:elixir)
+  Styles.each_pair {|klass, style| pyg_change(code, klass, style) }
+  code.sub!(/<pre>/, "<pre>\n")
+  code.gsub!(/<span class="[np]">/, "")
+  code.gsub!(/<\/span>/, "")
+  color = _codebar_color(lexer)
+  code.sub!(/<td class="linenos"/, "<td width=2%></td><td width=5% bgcolor=#{color}")
+  code.gsub!(/<td/, "<td valign=top ")
+  code.gsub!(/ class="[^"]*?"/, "")    # Get rid of remaining Pygments CSS
+  lines = code.split("\n")
+  n1 = lines.index {|x| x =~ /<pre>/ }
+  n2 = lines.index {|x| x =~ /<\/pre>/ }
+  # FIXME ?
+  n1 ||= 0
+  n2 ||= -1
+  lines[n1].sub!(/ 1$/, "  1 ")
+  (n1+1).upto(n2) {|n| lines[n].replace(" " + lines[n] + " ") }
+  code = lines.join("\n")
+  code
+end
 
 def _process_code(text)
-File.open("debug-pc1", "w") {|f| f.puts text }
   lines = text.split("\n")
   lines = lines.select {|x| x !~ /##~ omit/ }
   @refs = {}
@@ -66,7 +63,6 @@ File.open("debug-pc1", "w") {|f| f.puts text }
   end
   lines.map! {|line| "  " + line }
   text2 = lines.join("\n")
-File.open("debug-pc2", "w") {|f| f.puts text2 }
   text.replace(text2)
 end
 
@@ -86,34 +82,6 @@ def _colorize!(code, lexer=:elixir)
   result
 end
 
-def OLD_ruby
-  file = @_args.first 
-  if file.nil?
-    code = "# Ruby code\n"
-    _body {|line| code << line + "\n" }
-  else
-    code = "# Ruby code\n\n" + ::File.read(file)
-  end
-
-  _process_code(code)
-  html = _colorize(code, :ruby)
-  _out "\n#{html}\n "
-end
-
-def OLD_elixir
-  file = @_args.first 
-  if file.nil?
-    code = ""
-    _body {|line| code << line + "\n" }
-  else
-    code = ::File.read(file)
-  end
-
-  _process_code(code)
-  html = _colorize(code, :elixir)
-  _out "\n#{html}\n "
-end
-
 def fragment
   lang = @_args.empty? ? :elixir : @_args.first.to_sym   # ruby or elixir
   @_args = []

data/plugin/tutorial.rb

@@ -52,7 +52,6 @@ def inout(args = nil, body = nil)
 end
 
 def put_table(src, exp)
-STDERR.puts "put_table: #{[src, exp].inspect}"
   t1 = ::File.readlines(src) rescue (abort "Fail - src = #{src}  t1 = #{src}")
   t2 = ::File.readlines(exp) rescue (abort "Fail - src = #{exp}  t2 = #{out}")
   t1 = t1.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join

data/test/snapshots/error_inc_line_num/actual-error.txt

@@ -0,0 +1,14 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:121:in `handle_dotcmd': Name 'foobar' is unknown (RuntimeError)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:210:in `dot_include'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

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

@@ -0,0 +1,7 @@
+This is my 
+source file
+which includes file2 here:
+  This is file2
+  which has an error
+  about an unknown command
+  in line 5

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

@@ -0,0 +1,14 @@
+ACTUAL                                                      | EXPECTED                                                    
+This is my                                                    This is my 
+source file                                                   source file
+which includes file2 here:                                    which includes file2 here:
+  This is file2                                                 This is file2
+  which has an error                                            which has an error
+  about an unknown command                                      about an unknown command
+  in line 5                                                     in line 5
+                                                            > <p>
+                                                            >
+                                                            >   And this is file2 line 7.
+                                                            > And here we are
+                                                            > back in the
+                                                            > original file.

data/test/snapshots/error_invalid_name/actual-error.txt

@@ -0,0 +1,10 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:140:in `check_disallowed': Error: name 'to_s' is invalid (DisallowedName)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:142:in `dot_def'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

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

@@ -0,0 +1,6 @@
+ACTUAL                                                      | EXPECTED                                                    
+                                                            > This file has
+                                                            > a defined method
+                                                            > that is invalid:
+                                                            > <p>
+                                                            >

data/test/snapshots/error_missing_end/actual-error.txt

@@ -0,0 +1,10 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/userapi.rb:92:in `_body': Expected .end, found end of file (RuntimeError)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:48:in `comment'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

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

@@ -0,0 +1,6 @@
+ACTUAL                                                      | EXPECTED                                                    
+                                                            > Blah
+                                                            > blah
+                                                            > <p>
+                                                            >
+                                                            >

data/test/snapshots/error_no_such_copy/actual-error.txt

@@ -0,0 +1,10 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:144:in `check_file_exists': Error: file 'nosuchfile.txt' not found (FileNotFound)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:252:in `copy'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

data/test/snapshots/error_no_such_inc/actual-error.txt

@@ -0,0 +1,10 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:144:in `check_file_exists': Error: file 'nosuchinc.lt3' not found (FileNotFound)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:209:in `dot_include'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

data/test/snapshots/error_no_such_mixin/actual-error.txt

@@ -0,0 +1,13 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:34:in `find_file': No such mixin 'nosuchthing' (RuntimeError)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/parser/mixin.rb:12:in `initialize'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/parser/mixin.rb:16:in `new'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/parser/mixin.rb:16:in `get_module'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:231:in `mixin'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

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

@@ -0,0 +1,6 @@
+ACTUAL                                                      | EXPECTED                                                    
+                                                            > Test that
+                                                            > we give an error
+                                                            > when a mixin does not
+                                                            > exist:
+                                                            > <p>

data/test/snapshots/import/actual-error.txt

@@ -0,0 +1,13 @@
+/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:34:in `find_file': No such mixin 'nonexistent' (RuntimeError)
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/handler/import.rb:9:in `initialize'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/handler/import.rb:13:in `new'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/handler/import.rb:13:in `get_module'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:243:in `import'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
+	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
+	from ../../../bin/livetext:86:in `block in <main>'
+	from ../../../bin/livetext:57:in `loop'
+	from ../../../bin/livetext:57:in `<main>'

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

@@ -0,0 +1,6 @@
+ACTUAL                                                      | EXPECTED                                                    
+                                                            > Test fake command .icanhaz:
+                                                            > we give an error
+                                                            > when a .rb does not
+                                                            > exist:
+                                                            > <p>

data/test/snapshots/{icanhaz → import}/source.lt3

@@ -1,9 +1,9 @@
-Test fake command .icanhaz:
+Test .import:
 we give an error
 when a .rb does not
 exist:
 
-.icanhaz nonexistent
+.import nonexistent
 
 We shouldn't
 reach this point

data/test/snapshots/{icanhaz2 → import2}/expected-output.txt

@@ -1,6 +1,8 @@
-Testing fake command .icanhaz:
+Testing .import:
 <p>
 
 Now call a method:
 Hello, world.
+<p>
+
 That's all.

data/test/snapshots/import2/source.lt3

@@ -0,0 +1,8 @@
+Testing .import:
+
+.import simple_import
+
+Now call a method:
+.hello_world
+
+That's all.

data/test/snapshots/more_functions/expected-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/source.lt3

@@ -0,0 +1,40 @@
+Testing some more functions here...
+
+.func just_do_it
+  item = param
+  # Do "something" with the parameter...
+  return ""  # parameter disappears!
+.end
+
+Here I am calling a function $$just_do_it:foobar with 
+a colon parameter...
+
+
+Next let's *do* something with our parameter:
+
+.func reverse
+  param.reverse   # just reverse it
+.end
+
+I'll call these variants...
+
+"Motel" spelled backwards is $$reverse:motel :)
+
+"lamina" reversed is $$reverse:lamina
+
+I can also use the $$reverse[bracket feature] here.
+
+If I don't use a parameter for $$reverse - it gives
+me an error. (Bug or feature??)
+
+What if a function doesn't use parameters at all, but
+we pass them? Hmm...
+
+.func meditate 
+   "succeed"   # just replaces params with this verb
+.end
+
+Now we $$meditate:slowly and $$meditate some more
+and finally we $$meditate[on various things] in life.
+
+But can we $$meditate, when our beds are burning?

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

@@ -4,4 +4,6 @@ testing a simple import
 
 Now call a method:
 Hello, world.
+<p>
+
 That's all.

data/test/snapshots/simple_import/source.lt3

@@ -1,7 +1,9 @@
 Here I am
 testing a simple import
-.mixin simple_import
+
+.import simple_import
 
 Now call a method:
 .hello_world
+
 That's all.

data/test/snapshots/subset.txt

@@ -19,26 +19,21 @@
 
 # Note that QUIT (on a line by itself) will stop processing the file
 
-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
-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
-
-# Dummy command .icanhaz works like .mixin or .import
-
-x  icanhaz                  # "Leading" output doesn't get generated (same as error_no_such_inc)
-   icanhaz2                 # works?
 
 # Others (usually passing):
 
 # 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
    simple_copy              #                    
-x  simple_import            # not working yet (but *could* sub in .icanhaz)
+   simple_import            # 
    simple_include           #                            
    simple_mixin             #                            
+x  import                   # "Leading" output doesn't get generated (same as error_no_such_inc)
+   import2                  # 
+ 
                      
 # raw input                     
                      
@@ -72,10 +67,14 @@ x  simple_import            # not working yet (but *could* sub in .icanhaz)
    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
 
 # functions
 
    functions                #  
+   more_functions           # 
 
 # More/misc...