GNOME.org
 

[gjs/wip/ptomato/mozjs31: 23/29] js: Remove flags param from JSNewResolveOp

commit c9e5219d50714ea23b316d38ef540465d17197c9
Author: Philip Chimento <philip endlessm com>
Date:   Mon Nov 7 14:38:45 2016 -0800

    js: Remove flags param from JSNewResolveOp
    
    The signature of JSNewResolveOp changes in mozjs31. It does not provide a
    flags parameter anymore to the callback. This is not caught at compile
    time because you have to cast the JSNewResolveOp callback pointer to
    JSResolveOp in order to fit it into the JSClass structure. Presumably
    this will go away once JSResolveOp is really deprecated in a future
    SpiderMonkey release.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=751252

 gi/boxed.cpp       |    9 ---------
 gi/fundamental.cpp |    9 ---------
 gi/interface.cpp   |    1 -
 gi/ns.cpp          |    9 ---------
 gi/object.cpp      |    9 ---------
 gi/param.cpp       |    9 ---------
 gi/repo.cpp        |    9 ---------
 gi/union.cpp       |    9 ---------
 gjs/importer.cpp   |    9 ---------
 gjs/jsapi-util.h   |    1 -
 10 files changed, 0 insertions(+), 74 deletions(-)
---
diff --git a/gi/boxed.cpp b/gi/boxed.cpp
index 38ac586..97f92cf 100644
--- a/gi/boxed.cpp
+++ b/gi/boxed.cpp
@@ -105,14 +105,6 @@ gjs_define_static_methods(JSContext       *context,
 }
 
 /*
- * Like JSResolveOp, but flags provide contextual information as follows:
- *
- *  JSRESOLVE_QUALIFIED   a qualified property id: obj.id or obj[id], not id
- *  JSRESOLVE_ASSIGNING   obj[id] is on the left-hand side of an assignment
- *  JSRESOLVE_DETECTING   'if (o.p)...' or similar detection opcode sequence
- *  JSRESOLVE_DECLARING   var, const, or boxed prolog declaration opcode
- *  JSRESOLVE_CLASSNAME   class name used when constructing
- *
  * The *objp out parameter, on success, should be null to indicate that id
  * was not resolved; and non-null, referring to obj or one of its prototypes,
  * if id was resolved.
@@ -121,7 +113,6 @@ static bool
 boxed_new_resolve(JSContext *context,
                   JS::HandleObject obj,
                   JS::HandleId id,
-                  unsigned flags,
                   JS::MutableHandleObject objp)
 {
     Boxed *priv;
diff --git a/gi/fundamental.cpp b/gi/fundamental.cpp
index 8a21b82..1a0c96a 100644
--- a/gi/fundamental.cpp
+++ b/gi/fundamental.cpp
@@ -278,14 +278,6 @@ fundamental_instance_new_resolve_interface(JSContext    *context,
 }
 
 /*
- * Like JSResolveOp, but flags provide contextual information as follows:
- *
- *  JSRESOLVE_QUALIFIED   a qualified property id: obj.id or obj[id], not id
- *  JSRESOLVE_ASSIGNING   obj[id] is on the left-hand side of an assignment
- *  JSRESOLVE_DETECTING   'if (o.p)...' or similar detection opcode sequence
- *  JSRESOLVE_DECLARING   var, const, or fundamental prolog declaration opcode
- *  JSRESOLVE_CLASSNAME   class name used when constructing
- *
  * The *objp out parameter, on success, should be null to indicate that id
  * was not resolved; and non-null, referring to obj or one of its prototypes,
  * if id was resolved.
@@ -294,7 +286,6 @@ static bool
 fundamental_instance_new_resolve(JSContext  *context,
                                  JS::HandleObject obj,
                                  JS::HandleId id,
-                                 unsigned flags,
                                  JS::MutableHandleObject objp)
 {
     FundamentalInstance *priv;
diff --git a/gi/interface.cpp b/gi/interface.cpp
index f4558eb..0347812 100644
--- a/gi/interface.cpp
+++ b/gi/interface.cpp
@@ -108,7 +108,6 @@ static bool
 interface_new_resolve(JSContext *context,
                       JS::HandleObject obj,
                       JS::HandleId id,
-                      unsigned flags,
                       JS::MutableHandleObject objp)
 {
     Interface *priv;
diff --git a/gi/ns.cpp b/gi/ns.cpp
index 2cff633..2930db7 100644
--- a/gi/ns.cpp
+++ b/gi/ns.cpp
@@ -43,14 +43,6 @@ extern struct JSClass gjs_ns_class;
 GJS_DEFINE_PRIV_FROM_JS(Ns, gjs_ns_class)
 
 /*
- * Like JSResolveOp, but flags provide contextual information as follows:
- *
- *  JSRESOLVE_QUALIFIED   a qualified property id: obj.id or obj[id], not id
- *  JSRESOLVE_ASSIGNING   obj[id] is on the left-hand side of an assignment
- *  JSRESOLVE_DETECTING   'if (o.p)...' or similar detection opcode sequence
- *  JSRESOLVE_DECLARING   var, const, or function prolog declaration opcode
- *  JSRESOLVE_CLASSNAME   class name used when constructing
- *
  * The *objp out parameter, on success, should be null to indicate that id
  * was not resolved; and non-null, referring to obj or one of its prototypes,
  * if id was resolved.
@@ -59,7 +51,6 @@ static bool
 ns_new_resolve(JSContext *context,
                JS::HandleObject obj,
                JS::HandleId id,
-               unsigned flags,
                JS::MutableHandleObject objp)
 {
     Ns *priv;
diff --git a/gi/object.cpp b/gi/object.cpp
index 2f6cc6c..a95e8ae 100644
--- a/gi/object.cpp
+++ b/gi/object.cpp
@@ -497,14 +497,6 @@ object_instance_new_resolve_no_info(JSContext       *context,
 }
 
 /*
- * Like JSResolveOp, but flags provide contextual information as follows:
- *
- *  JSRESOLVE_QUALIFIED   a qualified property id: obj.id or obj[id], not id
- *  JSRESOLVE_ASSIGNING   obj[id] is on the left-hand side of an assignment
- *  JSRESOLVE_DETECTING   'if (o.p)...' or similar detection opcode sequence
- *  JSRESOLVE_DECLARING   var, const, or object prolog declaration opcode
- *  JSRESOLVE_CLASSNAME   class name used when constructing
- *
  * The *objp out parameter, on success, should be null to indicate that id
  * was not resolved; and non-null, referring to obj or one of its prototypes,
  * if id was resolved.
@@ -513,7 +505,6 @@ static bool
 object_instance_new_resolve(JSContext *context,
                             JS::HandleObject obj,
                             JS::HandleId id,
-                            unsigned flags,
                             JS::MutableHandleObject objp)
 {
     GIFunctionInfo *method_info;
diff --git a/gi/param.cpp b/gi/param.cpp
index bc23f31..84a0e54 100644
--- a/gi/param.cpp
+++ b/gi/param.cpp
@@ -45,14 +45,6 @@ extern struct JSClass gjs_param_class;
 GJS_DEFINE_PRIV_FROM_JS(Param, gjs_param_class)
 
 /*
- * Like JSResolveOp, but flags provide contextual information as follows:
- *
- *  JSRESOLVE_QUALIFIED   a qualified property id: obj.id or obj[id], not id
- *  JSRESOLVE_ASSIGNING   obj[id] is on the left-hand side of an assignment
- *  JSRESOLVE_DETECTING   'if (o.p)...' or similar detection opcode sequence
- *  JSRESOLVE_DECLARING   var, const, or object prolog declaration opcode
- *  JSRESOLVE_CLASSNAME   class name used when constructing
- *
  * The *objp out parameter, on success, should be null to indicate that id
  * was not resolved; and non-null, referring to obj or one of its prototypes,
  * if id was resolved.
@@ -61,7 +53,6 @@ static bool
 param_new_resolve(JSContext *context,
                   JS::HandleObject obj,
                   JS::HandleId id,
-                  unsigned flags,
                   JS::MutableHandleObject objp)
 {
     GIObjectInfo *info = NULL;
diff --git a/gi/repo.cpp b/gi/repo.cpp
index 0397958..8dadb46 100644
--- a/gi/repo.cpp
+++ b/gi/repo.cpp
@@ -142,14 +142,6 @@ resolve_namespace_object(JSContext       *context,
 }
 
 /*
- * Like JSResolveOp, but flags provide contextual information as follows:
- *
- *  JSRESOLVE_QUALIFIED   a qualified property id: obj.id or obj[id], not id
- *  JSRESOLVE_ASSIGNING   obj[id] is on the left-hand side of an assignment
- *  JSRESOLVE_DETECTING   'if (o.p)...' or similar detection opcode sequence
- *  JSRESOLVE_DECLARING   var, const, or function prolog declaration opcode
- *  JSRESOLVE_CLASSNAME   class name used when constructing
- *
  * The *objp out parameter, on success, should be null to indicate that id
  * was not resolved; and non-null, referring to obj or one of its prototypes,
  * if id was resolved.
@@ -158,7 +150,6 @@ static bool
 repo_new_resolve(JSContext *context,
                  JS::HandleObject obj,
                  JS::HandleId id,
-                 unsigned flags,
                  JS::MutableHandleObject objp)
 {
     Repo *priv;
diff --git a/gi/union.cpp b/gi/union.cpp
index 4d88ddb..28db3dc 100644
--- a/gi/union.cpp
+++ b/gi/union.cpp
@@ -50,14 +50,6 @@ extern struct JSClass gjs_union_class;
 GJS_DEFINE_PRIV_FROM_JS(Union, gjs_union_class)
 
 /*
- * Like JSResolveOp, but flags provide contextual information as follows:
- *
- *  JSRESOLVE_QUALIFIED   a qualified property id: obj.id or obj[id], not id
- *  JSRESOLVE_ASSIGNING   obj[id] is on the left-hand side of an assignment
- *  JSRESOLVE_DETECTING   'if (o.p)...' or similar detection opcode sequence
- *  JSRESOLVE_DECLARING   var, const, or boxed prolog declaration opcode
- *  JSRESOLVE_CLASSNAME   class name used when constructing
- *
  * The *objp out parameter, on success, should be null to indicate that id
  * was not resolved; and non-null, referring to obj or one of its prototypes,
  * if id was resolved.
@@ -66,7 +58,6 @@ static bool
 union_new_resolve(JSContext *context,
                   JS::HandleObject obj,
                   JS::HandleId id,
-                  unsigned flags,
                   JS::MutableHandleObject objp)
 {
     Union *priv;
diff --git a/gjs/importer.cpp b/gjs/importer.cpp
index 361a75f..71dd3f6 100644
--- a/gjs/importer.cpp
+++ b/gjs/importer.cpp
@@ -804,14 +804,6 @@ importer_new_enumerate(JSContext  *context,
 }
 
 /*
- * Like JSResolveOp, but flags provide contextual information as follows:
- *
- *  JSRESOLVE_QUALIFIED   a qualified property id: obj.id or obj[id], not id
- *  JSRESOLVE_ASSIGNING   obj[id] is on the left-hand side of an assignment
- *  JSRESOLVE_DETECTING   'if (o.p)...' or similar detection opcode sequence
- *  JSRESOLVE_DECLARING   var, const, or function prolog declaration opcode
- *  JSRESOLVE_CLASSNAME   class name used when constructing
- *
  * The *objp out parameter, on success, should be null to indicate that id
  * was not resolved; and non-null, referring to obj or one of its prototypes,
  * if id was resolved.
@@ -820,7 +812,6 @@ static bool
 importer_new_resolve(JSContext *context,
                      JS::HandleObject obj,
                      JS::HandleId id,
-                     unsigned flags,
                      JS::MutableHandleObject objp)
 {
     Importer *priv;
diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
index 209955d..9f7c945 100644
--- a/gjs/jsapi-util.h
+++ b/gjs/jsapi-util.h
@@ -179,7 +179,6 @@ static void gjs_##cname##_finalize(JSFreeOp *fop, JSObject *obj); \
 static bool gjs_##cname##_new_resolve(JSContext *context, \
                                       JSObject  *obj, \
                                       JS::Value  id, \
-                                      unsigned   flags, \
                                       JSObject **objp) \
 { \
     return true; \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]