merging in master

This commit is contained in:
Jeremy Ashkenas
2010-02-02 20:38:44 -05:00
5 changed files with 1310 additions and 1181 deletions

View File

@@ -34,4 +34,15 @@ puts i is 0
money$: 'dollars'
puts money$ is 'dollars'
puts money$ is 'dollars'
bob: {
name: 'Bob'
greet: (salutation) ->
salutation + " " + @name
hello: ->
@greet("Hello")
}
puts bob.hello() is "Hello Bob"