diff --git a/_demo/setjmp/setjmp.go b/_demo/setjmp/setjmp.go index e8955695..c281d90f 100644 --- a/_demo/setjmp/setjmp.go +++ b/_demo/setjmp/setjmp.go @@ -2,7 +2,7 @@ package main import ( "github.com/goplus/llgo/c/setjmp" - "github.com/goplus/llgo/c/setjmp/demo" + "github.com/goplus/llgo/c/setjmp/trycatch" ) func main() { @@ -10,7 +10,7 @@ func main() { switch ret := setjmp.Sigsetjmp(&jb, 0); ret { case 0: println("Hello, setjmp!") - demo.ThrowCppException() + trycatch.ThrowCppException() setjmp.Siglongjmp(&jb, 1) default: println("exception:", ret) diff --git a/c/setjmp/demo/_code/try_catch.cpp b/c/setjmp/demo/_code/try_catch.cpp deleted file mode 100644 index e4aa343d..00000000 --- a/c/setjmp/demo/_code/try_catch.cpp +++ /dev/null @@ -1,10 +0,0 @@ -extern "C" void throwCppException(); - -int main() { - try { - throwCppException(); - } catch (...) { - throw; - } - return 0; -} diff --git a/c/setjmp/demo/_code/demo.cpp b/c/setjmp/trycatch/_code/demo.cpp similarity index 100% rename from c/setjmp/demo/_code/demo.cpp rename to c/setjmp/trycatch/_code/demo.cpp diff --git a/c/setjmp/trycatch/_code/try_catch.cpp b/c/setjmp/trycatch/_code/try_catch.cpp new file mode 100644 index 00000000..0b160194 --- /dev/null +++ b/c/setjmp/trycatch/_code/try_catch.cpp @@ -0,0 +1,13 @@ +#include +#include + +extern "C" void throwCppException(); + +int main() { + try { + throwCppException(); + } catch (std::exception& e) { + printf("Hi, %s\n", e.what()); + } + return 0; +} diff --git a/c/setjmp/demo/demo.go b/c/setjmp/trycatch/demo.go similarity index 97% rename from c/setjmp/demo/demo.go rename to c/setjmp/trycatch/demo.go index d0fed258..79ae2ce1 100644 --- a/c/setjmp/demo/demo.go +++ b/c/setjmp/trycatch/demo.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package demo +package trycatch import ( _ "unsafe" diff --git a/c/setjmp/demo/demo.ll b/c/setjmp/trycatch/demo.ll similarity index 100% rename from c/setjmp/demo/demo.ll rename to c/setjmp/trycatch/demo.ll diff --git a/c/setjmp/demo/llgo.cfg b/c/setjmp/trycatch/llgo.cfg similarity index 100% rename from c/setjmp/demo/llgo.cfg rename to c/setjmp/trycatch/llgo.cfg diff --git a/c/setjmp/demo/llgo_autogen.lla b/c/setjmp/trycatch/llgo_autogen.lla similarity index 100% rename from c/setjmp/demo/llgo_autogen.lla rename to c/setjmp/trycatch/llgo_autogen.lla