rename "switchcase_transform" to "use_switch"

Cython/Compiler/Optimize.py

@@ -917,7 +917,7 @@ class SwitchTransform(Visitor.CythonTransform):
         return False
 
     def visit_IfStatNode(self, node):
-        if not self.current_directives.get('optimize.switchcase_transform'):
+        if not self.current_directives.get('optimize.use_switch'):
             self.visitchildren(node)
             return node
 
@@ -950,7 +950,7 @@ class SwitchTransform(Visitor.CythonTransform):
         return switch_node
 
     def visit_CondExprNode(self, node):
-        if not self.current_directives.get('optimize.switchcase_transform'):
+        if not self.current_directives.get('optimize.use_switch'):
             self.visitchildren(node)
             return node
 
@@ -966,7 +966,7 @@ class SwitchTransform(Visitor.CythonTransform):
             node.true_val, node.false_val)
 
     def visit_BoolBinopNode(self, node):
-        if not self.current_directives.get('optimize.switchcase_transform'):
+        if not self.current_directives.get('optimize.use_switch'):
             self.visitchildren(node)
             return node
 
@@ -984,7 +984,7 @@ class SwitchTransform(Visitor.CythonTransform):
             ExprNodes.BoolNode(node.pos, value=False, constant_result=False))
 
     def visit_PrimaryCmpNode(self, node):
-        if not self.current_directives.get('optimize.switchcase_transform'):
+        if not self.current_directives.get('optimize.use_switch'):
             self.visitchildren(node)
             return node
 
@@ -1031,7 +1031,7 @@ class SwitchTransform(Visitor.CythonTransform):
         return replacement
 
     def visit_EvalWithTempExprNode(self, node):
-        if not self.current_directives.get('optimize.switchcase_transform'):
+        if not self.current_directives.get('optimize.use_switch'):
             self.visitchildren(node)
             return node
 

Cython/Compiler/Options.py

@@ -129,7 +129,7 @@ directive_defaults = {
 
 # optimizations
     'optimize.inline_defnode_calls': True,
-    'optimize.switchcase_transform': True,
+    'optimize.use_switch': True,
 
 # remove unreachable code
     'remove_unreachable': True,

tests/errors/e_switch_transform.pyx

-# cython: optimize.switchcase_transform=True
+# cython: optimize.use_switch=True
 # mode: error
 
 import cython
 
-cdef extern from "includes/e_switch_transform_support.h":
+cdef extern from "../run/includes/switch_transform_support.h":
     enum:
         ONE
         ONE_AGAIN

tests/errors/includes/e_switch_transform_support.h

-#ifndef E_SWITCH_TRANSFORM_SUPPORT_H_
-#define E_SWITCH_TRANSFORM_SUPPORT_H_ 1
-
-enum {
-    ONE=1,
-    ONE_AGAIN=1
-};
-
-#endif /* E_SWITCH_TRANSFORM_SUPPORT_H_ */

tests/run/switch_transform.pyx

-# cython: optimize.switchcase_transform=False
+# cython: optimize.use_switch=False
 
 cdef extern from "includes/switch_transform_support.h":
     enum: