utils.h: check optional parameter.

fibjs · Jun 20, 2017 · 1fa88f4 · 1fa88f4
1 parent f49f184
commit 1fa88f4
Showing 1 changed file with 39 additions and 39 deletions.
diff --git a/fibjs/include/utils.h b/fibjs/include/utils.h
@@ -198,47 +198,47 @@ typedef int32_t result_t;
     do {                                      \
         do {
 
-#define METHOD_OVER(c, o)                                                   \
-    }                                                                       \
-    while (0)                                                               \
-        ;                                                                   \
-    if (hr > CALL_E_MIN_ARG && hr < CALL_E_MAX)                             \
-        do {                                                                \
-            hr = 0;                                                         \
-            int32_t argc = args.Length();                                   \
-            while (argc > 0 && argc > (c) && args[argc - 1]->IsUndefined()) \
-                argc--;                                                     \
-            if ((c) >= 0 && argc > (c)) {                                   \
-                hr = CALL_E_BADPARAMCOUNT;                                  \
-                break;                                                      \
-            }                                                               \
-            if ((o) > 0 && argc < (o)) {                                    \
-                hr = CALL_E_PARAMNOTOPTIONAL;                               \
-                break;                                                      \
+#define METHOD_OVER(c, o)                                       \
+    }                                                           \
+    while (0)                                                   \
+        ;                                                       \
+    if (hr > CALL_E_MIN_ARG && hr < CALL_E_MAX)                 \
+        do {                                                    \
+            hr = 0;                                             \
+            int32_t argc = args.Length();                       \
+            while (argc > (o) && args[argc - 1]->IsUndefined()) \
+                argc--;                                         \
+            if ((c) >= 0 && argc > (c)) {                       \
+                hr = CALL_E_BADPARAMCOUNT;                      \
+                break;                                          \
+            }                                                   \
+            if ((o) > 0 && argc < (o)) {                        \
+                hr = CALL_E_PARAMNOTOPTIONAL;                   \
+                break;                                          \
             }
 
-#define ASYNC_METHOD_OVER(c, o)                                                 \
-    }                                                                           \
-    while (0)                                                                   \
-        ;                                                                       \
-    if (hr > CALL_E_MIN_ARG && hr < CALL_E_MAX)                                 \
-        do {                                                                    \
-            hr = 0;                                                             \
-            int32_t argc = args.Length();                                       \
-            while (argc > 0 && argc > (c + 1) && args[argc - 1]->IsUndefined()) \
-                argc--;                                                         \
-            v8::Local<v8::Function> cb;                                         \
-            if (argc > 0 && args[argc - 1]->IsFunction())                       \
-                cb = v8::Local<v8::Function>::Cast(args[--argc]);               \
-            while (argc > 0 && argc > (c) && args[argc - 1]->IsUndefined())     \
-                argc--;                                                         \
-            if ((c) >= 0 && argc > (c)) {                                       \
-                hr = CALL_E_BADPARAMCOUNT;                                      \
-                break;                                                          \
-            }                                                                   \
-            if ((o) > 0 && argc < (o)) {                                        \
-                hr = CALL_E_PARAMNOTOPTIONAL;                                   \
-                break;                                                          \
+#define ASYNC_METHOD_OVER(c, o)                                     \
+    }                                                               \
+    while (0)                                                       \
+        ;                                                           \
+    if (hr > CALL_E_MIN_ARG && hr < CALL_E_MAX)                     \
+        do {                                                        \
+            hr = 0;                                                 \
+            int32_t argc = args.Length();                           \
+            while (argc > (o + 1) && args[argc - 1]->IsUndefined()) \
+                argc--;                                             \
+            v8::Local<v8::Function> cb;                             \
+            if (argc > 0 && args[argc - 1]->IsFunction())           \
+                cb = v8::Local<v8::Function>::Cast(args[--argc]);   \
+            while (argc > (o) && args[argc - 1]->IsUndefined())     \
+                argc--;                                             \
+            if ((c) >= 0 && argc > (c)) {                           \
+                hr = CALL_E_BADPARAMCOUNT;                          \
+                break;                                              \
+            }                                                       \
+            if ((o) > 0 && argc < (o)) {                            \
+                hr = CALL_E_PARAMNOTOPTIONAL;                       \
+                break;                                              \
             }
 
 #define METHOD_ENTER()                        \