From f4fe2e932cc8f445e9e1bc52863e11b669e3afc9 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Wed, 3 Mar 2010 00:28:22 -0500 Subject: PR11004: try / catch error-handling script syntax * parse.h (try_block): New class. Update basic visitors. * staptree.cxx: Implement basic visitors. * parse.cxx (expect_kw): Fix to actually look for keywords. (parse_try_block): New function. (lexer ctor): Designate 'try' and 'catch' as keywords. * elaborate.cxx (dead_assignment_remover, dead_statmtexpr_remover): Optimize. (other visitors): Implement. * translate.cxx (c_unparser): Implement via super-handy __local__ labels. (emit_probe, emit_function): Make outer out: label also __local__. * testsuite/buildok/fortyone.stp, semko/fortynine.stp, systemtap.base/trycatch.exp: Test it. * NEWS, doc/langref.txt, stap.1.in: Document it. --- testsuite/buildok/fortyone.stp | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 testsuite/buildok/fortyone.stp (limited to 'testsuite/buildok') diff --git a/testsuite/buildok/fortyone.stp b/testsuite/buildok/fortyone.stp new file mode 100755 index 00000000..7a1fceb8 --- /dev/null +++ b/testsuite/buildok/fortyone.stp @@ -0,0 +1,37 @@ +#! stap -p4 + +# NB: also used for systemtap.base/trycatch.exp + +function foo () { + try { error("foo") println("KO 1") } catch { println("OK 1") error ("bar") } +} + +function koo () { + try { println(1/(0*foo())) println("KO 2") } catch (er) { println("OK 2 ",er) error("baz") } +} + +probe begin { + try { koo () println("KO 3") } catch { println("OK 3") } + try { /* empty */ } catch { log("KO 4") } + try { log("OK 4") } catch { /* empty */ } + try { /* empty */ } catch { /* empty */ } + println("OK 5") + + // check for proper loop / try/catch nesting + for (i=0;i<5;i++) try { error("me") } catch { break } + println ((i==0) ? "OK 7" : "KO 7") + + for (j=0;j<5;j++) { for (i=0;i<5;i++) try { break } catch { continue } } + println ((i==0 && j==5) ? "OK 7a" : "KO 7a") + + for (i=0;i<5;i++) try { error("me") } catch { continue } + println ((i==5) ? "OK 8" : "KO 8") + + for (j=0;j<5;j++) { for (i=0;i<5;i++) try { continue } catch { break } } + println ((i==5 && j==5) ? "OK 8a" : "KO 8a") + + // check that MAXACTIONS cannot be bypassed, e.g. with nested catch {}'s + try { for (i=0; i<100000; i++) ; println("KO 6") } catch { println("KO 5") } + println("KO 6") + // will result in MAXACTION error +} -- cgit