coffee-script 0.2.1 → 0.2.2

data/README

@@ -36,3 +36,6 @@
 
   The source repository:
   git://github.com/jashkenas/coffee-script.git
+  
+  To build CoffeeScript from source, install the "racc" gem and
+  run "rake build:parser". Then bin/coffee will work.

data/coffee-script.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'coffee-script'
-  s.version   = '0.2.1'         # Keep version in sync with coffee-script.rb
-  s.date      = '2010-1-5'
+  s.version   = '0.2.2'         # Keep version in sync with coffee-script.rb
+  s.date      = '2010-1-10'
 
   s.homepage    = "http://jashkenas.github.com/coffee-script/"
   s.summary     = "The CoffeeScript Compiler"

data/examples/code.coffee

@@ -141,18 +141,18 @@ aliquam erat volutpat. Ut wisi enim ad."
 
 # Inheritance and calling super.
 Animal: =>
-Animal.prototype.move: meters =>
+Animal::move: meters =>
   alert(this.name + " moved " + meters + "m.")
 
 Snake: name => this.name: name
 Snake extends Animal
-Snake.prototype.move: =>
+Snake::move: =>
   alert('Slithering...')
   super(5)
 
 Horse: name => this.name: name
 Horse extends Animal
-Horse.prototype.move: =>
+Horse::move: =>
   alert('Galloping...')
   super(45)
 

data/examples/poignant.coffee

@@ -14,9 +14,9 @@
 # end
 
 LotteryTicket: {
-  get_picks:    => this.picks
-  set_picks:    nums => this.picks: nums
-  get_purchase: => this.purchase
+  get_picks:           => this.picks
+  set_picks:      nums => this.picks: nums
+  get_purchase:        => this.purchase
   set_purchase: amount => this.purchase: amount
 }
 

data/examples/underscore.coffee

@@ -30,7 +30,7 @@
   breaker: if typeof(StopIteration) is 'undefined' then '__break__' else StopIteration
 
 
-  # Create a safe reference to the Underscore object for reference below.
+  # Create a safe reference to the Underscore object forreference below.
   _: root._: obj => new wrapper(obj)
 
 
@@ -39,15 +39,15 @@
 
 
   # Create quick reference variables for speed access to core prototypes.
-  slice:                Array.prototype.slice
-  unshift:              Array.prototype.unshift
-  toString:             Object.prototype.toString
-  hasOwnProperty:       Object.prototype.hasOwnProperty
-  propertyIsEnumerable: Object.prototype.propertyIsEnumerable
+  slice:                Array::slice
+  unshift:              Array::unshift
+  toString:             Object::toString
+  hasOwnProperty:       Object::hasOwnProperty
+  propertyIsEnumerable: Object::propertyIsEnumerable
 
 
   # Current version.
-  _.VERSION: '0.5.3'
+  _.VERSION: '0.5.5'
 
 
   # ------------------------ Collection Functions: ---------------------------
@@ -60,7 +60,7 @@
       return obj.forEach(iterator, context) if obj.forEach
       if _.isArray(obj) or _.isArguments(obj)
         return iterator.call(context, obj[i], i, obj) for i in [0...obj.length]
-      iterator.call(context, val, key, obj) for val, key in obj
+      iterator.call(context, val, key, obj) for key, val ino obj
     catch e
       throw e if e isnt breaker
     obj
@@ -148,7 +148,7 @@
   # based on '==='.
   _.include: obj, target =>
     return _.indexOf(obj, target) isnt -1 if _.isArray(obj)
-    for val in obj
+    for key, val ino obj
       return true if val is target
     false
 
@@ -380,7 +380,7 @@
   # Retrieve the names of an object's properties.
   _.keys: obj =>
     return _.range(0, obj.length) if _.isArray(obj)
-    key for val, key in obj
+    key for key, val ino obj
 
 
   # Retrieve the values of an object's properties.
@@ -395,7 +395,7 @@
 
   # Extend a given object with all of the properties in a source object.
   _.extend: destination, source =>
-    for val, key in source
+    for key, val ino source
       destination[key]: val
     destination
 
@@ -564,8 +564,9 @@
   _.each(_.functions(_)) name =>
     method: _[name]
     wrapper.prototype[name]: =>
-      unshift.call(arguments, this._wrapped)
-      result(method.apply(_, arguments), this._chain)
+      args: _.toArray(arguments)
+      unshift.call(args, this._wrapped)
+      result(method.apply(_, args), this._chain)
 
 
   # Add all mutator Array functions to the wrapper.
@@ -584,10 +585,10 @@
 
 
   # Start chaining a wrapped Underscore object.
-  wrapper.prototype.chain: =>
+  wrapper::chain: =>
     this._chain: true
     this
 
 
   # Extracts the result from a wrapped and chained object.
-  wrapper.prototype.value: => this._wrapped
+  wrapper::value: => this._wrapped

data/lib/coffee-script.rb

@@ -10,7 +10,7 @@ require "coffee_script/parse_error"
 # Namespace for all CoffeeScript internal classes.
 module CoffeeScript
 
-  VERSION = '0.2.1'   # Keep in sync with the gemspec.
+  VERSION = '0.2.2'   # Keep in sync with the gemspec.
 
   # Compile a script (String or IO) to JavaScript.
   def self.compile(script, options={})

data/lib/coffee_script/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage

@@ -10,6 +10,10 @@
 	</array>
 	<key>name</key>
 	<string>CoffeeScript</string>
+	<key>foldingStartMarker</key>
+	<string>^.*[:=] \{[^\}]*$</string>
+	<key>foldingStopMarker</key>
+	<string>\s*\}</string>
 	<key>patterns</key>
 	<array>
 		<dict>
@@ -39,7 +43,7 @@
 			<key>comment</key>
 			<string>match stuff like: funcName: =&gt; … </string>
 			<key>match</key>
-			<string>([a-zA-Z0-9_?.$*]*)\s*(=|:)\s*([\w,\s]*?)\s*(=&gt;)</string>
+			<string>([a-zA-Z0-9_?.$:*]*)\s*(=|:)\s*([\w,\s]*?)\s*(=&gt;)</string>
 			<key>name</key>
 			<string>meta.function.coffee</string>
 		</dict>
@@ -60,7 +64,7 @@
 			<key>comment</key>
 			<string>match stuff like: a =&gt; … </string>
 			<key>match</key>
-			<string>([a-zA-Z0-9_?., $*]*)\s*(=&gt;)</string>
+			<string>([a-zA-Z0-9_?., $:*]*)\s*(=&gt;)</string>
 			<key>name</key>
 			<string>meta.inline.function.coffee</string>
 		</dict>
@@ -210,7 +214,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b([a-zA-Z$_]\w*)(\:)\s</string>
+			<string>\b([a-zA-Z$_](\w|\$|:)*)(\:)\s</string>
 			<key>name</key>
 			<string>variable.assignment.coffee</string>
 			<key>captures</key>
@@ -220,7 +224,7 @@
 					<key>name</key>
 					<string>entity.name.function.coffee</string>
 				</dict>
-				<key>2</key>
+				<key>3</key>
 				<dict>
 					<key>name</key>
 					<string>keyword.operator.coffee</string>
@@ -259,7 +263,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>!|\$|%|&amp;|\*|\/|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\?|\|\||\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\b(in|instanceof|new|delete|typeof|and|or|is|isnt|not)\b</string>
+			<string>!|%|&amp;|\*|\/|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\?|\|\||\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\b(in|ino|instanceof|new|delete|typeof|and|or|is|isnt|not)\b</string>
 			<key>name</key>
 			<string>keyword.operator.coffee</string>
 		</dict>

data/lib/coffee_script/command_line.rb

@@ -1,7 +1,13 @@
 require 'optparse'
 require 'fileutils'
 require 'open3'
-require File.expand_path(File.dirname(__FILE__) + '/../coffee-script')
+begin
+  require File.expand_path(File.dirname(__FILE__) + '/../coffee-script')
+rescue LoadError => e
+  puts(e.message)
+  puts("use \"rake build:parser\" to regenerate parser.rb")
+  exit(1)
+end
 
 module CoffeeScript
 
@@ -133,6 +139,7 @@ Usage:
       begin
         options = {}
         options[:no_wrap] = true if @options[:no_wrap]
+        options[:globals] = true if @options[:globals]
         CoffeeScript.compile(script, options)
       rescue CoffeeScript::ParseError, SyntaxError => e
         STDERR.puts "#{source}: #{e.message}"
@@ -187,9 +194,12 @@ Usage:
         opts.on('-v', '--verbose', 'print at every step of code generation') do |v|
           ENV['VERBOSE'] = 'true'
         end
-        opts.on('-n', '--no-wrap', 'raw output, no safety wrapper or vars') do |n|
+        opts.on('-n', '--no-wrap', 'raw output, no function safety wrapper') do |n|
           @options[:no_wrap] = true
         end
+        opts.on('-g', '--globals', 'attach all top-level variable as globals') do |n|
+          @options[:globals] = true
+        end
         opts.on_tail('--install-bundle', 'install the CoffeeScript TextMate bundle') do |i|
           install_bundle
           exit

data/lib/coffee_script/grammar.y

@@ -1,14 +1,14 @@
 class Parser
 
-# Declare tokens produced by the lexer
+# Declare terminal tokens produced by the lexer.
 token IF ELSE UNLESS
 token NUMBER STRING REGEX
 token TRUE FALSE YES NO ON OFF
-token IDENTIFIER PROPERTY_ACCESS
-token CODE PARAM PARAM_SPLAT NEW RETURN
+token IDENTIFIER PROPERTY_ACCESS PROTOTYPE_ACCESS
+token CODE PARAM NEW RETURN
 token TRY CATCH FINALLY THROW
 token BREAK CONTINUE
-token FOR IN BY WHEN WHILE
+token FOR IN INO BY WHEN WHILE
 token SWITCH LEADING_WHEN
 token DELETE INSTANCEOF TYPEOF
 token SUPER EXTENDS
@@ -21,7 +21,7 @@ token INDENT OUTDENT
 # Declare order of operations.
 prechigh
   left     '?'
-  nonassoc UMINUS PARAM_SPLAT SPLAT NOT '!' '!!' '~' '++' '--'
+  nonassoc UMINUS NOT '!' '!!' '~' '++' '--'
   left     '*' '/' '%'
   left     '+' '-'
   left     '<<' '>>' '>>>'
@@ -34,11 +34,12 @@ prechigh
   left     '.'
   right    INDENT
   left     OUTDENT
-  right    WHEN LEADING_WHEN IN BY
+  right    WHEN LEADING_WHEN IN INO BY
   right    THROW FOR NEW SUPER
   left     EXTENDS
   left     ASSIGN '||=' '&&='
-  right    RETURN '=>' UNLESS IF ELSE WHILE
+  right    RETURN
+  right    '=>' UNLESS IF ELSE WHILE
 preclow
 
 rule
@@ -58,13 +59,13 @@ rule
   | Expressions Terminator            { result = val[0] }
   ;
 
-  # All types of expressions in our language.
+  # All types of expressions in our language. The basic unit of CoffeeScript
+  # is the expression.
   Expression:
     Value
   | Call
   | Code
   | Operation
-  | Range
   | Assign
   | If
   | Try
@@ -79,18 +80,20 @@ rule
   | Comment
   ;
 
+  # A block of expressions. Note that the Rewriter will convert some postfix
+  # forms into blocks for us, by altering the token stream.
   Block:
     INDENT Expressions OUTDENT        { result = val[1] }
   | INDENT OUTDENT                    { result = Expressions.new }
   ;
 
-  # All tokens that can terminate an expression.
+  # Tokens that can terminate an expression.
   Terminator:
     "\n"
   | ";"
   ;
 
-  # All hard-coded values.
+  # All hard-coded values. These can be printed straight to JavaScript.
   Literal:
     NUMBER                            { result = LiteralNode.new(val[0]) }
   | STRING                            { result = LiteralNode.new(val[0]) }
@@ -107,12 +110,12 @@ rule
   | OFF                               { result = LiteralNode.new(false) }
   ;
 
-  # Assignment to a variable.
+  # Assignment to a variable (or index).
   Assign:
     Value ASSIGN Expression           { result = AssignNode.new(val[0], val[2]) }
   ;
 
-  # Assignment within an object literal.
+  # Assignment within an object literal (can be quoted).
   AssignObj:
     IDENTIFIER ASSIGN Expression      { result = AssignNode.new(ValueNode.new(val[0]), val[2], :object) }
   | STRING ASSIGN Expression          { result = AssignNode.new(ValueNode.new(LiteralNode.new(val[0])), val[2], :object) }
@@ -122,6 +125,7 @@ rule
   # A return statement.
   Return:
     RETURN Expression                 { result = ReturnNode.new(val[1]) }
+  | RETURN                            { result = ReturnNode.new(ValueNode.new(Value.new('null'))) }
   ;
 
   # A comment.
@@ -184,8 +188,10 @@ rule
   | Expression '&&=' Expression       { result = OpNode.new(val[1], val[0], val[2]) }
 
   | Expression INSTANCEOF Expression  { result = OpNode.new(val[1], val[0], val[2]) }
+  | Expression IN Expression          { result = OpNode.new(val[1], val[0], val[2]) }
   ;
 
+  # The existence operator.
   Existence:
     Expression '?'                    { result = ExistenceNode.new(val[0]) }
   ;
@@ -202,13 +208,15 @@ rule
   | ParamList "," Param               { result = val[0] << val[2] }
   ;
 
+  # A Parameter (or ParamSplat) in a function definition.
   Param:
     PARAM
-  | PARAM_SPLAT PARAM                 { result = ParamSplatNode.new(val[1]) }
+  | PARAM "." "." "."                 { result = ParamSplatNode.new(val[0]) }
   ;
 
+  # A regular splat.
   Splat:
-    '*' Value = SPLAT                 { result = ArgSplatNode.new(val[1]) }
+    Expression "." "." "."            { result = ArgSplatNode.new(val[0])}
   ;
 
   # Expressions that can be treated as values.
@@ -218,6 +226,7 @@ rule
   | Array                             { result = ValueNode.new(val[0]) }
   | Object                            { result = ValueNode.new(val[0]) }
   | Parenthetical                     { result = ValueNode.new(val[0]) }
+  | Range                             { result = ValueNode.new(val[0]) }
   | Value Accessor                    { result = val[0] << val[1] }
   | Invocation Accessor               { result = ValueNode.new(val[0], [val[1]]) }
   ;
@@ -225,6 +234,7 @@ rule
   # Accessing into an object or array, through dot or index notation.
   Accessor:
     PROPERTY_ACCESS IDENTIFIER        { result = AccessorNode.new(val[1]) }
+  | PROTOTYPE_ACCESS IDENTIFIER       { result = AccessorNode.new(val[1], true) }
   | Index                             { result = val[0] }
   | Range                             { result = SliceNode.new(val[0]) }
   ;
@@ -269,6 +279,7 @@ rule
   # | Invocation Code                   { result = val[0] << val[1] }
   ;
 
+  # The list of arguments to a function invocation.
   Arguments:
     "(" ArgList ")"                   { result = val[1] }
   | "(" ArgList ")" Code              { result = val[1] << val[3] }
@@ -330,6 +341,7 @@ rule
   # The while loop. (there is no do..while).
   While:
     WHILE Expression Block            { result = WhileNode.new(val[1], val[2]) }
+  | WHILE Expression                  { result = WhileNode.new(val[1], nil) }
   ;
 
   # Array comprehensions, including guard and current index.
@@ -349,6 +361,7 @@ rule
   # The source of the array comprehension can optionally be filtered.
   ForSource:
     IN Expression                     { result = {:source => val[1]} }
+  | INO Expression                    { result = {:source => val[1], :object => true} }
   | ForSource
     WHEN Expression                   { result = val[0].merge(:filter => val[2]) }
   | ForSource
@@ -374,12 +387,10 @@ rule
     LEADING_WHEN Expression Block     { result = IfNode.new(val[1], val[2], nil, {:statement => true}) }
   | LEADING_WHEN Expression Block
       Terminator                      { result = IfNode.new(val[1], val[2], nil, {:statement => true}) }
-  | Comment
+  | Comment Terminator When           { result = val[2].add_comment(val[0]) }
   ;
 
-  # All of the following nutso if-else destructuring is to make the
-  # grammar expand unambiguously.
-
+  # The most basic form of "if".
   IfBlock:
     IF Expression Block               { result = IfNode.new(val[1], val[2]) }
   ;

data/lib/coffee_script/lexer.rb

@@ -12,23 +12,23 @@ module CoffeeScript
                   "new", "return",
                   "try", "catch", "finally", "throw",
                   "break", "continue",
-                  "for", "in", "by", "where", "while",
+                  "for", "in", "ino", "by", "where", "while",
                   "switch", "when",
                   "super", "extends",
                   "arguments",
                   "delete", "instanceof", "typeof"]
 
     # Token matching regexes.
-    IDENTIFIER = /\A([a-zA-Z$_]\w*)/
+    IDENTIFIER = /\A([a-zA-Z$_](\w|\$)*)/
     NUMBER     = /\A(\b((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?(e[+\-]?[0-9]+)?)))\b/i
-    STRING     = /\A(""|''|"(.*?)[^\\]"|'(.*?)[^\\]')/m
-    JS         = /\A(``|`(.*?)[^\\]`)/m
+    STRING     = /\A(""|''|"(.*?)([^\\]|\\\\)"|'(.*?)([^\\]|\\\\)')/m
+    JS         = /\A(``|`(.*?)([^\\]|\\\\)`)/m
     OPERATOR   = /\A([+\*&|\/\-%=<>:!]+)/
     WHITESPACE = /\A([ \t]+)/
     COMMENT    = /\A(((\n?[ \t]*)?#.*$)+)/
     CODE       = /\A(=>)/
-    REGEX      = /\A(\/(.*?)[^\\]\/[imgy]{0,4})/
-    MULTI_DENT = /\A((\n([ \t]*)?)+)/
+    REGEX      = /\A(\/(.*?)([^\\]|\\\\)\/[imgy]{0,4})/
+    MULTI_DENT = /\A((\n([ \t]*))+)(\.)?/
     LAST_DENT  = /\n([ \t]*)/
     ASSIGNMENT = /\A(:|=)\Z/
 
@@ -88,6 +88,7 @@ module CoffeeScript
       tag = KEYWORDS.include?(identifier) ? identifier.upcase.to_sym : :IDENTIFIER
       tag = :LEADING_WHEN if tag == :WHEN && [:OUTDENT, :INDENT, "\n"].include?(last_tag)
       @tokens[-1][0] = :PROPERTY_ACCESS if tag == :IDENTIFIER && last_value == '.' && !(@tokens[-2][1] == '.')
+      @tokens[-1][0] = :PROTOTYPE_ACCESS if tag == :IDENTIFIER && last_value == '::'
       token(tag, identifier)
       @i += identifier.length
     end
@@ -139,7 +140,9 @@ module CoffeeScript
       return false unless indent = @chunk[MULTI_DENT, 1]
       @line += indent.scan(MULTILINER).size
       @i += indent.size
-      return suppress_newlines(indent) if last_value.to_s.match(NO_NEWLINE) && last_value != "=>"
+      next_character = @chunk[MULTI_DENT, 4]
+      no_newlines = next_character == '.' || (last_value.to_s.match(NO_NEWLINE) && last_value != "=>")
+      return suppress_newlines(indent) if no_newlines
       size = indent.scan(LAST_DENT).last.last.length
       return newline_token(indent) if size == @indent
       if size > @indent
@@ -221,8 +224,7 @@ module CoffeeScript
         i -= 1
         tok = @tokens[i]
         return if !tok
-        next if tok[0] == ','
-        next tok[0] = :PARAM_SPLAT if tok[0] == '*'
+        next if ['.', ','].include?(tok[0])
         return if tok[0] != :IDENTIFIER
         tok[0] = :PARAM
       end