Skip to content

Commit

Permalink
collection, break: deprecated List object.
Browse files Browse the repository at this point in the history
  • Loading branch information
xicilion committed Oct 31, 2017
1 parent bfe47e8 commit aaa56a6
Show file tree
Hide file tree
Showing 101 changed files with 298 additions and 1,371 deletions.
2 changes: 0 additions & 2 deletions fibjs/fibjs.vcxproj
Expand Up @@ -133,7 +133,6 @@
<ClInclude Include="include\Isolate.h" />
<ClInclude Include="include\JSHandler.h" />
<ClInclude Include="include\LevelDB.h" />
<ClInclude Include="include\List.h" />
<ClInclude Include="include\Lock.h" />
<ClInclude Include="include\LruCache.h" />
<ClInclude Include="include\Map.h" />
Expand Down Expand Up @@ -381,7 +380,6 @@
<ClCompile Include="src\base\utf8.cpp" />
<ClCompile Include="src\base\utils.cpp" />
<ClCompile Include="src\base\v8_api.cpp" />
<ClCompile Include="src\collection\List.cpp" />
<ClCompile Include="src\collection\Map.cpp" />
<ClCompile Include="src\collection\Queue.cpp" />
<ClCompile Include="src\console\TextColor.cpp" />
Expand Down
6 changes: 0 additions & 6 deletions fibjs/fibjs.vcxproj.filters
Expand Up @@ -240,9 +240,6 @@
<ClInclude Include="include\LevelDB.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\List.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Lock.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -971,9 +968,6 @@
<ClCompile Include="src\base\v8_api.cpp">
<Filter>Source Files\base</Filter>
</ClCompile>
<ClCompile Include="src\collection\List.cpp">
<Filter>Source Files\collection</Filter>
</ClCompile>
<ClCompile Include="src\collection\Map.cpp">
<Filter>Source Files\collection</Filter>
</ClCompile>
Expand Down
2 changes: 0 additions & 2 deletions fibjs/fibjs_gui.vcxproj
Expand Up @@ -133,7 +133,6 @@
<ClInclude Include="include\Isolate.h" />
<ClInclude Include="include\JSHandler.h" />
<ClInclude Include="include\LevelDB.h" />
<ClInclude Include="include\List.h" />
<ClInclude Include="include\Lock.h" />
<ClInclude Include="include\LruCache.h" />
<ClInclude Include="include\Map.h" />
Expand Down Expand Up @@ -381,7 +380,6 @@
<ClCompile Include="src\base\utf8.cpp" />
<ClCompile Include="src\base\utils.cpp" />
<ClCompile Include="src\base\v8_api.cpp" />
<ClCompile Include="src\collection\List.cpp" />
<ClCompile Include="src\collection\Map.cpp" />
<ClCompile Include="src\collection\Queue.cpp" />
<ClCompile Include="src\console\TextColor.cpp" />
Expand Down
6 changes: 0 additions & 6 deletions fibjs/fibjs_gui.vcxproj.filters
Expand Up @@ -240,9 +240,6 @@
<ClInclude Include="include\LevelDB.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\List.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Lock.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -971,9 +968,6 @@
<ClCompile Include="src\base\v8_api.cpp">
<Filter>Source Files\base</Filter>
</ClCompile>
<ClCompile Include="src\collection\List.cpp">
<Filter>Source Files\collection</Filter>
</ClCompile>
<ClCompile Include="src\collection\Map.cpp">
<Filter>Source Files\collection</Filter>
</ClCompile>
Expand Down
7 changes: 3 additions & 4 deletions fibjs/include/HeapGraphNode.h
Expand Up @@ -7,7 +7,6 @@

#include "ifs/HeapGraphNode.h"
#include <v8/include/v8-profiler.h>
#include "List.h"

#ifndef _fj_HEAPGRAPHNODE_H
#define _fj_HEAPGRAPHNODE_H
Expand All @@ -18,7 +17,7 @@ class HeapSnapshot;
class HeapGraphNode : public HeapGraphNode_base {
public:
HeapGraphNode(int32_t _type, exlib::string& _name, int32_t _id,
int32_t _size, List* _childs)
int32_t _size, NArray* _childs)
: m_type(_type)
, m_name(_name)
, m_id(_id)
Expand All @@ -34,7 +33,7 @@ class HeapGraphNode : public HeapGraphNode_base {
virtual result_t get_description(exlib::string& retVal);
virtual result_t get_id(int32_t& retVal);
virtual result_t get_shallowSize(int32_t& retVal);
virtual result_t get_childs(obj_ptr<List_base>& retVal);
virtual result_t get_childs(obj_ptr<NArray>& retVal);

public:
static void get_description(HeapGraphNode_base* node, exlib::string& retVal)
Expand Down Expand Up @@ -75,7 +74,7 @@ class HeapGraphNode : public HeapGraphNode_base {
exlib::string m_name;
int32_t m_id;
int32_t m_shallowSize;
obj_ptr<List> m_childs;
obj_ptr<NArray> m_childs;
};
}

Expand Down
9 changes: 4 additions & 5 deletions fibjs/include/HeapProxy.h
Expand Up @@ -7,7 +7,6 @@

#include "ifs/HeapSnapshot.h"
#include "ifs/HeapGraphEdge.h"
#include "List.h"
#include <v8/include/v8-profiler.h>
#include <map>

Expand Down Expand Up @@ -41,7 +40,7 @@ class HeapSnapshotProxy : public HeapSnapshot_base {
virtual result_t save(exlib::string fname, AsyncEvent* ac);
virtual result_t get_time(date_t& retVal);
virtual result_t get_root(obj_ptr<HeapGraphNode_base>& retVal);
virtual result_t get_nodes(obj_ptr<List_base>& retVal);
virtual result_t get_nodes(obj_ptr<NArray>& retVal);

private:
void fill_nodes();
Expand All @@ -50,7 +49,7 @@ class HeapSnapshotProxy : public HeapSnapshot_base {
const v8::HeapSnapshot* m_snapshot;
date_t m_d;
std::map<int32_t, int32_t> _nodes;
obj_ptr<List> m_nodes;
obj_ptr<NArray> m_nodes;
};

class HeapGraphNodeProxy : public HeapGraphNode_base {
Expand All @@ -68,12 +67,12 @@ class HeapGraphNodeProxy : public HeapGraphNode_base {
virtual result_t get_description(exlib::string& retVal);
virtual result_t get_id(int32_t& retVal);
virtual result_t get_shallowSize(int32_t& retVal);
virtual result_t get_childs(obj_ptr<List_base>& retVal);
virtual result_t get_childs(obj_ptr<NArray>& retVal);

private:
weak_ptr<HeapSnapshotProxy> m_snapshot;
const v8::HeapGraphNode* m_node;
obj_ptr<List> m_childs;
obj_ptr<NArray> m_childs;
};

class HeapGraphEdgeProxy : public HeapGraphEdge_base {
Expand Down
5 changes: 2 additions & 3 deletions fibjs/include/HeapSnapshot.h
Expand Up @@ -7,7 +7,6 @@

#include "ifs/HeapSnapshot.h"
#include <v8/include/v8-profiler.h>
#include "List.h"
#include <map>

#ifndef _fj_HEAPSNAPSHOT_H
Expand All @@ -23,7 +22,7 @@ class HeapSnapshot : public HeapSnapshot_base {
virtual result_t save(exlib::string fname, AsyncEvent* ac);
virtual result_t get_time(date_t& retVal);
virtual result_t get_root(obj_ptr<HeapGraphNode_base>& retVal);
virtual result_t get_nodes(obj_ptr<List_base>& retVal);
virtual result_t get_nodes(obj_ptr<NArray>& retVal);

public:
result_t load(exlib::string fname);
Expand All @@ -32,7 +31,7 @@ class HeapSnapshot : public HeapSnapshot_base {

private:
date_t m_time;
obj_ptr<List> m_nodes;
obj_ptr<NArray> m_nodes;
std::map<int32_t, int32_t> _nodes;
};
}
Expand Down
9 changes: 4 additions & 5 deletions fibjs/include/HttpClient.h
Expand Up @@ -9,7 +9,6 @@

#include "ifs/HttpClient.h"
#include "HttpCookie.h"
#include "List.h"

namespace fibjs {

Expand All @@ -23,13 +22,13 @@ class HttpClient : public HttpClient_base {
, m_autoRedirect(true)
, m_maxBodySize(-1)
{
m_cookies = new List();
m_cookies = new NArray();
m_userAgent = "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36";
}

public:
// HttpClient_base
virtual result_t get_cookies(obj_ptr<List_base>& retVal);
virtual result_t get_cookies(obj_ptr<NArray>& retVal);
virtual result_t get_timeout(int32_t& retVal);
virtual result_t set_timeout(int32_t newVal);
virtual result_t get_enableCookie(bool& retVal);
Expand All @@ -51,7 +50,7 @@ class HttpClient : public HttpClient_base {
virtual result_t find(exlib::string url, v8::Local<v8::Object> headers, obj_ptr<HttpResponse_base>& retVal, AsyncEvent* ac);

public:
result_t update_cookies(exlib::string url, obj_ptr<List_base> cookies);
result_t update_cookies(exlib::string url, obj_ptr<NArray> cookies);
result_t get_cookie(exlib::string url, exlib::string& retVal);

exlib::string agent()
Expand All @@ -63,7 +62,7 @@ class HttpClient : public HttpClient_base {
result_t update(obj_ptr<HttpCookie_base> cookie);

private:
obj_ptr<List> m_cookies;
obj_ptr<NArray> m_cookies;
int32_t m_timeout;
bool m_enableCookie;
bool m_autoRedirect;
Expand Down
2 changes: 1 addition & 1 deletion fibjs/include/HttpCollection.h
Expand Up @@ -25,7 +25,7 @@ class HttpCollection : public HttpCollection_base {
virtual result_t clear();
virtual result_t has(exlib::string name, bool& retVal);
virtual result_t first(exlib::string name, Variant& retVal);
virtual result_t all(exlib::string name, obj_ptr<List_base>& retVal);
virtual result_t all(exlib::string name, obj_ptr<NArray>& retVal);
virtual result_t add(v8::Local<v8::Object> map);
virtual result_t add(exlib::string name, Variant value);
virtual result_t set(v8::Local<v8::Object> map);
Expand Down
2 changes: 1 addition & 1 deletion fibjs/include/HttpMessage.h
Expand Up @@ -47,7 +47,7 @@ class HttpMessage : public Message {
result_t get_socket(obj_ptr<Stream_base>& retVal);
result_t hasHeader(exlib::string name, bool& retVal);
result_t firstHeader(exlib::string name, Variant& retVal);
result_t allHeader(exlib::string name, obj_ptr<List_base>& retVal);
result_t allHeader(exlib::string name, obj_ptr<NArray>& retVal);
result_t addHeader(v8::Local<v8::Object> map);
result_t addHeader(exlib::string name, Variant value);
result_t setHeader(v8::Local<v8::Object> map);
Expand Down
5 changes: 2 additions & 3 deletions fibjs/include/HttpRequest.h
Expand Up @@ -29,8 +29,7 @@ class HttpRequest : public HttpRequest_base {
// Message_base
virtual result_t get_value(exlib::string& retVal);
virtual result_t set_value(exlib::string newVal);
virtual result_t get_params(obj_ptr<List_base>& retVal);
virtual result_t set_params(List_base* newVal);
virtual result_t get_params(obj_ptr<NArray>& retVal);
virtual result_t get_type(int32_t& retVal);
virtual result_t set_type(int32_t newVal);
virtual result_t get_data(v8::Local<v8::Value>& retVal);
Expand Down Expand Up @@ -68,7 +67,7 @@ class HttpRequest : public HttpRequest_base {
virtual result_t get_socket(obj_ptr<Stream_base>& retVal);
virtual result_t hasHeader(exlib::string name, bool& retVal);
virtual result_t firstHeader(exlib::string name, Variant& retVal);
virtual result_t allHeader(exlib::string name, obj_ptr<List_base>& retVal);
virtual result_t allHeader(exlib::string name, obj_ptr<NArray>& retVal);
virtual result_t addHeader(v8::Local<v8::Object> map);
virtual result_t addHeader(exlib::string name, Variant value);
virtual result_t setHeader(v8::Local<v8::Object> map);
Expand Down
9 changes: 4 additions & 5 deletions fibjs/include/HttpResponse.h
Expand Up @@ -27,8 +27,7 @@ class HttpResponse : public HttpResponse_base {
// Message_base
virtual result_t get_value(exlib::string& retVal);
virtual result_t set_value(exlib::string newVal);
virtual result_t get_params(obj_ptr<List_base>& retVal);
virtual result_t set_params(List_base* newVal);
virtual result_t get_params(obj_ptr<NArray>& retVal);
virtual result_t get_type(int32_t& retVal);
virtual result_t set_type(int32_t newVal);
virtual result_t get_data(v8::Local<v8::Value>& retVal);
Expand Down Expand Up @@ -66,7 +65,7 @@ class HttpResponse : public HttpResponse_base {
virtual result_t get_socket(obj_ptr<Stream_base>& retVal);
virtual result_t hasHeader(exlib::string name, bool& retVal);
virtual result_t firstHeader(exlib::string name, Variant& retVal);
virtual result_t allHeader(exlib::string name, obj_ptr<List_base>& retVal);
virtual result_t allHeader(exlib::string name, obj_ptr<NArray>& retVal);
virtual result_t addHeader(v8::Local<v8::Object> map);
virtual result_t addHeader(exlib::string name, Variant value);
virtual result_t setHeader(v8::Local<v8::Object> map);
Expand All @@ -81,7 +80,7 @@ class HttpResponse : public HttpResponse_base {
virtual result_t set_statusMessage(exlib::string newVal);
virtual result_t writeHead(int32_t statusCode, exlib::string statusMessage, v8::Local<v8::Object> headers);
virtual result_t writeHead(int32_t statusCode, v8::Local<v8::Object> headers);
virtual result_t get_cookies(obj_ptr<List_base>& retVal);
virtual result_t get_cookies(obj_ptr<NArray>& retVal);
virtual result_t addCookie(HttpCookie_base* cookie);
virtual result_t redirect(exlib::string url);
virtual result_t sendHeader(Stream_base* stm, AsyncEvent* ac);
Expand All @@ -90,7 +89,7 @@ class HttpResponse : public HttpResponse_base {
obj_ptr<HttpMessage> m_message;
int32_t m_statusCode;
exlib::string m_statusMessage;
obj_ptr<List_base> m_cookies;
obj_ptr<NArray> m_cookies;
};

} /* namespace fibjs */
Expand Down
2 changes: 1 addition & 1 deletion fibjs/include/HttpUploadCollection.h
Expand Up @@ -25,7 +25,7 @@ class HttpUploadCollection : public HttpCollection_base {
virtual result_t clear();
virtual result_t has(exlib::string name, bool& retVal);
virtual result_t first(exlib::string name, Variant& retVal);
virtual result_t all(exlib::string name, obj_ptr<List_base>& retVal);
virtual result_t all(exlib::string name, obj_ptr<NArray>& retVal);
virtual result_t add(v8::Local<v8::Object> map);
virtual result_t add(exlib::string name, Variant value);
virtual result_t set(v8::Local<v8::Object> map);
Expand Down
6 changes: 3 additions & 3 deletions fibjs/include/LevelDB.h
Expand Up @@ -30,7 +30,7 @@ class LevelDB : public LevelDB_base {
// LevelDB_base
virtual result_t has(Buffer_base* key, bool& retVal, AsyncEvent* ac);
virtual result_t get(Buffer_base* key, obj_ptr<Buffer_base>& retVal, AsyncEvent* ac);
virtual result_t mget(v8::Local<v8::Array> keys, obj_ptr<List_base>& retVal);
virtual result_t mget(v8::Local<v8::Array> keys, obj_ptr<NArray>& retVal);
virtual result_t set(Buffer_base* key, Buffer_base* value, AsyncEvent* ac);
virtual result_t mset(v8::Local<v8::Object> map);
virtual result_t mremove(v8::Local<v8::Array> keys);
Expand All @@ -57,8 +57,8 @@ class LevelDB : public LevelDB_base {
result_t _commit(leveldb::WriteBatch* batch, AsyncEvent* ac);
ASYNC_MEMBER1_AC(LevelDB, _commit, leveldb::WriteBatch*);

result_t _mget(std::vector<exlib::string>* keys, obj_ptr<List_base>& retVal, AsyncEvent* ac);
ASYNC_MEMBERVALUE2_AC(LevelDB, _mget, std::vector<exlib::string>*, obj_ptr<List_base>);
result_t _mget(std::vector<exlib::string>* keys, obj_ptr<NArray>& retVal, AsyncEvent* ac);
ASYNC_MEMBERVALUE2_AC(LevelDB, _mget, std::vector<exlib::string>*, obj_ptr<NArray>);

leveldb::DB* db()
{
Expand Down

0 comments on commit aaa56a6

Please sign in to comment.