Clean up jsscripts, add -Debug option.

Author: Karl Malbrain

js.h

@@ -12,6 +12,9 @@
 #define strcasecmp _strnicmp
 #endif
 
+extern bool MathNums;
+extern bool debug;
+
 //  memory allocation
 
 void *js_realloc(void *old, uint32_t size, bool zeroit);

js_db.c

@@ -3,8 +3,6 @@
 #include "database/db_api.h"
 #include "database/db_error.h"
 
-static bool debug = false;
-
 //	types of handles/arenas
 
 extern void marshal_doc(value_t document, uint8_t *doc, uint32_t docSize);

js_dbfind.c

@@ -1,7 +1,6 @@
 #include "js.h"
 #include "js_eval.h"
 
-bool debug = false;
 bool init = true;
 
 typedef bool (*queryFcn)(value_t r, value_t tst);

js_dbinsert.c

@@ -2,8 +2,6 @@
 #include "database/db.h"
 #include "database/db_api.h"
 
-static bool debug = false;
-
 extern uint32_t calcSize (value_t doc);
 extern void marshal_doc(value_t document, uint8_t *doc, uint32_t docSize);
 

js_error.c

@@ -2,13 +2,18 @@
 
 char *strstatus(Status s) {
 	switch (s) {
-	case OK:					return "OK";
-	case ERROR_outofmemory:		return "out of memory";
-	case ERROR_script_internal:	return "script internal error";
+	case OK:						return "OK";
+	case ERROR_outofmemory:			return "out of memory";
+	case ERROR_script_internal:		return "script internal error";
 	case ERROR_script_unrecognized_function:	return "script unrecognized function";
-	case ERROR_tcperror:		return "tcperror";
-	case ERROR_bsonformat:		return "bsonformat";
+	case ERROR_tcperror:			return "tcperror";
+	case ERROR_bsonformat:			return "bsonformat";
 	case ERROR_notobject_or_array:	return "not object or array";
+	case ERROR_mathdomain:			return "outside math domain";
+	case ERROR_endoffile:			return "end of file";
+	case ERROR_doesnot_exist:		return "does not exist";
+	case ERROR_script_parse:		return "script parse";
+	case ERROR_json_parse:			return "json parse";
 	default:;
 	}
 	return NULL;

js_eval.c

@@ -1,9 +1,6 @@
 #include "js.h"
 #include "js_malloc.h"
 
-static bool debug = false;
-extern bool MathNums;
-
 int ArraySize[] = {
 	sizeof(value_t),
 	sizeof(int8_t),

js_fcns.c

@@ -259,7 +259,8 @@ void execScripts(Node *table, uint32_t size, value_t args, symtab_t *symbols, en
 		dispatch(fn->begin, env);
 
 		elapsed = getCpuTime(0) - strtTime;
-		fprintf (stderr, "Execution: %dm%.6fs %s \n", (int)(elapsed/60), elapsed - (int)(elapsed/60)*60, fn->script);
+		if (debug)
+			fprintf (stderr, "Execution: %dm%.6fs %s \n", (int)(elapsed/60), elapsed - (int)(elapsed/60)*60, fn->script);
 	}
 
 	v.bits = vt_closure;

js_lib.c

@@ -19,9 +19,6 @@
 #define strerror_s(buf,siz,err) (strerror_r(err,buf,siz))
 #endif
 
-static bool debug = false;
-extern bool MathNums;
-
 value_t js_setOption(uint32_t args, environment_t *env) {
 	value_t v, s;
 
@@ -36,6 +33,9 @@ value_t js_setOption(uint32_t args, environment_t *env) {
 		return s.status = ERROR_script_internal, s;
 	}
 
+	if (!memcmp(v.str, "Debug", 6))
+		debug = true;
+
 	if (!memcmp(v.str, "Math", 5))
 		MathNums = true;
 
@@ -366,9 +366,7 @@ value_t js_listFiles(uint32_t args, environment_t *env) {
 	HANDLE hndl;
 
 	memcpy (pattern, path.str, path.aux > MAX_PATH - 2 ? MAX_PATH - 2 : path.aux);
-	pattern[path.aux] = '/';
-	pattern[path.aux+1] = '*';
-	pattern[path.aux+2] = 0;
+	pattern[path.aux] = 0;
 
 	hndl = FindFirstFile(pattern, fd);
 

js_main.c

@@ -13,6 +13,7 @@
 #endif
 
 bool MathNums;	//	interpret numbers as doubles
+bool debug;
 
 void memInit(void);
 
@@ -74,11 +75,6 @@ int main(int argc, char* argv[]) {
 
 	memInit();
 
-	printf("sizeof value_t = %d\n",  (int)sizeof(value_t));
-	printf("sizeof Node = %d\n",  (int)sizeof(Node));
-	printf("sizeof Object = %d\n",  (int)sizeof(object_t));
-	printf("sizeof raw_t = %d\n",  (int)sizeof(rawobj_t));
-
 	for (int i = 0; i < node_MAX; i++)
 		dispatchTable[i] = eval_badop;
 
@@ -121,6 +117,8 @@ int main(int argc, char* argv[]) {
 	while (--argc > 0 && (++argv)[0][0] == '-') {
 		if (!strcmp(argv[0], "-Math"))
 			MathNums = true;
+		if (!strcmp(argv[0], "-Debug"))
+			debug = true;
 		else if(!strcmp(argv[0], "-Write") && argc > 1)	{
 			if((err = fopen_s(&strm, argv[1], "wb"))) {
 			  strerror_s(errmsg, sizeof(errmsg), err);
@@ -150,7 +148,8 @@ int main(int argc, char* argv[]) {
 		strerror_s(errmsg, sizeof(errmsg), err);
 		fprintf(stderr, "Error: unable to open '%s' error: %d: %s\n", argv[nScripts], err, errmsg);
 	  } else {
-		fprintf(stderr, "Compiling: %s\n", argv[nScripts]);
+		if (debug)
+			fprintf(stderr, "Compiling: %s\n", argv[nScripts]);
 		pd->script = argv[nScripts];
 		loadScript(pd);
 		fclose(dummy);
@@ -174,6 +173,13 @@ int main(int argc, char* argv[]) {
 
 	execScripts(pd->table, pd->tableNext, args, globalSymbols, NULL);
 
+	if (debug) {
+		printf("sizeof value_t = %d\n",  (int)sizeof(value_t));
+		printf("sizeof Node = %d\n",  (int)sizeof(Node));
+		printf("sizeof Object = %d\n",  (int)sizeof(object_t));
+		printf("sizeof raw_t = %d\n",  (int)sizeof(rawobj_t));
+	}
+
 	//	TODO: delete objects in the global frame
 
 	return 0;

js_malloc.c

@@ -8,8 +8,6 @@
 #include "js_malloc.h"
 #include "database/db_malloc.h"
 
-static bool debug = true;
-
 //  allocate reference counted object
 
 uint64_t js_rawAlloc(uint32_t size, bool zeroit) {

js_math.c

@@ -11,8 +11,6 @@
 #include "js_math.h"
 #include "js_malloc.h"
 
-static int debug = 0;
-
 value_t conv(value_t val, valuetype_t type, bool abandon) {
 	value_t result;
 

js_symbols.c

@@ -1,7 +1,5 @@
 #include "js.h"
 
-static bool debug = false;
-
 extern int builtin (stringNode *name);
 extern symtab_t globalSymbols[1];
 

jsscripts/test_fcn.js

@@ -6,6 +6,7 @@ function x(y,z){
 	}
 }
 
+print("expecting 1");
 x("yes1", true);
 
 function a(y,z){
@@ -16,6 +17,6 @@ function a(y,z){
 	}
 }
 
-print(x("yes1", true));
-print(a("yes2", true));
+print("Expecting yes2true:", x("yes1", true));
+print("Expecting undefined:", a("yes2", true));
 

jsscripts/test_fcn2.js

@@ -23,4 +23,4 @@ function bottomUpTree(item,depth){
    }
 }
 
-print(bottomUpTree(0,0).itemCheck());
+print("Expecting 0: ", bottomUpTree(0,0).itemCheck());

jsscripts/test_for.js

@@ -1,7 +1,9 @@
 var array = [3,2,1];
 
+print("array: ", array);
+
 for( var idx in array)
-	print("idx: ", idx);
+	print("idx values in array: ", idx);
 
 for( var val of array)
-	print("val: ", val);
+	print("val values of array: ", val);

jsscripts/test_ifthenelse.js

@@ -1,5 +1,7 @@
 var a = 1, b = 2;
 
+print("expecting 2:");
+
 if (a) {
    if (b) print(b);
 } else

jsscripts/test_int.js

@@ -1,2 +1,2 @@
 var i = 2.0;
-print(i);
+print("Expecting 2.0: ", i);

jsscripts/test.js renamed to jsscripts/test_json.js

@@ -1,10 +1,11 @@
 var v = [1.2,2.2,3.2];
-print(v[0], v[1], v[2]);
-print(v[0] * v[1] * v[2]);
+print("Vector :", v);
+
+print("Multiplied: ", v[0] * v[1] * v[2]);
 
 var a = 1;
 
 for(var i = 0; i < v.length; i++)
 	a /= v[i];
 
-print(i, ": vec div = ", a);
+print("1/", v[0] * v[1] * v[2], " = ", a);

jsscripts/test_math.js

@@ -1,7 +1,6 @@
 
 function Test (a,b,c) {
-	print(Test.displayName);
 	return { test : a, test2:b, test3:c, name : Test.displayName };
 }
 
-print(Test(1,2,3));
+print("Call Test(1,2,3), expecting { test : a, test2:b, test3:c, name : Test.displayName }: ", Test(1,2,3));

jsscripts/test_name.js

@@ -1,18 +1,17 @@
 var doc = { field: 1,};
-print(doc);
+print("Expecting { field: 1,} : ", doc);
 
 doc = [1,2];
-print(doc);
+print("Expecting [1,2] : ", doc);
 
 function NewObj (a,b,c) {
 	this.sum = a+b+c;
 }
 
-print("begin test");
 NewObj.prototype.type = "NewObj";
 
 var test = new NewObj(1,2,3);
 
-print(test.type);
+print("Expecting NewObj: ", test.type);
 
 

jsscripts/test_obj.js

@@ -1,5 +1,5 @@
-print(parseInt("1"));
-print(parseFloat("1.2"));
+print('parseInt("1")     = ', parseInt("1"));
+print('parseFloat("1.2") = ', parseFloat("1.2"));
 
-print(parseInt("a"));
-print(parseFloat("a"));
+print('parseInt("a")     = ', parseInt("a"));
+print('parseFloat("a")   = ', parseFloat("a"));

jsscripts/test_parse.js

@@ -5,7 +5,7 @@ var o = {
   }
 };
 
-print(o.f()); // logs 37
+print("Expecting 37: ", o.f());
 
 Function.prototype.toString = function() {
 	return "Fcn: " + this.name;

jsscripts/test_proto.js

@@ -1,6 +1,6 @@
-print("a" > "b");
-print("a" < "b");
-print("aa" < "aa");
-print("aa" <= "aa");
-print("aa" <= "aab");
-print("aa" > "aab");
+print('"a" > "b" = ', "a" > "b");
+print('"a" < "b" = ', "a" < "b");
+print('"aa" < "aa" = ', "aa" < "aa");
+print('"aa" <= "aa" = ', "aa" <= "aa");
+print('"aa" <= "aab" = ', "aa" <= "aab");
+print('"aa" > "aab" = ', "aa" > "aab");

jsscripts/test_rel.js

@@ -1,3 +1,3 @@
 var x = 2 * 3.0;
-print(x);;
-print("ok");
+print("Expecting: 6.0: ", x);;
+print("Empty Statement Ignored");

jsscripts/test_semi.js

@@ -1,2 +1,2 @@
 var source = [9,3,8,1];
-print(source.sort());
+print("Sorting: ", source, " result: ", source.sort());

jsscripts/test_sort.js

@@ -46,7 +46,7 @@ var array = ["aaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbb", "cccccccccccccccc", 4];
 
 print ('\nmake array["aaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbb", "cccccccccccccccc", 4]: ', array);
 print("array[0].charCodeAt(6): ", array[0].charCodeAt(6));
-print(typeof array[0]);
+print("Expecting typeof array[0]: ", typeof array[0]);
 
 print("\narray.join w/'->': ", array.join("->"));
 print("\nmake 16 byte chunks\n");

jsscripts/test_str.js

@@ -1,11 +1,11 @@
 var array = ["a", 2, 3, "d"];
 
-print(array);
+print('Expecting ["a", 2, 3, "d"] : ', array);
 
 var str = " ";
 
 for(var i = 0; i < 1024 * 1024; i++)
 	str += " ";
 
-print(str.length);
+print("Expecting 1048577: ", str.length);
 

jsscripts/test_str1.js

@@ -1,2 +1,2 @@
 var x = 1>2 ? "good" : 1<2 ? "good2" : "bad";
-print(x);
+print("expecting good2: ", x);