@jdeighan/coffee-utils 6.0.3 → 6.0.4

package/package.json

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

package/src/call_stack.coffee

@@ -1,7 +1,7 @@
 # call_stack.coffee
 
 import {undef, croak} from '@jdeighan/coffee-utils'
-import {log} from '@jdeighan/coffee-utils/log'
+import {log, LOG} from '@jdeighan/coffee-utils/log'
 
 # ---------------------------------------------------------------------------
 
@@ -23,11 +23,12 @@ 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
 		{funcName, hInfo} = @lStack.pop()
 		if funcName != fName
 			@dump()
-			croak "returnFrom('#{fName}') but TOS is '#{funcName}'"
+			LOG "returnFrom('#{fName}') but TOS is '#{funcName}'"
 		return hInfo
 
 	# ........................................................................
@@ -42,5 +43,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

@@ -6,7 +6,8 @@ import {
 } from '@jdeighan/coffee-utils';
 
 import {
-  log
+  log,
+  LOG
 } from '@jdeighan/coffee-utils/log';
 
 // ---------------------------------------------------------------------------
@@ -24,12 +25,13 @@ export var CallStack = class CallStack {
   returnFrom(fName) {
     var funcName, hInfo;
     if (this.lStack.length === 0) {
-      croak(`returnFrom('${fName}') but stack is empty`);
+      LOG(`returnFrom('${fName}') but stack is empty`);
+      return undef;
     }
     ({funcName, hInfo} = this.lStack.pop());
     if (funcName !== fName) {
       this.dump();
-      croak(`returnFrom('${fName}') but TOS is '${funcName}'`);
+      LOG(`returnFrom('${fName}') but TOS is '${funcName}'`);
     }
     return hInfo;
   }
@@ -46,7 +48,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;