fix double_array_converter

timotejroiko · Jul 19, 2021 · 9ac36f0 · 9ac36f0
1 parent d17ccca
commit 9ac36f0
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,3 @@ deps/swisseph.vcxproj
 deps/swisseph.vcxproj.filters
 src/functions.cpp
 package-lock.json
-test.ts
-thread.js
diff --git a/.npmignore b/.npmignore
@@ -10,5 +10,3 @@ src/functions.cpp
 .gitattributes
 .gitignore
 package-lock.json
-test.ts
-thread.js
diff --git a/src/functions/azalt.cpp b/src/functions/azalt.cpp
@@ -16,12 +16,12 @@ Napi::Value sweph_azalt(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double geopos [3];
-	if(!sweph_double_array_converter(geopos, info[2])) {
+	if(!sweph_double_array_converter(geopos, 3, info[2])) {
 		Napi::TypeError::New(env, args[3].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}
 	double xin [3];
-	if(!sweph_double_array_converter(xin, info[5])) {
+	if(!sweph_double_array_converter(xin, 3, info[5])) {
 		Napi::TypeError::New(env, args[6].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/azalt_rev.cpp b/src/functions/azalt_rev.cpp
@@ -14,12 +14,12 @@ Napi::Value sweph_azalt_rev(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double geopos [3];
-	if(!sweph_double_array_converter(geopos, info[2])) {
+	if(!sweph_double_array_converter(geopos, 3, info[2])) {
 		Napi::TypeError::New(env, args[3].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}
 	double xin [2];
-	if(!sweph_double_array_converter(xin, info[3])) {
+	if(!sweph_double_array_converter(xin, 2, info[3])) {
 		Napi::TypeError::New(env, args[4].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/cotrans.cpp b/src/functions/cotrans.cpp
@@ -12,7 +12,7 @@ Napi::Value sweph_cotrans(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double in [3];
-	if(!sweph_double_array_converter(in, info[0])) {
+	if(!sweph_double_array_converter(in, 3, info[0])) {
 		Napi::TypeError::New(env, args[1].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/cotrans_sp.cpp b/src/functions/cotrans_sp.cpp
@@ -12,7 +12,7 @@ Napi::Value sweph_cotrans_sp(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double in [6];
-	if(!sweph_double_array_converter(in, info[0])) {
+	if(!sweph_double_array_converter(in, 6, info[0])) {
 		Napi::TypeError::New(env, args[1].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/gauquelin_sector.cpp b/src/functions/gauquelin_sector.cpp
@@ -18,7 +18,7 @@ Napi::Value sweph_gauquelin_sector(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double geopos [3];
-	if(!sweph_double_array_converter(geopos, info[5])) {
+	if(!sweph_double_array_converter(geopos, 3, info[5])) {
 		Napi::TypeError::New(env, args[6].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/heliacal_pheno_ut.cpp b/src/functions/heliacal_pheno_ut.cpp
@@ -17,17 +17,17 @@ Napi::Value sweph_heliacal_pheno_ut(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double dgeo [3];
-	if(!sweph_double_array_converter(dgeo, info[1])) {
+	if(!sweph_double_array_converter(dgeo, 3, info[1])) {
 		Napi::TypeError::New(env, args[2].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}
 	double datm [4];
-	if(!sweph_double_array_converter(datm, info[2])) {
+	if(!sweph_double_array_converter(datm, 4, info[2])) {
 		Napi::TypeError::New(env, args[3].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}
 	double dobs [6];
-	if(!sweph_double_array_converter(dobs, info[3])) {
+	if(!sweph_double_array_converter(dobs, 6, info[3])) {
 		Napi::TypeError::New(env, args[4].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/heliacal_ut.cpp b/src/functions/heliacal_ut.cpp
@@ -17,17 +17,17 @@ Napi::Value sweph_heliacal_ut(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double dgeo [3];
-	if(!sweph_double_array_converter(dgeo, info[1])) {
+	if(!sweph_double_array_converter(dgeo, 3, info[1])) {
 		Napi::TypeError::New(env, args[2].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}
 	double datm [4];
-	if(!sweph_double_array_converter(datm, info[2])) {
+	if(!sweph_double_array_converter(datm, 4, info[2])) {
 		Napi::TypeError::New(env, args[3].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}
 	double dobs [6];
-	if(!sweph_double_array_converter(dobs, info[3])) {
+	if(!sweph_double_array_converter(dobs, 6, info[3])) {
 		Napi::TypeError::New(env, args[4].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/house_pos.cpp b/src/functions/house_pos.cpp
@@ -15,7 +15,7 @@ Napi::Value sweph_house_pos(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double planet [2];
-	if(!sweph_double_array_converter(planet, info[4])) {
+	if(!sweph_double_array_converter(planet, 2, info[4])) {
 		Napi::TypeError::New(env, args[5].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/lun_eclipse_how.cpp b/src/functions/lun_eclipse_how.cpp
@@ -13,7 +13,7 @@ Napi::Value sweph_lun_eclipse_how(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double geopos [3];
-	if(!sweph_double_array_converter(geopos, info[2])) {
+	if(!sweph_double_array_converter(geopos, 3, info[2])) {
 		Napi::TypeError::New(env, args[3].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/lun_eclipse_when_loc.cpp b/src/functions/lun_eclipse_when_loc.cpp
@@ -14,7 +14,7 @@ Napi::Value sweph_lun_eclipse_when_loc(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double geopos [3];
-	if(!sweph_double_array_converter(geopos, info[2])) {
+	if(!sweph_double_array_converter(geopos, 3, info[2])) {
 		Napi::TypeError::New(env, args[3].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/lun_occult_when_loc.cpp b/src/functions/lun_occult_when_loc.cpp
@@ -16,7 +16,7 @@ Napi::Value sweph_lun_occult_when_loc(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double geopos [3];
-	if(!sweph_double_array_converter(geopos, info[0])) {
+	if(!sweph_double_array_converter(geopos, 3, info[0])) {
 		Napi::TypeError::New(env, args[1].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/rise_trans.cpp b/src/functions/rise_trans.cpp
@@ -18,7 +18,7 @@ Napi::Value sweph_rise_trans(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double geopos [3];
-	if(!sweph_double_array_converter(geopos, info[5])) {
+	if(!sweph_double_array_converter(geopos, 3, info[5])) {
 		Napi::TypeError::New(env, args[6].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/rise_trans_true_hor.cpp b/src/functions/rise_trans_true_hor.cpp
@@ -19,7 +19,7 @@ Napi::Value sweph_rise_trans_true_hor(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double geopos [3];
-	if(!sweph_double_array_converter(geopos, info[5])) {
+	if(!sweph_double_array_converter(geopos, 3, info[5])) {
 		Napi::TypeError::New(env, args[6].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/sol_eclipse_how.cpp b/src/functions/sol_eclipse_how.cpp
@@ -13,7 +13,7 @@ Napi::Value sweph_sol_eclipse_how(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double geopos [3];
-	if(!sweph_double_array_converter(geopos, info[2])) {
+	if(!sweph_double_array_converter(geopos, 3, info[2])) {
 		Napi::TypeError::New(env, args[3].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/sol_eclipse_when_loc.cpp b/src/functions/sol_eclipse_when_loc.cpp
@@ -14,7 +14,7 @@ Napi::Value sweph_sol_eclipse_when_loc(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double geopos [3];
-	if(!sweph_double_array_converter(geopos, info[2])) {
+	if(!sweph_double_array_converter(geopos, 3, info[2])) {
 		Napi::TypeError::New(env, args[3].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/functions/vis_limit_mag.cpp b/src/functions/vis_limit_mag.cpp
@@ -16,17 +16,17 @@ Napi::Value sweph_vis_limit_mag(const Napi::CallbackInfo& info) {
 		return env.Null();
 	}
 	double dgeo [3];
-	if(!sweph_double_array_converter(dgeo, info[1])) {
+	if(!sweph_double_array_converter(dgeo, 3, info[1])) {
 		Napi::TypeError::New(env, args[2].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}
 	double datm [4];
-	if(!sweph_double_array_converter(datm, info[2])) {
+	if(!sweph_double_array_converter(datm, 4, info[2])) {
 		Napi::TypeError::New(env, args[3].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}
 	double dobs [6];
-	if(!sweph_double_array_converter(dobs, info[3])) {
+	if(!sweph_double_array_converter(dobs, 6, info[3])) {
 		Napi::TypeError::New(env, args[4].second).ThrowAsJavaScriptException();
 		return env.Null();
 	}

diff --git a/src/sweph.cpp b/src/sweph.cpp
@@ -119,9 +119,9 @@ bool sweph_type_check(const std::pair<int, const char*> types[], const Napi::Cal
 	return true;
 }
 
-bool sweph_double_array_converter(double *target, Napi::Value data) {
+bool sweph_double_array_converter(double *target, int size, Napi::Value data) {
 	Napi::Array x = data.As<Napi::Array>();
-	for(int i = 0; i < sizeof(target) / sizeof(target[0]); i++) {
+	for(int i = 0; i < size; i++) {
 		Napi::Value v = x[i];
 		if(!v.IsNumber()) {
 			return false;

diff --git a/src/sweph.h b/src/sweph.h
@@ -97,7 +97,7 @@ Napi::Value sweph_cs2degstr(const Napi::CallbackInfo& info);
 
 bool sweph_is_type(int type, Napi::Value data);
 bool sweph_type_check(const std::pair<int, const char*> types[], const Napi::CallbackInfo& info);
-bool sweph_double_array_converter(double *target, Napi::Value data);
+bool sweph_double_array_converter(double *target, int size, Napi::Value data);
 Napi::Array sweph_js_array_converter(double *src, int size, Napi::Env env);
 
 enum TYPES {