github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-04-11 03:00:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

be more vigorous about removing mid-expression newlines, 'when' closes implicit blocks, a better comment-detecting regex lexer that doesn't eat outdents

Browse Source
This commit is contained in:
Jeremy Ashkenas
2009-12-30 19:26:37 -05:00
parent cd68f02981
commit dc821f2e4c
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/coffee_script/lexer.rb
View File

@@ -24,7 +24,7 @@ module CoffeeScript
JS = /\A(``|`(.*?)[^\\]`)/m JS = /\A(``|`(.*?)[^\\]`)/m
OPERATOR = /\A([+\*&|\/\-%=<>:!]+)/ OPERATOR = /\A([+\*&|\/\-%=<>:!]+)/
WHITESPACE = /\A([ \t]+)/ WHITESPACE = /\A([ \t]+)/
COMMENT = /\A((#[^\n]*\s*)+)/m COMMENT = /\A((#[^\n]*(\s(?=#))*)+)/m
CODE = /\A(=>)/ CODE = /\A(=>)/
REGEX = /\A(\/(.*?)[^\\]\/[imgy]{0,4})/ REGEX = /\A(\/(.*?)[^\\]\/[imgy]{0,4})/
MULTI_DENT = /\A((\n+([ \t]*(?=\S))?)+)/ MULTI_DENT = /\A((\n+([ \t]*(?=\S))?)+)/
@@ -43,12 +43,13 @@ module CoffeeScript
# Outdents that come before these tokens don't signify the end of the # Outdents that come before these tokens don't signify the end of the
# expression. # expression.
EXPRESSION_TAIL = [:CATCH, :WHEN, :ELSE, :FINALLY, ')', ']', '}'] EXPRESSION_START = [:INDENT, '{', '(', '[']
EXPRESSION_TAIL = [:CATCH, :OUTDENT, :WHEN, :ELSE, :FINALLY, ')', ']', '}']
# Single-line flavors of block expressions that have unclosed endings. # Single-line flavors of block expressions that have unclosed endings.
# The grammar can't disambiguate them, so we insert the implicit indentation. # The grammar can't disambiguate them, so we insert the implicit indentation.
SINGLE_LINERS = [:ELSE, "=>", :TRY, :FINALLY, :THEN] SINGLE_LINERS = [:ELSE, "=>", :TRY, :FINALLY, :THEN]
SINGLE_CLOSERS = ["\n", :CATCH, :FINALLY, :ELSE, :OUTDENT] SINGLE_CLOSERS = ["\n", :CATCH, :FINALLY, :ELSE, :OUTDENT, :WHEN]
# The inverse mappings of token pairs we're trying to fix up. # The inverse mappings of token pairs we're trying to fix up.
INVERSES = {:INDENT => :OUTDENT, :OUTDENT => :INDENT, '(' => ')', ')' => '('} INVERSES = {:INDENT => :OUTDENT, :OUTDENT => :INDENT, '(' => ')', ')' => '('}
@@ -65,6 +66,7 @@ module CoffeeScript
@chunk = @code[@i..-1] @chunk = @code[@i..-1]
extract_next_token extract_next_token
end end
puts "original stream: #{@tokens.inspect}" if ENV['VERBOSE']
close_indentation close_indentation
remove_mid_expression_newlines remove_mid_expression_newlines
move_commas_outside_outdents move_commas_outside_outdents
@@ -235,7 +237,9 @@ module CoffeeScript
# this, remove their trailing newlines. # this, remove their trailing newlines.
def remove_mid_expression_newlines def remove_mid_expression_newlines
scan_tokens do |prev, token, post, i| scan_tokens do |prev, token, post, i|
@tokens.delete_at(i) if post && EXPRESSION_TAIL.include?(post[0]) && token[0] == "\n" && prev[0] == :OUTDENT @tokens.delete_at(i) if post && EXPRESSION_TAIL.include?(post[0]) &&
token[0] == "\n" # &&
# EXPRESSION_START.include?(prev[0])
end end
end end
@@ -310,7 +314,6 @@ module CoffeeScript
verbose = ENV['VERBOSE'] verbose = ENV['VERBOSE']
stack, debt = [], Hash.new(0) stack, debt = [], Hash.new(0)
stack_stats = lambda { "stack: #{stack.inspect} debt: #{debt.inspect}" } stack_stats = lambda { "stack: #{stack.inspect} debt: #{debt.inspect}" }
puts "original stream: #{@tokens.inspect}" if verbose
scan_tokens do |prev, token, post, i| scan_tokens do |prev, token, post, i|
tag, inv = token[0], INVERSES[token[0]] tag, inv = token[0], INVERSES[token[0]]
if [:INDENT, '('].include?(tag) if [:INDENT, '('].include?(tag)

4
lib/coffee_script/nodes.rb
View File

@@ -469,8 +469,8 @@ module CoffeeScript
indent = o[:indent] indent = o[:indent]
o[:indent] += TAB o[:indent] += TAB
props = @properties.map { |prop| props = @properties.map { |prop|
joiner = prop == @properties.last ? '' : prop.is_a?(CommentNode) ? "\n" : ",\n" joiner = prop == @properties.first ? '' : prop.is_a?(CommentNode) ? "\n" : ",\n"
o[:indent] + prop.compile(o) + joiner joiner + o[:indent] + prop.compile(o)
}.join('') }.join('')
write("{\n#{props}\n#{indent}}") write("{\n#{props}\n#{indent}}")
end end