@jdeighan/coffee-utils 6.0.4 → 6.0.7

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "6.0.4",
+	"version": "6.0.7",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {

package/src/call_stack.coffee

@@ -1,8 +1,17 @@
 # call_stack.coffee
 
-import {undef, croak} from '@jdeighan/coffee-utils'
+import {undef, croak, assert} from '@jdeighan/coffee-utils'
 import {log, LOG} from '@jdeighan/coffee-utils/log'
 
+doDebugStack = false
+
+# ---------------------------------------------------------------------------
+
+export debugStack = (flag=true) ->
+
+	doDebugStack = flag
+	return
+
 # ---------------------------------------------------------------------------
 
 export class CallStack
@@ -15,6 +24,9 @@ export class CallStack
 
 	call: (funcName, hInfo) ->
 
+		if doDebugStack
+			prefix = '   '.repeat(@lStack.length)
+			LOG "#{prefix}[> CALL #{funcName}]"
 		@lStack.push({funcName, hInfo})
 		return
 
@@ -26,15 +38,26 @@ export class CallStack
 			LOG "returnFrom('#{fName}') but stack is empty"
 			return undef
 		{funcName, hInfo} = @lStack.pop()
-		if funcName != fName
+		while (funcName != fName) && (@lStack.length > 0)
+			LOG "[MISSING RETURN FROM #{funcName} (return from #{fName})]"
+			{funcName, hInfo} = @lStack.pop()
+
+		if doDebugStack
+			prefix = '   '.repeat(@lStack.length)
+			LOG "#{prefix}[< BACK #{fName}]"
+		if (funcName == fName)
+			return hInfo
+		else
 			@dump()
-			LOG "returnFrom('#{fName}') but TOS is '#{funcName}'"
-		return hInfo
+			LOG "BAD returnFrom('#{fName}')"
+			return undef
 
 	# ........................................................................
 
 	reset: () ->
 
+		if doDebugStack
+			LOG "RESET STACK"
 		@lStack = []
 
 	# ........................................................................

package/src/call_stack.js

@@ -1,8 +1,11 @@
 // Generated by CoffeeScript 2.6.1
-  // call_stack.coffee
+// call_stack.coffee
+var doDebugStack;
+
 import {
   undef,
-  croak
+  croak,
+  assert
 } from '@jdeighan/coffee-utils';
 
 import {
@@ -10,6 +13,13 @@ import {
   LOG
 } from '@jdeighan/coffee-utils/log';
 
+doDebugStack = false;
+
+// ---------------------------------------------------------------------------
+export var debugStack = function(flag = true) {
+  doDebugStack = flag;
+};
+
 // ---------------------------------------------------------------------------
 export var CallStack = class CallStack {
   constructor() {
@@ -18,26 +28,44 @@ export var CallStack = class CallStack {
 
   // ........................................................................
   call(funcName, hInfo) {
+    var prefix;
+    if (doDebugStack) {
+      prefix = '   '.repeat(this.lStack.length);
+      LOG(`${prefix}[> CALL ${funcName}]`);
+    }
     this.lStack.push({funcName, hInfo});
   }
 
   // ........................................................................
   returnFrom(fName) {
-    var funcName, hInfo;
+    var funcName, hInfo, prefix;
     if (this.lStack.length === 0) {
       LOG(`returnFrom('${fName}') but stack is empty`);
       return undef;
     }
     ({funcName, hInfo} = this.lStack.pop());
-    if (funcName !== fName) {
+    while ((funcName !== fName) && (this.lStack.length > 0)) {
+      LOG(`[MISSING RETURN FROM ${funcName} (return from ${fName})]`);
+      ({funcName, hInfo} = this.lStack.pop());
+    }
+    if (doDebugStack) {
+      prefix = '   '.repeat(this.lStack.length);
+      LOG(`${prefix}[< BACK ${fName}]`);
+    }
+    if (funcName === fName) {
+      return hInfo;
+    } else {
       this.dump();
-      LOG(`returnFrom('${fName}') but TOS is '${funcName}'`);
+      LOG(`BAD returnFrom('${fName}')`);
+      return undef;
     }
-    return hInfo;
   }
 
   // ........................................................................
   reset() {
+    if (doDebugStack) {
+      LOG("RESET STACK");
+    }
     return this.lStack = [];
   }
 

package/src/log_utils.coffee

@@ -34,6 +34,8 @@ export LOG = (lArgs...) ->
 		console.log label
 	return
 
+export DEBUG = LOG   # synonym
+
 # ---------------------------------------------------------------------------
 
 export setStringifier = (func) ->

package/src/log_utils.js

@@ -59,6 +59,9 @@ export var LOG = function(...lArgs) {
   }
 };
 
+export var DEBUG = LOG; // synonym
+
+
 // ---------------------------------------------------------------------------
 export var setStringifier = function(func) {
   var orgStringifier;