Changeset 18978

Timestamp:

04/05/18 19:00:31 (7 years ago)

Author:

tbretz

Message:

clang++ complained about the way some arrays are initialized and there were two mistakes in conditionals -- unfortunately, this is not trivial to check, but it should also be of no relevance.

File:

• trunk/FACT++/src/InterpreterV8.cc (modified) (11 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -13 +13 @@
 
 #ifdef HAVE_NOVA
-#include "externals/nova.h"
+#include "nova.h"
 #endif
 
@@ -25 +25 @@
 #include "tools.h"
 #include "Readline.h"
-#include "externals/izstream.h"
+#include "izstream.h"
 
 #include "WindowLog.h"
@@ -157 +157 @@
     const int nn = args.Length()==2 ? 0 : args.Length()-3;
 
-    Handle<Value> argv[nn];
+    vector<Handle<Value>> argv(nn);
     for (int i=0; i<nn; i++)
         argv[i] = args[i+3];
@@ -164 +164 @@
     while (1)
     {
-        const Handle<Value> rc = args.Length()<3 ? func->Call(func, nn, argv) : func->Call(args[2]->ToObject(), nn, argv);
+        const Handle<Value> rc = args.Length()<3 ?
+            func->Call(func, nn, argv.data()) :
+            func->Call(args[2]->ToObject(), nn, argv.data());
+
         if (rc.IsEmpty())
             return Undefined();
@@ -628 +631 @@
     string arg0 = args.Length() ? *String::AsciiValue(args[0]) : "";
     if (arg0=="*")
-        arg0=="";
+        arg0="";
 
     const set<Service> services = JsGetServices();
@@ -1187 +1190 @@
         return ThrowException(String::New(e.what()));
     }
+#else
+    return Undefined();
 #endif
 }
@@ -1227 +1232 @@
         return ThrowException(String::New(e.what()));
     }
+#else
+    return Undefined();
 #endif
 }
@@ -2199 +2206 @@
     obj->Set(String::New("observatory"), String::New(args.obs.c_str()), ReadOnly);
 
-    const bool isUp = rc>0 ||
+    const bool isUp = 
         (rst.rise<rst.set && (args.jd>rst.rise && args.jd<rst.set)) ||
         (rst.rise>rst.set && (args.jd<rst.set  || args.jd>rst.rise));
 
-    obj->Set(String::New("isUp"), Boolean::New(rc>=0 && isUp), ReadOnly);
-
-    if (rc!=0)
+    obj->Set(String::New("isUp"), Boolean::New(isUp), ReadOnly);
+
+    if (!rc) // circumpolar
         return obj;
 
@@ -2261 +2268 @@
 
     ln_rst_time sun;
-    const int rc = ln_get_solar_rst_horizon(local.jd-0.5, &local.posn, hrz, &sun);
+    const bool rc = ln_get_solar_rst_horizon(local.jd-0.5, &local.posn, hrz, &sun)==0;
     Handle<Object> rst = ConstructRiseSet(local, sun, rc);
     rst->Set(String::New("horizon"), Number::New(hrz));
@@ -2282 +2289 @@
 
     ln_rst_time moon;
-    const int rc = ln_get_lunar_rst(local.jd-0.5, &local.posn, &moon);
+    const bool rc = ln_get_lunar_rst(local.jd-0.5, &local.posn, &moon)==0;
     Handle<Object> rst = ConstructRiseSet(local, moon, rc);
     return handle_scope.Close(rst);
@@ -2551 +2558 @@
 Handle<Value> InterpreterV8::Constructor(/*Handle<FunctionTemplate> T,*/ const Arguments &args)
 {
-    Handle<Value> argv[args.Length()];
+    vector<Handle<Value>> argv(args.Length());
 
     for (int i=0; i<args.Length(); i++)
         argv[i] = args[i];
 
-    return args.Callee()->NewInstance(args.Length(), argv);
+    return args.Callee()->NewInstance(args.Length(), argv.data());
 }