coffee-script 0.2.6 → 0.3.0

data/{lib/coffee_script → extras}/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage

@@ -19,52 +19,31 @@
 		<dict>
 			<key>captures</key>
 			<dict>
-				<key>1</key>
+			  <key>1</key>
 				<dict>
 					<key>name</key>
-					<string>entity.name.function.coffee</string>
+					<string>variable.parameter.function.coffee</string>
 				</dict>
 				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.coffee</string>
-				</dict>
-				<key>3</key>
 				<dict>
 					<key>name</key>
 					<string>variable.parameter.function.coffee</string>
 				</dict>
 				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.function.coffee</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>match stuff like: funcName: =&gt; … </string>
-			<key>match</key>
-			<string>([a-zA-Z0-9_?.$:*]*?)\s*(=\b|:\b)\s*([\w,\s]*?)\s*(=+&gt;)</string>
-			<key>name</key>
-			<string>meta.function.coffee</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
 				<dict>
 					<key>name</key>
 					<string>variable.parameter.function.coffee</string>
 				</dict>
-				<key>2</key>
+				<key>5</key>
 				<dict>
 					<key>name</key>
 					<string>storage.type.function.coffee</string>
 				</dict>
 			</dict>
 			<key>comment</key>
-			<string>match stuff like: a =&gt; … </string>
+			<string>match stuff like: a -&gt; … </string>
 			<key>match</key>
-			<string>([a-zA-Z0-9_?., $*]*)\s*(=+&gt;)</string>
+			<string>(\()([a-zA-Z0-9_?.$]*(,\s*[a-zA-Z0-9_?.$]+)*)(\))\s*((=|-)&gt;)</string>
 			<key>name</key>
 			<string>meta.inline.function.coffee</string>
 		</dict>
@@ -313,6 +292,12 @@
 			<key>name</key>
 			<string>keyword.other.coffee</string>
 		</dict>
+		<dict>
+			<key>match</key>
+			<string>(=|-)&gt;</string>
+			<key>name</key>
+			<string>storage.type.function.coffee</string>
+		</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(instanceof|new|delete|typeof|and|or|is|isnt|not)\b</string>

data/extras/EXTRAS

@@ -0,0 +1,20 @@
+This folder includes rough cuts of CoffeeScript syntax highlighters for 
+TextMate and Vim. Improvements to their lexing ability are always welcome.
+
+To install the TextMate bundle, run `bin/coffee --install-bundle`, or drop it
+into "~/Library/Application Support/TextMate/Bundles".
+
+To install the Vim highlighter, copy "coffee.vim" into the "syntax" directory of
+your vim72, and enable it in either of the following two ways:
+
+  * Manually, by running `:set syntax=coffee`
+  
+  * Or automatically, by creating a "filetype.vim" file within "~/.vim", which
+    contains something along these lines:
+    
+    if exists("did_load_filetypes")
+      finish
+    end
+    augroup filetypedetect
+      au! BufRead,BufNewFile *.coffee setfiletype coffee
+    augroup END

data/extras/coffee.vim

@@ -0,0 +1,111 @@
+" Vim syntax file
+" Language:	CoffeeScript
+" Maintainer:	Jeff Olson <olson.jeffery@gmail.com>
+" URL:		http://github.com/olsonjeffery
+" Changes:	(jro) initial port from javascript
+" Last Change:	2006 Jun 19
+" Adaptation of javascript.vim syntax file (distro'd w/ vim72), 
+" maintained by Claudio Fleiner <claudio@fleiner.com>
+" with updates from Scott Shattuck (ss) <ss@technicalpursuit.com>
+
+if !exists("main_syntax")
+  if version < 600
+    syntax clear
+  elseif exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'coffee'
+endif
+
+syn case ignore
+
+syn match   coffeeLineComment      "#.*" contains=@Spell,CoffeeCommentTodo
+syn match   coffeeSpecial	       "\\\d\d\d\|\\."
+syn region  coffeeStringD	       start=+"+  skip=+\\\\\|\\"+  end=+"\|$+  contains=coffeeSpecial,@htmlPreproc
+syn region  coffeeStringS	       start=+'+  skip=+\\\\\|\\'+  end=+'\|$+  contains=coffeeSpecial,@htmlPreproc
+
+syn match   coffeeSpecialCharacter "'\\.'"
+syn match   coffeeNumber	       "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
+syn region  coffeeRegexpString     start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gi]\{0,2\}\s*$+ end=+/[gi]\{0,2\}\s*[;.,)\]}]+me=e-1 contains=@htmlPreproc oneline
+
+syn match coffeePrototypeAccess "::"
+syn match coffeeFunction "->"
+
+syn keyword coffeeExtends   extends
+syn keyword coffeeConditional	if else switch then
+syn keyword coffeeRepeat		while for in of
+syn keyword coffeeBranch		break continue
+syn keyword coffeeOperator		delete instanceof typeof
+syn keyword coffeeType		Array Boolean Date Function Number Object String RegExp
+syn keyword coffeeStatement		return with
+syn keyword coffeeBoolean		true false
+syn keyword coffeeNull		null undefined
+syn keyword coffeeIdentifier	arguments this var
+syn keyword coffeeLabel		case default
+syn keyword coffeeException		try catch finally throw
+syn keyword coffeeMessage		alert confirm prompt status
+syn keyword coffeeGlobal		self window top parent
+syn keyword coffeeMember		document event location 
+syn keyword coffeeDeprecated	escape unescape
+syn keyword coffeeReserved		abstract boolean byte char class const debugger double enum export final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile 
+
+syn sync fromstart
+syn sync maxlines=100
+
+if main_syntax == "coffee"
+  syn sync ccomment coffeeComment
+endif
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_coffee_syn_inits")
+  if version < 508
+    let did_coffee_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink coffeePrototypeAccess Keyword
+  HiLink coffeeExtends        Keyword
+  HiLink coffeeLineComment		Comment
+  HiLink coffeeSpecial		Special
+  HiLink coffeeStringS		String
+  HiLink coffeeStringD		String
+  HiLink coffeeCharacter		Character
+  HiLink coffeeSpecialCharacter	coffeeSpecial
+  HiLink coffeeNumber		coffeeValue
+  HiLink coffeeConditional		Conditional
+  HiLink coffeeRepeat		Repeat
+  HiLink coffeeBranch		Conditional
+  HiLink coffeeOperator		Operator
+  HiLink coffeeType			Type
+  HiLink coffeeStatement		Statement
+  HiLink coffeeFunction		Function
+  HiLink coffeeBraces		Function
+  HiLink coffeeError		Error
+  HiLink coffeeScrParenError		coffeeError
+  HiLink coffeeNull			Keyword
+  HiLink coffeeBoolean		Boolean
+  HiLink coffeeRegexpString		String
+
+  HiLink coffeeIdentifier		Identifier
+  HiLink coffeeLabel		Label
+  HiLink coffeeException		Exception
+  HiLink coffeeMessage		Keyword
+  HiLink coffeeGlobal		Keyword
+  HiLink coffeeMember		Keyword
+  HiLink coffeeDeprecated		Exception 
+  HiLink coffeeReserved		Keyword
+  HiLink coffeeDebug		Debug
+  HiLink coffeeConstant		Label
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "coffee"
+if main_syntax == 'coffee'
+  unlet main_syntax
+endif
+
+" vim: ts=8

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.6'   # Keep in sync with the gemspec.
+  VERSION = '0.3.0'   # Keep in sync with the gemspec.
 
   # Compile a script (String or IO) to JavaScript.
   def self.compile(script, options={})

data/lib/coffee_script/command_line.rb

@@ -25,9 +25,11 @@ Usage:
     # Seconds to pause between checks for changed source files.
     WATCH_INTERVAL = 0.5
 
+    # Path to the root of the CoffeeScript install.
+    ROOT = File.expand_path(File.dirname(__FILE__) + '/../..')
+
     # Command to execute in Narwhal
-    PACKAGE = File.expand_path(File.dirname(__FILE__) + '/../..')
-    LAUNCHER = "narwhal -p #{PACKAGE} -e 'require(\"coffee-script\").run(system.args);'"
+    LAUNCHER = "narwhal -p #{ROOT} -e 'require(\"coffee-script\").run(system.args);'"
 
     # Run the CommandLine off the contents of ARGV.
     def initialize
@@ -141,7 +143,7 @@ Usage:
         options[:no_wrap] = true if @options[:no_wrap]
         options[:globals] = true if @options[:globals]
         CoffeeScript.compile(script, options)
-      rescue CoffeeScript::ParseError, SyntaxError => e
+      rescue CoffeeScript::ParseError => e
         STDERR.puts "#{source}: #{e.message}"
         exit(1) unless @options[:watch]
         nil
@@ -159,7 +161,7 @@ Usage:
     # Install the CoffeeScript TextMate bundle to ~/Library.
     def install_bundle
       bundle_dir = File.expand_path('~/Library/Application Support/TextMate/Bundles/')
-      FileUtils.cp_r(File.dirname(__FILE__) + '/CoffeeScript.tmbundle', bundle_dir)
+      FileUtils.cp_r("#{ROOT}/extras/CoffeeScript.tmbundle", bundle_dir)
     end
 
     # Use OptionParser for all the options.

data/lib/coffee_script/grammar.y

@@ -4,8 +4,9 @@ class Parser
 token IF ELSE UNLESS
 token NUMBER STRING REGEX
 token TRUE FALSE YES NO ON OFF
-token IDENTIFIER PROPERTY_ACCESS PROTOTYPE_ACCESS
-token CODE PARAM NEW RETURN
+token IDENTIFIER PROPERTY_ACCESS PROTOTYPE_ACCESS SOAK_ACCESS
+token CODE PARAM_START PARAM PARAM_END NEW RETURN
+token CALL_START CALL_END INDEX_START INDEX_END
 token TRY CATCH FINALLY THROW
 token BREAK CONTINUE
 token FOR IN OF BY WHEN WHILE
@@ -16,13 +17,12 @@ token ARGUMENTS
 token NEWLINE
 token COMMENT
 token JS
-token THIS
 token INDENT OUTDENT
 
 # Declare order of operations.
 prechigh
   left     '?'
-  nonassoc UMINUS NOT '!' '!!' '~' '++' '--'
+  nonassoc UMINUS UPLUS NOT '!' '!!' '~' '++' '--'
   left     '*' '/' '%'
   left     '+' '-'
   left     '<<' '>>' '>>>'
@@ -38,9 +38,9 @@ prechigh
   right    WHEN LEADING_WHEN IN OF BY
   right    THROW FOR NEW SUPER
   left     EXTENDS
-  left     ASSIGN '||=' '&&=' '?='
-  right    RETURN
-  right    '=>' '==>' UNLESS IF ELSE WHILE
+  left     '||=' '&&=' '?='
+  right    ASSIGN RETURN
+  right    '->' '=>' UNLESS IF ELSE WHILE
 preclow
 
 rule
@@ -141,6 +141,7 @@ rule
     '!' Expression                    { result = OpNode.new(val[0], val[1]) }
   | '!!' Expression                   { result = OpNode.new(val[0], val[1]) }
   | '-' Expression = UMINUS           { result = OpNode.new(val[0], val[1]) }
+  | '+' Expression = UPLUS            { result = OpNode.new(val[0], val[1]) }
   | NOT Expression                    { result = OpNode.new(val[0], val[1]) }
   | '~' Expression                    { result = OpNode.new(val[0], val[1]) }
   | '--' Expression                   { result = OpNode.new(val[0], val[1]) }
@@ -201,14 +202,15 @@ rule
 
   # Function definition.
   Code:
-    ParamList FuncGlyph Block         { result = CodeNode.new(val[0], val[2], val[1]) }
+    PARAM_START ParamList PARAM_END
+      FuncGlyph Block                 { result = CodeNode.new(val[1], val[4], val[3]) }
   | FuncGlyph Block                   { result = CodeNode.new([], val[1], val[0]) }
   ;
 
   # The symbols to signify functions, and bound functions.
   FuncGlyph:
-    '=>'                              { result = :func }
-  | '==>'                             { result = :boundfunc }
+    '->'                              { result = :func }
+  | '=>'                              { result = :boundfunc }
   ;
 
   # The parameters to a function definition.
@@ -238,20 +240,20 @@ rule
   | Range                             { result = ValueNode.new(val[0]) }
   | Value Accessor                    { result = val[0] << val[1] }
   | Invocation Accessor               { result = ValueNode.new(val[0], [val[1]]) }
-  | THIS                              { result = ValueNode.new(ThisNode.new) }
   ;
 
   # 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) }
+  | PROTOTYPE_ACCESS IDENTIFIER       { result = AccessorNode.new(val[1], :prototype) }
+  | SOAK_ACCESS IDENTIFIER            { result = AccessorNode.new(val[1], :soak) }
   | Index                             { result = val[0] }
-  | Range                             { result = SliceNode.new(val[0]) }
+  | Slice                             { result = SliceNode.new(val[0]) }
   ;
 
   # Indexing into an object or array.
   Index:
-    "[" Expression "]"                { result = IndexNode.new(val[1]) }
+    INDEX_START Expression INDEX_END  { result = IndexNode.new(val[1]) }
   ;
 
   # An object literal.
@@ -290,13 +292,12 @@ rule
 
   # The list of arguments to a function invocation.
   Arguments:
-    "(" ArgList ")"                   { result = val[1] }
-  | "(" ArgList ")" Code              { result = val[1] << val[3] }
+    CALL_START ArgList CALL_END       { result = val[1] }
   ;
 
   # Calling super.
   Super:
-    SUPER "(" ArgList ")"             { result = CallNode.new(Value.new('super'), val[2]) }
+    SUPER CALL_START ArgList CALL_END { result = CallNode.new(Value.new('super'), val[2]) }
   ;
 
   # The range literal.
@@ -307,6 +308,14 @@ rule
       "." "." "." Expression "]"      { result = RangeNode.new(val[1], val[5], true) }
   ;
 
+  # The slice literal.
+  Slice:
+    INDEX_START Expression "." "."
+      Expression INDEX_END            { result = RangeNode.new(val[1], val[4]) }
+  | INDEX_START Expression "." "." "."
+      Expression INDEX_END            { result = RangeNode.new(val[1], val[5], true) }
+  ;
+
   # The array literal.
   Array:
     "[" ArgList "]"                   { result = ArrayNode.new(val[1]) }

data/lib/coffee_script/lexer.rb

@@ -16,19 +16,18 @@ module CoffeeScript
                   "delete", "instanceof", "typeof",
                   "switch", "when",
                   "super", "extends",
-                  "arguments",
-                  "this"]
+                  "arguments"]
 
     # Token matching regexes.
     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
-    HEREDOC    = /\A("{6}|'{6}|"{3}\n?(.*?)\n?(\s*)"{3}|'{3}\n?(.*?)\n?(\s*)'{3})/m
+    HEREDOC    = /\A("{6}|'{6}|"{3}\n?(.*?)\n?([ \t]*)"{3}|'{3}\n?(.*?)\n?([ \t]*)'{3})/m
     JS         = /\A(``|`(.*?)([^\\]|\\\\)`)/m
     OPERATOR   = /\A([+\*&|\/\-%=<>:!?]+)/
     WHITESPACE = /\A([ \t]+)/
     COMMENT    = /\A(((\n?[ \t]*)?#.*$)+)/
-    CODE       = /\A(=?=>)/
+    CODE       = /\A((-|=)>)/
     REGEX      = /\A(\/(.*?)([^\\]|\\\\)\/[imgy]{0,4})/
     MULTI_DENT = /\A((\n([ \t]*))+)(\.)?/
     LAST_DENT  = /\n([ \t]*)/
@@ -37,10 +36,10 @@ module CoffeeScript
     # Token cleaning regexes.
     JS_CLEANER      = /(\A`|`\Z)/
     MULTILINER      = /\n/
-    STRING_NEWLINES = /\n\s*/
-    COMMENT_CLEANER = /(^\s*#|\n\s*$)/
+    STRING_NEWLINES = /\n[ \t]*/
+    COMMENT_CLEANER = /(^[ \t]*#|\n[ \t]*$)/
     NO_NEWLINE      = /\A([+\*&|\/\-%=<>:!.\\][<>=&|]*|and|or|is|isnt|not|delete|typeof|instanceof)\Z/
-    HEREDOC_INDENT  = /^\s+/
+    HEREDOC_INDENT  = /^[ \t]+/
 
     # Tokens which a regular expression will never immediately follow, but which
     # a division operator might.
@@ -48,9 +47,12 @@ module CoffeeScript
     NOT_REGEX  = [
       :IDENTIFIER, :NUMBER, :REGEX, :STRING,
       ')', '++', '--', ']', '}',
-      :FALSE, :NULL, :THIS, :TRUE
+      :FALSE, :NULL, :TRUE
     ]
 
+    # Tokens which could legitimately be invoked or indexed.
+    CALLABLE = [:IDENTIFIER, :SUPER, ')', ']', '}', :STRING]
+
     # Scan by attempting to match tokens one character at a time. Slow and steady.
     def tokenize(code)
       @code    = code.chomp # Cleanup code by remove extra line breaks
@@ -59,6 +61,7 @@ module CoffeeScript
       @indent  = 0          # The current indent level.
       @indents = []         # The stack of all indent levels we are currently within.
       @tokens  = []         # Collection of all parsed tokens in the form [:TOKEN_TYPE, value]
+      @spaced  = nil        # The last value that has a space following it.
       while @i < @code.length
         @chunk = @code[@i..-1]
         extract_next_token
@@ -92,8 +95,15 @@ module CoffeeScript
       # 'if' will result in an [:IF, "if"] token.
       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] && @tokens[-2][1] == '.')
       @tokens[-1][0] = :PROTOTYPE_ACCESS if tag == :IDENTIFIER && last_value == '::'
+      if tag == :IDENTIFIER && last_value == '.' && !(@tokens[-2] && @tokens[-2][1] == '.')
+        if @tokens[-2][0] == "?"
+          @tokens[-1][0] = :SOAK_ACCESS
+          @tokens.delete_at(-2)
+        else
+          @tokens[-1][0] = :PROPERTY_ACCESS
+        end
+      end
       token(tag, identifier)
       @i += identifier.length
     end
@@ -157,7 +167,7 @@ module CoffeeScript
       @line += indent.scan(MULTILINER).size
       @i += indent.size
       next_character = @chunk[MULTI_DENT, 4]
-      no_newlines = next_character == '.' || (last_value.to_s.match(NO_NEWLINE) && !last_value.match(CODE))
+      no_newlines = next_character == '.' || (last_value.to_s.match(NO_NEWLINE) && @tokens[-2][0] != '.'  && !last_value.match(CODE))
       return suppress_newlines(indent) if no_newlines
       size = indent.scan(LAST_DENT).last.last.length
       return newline_token(indent) if size == @indent
@@ -184,6 +194,7 @@ module CoffeeScript
     # Matches and consumes non-meaningful whitespace.
     def whitespace_token
       return false unless whitespace = @chunk[WHITESPACE, 1]
+      @spaced = last_value
       @i += whitespace.length
     end
 
@@ -208,6 +219,10 @@ module CoffeeScript
       tag_parameters if value && value.match(CODE)
       value ||= @chunk[0,1]
       tag = value.match(ASSIGNMENT) ? :ASSIGN : value
+      if !@spaced.equal?(last_value) && CALLABLE.include?(last_tag)
+        tag = :CALL_START  if value == '('
+        tag = :INDEX_START if value == '['
+      end
       token(tag, value)
       @i += value.length
     end
@@ -235,14 +250,17 @@ module CoffeeScript
     # parameter identifiers in order to avoid this. Also, parameter lists can
     # make use of splats.
     def tag_parameters
+      return if last_tag != ')'
       i = 0
       loop do
         i -= 1
         tok = @tokens[i]
         return if !tok
-        next if ['.', ','].include?(tok[0])
-        return if tok[0] != :IDENTIFIER
-        tok[0] = :PARAM
+        case tok[0]
+        when :IDENTIFIER  then tok[0] = :PARAM
+        when ')'          then tok[0] = :PARAM_END
+        when '('          then return tok[0] = :PARAM_START
+        end
       end
     end