From 7068f0c092a47b81fba0ede028d5b8a6b28eb2bc Mon Sep 17 00:00:00 2001 From: The Coriolis Project Date: Mon, 17 Nov 2008 21:55:03 +0000 Subject: [PATCH] Init -> init --- hurricane/src/isobar/PyBox.cpp | 8 +- hurricane/src/isobar/PyContact.cpp | 2 +- hurricane/src/isobar/PyDbU.cpp | 6 +- hurricane/src/isobar/PyHorizontal.cpp | 2 +- hurricane/src/isobar/PyHurricane.cpp | 98 +++++++++---------- hurricane/src/isobar/PyInstance.cpp | 2 +- hurricane/src/isobar/PyName.cpp | 2 +- hurricane/src/isobar/PyOccurrence.cpp | 2 +- hurricane/src/isobar/PyPath.cpp | 4 +- hurricane/src/isobar/PyPin.cpp | 2 +- hurricane/src/isobar/PyPoint.cpp | 2 +- hurricane/src/isobar/PyReference.cpp | 2 +- hurricane/src/isobar/PyTransformation.cpp | 12 +-- hurricane/src/isobar/PyVertical.cpp | 2 +- .../src/isobar/hurricane/isobar/PyHurricane.h | 10 +- 15 files changed, 77 insertions(+), 79 deletions(-) diff --git a/hurricane/src/isobar/PyBox.cpp b/hurricane/src/isobar/PyBox.cpp index 8852c694..62e45692 100644 --- a/hurricane/src/isobar/PyBox.cpp +++ b/hurricane/src/isobar/PyBox.cpp @@ -192,7 +192,7 @@ extern "C" { HTRY - __cs.Init ("Box.contains"); + __cs.init ("Box.contains"); if ( ! PyArg_ParseTuple(args,"|O&O&:Box.contains",Converter,&arg0,Converter,&arg1) ) return ( NULL ); @@ -293,7 +293,7 @@ extern "C" { HTRY - __cs.Init ("Box.inflate"); + __cs.init ("Box.inflate"); if ( ! PyArg_ParseTuple(args,"|O&O&O&O&:Box.inflate",Converter,&arg0,Converter,&arg1) ) return ( NULL ); @@ -335,7 +335,7 @@ extern "C" { HTRY - __cs.Init ("Box.merge"); + __cs.init ("Box.merge"); if ( ! PyArg_ParseTuple(args,"|O&O&O&O&:Box.merge",Converter,&arg0,Converter,&arg1,Converter,&arg2,Converter,&arg3) ) return ( NULL ); @@ -427,7 +427,7 @@ extern "C" { PyObject* arg2; PyObject* arg3; - __cs.Init ("Box.new"); + __cs.init ("Box.new"); if ( ! PyArg_ParseTuple(args,"|O&O&O&O&:Box.new" ,Converter,&arg0 ,Converter,&arg1 diff --git a/hurricane/src/isobar/PyContact.cpp b/hurricane/src/isobar/PyContact.cpp index 544dd340..9c5dacaa 100644 --- a/hurricane/src/isobar/PyContact.cpp +++ b/hurricane/src/isobar/PyContact.cpp @@ -139,7 +139,7 @@ extern "C" { HTRY - __cs.Init ("Contact.new"); + __cs.init ("Contact.new"); if ( ! PyArg_ParseTuple(args,"O&O&O&O&|O&O&:Contact.new" ,Converter,&arg0 ,Converter,&arg1 diff --git a/hurricane/src/isobar/PyDbU.cpp b/hurricane/src/isobar/PyDbU.cpp index bc1ff7bc..5c0530ce 100644 --- a/hurricane/src/isobar/PyDbU.cpp +++ b/hurricane/src/isobar/PyDbU.cpp @@ -86,7 +86,7 @@ extern "C" { HTRY - __cs.Init ( "DbU.db" ); + __cs.init ( "DbU.db" ); if ( ! PyArg_ParseTuple(args,"|O&:DbU.db",Converter,&arg0) ) return ( NULL ); @@ -114,7 +114,7 @@ extern "C" { HTRY - __cs.Init ( "DbU.grid" ); + __cs.init ( "DbU.grid" ); if ( ! PyArg_ParseTuple(args,"|O&:DbU.grid",Converter,&arg0) ) return ( NULL ); @@ -142,7 +142,7 @@ extern "C" { HTRY - __cs.Init ( "DbU.symbolic" ); + __cs.init ( "DbU.symbolic" ); if ( ! PyArg_ParseTuple(args,"|O&:DbU.symbolic",Converter,&arg0) ) return ( NULL ); diff --git a/hurricane/src/isobar/PyHorizontal.cpp b/hurricane/src/isobar/PyHorizontal.cpp index 2d382103..1154c3a2 100644 --- a/hurricane/src/isobar/PyHorizontal.cpp +++ b/hurricane/src/isobar/PyHorizontal.cpp @@ -122,7 +122,7 @@ extern "C" { HTRY - __cs.Init ("Horizontal.create"); + __cs.init ("Horizontal.create"); if ( ! PyArg_ParseTuple(args,"O&O&O&|O&O&O&O&:Horizontal.create" ,Converter,&arg0 ,Converter,&arg1 diff --git a/hurricane/src/isobar/PyHurricane.cpp b/hurricane/src/isobar/PyHurricane.cpp index ad3b861f..46b47228 100644 --- a/hurricane/src/isobar/PyHurricane.cpp +++ b/hurricane/src/isobar/PyHurricane.cpp @@ -198,9 +198,9 @@ using namespace Hurricane; // ------------------------------------------------------------------- -// Method : "::ConverterState::AddType ()" +// Method : "::ConverterState::addType ()" - void ConverterState::AddType ( char* id + void ConverterState::addType ( char* id , PyTypeObject* pyType , char* name , bool isPythonType @@ -301,11 +301,11 @@ using namespace Hurricane; // ------------------------------------------------------------------- -// Method : "::ConverterState::Init ()" +// Method : "::ConverterState::init ()" - void ConverterState::Init ( char* function, char* inheritStop ) { + void ConverterState::init ( char* function, char* inheritStop ) { _objectIds = ""; - SetFunction ( function ); + setFunction ( function ); ObjectType::_inheritStop = inheritStop; }; @@ -323,7 +323,7 @@ using namespace Hurricane; if ( PyCallable_Check(object) || baseType ) { *pArg = object; i = baseType->_index; - __cs.AddId ( baseType->_id ); + __cs.addId ( baseType->_id ); if ( ! __cs.getTypes()[i]->_isPythonType ) { void** member = ( (void**)( (unsigned long)object + __objectOffset ) ); @@ -362,7 +362,7 @@ using namespace Hurricane; bool ParseOneArg ( char* function, PyObject* args, string format, PyObject** arg ) { ostringstream message; - __cs.Init ( function ); + __cs.init ( function ); if ( ! PyArg_ParseTuple(args,"O&",Converter,arg) ) return ( false ); string firstArgType = ConverterState::getObjectType ( __cs.getObjectIds(), 0 ); @@ -382,7 +382,7 @@ using namespace Hurricane; bool ParseTwoArg ( char* function, PyObject* args, string format, PyObject** arg0, PyObject** arg1 ) { ostringstream message; - __cs.Init ( function ); + __cs.init ( function ); if ( ! PyArg_ParseTuple(args,"O&O&",Converter,arg0,Converter,arg1) ) return ( false ); string firstArgType = ConverterState::getObjectType ( __cs.getObjectIds(), 0 ); @@ -408,9 +408,7 @@ using namespace Hurricane; bool ParseThreeArg ( char* function, PyObject* args, string format, PyObject** arg0, PyObject** arg1, PyObject** arg2 ) { ostringstream message; - cerr << "akecoucou2" << endl; - - __cs.Init ( function ); + __cs.init ( function ); if ( ! PyArg_ParseTuple(args,"O&O&O&",Converter,arg0,Converter,arg1,Converter,arg2) ) return ( false ); string firstArgType = ConverterState::getObjectType ( __cs.getObjectIds(), 0 ); @@ -620,47 +618,47 @@ extern "C" { // Identifier string can take up to 10 characters ! - __cs.AddType ( "box" , &PyTypeBox , "" , false ); - __cs.AddType ( "ent" , &PyTypeEntity , "" , false ); - __cs.AddType ( "cell" , &PyTypeCell , "" , false, "ent" ); - __cs.AddType ( "cellCol" , &PyTypeCellCollection , "" , false ); - __cs.AddType ( "comp" , &PyTypeComponent , "" , false, "ent" ); - __cs.AddType ( "compCol" , &PyTypeComponentCollection, "" , false ); - __cs.AddType ( "contact" , &PyTypeContact , "" , false, "comp" ); + __cs.addType ( "box" , &PyTypeBox , "" , false ); + __cs.addType ( "ent" , &PyTypeEntity , "" , false ); + __cs.addType ( "cell" , &PyTypeCell , "" , false, "ent" ); + __cs.addType ( "cellCol" , &PyTypeCellCollection , "" , false ); + __cs.addType ( "comp" , &PyTypeComponent , "" , false, "ent" ); + __cs.addType ( "compCol" , &PyTypeComponentCollection, "" , false ); + __cs.addType ( "contact" , &PyTypeContact , "" , false, "comp" ); // Do not change the "none" string. It's hardwired to the None object. - __cs.AddType ( "none" , Py_None->ob_type , "" , true ); - __cs.AddType ( "float" , &PyFloat_Type , "" , true ); - __cs.AddType ( "int" , &PyInt_Type , "" , true ); - __cs.AddType ( "bool" , &PyBool_Type , "" , true ); - __cs.AddType ( "string" , &PyString_Type , "" , true ); - __cs.AddType ( "list" , &PyList_Type , "" , true ); + __cs.addType ( "none" , Py_None->ob_type , "" , true ); + __cs.addType ( "float" , &PyFloat_Type , "" , true ); + __cs.addType ( "int" , &PyInt_Type , "" , true ); + __cs.addType ( "bool" , &PyBool_Type , "" , true ); + __cs.addType ( "string" , &PyString_Type , "" , true ); + __cs.addType ( "list" , &PyList_Type , "" , true ); // Do not change the "function" string. It's hardwired to callable (function) objects. - __cs.AddType ( "function" , NULL , "" , true ); - __cs.AddType ( "horiz" , &PyTypeHorizontal , "" , false, "segment" ); - __cs.AddType ( "inst" , &PyTypeInstance , "" , false, "ent" ); - __cs.AddType ( "instCol" , &PyTypeInstanceCollection, "" , false ); - __cs.AddType ( "layer" , &PyTypeLayer , "" , false ); - __cs.AddType ( "library" , &PyTypeLibrary , "" , false ); - __cs.AddType ( "name" , &PyTypeName , "" , false ); - __cs.AddType ( "ref" , &PyTypeReference , "" , false, "ent" ); - __cs.AddType ( "refCol" , &PyTypeReferenceCollection, "" , false ); - __cs.AddType ( "net" , &PyTypeNet , "" , false, "ent" ); - __cs.AddType ( "netCol" , &PyTypeNetCollection , "" , false ); - __cs.AddType ( "hyperNet" , &PyTypeHyperNet , "" , false ); - __cs.AddType ( "pin" , &PyTypePin , "" , false, "contact" ); - __cs.AddType ( "pinCol" , &PyTypePinCollection , "" , false ); - __cs.AddType ( "plug" , &PyTypePlug , "" , false, "comp" ); - __cs.AddType ( "plugCol" , &PyTypePlugCollection , "" , false ); - __cs.AddType ( "point" , &PyTypePoint , "" , false ); - __cs.AddType ( "segment" , &PyTypeSegment , "" , false, "comp" ); - __cs.AddType ( "segmentCol" , &PyTypeSegmentCollection, "", false ); - __cs.AddType ( "db" , &PyTypeDataBase , "" , false ); - __cs.AddType ( "techno" , &PyTypeTechnology , "" , false ); - __cs.AddType ( "transfo" , &PyTypeTransformation , "" , false ); - __cs.AddType ( "vert" , &PyTypeVertical , "" , false, "segment" ); - __cs.AddType ( "path" , &PyTypePath , "" , false ); - __cs.AddType ( "occur" , &PyTypeOccurrence , "" , false ); - __cs.AddType ( "occurCol" , &PyTypeOccurrenceCollection, "", false ); + __cs.addType ( "function" , NULL , "" , true ); + __cs.addType ( "horiz" , &PyTypeHorizontal , "" , false, "segment" ); + __cs.addType ( "inst" , &PyTypeInstance , "" , false, "ent" ); + __cs.addType ( "instCol" , &PyTypeInstanceCollection, "" , false ); + __cs.addType ( "layer" , &PyTypeLayer , "" , false ); + __cs.addType ( "library" , &PyTypeLibrary , "" , false ); + __cs.addType ( "name" , &PyTypeName , "" , false ); + __cs.addType ( "ref" , &PyTypeReference , "" , false, "ent" ); + __cs.addType ( "refCol" , &PyTypeReferenceCollection, "" , false ); + __cs.addType ( "net" , &PyTypeNet , "" , false, "ent" ); + __cs.addType ( "netCol" , &PyTypeNetCollection , "" , false ); + __cs.addType ( "hyperNet" , &PyTypeHyperNet , "" , false ); + __cs.addType ( "pin" , &PyTypePin , "" , false, "contact" ); + __cs.addType ( "pinCol" , &PyTypePinCollection , "" , false ); + __cs.addType ( "plug" , &PyTypePlug , "" , false, "comp" ); + __cs.addType ( "plugCol" , &PyTypePlugCollection , "" , false ); + __cs.addType ( "point" , &PyTypePoint , "" , false ); + __cs.addType ( "segment" , &PyTypeSegment , "" , false, "comp" ); + __cs.addType ( "segmentCol" , &PyTypeSegmentCollection, "", false ); + __cs.addType ( "db" , &PyTypeDataBase , "" , false ); + __cs.addType ( "techno" , &PyTypeTechnology , "" , false ); + __cs.addType ( "transfo" , &PyTypeTransformation , "" , false ); + __cs.addType ( "vert" , &PyTypeVertical , "" , false, "segment" ); + __cs.addType ( "path" , &PyTypePath , "" , false ); + __cs.addType ( "occur" , &PyTypeOccurrence , "" , false ); + __cs.addType ( "occurCol" , &PyTypeOccurrenceCollection, "", false ); PyObject* module = Py_InitModule ( "Hurricane", PyHurricane_Methods ); diff --git a/hurricane/src/isobar/PyInstance.cpp b/hurricane/src/isobar/PyInstance.cpp index cdb725b0..43dbfd2b 100644 --- a/hurricane/src/isobar/PyInstance.cpp +++ b/hurricane/src/isobar/PyInstance.cpp @@ -448,7 +448,7 @@ extern "C" { PyObject* arg3; HTRY - __cs.Init ("Instance.new"); + __cs.init ("Instance.new"); if ( ! PyArg_ParseTuple(args,"O&O&O&|O&:Instance.new" ,Converter,&arg0 ,Converter,&arg1 diff --git a/hurricane/src/isobar/PyName.cpp b/hurricane/src/isobar/PyName.cpp index fc09cda5..cd5a0f93 100644 --- a/hurricane/src/isobar/PyName.cpp +++ b/hurricane/src/isobar/PyName.cpp @@ -108,7 +108,7 @@ extern "C" { Name* name = NULL; PyObject* arg0; - __cs.Init ("Name.new"); + __cs.init ("Name.new"); if (!PyArg_ParseTuple(args,"|O&:Name.new",Converter,&arg0)) { PyErr_SetString ( ConstructorError, "invalid number of parameters for Name constructor." ); return NULL; diff --git a/hurricane/src/isobar/PyOccurrence.cpp b/hurricane/src/isobar/PyOccurrence.cpp index f7bfcf29..9ef81fa0 100644 --- a/hurricane/src/isobar/PyOccurrence.cpp +++ b/hurricane/src/isobar/PyOccurrence.cpp @@ -250,7 +250,7 @@ extern "C" { PyObject* arg0; PyObject* arg1; - __cs.Init ("Occurrence.new"); + __cs.init ("Occurrence.new"); if ( ! PyArg_ParseTuple(args,"|O&O&:Occurrence.new" ,Converter,&arg0 ,Converter,&arg1 diff --git a/hurricane/src/isobar/PyPath.cpp b/hurricane/src/isobar/PyPath.cpp index dc30a28f..de8ba464 100644 --- a/hurricane/src/isobar/PyPath.cpp +++ b/hurricane/src/isobar/PyPath.cpp @@ -237,7 +237,7 @@ extern "C" { PyTransformation* pyTransf = PyObject_NEW ( PyTransformation, &PyTypeTransformation ); if ( pyTransf == NULL ) { return NULL; } - __cs.Init ("Path.getTransformation"); + __cs.init ("Path.getTransformation"); if ( ! PyArg_ParseTuple(args,"|O&:Path.getTransformation",Converter,&arg0) ) return ( NULL ); HTRY @@ -321,7 +321,7 @@ extern "C" { PyObject* arg1 = NULL; PyPath* pyPath = NULL; - __cs.Init ("Path.new"); + __cs.init ("Path.new"); if ( ! PyArg_ParseTuple(args,"|O&O&:Path.new" ,Converter,&arg0 ,Converter,&arg1 diff --git a/hurricane/src/isobar/PyPin.cpp b/hurricane/src/isobar/PyPin.cpp index c26ee310..c34bc455 100644 --- a/hurricane/src/isobar/PyPin.cpp +++ b/hurricane/src/isobar/PyPin.cpp @@ -171,7 +171,7 @@ extern "C" { PyObject* arg7; PyObject* arg8; - __cs.Init ("Pin.new"); + __cs.init ("Pin.new"); if (!PyArg_ParseTuple(args,"O&O&O&O&O&O&O&|O&O&:Pin.new" , Converter, &arg0 , Converter, &arg1 diff --git a/hurricane/src/isobar/PyPoint.cpp b/hurricane/src/isobar/PyPoint.cpp index fd071877..aeac6921 100644 --- a/hurricane/src/isobar/PyPoint.cpp +++ b/hurricane/src/isobar/PyPoint.cpp @@ -143,7 +143,7 @@ extern "C" { PyObject* arg0; PyObject* arg1; - __cs.Init ("Point.create"); + __cs.init ("Point.create"); if ( ! PyArg_ParseTuple(args,"|O&O&:Point.create" ,Converter,&arg0 ,Converter,&arg1 diff --git a/hurricane/src/isobar/PyReference.cpp b/hurricane/src/isobar/PyReference.cpp index a63e6488..0d11e4b3 100644 --- a/hurricane/src/isobar/PyReference.cpp +++ b/hurricane/src/isobar/PyReference.cpp @@ -195,7 +195,7 @@ extern "C" { HTRY - __cs.Init ("Reference.new"); + __cs.init ("Reference.new"); if ( ! PyArg_ParseTuple(args,"O&O&O&|O&:Reference.new" ,Converter,&arg0 ,Converter,&arg1 diff --git a/hurricane/src/isobar/PyTransformation.cpp b/hurricane/src/isobar/PyTransformation.cpp index 8720692d..fd91e4b4 100644 --- a/hurricane/src/isobar/PyTransformation.cpp +++ b/hurricane/src/isobar/PyTransformation.cpp @@ -167,7 +167,7 @@ extern "C" { HTRY - __cs.Init ("Transformation.getX"); + __cs.init ("Transformation.getX"); if ( ! PyArg_ParseTuple(args,"|O&O&:Transformation.getX",Converter,&arg0,Converter,&arg1) ) return ( NULL ); @@ -202,7 +202,7 @@ extern "C" { HTRY - __cs.Init ("Transformation.getY"); + __cs.init ("Transformation.getY"); if ( ! PyArg_ParseTuple(args,"|O&O&:Transformation.getY",Converter,&arg0,Converter,&arg1) ) return ( NULL ); @@ -321,7 +321,7 @@ extern "C" { PyObject* arg1; Point result; - __cs.Init ("Transformation.getPoint"); + __cs.init ("Transformation.getPoint"); if ( ! PyArg_ParseTuple(args,"|O&O&:Transformation.getPoint",Converter,&arg0,Converter,&arg1) ) return ( NULL ); @@ -367,7 +367,7 @@ extern "C" { PyObject* arg3; Box result; - __cs.Init ("Transformation.getBox"); + __cs.init ("Transformation.getBox"); if ( ! PyArg_ParseTuple(args,"|O&O&O&O&:Transformation.getBox" ,Converter,&arg0 ,Converter,&arg1 @@ -472,7 +472,7 @@ extern "C" { HTRY - __cs.Init ("Transformation.ApplyOn"); + __cs.init ("Transformation.ApplyOn"); if ( ! PyArg_ParseTuple(args,"|O&O&:Transformation.ApplyOn",Converter,&arg0,Converter,&arg1) ) return ( NULL ); @@ -551,7 +551,7 @@ extern "C" { PyObject* arg1; PyObject* arg2; - __cs.Init ("Transformation.new"); + __cs.init ("Transformation.new"); if ( ! PyArg_ParseTuple(args,"|O&O&O&:Transformation.new" ,Converter,&arg0 ,Converter,&arg1 diff --git a/hurricane/src/isobar/PyVertical.cpp b/hurricane/src/isobar/PyVertical.cpp index 0fccb3f1..b608eacc 100644 --- a/hurricane/src/isobar/PyVertical.cpp +++ b/hurricane/src/isobar/PyVertical.cpp @@ -117,7 +117,7 @@ extern "C" { Vertical* vertical = NULL; HTRY - __cs.Init ("Vertical.new"); + __cs.init ("Vertical.new"); if (!PyArg_ParseTuple(args,"O&O&O&|O&O&O&O&:Vertical.new" ,Converter,&arg0 ,Converter,&arg1 diff --git a/hurricane/src/isobar/hurricane/isobar/PyHurricane.h b/hurricane/src/isobar/hurricane/isobar/PyHurricane.h index dcbe391e..693593d6 100644 --- a/hurricane/src/isobar/hurricane/isobar/PyHurricane.h +++ b/hurricane/src/isobar/hurricane/isobar/PyHurricane.h @@ -116,11 +116,11 @@ using namespace std; public: char* getFunction () const { return ( _function ); }; public: int getSize () const { return ( _objectIds.size() ); }; public: const ObjectTypeVector& getTypes () const { return ( _types ); }; - public: void AddObject ( PyObject* object ) { _objectIds += getObjectId ( object ); }; - public: void AddId ( char* id ) { _objectIds += ":"; _objectIds += id; }; - public: void SetFunction ( char* function ) { _function = function; }; - public: void Init ( char* function, char* inheritStop="comp" ); - public: void AddType ( char* id, PyTypeObject* pyType, char* name, bool isPythonType, char* idBase="" ); + public: void addObject ( PyObject* object ) { _objectIds += getObjectId ( object ); }; + public: void addId ( char* id ) { _objectIds += ":"; _objectIds += id; }; + public: void setFunction ( char* function ) { _function = function; }; + public: void init ( char* function, char* inheritStop="comp" ); + public: void addType ( char* id, PyTypeObject* pyType, char* name, bool isPythonType, char* idBase="" ); public: static string getObjectType ( string objectsTypes, unsigned n ); };