Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
3a794069
Commit
3a794069
authored
Jan 01, 2015
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix naming conflict: "__pyx_tuple" is already used as tuple constant prefix
parent
e222eba0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
Cython/Compiler/Naming.py
Cython/Compiler/Naming.py
+1
-0
Cython/Compiler/PyrexTypes.py
Cython/Compiler/PyrexTypes.py
+1
-1
No files found.
Cython/Compiler/Naming.py
View file @
3a794069
...
@@ -61,6 +61,7 @@ interned_prefixes = {
...
@@ -61,6 +61,7 @@ interned_prefixes = {
'ustring'
:
pyrex_prefix
+
"ustring_"
,
'ustring'
:
pyrex_prefix
+
"ustring_"
,
}
}
ctuple_type_prefix
=
pyrex_prefix
+
"ctuple_"
args_cname
=
pyrex_prefix
+
"args"
args_cname
=
pyrex_prefix
+
"args"
generator_cname
=
pyrex_prefix
+
"generator"
generator_cname
=
pyrex_prefix
+
"generator"
sent_value_cname
=
pyrex_prefix
+
"sent_value"
sent_value_cname
=
pyrex_prefix
+
"sent_value"
...
...
Cython/Compiler/PyrexTypes.py
View file @
3a794069
...
@@ -3643,7 +3643,7 @@ def c_tuple_type(components):
...
@@ -3643,7 +3643,7 @@ def c_tuple_type(components):
components
=
tuple
(
components
)
components
=
tuple
(
components
)
tuple_type
=
c_tuple_types
.
get
(
components
)
tuple_type
=
c_tuple_types
.
get
(
components
)
if
tuple_type
is
None
:
if
tuple_type
is
None
:
cname
=
'__pyx_tuple_'
+
type_list_identifier
(
components
)
cname
=
Naming
.
ctuple_type_prefix
+
type_list_identifier
(
components
)
tuple_type
=
c_tuple_types
[
components
]
=
CTupleType
(
cname
,
components
)
tuple_type
=
c_tuple_types
[
components
]
=
CTupleType
(
cname
,
components
)
return
tuple_type
return
tuple_type
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment