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

fixing range literals by making them values, not expressions, and adding tests

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-01-05 22:49:51 -05:00
parent 46f1977ea1
commit 001e42b85c
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/coffee_script/grammar.y
View File

@@ -64,7 +64,6 @@ rule
| Call
| Code
| Operation
| Range
| Assign
| If
| Try
@@ -218,6 +217,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]]) }
;

11
lib/coffee_script/nodes.rb
View File

@@ -367,7 +367,7 @@ module CoffeeScript
# TODO: This generates pretty ugly code ... shrink it.
def compile_array(o)
body = Expressions.wrap(LiteralNode.new(Value.new('i')))
arr = Expressions.wrap(ForNode.new(body, {:source => self}, Value.new('i')))
arr = Expressions.wrap(ForNode.new(body, {:source => ValueNode.new(self)}, Value.new('i')))
ParentheticalNode.new(CallNode.new(CodeNode.new([], arr))).compile(o)
end
@@ -617,7 +617,8 @@ module CoffeeScript
def compile_node(o)
top_level = o.delete(:top) && !o[:return]
range = @source.is_a?(RangeNode)
range = @source.is_a?(ValueNode) && @source.literal.is_a?(RangeNode) && @source.properties.empty?
source = range ? @source.literal : @source
scope = o[:scope]
name_found = scope.find(@name)
index_found = @index && scope.find(@index)
@@ -629,12 +630,12 @@ module CoffeeScript
body_dent = o[:indent] + TAB
var_part, pre_cond, post_cond = '', '', ''
index_var = scope.free_variable
source_part = @source.compile_variables(o)
for_part = "#{index_var}=0, #{@source.compile(o.merge(:index => ivar, :step => @step))}, #{index_var}++"
source_part = source.compile_variables(o)
for_part = "#{index_var}=0, #{source.compile(o.merge(:index => ivar, :step => @step))}, #{index_var}++"
else
index_var = nil
body_dent = o[:indent] + TAB + TAB
source_part = "#{o[:indent]}#{svar} = #{@source.compile(o)};\n#{o[:indent]}"
source_part = "#{o[:indent]}#{svar} = #{source.compile(o)};\n#{o[:indent]}"
for_part = "#{ivar} in #{svar}"
pre_cond = "\n#{o[:indent] + TAB}if (#{svar}.hasOwnProperty(#{ivar})) {"
var_part = "\n#{body_dent}#{@name} = #{svar}[#{ivar}];"

5
test/fixtures/execution/test_ranges_and_slices.coffee vendored
View File

@@ -5,4 +5,7 @@ b: array[2...4]
result: a.concat(b).join(' ')
print(result is "7 8 9 2 3")
print(result is "7 8 9 2 3")
countdown: [10..1].join(' ')
print(countdown is "10 9 8 7 6 5 4 3 2 1")