[DRE-commits] [ruby-narray] 01/06: Imported Upstream version 0.6.1.1

[Youhei SASAKI]

This is an automated email from the git hooks/post-receive script.

uwabami-guest pushed a commit to annotated tag debian/0.6.1.1-1
in repository ruby-narray.

commit 4b00e9f3955b69448cc2270cdbcf2558535355ed
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Feb 22 11:03:42 2015 +0900

    Imported Upstream version 0.6.1.1
---
 README.ja.md       |   5 +++--
 README.md          |   5 +++--
 checksums.yaml.gz  | Bin 269 -> 0 bytes
 metadata.yml       |   4 ++--
 src/lib/nmatrix.rb |   2 +-
 src/narray.c       |  22 +++++++++++++---------
 src/narray.h       |   4 ++--
 7 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/README.ja.md b/README.ja.md
index 3755692..8ab5b4a 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -1,8 +1,9 @@
 # Ruby/NArray
 
-* ver 0.6.0.9 (2014-05-29)
+* ver 0.6.1.0 (2014-06-02)
 * [Home page](http://masa16.github.io/narray/index.ja.html)
-* [リポジトリ](https://github.com/masa16/narray)
+* [GitHub Repository](https://github.com/masa16/narray)
+* [RubyGems](https://rubygems.org/gems/narray)
 * [NArrayメソッド一覧](https://github.com/masa16/narray/blob/master/SPEC.ja.txt)
 
 ## Ruby/NArrayの特徴:
diff --git a/README.md b/README.md
index 7997299..22afc3b 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
 # Ruby/NArray
 
-* ver 0.6.0.9 (2014-05-29)
+* ver 0.6.1.0 (2014-06-02)
 * [Home page](http://masa16.github.io/narray/)
-* [Repository](https://github.com/masa16/narray)
+* [GitHub Repository](https://github.com/masa16/narray)
+* [RubyGems](https://rubygems.org/gems/narray)
 * [NArray method list](https://github.com/masa16/narray/blob/master/SPEC.en.txt)
 
 ## NArray Features:
diff --git a/checksums.yaml.gz b/checksums.yaml.gz
deleted file mode 100644
index 5415ee0..0000000
Binary files a/checksums.yaml.gz and /dev/null differ
diff --git a/metadata.yml b/metadata.yml
index d3ce081..208a314 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: narray
 version: !ruby/object:Gem::Version
-  version: 0.6.0.9
+  version: 0.6.1.1
 platform: ruby
 authors:
 - Masahiro Tanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies: []
 description: Numerical N-dimensional Array class
 email: masa16.tanaka at gmail.com
diff --git a/src/lib/nmatrix.rb b/src/lib/nmatrix.rb
index b1dff38..4b6b102 100644
--- a/src/lib/nmatrix.rb
+++ b/src/lib/nmatrix.rb
@@ -91,7 +91,7 @@ class NMatrix < NArray
       (2..n).each{ m *= self }
       m
     else
-      raise TypeError,"Illegal operation: NMatrix ** %s" % other.class
+      raise TypeError,"Illegal operation: NMatrix ** %s" % n.class
     end
   end
 
diff --git a/src/narray.c b/src/narray.c
index 78fe342..5405beb 100644
--- a/src/narray.c
+++ b/src/narray.c
@@ -1096,18 +1096,22 @@ static VALUE
   char *p;
   void (*func)();
 
-  GetNArray(obj,ary);
+  if (rb_block_given_p()) {
+    GetNArray(obj,ary);
 
-  p  = ary->ptr;
-  sz = na_sizeof[ary->type];
-  func = SetFuncs[NA_ROBJ][ary->type];
+    p  = ary->ptr;
+    sz = na_sizeof[ary->type];
+    func = SetFuncs[NA_ROBJ][ary->type];
 
-  for ( i=ary->total; i-->0; ) {
-    (*func)( 1, &v, 0, p, 0 );
-    rb_yield(v);
-    p += sz;
+    for ( i=ary->total; i-->0; ) {
+      (*func)( 1, &v, 0, p, 0 );
+      rb_yield(v);
+      p += sz;
+    }
+    return Qnil;
+  } else {
+    return rb_funcall(obj, rb_intern("to_enum"), 0);
   }
-  return Qnil;
 }
 
 
diff --git a/src/narray.h b/src/narray.h
index 55b6cb0..eaa860f 100644
--- a/src/narray.h
+++ b/src/narray.h
@@ -23,8 +23,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.6.0.9"
-#define NARRAY_VERSION_CODE 609
+#define NARRAY_VERSION "0.6.1.1"
+#define NARRAY_VERSION_CODE 611
 
 /*
   Data types used in NArray :

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-narray.git