Index: openacs-4/packages/acs-tcl/tcl/exception-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/exception-procs.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/acs-tcl/tcl/exception-procs.tcl 25 Jul 2018 01:39:50 -0000 1.10 +++ openacs-4/packages/acs-tcl/tcl/exception-procs.tcl 17 Jan 2019 17:02:00 -0000 1.11 @@ -9,7 +9,7 @@ # # In Tcl 8.5, "::try" was not yet a built-in of Tcl # - package require try + package require try } if {[info commands "::try"] eq ""} { error "This version of OpenACS requires the ::try command (built-in in 8.6+, package for 8.5" @@ -32,7 +32,7 @@ Check if the exception was caused by ad_raise (i.e. was an OpenACS exception) - + @return ad_exception value or empty, in case the exception had other causes } { lassign $errorCode flag type value @@ -46,13 +46,13 @@ # # Tcl 8.6 (or newer) variant of ad_try # - + ad_proc ad_try { {-auto_abort:boolean true} body args } { - + Generic code for OpenACS to handle exceptions and traps based on Tcl's primitives. This implementation is a slight generalization of the Tcl 8.6 built-in ::try, which handles ad_script_aborts @@ -64,9 +64,9 @@ "with_finally" and "with_catch" obsolete, which should be marked as deprecated in the not-to-far future. - @see with_finally + @see with_finally @see with_catch - + } { # # Per default, ad_script_abort exceptions are automatically passed @@ -90,10 +90,10 @@ # Call the Tcl 8.6 built-in/compliant ::try in the scope of the caller # #puts stderr EXEC=[list ::try $body {*}$extraTraps {*}$args] - + tailcall ::try $body {*}$extraTraps {*}$args } - + } else { # version for Tcl 8.5 @@ -102,7 +102,7 @@ body args } { - + Generic code for OpenACS to handle exceptions and traps based on Tcl's primitives. This implementation is a slight generalization of the Tcl 8.6 built-in ::try, which handles ad_script_aborts @@ -114,9 +114,9 @@ "with_finally" and "with_catch" obsolete, which should be marked as deprecated in the not-to-far future. - @see with_finally + @see with_finally @see with_catch - + } { # # Per default, ad_script_abort exceptions are automatically passed @@ -140,7 +140,7 @@ # Call the Tcl 8.6 built-in/compliant ::try in the scope of the caller # #puts stderr EXEC=[list ::try $body {*}$extraTraps {*}$args] - + #uplevel [list ::try $body {*}$extraTraps {*}$args] if {[catch {uplevel [list ::try $body {*}$extraTraps {*}$args]} msg opts]} { @@ -149,7 +149,7 @@ } else { return $msg } - } + } } # Local variables: