You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2009/02/26 08:50:22 UTC
svn commit: r748053 - in /lucene/pylucene/trunk/jcc: ./ _jcc/
_jcc/java/lang/ _jcc/java/lang/reflect/ _jcc/java/util/ jcc/ jcc/sources/
Author: vajda
Date: Thu Feb 26 07:50:20 2009
New Revision: 748053
URL: http://svn.apache.org/viewvc?rev=748053&view=rev
Log:
- changed Type suffix to $$Type to avoid clashes with like-named Java classes
Modified:
lucene/pylucene/trunk/jcc/CHANGES
lucene/pylucene/trunk/jcc/_jcc/boot.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/Boolean.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/Boolean.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/Class.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/Class.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/Double.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/Double.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/Exception.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/Exception.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/Integer.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/Integer.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/Long.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/Long.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/Object.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/Object.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/RuntimeException.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/RuntimeException.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/String.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/String.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/Throwable.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/Throwable.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/__init__.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Constructor.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Constructor.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Field.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Field.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Method.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Method.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Modifier.cpp
lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Modifier.h
lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/__init__.cpp
lucene/pylucene/trunk/jcc/_jcc/java/util/Enumeration.cpp
lucene/pylucene/trunk/jcc/_jcc/java/util/Enumeration.h
lucene/pylucene/trunk/jcc/_jcc/java/util/Iterator.cpp
lucene/pylucene/trunk/jcc/_jcc/java/util/Iterator.h
lucene/pylucene/trunk/jcc/jcc/python.py
lucene/pylucene/trunk/jcc/jcc/sources/JArray.cpp
lucene/pylucene/trunk/jcc/jcc/sources/JArray.h
lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp
lucene/pylucene/trunk/jcc/jcc/sources/JObject.cpp
lucene/pylucene/trunk/jcc/jcc/sources/JObject.h
lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp
lucene/pylucene/trunk/jcc/jcc/sources/functions.h
lucene/pylucene/trunk/jcc/jcc/sources/jcc.cpp
lucene/pylucene/trunk/jcc/jcc/sources/jccfuncs.h
lucene/pylucene/trunk/jcc/jcc/sources/macros.h
lucene/pylucene/trunk/jcc/jcc/sources/types.cpp
Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Thu Feb 26 07:50:20 2009
@@ -10,6 +10,7 @@
- JArray Python wrappers should return None when passed a null array
- added JDK variable to setup.py to better parameterize build configuration
- added support for proxying mapping and sequence protocols on FinalizerProxy
+ - changed Type suffix to $$Type to avoid clashes with like-named Java classes
-
Version 2.0 -> 2.1
Modified: lucene/pylucene/trunk/jcc/_jcc/boot.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/boot.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/boot.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/boot.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -20,7 +18,7 @@
#include "java/lang/RuntimeException.h"
#include "macros.h"
-extern PyTypeObject JObjectType, JCCEnvType, ConstVariableDescriptorType;
+extern PyTypeObject JObject$$Type, JCCEnv$$Type, ConstVariableDescriptor$$Type;
PyObject *initVM(PyObject *self, PyObject *args, PyObject *kwds);
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Boolean.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Boolean.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Boolean.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Boolean.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Boolean.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Boolean.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Boolean.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Boolean.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -38,7 +36,7 @@
static Boolean *FALSE;
};
- extern PyTypeObject BooleanType;
+ extern PyTypeObject Boolean$$Type;
class t_Boolean {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Class.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Class.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Class.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Class.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -402,7 +400,7 @@
static PyObject *t_Class_isAssignableFrom(t_Class *self, PyObject *arg)
{
- if (!PyObject_TypeCheck(arg, &ClassType))
+ if (!PyObject_TypeCheck(arg, &Class$$Type))
{
PyErr_SetObject(PyExc_TypeError, arg);
return NULL;
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Class.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Class.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Class.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Class.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -62,7 +60,7 @@
int isInstance(const Object &obj) const;
};
- extern PyTypeObject ClassType;
+ extern PyTypeObject Class$$Type;
class t_Class {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Double.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Double.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Double.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Double.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Double.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Double.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Double.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Double.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -36,7 +34,7 @@
Double(jdouble);
};
- extern PyTypeObject DoubleType;
+ extern PyTypeObject Double$$Type;
class t_Double {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Exception.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Exception.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Exception.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Exception.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Exception.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Exception.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Exception.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Exception.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -36,7 +34,7 @@
}
};
- extern PyTypeObject ExceptionType;
+ extern PyTypeObject Exception$$Type;
class t_Exception {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Integer.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Integer.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Integer.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Integer.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Integer.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Integer.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Integer.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Integer.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -36,7 +34,7 @@
Integer(jint);
};
- extern PyTypeObject IntegerType;
+ extern PyTypeObject Integer$$Type;
class t_Integer {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Long.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Long.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Long.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Long.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Long.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Long.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Long.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Long.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -36,7 +34,7 @@
Long(jlong);
};
- extern PyTypeObject LongType;
+ extern PyTypeObject Long$$Type;
class t_Long {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Object.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Object.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Object.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Object.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Object.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Object.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Object.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Object.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -41,7 +39,7 @@
int hashCode() const;
};
- extern PyTypeObject ObjectType;
+ extern PyTypeObject Object$$Type;
class t_Object {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/RuntimeException.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/RuntimeException.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/RuntimeException.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/RuntimeException.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/RuntimeException.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/RuntimeException.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/RuntimeException.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/RuntimeException.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -36,7 +34,7 @@
}
};
- extern PyTypeObject RuntimeExceptionType;
+ extern PyTypeObject RuntimeException$$Type;
class t_RuntimeException {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/String.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/String.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/String.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/String.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/String.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/String.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/String.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/String.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -43,7 +41,7 @@
int length() const;
};
- extern PyTypeObject StringType;
+ extern PyTypeObject String$$Type;
class t_String {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Throwable.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Throwable.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Throwable.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Throwable.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/Throwable.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/Throwable.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/Throwable.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/Throwable.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -40,7 +38,7 @@
String getMessage() const;
};
- extern PyTypeObject ThrowableType;
+ extern PyTypeObject Throwable$$Type;
class t_Throwable {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/__init__.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/__init__.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/__init__.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/__init__.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -20,16 +18,16 @@
namespace java {
namespace lang {
- extern PyTypeObject ObjectType;
- extern PyTypeObject StringType;
- extern PyTypeObject ClassType;
- extern PyTypeObject ThrowableType;
- extern PyTypeObject ExceptionType;
- extern PyTypeObject RuntimeExceptionType;
- extern PyTypeObject BooleanType;
- extern PyTypeObject IntegerType;
- extern PyTypeObject LongType;
- extern PyTypeObject DoubleType;
+ extern PyTypeObject Object$$Type;
+ extern PyTypeObject String$$Type;
+ extern PyTypeObject Class$$Type;
+ extern PyTypeObject Throwable$$Type;
+ extern PyTypeObject Exception$$Type;
+ extern PyTypeObject RuntimeException$$Type;
+ extern PyTypeObject Boolean$$Type;
+ extern PyTypeObject Integer$$Type;
+ extern PyTypeObject Long$$Type;
+ extern PyTypeObject Double$$Type;
namespace reflect {
void __install__(PyObject *module);
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Constructor.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Constructor.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Constructor.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Constructor.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Constructor.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Constructor.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Constructor.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Constructor.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -43,7 +41,7 @@
};
- extern PyTypeObject ConstructorType;
+ extern PyTypeObject Constructor$$Type;
class t_Constructor {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Field.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Field.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Field.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Field.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Field.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Field.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Field.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Field.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -41,7 +39,7 @@
String getName() const;
};
- extern PyTypeObject FieldType;
+ extern PyTypeObject Field$$Type;
class t_Field {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Method.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Method.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Method.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Method.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Method.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Method.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Method.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Method.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -45,7 +43,7 @@
Class getDeclaringClass() const;
};
- extern PyTypeObject MethodType;
+ extern PyTypeObject Method$$Type;
class t_Method {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Modifier.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Modifier.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Modifier.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Modifier.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Modifier.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Modifier.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Modifier.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/Modifier.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -46,7 +44,7 @@
static int isProtected(int mod);
};
- extern PyTypeObject ModifierType;
+ extern PyTypeObject Modifier$$Type;
class t_Modifier {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/__init__.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/__init__.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/__init__.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/lang/reflect/__init__.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -21,10 +19,10 @@
namespace lang {
namespace reflect {
- extern PyTypeObject ConstructorType;
- extern PyTypeObject MethodType;
- extern PyTypeObject ModifierType;
- extern PyTypeObject FieldType;
+ extern PyTypeObject Constructor$$Type;
+ extern PyTypeObject Method$$Type;
+ extern PyTypeObject Modifier$$Type;
+ extern PyTypeObject Field$$Type;
void __install__(PyObject *m)
{
Modified: lucene/pylucene/trunk/jcc/_jcc/java/util/Enumeration.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/util/Enumeration.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/util/Enumeration.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/util/Enumeration.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/util/Enumeration.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/util/Enumeration.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/util/Enumeration.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/util/Enumeration.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -42,7 +40,7 @@
Object nextElement() const;
};
- extern PyTypeObject EnumerationType;
+ extern PyTypeObject Enumeration$$Type;
class t_Enumeration {
public:
Modified: lucene/pylucene/trunk/jcc/_jcc/java/util/Iterator.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/util/Iterator.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/util/Iterator.cpp (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/util/Iterator.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/_jcc/java/util/Iterator.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/_jcc/java/util/Iterator.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/_jcc/java/util/Iterator.h (original)
+++ lucene/pylucene/trunk/jcc/_jcc/java/util/Iterator.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -42,7 +40,7 @@
Object next() const;
};
- extern PyTypeObject IteratorType;
+ extern PyTypeObject Iterator$$Type;
class t_Iterator {
public:
Modified: lucene/pylucene/trunk/jcc/jcc/python.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/python.py?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/python.py (original)
+++ lucene/pylucene/trunk/jcc/jcc/python.py Thu Feb 26 07:50:20 2009
@@ -1,3 +1,4 @@
+#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@@ -9,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
import os, sys, platform, shutil, _jcc, py_compile
@@ -228,7 +230,7 @@
if isExtension and name == 'clone' and Modifier.isNative(modifiers):
line(out)
line(out, indent, '%s object(result.this$);', typename(cls, cls, False))
- line(out, indent, 'if (PyObject_TypeCheck(arg, &FinalizerProxyType) &&')
+ line(out, indent, 'if (PyObject_TypeCheck(arg, &FinalizerProxy$$Type) &&')
line(out, indent, ' PyObject_TypeCheck(((t_fp *) arg)->object, self->ob_type))')
line(out, indent, '{')
line(out, indent + 1, 'PyObject *_arg = ((t_fp *) arg)->object;')
@@ -398,7 +400,7 @@
for name in names[:-1]:
line(out_h, indent, 'namespace %s {', name)
indent += 1
- line(out_h, indent, 'extern PyTypeObject %sType;', names[-1])
+ line(out_h, indent, 'extern PyTypeObject %s$$Type;', names[-1])
line(out_h)
line(out_h, indent, 'class t_%s {', names[-1])
@@ -790,16 +792,16 @@
if inner in typeset:
if Modifier.isStatic(inner.getModifiers()):
innerName = inner.getName().split('.')[-1]
- line(out, indent + 1, 'PyDict_SetItemString(%sType.tp_dict, "%s", make_descriptor(&%sType));',
+ line(out, indent + 1, 'PyDict_SetItemString(%s$$Type.tp_dict, "%s", make_descriptor(&%s$$Type));',
names[-1], innerName[len(names[-1])+1:], innerName)
line(out, indent, '}')
line(out)
line(out, indent, 'void t_%s::initialize(PyObject *module)', names[-1])
line(out, indent, '{')
- line(out, indent + 1, 'PyDict_SetItemString(%sType.tp_dict, "class_", make_descriptor(%s::initializeClass));',
+ line(out, indent + 1, 'PyDict_SetItemString(%s$$Type.tp_dict, "class_", make_descriptor(%s::initializeClass));',
names[-1], names[-1])
- line(out, indent + 1, 'PyDict_SetItemString(%sType.tp_dict, "wrapfn_", make_descriptor(t_%s::wrap_jobject));',
+ line(out, indent + 1, 'PyDict_SetItemString(%s$$Type.tp_dict, "wrapfn_", make_descriptor(t_%s::wrap_jobject));',
names[-1], names[-1])
if isExtension:
@@ -826,7 +828,7 @@
if fieldName in RESERVED:
value += '$'
value = fieldValue(cls, value, fieldType)
- line(out, indent + 1, 'PyDict_SetItemString(%sType.tp_dict, "%s", make_descriptor(%s));',
+ line(out, indent + 1, 'PyDict_SetItemString(%s$$Type.tp_dict, "%s", make_descriptor(%s));',
names[-1], fieldName, value)
line(out, indent, '}')
@@ -927,7 +929,7 @@
line(out, indent + 1, 'return callSuper(type, "%s"%s, %d);',
name, args, cardinality)
else:
- line(out, indent + 1, 'return callSuper(&%sType, (PyObject *) self, "%s"%s, %d);',
+ line(out, indent + 1, 'return callSuper(&%s$$Type, (PyObject *) self, "%s"%s, %d);',
names[-1], name, args, cardinality)
else:
line(out, indent + 1, 'PyErr_SetArgsError(%s, "%s"%s);',
@@ -1218,7 +1220,7 @@
line(out)
line(out, 0, 'void __install__(PyObject *module);')
- line(out, 0, 'extern PyTypeObject JObjectType, ConstVariableDescriptorType, FinalizerClassType, FinalizerProxyType;')
+ line(out, 0, 'extern PyTypeObject JObject$$Type, ConstVariableDescriptor$$Type, FinalizerClass$$Type, FinalizerProxy$$Type;')
line(out, 0, 'extern void _install_jarray(PyObject *);')
line(out)
line(out, 0, '#if defined(_jcc_shared) && (defined(_MSC_VER) || defined(__WIN32))')
@@ -1226,7 +1228,7 @@
line(out, 0, '#else')
line(out, 0, '#define _DLL_IMPORT')
line(out, 0, '#endif')
- line(out, 0, '_DLL_IMPORT extern PyTypeObject JCCEnvType;')
+ line(out, 0, '_DLL_IMPORT extern PyTypeObject JCCEnv$$Type;')
line(out)
line(out, 0, 'extern "C" {')
Modified: lucene/pylucene/trunk/jcc/jcc/sources/JArray.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/JArray.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/JArray.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/JArray.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2008-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -415,7 +413,7 @@
if (!PyArg_ParseTuple(args, "O", &arg))
return NULL;
- if (!PyObject_TypeCheck(arg, &ObjectType))
+ if (!PyObject_TypeCheck(arg, &Object$$Type))
{
PyErr_SetObject(PyExc_TypeError, arg);
return NULL;
@@ -452,7 +450,7 @@
if (!PyArg_ParseTuple(args, "O", &arg))
return NULL;
- if (!PyObject_TypeCheck(arg, &ObjectType))
+ if (!PyObject_TypeCheck(arg, &Object$$Type))
Py_RETURN_FALSE;
Class argCls = ((t_Object *) arg)->object.getClass();
@@ -602,7 +600,7 @@
(richcmpfunc) (PyObject *(*)(U *, PyObject *, int)) richcompare<U>;
type_object.tp_iter = (getiterfunc) (PyObject *(*)(U *)) iter<U>;
type_object.tp_methods = methods;
- type_object.tp_base = &ObjectType;
+ type_object.tp_base = &Object$$Type;
type_object.tp_init =
(initproc) (int (*)(U *, PyObject *, PyObject *)) init<T,U>;
type_object.tp_new = (newfunc) _new;
@@ -640,11 +638,11 @@
if (clsObj == NULL)
cls = env->findClass("java/lang/Object");
- else if (PyObject_TypeCheck(clsObj, &ClassType))
+ else if (PyObject_TypeCheck(clsObj, &Class$$Type))
cls = (jclass) ((t_Class *) clsObj)->object.this$;
else if (PyType_Check(clsObj))
{
- if (PyType_IsSubtype((PyTypeObject *) clsObj, &JObjectType))
+ if (PyType_IsSubtype((PyTypeObject *) clsObj, &JObject$$Type))
{
PyObject *cobj = PyObject_GetAttrString(clsObj, "wrapfn_");
@@ -734,7 +732,7 @@
if (!PyArg_ParseTuple(args, "O|O", &arg, &clsArg))
return NULL;
- if (!PyObject_TypeCheck(arg, &ObjectType))
+ if (!PyObject_TypeCheck(arg, &Object$$Type))
{
PyErr_SetObject(PyExc_TypeError, arg);
return NULL;
@@ -755,7 +753,7 @@
PyErr_SetObject(PyExc_TypeError, clsArg);
return NULL;
}
- else if (!PyType_IsSubtype((PyTypeObject *) clsArg, &JObjectType))
+ else if (!PyType_IsSubtype((PyTypeObject *) clsArg, &JObject$$Type))
{
PyErr_SetObject(PyExc_ValueError, clsArg);
return NULL;
@@ -803,7 +801,7 @@
if (!PyArg_ParseTuple(args, "O|O", &arg, &clsArg))
return NULL;
- if (!PyObject_TypeCheck(arg, &ObjectType))
+ if (!PyObject_TypeCheck(arg, &Object$$Type))
Py_RETURN_FALSE;
Class argCls = ((t_Object *) arg)->object.getClass();
@@ -818,7 +816,7 @@
PyErr_SetObject(PyExc_TypeError, clsArg);
return NULL;
}
- else if (!PyType_IsSubtype((PyTypeObject *) clsArg, &JObjectType))
+ else if (!PyType_IsSubtype((PyTypeObject *) clsArg, &JObject$$Type))
{
PyErr_SetObject(PyExc_ValueError, clsArg);
return NULL;
@@ -853,7 +851,7 @@
if (!PyArg_ParseTuple(args, "O|O", &arg, &clsArg))
return NULL;
- if (!PyObject_TypeCheck(arg, &ObjectType))
+ if (!PyObject_TypeCheck(arg, &Object$$Type))
Py_RETURN_FALSE;
Class argCls = ((t_Object *) arg)->object.getClass();
@@ -868,7 +866,7 @@
PyErr_SetObject(PyExc_TypeError, clsArg);
return NULL;
}
- else if (!PyType_IsSubtype((PyTypeObject *) clsArg, &JObjectType))
+ else if (!PyType_IsSubtype((PyTypeObject *) clsArg, &JObject$$Type))
{
PyErr_SetObject(PyExc_ValueError, clsArg);
return NULL;
@@ -1141,58 +1139,58 @@
return type;
}
-PyTypeObject *JArrayObjectType;
-PyTypeObject *JArrayStringType;
-PyTypeObject *JArrayBoolType;
-PyTypeObject *JArrayByteType;
-PyTypeObject *JArrayCharType;
-PyTypeObject *JArrayDoubleType;
-PyTypeObject *JArrayFloatType;
-PyTypeObject *JArrayIntType;
-PyTypeObject *JArrayLongType;
-PyTypeObject *JArrayShortType;
+PyTypeObject *JArrayObject$$Type;
+PyTypeObject *JArrayString$$Type;
+PyTypeObject *JArrayBool$$Type;
+PyTypeObject *JArrayByte$$Type;
+PyTypeObject *JArrayChar$$Type;
+PyTypeObject *JArrayDouble$$Type;
+PyTypeObject *JArrayFloat$$Type;
+PyTypeObject *JArrayInt$$Type;
+PyTypeObject *JArrayLong$$Type;
+PyTypeObject *JArrayShort$$Type;
void _install_jarray(PyObject *module)
{
jarray_jobject.install("JArray_object", "object",
"__JArray_object_iterator", module);
- JArrayObjectType = &jarray_jobject.type_object;
+ JArrayObject$$Type = &jarray_jobject.type_object;
jarray_jstring.install("JArray_string", "string",
"__JArray_string_iterator", module);
- JArrayStringType = &jarray_jstring.type_object;
+ JArrayString$$Type = &jarray_jstring.type_object;
jarray_jboolean.install("JArray_bool", "bool",
"__JArray_bool_iterator", module);
- JArrayBoolType = &jarray_jboolean.type_object;
+ JArrayBool$$Type = &jarray_jboolean.type_object;
jarray_jbyte.install("JArray_byte", "byte",
"__JArray_byte_iterator", module);
- JArrayByteType = &jarray_jbyte.type_object;
+ JArrayByte$$Type = &jarray_jbyte.type_object;
jarray_jchar.install("JArray_char", "char",
"__JArray_char_iterator", module);
- JArrayCharType = &jarray_jchar.type_object;
+ JArrayChar$$Type = &jarray_jchar.type_object;
jarray_jdouble.install("JArray_double", "double",
"__JArray_double_iterator", module);
- JArrayDoubleType = &jarray_jdouble.type_object;
+ JArrayDouble$$Type = &jarray_jdouble.type_object;
jarray_jfloat.install("JArray_float", "float",
"__JArray_float_iterator", module);
- JArrayFloatType = &jarray_jfloat.type_object;
+ JArrayFloat$$Type = &jarray_jfloat.type_object;
jarray_jint.install("JArray_int", "int",
"__JArray_int_iterator", module);
- JArrayIntType = &jarray_jint.type_object;
+ JArrayInt$$Type = &jarray_jint.type_object;
jarray_jlong.install("JArray_long", "long",
"__JArray_long_iterator", module);
- JArrayLongType = &jarray_jlong.type_object;
+ JArrayLong$$Type = &jarray_jlong.type_object;
jarray_jshort.install("JArray_short", "short",
"__JArray_short_iterator", module);
- JArrayShortType = &jarray_jshort.type_object;
+ JArrayShort$$Type = &jarray_jshort.type_object;
}
#endif /* PYTHON */
Modified: lucene/pylucene/trunk/jcc/jcc/sources/JArray.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/JArray.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/JArray.h (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/JArray.h Thu Feb 26 07:50:20 2009
@@ -24,16 +24,16 @@
extern jobjectArray fromPySequence(jclass cls, PyObject *sequence);
extern PyObject *PyErr_SetJavaError(jthrowable throwable);
-extern PyTypeObject *JArrayObjectType;
-extern PyTypeObject *JArrayStringType;
-extern PyTypeObject *JArrayBoolType;
-extern PyTypeObject *JArrayByteType;
-extern PyTypeObject *JArrayCharType;
-extern PyTypeObject *JArrayDoubleType;
-extern PyTypeObject *JArrayFloatType;
-extern PyTypeObject *JArrayIntType;
-extern PyTypeObject *JArrayLongType;
-extern PyTypeObject *JArrayShortType;
+extern PyTypeObject *JArrayObject$$Type;
+extern PyTypeObject *JArrayString$$Type;
+extern PyTypeObject *JArrayBool$$Type;
+extern PyTypeObject *JArrayByte$$Type;
+extern PyTypeObject *JArrayChar$$Type;
+extern PyTypeObject *JArrayDouble$$Type;
+extern PyTypeObject *JArrayFloat$$Type;
+extern PyTypeObject *JArrayInt$$Type;
+extern PyTypeObject *JArrayLong$$Type;
+extern PyTypeObject *JArrayShort$$Type;
#endif
@@ -121,7 +121,7 @@
if (obj == NULL)
break;
- if (!PyObject_TypeCheck(obj, &JObjectType))
+ if (!PyObject_TypeCheck(obj, &JObject$$Type))
{
PyErr_SetObject(PyExc_TypeError, obj);
break;
@@ -203,7 +203,7 @@
if (n >= 0 && n < length)
{
- if (!PyObject_TypeCheck(obj, &JObjectType))
+ if (!PyObject_TypeCheck(obj, &JObject$$Type))
{
PyErr_SetObject(PyExc_TypeError, obj);
return -1;
Modified: lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp Thu Feb 26 07:50:20 2009
@@ -1,4 +1,4 @@
-/* ====================================================================
+/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -10,7 +10,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ====================================================================
*/
#include <map>
Modified: lucene/pylucene/trunk/jcc/jcc/sources/JObject.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/JObject.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/JObject.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/JObject.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -51,7 +49,7 @@
{ NULL, NULL, NULL, NULL, NULL }
};
-PyTypeObject JObjectType = {
+PyTypeObject JObject$$Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"jcc.JObject", /* tp_name */
@@ -118,7 +116,7 @@
switch (op) {
case Py_EQ:
case Py_NE:
- if (PyObject_TypeCheck(arg, &JObjectType))
+ if (PyObject_TypeCheck(arg, &JObject$$Type))
b = self->object == ((t_JObject *) arg)->object;
if (op == Py_EQ)
Py_RETURN_BOOL(b);
Modified: lucene/pylucene/trunk/jcc/jcc/sources/JObject.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/JObject.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/JObject.h (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/JObject.h Thu Feb 26 07:50:20 2009
@@ -90,7 +90,7 @@
JObject object;
};
-extern PyTypeObject JObjectType;
+extern PyTypeObject JObject$$Type;
#endif /* PYTHON */
Modified: lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -141,7 +139,7 @@
if (array)
{
- if (PyObject_TypeCheck(arg, JArrayObjectType))
+ if (PyObject_TypeCheck(arg, JArrayObject$$Type))
break;
if (PySequence_Check(arg) &&
@@ -152,7 +150,7 @@
PyObject *obj = PySequence_GetItem(arg, 0);
int ok =
(obj == Py_None ||
- (PyObject_TypeCheck(obj, &ObjectType) &&
+ (PyObject_TypeCheck(obj, &Object$$Type) &&
cls->isInstance(((t_Object *) obj)->object)));
Py_DECREF(obj);
@@ -163,13 +161,13 @@
break;
}
}
- else if (PyObject_TypeCheck(arg, &ObjectType) &&
+ else if (PyObject_TypeCheck(arg, &Object$$Type) &&
cls->isInstance(((t_Object *) arg)->object))
break;
- else if (PyObject_TypeCheck(arg, &FinalizerProxyType))
+ else if (PyObject_TypeCheck(arg, &FinalizerProxy$$Type))
{
arg = ((t_fp *) arg)->object;
- if (PyObject_TypeCheck(arg, &ObjectType) &&
+ if (PyObject_TypeCheck(arg, &Object$$Type) &&
cls->isInstance(((t_Object *) arg)->object))
break;
}
@@ -184,7 +182,7 @@
if (arg == Py_None)
break;
- if (PyObject_TypeCheck(arg, JArrayBoolType))
+ if (PyObject_TypeCheck(arg, JArrayBool$$Type))
break;
if (PySequence_Check(arg))
@@ -214,7 +212,7 @@
{
if (arg == Py_None)
break;
- if (PyObject_TypeCheck(arg, JArrayByteType))
+ if (PyObject_TypeCheck(arg, JArrayByte$$Type))
break;
if (arg == Py_None || PyString_Check(arg))
break;
@@ -230,7 +228,7 @@
{
if (arg == Py_None)
break;
- if (PyObject_TypeCheck(arg, JArrayCharType))
+ if (PyObject_TypeCheck(arg, JArrayChar$$Type))
break;
if (arg == Py_None || PyUnicode_Check(arg))
break;
@@ -247,7 +245,7 @@
if (arg == Py_None)
break;
- if (PyObject_TypeCheck(arg, JArrayIntType))
+ if (PyObject_TypeCheck(arg, JArrayInt$$Type))
break;
if (PySequence_Check(arg))
@@ -278,7 +276,7 @@
if (arg == Py_None)
break;
- if (PyObject_TypeCheck(arg, JArrayShortType))
+ if (PyObject_TypeCheck(arg, JArrayShort$$Type))
break;
if (PySequence_Check(arg))
@@ -309,7 +307,7 @@
if (arg == Py_None)
break;
- if (PyObject_TypeCheck(arg, JArrayDoubleType))
+ if (PyObject_TypeCheck(arg, JArrayDouble$$Type))
break;
if (PySequence_Check(arg))
@@ -340,7 +338,7 @@
if (arg == Py_None)
break;
- if (PyObject_TypeCheck(arg, JArrayFloatType))
+ if (PyObject_TypeCheck(arg, JArrayFloat$$Type))
break;
if (PySequence_Check(arg))
@@ -371,7 +369,7 @@
if (arg == Py_None)
break;
- if (PyObject_TypeCheck(arg, JArrayLongType))
+ if (PyObject_TypeCheck(arg, JArrayLong$$Type))
break;
if (PySequence_Check(arg))
@@ -402,7 +400,7 @@
if (arg == Py_None)
break;
- if (PyObject_TypeCheck(arg, JArrayStringType))
+ if (PyObject_TypeCheck(arg, JArrayString$$Type))
break;
if (PySequence_Check(arg) &&
@@ -469,7 +467,7 @@
if (arg == Py_None)
*array = JArray<jobject>((jobject) NULL);
- else if (PyObject_TypeCheck(arg, JArrayObjectType))
+ else if (PyObject_TypeCheck(arg, JArrayObject$$Type))
*array = ((t_jarray<jobject> *) arg)->array;
else
*array = JArray<jobject>((jclass) cls->this$, arg);
@@ -481,7 +479,7 @@
{
Object *obj = va_arg(list, Object *);
- if (PyObject_TypeCheck(arg, &FinalizerProxyType))
+ if (PyObject_TypeCheck(arg, &FinalizerProxy$$Type))
arg = ((t_fp *) arg)->object;
*obj = arg == Py_None
@@ -499,7 +497,7 @@
if (arg == Py_None)
*array = JArray<jboolean>((jobject) NULL);
- else if (PyObject_TypeCheck(arg, JArrayBoolType))
+ else if (PyObject_TypeCheck(arg, JArrayBool$$Type))
*array = ((t_jarray<jboolean> *) arg)->array;
else
*array = JArray<jboolean>(arg);
@@ -523,7 +521,7 @@
if (arg == Py_None)
*array = JArray<jbyte>((jobject) NULL);
- else if (PyObject_TypeCheck(arg, JArrayByteType))
+ else if (PyObject_TypeCheck(arg, JArrayByte$$Type))
*array = ((t_jarray<jbyte> *) arg)->array;
else
*array = JArray<jbyte>(arg);
@@ -547,7 +545,7 @@
if (arg == Py_None)
*array = JArray<jchar>((jobject) NULL);
- else if (PyObject_TypeCheck(arg, JArrayCharType))
+ else if (PyObject_TypeCheck(arg, JArrayChar$$Type))
*array = ((t_jarray<jchar> *) arg)->array;
else
*array = JArray<jchar>(arg);
@@ -571,7 +569,7 @@
if (arg == Py_None)
*array = JArray<jint>((jobject) NULL);
- else if (PyObject_TypeCheck(arg, JArrayIntType))
+ else if (PyObject_TypeCheck(arg, JArrayInt$$Type))
*array = ((t_jarray<jint> *) arg)->array;
else
*array = JArray<jint>(arg);
@@ -595,7 +593,7 @@
if (arg == Py_None)
*array = JArray<jshort>((jobject) NULL);
- else if (PyObject_TypeCheck(arg, JArrayShortType))
+ else if (PyObject_TypeCheck(arg, JArrayShort$$Type))
*array = ((t_jarray<jshort> *) arg)->array;
else
*array = JArray<jshort>(arg);
@@ -619,7 +617,7 @@
if (arg == Py_None)
*array = JArray<jdouble>((jobject) NULL);
- else if (PyObject_TypeCheck(arg, JArrayDoubleType))
+ else if (PyObject_TypeCheck(arg, JArrayDouble$$Type))
*array = ((t_jarray<jdouble> *) arg)->array;
else
*array = JArray<jdouble>(arg);
@@ -643,7 +641,7 @@
if (arg == Py_None)
*array = JArray<jfloat>((jobject) NULL);
- else if (PyObject_TypeCheck(arg, JArrayFloatType))
+ else if (PyObject_TypeCheck(arg, JArrayFloat$$Type))
*array = ((t_jarray<jfloat> *) arg)->array;
else
*array = JArray<jfloat>(arg);
@@ -667,7 +665,7 @@
if (arg == Py_None)
*array = JArray<jlong>((jobject) NULL);
- else if (PyObject_TypeCheck(arg, JArrayLongType))
+ else if (PyObject_TypeCheck(arg, JArrayLong$$Type))
*array = ((t_jarray<jlong> *) arg)->array;
else
*array = JArray<jlong>(arg);
@@ -691,7 +689,7 @@
if (arg == Py_None)
*array = JArray<jstring>((jobject) NULL);
- else if (PyObject_TypeCheck(arg, JArrayStringType))
+ else if (PyObject_TypeCheck(arg, JArrayString$$Type))
*array = ((t_jarray<jstring> *) arg)->array;
else
*array = JArray<jstring>(arg);
@@ -735,12 +733,12 @@
if (arg == Py_None)
*obj = Object(NULL);
- else if (PyObject_TypeCheck(arg, &ObjectType))
+ else if (PyObject_TypeCheck(arg, &Object$$Type))
*obj = ((t_Object *) arg)->object;
- else if (PyObject_TypeCheck(arg, &FinalizerProxyType))
+ else if (PyObject_TypeCheck(arg, &FinalizerProxy$$Type))
{
arg = ((t_fp *) arg)->object;
- if (PyObject_TypeCheck(arg, &ObjectType))
+ if (PyObject_TypeCheck(arg, &Object$$Type))
*obj = ((t_Object *) arg)->object;
else
return -1;
@@ -863,7 +861,7 @@
Py_XDECREF(traceback);
exc = je;
- if (exc && PyObject_TypeCheck(exc, &ThrowableType))
+ if (exc && PyObject_TypeCheck(exc, &Throwable$$Type))
{
jobject jobj = ((t_Throwable *) exc)->object.this$;
@@ -989,10 +987,10 @@
PyObject *castCheck(PyObject *obj, jclass cls, int reportError)
{
- if (PyObject_TypeCheck(obj, &FinalizerProxyType))
+ if (PyObject_TypeCheck(obj, &FinalizerProxy$$Type))
obj = ((t_fp *) obj)->object;
- if (!PyObject_TypeCheck(obj, &ObjectType))
+ if (!PyObject_TypeCheck(obj, &Object$$Type))
{
if (reportError)
PyErr_SetObject(PyExc_TypeError, obj);
@@ -1065,9 +1063,9 @@
jobj = env->fromPyString(obj);
fromString = 1;
}
- else if (PyObject_TypeCheck(obj, &JObjectType))
+ else if (PyObject_TypeCheck(obj, &JObject$$Type))
jobj = ((t_JObject *) obj)->object.this$;
- else if (PyObject_TypeCheck(obj, &FinalizerProxyType))
+ else if (PyObject_TypeCheck(obj, &FinalizerProxy$$Type))
jobj = ((t_JObject *) ((t_fp *) obj)->object)->object.this$;
else /* todo: add auto-boxing of primitive types */
{
Modified: lucene/pylucene/trunk/jcc/jcc/sources/functions.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/functions.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/functions.h (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/functions.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -171,8 +169,8 @@
jobjectArray fromPySequence(jclass cls, PyObject *sequence);
PyObject *castCheck(PyObject *obj, jclass cls, int reportError);
-extern PyTypeObject FinalizerClassType;
-extern PyTypeObject FinalizerProxyType;
+extern PyTypeObject FinalizerClass$$Type;
+extern PyTypeObject FinalizerProxy$$Type;
typedef struct {
PyObject_HEAD
Modified: lucene/pylucene/trunk/jcc/jcc/sources/jcc.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/jcc.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/jcc.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/jcc.cpp Thu Feb 26 07:50:20 2009
@@ -1,4 +1,4 @@
-/* ====================================================================
+/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -10,7 +10,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ====================================================================
*/
#include <stdio.h>
@@ -62,7 +61,7 @@
{ NULL, NULL, 0, NULL }
};
-_DLL_EXPORT PyTypeObject JCCEnvType = {
+_DLL_EXPORT PyTypeObject JCCEnv$$Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"jcc.JCCEnv", /* tp_name */
@@ -250,7 +249,7 @@
{
if (env)
{
- t_jccenv *jccenv = (t_jccenv *) JCCEnvType.tp_alloc(&JCCEnvType, 0);
+ t_jccenv *jccenv = (t_jccenv *) JCCEnv$$Type.tp_alloc(&JCCEnv$$Type, 0);
jccenv->env = env;
return (PyObject *) jccenv;
@@ -372,7 +371,7 @@
for (unsigned int i = 0; i < nOptions; i++)
delete vm_options[i].optionString;
- t_jccenv *jccenv = (t_jccenv *) JCCEnvType.tp_alloc(&JCCEnvType, 0);
+ t_jccenv *jccenv = (t_jccenv *) JCCEnv$$Type.tp_alloc(&JCCEnv$$Type, 0);
jccenv->env = new JCCEnv(vm, vm_env);
#ifdef _jcc_lib
Modified: lucene/pylucene/trunk/jcc/jcc/sources/jccfuncs.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/jccfuncs.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/jccfuncs.h (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/jccfuncs.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Modified: lucene/pylucene/trunk/jcc/jcc/sources/macros.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/macros.h?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/macros.h (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/macros.h Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -58,7 +56,7 @@
#define DECLARE_TYPE(name, t_name, base, javaClass, \
init, iter, iternext, getset, mapping, sequence) \
-PyTypeObject name##Type = { \
+PyTypeObject name##$$Type = { \
PyObject_HEAD_INIT(NULL) \
/* ob_size */ 0, \
/* tp_name */ #name, \
@@ -90,7 +88,7 @@
/* tp_methods */ t_name##__methods_, \
/* tp_members */ 0, \
/* tp_getset */ getset, \
- /* tp_base */ &base##Type, \
+ /* tp_base */ &base##$$Type, \
/* tp_dict */ 0, \
/* tp_descr_get */ 0, \
/* tp_descr_set */ 0, \
@@ -103,7 +101,8 @@
{ \
if (!!object) \
{ \
- t_name *self = (t_name *) name##Type.tp_alloc(&name##Type, 0); \
+ t_name *self = \
+ (t_name *) name##$$Type.tp_alloc(&name##$$Type, 0); \
if (self) \
self->object = object; \
return (PyObject *) self; \
@@ -114,7 +113,8 @@
{ \
if (!!object) \
{ \
- t_name *self = (t_name *) name##Type.tp_alloc(&name##Type, 0); \
+ t_name *self = \
+ (t_name *) name##$$Type.tp_alloc(&name##$$Type, 0); \
if (self) \
self->object = javaClass(object); \
return (PyObject *) self; \
@@ -124,19 +124,19 @@
-#define INSTALL_TYPE(name, module) \
- if (PyType_Ready(&name##Type) == 0) \
- { \
- Py_INCREF(&name##Type); \
- PyModule_AddObject(module, #name, (PyObject *) &name##Type); \
+#define INSTALL_TYPE(name, module) \
+ if (PyType_Ready(&name##$$Type) == 0) \
+ { \
+ Py_INCREF(&name##$$Type); \
+ PyModule_AddObject(module, #name, (PyObject *) &name##$$Type); \
}
-#define INSTALL_EXTENSION(name, module) \
- if (PyType_Ready(&name##Type) == 0) \
- { \
- Py_INCREF(&name##Type); \
- name##Type.ob_type = &FinalizerClassType; \
- PyModule_AddObject(module, #name, (PyObject *) &name##Type); \
+#define INSTALL_EXTENSION(name, module) \
+ if (PyType_Ready(&name##$$Type) == 0) \
+ { \
+ Py_INCREF(&name##$$Type); \
+ name##$$Type.ob_type = &FinalizerClass$$Type; \
+ PyModule_AddObject(module, #name, (PyObject *) &name##$$Type); \
}
Modified: lucene/pylucene/trunk/jcc/jcc/sources/types.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/types.cpp?rev=748053&r1=748052&r2=748053&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/types.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/types.cpp Thu Feb 26 07:50:20 2009
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -54,7 +52,7 @@
static PyObject *t_fp_seq_inplace_repeat(t_fp *self, Py_ssize_t n);
-PyTypeObject FinalizerClassType = {
+PyTypeObject FinalizerClass$$Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"jcc.FinalizerClass", /* tp_name */
@@ -115,7 +113,7 @@
(ssizeargfunc)t_fp_seq_inplace_repeat, /* sq_inplace_repeat */
};
-PyTypeObject FinalizerProxyType = {
+PyTypeObject FinalizerProxy$$Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"jcc.FinalizerProxy", /* tp_name */
@@ -164,7 +162,7 @@
if (obj)
{
- t_fp *fp = (t_fp *) FinalizerProxyType.tp_alloc(&FinalizerProxyType, 0);
+ t_fp *fp = (t_fp *) FinalizerProxy$$Type.tp_alloc(&FinalizerProxy$$Type, 0);
fp->object = obj;
obj = (PyObject *) fp;
@@ -309,7 +307,7 @@
};
-PyTypeObject ConstVariableDescriptorType = {
+PyTypeObject ConstVariableDescriptor$$Type = {
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
"jcc.ConstVariableDescriptor", /* tp_name */
@@ -363,7 +361,7 @@
PyObject *make_descriptor(PyTypeObject *value)
{
t_descriptor *self = (t_descriptor *)
- ConstVariableDescriptorType.tp_alloc(&ConstVariableDescriptorType, 0);
+ ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);
if (self)
{
@@ -378,7 +376,7 @@
PyObject *make_descriptor(jclass (*initializeClass)(void))
{
t_descriptor *self = (t_descriptor *)
- ConstVariableDescriptorType.tp_alloc(&ConstVariableDescriptorType, 0);
+ ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);
if (self)
{
@@ -392,7 +390,7 @@
PyObject *make_descriptor(PyObject *value)
{
t_descriptor *self = (t_descriptor *)
- ConstVariableDescriptorType.tp_alloc(&ConstVariableDescriptorType, 0);
+ ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);
if (self)
{
@@ -413,7 +411,7 @@
PyObject *make_descriptor(jboolean b)
{
t_descriptor *self = (t_descriptor *)
- ConstVariableDescriptorType.tp_alloc(&ConstVariableDescriptorType, 0);
+ ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);
if (self)
{
@@ -428,7 +426,7 @@
PyObject *make_descriptor(jbyte value)
{
t_descriptor *self = (t_descriptor *)
- ConstVariableDescriptorType.tp_alloc(&ConstVariableDescriptorType, 0);
+ ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);
if (self)
{
@@ -442,7 +440,7 @@
PyObject *make_descriptor(jchar value)
{
t_descriptor *self = (t_descriptor *)
- ConstVariableDescriptorType.tp_alloc(&ConstVariableDescriptorType, 0);
+ ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);
if (self)
{
@@ -458,7 +456,7 @@
PyObject *make_descriptor(jdouble value)
{
t_descriptor *self = (t_descriptor *)
- ConstVariableDescriptorType.tp_alloc(&ConstVariableDescriptorType, 0);
+ ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);
if (self)
{
@@ -472,7 +470,7 @@
PyObject *make_descriptor(jfloat value)
{
t_descriptor *self = (t_descriptor *)
- ConstVariableDescriptorType.tp_alloc(&ConstVariableDescriptorType, 0);
+ ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);
if (self)
{
@@ -486,7 +484,7 @@
PyObject *make_descriptor(jint value)
{
t_descriptor *self = (t_descriptor *)
- ConstVariableDescriptorType.tp_alloc(&ConstVariableDescriptorType, 0);
+ ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);
if (self)
{
@@ -500,7 +498,7 @@
PyObject *make_descriptor(jlong value)
{
t_descriptor *self = (t_descriptor *)
- ConstVariableDescriptorType.tp_alloc(&ConstVariableDescriptorType, 0);
+ ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);
if (self)
{
@@ -514,7 +512,7 @@
PyObject *make_descriptor(jshort value)
{
t_descriptor *self = (t_descriptor *)
- ConstVariableDescriptorType.tp_alloc(&ConstVariableDescriptorType, 0);
+ ConstVariableDescriptor$$Type.tp_alloc(&ConstVariableDescriptor$$Type, 0);
if (self)
{