diff --git a/cg/VB2UML.cstl b/cg/VB2UML.cstl index 9c5a7e6d..3f8c80c0 100644 --- a/cg/VB2UML.cstl +++ b/cg/VB2UML.cstl @@ -1361,7 +1361,7 @@ END |--> OclProcess.exit(1) exitStmt:: EXIT DO |--> break EXIT FOR |--> break -EXIT FUNCTION |--> return result +EXIT FUNCTION |--> return _88 EXIT PROPERTY |--> return result EXIT SUB |--> return diff --git a/cg/python2UML.cstl b/cg/python2UML.cstl index 6872808d..96b49dba 100644 --- a/cg/python2UML.cstl +++ b/cg/python2UML.cstl @@ -820,6 +820,7 @@ trailer:: . upper _1 |-->->toUpperCase() . lower _1 |-->->toLowerCase() . strip _1 |-->->trim() +. split _1 |-->->split_1 . replace _1 |-->.replace_1 . find _1 |-->->indexOf_1 - 1 . startswith _1 |-->->hasPrefix_1 @@ -2157,6 +2158,7 @@ trailerOclType:: . upper _1 |-->String . lower _1 |-->String +. split _1 |-->Sequence . strip _1 |-->String . replace _1 |-->String . find _1 |-->int diff --git a/cg/vbFunctions.cstl b/cg/vbFunctions.cstl index 7334f792..2dfe8891 100644 --- a/cg/vbFunctions.cstl +++ b/cg/vbFunctions.cstl @@ -83,27 +83,27 @@ _1 |-->_1 functionStmt:: -FUNCTION _1 _2 \r\n \r\n _3 _* END FUNCTION |-->operation _1`VB2UML_2`VB2UML : OclAny\n pre: true post: true\n activity: var _1 : OclAny;\n_3`VB2UML\n return _1;\n\n +FUNCTION _1 _2 \r\n \r\n _3 _* END FUNCTION |-->operation _1`VB2UML_2`VB2UML : OclAny\n pre: true post: true\n activity: var _1 : OclAny;\n_3`VB2UML\n return _1;\n\n _88 _1 Function _1 _2 \r\n \r\n _3 _* End Function |-->operation _1`VB2UML_2`VB2UML : OclAny\n pre: true post: true\n activity: var _1 : OclAny;\n_3`VB2UML\n return _1;\n\n -FUNCTION _1 _2 \r\n _3 _* END FUNCTION |-->operation _1`VB2UML_2`VB2UML : OclAny\n pre: true post: true\n activity: var _1`VB2UML : OclAny;\n_3`VB2UML\n return _1;\n\n +FUNCTION _1 _2 \r\n _3 _* END FUNCTION |-->operation _1`VB2UML_2`VB2UML : OclAny\n pre: true post: true\n activity: var _1`VB2UML : OclAny;\n_3`VB2UML\n return _1;\n\n _88 _1 Function _1 _2 \r\n _3 _* End Function |-->operation _1`VB2UML_2`VB2UML : OclAny\n pre: true post: true\n activity: var _1`VB2UML : OclAny;\n_3`VB2UML\n return _1;\n\n -FUNCTION _1 _2 _3 \r\n \r\n _4 _* END FUNCTION |-->operation _1_2`VB2UML _3`VB2UML\n pre: true post: true\n activity: var _1 _3`VB2UML;\n_4`VB2UML\n return _1;\n\n +FUNCTION _1 _2 _3 \r\n \r\n _4 _* END FUNCTION |-->operation _1_2`VB2UML _3`VB2UML\n pre: true post: true\n activity: var _1 _3`VB2UML;\n_4`VB2UML\n return _1;\n\n _88 _1 Function _1 _2 _3 \r\n \r\n _4 _* End Function |-->operation _1_2`VB2UML _3`VB2UML\n pre: true post: true\n activity: var _1 _3`VB2UML;\n_4`VB2UML\n return _1;\n\n -FUNCTION _1 _2 _3 \r\n _4 _* END FUNCTION |-->operation _1_2`VB2UML _3`VB2UML\n pre: true post: true\n activity: var _1 _3`VB2UML;\n_4`VB2UML\n return _1;\n\n +FUNCTION _1 _2 _3 \r\n _4 _* END FUNCTION |-->operation _1_2`VB2UML _3`VB2UML\n pre: true post: true\n activity: var _1 _3`VB2UML;\n_4`VB2UML\n return _1;\n\n _88 _1 Function _1 _2 _3 \r\n _4 _* End Function |-->operation _1_2`VB2UML _3`VB2UML\n pre: true post: true\n activity: var _1 _3`VB2UML;\n_4`VB2UML\n return _1;\n\n -_1 FUNCTION _2 _3 _4 \r\n \r\n _5 _* END FUNCTION |-->operation _2`VB2UML_3`VB2UML _4`VB2UML\n pre: true post: true\n activity: var _2 _4`VB2UML;\n_5`VB2UML\n return _2;\n\n +_1 FUNCTION _2 _3 _4 \r\n \r\n _5 _* END FUNCTION |-->operation _2`VB2UML_3`VB2UML _4`VB2UML\n pre: true post: true\n activity: var _2 _4`VB2UML;\n_5`VB2UML\n return _2;\n\n _88 _1 _1 Function _2 _3 _4 \r\n \r\n _5 _* End Function |-->operation _2`VB2UML_3`VB2UML _4`VB2UML\n pre: true post: true\n activity: var _2 _4`VB2UML;\n_5`VB2UML\n return _2;\n\n -_1 FUNCTION _2 _3 _4 \r\n _5 _* END FUNCTION |-->operation _2`VB2UML_3`VB2UML _4`VB2UML\n pre: true post: true\n activity: var _2 _4`VB2UML;\n_5`VB2UML\n return _2;\n\n +_1 FUNCTION _2 _3 _4 \r\n _5 _* END FUNCTION |-->operation _2`VB2UML_3`VB2UML _4`VB2UML\n pre: true post: true\n activity: var _2 _4`VB2UML;\n_5`VB2UML\n return _2;\n\n _88 _1 _1 Function _2 _3 _4 \r\n _5 _* End Function |-->operation _2`VB2UML_3`VB2UML _4`VB2UML\n pre: true post: true\n activity: var _2 _4`VB2UML;\n_5`VB2UML\n return _2;\n\n