src: refactor contextify

Small refactoring to make contextify more readable. Remove auto and inline FromJust(). Simplify if statement. PR-URL: #8909 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Oct 17, 2016 · b2be04a · b2be04a
1 parent 72f1c41
commit b2be04a
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
@@ -125,15 +125,13 @@ class ContextifyContext {
     int length = names->Length();
     for (int i = 0; i < length; i++) {
       Local<String> key = names->Get(i)->ToString(env()->isolate());
-      auto maybe_has = sandbox_obj->HasOwnProperty(context, key);
+      Maybe<bool> has = sandbox_obj->HasOwnProperty(context, key);
 
       // Check for pending exceptions
-      if (!maybe_has.IsJust())
-        break;
-
-      bool has = maybe_has.FromJust();
+      if (has.IsNothing())
+        return;
 
-      if (!has) {
+      if (!has.FromJust()) {
         // Could also do this like so:
         //
         // PropertyAttribute att = global->GetPropertyAttributes(key_v);
@@ -316,7 +314,7 @@ class ContextifyContext {
     }
     Local<Object> sandbox = args[0].As<Object>();
 
-    auto result =
+    Maybe<bool> result =
         sandbox->HasPrivate(env->context(),
                             env->contextify_context_private_symbol());
     args.GetReturnValue().Set(result.FromJust());
@@ -332,7 +330,7 @@ class ContextifyContext {
   static ContextifyContext* ContextFromContextifiedSandbox(
       Environment* env,
       const Local<Object>& sandbox) {
-    auto maybe_value =
+    MaybeLocal<Value> maybe_value =
         sandbox->GetPrivate(env->context(),
                             env->contextify_context_private_symbol());
     Local<Value> context_external_v;
@@ -506,8 +504,8 @@ class ContextifyScript : public BaseObject {
     }
 
     ScriptCompiler::CachedData* cached_data = nullptr;
-    if (!cached_data_buf.IsEmpty()) {
-      Local<Uint8Array> ui8 = cached_data_buf.ToLocalChecked();
+    Local<Uint8Array> ui8;
+    if (cached_data_buf.ToLocal(&ui8)) {
       ArrayBuffer::Contents contents = ui8->Buffer()->GetContents();
       cached_data = new ScriptCompiler::CachedData(
           static_cast<uint8_t*>(contents.Data()) + ui8->ByteOffset(),
@@ -655,7 +653,7 @@ class ContextifyScript : public BaseObject {
 
     AppendExceptionLine(env, exception, try_catch.Message(), CONTEXTIFY_ERROR);
     Local<Value> stack = err_obj->Get(env->stack_string());
-    auto maybe_value =
+    MaybeLocal<Value> maybe_value =
         err_obj->GetPrivate(
             env->context(),
             env->arrow_message_private_symbol());