@jdeighan/coffee-utils 4.1.14 → 4.1.18

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "4.1.14",
+	"version": "4.1.18",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -19,6 +19,9 @@
 	"engines": {
 		"node": ">=12.0.0"
 	},
+	"ava": {
+		"verbose": false
+	},
 	"scripts": {
 		"build": "cls && rm -f ./src/*.js && coffee -c ./src",
 		"old_pretest": "npm run build && rm -f ./test/*.js && rm -f ./test/*.coffee && cielo -fq ./test",

package/src/call_stack.coffee

@@ -22,8 +22,11 @@ export class CallStack
 
 	returnFrom: (fName) ->
 
+		if @lStack.length == 0
+			croak "returnFrom('#{fName}') but stack is empty"
 		{funcName, hInfo} = @lStack.pop()
 		if funcName != fName
+			@dump()
 			croak "returnFrom('#{fName}') but TOS is '#{funcName}'"
 		return hInfo
 
@@ -37,7 +40,7 @@ export class CallStack
 
 	dump: (label='CALL STACK') ->
 
-		log "#{label}:"
+		console.log "#{label}:"
 		for item, i in @lStack
-			log "#{i}: #{JSON.stringify(item)}"
+			console.log "#{i}: #{JSON.stringify(item)}"
 		return

package/src/call_stack.js

@@ -23,8 +23,12 @@ export var CallStack = class CallStack {
   // ........................................................................
   returnFrom(fName) {
     var funcName, hInfo;
+    if (this.lStack.length === 0) {
+      croak(`returnFrom('${fName}') but stack is empty`);
+    }
     ({funcName, hInfo} = this.lStack.pop());
     if (funcName !== fName) {
+      this.dump();
       croak(`returnFrom('${fName}') but TOS is '${funcName}'`);
     }
     return hInfo;
@@ -38,11 +42,11 @@ export var CallStack = class CallStack {
   // ........................................................................
   dump(label = 'CALL STACK') {
     var i, item, j, len, ref;
-    log(`${label}:`);
+    console.log(`${label}:`);
     ref = this.lStack;
     for (i = j = 0, len = ref.length; j < len; i = ++j) {
       item = ref[i];
-      log(`${i}: ${JSON.stringify(item)}`);
+      console.log(`${i}: ${JSON.stringify(item)}`);
     }
   }
 

package/src/debug_utils.coffee

@@ -162,7 +162,7 @@ export debug = (lArgs...) ->
 	else if (lMatches = str.match(///^
 			\s*
 			return
-			.*
+			.+
 			from
 			\s+
 			([A-Za-z_][A-Za-z0-9_\.]*)

package/src/debug_utils.js

@@ -178,7 +178,7 @@ export var debug = function(...lArgs) {
     curFunc = lMatches[1];
     stack.call(curFunc, curEnv());
     debugging = shouldDebug(curFunc, debugging);
-  } else if ((lMatches = str.match(/^\s*return.*from\s+([A-Za-z_][A-Za-z0-9_\.]*)/))) {
+  } else if ((lMatches = str.match(/^\s*return.+from\s+([A-Za-z_][A-Za-z0-9_\.]*)/))) {
     returning = true;
     curFunc = lMatches[1];
     hInfo = stack.returnFrom(curFunc);