diff --git a/Source/Modules/contract.cxx b/Source/Modules/contract.cxx index 146f6eeda..a2f83b631 100644 --- a/Source/Modules/contract.cxx +++ b/Source/Modules/contract.cxx @@ -395,7 +395,7 @@ int Contracts::AssertAddErrorMsg(Node *n) { str_assert = NewString(Getattr(n, "feature:preassert")); Replaceall(str_assert, ");\n", ""); 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(str_assert, ", \"%s\");\n", error_msg); Setattr(n, "feature:preassert", str_assert); @@ -407,7 +407,7 @@ int Contracts::AssertAddErrorMsg(Node *n) { str_assert = NewString(Getattr(n, "feature:inherit_preassert")); Replaceall(str_assert, ");\n", ""); 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(str_assert, ", \"%s\");\n", error_msg); Setattr(n, "feature:inherit_preassert", str_assert); @@ -419,7 +419,7 @@ int Contracts::AssertAddErrorMsg(Node *n) { str_assert = NewString(Getattr(n, "feature:postassert")); Replaceall(str_assert, ");\n", ""); 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(str_assert, ", \"%s\");\n", error_msg); Setattr(n, "feature:postassert", str_assert); @@ -431,7 +431,7 @@ int Contracts::AssertAddErrorMsg(Node *n) { str_assert = NewString(Getattr(n, "feature:inherit_postassert")); Replaceall(str_assert, ");\n", ""); 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(str_assert, ", \"%s\");\n", error_msg); Setattr(n, "feature:inherit_postassert", str_assert); @@ -443,7 +443,7 @@ int Contracts::AssertAddErrorMsg(Node *n) { str_assert = NewString(Getattr(n, "feature:invariant")); Replaceall(str_assert, ");\n", ""); 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(str_assert, ", \"%s\");\n", error_msg); Setattr(n, "feature:invariant", str_assert); diff --git a/Source/Modules/emit.cxx b/Source/Modules/emit.cxx index f204d9bbd..26c2ffab5 100644 --- a/Source/Modules/emit.cxx +++ b/Source/Modules/emit.cxx @@ -512,17 +512,17 @@ void emit_action(Node *n, Wrapper *f) { Replaceid(tm, "SWIG_invariant", "SWIG_invariant_end"); 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 */ tm = Getattr(n, "feature:postassert"); if (Len(tm)) { replace_contract_args(Getmeta(tm,"parms"), Getattr(n,"parms"),tm); 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); + } } }