cxxheaderparser 1.3.0__tar.gz → 1.3.2__tar.gz

{cxxheaderparser-1.3.0 → cxxheaderparser-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cxxheaderparser
-Version: 1.3.0
+Version: 1.3.2
 Summary: Parse C++ header files and generate a data structure representing the class
 Home-page: https://github.com/robotpy/cxxheaderparser
 Author: Dustin Spicuzza

{cxxheaderparser-1.3.0 → cxxheaderparser-1.3.2}/cxxheaderparser/lexer.py

@@ -225,18 +225,18 @@ class PlyLexer:
     #
 
     hex_prefix = "0[xX]"
-    hex_digits = "[0-9a-fA-F]+"
+    hex_digits = "[0-9a-fA-F']+"
     bin_prefix = "0[bB]"
-    bin_digits = "[01]+"
+    bin_digits = "[01']+"
 
     # integer constants (K&R2: A.2.5.1)
     integer_suffix_opt = (
         r"(([uU]ll)|([uU]LL)|(ll[uU]?)|(LL[uU]?)|([uU][lL])|([lL][uU]?)|[uU])?"
     )
     decimal_constant = (
-        "(0" + integer_suffix_opt + ")|([1-9][0-9]*" + integer_suffix_opt + ")"
+        "(0" + integer_suffix_opt + ")|([1-9][0-9']*" + integer_suffix_opt + ")"
     )
-    octal_constant = "0[0-7]*" + integer_suffix_opt
+    octal_constant = "0[0-7']*" + integer_suffix_opt
     hex_constant = hex_prefix + hex_digits + integer_suffix_opt
     bin_constant = bin_prefix + bin_digits + integer_suffix_opt
 

{cxxheaderparser-1.3.0 → cxxheaderparser-1.3.2}/cxxheaderparser/parser.py

@@ -1041,7 +1041,9 @@ class CxxParser:
     ) -> None:
         self.state.location = tok.location
 
-        tok = self._next_token_must_be("NAME", "DBL_COLON", "namespace", "typename")
+        tok = self._next_token_must_be(
+            "NAME", "DBL_COLON", "namespace", "typename", "enum"
+        )
 
         if tok.type == "namespace":
             if template:

{cxxheaderparser-1.3.0 → cxxheaderparser-1.3.2}/cxxheaderparser/version.py

@@ -1,2 +1,2 @@
 # Autogenerated by setup.py
-__version__ = '1.3.0'
+__version__ = '1.3.2'

{cxxheaderparser-1.3.0 → cxxheaderparser-1.3.2}/cxxheaderparser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cxxheaderparser
-Version: 1.3.0
+Version: 1.3.2
 Summary: Parse C++ header files and generate a data structure representing the class
 Home-page: https://github.com/robotpy/cxxheaderparser
 Author: Dustin Spicuzza

{cxxheaderparser-1.3.0 → cxxheaderparser-1.3.2}/cxxheaderparser.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ tests/test_fn.py
 tests/test_friends.py
 tests/test_misc.py
 tests/test_namespaces.py
+tests/test_numeric_literals.py
 tests/test_operators.py
 tests/test_preprocessor.py
 tests/test_skip.py

cxxheaderparser-1.3.2/tests/test_numeric_literals.py

@@ -0,0 +1,60 @@
+# Note: testcases generated via `python -m cxxheaderparser.gentest`
+
+from cxxheaderparser.types import (
+    FundamentalSpecifier,
+    NameSpecifier,
+    PQName,
+    Token,
+    Type,
+    Value,
+    Variable,
+)
+from cxxheaderparser.simple import (
+    Include,
+    NamespaceScope,
+    Pragma,
+    parse_string,
+    ParsedData,
+)
+
+
+def test_numeric_literals() -> None:
+    content = """
+      #pragma once
+      #include <cstdint>
+
+      int test_binary = 0b01'10'01;
+      int test_decimal = 123'456'789u;
+      int test_octal = 012'42'11l;
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            variables=[
+                Variable(
+                    name=PQName(segments=[NameSpecifier(name="test_binary")]),
+                    type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="int")])
+                    ),
+                    value=Value(tokens=[Token(value="0b01'10'01")]),
+                ),
+                Variable(
+                    name=PQName(segments=[NameSpecifier(name="test_decimal")]),
+                    type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="int")])
+                    ),
+                    value=Value(tokens=[Token(value="123'456'789u")]),
+                ),
+                Variable(
+                    name=PQName(segments=[NameSpecifier(name="test_octal")]),
+                    type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="int")])
+                    ),
+                    value=Value(tokens=[Token(value="012'42'11l")]),
+                ),
+            ]
+        ),
+        pragmas=[Pragma(content=Value(tokens=[Token(value="once")]))],
+        includes=[Include(filename="<cstdint>")],
+    )

{cxxheaderparser-1.3.0 → cxxheaderparser-1.3.2}/tests/test_using.py

@@ -716,3 +716,64 @@ def test_using_typename_in_class() -> None:
             ]
         )
     )
+
+
+def test_using_enum_global() -> None:
+    content = """
+      namespace A {
+      using enum B::C;
+      }
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            namespaces={
+                "A": NamespaceScope(
+                    name="A",
+                    using=[
+                        UsingDecl(
+                            typename=PQName(
+                                segments=[
+                                    NameSpecifier(name="B"),
+                                    NameSpecifier(name="C"),
+                                ],
+                                classkey="enum",
+                            )
+                        )
+                    ],
+                )
+            }
+        )
+    )
+
+
+def test_using_enum_in_struct() -> None:
+    content = """
+      struct S {
+        using enum fruit;
+      };
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            classes=[
+                ClassScope(
+                    class_decl=ClassDecl(
+                        typename=PQName(
+                            segments=[NameSpecifier(name="S")], classkey="struct"
+                        )
+                    ),
+                    using=[
+                        UsingDecl(
+                            typename=PQName(
+                                segments=[NameSpecifier(name="fruit")], classkey="enum"
+                            ),
+                            access="public",
+                        )
+                    ],
+                )
+            ]
+        )
+    )