From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Thu, 4 Feb 2010 22:49:57 +0000 (-0800)
Subject: Merge gsoc-danilo C++ code into main branch.
X-Git-Tag: 0.13.beta0~353
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c8b2401a9374d0d24f6c9a33e102a2faa40fab31;p=cython.git

Merge gsoc-danilo C++ code into main branch.
---

c8b2401a9374d0d24f6c9a33e102a2faa40fab31
diff --cc Cython/Compiler/ExprNodes.py
index 89106db9,bcaac218..e16b7740
mode 100644,100755..100755
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
diff --cc Cython/Compiler/ParseTreeTransforms.py
index 402a0221,bcd18cb6..e3011777
--- a/Cython/Compiler/ParseTreeTransforms.py
+++ b/Cython/Compiler/ParseTreeTransforms.py
@@@ -1034,19 -1060,9 +1072,9 @@@ class TransformBuiltinMethods(EnvTransf
                          node = SizeofTypeNode(node.function.pos, arg_type=type)
                      else:
                          node = SizeofVarNode(node.function.pos, operand=node.args[0])
-             elif function == 'typeof':
-                 if len(node.args) != 1:
-                     error(node.function.pos, u"typeof() takes exactly one argument")
-                 else:
-                     node = TypeofNode(node.function.pos, operand=node.args[0])
-             elif function == 'address':
-                 if len(node.args) != 1:
-                     error(node.function.pos, u"address() takes exactly one argument")
-                 else:
-                     node = AmpersandNode(node.function.pos, operand=node.args[0])
              elif function == 'cmod':
                  if len(node.args) != 2:
 -                    error(node.function.pos, u"cmod() takes exactly one argument" % function)
 +                    error(node.function.pos, u"cmod() takes exactly two arguments")
                  else:
                      node = binop_node(node.function.pos, '%', node.args[0], node.args[1])
                      node.cdivision = True
diff --cc Cython/Compiler/PyrexTypes.py
index a10a14a2,77bed247..af0a01dd
mode 100644,100755..100755
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
diff --cc tests/bugs.txt
index 8a1b3fd7,0fbe4d22..28998142
--- a/tests/bugs.txt
+++ b/tests/bugs.txt
@@@ -7,4 -7,6 +7,6 @@@ numpy_ValueError_T17
  unsignedbehaviour_T184
  missing_baseclass_in_predecl_T262
  cfunc_call_tuple_args_T408
 -ifelseexpr_T267
 +cascaded_list_unpacking_T467
+ compile.cpp_operators
 -cpp_nested_templates
++cpp_nested_templates