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

Restored contract support. Fixed error messages

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5266 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2003-11-05 21:23:56 +00:00
commit c18c2e5d9a
2 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/Modules/contract.cxx
View file

@ -432,8 +432,8 @@ 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("Require assertion violation, ");
Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name")); Printf(error_msg, "in function %s", 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);
Delete(error_msg); Delete(error_msg);
@ -444,8 +444,8 @@ 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("Inherited require assertion violation, ");
Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name")); Printf(error_msg, "in function %s", 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);
Delete(error_msg); Delete(error_msg);
@ -456,8 +456,8 @@ 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("Ensure assertion violation, ");
Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name")); Printf(error_msg, "in function of %s", 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);
Delete(error_msg); Delete(error_msg);
@ -468,8 +468,8 @@ 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("Inherited ensure assertion violation, ");
Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name")); Printf(error_msg, "in function of %s", 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);
Delete(error_msg); Delete(error_msg);
@ -480,8 +480,8 @@ 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("Invariant assertion violation, ");
Printf(error_msg, "in function of <<%s>>\\n", Getattr(n, "name")); Printf(error_msg, "in function of %s", 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);
Delete(error_msg); Delete(error_msg);
@ -557,6 +557,11 @@ int Contracts::emit_contract(Node *n) {
} }
/* Add tags and error msgs later when emit, /* Add tags and error msgs later when emit,
and keep assertions as experisions in the parse tree */ and keep assertions as experisions in the parse tree */
AssertAddTag(n);
AssertAddErrorMsg(n);
AssertSetParms(n);
return ret; return ret;
} }

11
Source/Modules/emit.cxx
View file

@ -429,17 +429,6 @@ void emit_action(Node *n, Wrapper *f) {
/* Emit contract code (if any) */ /* Emit contract code (if any) */
if (Swig_contract_mode_get()) { if (Swig_contract_mode_get()) {
/* Modify contracts */
/* This code is broken.
Contracts *a = new Contracts;
if (Getattr(n, "feature:contract")) {
a->AssertAddTag(n);
a->AssertAddErrorMsg(n);
a->AssertSetParms(n);
}
delete a;
*/
/* Preassertion */ /* Preassertion */
tm = Getattr(n, "feature:preassert"); tm = Getattr(n, "feature:preassert");