From 2995cd100529f95e497b56288035a5f5d252a412 Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Mon, 1 Jul 2013 14:45:59 -0400
Subject: draft of Julia entry based on Python entry; finish up to Tuples
 section.

---
 julia.html.markdown | 427 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 427 insertions(+)
 create mode 100644 julia.html.markdown

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
new file mode 100644
index 00000000..ff2f2339
--- /dev/null
+++ b/julia.html.markdown
@@ -0,0 +1,427 @@
+---
+language: julia
+author: Leah Hanson
+author_url: http://leahhanson.us
+---
+
+Julia is a new homoiconic functional language focused on technical computing.
+While having the full power of homoiconic macros, first-class functions, and low-level control, Julia is as easy to learn and use as Python.
+
+This is based on the current development version of Julia, as of June 29th, 2013.
+
+```julia
+# Single line comments start with a hash.
+
+####################################################
+## 1. Primitive Datatypes and Operators
+####################################################
+
+# Everything in Julia is a expression.
+
+# You have numbers
+3 #=> 3 (Int64)
+3.2 #=> 3.2 (Float64)
+2 + 1im #=> 2 + 1im (Complex{Int64})
+2//3 #=> 2//3 (Rational{Int64})
+
+# Math is what you would expect
+1 + 1 #=> 2
+8 - 1 #=> 7
+10 * 2 #=> 20
+35 / 5 #=> 7.0
+5 \ 35 #=> 7.0
+5 / 2 #=> 2.5
+div(5, 2) #=> 2
+2 ^ 2 #=> 4
+12 % 10 #=> 2
+
+# Enforce precedence with parentheses
+(1 + 3) * 2 #=> 8
+
+# Bitwise Operators
+~2 #=> -3   # bitwise not
+3 & 5 #=> 1 # bitwise and
+2 | 4 #=> 6 # bitwise or
+2 $ 4 #=> 6 # bitwise xor
+2 >>> 1 #=> 1 # logical shift right
+2 >> 1  #=> 1 # arithmetic shift right
+2 << 1  #=> 4 # logical/arithmetic shift left
+
+# You can use the bits function to see the binary representation of a number.
+bits(2)   #=> "0000000000000000000000000000000000000000000000000000000000000010"
+bits(2.0) #=> "0100000000000000000000000000000000000000000000000000000000000000"
+
+# Boolean values are primitives
+true
+false
+
+# Boolean operators
+!true #=> false
+!false #=> true
+1 == 1 #=> true
+2 == 1 #=> false
+1 != 1 #=> false
+2 != 1 #=> true
+1 < 10 #=> true
+1 > 10 #=> false
+2 <= 2 #=> true
+2 >= 2 #=> true
+# Comparisons can be chained
+1 < 2 < 3 #=> true
+2 < 3 < 2 #=> false
+
+# Strings are created with "
+"This is a string."
+
+# Character literals written with '
+'a'
+
+# A string can be treated like a list of characters
+"This is a string"[1] #=> 'T' # Julia indexes from 1
+
+# $ can be used for string interpolation:
+"2 + 2 = $(2+2)" # => "2 + 2 = 4"
+# You can put any Julia expression inside the parenthesis.
+
+# Another way to format strings is the printf macro.
+@printf "%d is less than %f" 4.5 5.3 # 5 is less than 5.300000
+
+####################################################
+## 2. Variables and Collections
+####################################################
+
+# Printing is pretty easy
+println("I'm Julia. Nice to meet you!")
+
+# No need to declare variables before assigning to them.
+some_var = 5 #=> 5 
+some_var #=> 5
+# Accessing a previously unassigned variable is an error
+some_other_var #=> ERROR: some_other_var not defined
+
+# Variable Names:
+Some!Other1Var! = 6 #=> 6 # You can use uppercase letters, digits, and exclamation points as well.
+☃ = 8 #=> 8 # You can also use unicode characters
+
+# A note on naming conventions in Julia:
+# * Names of variables are in lower case, with word separation indicated by underscores ('\_').
+# * Names of Types begin with a capital letter and word separation is shown with CamelCase instead of underscores.
+# * Names of functions and macros are in lower case, without underscores.
+# * Functions that modify their inputs have names that end in !. These functions are sometimes called mutating functions or in-place functions.
+
+
+# Arrays store sequences
+li = Int64[] #=> 0-element Int64 Array
+# 1-dimensional array literals can be written with comma-separated values.
+other_li = [4, 5, 6] #=> 3-element Int64 Array: [4, 5, 6]
+# 2-dimentional arrays use space-separated values and semicolon-separated rows.
+matrix = [1 2; 3 4] #=> 2x2 Int64 Array: [1 2; 3 4]
+
+# Add stuff to the end of a list with push! and append!
+push!(li,1)     #=> [1]
+push!(li,2)     #=> [1,2]
+push!(li,4)     #=> [1,2,4]
+push!(li,3)     #=> [1,2,4,3]
+append!(li,other_li) #=> [1,2,4,3,4,5,6]
+# Remove from the end with pop
+pop!(other_li)        #=> 6 and other_li is now [4,5]
+# Let's put it back
+push!(other_li,6)   # other_li is now [4,5,6] again.
+
+# Remember that Julia indexes from 1, not 0!
+li[1] #=> 1
+
+# Function names that end in exclamations points indicate that they modify their argument.
+arr = [5,4,6] #=> 3-element Int64 Array: [5,4,6]
+sort(arr) #=> [4,5,6]; arr is still [5,4,6]
+sort!(arr) #=> [4,5,6]; arr is now [4,5,6]
+
+# Looking out of bounds is a BoundsError
+li[0] # ERROR: BoundsError() in getindex at array.jl:270
+# Errors list the line and file they came from, even if it's in the standard library.
+# If you built Julia from source, you can look in the folder base inside the julia folder to find these files.
+
+# You can initialize arrays from ranges
+li = [1:5] #=> 5-element Int64 Array: [1,2,3,4,5]
+
+# You can look at ranges with slice syntax.
+li[1:3] #=> [1, 2, 3]
+# Omit the beginning
+li[2:] #=> [2, 3, 4, 5]
+
+# Remove arbitrary elements from a list with splice!
+splice!(li,2) #=> 2 ; li is now [1, 3, 4, 5]
+
+# Concatenate lists with append! 
+other_li = [1,2,3]
+append!(li,other_li) # Now li is [1, 3, 4, 5, 1, 2, 3]
+
+# Check for existence in a list with contains 
+contains(li,1) #=> true
+
+# Examine the length with length
+length(li) #=> 7
+
+# Tuples are like lists but are immutable.
+tup = (1, 2, 3)
+tup[0] #=> 1
+try:
+    tup[0] = 3  # Raises a TypeError
+except TypeError:
+    print "Tuples cannot be mutated."
+
+# You can do all those list thingies on tuples too
+len(tup) #=> 3
+tup + (4, 5, 6) #=> (1, 2, 3, 4, 5, 6)
+tup[:2] #=> (1, 2)
+2 in tup #=> True
+
+# You can unpack tuples into variables
+a, b, c = (1, 2, 3)     # a is now 1, b is now 2 and c is now 3
+# Tuples are created by default if you leave out the parentheses
+d, e, f = 4, 5, 6
+# Now look how easy it is to swap two values
+e, d = d, e     # d is now 5 and e is now 4
+
+
+# Dictionaries store mappings
+empty_dict = {}
+# Here is a prefilled dictionary
+filled_dict = {"one": 1, "two": 2, "three": 3}
+
+# Look up values with []
+filled_dict["one"] #=> 1
+
+# Get all keys as a list
+filled_dict.keys() #=> ["three", "two", "one"]
+# Note - Dictionary key ordering is not guaranteed.
+# Your results might not match this exactly.
+
+# Get all values as a list
+filled_dict.values() #=> [3, 2, 1]
+# Note - Same as above regarding key ordering.
+
+# Check for existence of keys in a dictionary with in
+"one" in filled_dict #=> True
+1 in filled_dict #=> False
+
+# Trying to look up a non-existing key will raise a KeyError
+filled_dict["four"] #=> KeyError
+
+# Use get method to avoid the KeyError
+filled_dict.get("one") #=> 1
+filled_dict.get("four") #=> None
+
+# The get method supports a default argument when the value is missing
+filled_dict.get("one", 4) #=> 1
+filled_dict.get("four", 4) #=> 4
+
+# Setdefault method is a safe way to add new key-value pair into dictionary
+filled_dict.setdefault("five", 5) #filled_dict["five"] is set to 5
+filled_dict.setdefault("five", 6) #filled_dict["five"] is still 5
+
+
+# Sets store ... well sets
+empty_set = set()
+# Initialize a set with a bunch of values
+some_set = set([1,2,2,3,4]) # filled_set is now set([1, 2, 3, 4])
+
+# Since Python 2.7, {} can be used to declare a set
+filled_set = {1, 2, 2, 3, 4} # => {1 2 3 4}
+
+# Add more items to a set
+filled_set.add(5) # filled_set is now {1, 2, 3, 4, 5}
+
+# Do set intersection with &
+other_set = set{3, 4, 5, 6}
+filled_set & other_set #=> {3, 4, 5}
+
+# Do set union with |
+filled_set | other_set #=> {1, 2, 3, 4, 5, 6}
+
+# Do set difference with -
+{1,2,3,4} - {2,3,5} #=> {1, 4}
+
+# Check for existence in a set with in
+2 in filled_set #=> True
+10 in filled_set #=> False
+
+
+####################################################
+## 3. Control Flow
+####################################################
+
+# Let's just make a variable
+some_var = 5
+
+# Here is an if statement. INDENTATION IS SIGNIFICANT IN PYTHON!
+# prints "some var is smaller than 10"
+if some_var > 10:
+    print "some_var is totally bigger than 10."
+elif some_var < 10:    # This elif clause is optional.
+    print "some_var is smaller than 10."
+else:           # This is optional too.
+    print "some_var is indeed 10."
+
+
+"""
+For loops iterate over lists
+prints:
+    dog is a mammal
+    cat is a mammal
+    mouse is a mammal
+"""
+for animal in ["dog", "cat", "mouse"]:
+    # You can use % to interpolate formatted strings
+    print "%s is a mammal" % animal
+
+"""
+While loops go until a condition is no longer met.
+prints:
+    0
+    1
+    2
+    3
+"""
+x = 0
+while x < 4:
+    print x
+    x += 1  # Shorthand for x = x + 1
+
+# Handle exceptions with a try/except block
+
+# Works on Python 2.6 and up:
+try:
+    # Use raise to raise an error
+    raise IndexError("This is an index error")
+except IndexError as e:
+    pass    # Pass is just a no-op. Usually you would do recovery here.
+
+# Works for Python 2.7 and down:
+try:
+    raise IndexError("This is an index error")
+except IndexError, e: # No "as", comma instead
+    pass
+
+
+####################################################
+## 4. Functions
+####################################################
+
+# Use def to create new functions
+def add(x, y):
+    print "x is %s and y is %s" % (x, y)
+    return x + y    # Return values with a return statement
+
+# Calling functions with parameters
+add(5, 6) #=> 11 and prints out "x is 5 and y is 6"
+# Another way to call functions is with keyword arguments
+add(y=6, x=5)   # Keyword arguments can arrive in any order.
+
+# You can define functions that take a variable number of
+# positional arguments
+def varargs(*args):
+    return args
+
+varargs(1, 2, 3) #=> (1,2,3)
+
+
+# You can define functions that take a variable number of
+# keyword arguments, as well
+def keyword_args(**kwargs):
+    return kwargs
+
+# Let's call it to see what happens
+keyword_args(big="foot", loch="ness") #=> {"big": "foot", "loch": "ness"}
+
+# You can do both at once, if you like
+def all_the_args(*args, **kwargs):
+    print args
+    print kwargs
+"""
+all_the_args(1, 2, a=3, b=4) prints:
+    [1, 2]
+    {"a": 3, "b": 4}
+"""
+
+# You can also use * and ** when calling a function
+args = (1, 2, 3, 4)
+kwargs = {"a": 3, "b": 4}
+foo(*args) # equivalent to foo(1, 2, 3, 4)
+foo(**kwargs) # equivalent to foo(a=3, b=4)
+foo(*args, **kwargs) # equivalent to foo(1, 2, 3, 4, a=3, b=4)
+
+# Python has first class functions
+def create_adder(x):
+    def adder(y):
+        return x + y
+    return adder
+
+add_10 = create_adder(10)
+add_10(3) #=> 13
+
+# There are also anonymous functions
+(lambda x: x > 2)(3) #=> True
+
+# There are built-in higher order functions
+map(add_10, [1,2,3]) #=> [11, 12, 13]
+filter(lambda x: x > 5, [3, 4, 5, 6, 7]) #=> [6, 7]
+
+# We can use list comprehensions for nice maps and filters
+[add_10(i) for i in [1, 2, 3]]  #=> [11, 12, 13]
+[x for x in [3, 4, 5, 6, 7] if x > 5] #=> [6, 7]
+
+####################################################
+## 5. Classes
+####################################################
+
+# We subclass from object to get a class.
+class Human(object):
+
+     # A class attribute. It is shared by all instances of this class
+    species = "H. sapiens"
+
+    # Basic initializer
+    def __init__(self, name):
+        # Assign the argument to the instance's name attribute
+        self.name = name
+
+    # An instance method. All methods take self as the first argument
+    def say(self, msg):
+       return "%s: %s" % (self.name, msg)
+
+    # A class method is shared among all instances
+    # They are called with the calling class as the first argument
+    @classmethod
+    def get_species(cls):
+        return cls.species
+
+    # A static method is called without a class or instance reference
+    @staticmethod
+    def grunt():
+        return "*grunt*"
+
+
+# Instantiate a class
+i = Human(name="Ian")
+print i.say("hi")     # prints out "Ian: hi"
+
+j = Human("Joel")
+print j.say("hello")  #prints out "Joel: hello"
+
+# Call our class method
+i.get_species() #=> "H. sapiens"
+
+# Change the shared attribute
+Human.species = "H. neanderthalensis"
+i.get_species() #=> "H. neanderthalensis"
+j.get_species() #=> "H. neanderthalensis"
+
+# Call the static method
+Human.grunt() #=> "*grunt*"
+```
+
+## Further Reading
+
+Still up for more? Try [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
+
-- 
cgit v1.2.3


From 18c413f6f55b24d031a37590a85d4e602ac6bceb Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Mon, 1 Jul 2013 16:21:56 -0400
Subject: edited tuples section

---
 julia.html.markdown | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index ff2f2339..b036b1dd 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -109,7 +109,6 @@ Some!Other1Var! = 6 #=> 6 # You can use uppercase letters, digits, and exclamati
 # * Names of functions and macros are in lower case, without underscores.
 # * Functions that modify their inputs have names that end in !. These functions are sometimes called mutating functions or in-place functions.
 
-
 # Arrays store sequences
 li = Int64[] #=> 0-element Int64 Array
 # 1-dimensional array literals can be written with comma-separated values.
@@ -128,8 +127,8 @@ pop!(other_li)        #=> 6 and other_li is now [4,5]
 # Let's put it back
 push!(other_li,6)   # other_li is now [4,5,6] again.
 
-# Remember that Julia indexes from 1, not 0!
-li[1] #=> 1
+li[1] #=> 1 # remember that Julia indexes from 1, not 0!
+li[end] #=> 6 # end is a shorthand for the last index; it can be used in any indexing expression.
 
 # Function names that end in exclamations points indicate that they modify their argument.
 arr = [5,4,6] #=> 3-element Int64 Array: [5,4,6]
@@ -162,26 +161,22 @@ contains(li,1) #=> true
 # Examine the length with length
 length(li) #=> 7
 
-# Tuples are like lists but are immutable.
-tup = (1, 2, 3)
-tup[0] #=> 1
-try:
-    tup[0] = 3  # Raises a TypeError
-except TypeError:
-    print "Tuples cannot be mutated."
+# Tuples are immutable.
+tup = (1, 2, 3) #=>(1,2,3) # an (Int64,Int64,Int64) tuple.
+tup[1] #=> 1
+tup[0] = 3  # ERROR: no method setindex!((Int64,Int64,Int64),Int64,Int64)
 
-# You can do all those list thingies on tuples too
-len(tup) #=> 3
-tup + (4, 5, 6) #=> (1, 2, 3, 4, 5, 6)
-tup[:2] #=> (1, 2)
-2 in tup #=> True
+# Many list functions also work on tuples
+length(tup) #=> 3
+tup[1:2] #=> (1,2)
+contains(tup,2) #=> true
 
 # You can unpack tuples into variables
-a, b, c = (1, 2, 3)     # a is now 1, b is now 2 and c is now 3
+a, b, c = (1, 2, 3) #=> (1,2,3)  # a is now 1, b is now 2 and c is now 3
 # Tuples are created by default if you leave out the parentheses
-d, e, f = 4, 5, 6
+d, e, f = 4, 5, 6 #=> (4,5,6)
 # Now look how easy it is to swap two values
-e, d = d, e     # d is now 5 and e is now 4
+e, d = d, e  #=> (5,4) # d is now 5 and e is now 4
 
 
 # Dictionaries store mappings
-- 
cgit v1.2.3


From a333018593affb355c8d805f8e0792ff80955712 Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Mon, 1 Jul 2013 16:34:39 -0400
Subject: edited Dict section

---
 julia.html.markdown | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index b036b1dd..e60b4e52 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -180,43 +180,37 @@ e, d = d, e  #=> (5,4) # d is now 5 and e is now 4
 
 
 # Dictionaries store mappings
-empty_dict = {}
+empty_dict = Dict() #=> Dict{Any,Any}()
 # Here is a prefilled dictionary
-filled_dict = {"one": 1, "two": 2, "three": 3}
+filled_dict = ["one"=> 1, "two"=> 2, "three"=> 3] #=> ["one"=> 1, "two"=> 2, "three"=> 3] # Dict{ASCIIString,Int64}
 
 # Look up values with []
 filled_dict["one"] #=> 1
 
-# Get all keys as a list
-filled_dict.keys() #=> ["three", "two", "one"]
+# Get all keys
+keys(filled_dict) #=> KeyIterator{Dict{ASCIIString,Int64}}(["three"=>3,"one"=>1,"two"=>2])
 # Note - Dictionary key ordering is not guaranteed.
 # Your results might not match this exactly.
 
-# Get all values as a list
-filled_dict.values() #=> [3, 2, 1]
+# Get all values 
+values(d) #=> ValueIterator{Dict{ASCIIString,Int64}}(["three"=>3,"one"=>1,"two"=>2])
 # Note - Same as above regarding key ordering.
 
-# Check for existence of keys in a dictionary with in
-"one" in filled_dict #=> True
-1 in filled_dict #=> False
+# Check for existence of keys in a dictionary with contains, haskey
+contains(filled_dict,("one",1)) #=> true
+contains(filled_dict,("two",3)) #=> false
+haskey(filled_dict,"one") #=> true
+haskey(filled_dict,1) #=> false
 
-# Trying to look up a non-existing key will raise a KeyError
-filled_dict["four"] #=> KeyError
+# Trying to look up a non-existing key will raise an error
+filled_dict["four"] #=> ERROR: key not found: four in getindex at dict.jl:489
 
-# Use get method to avoid the KeyError
-filled_dict.get("one") #=> 1
-filled_dict.get("four") #=> None
+# Use get method to avoid the error
+# get(dictionary,key,default_value)
+get(filled_dict,"one",4) #=> 1
+get(filled_dict,"four",4) #=> 4
 
-# The get method supports a default argument when the value is missing
-filled_dict.get("one", 4) #=> 1
-filled_dict.get("four", 4) #=> 4
-
-# Setdefault method is a safe way to add new key-value pair into dictionary
-filled_dict.setdefault("five", 5) #filled_dict["five"] is set to 5
-filled_dict.setdefault("five", 6) #filled_dict["five"] is still 5
-
-
-# Sets store ... well sets
+# Sets store sets
 empty_set = set()
 # Initialize a set with a bunch of values
 some_set = set([1,2,2,3,4]) # filled_set is now set([1, 2, 3, 4])
-- 
cgit v1.2.3


From 2a2dae61ce885d57fc257b28c5c041076041cf9e Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Mon, 1 Jul 2013 16:44:47 -0400
Subject: edited Set section

---
 julia.html.markdown | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index e60b4e52..b19250af 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -211,29 +211,22 @@ get(filled_dict,"one",4) #=> 1
 get(filled_dict,"four",4) #=> 4
 
 # Sets store sets
-empty_set = set()
+empty_set = Set() #=> Set{Any}()
 # Initialize a set with a bunch of values
-some_set = set([1,2,2,3,4]) # filled_set is now set([1, 2, 3, 4])
-
-# Since Python 2.7, {} can be used to declare a set
-filled_set = {1, 2, 2, 3, 4} # => {1 2 3 4}
+filled_set = Set(1,2,2,3,4) #=> Set{Int64}(1,2,3,4)
 
 # Add more items to a set
-filled_set.add(5) # filled_set is now {1, 2, 3, 4, 5}
-
-# Do set intersection with &
-other_set = set{3, 4, 5, 6}
-filled_set & other_set #=> {3, 4, 5}
-
-# Do set union with |
-filled_set | other_set #=> {1, 2, 3, 4, 5, 6}
+add!(filled_set,5) #=> Set{Int64}(5,4,2,3,1)
 
-# Do set difference with -
-{1,2,3,4} - {2,3,5} #=> {1, 4}
+# There are functions for set intersection, union, and difference.
+other_set = Set(3, 4, 5, 6) #=> Set{Int64}(6,4,5,3)
+intersect(filled_set, other_set) #=> Set{Int64}(3,4,5)
+union(filled_set, other_set) #=> Set{Int64}(1,2,3,4,5,6)
+setdiff(Set(1,2,3,4),Set(2,3,5)) #=> Set{Int64}(1,4)
 
-# Check for existence in a set with in
-2 in filled_set #=> True
-10 in filled_set #=> False
+# Check for existence in a set with contains 
+contains(filled_set,2) #=> true
+contains(filled_set,10) #=> false
 
 
 ####################################################
-- 
cgit v1.2.3


From 2627624bb495a0d5450e493b685a938c70eaa32d Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Mon, 1 Jul 2013 16:59:53 -0400
Subject: edited control flow section

---
 julia.html.markdown | 92 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 49 insertions(+), 43 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index b19250af..12f52e6e 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -233,57 +233,63 @@ contains(filled_set,10) #=> false
 ## 3. Control Flow
 ####################################################
 
-# Let's just make a variable
+# Let's make a variable
 some_var = 5
 
-# Here is an if statement. INDENTATION IS SIGNIFICANT IN PYTHON!
+# Here is an if statement. Indentation is NOT meaningful in Julia.
 # prints "some var is smaller than 10"
-if some_var > 10:
-    print "some_var is totally bigger than 10."
-elif some_var < 10:    # This elif clause is optional.
-    print "some_var is smaller than 10."
-else:           # This is optional too.
-    print "some_var is indeed 10."
-
-
-"""
-For loops iterate over lists
-prints:
-    dog is a mammal
-    cat is a mammal
-    mouse is a mammal
-"""
-for animal in ["dog", "cat", "mouse"]:
-    # You can use % to interpolate formatted strings
-    print "%s is a mammal" % animal
-
-"""
-While loops go until a condition is no longer met.
-prints:
-    0
-    1
-    2
-    3
-"""
+if some_var > 10
+    println("some_var is totally bigger than 10.")
+elseif some_var < 10    # This elseif clause is optional.
+    println("some_var is smaller than 10.")
+else           # This is optional too.
+    println("some_var is indeed 10.")
+end
+
+
+
+# For loops iterate over iterable things, such as ranges, lists, sets, dicts, strings. 
+# prints:
+#    dog is a mammal
+#    cat is a mammal
+#    mouse is a mammal
+
+for animal=["dog", "cat", "mouse"]
+    # You can use $ to interpolate into strings
+    println("$animal is a mammal")
+end
+
+# You can use in instead of =, if you want.
+for animal in ["dog", "cat", "mouse"]
+    println("$animal is a mammal")
+end
+
+for a in ["dog"=>"mammal","cat"=>"mammal","mouse"=>"mammal"]
+    println("$(a[1]) is $(a[2])")
+end
+
+
+# While loops go until a condition is no longer met.
+# prints:
+#   0
+#   1
+#   2
+#   3
 x = 0
-while x < 4:
-    print x
+while x < 4
+    println(x)
     x += 1  # Shorthand for x = x + 1
+end
 
 # Handle exceptions with a try/except block
 
-# Works on Python 2.6 and up:
-try:
-    # Use raise to raise an error
-    raise IndexError("This is an index error")
-except IndexError as e:
-    pass    # Pass is just a no-op. Usually you would do recovery here.
-
-# Works for Python 2.7 and down:
-try:
-    raise IndexError("This is an index error")
-except IndexError, e: # No "as", comma instead
-    pass
+error("help") # ERROR: help in error at error.jl:21
+
+try
+  error("my error!")
+except
+  println("caught it!")
+end
 
 
 ####################################################
-- 
cgit v1.2.3


From 0f641aed5e7d52633f11443ff6d80ea0a8ee3fe1 Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Mon, 1 Jul 2013 17:03:05 -0400
Subject: fixed try/catch section

---
 julia.html.markdown | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index 12f52e6e..5ba27efc 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -286,10 +286,11 @@ end
 error("help") # ERROR: help in error at error.jl:21
 
 try
-  error("my error!")
-except
-  println("caught it!")
-end
+   error("help")
+catch e
+   println("caught it $e")
+end             
+#=> caught it ErrorException("help")
 
 
 ####################################################
-- 
cgit v1.2.3


From 43129d86e1d94c7fec5806b37d1f5522992c25b8 Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Mon, 1 Jul 2013 17:39:42 -0400
Subject: small changes based on Stefan's feedback.

---
 julia.html.markdown | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index 5ba27efc..f26694d7 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -32,7 +32,7 @@ This is based on the current development version of Julia, as of June 29th, 2013
 5 \ 35 #=> 7.0
 5 / 2 #=> 2.5
 div(5, 2) #=> 2
-2 ^ 2 #=> 4
+2 ^ 2 #=> 4 # power, not bitwise xor
 12 % 10 #=> 2
 
 # Enforce precedence with parentheses
@@ -100,7 +100,7 @@ some_var #=> 5
 some_other_var #=> ERROR: some_other_var not defined
 
 # Variable Names:
-Some!Other1Var! = 6 #=> 6 # You can use uppercase letters, digits, and exclamation points as well.
+SomeOtherVar123! = 6 #=> 6 # You can use uppercase letters, digits, and exclamation points as well.
 ☃ = 8 #=> 8 # You can also use unicode characters
 
 # A note on naming conventions in Julia:
@@ -149,7 +149,8 @@ li[1:3] #=> [1, 2, 3]
 li[2:] #=> [2, 3, 4, 5]
 
 # Remove arbitrary elements from a list with splice!
-splice!(li,2) #=> 2 ; li is now [1, 3, 4, 5]
+arr = [3,4,5]
+splice!(arr,2) #=> 4 ; arr is now [3,5]
 
 # Concatenate lists with append! 
 other_li = [1,2,3]
-- 
cgit v1.2.3


From 3ebd8c55fd018aec6381ef69cca9c9f55f0e4796 Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Mon, 1 Jul 2013 17:58:25 -0400
Subject: edited functions through keyword args

---
 julia.html.markdown | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index f26694d7..c6e54f70 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -298,31 +298,45 @@ end
 ## 4. Functions
 ####################################################
 
-# Use def to create new functions
-def add(x, y):
-    print "x is %s and y is %s" % (x, y)
-    return x + y    # Return values with a return statement
+# Use the keyword function to create new functions
+function add(x, y)
+    println("x is $x and y is $y")
+    x + y    # or equivalently: return x + y
+end
 
-# Calling functions with parameters
 add(5, 6) #=> 11 and prints out "x is 5 and y is 6"
-# Another way to call functions is with keyword arguments
-add(y=6, x=5)   # Keyword arguments can arrive in any order.
 
 # You can define functions that take a variable number of
 # positional arguments
-def varargs(*args):
+function varargs(args...)
     return args
+end
 
 varargs(1, 2, 3) #=> (1,2,3)
 
+# You can define functions with optional positional arguments
+function defaults(a,b,x=5,y=6)
+  return "$a $b and $x $y"
+end
+
+defaults('h','g') #=> "h g and 5 6"
+defaults('h','g','j') #=> "h g and j 6"
+defaults('h','g','j','k') #=> "h g and j k"
+defaults('h') #=> ERROR: no method defaults(Char,)
+defaults() #=> ERROR: no methods defaults()
 
-# You can define functions that take a variable number of
-# keyword arguments, as well
-def keyword_args(**kwargs):
-    return kwargs
+# You can define functions that take keyword arguments
+function keyword_args(;k1=4,name2="hello") # note the ;
+    return ["k1"=>k1,"name2"=>name2]
+end 
+
+keyword_args(name2="ness") #=> ["name2"=>"ness","k1"=>4]
+keyword_args(k1="mine") #=> ["k1"=>"mine","name2"=>"hello"]
+keyword_args() #=> ["name2"=>"hello","k2"=>4]
 
-# Let's call it to see what happens
-keyword_args(big="foot", loch="ness") #=> {"big": "foot", "loch": "ness"}
+####
+#### In progress point
+####
 
 # You can do both at once, if you like
 def all_the_args(*args, **kwargs):
-- 
cgit v1.2.3


From 7b21a8ae1bdd909b9923290f588ffae17ea960a5 Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Mon, 1 Jul 2013 18:00:13 -0400
Subject: added another dictionary-for-loop example

---
 julia.html.markdown | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index c6e54f70..222a490a 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -269,6 +269,10 @@ for a in ["dog"=>"mammal","cat"=>"mammal","mouse"=>"mammal"]
     println("$(a[1]) is $(a[2])")
 end
 
+for (k,v) in ["dog"=>"mammal","cat"=>"mammal","mouse"=>"mammal"]
+    println("$k is $v")
+end
+
 
 # While loops go until a condition is no longer met.
 # prints:
-- 
cgit v1.2.3


From b642fcb3097bdaa4117bccab23088654f0ce4c76 Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Tue, 2 Jul 2013 11:49:19 -0400
Subject: added section on splatting and translated default-and-keyword args
 function.

---
 julia.html.markdown | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index 222a490a..e1c6731c 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -318,6 +318,17 @@ end
 
 varargs(1, 2, 3) #=> (1,2,3)
 
+# The ... is called a splat.
+# It can also be used in a fuction call
+# to splat a list or tuple out to be the arguments
+Set([1,2,3])    #=>Set{Array{Int64,1}}([1,2,3]) # no ..., produces a Set of Arrays
+Set([1,2,3]...) #=>Set{Int64}(1,2,3) # this is equivalent to Set(1,2,3)
+
+x = (1,2,3)     #=> (1,2,3)
+Set(x)          #=> Set{(Int64,Int64,Int64)}((1,2,3)) # a Set of Tuples
+Set(x...)       #=> Set{Int64}(2,3,1)
+
+
 # You can define functions with optional positional arguments
 function defaults(a,b,x=5,y=6)
   return "$a $b and $x $y"
@@ -338,27 +349,24 @@ keyword_args(name2="ness") #=> ["name2"=>"ness","k1"=>4]
 keyword_args(k1="mine") #=> ["k1"=>"mine","name2"=>"hello"]
 keyword_args() #=> ["name2"=>"hello","k2"=>4]
 
+# You can also do both at once
+function all_the_args(normal_arg, optional_positional_arg=2; keyword_arg="foo")
+    println("normal arg: $normal_arg")
+    println("optional arg: $optional_positional_arg")
+    println("keyword arg: $keyword_arg")
+end
+
+all_the_args(1, 3, keyword_arg=4)
+# prints:
+#   normal arg: 1
+#   optional arg: 3
+#   keyword arg: 4
+
+
 ####
 #### In progress point
 ####
 
-# You can do both at once, if you like
-def all_the_args(*args, **kwargs):
-    print args
-    print kwargs
-"""
-all_the_args(1, 2, a=3, b=4) prints:
-    [1, 2]
-    {"a": 3, "b": 4}
-"""
-
-# You can also use * and ** when calling a function
-args = (1, 2, 3, 4)
-kwargs = {"a": 3, "b": 4}
-foo(*args) # equivalent to foo(1, 2, 3, 4)
-foo(**kwargs) # equivalent to foo(a=3, b=4)
-foo(*args, **kwargs) # equivalent to foo(1, 2, 3, 4, a=3, b=4)
-
 # Python has first class functions
 def create_adder(x):
     def adder(y):
-- 
cgit v1.2.3


From b1e305626efe710e366003206ae53018f8e76df8 Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Tue, 2 Jul 2013 17:23:10 -0400
Subject: finished function section

---
 julia.html.markdown | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index e1c6731c..d54e7d0e 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -362,30 +362,44 @@ all_the_args(1, 3, keyword_arg=4)
 #   optional arg: 3
 #   keyword arg: 4
 
+# Julia has first class functions
+function create_adder(x)
+  adder = function (y)
+    return x + y
+  end
+  return adder
+end
 
-####
-#### In progress point
-####
+# or equivalently
+function create_adder(x)
+    y -> x + y
+end
 
-# Python has first class functions
-def create_adder(x):
-    def adder(y):
-        return x + y
-    return adder
+# you can also name the internal function, if you want
+function create_adder(x)
+  function adder(y)
+    x + y
+  end
+  adder
+end
 
 add_10 = create_adder(10)
 add_10(3) #=> 13
 
-# There are also anonymous functions
-(lambda x: x > 2)(3) #=> True
+# The first two inner functions above are anonymous functions
+(x -> x > 2)(3) #=> true
 
 # There are built-in higher order functions
 map(add_10, [1,2,3]) #=> [11, 12, 13]
-filter(lambda x: x > 5, [3, 4, 5, 6, 7]) #=> [6, 7]
+filter(x -> x > 5, [3, 4, 5, 6, 7]) #=> [6, 7]
 
 # We can use list comprehensions for nice maps and filters
+[add_10(i) for i=[1, 2, 3]]  #=> [11, 12, 13]
 [add_10(i) for i in [1, 2, 3]]  #=> [11, 12, 13]
-[x for x in [3, 4, 5, 6, 7] if x > 5] #=> [6, 7]
+
+####
+#### In progress point
+####
 
 ####################################################
 ## 5. Classes
-- 
cgit v1.2.3


From 587e35062cd129f6b7665f80daab384960863327 Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Tue, 2 Jul 2013 18:00:32 -0400
Subject: added types section

---
 julia.html.markdown | 71 +++++++++++++++++++++--------------------------------
 1 file changed, 28 insertions(+), 43 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index d54e7d0e..e18fc3cd 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -397,61 +397,46 @@ filter(x -> x > 5, [3, 4, 5, 6, 7]) #=> [6, 7]
 [add_10(i) for i=[1, 2, 3]]  #=> [11, 12, 13]
 [add_10(i) for i in [1, 2, 3]]  #=> [11, 12, 13]
 
-####
-#### In progress point
-####
-
 ####################################################
-## 5. Classes
+## 5. Types and Multiple-Dispatch 
 ####################################################
 
-# We subclass from object to get a class.
-class Human(object):
-
-     # A class attribute. It is shared by all instances of this class
-    species = "H. sapiens"
-
-    # Basic initializer
-    def __init__(self, name):
-        # Assign the argument to the instance's name attribute
-        self.name = name
-
-    # An instance method. All methods take self as the first argument
-    def say(self, msg):
-       return "%s: %s" % (self.name, msg)
-
-    # A class method is shared among all instances
-    # They are called with the calling class as the first argument
-    @classmethod
-    def get_species(cls):
-        return cls.species
+# Type definition
+type Tiger
+  taillength::Float64
+  coatcolor # no type annotation is implicitly Any
+end
+# default constructor is the properties in order
+# so, Tiger(taillength,coatcolor)
 
-    # A static method is called without a class or instance reference
-    @staticmethod
-    def grunt():
-        return "*grunt*"
+# Type instantiation
+tigger = Tiger(3.5,"orange") # the type doubles as the constructor function
 
+# Abtract Types
+abstract Cat # just a name and point in the type hierarchy
 
-# Instantiate a class
-i = Human(name="Ian")
-print i.say("hi")     # prints out "Ian: hi"
+# types defined with the type keyword are concrete types; they can be instantiated
+# types defined with the abstract keyword are abstract types; they can have subtypes
+# each type has one supertype; a supertype can have zero or more subtypes.
 
-j = Human("Joel")
-print j.say("hello")  #prints out "Joel: hello"
+type Lion <: Cat # Lion is a subtype of Cat
+  mane_color
+  roar::String
+end
 
-# Call our class method
-i.get_species() #=> "H. sapiens"
+type Panther <: Cat # Panther is also a subtype of Cat
+  eye_color
+  Panther() = new("green") # Panthers will only have this constructor, and no default constructor.
+end
 
-# Change the shared attribute
-Human.species = "H. neanderthalensis"
-i.get_species() #=> "H. neanderthalensis"
-j.get_species() #=> "H. neanderthalensis"
+####
+#### In progress point
+####
 
-# Call the static method
-Human.grunt() #=> "*grunt*"
-```
+#### Multiple Dispatch
 
 ## Further Reading
 
+#### Link to Maunual
 Still up for more? Try [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
 
-- 
cgit v1.2.3


From 0cf568d278db4cb766723e30d88b15c38f1d4536 Mon Sep 17 00:00:00 2001
From: Leah Hanson <astrieanna@gmail.com>
Date: Tue, 2 Jul 2013 18:55:23 -0400
Subject: finished first draft :)

---
 julia.html.markdown | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index e18fc3cd..f722f7ee 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -429,14 +429,37 @@ type Panther <: Cat # Panther is also a subtype of Cat
   Panther() = new("green") # Panthers will only have this constructor, and no default constructor.
 end
 
-####
-#### In progress point
-####
+# Multiple Dispatch
+
+# In Julia, all named functions are generic functions
+# This means that they are built up from many small methods
+# For example, let's make a function meow:
+function meow(cat::Lion)
+  cat.roar # access properties using dot notation
+end
+
+function meow(cat::Panther)
+  "grrr"
+end
+
+function meow(cat::Tiger)
+  "rawwwr"
+end
+
+meow(tigger) #=> "rawwr"
+meow(Lion("brown","ROAAR")) #=> "ROAAR"
+meow(Panther()) #=> "grrr"
+
+function pet_cat(cat::Cat)
+  println("The cat says $(meow(cat))")
+end
+
+pet_cat(tigger) #=> ERROR: no method pet_cat(Tiger,)
+pet_cat(Lion(Panther(),"42")) #=> prints "The cat says 42"
 
-#### Multiple Dispatch
 
 ## Further Reading
 
-#### Link to Maunual
-Still up for more? Try [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
+You can get a lot more detail from [The Julia Manual](http://docs.julialang.org/en/latest/manual/)
+
 
-- 
cgit v1.2.3


From bbfe94770feb3f9373a6c8b8fbffb97e8f06e867 Mon Sep 17 00:00:00 2001
From: Stefan Karpinski <stefan@karpinski.org>
Date: Tue, 2 Jul 2013 23:15:34 -0400
Subject: suggested edits to the learn Julia in Y minutes document.

---
 julia.html.markdown | 95 +++++++++++++++++++++++++++++------------------------
 1 file changed, 52 insertions(+), 43 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index f722f7ee..0dd40f73 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -51,6 +51,15 @@ div(5, 2) #=> 2
 bits(2)   #=> "0000000000000000000000000000000000000000000000000000000000000010"
 bits(2.0) #=> "0100000000000000000000000000000000000000000000000000000000000000"
 
+# this might be a better example:
+julia> bits(123)
+"0000000000000000000000000000000000000000000000000000000001111011"
+
+julia> bits(123.0)
+"0100000001011110110000000000000000000000000000000000000000000000"
+# the other one stands the risk of someone thinking that floating-point
+# numbers are just integers with reversed bit-patterns or something.
+
 # Boolean values are primitives
 true
 false
@@ -80,7 +89,7 @@ false
 "This is a string"[1] #=> 'T' # Julia indexes from 1
 
 # $ can be used for string interpolation:
-"2 + 2 = $(2+2)" # => "2 + 2 = 4"
+"2 + 2 = $(2 + 2)" #=> "2 + 2 = 4"
 # You can put any Julia expression inside the parenthesis.
 
 # Another way to format strings is the printf macro.
@@ -100,7 +109,7 @@ some_var #=> 5
 some_other_var #=> ERROR: some_other_var not defined
 
 # Variable Names:
-SomeOtherVar123! = 6 #=> 6 # You can use uppercase letters, digits, and exclamation points as well.
+SomeOtherVar123! = 6 #=> 6 # You can use uppercase letters, digits, and exclamation points as well after the initial alphabetic character.
 ☃ = 8 #=> 8 # You can also use unicode characters
 
 # A note on naming conventions in Julia:
@@ -109,26 +118,28 @@ SomeOtherVar123! = 6 #=> 6 # You can use uppercase letters, digits, and exclamat
 # * Names of functions and macros are in lower case, without underscores.
 # * Functions that modify their inputs have names that end in !. These functions are sometimes called mutating functions or in-place functions.
 
-# Arrays store sequences
-li = Int64[] #=> 0-element Int64 Array
+# Arrays store a sequence of values indexed by integers 1 through n:
+a = Int64[] #=> 0-element Int64 Array
 # 1-dimensional array literals can be written with comma-separated values.
-other_li = [4, 5, 6] #=> 3-element Int64 Array: [4, 5, 6]
+b = [4, 5, 6] #=> 3-element Int64 Array: [4, 5, 6]
+b[1] #=> 4
+b[end] #=> 6
 # 2-dimentional arrays use space-separated values and semicolon-separated rows.
 matrix = [1 2; 3 4] #=> 2x2 Int64 Array: [1 2; 3 4]
 
 # Add stuff to the end of a list with push! and append!
-push!(li,1)     #=> [1]
-push!(li,2)     #=> [1,2]
-push!(li,4)     #=> [1,2,4]
-push!(li,3)     #=> [1,2,4,3]
-append!(li,other_li) #=> [1,2,4,3,4,5,6]
+push!(a,1)     #=> [1]
+push!(a,2)     #=> [1,2]
+push!(a,4)     #=> [1,2,4]
+push!(a,3)     #=> [1,2,4,3]
+append!(a,b) #=> [1,2,4,3,4,5,6]
 # Remove from the end with pop
-pop!(other_li)        #=> 6 and other_li is now [4,5]
+pop!(a)        #=> 6 and b is now [4,5]
 # Let's put it back
-push!(other_li,6)   # other_li is now [4,5,6] again.
+push!(b,6)   # b is now [4,5,6] again.
 
-li[1] #=> 1 # remember that Julia indexes from 1, not 0!
-li[end] #=> 6 # end is a shorthand for the last index; it can be used in any indexing expression.
+a[1] #=> 1 # remember that Julia indexes from 1, not 0!
+a[end] #=> 6 # end is a shorthand for the last index; it can be used in any indexing expression.
 
 # Function names that end in exclamations points indicate that they modify their argument.
 arr = [5,4,6] #=> 3-element Int64 Array: [5,4,6]
@@ -136,36 +147,37 @@ sort(arr) #=> [4,5,6]; arr is still [5,4,6]
 sort!(arr) #=> [4,5,6]; arr is now [4,5,6]
 
 # Looking out of bounds is a BoundsError
-li[0] # ERROR: BoundsError() in getindex at array.jl:270
+a[0] #=> ERROR: BoundsError() in getindex at array.jl:270
+a[end+1] #=> ERROR: BoundsError() in getindex at array.jl:270
 # Errors list the line and file they came from, even if it's in the standard library.
 # If you built Julia from source, you can look in the folder base inside the julia folder to find these files.
 
 # You can initialize arrays from ranges
-li = [1:5] #=> 5-element Int64 Array: [1,2,3,4,5]
+a = [1:5] #=> 5-element Int64 Array: [1,2,3,4,5]
 
 # You can look at ranges with slice syntax.
-li[1:3] #=> [1, 2, 3]
+a[1:3] #=> [1, 2, 3]
 # Omit the beginning
-li[2:] #=> [2, 3, 4, 5]
+a[2:] #=> [2, 3, 4, 5]
 
 # Remove arbitrary elements from a list with splice!
 arr = [3,4,5]
 splice!(arr,2) #=> 4 ; arr is now [3,5]
 
 # Concatenate lists with append! 
-other_li = [1,2,3]
-append!(li,other_li) # Now li is [1, 3, 4, 5, 1, 2, 3]
+b = [1,2,3]
+append!(a,b) # Now a is [1, 3, 4, 5, 1, 2, 3]
 
 # Check for existence in a list with contains 
-contains(li,1) #=> true
+contains(a,1) #=> true
 
 # Examine the length with length
-length(li) #=> 7
+length(a) #=> 7
 
 # Tuples are immutable.
 tup = (1, 2, 3) #=>(1,2,3) # an (Int64,Int64,Int64) tuple.
 tup[1] #=> 1
-tup[0] = 3  # ERROR: no method setindex!((Int64,Int64,Int64),Int64,Int64)
+tup[0] = 3 #=> ERROR: no method setindex!((Int64,Int64,Int64),Int64,Int64)
 
 # Many list functions also work on tuples
 length(tup) #=> 3
@@ -190,8 +202,7 @@ filled_dict["one"] #=> 1
 
 # Get all keys
 keys(filled_dict) #=> KeyIterator{Dict{ASCIIString,Int64}}(["three"=>3,"one"=>1,"two"=>2])
-# Note - Dictionary key ordering is not guaranteed.
-# Your results might not match this exactly.
+# Note - dictionary keys are not sorted or in the order you inserted them.
 
 # Get all values 
 values(d) #=> ValueIterator{Dict{ASCIIString,Int64}}(["three"=>3,"one"=>1,"two"=>2])
@@ -243,12 +254,11 @@ if some_var > 10
     println("some_var is totally bigger than 10.")
 elseif some_var < 10    # This elseif clause is optional.
     println("some_var is smaller than 10.")
-else           # This is optional too.
+else                    # The else clause is optional too.
     println("some_var is indeed 10.")
 end
 
 
-
 # For loops iterate over iterable things, such as ranges, lists, sets, dicts, strings. 
 # prints:
 #    dog is a mammal
@@ -308,7 +318,7 @@ function add(x, y)
     x + y    # or equivalently: return x + y
 end
 
-add(5, 6) #=> 11 and prints out "x is 5 and y is 6"
+add(5, 6) #=> 11 after printing out "x is 5 and y is 6"
 
 # You can define functions that take a variable number of
 # positional arguments
@@ -316,13 +326,13 @@ function varargs(args...)
     return args
 end
 
-varargs(1, 2, 3) #=> (1,2,3)
+varargs(1,2,3) #=> (1,2,3)
 
 # The ... is called a splat.
 # It can also be used in a fuction call
 # to splat a list or tuple out to be the arguments
-Set([1,2,3])    #=>Set{Array{Int64,1}}([1,2,3]) # no ..., produces a Set of Arrays
-Set([1,2,3]...) #=>Set{Int64}(1,2,3) # this is equivalent to Set(1,2,3)
+Set([1,2,3])    #=> Set{Array{Int64,1}}([1,2,3]) # no ..., produces a Set of Arrays
+Set([1,2,3]...) #=> Set{Int64}(1,2,3) # this is equivalent to Set(1,2,3)
 
 x = (1,2,3)     #=> (1,2,3)
 Set(x)          #=> Set{(Int64,Int64,Int64)}((1,2,3)) # a Set of Tuples
@@ -331,7 +341,7 @@ Set(x...)       #=> Set{Int64}(2,3,1)
 
 # You can define functions with optional positional arguments
 function defaults(a,b,x=5,y=6)
-  return "$a $b and $x $y"
+    return "$a $b and $x $y"
 end
 
 defaults('h','g') #=> "h g and 5 6"
@@ -364,10 +374,10 @@ all_the_args(1, 3, keyword_arg=4)
 
 # Julia has first class functions
 function create_adder(x)
-  adder = function (y)
-    return x + y
-  end
-  return adder
+    adder = function (y)
+        return x + y
+    end
+    return adder
 end
 
 # or equivalently
@@ -377,10 +387,10 @@ end
 
 # you can also name the internal function, if you want
 function create_adder(x)
-  function adder(y)
-    x + y
-  end
-  adder
+    function adder(y)
+        x + y
+    end
+    adder
 end
 
 add_10 = create_adder(10)
@@ -394,8 +404,8 @@ map(add_10, [1,2,3]) #=> [11, 12, 13]
 filter(x -> x > 5, [3, 4, 5, 6, 7]) #=> [6, 7]
 
 # We can use list comprehensions for nice maps and filters
-[add_10(i) for i=[1, 2, 3]]  #=> [11, 12, 13]
-[add_10(i) for i in [1, 2, 3]]  #=> [11, 12, 13]
+[add_10(i) for i=[1, 2, 3]] #=> [11, 12, 13]
+[add_10(i) for i in [1, 2, 3]] #=> [11, 12, 13]
 
 ####################################################
 ## 5. Types and Multiple-Dispatch 
@@ -462,4 +472,3 @@ pet_cat(Lion(Panther(),"42")) #=> prints "The cat says 42"
 
 You can get a lot more detail from [The Julia Manual](http://docs.julialang.org/en/latest/manual/)
 
-
-- 
cgit v1.2.3


From 9adefc58b1adf5a58bacf06f0434a53137dd8b89 Mon Sep 17 00:00:00 2001
From: Stefan Karpinski <stefan@karpinski.org>
Date: Tue, 2 Jul 2013 23:27:19 -0400
Subject: don't be lazy and actually make the first change I suggested.

---
 julia.html.markdown | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'julia.html.markdown')

diff --git a/julia.html.markdown b/julia.html.markdown
index 0dd40f73..c31df752 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -48,17 +48,8 @@ div(5, 2) #=> 2
 2 << 1  #=> 4 # logical/arithmetic shift left
 
 # You can use the bits function to see the binary representation of a number.
-bits(2)   #=> "0000000000000000000000000000000000000000000000000000000000000010"
-bits(2.0) #=> "0100000000000000000000000000000000000000000000000000000000000000"
-
-# this might be a better example:
-julia> bits(123)
-"0000000000000000000000000000000000000000000000000000000001111011"
-
-julia> bits(123.0)
-"0100000001011110110000000000000000000000000000000000000000000000"
-# the other one stands the risk of someone thinking that floating-point
-# numbers are just integers with reversed bit-patterns or something.
+bits(12345)   #=> "0000000000000000000000000000000000000000000000000011000000111001"
+bits(12345.0) #=> "0100000011001000000111001000000000000000000000000000000000000000"
 
 # Boolean values are primitives
 true
-- 
cgit v1.2.3