From 2d0ad73af815b2a833277741c690aea0c2ca877c Mon Sep 17 00:00:00 2001
From: Jeremy Ashkenas <jashkenas@gmail.com>
Date: Wed, 17 Feb 2010 00:55:56 -0500
Subject: [PATCH] reorganizing lib/coffee_script to plain ol' lib

---
 Cakefile                                         |  4 ++--
 bin/cake                                         |  2 +-
 bin/coffee                                       |  2 +-
 documentation/index.html.erb                     | 12 ++++++------
 index.html                                       | 12 ++++++------
 lib/{coffee_script => }/cake.js                  |  0
 lib/{coffee_script => }/coffee-script.js         |  0
 lib/{coffee_script => }/command_line.js          |  0
 lib/{coffee_script => }/grammar.js               |  0
 lib/{coffee_script => }/lexer.js                 |  0
 lib/{coffee_script => }/narwhal/coffee-script.js |  0
 lib/{coffee_script => }/nodes.js                 |  0
 lib/{coffee_script => }/optparse.js              |  0
 lib/{coffee_script => }/parser.js                |  0
 lib/{coffee_script => }/repl.js                  |  0
 lib/{coffee_script => }/rewriter.js              |  0
 lib/{coffee_script => }/scope.js                 |  0
 package.json                                     |  2 +-
 18 files changed, 17 insertions(+), 17 deletions(-)
 rename lib/{coffee_script => }/cake.js (100%)
 rename lib/{coffee_script => }/coffee-script.js (100%)
 rename lib/{coffee_script => }/command_line.js (100%)
 rename lib/{coffee_script => }/grammar.js (100%)
 rename lib/{coffee_script => }/lexer.js (100%)
 rename lib/{coffee_script => }/narwhal/coffee-script.js (100%)
 rename lib/{coffee_script => }/nodes.js (100%)
 rename lib/{coffee_script => }/optparse.js (100%)
 rename lib/{coffee_script => }/parser.js (100%)
 rename lib/{coffee_script => }/repl.js (100%)
 rename lib/{coffee_script => }/rewriter.js (100%)
 rename lib/{coffee_script => }/scope.js (100%)

diff --git a/Cakefile b/Cakefile
index d288040de6..09f7887cdd 100644
--- a/Cakefile
+++ b/Cakefile
@@ -10,14 +10,14 @@ run: (args) ->
 task 'build', 'build the CoffeeScript language from source', ->
   fs.readdir('src').addCallback (files) ->
     files: 'src/' + file for file in files when file.match(/\.coffee$/)
-    run ['-o', 'lib/coffee_script'].concat(files)
+    run ['-o', 'lib'].concat(files)
 
 
 task 'build:parser', 'rebuild the Jison parser', ->
   invoke 'build:compiler'
   parser: require('grammar').parser
   js: parser.generate()
-  parser_path: 'lib/coffee_script/parser.js'
+  parser_path: 'lib/parser.js'
   fs.open(parser_path, process.O_CREAT | process.O_WRONLY | process.O_TRUNC, parseInt('0755', 8)).addCallback (fd) ->
     fs.write(fd, js)
 
diff --git a/bin/cake b/bin/cake
index f74d3bed71..e0e51119cb 100755
--- a/bin/cake
+++ b/bin/cake
@@ -2,6 +2,6 @@
 
 process.mixin(require('sys'));
 
-require.paths.unshift('./lib/coffee_script');
+require.paths.unshift('./lib');
 
 require('cake').run();
diff --git a/bin/coffee b/bin/coffee
index 023e00b8e1..e1ac6fcdb3 100755
--- a/bin/coffee
+++ b/bin/coffee
@@ -2,6 +2,6 @@
 
 process.mixin(require('sys'));
 
-require.paths.unshift('./lib/coffee_script');
+require.paths.unshift('./lib');
 
 require('command_line').run();
diff --git a/documentation/index.html.erb b/documentation/index.html.erb
index 0a6160afb7..8329190442 100644
--- a/documentation/index.html.erb
+++ b/documentation/index.html.erb
@@ -842,12 +842,12 @@ print reverse 'tpircseeffoc'</textarea>
 
   </div>
 
-  <script type="text/javascript" src="lib/coffee_script/rewriter.js"></script>
-  <script type="text/javascript" src="lib/coffee_script/lexer.js"></script>
-  <script type="text/javascript" src="lib/coffee_script/parser.js"></script>
-  <script type="text/javascript" src="lib/coffee_script/scope.js"></script>
-  <script type="text/javascript" src="lib/coffee_script/nodes.js"></script>
-  <script type="text/javascript" src="lib/coffee_script/coffee-script.js"></script>
+  <script type="text/javascript" src="lib/rewriter.js"></script>
+  <script type="text/javascript" src="lib/lexer.js"></script>
+  <script type="text/javascript" src="lib/parser.js"></script>
+  <script type="text/javascript" src="lib/scope.js"></script>
+  <script type="text/javascript" src="lib/nodes.js"></script>
+  <script type="text/javascript" src="lib/coffee-script.js"></script>
 
   <script type="text/javascript">
     window.repl_compile = function() {
diff --git a/index.html b/index.html
index 15bae00ed8..3b5f334eef 100644
--- a/index.html
+++ b/index.html
@@ -1713,12 +1713,12 @@ <h2 id="change_log">Change Log</h2>
 
   </div>
 
-  <script type="text/javascript" src="lib/coffee_script/rewriter.js"></script>
-  <script type="text/javascript" src="lib/coffee_script/lexer.js"></script>
-  <script type="text/javascript" src="lib/coffee_script/parser.js"></script>
-  <script type="text/javascript" src="lib/coffee_script/scope.js"></script>
-  <script type="text/javascript" src="lib/coffee_script/nodes.js"></script>
-  <script type="text/javascript" src="lib/coffee_script/coffee-script.js"></script>
+  <script type="text/javascript" src="lib/rewriter.js"></script>
+  <script type="text/javascript" src="lib/lexer.js"></script>
+  <script type="text/javascript" src="lib/parser.js"></script>
+  <script type="text/javascript" src="lib/scope.js"></script>
+  <script type="text/javascript" src="lib/nodes.js"></script>
+  <script type="text/javascript" src="lib/coffee-script.js"></script>
 
   <script type="text/javascript">
     window.repl_compile = function() {
diff --git a/lib/coffee_script/cake.js b/lib/cake.js
similarity index 100%
rename from lib/coffee_script/cake.js
rename to lib/cake.js
diff --git a/lib/coffee_script/coffee-script.js b/lib/coffee-script.js
similarity index 100%
rename from lib/coffee_script/coffee-script.js
rename to lib/coffee-script.js
diff --git a/lib/coffee_script/command_line.js b/lib/command_line.js
similarity index 100%
rename from lib/coffee_script/command_line.js
rename to lib/command_line.js
diff --git a/lib/coffee_script/grammar.js b/lib/grammar.js
similarity index 100%
rename from lib/coffee_script/grammar.js
rename to lib/grammar.js
diff --git a/lib/coffee_script/lexer.js b/lib/lexer.js
similarity index 100%
rename from lib/coffee_script/lexer.js
rename to lib/lexer.js
diff --git a/lib/coffee_script/narwhal/coffee-script.js b/lib/narwhal/coffee-script.js
similarity index 100%
rename from lib/coffee_script/narwhal/coffee-script.js
rename to lib/narwhal/coffee-script.js
diff --git a/lib/coffee_script/nodes.js b/lib/nodes.js
similarity index 100%
rename from lib/coffee_script/nodes.js
rename to lib/nodes.js
diff --git a/lib/coffee_script/optparse.js b/lib/optparse.js
similarity index 100%
rename from lib/coffee_script/optparse.js
rename to lib/optparse.js
diff --git a/lib/coffee_script/parser.js b/lib/parser.js
similarity index 100%
rename from lib/coffee_script/parser.js
rename to lib/parser.js
diff --git a/lib/coffee_script/repl.js b/lib/repl.js
similarity index 100%
rename from lib/coffee_script/repl.js
rename to lib/repl.js
diff --git a/lib/coffee_script/rewriter.js b/lib/rewriter.js
similarity index 100%
rename from lib/coffee_script/rewriter.js
rename to lib/rewriter.js
diff --git a/lib/coffee_script/scope.js b/lib/scope.js
similarity index 100%
rename from lib/coffee_script/scope.js
rename to lib/scope.js
diff --git a/package.json b/package.json
index 5d8afcaa44..dd664aa64b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name":         "coffee-script",
-    "lib":          "lib/coffee_script/narwhal",
+    "lib":          "lib/narwhal",
     "description":  "Unfancy JavaScript",
     "keywords":     ["javascript", "language"],
     "author":       "Jeremy Ashkenas",