jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modified contract output format

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5079 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Tiger Feng 2003-09-05 19:11:11 +00:00
commit 04d557113f
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
SWIG/Source/Modules/contract.cxx
View file

@ -395,7 +395,7 @@ int Contracts::AssertAddErrorMsg(Node *n) {
str_assert = NewString(Getattr(n, "feature:preassert")); str_assert = NewString(Getattr(n, "feature:preassert"));
Replaceall(str_assert, ");\n", ""); Replaceall(str_assert, ");\n", "");
if (Len(str_assert)) { if (Len(str_assert)) {
error_msg = NewString("\\nRequire assertion violation,"); error_msg = NewString("\\nRequire assertion violation, ");
Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name")); Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name"));
Printf(str_assert, ", \"%s\");\n", error_msg); Printf(str_assert, ", \"%s\");\n", error_msg);
Setattr(n, "feature:preassert", str_assert); Setattr(n, "feature:preassert", str_assert);
@ -407,7 +407,7 @@ int Contracts::AssertAddErrorMsg(Node *n) {
str_assert = NewString(Getattr(n, "feature:inherit_preassert")); str_assert = NewString(Getattr(n, "feature:inherit_preassert"));
Replaceall(str_assert, ");\n", ""); Replaceall(str_assert, ");\n", "");
if (Len(str_assert)) { if (Len(str_assert)) {
error_msg = NewString("\\nInherited require assertion violation,"); error_msg = NewString("\\nInherited require assertion violation, ");
Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name")); Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name"));
Printf(str_assert, ", \"%s\");\n", error_msg); Printf(str_assert, ", \"%s\");\n", error_msg);
Setattr(n, "feature:inherit_preassert", str_assert); Setattr(n, "feature:inherit_preassert", str_assert);
@ -419,7 +419,7 @@ int Contracts::AssertAddErrorMsg(Node *n) {
str_assert = NewString(Getattr(n, "feature:postassert")); str_assert = NewString(Getattr(n, "feature:postassert"));
Replaceall(str_assert, ");\n", ""); Replaceall(str_assert, ");\n", "");
if (Len(str_assert)) { if (Len(str_assert)) {
error_msg = NewString("\\nEnsure assertion violation,"); error_msg = NewString("\\nEnsure assertion violation, ");
Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name")); Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name"));
Printf(str_assert, ", \"%s\");\n", error_msg); Printf(str_assert, ", \"%s\");\n", error_msg);
Setattr(n, "feature:postassert", str_assert); Setattr(n, "feature:postassert", str_assert);
@ -431,7 +431,7 @@ int Contracts::AssertAddErrorMsg(Node *n) {
str_assert = NewString(Getattr(n, "feature:inherit_postassert")); str_assert = NewString(Getattr(n, "feature:inherit_postassert"));
Replaceall(str_assert, ");\n", ""); Replaceall(str_assert, ");\n", "");
if (Len(str_assert)) { if (Len(str_assert)) {
error_msg = NewString("\\nInherited ensure assertion violation,"); error_msg = NewString("\\nInherited ensure assertion violation, ");
Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name")); Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name"));
Printf(str_assert, ", \"%s\");\n", error_msg); Printf(str_assert, ", \"%s\");\n", error_msg);
Setattr(n, "feature:inherit_postassert", str_assert); Setattr(n, "feature:inherit_postassert", str_assert);
@ -443,7 +443,7 @@ int Contracts::AssertAddErrorMsg(Node *n) {
str_assert = NewString(Getattr(n, "feature:invariant")); str_assert = NewString(Getattr(n, "feature:invariant"));
Replaceall(str_assert, ");\n", ""); Replaceall(str_assert, ");\n", "");
if (Len(str_assert)) { if (Len(str_assert)) {
error_msg = NewString("\\nInvariant assertion violation,"); error_msg = NewString("\\nInvariant assertion violation, ");
Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name")); Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name"));
Printf(str_assert, ", \"%s\");\n", error_msg); Printf(str_assert, ", \"%s\");\n", error_msg);
Setattr(n, "feature:invariant", str_assert); Setattr(n, "feature:invariant", str_assert);

12
SWIG/Source/Modules/emit.cxx
View file

@ -512,17 +512,17 @@ void emit_action(Node *n, Wrapper *f) {
Replaceid(tm, "SWIG_invariant", "SWIG_invariant_end"); Replaceid(tm, "SWIG_invariant", "SWIG_invariant_end");
Printv(f->code,tm,"\n",NIL); Printv(f->code,tm,"\n",NIL);
} }
/* Inherit Postassertion */
tm = Getattr(n, "feature:inherit_postassert");
if (Len(tm)) {
replace_contract_args(Getmeta(tm,"parms"), Getattr(n,"parms"),tm);
Printv(f->code,tm,"\n",NIL);
}
/* Postassertion */ /* Postassertion */
tm = Getattr(n, "feature:postassert"); tm = Getattr(n, "feature:postassert");
if (Len(tm)) { if (Len(tm)) {
replace_contract_args(Getmeta(tm,"parms"), Getattr(n,"parms"),tm); replace_contract_args(Getmeta(tm,"parms"), Getattr(n,"parms"),tm);
Printv(f->code,tm,"\n",NIL); Printv(f->code,tm,"\n",NIL);
} }
/* Inherit Postassertion */
tm = Getattr(n, "feature:inherit_postassert");
if (Len(tm)) {
replace_contract_args(Getmeta(tm,"parms"), Getattr(n,"parms"),tm);
Printv(f->code,tm,"\n",NIL);
}
} }
} }