summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-10-08 13:51:06 +0000
committerDavid Cournapeau <cournape@gmail.com>2009-10-08 13:51:06 +0000
commita539040d446aedc3866116b864284c7e47550cf4 (patch)
treed2c448e6ffca6d82821182650f06b8836ca234bf
parent75e95e8c4cf078f8bd743f0e5d46333344069a34 (diff)
downloadnumpy-a539040d446aedc3866116b864284c7e47550cf4.tar.gz
ENH: rename classes to output strings to avoid confusion with similarly name classes.
-rw-r--r--numpy/core/code_generators/generate_numpy_api.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/numpy/core/code_generators/generate_numpy_api.py b/numpy/core/code_generators/generate_numpy_api.py
index ad1523c3d..0fe6d5de6 100644
--- a/numpy/core/code_generators/generate_numpy_api.py
+++ b/numpy/core/code_generators/generate_numpy_api.py
@@ -177,7 +177,8 @@ def generate_api(output_dir, force=False):
return targets
-class Type:
+# Those *Api classes instances know how to output strings for the generated code
+class TypeApi:
def __init__(self, name, index, ptr_cast):
self.index = index
self.name = name
@@ -188,7 +189,7 @@ class Type:
self.ptr_cast,
self.index)
-class GlobalVar:
+class GlobalVarApi:
def __init__(self, name, index, type):
self.name = name
self.index = index
@@ -251,7 +252,7 @@ def do_generate_api(targets, sources):
first_types = []
for i in range(6):
name, index = ordered_types_api.pop(0)
- first_types.append(Type(name, index, 'PyTypeObject'))
+ first_types.append(TypeApi(name, index, 'PyTypeObject'))
for t in first_types:
beg_api += "%s\n" % t.define_from_array_api_string()
@@ -262,13 +263,13 @@ def do_generate_api(targets, sources):
ordered_global_api = genapi2.order_dict(multiarray_globals)
name, index = ordered_global_api.pop(0)
type = numpy_api.multiarray_global_vars_types[name]
- g0 = GlobalVar(name, index, type)
+ g0 = GlobalVarApi(name, index, type)
beg_api += "%s\n" % g0.define_from_array_api_string()
init_list.append(""" (%s *) &%s,""" % (type, name))
# Handle bool type
name, index = ordered_types_api.pop(0)
- tp = Type(name, index, 'PyTypeObject')
+ tp = TypeApi(name, index, 'PyTypeObject')
beg_api += "%s\n" % tp.define_from_array_api_string()
init_list.append(""" (void *) &%s,""" % "PyBoolArrType_Type")