Commit new generated lex files

copperspice · Jan 18, 2022 · 6968d13 · 6968d13
1 parent 9f2d135
commit 6968d13
Show file tree

Hide file tree

Showing 15 changed files with 114,212 additions and 111,653 deletions.
diff --git a/src/generated/code_cstyle.cpp b/src/generated/code_cstyle.cpp
diff --git a/src/generated/code_fortran.cpp b/src/generated/code_fortran.cpp
@@ -1,6 +1,6 @@
 /************************************************************************
 *
-* Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+* Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
 * Copyright (c) 1997-2014 Dimitri van Heesch
 *
 * DoxyPress is free software: you can redistribute it and/or
@@ -34101,7 +34101,7 @@ goto find_rule; \
 char *code_fortran_YYtext;
 /*************************************************************************
  *
- * Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+ * Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
  * Copyright (c) 1997-2014 Dimitri van Heesch
  * Copyright (c) Anke Visser
 

diff --git a/src/generated/code_py.cpp b/src/generated/code_py.cpp
@@ -1,6 +1,6 @@
 /************************************************************************
 *
-* Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+* Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
 * Copyright (c) 1997-2014 Dimitri van Heesch
 *
 * DoxyPress is free software: you can redistribute it and/or
@@ -1265,7 +1265,7 @@ goto find_rule; \
 char *code_py_YYtext;
 /*************************************************************************
  *
- * Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+ * Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
  * Copyright (c) 1997-2014 Dimitri van Heesch
 
 *************************************************************************/

diff --git a/src/generated/code_xml.cpp b/src/generated/code_xml.cpp
@@ -1,6 +1,6 @@
 /************************************************************************
 *
-* Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+* Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
 * Copyright (c) 1997-2014 Dimitri van Heesch
 *
 * DoxyPress is free software: you can redistribute it and/or
@@ -531,7 +531,7 @@ int code_xmlYY_flex_debug = 0;
 char *code_xmlYYtext;
 /*************************************************************************
  *
- * Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+ * Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
  * Copyright (c) 1997-2014 Dimitri van Heesch
  * Copyright (c) Weston Thayer
 

diff --git a/src/generated/commentcnv.cpp b/src/generated/commentcnv.cpp
diff --git a/src/generated/commentscan.cpp b/src/generated/commentscan.cpp
@@ -1,6 +1,6 @@
 /************************************************************************
 *
-* Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+* Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
 * Copyright (c) 1997-2014 Dimitri van Heesch
 *
 * DoxyPress is free software: you can redistribute it and/or
@@ -3791,7 +3791,7 @@ goto find_rule; \
 char *commentscanYYtext;
 /*************************************************************************
  *
- * Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+ * Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
  * Copyright (c) 1997-2014 Dimitri van Heesch
  *
 *************************************************************************/
@@ -4486,6 +4486,15 @@ static void addCite()
    Doxy_Globals::citeDict.insert(text);
 }
 
+static void lineCount()
+{
+   // commentscan, parse_py
+
+   for (const char *p = commentscanYYtext; *p; ++p) {
+      yyLineNr += (*p == '\n');
+   }
+}
+
 // strip trailing whitespace (excluding newlines) from string s
 static void stripTrailingWhiteSpace(QString &str)
 {
@@ -5694,7 +5703,7 @@ YY_RULE_SETUP
          endBrief(true);
       }
 
-      yyLineNr += text.count('\n');
+      lineCount();
    }
 	YY_BREAK
 case 49:
@@ -5916,7 +5925,10 @@ YY_RULE_SETUP
 {
       // handle argument
       QString text  = QString::fromUtf8(commentscanYYtext);
-      current->m_entryName = substitute(text,".", "::");
+
+      lineCount();
+      current->m_entryName = substitute(removeRedundantWhiteSpace(text),".", "::");
+
       BEGIN( Comment );
    }
 	YY_BREAK
@@ -5992,7 +6004,10 @@ case 80:
 YY_RULE_SETUP
 {
       QString text = QString::fromUtf8(commentscanYYtext);
+
+      lineCount();
       current->m_entryName = substitute(removeRedundantWhiteSpace(text),".","::");
+
       BEGIN( ClassDocArg2 );
    }
 	YY_BREAK
@@ -6003,7 +6018,9 @@ YY_RULE_SETUP
       // first argument
       QString text = QString::fromUtf8(commentscanYYtext);
 
+      lineCount();
       current->m_entryName = substitute(text,".","::");
+
       if (current->section == Entry::PROTOCOLDOC_SEC) {
          current->m_entryName += "-p";
       }
@@ -6017,7 +6034,10 @@ case 82:
 YY_RULE_SETUP
 {
       QString text  = QString::fromUtf8(commentscanYYtext);
+
+      lineCount();
       current->m_entryName = substitute(text,".","::");
+
       BEGIN( ClassDocArg2 );
    }
 	YY_BREAK
@@ -6927,6 +6947,7 @@ case 166:
 YY_RULE_SETUP
 {
       s_guardExpr += QString::fromUtf8(commentscanYYtext);
+      lineCount();
    }
 	YY_BREAK
 case 167:
@@ -7001,7 +7022,7 @@ YY_RULE_SETUP
 {
       QString text = QString::fromUtf8(commentscanYYtext);
 
-      yyLineNr += text.count('\n');
+      lineCount();
       s_spaceBeforeIf.clear();
 
       BEGIN(Comment);
@@ -9227,6 +9248,10 @@ static bool handleCite(const QString &str, const QStringList &list)
 
 static bool handleFormatBlock(const QString &str, const QStringList &list)
 {
+   if (! s_spaceBeforeCmd.isEmpty()) {
+      addToOutput(s_spaceBeforeCmd);
+      s_spaceBeforeCmd.clear();
+   }
    if (list.isEmpty()) {
       addToOutput("@" + str + " ");
 

diff --git a/src/generated/constexp.cpp b/src/generated/constexp.cpp
@@ -1,6 +1,6 @@
 /************************************************************************
 *
-* Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+* Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
 * Copyright (c) 1997-2014 Dimitri van Heesch
 *
 * DoxyPress is free software: you can redistribute it and/or
@@ -555,7 +555,7 @@ int constexpYY_flex_debug = 0;
 char *constexpYYtext;
 /*************************************************************************
  *
- * Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+ * Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
  * Copyright (c) 1997-2014 Dimitri van Heesch
  *
 *************************************************************************/

diff --git a/src/generated/declinfo.cpp b/src/generated/declinfo.cpp
@@ -1,6 +1,6 @@
 /************************************************************************
 *
-* Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+* Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
 * Copyright (c) 1997-2014 Dimitri van Heesch
 *
 * DoxyPress is free software: you can redistribute it and/or
@@ -653,7 +653,7 @@ goto find_rule; \
 char *declinfoYYtext;
 /*************************************************************************
  *
- * Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+ * Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
  * Copyright (c) 1997-2014 Dimitri van Heesch
 
 *************************************************************************/

diff --git a/src/generated/default_args.cpp b/src/generated/default_args.cpp
@@ -1,6 +1,6 @@
 /************************************************************************
 *
-* Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+* Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
 * Copyright (c) 1997-2014 Dimitri van Heesch
 *
 * DoxyPress is free software: you can redistribute it and/or
@@ -859,7 +859,7 @@ goto find_rule; \
 char *default_argsYYtext;
 /*************************************************************************
  *
- * Copyright (c) 2014-2021 Barbara Geller & Ansel Sermersheim
+ * Copyright (c) 2014-2022 Barbara Geller & Ansel Sermersheim
  * Copyright (c) 1997-2014 Dimitri van Heesch
 
 *************************************************************************/
@@ -1540,36 +1540,39 @@ YY_RULE_SETUP
       QString text = QString::fromUtf8(default_argsYYtext);
       *s_copyArgValue += text[0];
 
-      // do not count '<' inside '(' for code like: "< typename A = (i < 6) >"
-      if (s_argSharpCount > 0 && s_argRoundCount == 0) {
-         s_argSharpCount--;
+      if (s_argSharpCount == 0 && s_argRoundCount > 0) {
+         // do not count '<' inside '(' for code like: "< typename A = (i < 6) >"
 
-      } else  {
-         BEGIN( s_readArgContext );
+      } else {
+         if (s_argSharpCount>0) {
+            --s_argSharpCount;
+         } else  {
+            BEGIN( s_readArgContext );
+         }
       }
    }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
 {
       QString text = QString::fromUtf8(default_argsYYtext);
-      s_argRoundCount++;
+      ++s_argRoundCount;
       *s_copyArgValue += text[0];
    }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
 {
       QString text = QString::fromUtf8(default_argsYYtext);
-      s_argRoundCount--;
+      --s_argRoundCount;
       *s_copyArgValue += text[0];
    }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
 {
       QString text = QString::fromUtf8(default_argsYYtext);
-      s_argCurlyCount++;
+      ++s_argCurlyCount;
       *s_copyArgValue += text[0];
    }
 	YY_BREAK