* Value types are persistent handles rather than strings

Isaac Wagner · Isaac Wagner · commit 1e33cdfdbc62 · 2013-04-23T12:28:25.000-04:00
* Added a handful of function signatures to hashtable.h
* Close the handle scope in HashTable::Get() if the key is not found
diff --git a/src/hashtable.cpp b/src/hashtable.cpp
@@ -45,13 +45,12 @@ Handle<Value> HashTable::Put(const Arguments& args) {
   Local<Value> value = Local<Value>(args[1]);
 
   String::AsciiValue keyStr(key);
-  String::AsciiValue valueStr(value);
 
-  //Persistent<Value> persistent = Persistent<Value>::New(value);
+  Persistent<Value> persistent = Persistent<Value>::New(value);
 
   HashTable *obj = ObjectWrap::Unwrap<HashTable>(args.This());
   //obj->map.insert(std::pair<std::string, Persistent<Value>>(std::string(*ascii), persistent));
-  obj->map.insert(std::pair<std::string, std::string>(std::string(*keyStr), std::string(*valueStr)));
+  obj->map.insert(std::pair<std::string, Persistent<Value>>(std::string(*keyStr), persistent));
 
   //Return undefined
   return scope.Close(Handle<Value>());
@@ -66,20 +65,13 @@ Handle<Value> HashTable::Get(const Arguments& args) {
   Local<Value> key = Local<Value>(args[0]);
   String::AsciiValue keyStr(key);
 
-  //std::unordered_map<std::string,Persistent<Value>>::const_iterator itr = obj->map.find(std::string(*keyAscii));
-  std::unordered_map<std::string,std::string>::const_iterator itr = obj->map.find(std::string(*keyStr));
+  MapType::const_iterator itr = obj->map.find(std::string(*keyStr));
 
   if(itr == obj->map.end()) {
-    return Handle<Value>(); //undefined
+    return scope.Close(Handle<Value>()); //return undefined
   } 
 
-  /*Persistent<Value> persistent = itr->second;
-  String::AsciiValue persistentAscii(persistent);
-  std::cout << "key: '" << *keyAscii << "' value: '" << *persistentAscii << "'" << std::endl;*/
-  //Handle<Value> value = itr->second;
-
-  std::string str = itr->second;
-  Handle<Value> value = String::New(str.c_str());
+  Persistent<Value> value = itr->second;
 
   return scope.Close(value);
 }
diff --git a/src/hashtable.h b/src/hashtable.h
@@ -13,12 +13,32 @@ class HashTable : public node::ObjectWrap {
   HashTable(size_t buckets);
   ~HashTable();
 
-  std::unordered_map<std::string, std::string> map;
+  typedef std::unordered_map<std::string,v8::Persistent<v8::Value>> MapType;
+  MapType map;
 
+  //new HashTable() or new HashTable(buckets)
   static v8::Handle<v8::Value> Constructor(const v8::Arguments &args);
+
+  //hashTable.get(key) : value
   static v8::Handle<v8::Value> Get(const v8::Arguments &args);
+
+  //hashTable.put(key, value)
   static v8::Handle<v8::Value> Put(const v8::Arguments &args);
+
+  //hashTable.remove(key)
+  static v8::Handle<v8::Value> Remove(const v8::Arguments &args);
+
+  //hashTable.clear()
+  static v8::Handle<v8::Value> Clear(const v8::Arguments &args);
+
+  //hashTable.size() : number of elements
   static v8::Handle<v8::Value> Size(const v8::Arguments &args);
+
+  //hashTable.rehash(buckets)
+  static v8::Handle<v8::Value> Rehash(const v8::Arguments &args);
+
+  //hashTable.reserve(size)
+  static v8::Handle<v8::Value> Reserve(const v8::Arguments &args);
 };
 
 #endif
