Merge gsoc-danilo C++ code into main branch.
authorRobert Bradshaw <robertwb@math.washington.edu>
Thu, 4 Feb 2010 22:49:57 +0000 (14:49 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Thu, 4 Feb 2010 22:49:57 +0000 (14:49 -0800)
1  2 
Cython/Compiler/ExprNodes.py
Cython/Compiler/Main.py
Cython/Compiler/ModuleNode.py
Cython/Compiler/Nodes.py
Cython/Compiler/ParseTreeTransforms.py
Cython/Compiler/Parsing.py
Cython/Compiler/PyrexTypes.py
Cython/Compiler/Scanning.py
Cython/Compiler/Symtab.py
runtests.py
tests/bugs.txt

index 89106db9b2b772c90fc6416de72c384a2a93e4c2,bcaac218f1db477c709d0d7c9b6f774138859718..e16b77405c67ed886439309fca07e1f2deb710ff
mode 100644,100755..100755
Simple merge
Simple merge
Simple merge
index 402a02216c8386d3a586aac7fe3b606c6f314cad,bcd18cb60112dcfd697dbd1a28582d75bbfc2ab5..e30117771fe75235a7f5f8a5d1f24b53b85793b5
@@@ -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
Simple merge
index a10a14a289d13018beac22d50a71c266fa102d10,77bed247d8a3d817e63ee9e29a4b665b0913bcbf..af0a01dd48ae3f6b2f903ee7b482b94325342107
mode 100644,100755..100755
Simple merge
Simple merge
diff --cc runtests.py
Simple merge
diff --cc tests/bugs.txt
index 8a1b3fd76590958b20803c19ac6b302d7fdedb5c,0fbe4d22fa7c61fd91fd59088b0ebe50a56e1062..28998142b5a1132541be0be06d4c8098925d4578
@@@ -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