Merge remote-tracking branch 'superoptimizer/master' into HEAD

Conflicts:
	doc/tutorial.md
This commit is contained in:
Brian Anderson 2013-01-04 17:31:12 -08:00
commit 62c7ca64f0

View File

@ -228,7 +228,7 @@ let monster_size: int = 50;
Local variables may shadow earlier declarations, as in the previous example: Local variables may shadow earlier declarations, as in the previous example:
`monster_size` was first declared as a `float`, and then a second `monster_size` was first declared as a `float`, and then a second
`monster_size` was declared as an `int`. If you were to actually compile this `monster_size` was declared as an `int`. If you were to actually compile this
example, though, the compiler would determine that the second `monster_size` is example, though, the compiler would determine that the first `monster_size` is
unused and issue a warning (because this situation is likely to indicate a unused and issue a warning (because this situation is likely to indicate a
programmer error). For occasions where unused variables are intentional, their programmer error). For occasions where unused variables are intentional, their
names may be prefixed with an underscore to silence the warning, like `let names may be prefixed with an underscore to silence the warning, like `let