diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-03-02 19:10:51 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-03-08 13:31:54 (GMT) |
| commit | 4658413ff3b9551fac67907f296a586e9f2c15ed (patch) | |
| tree | 495ea78acb2a9d7463540f9e711530a0d42f3e72 /src/pyscanner.l | |
| parent | 6c06e912338176303d1a1e041a39984ff6fd42be (diff) | |
| download | Doxygen-4658413ff3b9551fac67907f296a586e9f2c15ed.zip Doxygen-4658413ff3b9551fac67907f296a586e9f2c15ed.tar.gz Doxygen-4658413ff3b9551fac67907f296a586e9f2c15ed.tar.bz2 | |
Enabled stricter compiler warnings and fixed all new warnings
Diffstat (limited to 'src/pyscanner.l')
| -rw-r--r-- | src/pyscanner.l | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/pyscanner.l b/src/pyscanner.l index 0abaae1..15e1040 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -64,6 +64,8 @@ #define YY_NO_INPUT 1 #define YY_NO_UNISTD_H 1 +#define USE_STATE2STRING 0 + /* ----------------------------------------------------------------- */ struct pyscannerYY_state @@ -72,7 +74,7 @@ struct pyscannerYY_state CommentScanner commentScanner; OutlineParserInterface *thisParser = 0; const char * inputString = 0; - int inputPosition = 0; + yy_size_t inputPosition = 0; Protection protection = Public; std::shared_ptr<Entry> current_root; std::shared_ptr<Entry> current; @@ -113,7 +115,9 @@ struct pyscannerYY_state }; //----------------------------------------------------------------------------- +#if USE_STATE2STRING static const char *stateToString(int state); +#endif static inline int computeIndent(const char *s); @@ -136,7 +140,8 @@ static void initSpecialBlock(yyscan_t yyscanner); static void searchFoundDef(yyscan_t yyscanner); static void searchFoundClass(yyscan_t yyscanner); static QCString findPackageScope(yyscan_t yyscanner,const char *fileName); -static int yyread(yyscan_t yyscanner,char *buf,int max_size); + +static yy_size_t yyread(yyscan_t yyscanner,char *buf,yy_size_t max_size); //----------------------------------------------------------------------------- /* ----------------------------------------------------------------- */ @@ -1437,10 +1442,10 @@ STARTDOCSYMS "##" //---------------------------------------------------------------------------- -static int yyread(yyscan_t yyscanner,char *buf,int max_size) +static yy_size_t yyread(yyscan_t yyscanner,char *buf,yy_size_t max_size) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - int c=0; + yy_size_t c=0; const char *p = yyextra->inputString + yyextra->inputPosition; while ( c < max_size && *p ) { *buf++ = *p++; c++; } yyextra->inputPosition+=c; @@ -1740,7 +1745,7 @@ static void parseCompounds(yyscan_t yyscanner,std::shared_ptr<Entry> rt) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; //printf("parseCompounds(%s)\n",rt->name.data()); - for (int i=0; i<rt->children().size(); ++i) + for (size_t i=0; i<rt->children().size(); ++i) { std::shared_ptr<Entry> ce = rt->children()[i]; if (!ce->program.isEmpty()) @@ -1865,7 +1870,7 @@ static void parsePrototype(yyscan_t yyscanner,const QCString &text) yyextra->packageCommentAllowed = FALSE; const char *orgInputString; - int orgInputPosition; + yy_size_t orgInputPosition; YY_BUFFER_STATE orgState; // save scanner state @@ -1951,4 +1956,6 @@ void PythonOutlineParser::parsePrototype(const char *text) //---------------------------------------------------------------------------- +#if USE_STATE2STRING #include "pyscanner.l.h" +#endif |