adding return values for destructuring assignment.

cleaning and commenting cake.coffee
cleaning and shrinking the option parser
jashkenas · jashkenas · jashkenas · jashkenas · jashkenas · jashkenas
diff --git a/Cakefile b/Cakefile
@@ -7,19 +7,25 @@ run: (args) ->
   proc.addListener 'error', (err) -> if err then puts err
 
 
-task 'install', 'install CoffeeScript into /usr/local', ->
+option '-p', '--prefix [DIR]', 'set the installation prefix for `cake install`'
+
+task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options) ->
+  base: options.prefix or '/usr/local'
+  lib:  base + '/lib/coffee-script'
   exec([
-    'mkdir -p /usr/local/lib/coffee-script'
-    'cp -rf bin lib LICENSE README package.json src vendor /usr/local/lib/coffee-script'
-    'ln -sf /usr/local/lib/coffee-script/lib/bin/coffee /usr/local/bin/coffee'
-    'ln -sf /usr/local/lib/coffee-script/lib/bin/cake /usr/local/bin/cake'
-  ].join(' && '))
+    'mkdir -p ' + lib
+    'cp -rf bin lib LICENSE README package.json src vendor ' + lib
+    'ln -sf ' + lib + '/bin/coffee ' + base + '/bin/coffee'
+    'ln -sf ' + lib + '/bin/cake ' + base + '/bin/cake'
+  ].join(' && '), (err, stdout, stderr) ->
+   if err then print stderr
+  )
 
 
 task 'build', 'build the CoffeeScript language from source', ->
-  fs.readdir 'src', (err, files) ->
-    files: 'src/' + file for file in files when file.match(/\.coffee$/)
-    run ['-o', 'lib'].concat(files)
+  files: fs.readdirSync 'src'
+  files: 'src/' + file for file in files when file.match(/\.coffee$/)
+  run ['-c', '-o', 'lib'].concat(files)
 
 
 task 'build:parser', 'rebuild the Jison parser (run build first)', ->
diff --git a/README b/README
@@ -34,7 +34,8 @@
   To suggest a feature, report a bug, or general discussion:
   http://github.com/jashkenas/coffee-script/issues/
   
-  If you'd like to chat, drop by #coffeescript on Freenode.
+  If you'd like to chat, drop by #coffeescript on Freenode IRC,
+  or on webchat.freenode.net.
 
   The source repository:
   git://github.com/jashkenas/coffee-script.git
diff --git a/Rakefile b/Rakefile
@@ -7,7 +7,7 @@ require 'yui/compressor'
 desc "Build the documentation page"
 task :doc do
   source = 'documentation/index.html.erb'
-  child = fork { exec "bin/coffee documentation/coffee/*.coffee -o documentation/js -w" }
+  child = fork { exec "bin/coffee -c documentation/coffee/*.coffee -o documentation/js -w" }
   at_exit { Process.kill("INT", child) }
   Signal.trap("INT") { exit }
   loop do
diff --git a/bin/cake b/bin/cake
@@ -1,7 +1,15 @@
 #!/usr/bin/env node
 
 process.mixin(require('sys'));
+var path = require('path');
+var fs = require('fs');
+var lib = null;
 
-require.paths.unshift(__dirname + '/../lib');
+if (fs.lstatSync(__filename).isSymbolicLink()) {
+  lib = path.join(path.dirname(fs.readlinkSync(__filename)), '../lib');
+} else {
+  lib = path.join(__dirname, '../lib');
+}
 
+require.paths.unshift(lib);
 require('cake').run();
diff --git a/bin/coffee b/bin/coffee
@@ -1,7 +1,15 @@
 #!/usr/bin/env node
 
 process.mixin(require('sys'));
+var path = require('path');
+var fs = require('fs');
+var lib = null;
 
-require.paths.unshift(__dirname + '/../lib');
+if (fs.lstatSync(__filename).isSymbolicLink()) {
+  lib = path.join(path.dirname(fs.readlinkSync(__filename)), '../lib');
+} else {
+  lib = path.join(__dirname, '../lib');
+}
 
+require.paths.unshift(lib);
 require('command_line').run();
diff --git a/documentation/coffee/array_comprehensions.coffee b/documentation/coffee/array_comprehensions.coffee
@@ -1,5 +1,5 @@
 # Eat lunch.
-lunch: eat(food) for food in ['toast', 'cheese', 'wine']
+lunch: eat food for food in ['toast', 'cheese', 'wine']
 
 # Naive collision detection.
 for roid in asteroids
diff --git a/documentation/coffee/classes.coffee b/documentation/coffee/classes.coffee
@@ -0,0 +1,29 @@
+class Animal
+  move: (meters) ->
+    alert @name + " moved " + meters + "m."
+
+class Snake extends Animal
+  constructor: (name) ->
+    @name: name
+
+  move: ->
+    alert "Slithering..."
+    super 5
+
+class Horse extends Animal
+  constructor: (name) ->
+    @name: name
+
+  move: ->
+    alert "Galloping..."
+    super 45
+
+sam: new Snake "Sammy the Python"
+tom: new Horse "Tommy the Palomino"
+
+sam.move()
+tom.move()
+
+
+
+
diff --git a/documentation/coffee/prototypes.coffee b/documentation/coffee/prototypes.coffee
@@ -0,0 +1,2 @@
+String::dasherize: ->
+  this.replace(/_/g, "-")
diff --git a/documentation/coffee/super.coffee b/documentation/coffee/super.coffee
@@ -1,34 +0,0 @@
-Animal: ->
-
-Animal::move: (meters) ->
-  alert @name + " moved " + meters + "m."
-
-Snake: (name) ->
-  @name: name
-  this
-
-Snake extends Animal
-
-Snake::move: ->
-  alert "Slithering..."
-  super 5
-
-Horse: (name) ->
-  @name: name
-  this
-
-Horse extends Animal
-
-Horse::move: ->
-  alert "Galloping..."
-  super 45
-
-sam: new Snake "Sammy the Python"
-tom: new Horse "Tommy the Palomino"
-
-sam.move()
-tom.move()
-
-
-
-
diff --git a/documentation/css/docs.css b/documentation/css/docs.css
@@ -117,10 +117,23 @@ div.code {
   #logo {
     display: block;
     width: 215px; height: 50px;
-    background: url('logo.png');
+    background: url('../images/logo.png');
     position: absolute;
     top: 0px; left: 10px;
   }
+  #error {
+    position: absolute;
+    -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px;
+    right: 15px; top: 15px; left: 565px;
+    height: 15px;
+    padding: 2px 5px;
+    background: #fdcdcc;
+    color: #864544;
+    border: 1px solid #864544;
+    font: 10px/15px Arial;
+    overflow: hidden;
+    text-transform: uppercase;
+  }
   .navigation {
     height: 50px;
     font: bold 11px/50px Arial;
@@ -132,6 +145,9 @@ div.code {
     border-top: 0; border-bottom: 0;
     cursor: pointer;
   }
+    body.full_screen .navigation {
+      position: static;
+    }
     .navigation.try {
       border-left: 0;
     }
@@ -161,17 +177,33 @@ div.code {
           width: 700px;
           padding: 0;
         }
+          body.full_screen .navigation .contents.repl_wrapper {
+            position: fixed;
+            width: auto; height: auto;
+            left: 60px; top: 75px; right: 60px; bottom: 30px;
+          }
           .navigation .contents.repl_wrapper .code {
             -webkit-box-shadow: none; -moz-box-shadow: none;
             background: transparent;
             border: 0;
+            position: static;
           }
+            body.full_screen .navigation .contents.repl_wrapper .code {
+              height: 100%;
+              padding: 0; margin: 0;
+            }
           .navigation .code button {
             bottom: 10px;
+            text-transform: none;
           }
-          .navigation .compile {
-            left: 240px; right: auto;
+          .navigation .full_screen, .navigation .minimize {
+            right: auto;
+            left: 10px;
+            display: none;
           }
+            body.minimized .full_screen, body.full_screen .minimize {
+              display: inline;
+            }
       .navigation .contents a {
         display: block;
         width: 300px;
@@ -195,19 +227,40 @@ div.code {
 
 #repl_source, #repl_results {
   background: transparent;
+  outline: none;
+  margin: 5px 0 20px;
 }
-  #repl_source {
-    border: 0;
-    padding: 5px 7px;
+  #repl_source_wrap {
     margin-left: 5px;
-    min-height: 250px;
-    resize: none;
-    width: 295px;
+    height: 250px;
+    width: 307px;
+    position: relative;
+    float: left;
   }
+    #repl_source {
+      width: 96%;
+      height: 100%;
+      border: 0;
+      resize: none;
+    }
   #repl_results {
     font-family: Monaco, Consolas, "Lucida Console", monospace;
     text-transform: none;
     font-weight: normal;
-    min-height: 260px;
-    width: 355px;
-  }
+    height: 260px;
+    margin-bottom: 25px;
+    overflow-y: auto;
+    width: 370px;
+  }
+    body.full_screen #repl_results, body.full_screen #repl_source_wrap {
+      width: auto; height: auto;
+      position: absolute;
+      margin-bottom: 0;
+      top: 10px; left: 10px; right: 10px; bottom: 40px;
+    }
+      body.full_screen #repl_source_wrap {
+        right: 50%;
+      }
+      body.full_screen #repl_results {
+        left: 50%;
+      }
diff --git a/documentation/css/idle.css b/documentation/css/idle.css
@@ -57,6 +57,7 @@ pre.idle .FunctionName {
    color: #21439C;
 }
 pre.idle .Variable {
+  color: #A535AE;
 }
 pre.idle .Comment {
    color: #919191;
diff --git a/documentation/images/favicon.ico b/documentation/images/favicon.ico
diff --git a/documentation/css/logo.png → documentation/images/logo.png b/documentation/css/logo.png → documentation/images/logo.png