@jdeighan/coffee-utils 6.0.3 → 6.0.6

package/package.json

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

package/src/call_stack.coffee

@@ -1,7 +1,16 @@
 # call_stack.coffee
 
-import {undef, croak} from '@jdeighan/coffee-utils'
-import {log} from '@jdeighan/coffee-utils/log'
+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
 
 # ---------------------------------------------------------------------------
 
@@ -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
 
@@ -23,17 +35,29 @@ export class CallStack
 	returnFrom: (fName) ->
 
 		if @lStack.length == 0
-			croak "returnFrom('#{fName}') but stack is empty"
+			LOG "returnFrom('#{fName}') but stack is empty"
+			return undef
+		if doDebugStack
+			prefix = '   '.repeat(@lStack.length-1)
+			LOG "#{prefix}[RETURN FROM #{fName}]"
 		{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 (funcName == fName)
+			return hInfo
+		else
 			@dump()
-			croak "returnFrom('#{fName}') but TOS is '#{funcName}'"
-		return hInfo
+			LOG "BAD returnFrom('#{fName}')"
+			return undef
 
 	# ........................................................................
 
 	reset: () ->
 
+		if doDebugStack
+			LOG "RESET STACK"
 		@lStack = []
 
 	# ........................................................................
@@ -42,5 +66,5 @@ export class CallStack
 
 		console.log "#{label}:"
 		for item, i in @lStack
-			console.log "#{i}: #{JSON.stringify(item)}"
+			LOG "#{i}: #{JSON.stringify(item)}"
 		return

package/src/call_stack.js

@@ -1,14 +1,25 @@
 // Generated by CoffeeScript 2.6.1
-  // call_stack.coffee
+// call_stack.coffee
+var doDebugStack;
+
 import {
   undef,
-  croak
+  croak,
+  assert
 } from '@jdeighan/coffee-utils';
 
 import {
-  log
+  log,
+  LOG
 } from '@jdeighan/coffee-utils/log';
 
+doDebugStack = false;
+
+// ---------------------------------------------------------------------------
+export var debugStack = function(flag = true) {
+  doDebugStack = flag;
+};
+
 // ---------------------------------------------------------------------------
 export var CallStack = class CallStack {
   constructor() {
@@ -17,25 +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) {
-      croak(`returnFrom('${fName}') but stack is empty`);
+      LOG(`returnFrom('${fName}') but stack is empty`);
+      return undef;
+    }
+    if (doDebugStack) {
+      prefix = '   '.repeat(this.lStack.length - 1);
+      LOG(`${prefix}[RETURN FROM ${fName}]`);
     }
     ({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 (funcName === fName) {
+      return hInfo;
+    } else {
       this.dump();
-      croak(`returnFrom('${fName}') but TOS is '${funcName}'`);
+      LOG(`BAD returnFrom('${fName}')`);
+      return undef;
     }
-    return hInfo;
   }
 
   // ........................................................................
   reset() {
+    if (doDebugStack) {
+      LOG("RESET STACK");
+    }
     return this.lStack = [];
   }
 
@@ -46,7 +76,7 @@ export var CallStack = class CallStack {
     ref = this.lStack;
     for (i = j = 0, len = ref.length; j < len; i = ++j) {
       item = ref[i];
-      console.log(`${i}: ${JSON.stringify(item)}`);
+      LOG(`${i}: ${JSON.stringify(item)}`);
     }
   }
 

package/src/debug_utils.coffee

@@ -150,7 +150,7 @@ export debug = (lArgs...) ->
 		returning = true
 		curFunc = lMatches[1]
 		hInfo = stack.returnFrom(curFunc)
-		if DEBUGDEBUG
+		if DEBUGDEBUG && hInfo
 			LOG "RETURN FROM #{curFunc}, debugging = #{hInfo.debugging}"
 
 	if shouldLogString(label)
@@ -179,7 +179,8 @@ export debug = (lArgs...) ->
 	if returning
 		if debugLevel > 0
 			debugLevel -= 1
-		setEnv(hInfo)
+		if hInfo
+			setEnv(hInfo)
 	else if entering
 		if debugging
 			debugLevel += 1

package/src/debug_utils.js

@@ -176,7 +176,7 @@ export var debug = function(...lArgs) {
     returning = true;
     curFunc = lMatches[1];
     hInfo = stack.returnFrom(curFunc);
-    if (DEBUGDEBUG) {
+    if (DEBUGDEBUG && hInfo) {
       LOG(`RETURN FROM ${curFunc}, debugging = ${hInfo.debugging}`);
     }
   }
@@ -205,7 +205,9 @@ export var debug = function(...lArgs) {
     if (debugLevel > 0) {
       debugLevel -= 1;
     }
-    setEnv(hInfo);
+    if (hInfo) {
+      setEnv(hInfo);
+    }
   } else if (entering) {
     if (debugging) {
       debugLevel += 1;