Add typedef parsing

Author: andreax79

cstruct/c_parser.py

@@ -160,6 +160,22 @@ def parse_type(tokens: Tokens, __cls__: Type['AbstractCStruct'], byte_order: Opt
     return FieldType(kind, c_type, ref, vlen, flexible_array, byte_order, offset)
 
 
+def parse_typedef(tokens: Tokens, __cls__: Type['AbstractCStruct'], byte_order: Optional[str]) -> None:
+    field_type = parse_type(tokens, __cls__, byte_order, 0)
+    vname = tokens.pop()
+    if field_type.ref is None:
+        TYPEDEFS[vname] = field_type.c_type
+    elif field_type.ref.__is_enum__:
+        TYPEDEFS[vname] = f"enum {field_type.ref.__name__}"
+    elif field_type.ref.__is_union__:
+        TYPEDEFS[vname] = f"union {field_type.ref.__name__}"
+    else:
+        TYPEDEFS[vname] = f"struct {field_type.ref.__name__}"
+    t = tokens.pop()
+    if t != ';':
+        raise ParserError(f"; expected but {t} found")
+
+
 def parse_struct_def(
     __def__: Union[str, Tokens],
     __cls__: Type['AbstractCStruct'],
@@ -174,10 +190,13 @@ def parse_struct_def(
     if not tokens:
         return None
     kind = tokens.pop()
+    if kind == 'typedef':
+        parse_typedef(tokens, __cls__, __byte_order__)
+        return parse_struct_def(tokens, __cls__, __byte_order__, **kargs)
     if kind == 'enum':
         return parse_enum_def(__def__, **kargs)
     if kind not in ['struct', 'union']:
-        raise ParserError("struct, union, or enum expected - {kind}")
+        raise ParserError(f"struct, union, or enum expected - {kind}")
     __is_union__ = kind == 'union'
     vtype = tokens.pop()
     if tokens.get() == '{':  # Named nested struct

tests/test_typdef.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+# *****************************************************************************
+#
+# Copyright (c) 2013-2019 Andrea Bonomi <andrea.bonomi@gmail.com>
+#
+# Published under the terms of the MIT license.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+# *****************************************************************************
+
+from cstruct import MemCStruct, NATIVE_ORDER
+from cstruct.base import TYPEDEFS
+
+class ExitStatus(MemCStruct):
+    __def__ = """
+        struct ExitStatus {
+            short   e_termination;      /* Process termination status.  */
+            short   e_exit;             /* Process exit status.  */
+        }
+    """
+
+class Utmp(MemCStruct):
+    __byte_order__ = NATIVE_ORDER
+    __def__ = """
+        #define UT_NAMESIZE 32
+        #define UT_LINESIZE 32
+        #define UT_HOSTSIZE 256
+
+        typedef int pid_t;
+        typedef long time_t;
+        typedef unsigned long int ulong;
+        typedef struct ExitStatus ExitStatus;
+
+        struct {
+            short   ut_type;              /* Type of record */
+            pid_t   ut_pid;               /* PID of login process */
+            char    ut_line[UT_LINESIZE]; /* Device name of tty - "/dev/" */
+            char    ut_id[4];             /* Terminal name suffix, or inittab(5) ID */
+            char    ut_user[UT_NAMESIZE]; /* Username */
+            char    ut_host[UT_HOSTSIZE]; /* Hostname for remote login, or kernel version for run-level messages */
+            ExitStatus ut_exit;           /* Exit status of a process marked as DEAD_PROCESS; not used by Linux init (1 */
+            int32_t ut_session;           /* Session ID (getsid(2)), used for windowing */
+            struct {
+               int32_t tv_sec;            /* Seconds */
+               int32_t tv_usec;           /* Microseconds */
+            } ut_tv;                      /* Time entry was made */
+            int32_t ut_addr_v6[4];        /* Internet address of remote host; IPv4 address uses just ut_addr_v6[0] */
+            char __unused[20];            /* Reserved for future use */
+        }
+    """
+
+def test_typedef():
+    assert TYPEDEFS['pid_t'] == 'int'
+    assert TYPEDEFS['time_t'] == 'long'
+    assert TYPEDEFS['ulong'] == 'unsigned long'
+    assert TYPEDEFS['ExitStatus'] == 'struct ExitStatus'