Remove outdated default args syntax

10 files changed, 8 insertions, 21 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5331fa971..31da8d347 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# v0.12.4-dev
+# v0.13.0-dev
 
 * Enhancements
 
@@ -7,7 +7,6 @@
 * Deprecations
 
 * Backwards incompatible changes
-  * [Version] The `Version` module now only works with SemVer. The functions `Version.parse/1` and `Version.parse_requirement/1` now return `{:ok,res} | :error` for the cases you want to handle non SemVer cases manually. All other functions will trigger errors on non semantics versions
 
 # v0.12.3 (2014-02-02)
 
diff --git a/VERSION b/VERSION
index fcd25c0fb..eca364485 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.12.4-dev
\ No newline at end of file
+0.13.0-dev
\ No newline at end of file
diff --git a/lib/elixir/lib/behaviour.ex b/lib/elixir/lib/behaviour.ex
index db2245ee0..97843110b 100644
--- a/lib/elixir/lib/behaviour.ex
+++ b/lib/elixir/lib/behaviour.ex
@@ -118,10 +118,6 @@ defmodule Behaviour do
     end
   end
 
-  defp ensure_not_default({ ://, _, [_, _] }) do
-    raise ArgumentError, message: "default arguments // not supported in defcallback/defmacrocallback"
-  end
-
   defp ensure_not_default({ :\\, _, [_, _] }) do
     raise ArgumentError, message: "default arguments \\\\ not supported in defcallback/defmacrocallback"
   end
diff --git a/lib/elixir/lib/macro.ex b/lib/elixir/lib/macro.ex
index c3e3d76d9..4056dd612 100644
--- a/lib/elixir/lib/macro.ex
+++ b/lib/elixir/lib/macro.ex
@@ -13,7 +13,7 @@ defmodule Macro do
 
   @binary_ops [:===, :!==,
     :==, :!=, :<=, :>=,
-    :&&, :||, :<>, :++, :--, ://, :\\, :::, :<-, :.., :|>, :=~,
+    :&&, :||, :<>, :++, :--, :\\, :::, :<-, :.., :|>, :=~,
     :<, :>, :->,
     :+, :-, :*, :/, :=, :|, :., :%,
     :and, :or, :xor, :when, :in, :inlist, :inbits,
@@ -30,7 +30,7 @@ defmodule Macro do
   @spec binary_op_props(atom) :: { :left | :right, precedence :: integer }
   defp binary_op_props(o) do
     case o do
-      o when o in [:<-, :inlist, :inbits, ://, :\\, :::]        -> {:left,  40}
+      o when o in [:<-, :inlist, :inbits, :\\, :::]             -> {:left,  40}
       :|                                                        -> {:right, 50}
       :when                                                     -> {:right, 70}
       :=                                                        -> {:right, 80}
diff --git a/lib/elixir/lib/version.ex b/lib/elixir/lib/version.ex
index 6b8f72ca5..5b25b629a 100644
--- a/lib/elixir/lib/version.ex
+++ b/lib/elixir/lib/version.ex
@@ -290,7 +290,7 @@ defmodule Version do
     defp nillify(o),  do: o
 
     @spec parse_version(String.t) :: Version.matchable
-    def parse_version(string, approximate? // false) when is_binary(string) do
+    def parse_version(string, approximate? \\ false) when is_binary(string) do
       if parsed = Regex.run(@version_regex, string) do
         destructure [_, major, minor, patch, pre], parsed
         patch = nillify(patch)
@@ -465,7 +465,7 @@ defmodule Version do
       to_condition({ :orelse, current, to_condition([operator, version]) }, rest)
     end
 
-    defp parse_condition(version, approximate? // false) do
+    defp parse_condition(version, approximate? \\ false) do
       case parse_version(version, approximate?) do
         { :ok, version } -> version
         :error -> throw :invalid_matchspec
diff --git a/lib/elixir/src/elixir_def_defaults.erl b/lib/elixir/src/elixir_def_defaults.erl
index 7f98dbe2e..529798f92 100644
--- a/lib/elixir/src/elixir_def_defaults.erl
+++ b/lib/elixir/src/elixir_def_defaults.erl
@@ -5,10 +5,6 @@
 
 expand(Args, E) ->
   lists:mapfoldl(fun
-    ({ '//', Meta, [Left, Right] }, Acc) ->
-      { ELeft, EL } = elixir_exp:expand(Left, Acc),
-      { ERight, _ } = elixir_exp:expand(Right, Acc#elixir_env{context=nil}),
-      { { '\\\\', Meta, [ELeft, ERight] }, EL };
     ({ '\\\\', Meta, [Left, Right] }, Acc) ->
       { ELeft, EL } = elixir_exp:expand(Left, Acc),
       { ERight, _ } = elixir_exp:expand(Right, Acc#elixir_env{context=nil}),
diff --git a/lib/elixir/src/elixir_parser.yrl b/lib/elixir/src/elixir_parser.yrl
index c87f3952b..b4b1a64d7 100644
--- a/lib/elixir/src/elixir_parser.yrl
+++ b/lib/elixir/src/elixir_parser.yrl
@@ -45,7 +45,7 @@ Expect 2.
 Left       5 do.
 Right     10 stab_op_eol.     %% ->
 Left      20 ','.
-Left      40 in_match_op_eol. %% <-, inlist, inbits, //, \\, :: (allowed in matches along =)
+Left      40 in_match_op_eol. %% <-, inlist, inbits, \\, :: (allowed in matches along =)
 Right     50 pipe_op_eol.     %% |
 Right     60 assoc_op_eol.    %% =>
 Right     70 when_op_eol.     %% when
diff --git a/lib/elixir/src/elixir_tokenizer.erl b/lib/elixir/src/elixir_tokenizer.erl
index f62a1b2c5..aa524e931 100644
--- a/lib/elixir/src/elixir_tokenizer.erl
+++ b/lib/elixir/src/elixir_tokenizer.erl
@@ -73,7 +73,6 @@
 
 -define(in_match_op(T1, T2),
   T1 == $<, T2 == $-;
-  T1 == $/, T2 == $/;
   T1 == $\\, T2 == $\\;
   T1 == $:, T2 == $:).
 
diff --git a/lib/elixir/test/erlang/tokenizer_test.erl b/lib/elixir/test/erlang/tokenizer_test.erl
index 773281ec8..a39542ac2 100644
--- a/lib/elixir/test/erlang/tokenizer_test.erl
+++ b/lib/elixir/test/erlang/tokenizer_test.erl
@@ -123,9 +123,6 @@ empty_string_test() ->
   [{bin_string,1,[<<>>]}] = tokenize("\"\""),
   [{list_string,1,[<<>>]}] = tokenize("''").
 
-default_test() ->
-  [{identifier,1,x},{in_match_op,1,'//'},{number,1,1}] = tokenize("x // 1").
-
 addadd_test() ->
   [{identifier,1,x},{two_op,1,'++'},{identifier,1,y}] = tokenize("x ++ y").
 
diff --git a/src/elixir.app.src b/src/elixir.app.src
index c9982a53a..4a1a196a0 100644
--- a/src/elixir.app.src
+++ b/src/elixir.app.src
@@ -1,6 +1,6 @@
 {application, elixir,
 [{description, "elixir"},
- {vsn, "0.12.4-dev"},
+ {vsn, "0.13.0-dev"},
  {modules, [
 	elixir
   ]},