[#24] Move ISequential and Seqable to List type module

clojerl · Jan 21, 2016 · f8e5d68 · f8e5d68
1 parent 17166e5
commit f8e5d68
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 28 deletions.
diff --git a/src/lang/clojerl.Integer.clojerl.Stringable.erl b/src/lang/clojerl.Integer.clojerl.Stringable.erl
diff --git a/src/lang/clojerl.Integer.erl b/src/lang/clojerl.Integer.erl
@@ -0,0 +1,8 @@
+-module('clojerl.Integer').
+
+-behaviour('clojerl.Stringable').
+
+-export(['clojerl.Stringable.str'/1]).
+
+'clojerl.Stringable.str'(Int) when is_integer(Int) ->
+  integer_to_binary(Int).
diff --git a/src/lang/clojerl.nil.clojerl.Stringable.erl b/src/lang/clojerl.nil.clojerl.Stringable.erl
diff --git a/src/lang/clojerl.nil.erl b/src/lang/clojerl.nil.erl
@@ -0,0 +1,7 @@
+-module('clojerl.nil').
+
+-behaviour('clojerl.Stringable').
+
+-export(['clojerl.Stringable.str'/1]).
+
+'clojerl.Stringable.str'(undefined) -> <<"nil">>.
diff --git a/src/lang/clojerl.protocol.erl b/src/lang/clojerl.protocol.erl
@@ -37,8 +37,12 @@ resolve(Protocol, FunctionName, Args = [Head | _]) ->
 
 -spec 'extends?'(atom(), atom()) -> boolean().
 'extends?'(Protocol, Type) ->
-  ImplModule = impl_module(Protocol, Type),
-  code:is_loaded(ImplModule) =/= false.
+  (erlang:function_exported(Type, module_info, 1)
+   andalso
+   lists:keymember([Protocol], 2, Type:module_info(attributes))
+  )
+    orelse
+    code:is_loaded(impl_module(Protocol, Type)) =/= false.
 
 -spec impl_module(atom(), atom()) -> atom().
 impl_module(Protocol, Type) when is_atom(Protocol),

diff --git a/src/lang/collections/clojerl.List.clojerl.ISequential.erl b/src/lang/collections/clojerl.List.clojerl.ISequential.erl
diff --git a/src/lang/collections/clojerl.List.clojerl.Seqable.erl b/src/lang/collections/clojerl.List.clojerl.Seqable.erl
diff --git a/src/lang/collections/clojerl.List.erl b/src/lang/collections/clojerl.List.erl
@@ -1,12 +1,18 @@
 -module('clojerl.List').
 
+-behaviour('clojerl.Counted').
+-behaviour('clojerl.Stringable').
+-behaviour('clojerl.Seqable').
+-behaviour('clojerl.ISeq').
+-behaviour('clojerl.ISequential').
+
 -export([ new/1
         , to_list/1
         ]).
 
 -export(['clojerl.Counted.count'/1]).
-
 -export(['clojerl.Stringable.str'/1]).
+-export(['clojerl.Seqable.seq'/1]).
 
 -type type() :: {?MODULE, list()}.
 
@@ -25,3 +31,6 @@ to_list({_, List, _}) -> List.
   ItemsStrs = lists:map(fun clj_core:str/1, Items),
   Strs = clj_utils:binary_join(ItemsStrs, <<", ">>),
   <<"(", Strs/binary, ")">>.
+
+'clojerl.Seqable.seq'({_, [], _}) -> undefined;
+'clojerl.Seqable.seq'({_, Seq, _}) -> Seq.
diff --git a/test/clojerl_List_SUITE.erl b/test/clojerl_List_SUITE.erl
@@ -5,6 +5,7 @@
 -export([ new/1
         , count/1
         , str/1
+        , is_sequential/1
         ]).
 
 -spec all() -> [atom()].
@@ -23,7 +24,10 @@ all() ->
 -spec new(config()) -> result().
 new(_Config) ->
   List = clj_core:list([1, 2, 3]),
-  [1, 2, 3] = clj_core:seq(List).
+  [1, 2, 3] = clj_core:seq(List),
+
+  List2 = clj_core:list([]),
+  undefined = clj_core:seq(List2).
 
 -spec count(config()) -> result().
 count(_Config) ->
@@ -40,3 +44,8 @@ str(_Config) ->
 
   List2 = clj_core:list([]),
   <<"()">> = clj_core:str(List2).
+
+-spec is_sequential(config()) -> result().
+is_sequential(_Config) ->
+  List = clj_core:list([1, 2, 3]),
+  true = clj_core:'sequential?'(List).