diff options
| -rw-r--r-- | python3.html.markdown | 8 | ||||
| -rw-r--r-- | swift.html.markdown | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/python3.html.markdown b/python3.html.markdown index 7657295d..bc0c05bd 100644 --- a/python3.html.markdown +++ b/python3.html.markdown @@ -98,6 +98,10 @@ not False # => True # You can use keywords if you don't want to count. "{name} wants to eat {food}".format(name="Bob", food="lasagna") #=> "Bob wants to eat lasagna" +# If your Python 3 code also needs to run on Python 2.5 and below, you can also +# still use the old style of formatting: +"%s can be %s the %s way" % ("strings", "interpolated", "old") + # None is an object None # => None @@ -292,7 +296,7 @@ prints: mouse is a mammal """ for animal in ["dog", "cat", "mouse"]: - # You can use % to interpolate formatted strings + # You can use format() to interpolate formatted strings print("{} is a mammal".format(animal)) """ @@ -471,7 +475,7 @@ class Human(object): # An instance method. All methods take "self" as the first argument def say(self, msg): - return "{name}: {message}" % (name=self.name, message=msg) + return "{name}: {message}".format(name=self.name, message=msg) # A class method is shared among all instances # They are called with the calling class as the first argument diff --git a/swift.html.markdown b/swift.html.markdown index f24b1592..a47b085a 100644 --- a/swift.html.markdown +++ b/swift.html.markdown @@ -31,7 +31,7 @@ optionalString = nil // Array var shoppingList = ["catfish", "water", "lemons"] shoppingList[1] = "bottle of water" -let emptyArray = String[]() +let emptyArray = [String]() // Dictionary var occupations = [ @@ -65,7 +65,7 @@ for (key, value) in dict { for i in -1...1 { // [-1, 0, 1] println(i) } -// use .. to exclude the last number +// use ..< to exclude the last number // while loop var i = 1 @@ -127,6 +127,7 @@ increment(7) // // Closures // +var numbers = [1, 2, 6] // Functions are special case closures ({}) @@ -140,8 +141,10 @@ numbers.map({ }) // When the type is known, like above, we can do this -var numbers = [1, 2, 6] numbers = numbers.map({ number in 3 * number }) +//Or even this +//numbers = numbers.map({ $0 * 3 }) + print(numbers) // [3, 6, 18] @@ -221,4 +224,4 @@ enum Suit { // Generics: Similar to Java. Use the `where` keyword to specify the // requirements of the generics. -```
\ No newline at end of file +``` |