Merge pull request #28 from robotpy/fix-final-as-name

Allow using 'final' as a name in some contexts

cxxheaderparser/parser.py

@@ -1250,7 +1250,16 @@ class CxxParser:
         return parts
 
     _pqname_start_tokens = (
-        {"auto", "decltype", "NAME", "operator", "template", "typename", "DBL_COLON"}
+        {
+            "auto",
+            "decltype",
+            "NAME",
+            "operator",
+            "template",
+            "typename",
+            "DBL_COLON",
+            "final",
+        }
         | _name_compound_start
         | _fundamentals
     )
@@ -1463,7 +1472,7 @@ class CxxParser:
             self.lex.return_tokens(toks[1:-1])
 
         # optional name
-        tok = self.lex.token_if("NAME")
+        tok = self.lex.token_if("NAME", "final")
         if tok:
             param_name = tok.value
 

tests/test_misc.py

@@ -1,15 +1,20 @@
 # Note: testcases generated via `python -m cxxheaderparser.gentest`
 
 from cxxheaderparser.types import (
+    BaseClass,
+    ClassDecl,
     Function,
     FundamentalSpecifier,
     NameSpecifier,
     PQName,
     Parameter,
+    Token,
     Type,
+    Value,
     Variable,
 )
 from cxxheaderparser.simple import (
+    ClassScope,
     Include,
     NamespaceScope,
     Pragma,
@@ -168,3 +173,66 @@ def test_comment_eof():
     assert data == ParsedData(
         namespace=NamespaceScope(namespaces={"a": NamespaceScope(name="a")})
     )
+
+
+def test_final():
+    content = """
+      // ok here
+      int fn(const int final);
+      
+      // ok here
+      int final = 2;
+      
+      // but it's a keyword here
+      struct B final : A {};
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            classes=[
+                ClassScope(
+                    class_decl=ClassDecl(
+                        typename=PQName(
+                            segments=[NameSpecifier(name="B")], classkey="struct"
+                        ),
+                        bases=[
+                            BaseClass(
+                                access="public",
+                                typename=PQName(segments=[NameSpecifier(name="A")]),
+                            )
+                        ],
+                        final=True,
+                    )
+                )
+            ],
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="int")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="fn")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(
+                                typename=PQName(
+                                    segments=[FundamentalSpecifier(name="int")]
+                                ),
+                                const=True,
+                            ),
+                            name="final",
+                        )
+                    ],
+                )
+            ],
+            variables=[
+                Variable(
+                    name=PQName(segments=[NameSpecifier(name="final")]),
+                    type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="int")])
+                    ),
+                    value=Value(tokens=[Token(value="2")]),
+                )
+            ],
+        )
+    )