cleaning up the previous merge -- moving it out to helpers.invertLiterate

Author: jashkenas

lib/coffee-script/command.js

@@ -10,7 +10,6 @@ path              = require 'path'
 helpers           = require './helpers'
 optparse          = require './optparse'
 CoffeeScript      = require './coffee-script'
-{rewriteLiterate} = require './lexer'
 {spawn, exec}     = require 'child_process'
 {EventEmitter}    = require 'events'
 
@@ -123,7 +122,8 @@ compileScript = (file, input, base) ->
     else if o.nodes       then printLine CoffeeScript.nodes(t.input, t.options).toString().trim()
     else if o.run         then CoffeeScript.run t.input, t.options
     else if o.join and t.file isnt o.join
-      sourceCode[sources.indexOf(t.file)] = if helpers.isLiterate file then rewriteLiterate t.input else t.input
+      t.input = helpers.invertLiterate t.input if helpers.isLiterate file
+      sourceCode[sources.indexOf(t.file)] = t.input
       compileJoin()
     else
       compiled = CoffeeScript.compile t.input, t.options

lib/coffee-script/helpers.js

@@ -60,6 +60,17 @@ exports.some = Array::some ? (fn) ->
   return true for e in this when fn e
   false
 
+# Simple function for inverting Literate CoffeeScript code by putting the
+# documentation in comments, and bumping the actual code back out to the edge ...
+# producing a string of CoffeeScript code that can be compiled "normally".
+exports.invertLiterate = (code) ->
+  lines = for line in code.split('\n')
+    if match = (/^([ ]{4}|\t)/).exec line
+      line[match[0].length..]
+    else
+      '# ' + line
+  lines.join '\n'
+
 # Merge two jison-style location data objects together.
 # If `last` is not provided, this will simply return `first`.
 buildLocationData = (first, last) ->

lib/coffee-script/lexer.js

@@ -12,16 +12,7 @@
 {Rewriter, INVERSES} = require './rewriter'
 
 # Import the helpers we need.
-{count, starts, compact, last, locationDataToString} = require './helpers'
-
-# Rewrite literate CoffeeScript code, converting Markdown text into inline comments.
-exports.rewriteLiterate = rewriteLiterate = (code) ->
-  lines = for line in code.split('\n')
-    if match = LITERATE.exec line
-      line[match[0].length..]
-    else
-      '# ' + line
-  lines.join '\n'
+{count, starts, compact, last, invertLiterate, locationDataToString} = require './helpers'
 
 # The Lexer Class
 # ---------------
@@ -93,7 +84,7 @@ exports.Lexer = class Lexer
     if WHITESPACE.test code
         code = "\n#{code}"
         @chunkLine--
-    code = rewriteLiterate code if @literate
+    code = invertLiterate code if @literate
     code
 
   # Tokenizers
@@ -782,8 +773,6 @@ WHITESPACE = /^[^\n\S]+/
 
 COMMENT    = /^###([^#][\s\S]*?)(?:###[^\n\S]*|(?:###)$)|^(?:\s*#(?!##[^#]).*)+/
 
-LITERATE   = /^([ ]{4}|\t)/
-
 CODE       = /^[-=]>/
 
 MULTI_DENT = /^(?:\n[^\n\S]*)+/