[Pkg-javascript-commits] [node-leveldown] 327/492: change iterator behaviour, @0.3.0 release

[Andrew Kelley]

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

andrewrk-guest pushed a commit to annotated tag rocksdb-0.10.1
in repository node-leveldown.

commit 89dff108f4f30c36a84a819adadcdeacbed4b3d2
Author: Rod Vagg <rod at vagg.org>
Date:   Tue May 14 20:45:54 2013 +1000

    change iterator behaviour, @0.3.0 release
---
 package.json    |  4 ++--
 src/iterator.cc | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 378d320..3c2446d 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   , "keywords": [
         "leveldb"
     ]
-  , "version"         : "0.2.2"
+  , "version"         : "0.3.0"
   , "main"            : "index.js"
   , "dependencies"    : {
         "bindings"        : "~1.1.0"
@@ -27,7 +27,7 @@
       , "rimraf"             : "~2.1.4"
       , "mkfiletree"         : "~0.0.0"
       , "readfiletree"       : "~0.0.0"
-      , "abstract-leveldown" : "git://github.com/rvagg/node-abstract-leveldown.git"
+      , "abstract-leveldown" : "~0.6.0"
     }
   , "repository"      : {
         "type"            : "git"
diff --git a/src/iterator.cc b/src/iterator.cc
index 6381764..05f9eb3 100644
--- a/src/iterator.cc
+++ b/src/iterator.cc
@@ -135,22 +135,22 @@ v8::Handle<v8::Value> Iterator::Next (const v8::Arguments& args) {
     LD_THROW_RETURN(next() requires a callback argument)
   }
 
+  v8::Local<v8::Function> callback = v8::Local<v8::Function>::Cast(args[0]);
+
   if (iterator->ended) {
-    LD_THROW_RETURN(cannot call next() after end())
+    LD_RETURN_CALLBACK_OR_ERROR(callback, "cannot call next() after end()")
   }
 
   if (iterator->nexting) {
-    LD_THROW_RETURN(cannot call next() before previous next() has completed)
+    LD_RETURN_CALLBACK_OR_ERROR(callback, "cannot call next() before previous next() has completed")
   }
 
-  v8::Persistent<v8::Function> callback =
-      v8::Persistent<v8::Function>::New(
-          LD_NODE_ISOLATE_PRE
-          v8::Local<v8::Function>::Cast(args[0]));
+  v8::Persistent<v8::Function> persistentCallback =
+      v8::Persistent<v8::Function>::New(LD_NODE_ISOLATE_PRE callback);
 
   NextWorker* worker = new NextWorker(
       iterator
-    , callback
+    , persistentCallback
     , checkEndCallback
   );
   iterator->nexting = true;
@@ -168,18 +168,18 @@ v8::Handle<v8::Value> Iterator::End (const v8::Arguments& args) {
     LD_THROW_RETURN(end() requires a callback argument)
   }
 
+  v8::Local<v8::Function> callback = v8::Local<v8::Function>::Cast(args[0]);
+
   if (iterator->ended) {
-    LD_THROW_RETURN(end() already called on iterator)
+    LD_RETURN_CALLBACK_OR_ERROR(callback, "end() already called on iterator")
   }
 
-  v8::Persistent<v8::Function> callback =
-      v8::Persistent<v8::Function>::New(
-          LD_NODE_ISOLATE_PRE
-          v8::Local<v8::Function>::Cast(args[0]));
+  v8::Persistent<v8::Function> persistentCallback =
+      v8::Persistent<v8::Function>::New(LD_NODE_ISOLATE_PRE callback);
 
   EndWorker* worker = new EndWorker(
       iterator
-    , callback
+    , persistentCallback
   );
   iterator->ended = true;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-leveldown.git