-while ( ( $line = Maintenance::readconsole() ) !== false ) {
- if ( $useReadline ) {
- readline_add_history( $line );
- readline_write_history( $historyFile );
+$__e = null; // PHP exception
+while ( ( $__line = Maintenance::readconsole() ) !== false ) {
+ if ( $__e && !preg_match( '/^(exit|die);?$/', $__line ) ) {
+ // Internal state may be corrupted or fatals may occur later due
+ // to some object not being set. Don't drop out of eval in case
+ // lines were being pasted in (which would then get dumped to the shell).
+ // Instead, just absorb the remaning commands. Let "exit" through per DWIM.
+ echo "Exception was thrown before; please restart eval.php\n";
+ continue;
+ }
+ if ( $__useReadline ) {
+ readline_add_history( $__line );
+ readline_write_history( $__historyFile );
+ }
+ try {
+ $__val = eval( $__line . ";" );
+ } catch ( Exception $__e ) {
+ echo "Caught exception " . get_class( $__e ) .
+ ": {$__e->getMessage()}\n" . $__e->getTraceAsString() . "\n";
+ continue;