Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change Promise.thenPipe to use template types instead of std::function #181

Closed
wants to merge 5 commits into from
Closed

Change Promise.thenPipe to use template types instead of std::function #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8408150
Change Promise.thenPipe to use template types instead of std::function
Jan 13, 2017
5f4ae02
Fix compilation msvc14
Jan 17, 2017
aebf028
.
Jan 17, 2017
54d7e35
Reverted template typename change
Jan 17, 2017
38e3b07
REvert
Jan 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 0 additions & 51 deletions src/ScriptingCore/APITypes.h
View file
Open in desktop
Expand Up @@ -245,57 +245,6 @@ namespace FB
SecurityScope_Private = 4,
SecurityScope_Local = 6
};

/// @brief Defines an alias representing a method functor used by FB::JSAPIAuto, created by FB::make_method().
using CallMethodFunctor = std::function < variantPromise(const std::vector<variant>&) > ;
struct MethodFunctors
{
FB::CallMethodFunctor call;
SecurityZone zone;
MethodFunctors() : call() {}
MethodFunctors(const CallMethodFunctor& call) : call(call) {}
MethodFunctors(const SecurityZone& zone, const CallMethodFunctor& call) : call(call), zone(zone) {}
MethodFunctors(const MethodFunctors& m) : call(m.call) {}
MethodFunctors& operator=(const MethodFunctors& rhs) {
call = rhs.call;
zone = rhs.zone;
return *this;
}
};
/// @brief Defines an alias representing a map of method functors used by FB::JSAPIAuto
using MethodFunctorMap = std::map < std::string, MethodFunctors > ;

// new style JSAPI properties

/// @brief Defines an alias representing a property getter functor used by FB::JSAPIAuto
using GetPropFunctor = std::function < variantPromise() > ;
/// @brief Defines an alias representing a property setter functor used by FB::JSAPIAuto
using SetPropFunctor = std::function < void(const FB::variant&) > ;
/// @brief used by FB::JSAPIAuto to store property implementation details, created by FB::make_property().
struct PropertyFunctors
{
GetPropFunctor get;
SetPropFunctor set;
PropertyFunctors() : get(), set() {}
PropertyFunctors(const GetPropFunctor& get, const SetPropFunctor& set)
: get(get), set(set) {}
PropertyFunctors(const PropertyFunctors& p)
: get(p.get), set(p.set) {}
PropertyFunctors& operator=(const PropertyFunctors& rhs) {
get = rhs.get;
set = rhs.set;
return *this;
}
};
/// @brief Defines an alias representing a map of property functors used by FB::JSAPIAuto
using PropertyFunctorsMap = std::map < std::string, PropertyFunctors > ;

// JSAPI event handlers

using EventPair = std::pair < std::string, FB::JSObjectPtr > ;
using EventMultiMap = std::multimap < std::string, FB::JSObjectPtr > ;
using EventIFaceMap = std::map < void*, FB::JSObjectPtr > ;
using EventSingleMap = std::map < std::string, FB::JSObjectPtr >;

// implementation details

Expand Down
51 changes: 51 additions & 0 deletions src/ScriptingCore/JSAPIImpl.h
View file
Open in desktop
Expand Up @@ -27,6 +27,57 @@ namespace FB
{
FB_FORWARD_PTR(JSAPIImpl);

/// @brief Defines an alias representing a method functor used by FB::JSAPIAuto, created by FB::make_method().
using CallMethodFunctor = std::function < variantPromise(const std::vector<variant>&) >;
struct MethodFunctors
{
FB::CallMethodFunctor call;
SecurityZone zone;
MethodFunctors() : call() {}
MethodFunctors(const CallMethodFunctor& call) : call(call) {}
MethodFunctors(const SecurityZone& zone, const CallMethodFunctor& call) : call(call), zone(zone) {}
MethodFunctors(const MethodFunctors& m) : call(m.call) {}
MethodFunctors& operator=(const MethodFunctors& rhs) {
call = rhs.call;
zone = rhs.zone;
return *this;
}
};
/// @brief Defines an alias representing a map of method functors used by FB::JSAPIAuto
using MethodFunctorMap = std::map < std::string, MethodFunctors >;

// new style JSAPI properties

/// @brief Defines an alias representing a property getter functor used by FB::JSAPIAuto
using GetPropFunctor = std::function < variantPromise() >;
/// @brief Defines an alias representing a property setter functor used by FB::JSAPIAuto
using SetPropFunctor = std::function < void(const FB::variant&) >;
/// @brief used by FB::JSAPIAuto to store property implementation details, created by FB::make_property().
struct PropertyFunctors
{
GetPropFunctor get;
SetPropFunctor set;
PropertyFunctors() : get(), set() {}
PropertyFunctors(const GetPropFunctor& get, const SetPropFunctor& set)
: get(get), set(set) {}
PropertyFunctors(const PropertyFunctors& p)
: get(p.get), set(p.set) {}
PropertyFunctors& operator=(const PropertyFunctors& rhs) {
get = rhs.get;
set = rhs.set;
return *this;
}
};
/// @brief Defines an alias representing a map of property functors used by FB::JSAPIAuto
using PropertyFunctorsMap = std::map < std::string, PropertyFunctors >;

// JSAPI event handlers

using EventPair = std::pair < std::string, FB::JSObjectPtr >;
using EventMultiMap = std::multimap < std::string, FB::JSObjectPtr >;
using EventIFaceMap = std::map < void*, FB::JSObjectPtr >;
using EventSingleMap = std::map < std::string, FB::JSObjectPtr >;

////////////////////////////////////////////////////////////////////////////////////////////////////
/// @class JSAPIImpl
///
Expand Down