From d3095144e1c04b4e8c33fd43ad08b9db9f63b084 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 23 Nov 2022 19:57:20 +0000 Subject: [PATCH] Optimise SwigType_base implementation Also fixes assumption that templates start '<' instead of '<('. Checked java and python test-suite - no changes in output. --- Source/Swig/typeobj.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index 584e2424b..088497fa5 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -1181,20 +1181,9 @@ SwigType *SwigType_base(const SwigType *t) { c++; continue; } - if (*c == '<') { - /* Skip over template---it's part of the base name */ - int ntemp = 1; - c++; - while ((*c) && (ntemp > 0)) { - if (*c == '>') - ntemp--; - else if (*c == '<') - ntemp++; - c++; - } - if (ntemp) - break; - continue; + if (*c == '<' && *(c + 1) == '(') { + /* start of template parameters --- the remainder is part of the base */ + break; } if (*c == '(') { /* Skip over params */