Skip to content

Commit ad760a0

Browse files
davidmalcolmdavidmalcolm
committed
mass renaming of python symbols to use PyGcc_CamelCase
Now that the gcc-c-api code is merged, make it easy to tell the gcc-c-api code apart from the Python plugin code by using a different naming convention for the latter, in this case using PyGcc as a prefix, CamelCase, and a single underscore separating the primary "scope" part of the name from the secondary "specifics" part. Also, make type objects have a "_TypeObj" suffix, to help make it easier to deal with e.g. the type object for gcc.Type (aka "PyGccType_TypeObj"). This commit was autogenerated on top of 27db1f4 using the following script: import glob substs = [ ("gcc_python_make_wrapper_cgraph_edge", "PyGccCallgraphEdge_New"), ("gcc_python_make_wrapper_cgraph_node", "PyGccCallgraphNode_New"), ("gcc_python_make_wrapper_cfg", "PyGccCfg_New"), ("gcc_python_make_wrapper_basic_block", "PyGccBasicBlock_New"), ("gcc_python_make_wrapper_edge", "PyGccEdge_New"), ("gcc_python_make_wrapper_function", "PyGccFunction_New"), ("gcc_python_make_wrapper_opt_code", "PyGccOption_New"), ("gcc_python_make_wrapper_param_num", "PyGccParameter_New"), ("gcc_python_make_wrapper_variable", "PyGccVariable_New"), ("gcc_python_make_wrapper_location", "PyGccLocation_New"), ("gcc_python_make_wrapper_gimple", "PyGccGimple_New"), ("gcc_python_make_wrapper_gimple_phi", "PyGccGimplePhi_New"), ("gcc_python_make_wrapper_rtl", "PyGccRtl_New"), ("gcc_python_make_wrapper_tree_unique", "PyGccTree_NewUnique"), ("gcc_python_make_wrapper_tree", "PyGccTree_New"), ("gcc_python_make_wrapper_pass", "PyGccPass_New"), ("gcc_python_lazily_create_wrapper", "PyGcc_LazilyCreateWrapper"), ('gcc_python_wrapper_track', 'PyGccWrapper_Track'), ('gcc_python_wrapper_dealloc', 'PyGccWrapper_Dealloc'), ('wrtp_mark_for_', 'PyGcc_WrtpMarkFor'), ('gcc_FunctionType', 'PyGccFunction_TypeObj'), ('gcc_PassType', 'PyGccPass_TypeObj'), ('gcc_TreeType', 'PyGccTree_TypeObj'), ('gcc_Callgraph', 'PyGccCallgraph'), ('gcc_Pass', 'PyGccPass'), ('gcc_GimplePass', 'PyGccGimplePass'), ('gcc_GimplePass', 'PyGccGimplePass'), ('gcc_RtlPass', 'PyGccRtlPass'), ('gcc_SimpleIpaPass', 'PyGccSimpleIpaPass'), ('gcc_IpaPass', 'PyGccIpaPass'), ('gcc_Location', 'PyGccLocation'), ('gcc_Gimple', 'PyGccGimple'), ('gcc_Edge', 'PyGccEdge'), ('gcc_BasicBlock', 'PyGccBasicBlock'), ('gcc_Cfg', 'PyGccCfg'), ('gcc_Function', 'PyGccFunction'), ('gcc_Option', 'PyGccOption'), ('gcc_Parameter', 'PyGccParameter'), ('gcc_Rtl', 'PyGccRtl'), ('gcc_Tree', 'PyGccTree'), ('gcc_Variable', 'PyGccVariable'), ('gcc_IdentifierNode', 'PyGccIdentifierNode'), ('gcc_Type', 'PyGccType'), ('gcc_IntegerType', 'PyGccIntegerType'), ('gcc_MethodType', 'PyGccMethodType'), ('gcc_StringConstant', 'PyGccStringConstant'), ('gcc_TypeDecl', 'PyGccTypeDecl'), ('gcc_SsaName', 'PyGccSsaName'), ("gcc_module_def", "module_def"), ("gcc_python_finish_invoking_callback", "PyGcc_FinishInvokingCallback"), ("gcc_python_register_attribute", "PyGcc_RegisterAttribute"), ("gcc_python_register_callback", "PyGcc_RegisterCallback"), ("gcc_python_is_within_event", "PyGcc_IsWithinEvent"), ("gcc_python_closure_make_args", "PyGcc_Closure_MakeArgs"), ("gcc_python_closure_new_for_plugin_event", "PyGcc_Closure_NewForPluginEvent"), ("gcc_python_print_exception", "PyGcc_PrintException"), ("gcc_python_callback_for_", "PyGcc_CallbackFor_"), ("gcc_python_string_from_format", "PyGccString_FromFormat"), ("gcc_python_string_from_string", "PyGccString_FromString"), ("gcc_python_string_from_string_and_size", "PyGccString_FromStringAndSize"), ("gcc_python_string_as_string", "PyGccString_AsString"), ("gcc_python_int_from_long", "PyGccInt_FromLong"), ("gcc_python_int_check", "PyGccInt_Check"), ("gcc_python_int_as_long", "PyGccInt_AsLong"), ("gcc_python_string_or_none", "PyGccStringOrNone"), ("gcc_python_double_int_as_text", "PyGcc_DoubleIntAsText"), ('gcc_python_get_callgraph_nodes', 'PyGcc_get_callgraph_nodes'), ('gcc_python_permerror', 'PyGcc_permerror'), ('gcc_python_error', 'PyGcc_error'), ('gcc_python_warning', 'PyGcc_warning'), ('gcc_python_inform', 'PyGcc_inform'), ('gcc_ArrayRef', 'PyGccArrayRef'), ('gcc_ComponentRef', 'PyGccComponentRef'), ('gcc_Declaration', 'PyGccDeclaration'), ('gcc_Constructor', 'PyGccConstructor'), ('gcc_IntegerCst', 'PyGccIntegerCst'), ('gcc_IntegerConstant', 'PyGccIntegerConstant'), ('gcc_RealCst', 'PyGccRealCst'), ('gcc_CaseLabelExpr', 'PyGccCaseLabelExpr'), ('gcc_NamespaceDecl', 'PyGccNamespaceDecl'), ('gcc_python_namespace_decl', 'PyGccNamespaceDecl'), ('gcc_LabelDecl', 'PyGccLabelDecl'), ('gcc_PrettyPrinterType', 'PyGccPrettyPrinter_TypeObj'), ('gcc_python_pretty_printer_new', 'PyGccPrettyPrinter_New'), ('gcc_python_pretty_printer_as_', 'PyGccPrettyPrinter_as_'), ('gcc_PrettyPrinter_dealloc', 'PyGccPrettyPrinter_dealloc'), ('gcc_tree_list_from_chain', 'PyGcc_TreeListFromChain'), ('gcc_python_tree_make_list_from_tree_list_chain', 'PyGcc_TreeMakeListFromTreeList'), ('gcc_python_tree_make_list_of_pairs_from_tree_list_chain', 'PyGcc_TreeMakeListOfPairsFromTreeListChain'), ('gcc_python_', 'PyGcc_'), ('Type,', '_TypeObj,'), ('Type)', '_TypeObj)'), ('Type;', '_TypeObj;'), ('PyType__TypeObj', 'PyType_Type'), ] for filename in (glob.glob("*.[c|h]") + glob.glob('generate-*.py') + ['wrapperbuilder.py', 'cpybuilder.py']): with open(filename) as f: content = f.read() for before, after in substs: content = content.replace(before, after) with open(filename, 'w') as f: f.write(content)
1 parent 27db1f4 commit ad760a0

36 files changed

+965
-965
lines changed

‎cpybuilder.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ def add_simple_int_setter(self, identifier, typename, attrname, c_assignment):
458458
by a PyGetSetDef
459459
"""
460460
return self.add_simple_setter(identifier, typename, attrname,
461-
'gcc_python_int_check',
461+
'PyGccInt_Check',
462462
c_assignment)
463463

464464
class SimpleModule:

‎gcc-python-attribute.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ make_args_for_attribute_callback(tree node, tree args)
4848
Py_ssize_t i;
4949

5050
/* Walk "args" (a tree_list), converting to a python list of wrappers */
51-
list_args = gcc_python_tree_make_list_from_tree_list_chain(args);
51+
list_args = PyGcc_TreeMakeListFromTreeList(args);
5252
if (!list_args) {
5353
goto error;
5454
}
@@ -58,7 +58,7 @@ make_args_for_attribute_callback(tree node, tree args)
5858
goto error;
5959
}
6060

61-
py_node = gcc_python_make_wrapper_tree(gcc_private_make_tree(node));
61+
py_node = PyGccTree_New(gcc_private_make_tree(node));
6262
if (!py_node) {
6363
goto error;
6464
}
@@ -149,7 +149,7 @@ handle_python_attribute(tree *node, tree name, tree args,
149149
}
150150

151151
PyObject*
152-
gcc_python_register_attribute(PyObject *self, PyObject *args, PyObject *kwargs)
152+
PyGcc_RegisterAttribute(PyObject *self, PyObject *args, PyObject *kwargs)
153153
{
154154
const char *name;
155155
int min_length;
@@ -209,7 +209,7 @@ gcc_python_register_attribute(PyObject *self, PyObject *args, PyObject *kwargs)
209209
struct attribute_spec, so we have to cast away the constness, leading
210210
to the following deeply ugly code:
211211
*/
212-
*(char**)&attr->name = gcc_python_strdup(name);
212+
*(char**)&attr->name = PyGcc_strdup(name);
213213
if (!attr->name) {
214214
PyMem_Free(attr);
215215
return PyErr_NoMemory();

‎gcc-python-callbacks.c‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103

104104
static enum plugin_event current_event = (enum plugin_event)GCC_PYTHON_PLUGIN_BAD_EVENT;
105105

106-
int gcc_python_is_within_event(enum plugin_event *out_event)
106+
int PyGcc_IsWithinEvent(enum plugin_event *out_event)
107107
{
108108
if (current_event != GCC_PYTHON_PLUGIN_BAD_EVENT) {
109109
if (out_event) {
@@ -117,13 +117,13 @@ int gcc_python_is_within_event(enum plugin_event *out_event)
117117

118118

119119
static void
120-
gcc_python_finish_invoking_callback(PyGILState_STATE gstate,
120+
PyGcc_FinishInvokingCallback(PyGILState_STATE gstate,
121121
int expect_wrapped_data, PyObject *wrapped_gcc_data,
122122
void *user_data)
123123
CPYCHECKER_STEALS_REFERENCE_TO_ARG(3) /* wrapped_gcc_data */ ;
124124

125125
static void
126-
gcc_python_finish_invoking_callback(PyGILState_STATE gstate,
126+
PyGcc_FinishInvokingCallback(PyGILState_STATE gstate,
127127
int expect_wrapped_data, PyObject *wrapped_gcc_data,
128128
void *user_data)
129129
{
@@ -146,7 +146,7 @@ gcc_python_finish_invoking_callback(PyGILState_STATE gstate,
146146
gcc_set_input_location(gcc_private_make_location(cfun->function_start_locus));
147147
}
148148

149-
args = gcc_python_closure_make_args(closure, 1, wrapped_gcc_data);
149+
args = PyGcc_Closure_MakeArgs(closure, 1, wrapped_gcc_data);
150150
if (!args) {
151151
goto cleanup;
152152
}
@@ -160,7 +160,7 @@ gcc_python_finish_invoking_callback(PyGILState_STATE gstate,
160160

161161
if (!result) {
162162
/* Treat an unhandled Python error as a compilation error: */
163-
gcc_python_print_exception("Unhandled Python exception raised within callback");
163+
PyGcc_PrintException("Unhandled Python exception raised within callback");
164164
}
165165

166166
// FIXME: the result is ignored
@@ -185,35 +185,35 @@ gcc_python_finish_invoking_callback(PyGILState_STATE gstate,
185185
*/
186186

187187
static void
188-
gcc_python_callback_for_tree(void *gcc_data, void *user_data)
188+
PyGcc_CallbackFor_tree(void *gcc_data, void *user_data)
189189
{
190190
PyGILState_STATE gstate;
191191
tree t = (tree)gcc_data;
192192

193193
gstate = PyGILState_Ensure();
194194

195-
gcc_python_finish_invoking_callback(gstate,
196-
1, gcc_python_make_wrapper_tree(gcc_private_make_tree(t)),
195+
PyGcc_FinishInvokingCallback(gstate,
196+
1, PyGccTree_New(gcc_private_make_tree(t)),
197197
user_data);
198198
}
199199

200200

201201
static void
202-
gcc_python_callback_for_PLUGIN_ATTRIBUTES(void *gcc_data, void *user_data)
202+
PyGcc_CallbackFor_PLUGIN_ATTRIBUTES(void *gcc_data, void *user_data)
203203
{
204204
PyGILState_STATE gstate;
205205

206206
//printf("%s:%i:(%p, %p)\n", __FILE__, __LINE__, gcc_data, user_data);
207207

208208
gstate = PyGILState_Ensure();
209209

210-
gcc_python_finish_invoking_callback(gstate,
210+
PyGcc_FinishInvokingCallback(gstate,
211211
0, NULL,
212212
user_data);
213213
}
214214

215215
static void
216-
gcc_python_callback_for_PLUGIN_PASS_EXECUTION(void *gcc_data, void *user_data)
216+
PyGcc_CallbackFor_PLUGIN_PASS_EXECUTION(void *gcc_data, void *user_data)
217217
{
218218
PyGILState_STATE gstate;
219219
struct opt_pass *pass = (struct opt_pass *)gcc_data;
@@ -223,13 +223,13 @@ gcc_python_callback_for_PLUGIN_PASS_EXECUTION(void *gcc_data, void *user_data)
223223

224224
gstate = PyGILState_Ensure();
225225

226-
gcc_python_finish_invoking_callback(gstate,
227-
1, gcc_python_make_wrapper_pass(pass),
226+
PyGcc_FinishInvokingCallback(gstate,
227+
1, PyGccPass_New(pass),
228228
user_data);
229229
}
230230

231231
static void
232-
gcc_python_callback_for_FINISH(void *gcc_data, void *user_data)
232+
PyGcc_CallbackFor_FINISH(void *gcc_data, void *user_data)
233233
{
234234
PyGILState_STATE gstate;
235235

@@ -240,62 +240,62 @@ gcc_python_callback_for_FINISH(void *gcc_data, void *user_data)
240240

241241
gstate = PyGILState_Ensure();
242242

243-
gcc_python_finish_invoking_callback(gstate,
243+
PyGcc_FinishInvokingCallback(gstate,
244244
0, NULL,
245245
user_data);
246246
}
247247

248248
static void
249-
gcc_python_callback_for_FINISH_UNIT(void *gcc_data, void *user_data)
249+
PyGcc_CallbackFor_FINISH_UNIT(void *gcc_data, void *user_data)
250250
{
251251
PyGILState_STATE gstate;
252252

253253
gstate = PyGILState_Ensure();
254254

255-
gcc_python_finish_invoking_callback(gstate,
255+
PyGcc_FinishInvokingCallback(gstate,
256256
0, NULL,
257257
user_data);
258258
}
259259

260260
static void
261-
gcc_python_callback_for_GGC_START(void *gcc_data, void *user_data)
261+
PyGcc_CallbackFor_GGC_START(void *gcc_data, void *user_data)
262262
{
263263
PyGILState_STATE gstate;
264264

265265
gstate = PyGILState_Ensure();
266266

267-
gcc_python_finish_invoking_callback(gstate,
267+
PyGcc_FinishInvokingCallback(gstate,
268268
0, NULL,
269269
user_data);
270270
}
271271

272272
static void
273-
gcc_python_callback_for_GGC_MARKING(void *gcc_data, void *user_data)
273+
PyGcc_CallbackFor_GGC_MARKING(void *gcc_data, void *user_data)
274274
{
275275
PyGILState_STATE gstate;
276276

277277
gstate = PyGILState_Ensure();
278278

279-
gcc_python_finish_invoking_callback(gstate,
279+
PyGcc_FinishInvokingCallback(gstate,
280280
0, NULL,
281281
user_data);
282282
}
283283

284284
static void
285-
gcc_python_callback_for_GGC_END(void *gcc_data, void *user_data)
285+
PyGcc_CallbackFor_GGC_END(void *gcc_data, void *user_data)
286286
{
287287
PyGILState_STATE gstate;
288288

289289
gstate = PyGILState_Ensure();
290290

291-
gcc_python_finish_invoking_callback(gstate,
291+
PyGcc_FinishInvokingCallback(gstate,
292292
0, NULL,
293293
user_data);
294294
}
295295

296296

297297
PyObject*
298-
gcc_python_register_callback(PyObject *self, PyObject *args, PyObject *kwargs)
298+
PyGcc_RegisterCallback(PyObject *self, PyObject *args, PyObject *kwargs)
299299
{
300300
int event;
301301
PyObject *callback = NULL;
@@ -306,9 +306,9 @@ gcc_python_register_callback(PyObject *self, PyObject *args, PyObject *kwargs)
306306
return NULL;
307307
}
308308

309-
//printf("%s:%i:gcc_python_register_callback\n", __FILE__, __LINE__);
309+
//printf("%s:%i:PyGcc_RegisterCallback\n", __FILE__, __LINE__);
310310

311-
closure = gcc_python_closure_new_for_plugin_event(callback, extraargs, kwargs,
311+
closure = PyGcc_Closure_NewForPluginEvent(callback, extraargs, kwargs,
312312
(enum plugin_event)event);
313313
if (!closure) {
314314
return PyErr_NoMemory();
@@ -318,61 +318,61 @@ gcc_python_register_callback(PyObject *self, PyObject *args, PyObject *kwargs)
318318
case PLUGIN_ATTRIBUTES:
319319
register_callback("python", // FIXME
320320
(enum plugin_event)event,
321-
gcc_python_callback_for_PLUGIN_ATTRIBUTES,
321+
PyGcc_CallbackFor_PLUGIN_ATTRIBUTES,
322322
closure);
323323
break;
324324

325325
case PLUGIN_PRE_GENERICIZE:
326326
register_callback("python", // FIXME
327327
(enum plugin_event)event,
328-
gcc_python_callback_for_tree,
328+
PyGcc_CallbackFor_tree,
329329
closure);
330330
break;
331331

332332
case PLUGIN_PASS_EXECUTION:
333333
register_callback("python", // FIXME
334334
(enum plugin_event)event,
335-
gcc_python_callback_for_PLUGIN_PASS_EXECUTION,
335+
PyGcc_CallbackFor_PLUGIN_PASS_EXECUTION,
336336
closure);
337337
break;
338338

339339
case PLUGIN_FINISH:
340340
register_callback("python", // FIXME
341341
(enum plugin_event)event,
342-
gcc_python_callback_for_FINISH,
342+
PyGcc_CallbackFor_FINISH,
343343
closure);
344344
break;
345345

346346
case PLUGIN_FINISH_UNIT:
347347
register_callback("python", // FIXME
348348
(enum plugin_event)event,
349-
gcc_python_callback_for_FINISH_UNIT,
349+
PyGcc_CallbackFor_FINISH_UNIT,
350350
closure);
351351
break;
352352

353353
case PLUGIN_FINISH_TYPE:
354354
register_callback("python", // FIXME
355355
(enum plugin_event)event,
356-
gcc_python_callback_for_tree,
356+
PyGcc_CallbackFor_tree,
357357
closure);
358358
break;
359359

360360
case PLUGIN_GGC_START:
361361
register_callback("python", // FIXME
362362
(enum plugin_event)event,
363-
gcc_python_callback_for_GGC_START,
363+
PyGcc_CallbackFor_GGC_START,
364364
closure);
365365
break;
366366
case PLUGIN_GGC_MARKING:
367367
register_callback("python", // FIXME
368368
(enum plugin_event)event,
369-
gcc_python_callback_for_GGC_MARKING,
369+
PyGcc_CallbackFor_GGC_MARKING,
370370
closure);
371371
break;
372372
case PLUGIN_GGC_END:
373373
register_callback("python", // FIXME
374374
(enum plugin_event)event,
375-
gcc_python_callback_for_GGC_END,
375+
PyGcc_CallbackFor_GGC_END,
376376
closure);
377377
break;
378378

@@ -381,7 +381,7 @@ gcc_python_register_callback(PyObject *self, PyObject *args, PyObject *kwargs)
381381
case PLUGIN_FINISH_DECL:
382382
register_callback("python", // FIXME
383383
(enum plugin_event)event,
384-
gcc_python_callback_for_tree,
384+
PyGcc_CallbackFor_tree,
385385
closure);
386386
break;
387387
#endif /* GCC_PYTHON_PLUGIN_CONFIG_has_PLUGIN_FINISH_DECL */

0 commit comments

Comments
 (0)