Skip to content

Commit 603ed23

Browse files
fix: fix cffi define pattern
1 parent 2a77b5e commit 603ed23

File tree

1 file changed

+46
-1
lines changed

1 file changed

+46
-1
lines changed

sciencemode/_cffi.py

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,54 @@
4646
smpt_include_path4 = os.path.join(include_dir, "dyscom-level")
4747

4848
INCLUDE_PATTERN = re.compile(r"(-I)?(.*ScienceMode)")
49-
DEFINE_PATTERN = re.compile(r"^#define\s+(\w+)\s+\(?([\w<|.]+)\)?", re.M)
49+
DEFINE_PATTERN = re.compile(r"^#define\s+(\w+)\s+\(?([\w<|.\-+*/()\s]+)\)?", re.M)
5050
DEFINE_BLACKLIST = {
5151
"main",
52+
# Header guard defines that should not be treated as constants
53+
"SMPT_API",
54+
"SMPT_CLIENT_CMD_LISTS_H",
55+
"SMPT_CLIENT_DATA_H",
56+
"SMPT_CLIENT_H",
57+
"SMPT_CLIENT_POWER_H",
58+
"SMPT_CLIENT_UTILS_H",
59+
"SMPT_DEFINITIONS_DATA_TYPES_H",
60+
"SMPT_DEFINITIONS_FILE_TRANSFER_H",
61+
"SMPT_DEFINITIONS_H",
62+
"SMPT_DEFINITIONS_INTERNAL_H",
63+
"SMPT_DEFINITIONS_POWER_H",
64+
"SMPT_DL_DEFINITIONS_DATA_TYPES_H",
65+
"SMPT_DL_DEFINITIONS_H",
66+
"SMPT_DL_PACKET_CLIENT_H",
67+
"SMPT_DL_PACKET_VALIDITY_H",
68+
"SMPT_DL_SERVER_H",
69+
"SMPT_FILE_H",
70+
"SMPT_LL_DEFINITIONS_DATA_TYPES_H",
71+
"SMPT_LL_DEFINITIONS_H",
72+
"SMPT_LL_MESSAGES_H",
73+
"SMPT_LL_PACKET_CLIENT_H",
74+
"SMPT_LL_PACKET_INTERNAL_H",
75+
"SMPT_LL_PACKET_VALIDITY_H",
76+
"SMPT_LL_SERIAL_PORT_LINUX_H",
77+
"SMPT_LL_SERIAL_PORT_WINDOWS_H",
78+
"SMPT_LL_SERVER_H",
79+
"SMPT_MESSAGES_H",
80+
"SMPT_ML_DEFINITIONS_DATA_TYPES_H",
81+
"SMPT_ML_DEFINITIONS_H",
82+
"SMPT_ML_PACKET_CLIENT_H",
83+
"SMPT_ML_PACKET_SERVER_H",
84+
"SMPT_ML_PACKET_UTILS_H",
85+
"SMPT_ML_PACKET_VALIDITY_H",
86+
"SMPT_PACKET_CLIENT_H",
87+
"SMPT_PACKET_GENERAL_H",
88+
"SMPT_PACKET_INPUT_BUFFER_DEFINITIONS_H",
89+
"SMPT_PACKET_INPUT_BUFFER_H",
90+
"SMPT_PACKET_INPUT_BUFFER_INTERNAL_H",
91+
"SMPT_PACKET_NUMBER_GENERATOR_H",
92+
"SMPT_PACKET_OUTPUT_BUFFER_H",
93+
"SMPT_PACKET_SERVER_H",
94+
"SMPT_PACKET_UTILS_H",
95+
"SMPT_PACKET_VALIDITY_H",
96+
"SMPT_SERIAL_PORT_H",
5297
}
5398

5499
# Define GCC specific compiler extensions away - simplified + minimal bool

0 commit comments

Comments
 (0)