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

Clean up uses of Replace()

Browse source 
We were passing flags of DOH_REPLACE_ANY|DOH_REPLACE_FIRST in three
places, which doesn't make sense as those are mutually exclusive
concepts.  In the current implementation DOH_REPLACE_FIRST wins in
this situation, so replace with that and clarify the docs.
This commit is contained in:
Olly Betts 2022-02-06 09:54:21 +13:00
commit 9d7c962ee8
4 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Doc/Manual/Extending.html
View file

@ -1132,6 +1132,11 @@ DOH_REPLACE_FIRST - Replace first occurrence only.
Returns the number of replacements made (if any). Returns the number of replacements made (if any).
</p> </p>
<p>
At most one of <tt>DOH_REPLACE_ANY</tt> and <tt>DOH_REPLACE_FIRST</tt> should be specified.
<tt>DOH_REPLACE_ANY</tt> is the default if neither is specified.
</p>
</div> </div>
<H3><a name="Extending_nn16">40.5.2 Hashes</a></H3> <H3><a name="Extending_nn16">40.5.2 Hashes</a></H3>

2
Source/CParse/templ.c
View file

@ -249,7 +249,7 @@ String *partial_arg(String *s, String *p) {
} }
prefix = NewStringWithSize(cp, (int)(c - cp)); prefix = NewStringWithSize(cp, (int)(c - cp));
newarg = Copy(s); newarg = Copy(s);
Replace(newarg, prefix, "", DOH_REPLACE_ANY | DOH_REPLACE_FIRST); Replace(newarg, prefix, "", DOH_REPLACE_FIRST);
Delete(prefix); Delete(prefix);
return newarg; return newarg;
} }

2
Source/Modules/main.cxx
View file

@ -477,7 +477,7 @@ static void getoptions(int argc, char *argv[]) {
Swig_mark_arg(i); Swig_mark_arg(i);
} else if (strncmp(argv[i], "-D", 2) == 0) { } else if (strncmp(argv[i], "-D", 2) == 0) {
String *d = NewString(argv[i] + 2); String *d = NewString(argv[i] + 2);
Replace(d, "=", " ", DOH_REPLACE_ANY | DOH_REPLACE_FIRST); Replace(d, "=", " ", DOH_REPLACE_FIRST);
Preprocessor_define((DOH *) d, 0); Preprocessor_define((DOH *) d, 0);
Delete(d); Delete(d);
// Create a symbol // Create a symbol

2
Source/Modules/ocaml.cxx
View file

@ -407,7 +407,7 @@ public:
printf("Fatal error. SwigType_del_pointer applied to non-pointer.\n"); printf("Fatal error. SwigType_del_pointer applied to non-pointer.\n");
abort(); abort();
} }
Replace(t, "r.", "", DOH_REPLACE_ANY | DOH_REPLACE_FIRST); Replace(t, "r.", "", DOH_REPLACE_FIRST);
} }
void oc_SwigType_del_array(SwigType *t) { void oc_SwigType_del_array(SwigType *t) {