Refactor error handling

stdlib-js · Aug 17, 2019 · 9efdb42 · 9efdb42
1 parent e006d91
commit 9efdb42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/lib/node_modules/@stdlib/repl/lib/commands/load.js b/lib/node_modules/@stdlib/repl/lib/commands/load.js
@@ -66,15 +66,8 @@ function command( repl ) {
 		* @private
 		*/
 		function onDrain() {
-			try {
-				debug( 'Loading a file...' );
-				repl.load( fpath, clbk );
-			} catch ( error ) {
-				debug( 'Error: %s', error.message );
-
-				// TODO: determine whether we need to perform ANSI escape magic here! (the error message gets printed on the wrong line!)
-				repl._ostream.write( 'Error: '+error.message+'\n' );
-			}
+			debug( 'Loading a file...' );
+			repl.load( fpath, clbk );
 		}
 
 		/**
@@ -85,7 +78,11 @@ function command( repl ) {
 		*/
 		function clbk( error ) {
 			if ( error ) {
+				// NOTE: we can assume that the error pertains to actually reading the file (e.g., loading from disk) and NOT the line-by-line evaluation, where error handling should be handled separately...
 				debug( 'Error: %s', error.message );
+
+				// TODO: determine whether we need to perform ANSI escape magic here! (the error message gets printed on the wrong line!)
+				repl._ostream.write( 'Error: '+error.message+'\n' );
 				return;
 			}
 			debug( 'Successfully loaded file.' );

diff --git a/lib/node_modules/@stdlib/repl/lib/main.js b/lib/node_modules/@stdlib/repl/lib/main.js
@@ -597,7 +597,6 @@ setNonEnumerableReadOnly( REPL.prototype, 'load', function load( fpath, clbk ) {
 	file = readFileSync( fpath, 'utf8' );
 	if ( file instanceof Error ) {
 		debug( 'Error: %s', file.message );
-		this._ostream.write( 'Error: '+file.message+'\n' );
 		clbk( file );
 		return;
 	}