You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/13 17:43:47 UTC
[45/50] lager commit: updated refs/heads/import-master to da4419e
Fixed issue whereby element(1, ...) is called on every tuple nested inside a pretty printed record regardless of size.
Modified unit test to test 0 size tuple case.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-lager/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-lager/commit/d58e633e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-lager/tree/d58e633e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-lager/diff/d58e633e
Branch: refs/heads/import-master
Commit: d58e633e151dc481a728daf8378055caad88d8e1
Parents: 649becd
Author: Shane Howley <sh...@ufa.ie>
Authored: Tue Feb 11 12:38:48 2014 +0000
Committer: Shane Howley <sh...@ufa.ie>
Committed: Tue Feb 11 12:38:48 2014 +0000
----------------------------------------------------------------------
src/lager.erl | 6 ++++--
test/pr_nested_record_test.erl | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-lager/blob/d58e633e/src/lager.erl
----------------------------------------------------------------------
diff --git a/src/lager.erl b/src/lager.erl
index c075544..d335a3f 100644
--- a/src/lager.erl
+++ b/src/lager.erl
@@ -378,8 +378,10 @@ pr(Record, _) ->
Record.
zip([FieldName|RecordFields], [FieldValue|Record], Module, ToReturn) ->
- case is_tuple(FieldValue) andalso is_atom(element(1, FieldValue))
- andalso is_record_known(FieldValue, Module) of
+ case is_tuple(FieldValue) andalso
+ tuple_size(FieldValue) > 0 andalso
+ is_atom(element(1, FieldValue)) andalso
+ is_record_known(FieldValue, Module) of
false ->
zip(RecordFields, Record, Module, [{FieldName, FieldValue}|ToReturn]);
_Else ->
http://git-wip-us.apache.org/repos/asf/couchdb-lager/blob/d58e633e/test/pr_nested_record_test.erl
----------------------------------------------------------------------
diff --git a/test/pr_nested_record_test.erl b/test/pr_nested_record_test.erl
index ee19ef7..7a6e284 100644
--- a/test/pr_nested_record_test.erl
+++ b/test/pr_nested_record_test.erl
@@ -12,10 +12,10 @@
nested_record_test() ->
A = #a{field1 = x, field2 = y},
- B = #b{field1 = A, field2 = z},
+ B = #b{field1 = A, field2 = {}},
Pr_B = lager:pr(B, ?MODULE),
?assertEqual({'$lager_record', b,
[{field1, {'$lager_record', a,
[{field1, x},{field2, y}]}},
- {field2, z}]},
+ {field2, {}}]},
Pr_B).