Merge pull request #1128 from alco/1020-extended-doctest

Implement extended doctests

Author: alco

Makefile

@@ -127,7 +127,7 @@ test_erlang: compile
 	@ $(ERL) -pa lib/elixir/test/ebin -s test_helper test -s erlang halt;
 	@ echo
 
-test_elixir: test_kernel test_doctest test_mix test_ex_unit test_eex test_iex
+test_elixir: test_kernel test_ex_unit test_doctest test_mix test_eex test_iex
 
 test_doctest: compile
 	@ echo "==> doctest (exunit)"

lib/elixir/lib/bitwise.ex

@@ -7,11 +7,9 @@ defmodule Bitwise do
   your module:
 
       iex> use Bitwise
-      ...> bnot 1
+      iex> bnot 1
       -2
-
-      iex> use Bitwise
-      ...> 1 &&& 1
+      iex> 1 &&& 1
       1
 
   You can select to include only or skip operators by passing options:
@@ -127,4 +125,4 @@ defmodule Bitwise do
   defmacro left >>> right do
     quote do: __op__ :bsr, unquote(left), unquote(right)
   end
-end
+end

lib/elixir/lib/dict.ex

@@ -131,11 +131,9 @@ defmodule Dict do
   ## Examples
 
       iex> d = HashDict.new([a: 1])
-      ...> Dict.has_key?(d, :a)
+      iex> Dict.has_key?(d, :a)
       true
-
-      iex> d = HashDict.new([a: 1])
-      ...> Dict.has_key?(d, :b)
+      iex> Dict.has_key?(d, :b)
       false
 
   """
@@ -151,15 +149,11 @@ defmodule Dict do
   ## Examples
 
       iex> d = HashDict.new([a: 1])
-      ...> Dict.get(d, :a)
+      iex> Dict.get(d, :a)
       1
-
-      iex> d = HashDict.new([a: 1])
-      ...> Dict.get(d, :b)
+      iex> Dict.get(d, :b)
       nil
-
-      iex> d = HashDict.new([a: 1])
-      ...> Dict.get(d, :b, 3)
+      iex> Dict.get(d, :b, 3)
       3
   """
   @spec get(t, key, value) :: value
@@ -179,11 +173,9 @@ defmodule Dict do
   ## Examples
 
       iex> d = HashDict.new([a: 1])
-      ...> Dict.fetch(d, :a)
+      iex> Dict.fetch(d, :a)
       { :ok, 1 }
-
-      iex> d = HashDict.new([a: 1])
-      ...> Dict.fetch(d, :b)
+      iex> Dict.fetch(d, :b)
       :error
 
   """
@@ -199,10 +191,9 @@ defmodule Dict do
   ## Examples
 
       iex> d = HashDict.new([a: 1])
-      ...> Dict.fetch!(d, :a)
+      iex> Dict.fetch!(d, :a)
       1
-      iex> d = HashDict.new([a: 1])
-      ...> Dict.fetch!(d, :b)
+      iex> Dict.fetch!(d, :b)
       ** (KeyError) key not found: :b
 
   """
@@ -425,11 +416,11 @@ defmodule Dict do
   ## Examples
 
       iex> d = HashDict.new([a: 1, b: 2])
+      ...>
       ...> d = Dict.take(d, [:a, :c, :d])
       ...> Dict.to_list(d)
       [a: 1]
-
-      iex> d = HashDict.new([a: 1, b: 2])
+      ...>
       ...> d = Dict.take(d, [:c, :d])
       ...> Dict.to_list(d)
       []

lib/elixir/lib/enum.ex

@@ -372,8 +372,10 @@ defmodule Enum do
 
       iex> Enum.fetch!([2,4,6], 0)
       2
+
       iex> Enum.fetch!([2,4,6], 2)
       6
+
       iex> Enum.fetch!([2,4,6], 4)
       ** (Enum.OutOfBoundsError) out of bounds error
 

lib/elixir/lib/keyword.ex

@@ -152,6 +152,7 @@ defmodule Keyword do
 
       iex> Keyword.fetch!([a: 1], :a)
       1
+
       iex> Keyword.fetch!([a: 1], :b)
       ** (KeyError) key not found: :b
 
@@ -357,6 +358,7 @@ defmodule Keyword do
 
       iex> Keyword.update([a: 1], :a, &1 * 2)
       [a: 2]
+
       iex> Keyword.update([a: 1], :b, &1 * 2)
       ** (KeyError) key not found: :b
 

lib/elixir/lib/string.ex

@@ -752,7 +752,7 @@ defmodule String do
 
   """
   @spec to_integer(t) :: {integer, t} | :error
-  
+
   def to_integer(string) do
     {result, remainder} = :string.to_integer(binary_to_list(string))
     case result do
@@ -785,7 +785,7 @@ defmodule String do
     charlist = binary_to_list(string)
     {result, remainder} = :string.to_float(charlist)
     case result do
-      :error -> 
+      :error ->
         {int_result, int_remainder} = :string.to_integer(charlist)
         case int_result do
           :error -> :error

lib/elixir/test/doctest.exs

@@ -16,6 +16,7 @@ defmodule KernelTest do
   doctest Code
   doctest Dict
   doctest Enum
+  doctest ExUnit.CaptureIO, import: true
   doctest IO.ANSI
   doctest Regex
   doctest String