jepler/stepcode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove yet more CORBA and ObjectStore stuff... surprised it still exists

Browse source
This commit is contained in:
Mark Pictor 2015-07-26 14:21:52 -04:00
parent 5dfca2ed78
commit 3d90ffdf83
7 changed files with 11 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/cldai/sdaiDaObject.h
View file

@ -9,17 +9,11 @@
typedef char * SDAI_DAObjectID;
// interface PID (ISO/DIS 10303-23:1996(E) 5.3.10.1)
// Also, CORBA POS specification, Section 5.4
//
// The PID class maintains the persistent object identifier for every
// persistent object, objects of class DAObject, and objects of any class
// derived directly or indirectly from DAObject.
//
// POS: The PID identifies one or more locations within a Datastore that
// represent the persistent data of an object and generates a string
// identifier for that data. An object must have a PID in order to store
// its data persistently.
//
/*
The EXPRESS ENTITY application_instance from the SDAI_data_type_schema from
@ -29,7 +23,7 @@ typedef char * SDAI_DAObjectID;
The class DAObject is supported by the classes PID, PID_SDAI and the type
SDAI_DAObjectID as follows:
*/
/// interface PID (ISO/DIS 10303-23:1996(E) 5.3.10.1)
class SC_DAI_EXPORT SDAI_PID : public SDAI_sdaiObject {
public:
@ -67,8 +61,6 @@ typedef SDAI_PID * SDAI_PID_ptr;
typedef SDAI_PID_ptr SDAI_PID_var;
// interface PID_DA (ISO/DIS 10303-23:1996(E) 5.3.10.3)
// Also, CORBA POS specification, Direct Access Protocol, Section 5.10.1
//
// The Direct Access Protocol supports direct access to persistent data
// through typed attributes organized in data objects that are defined
@ -88,7 +80,7 @@ typedef SDAI_PID_ptr SDAI_PID_var;
// may be accessed through this extension to the CosPersistencePID
// interface.
//
/// interface PID_DA (ISO/DIS 10303-23:1996(E) 5.3.10.3)
class SC_DAI_EXPORT SDAI_PID_DA: public SDAI_PID {
public:
@ -120,11 +112,11 @@ class SC_DAI_EXPORT SDAI_PID_DA: public SDAI_PID {
typedef SDAI_PID_DA * SDAI_PID_DA_ptr;
typedef SDAI_PID_DA_ptr SDAI_PID_DA_var;
// interface PID_SDAI (ISO/DIS 10303-23:1996(E) 5.3.10.2)
//
// The PID_SDAI class maintains the persistent object identifier for
// a Model_contents object.
//
/// interface PID_SDAI (ISO/DIS 10303-23:1996(E) 5.3.10.2)
class SC_DAI_EXPORT SDAI_PID_SDAI : public SDAI_PID {
public:
SDAI_String _modelid;
@ -150,8 +142,6 @@ class SC_DAI_EXPORT SDAI_PID_SDAI : public SDAI_PID {
typedef SDAI_PID_SDAI * SDAI_PID_SDAI_ptr;
typedef SDAI_PID_SDAI_ptr SDAI_PID_SDAI_var;
// interface DAObject (ISO/DIS 10303-23:1996(E) 5.3.10.5)
// Also, CORBA POS Section 5.10.2, Direct Access Protocol.
//
// From POS: The DAObject interface provides operations that many data
// object clients need. A Datastore implementation may provide support
@ -166,6 +156,7 @@ class SDAI_DAObject;
typedef SDAI_DAObject * SDAI_DAObject_ptr;
typedef SDAI_DAObject_ptr SDAI_DAObject_var;
/// interface DAObject (ISO/DIS 10303-23:1996(E) 5.3.10.5)
class SC_DAI_EXPORT SDAI_DAObject : public SDAI_sdaiObject {
public:
@ -262,7 +253,7 @@ class SC_DAI_EXPORT SDAI_DAObject : public SDAI_sdaiObject {
void dado_free() { }
};
/*
/**
5.3.10.1 DAObject_SDAI
*/

3
src/exp2cxx/classes_type.c
View file

@ -367,6 +367,9 @@ void TYPEPrint( const Type type, FILES *files, Schema schema ) {
* Prints a bunch of lines for enumeration creation functions (i.e., "cre-
* ate_SdaiEnum1()"). Since this is done both for an enum and for "copies"
* of it (when "TYPE enum2 = enum1"), I placed this code in a separate fn.
*
* NOTE - "Print ObjectStore Access Hook function" comment seen at one of
* the calls seems to imply it's ObjectStore specific...
*/
static void printEnumCreateHdr( FILE * inc, const Type type ) {
const char * nm = TYPEget_ctype( type );

5
src/exp2cxx/fedex_main.c
View file

@ -83,10 +83,9 @@
extern void print_fedex_version( void );
static void exp2cxx_usage( void ) {
fprintf( stderr, "usage: %s [-s|-S] [-a|-A] [-c|-C] [-L] [-v] [-d # | -d 9 -l nnn -u nnn] [-n] [-p <object_type>] {-w|-i <warning>} express_file\n", EXPRESSprogram_name );
fprintf( stderr, "usage: %s [-s|-S] [-a|-A] [-L] [-v] [-d # | -d 9 -l nnn -u nnn] [-n] [-p <object_type>] {-w|-i <warning>} express_file\n", EXPRESSprogram_name );
fprintf( stderr, "where\t-s or -S uses only single inheritance in the generated C++ classes\n" );
fprintf( stderr, "\t-a or -A generates the early bound access functions for entity classes the old way (without an underscore)\n" );
fprintf( stderr, "\t-c or -C generates C++ classes for use with CORBA (Orbix)\n" );
fprintf( stderr, "\t-L prints logging code in the generated C++ classes\n" );
fprintf( stderr, "\t-v produces the version description below\n" );
fprintf( stderr, "\t-d turns on debugging (\"-d 0\" describes this further\n" );
@ -132,7 +131,7 @@ void EXPRESSinit_init( void ) {
EXPRESSsucceed = success;
EXPRESSgetopt = Handle_FedPlus_Args;
/* so the function getopt (see man 3 getopt) will not report an error */
strcat( EXPRESSgetopt_options, "sSlLcCaA" );
strcat( EXPRESSgetopt_options, "sSlLaA" );
ERRORusage_function = exp2cxx_usage;
}

1
src/exp2python/src/classes_misc_python.c
View file

@ -19,7 +19,6 @@ N350 ( August 31, 1993 ) of ISO 10303 TC184/SC4/WG7.
*******************************************************************/
extern int multiple_inheritance;
/*extern int corba_binding; */
/******************************************************************
** The following functions will be used ***

5
src/exp2python/src/classes_python.c
View file

@ -57,13 +57,11 @@ N350 ( August 31, 1993 ) of ISO 10303 TC184/SC4/WG7.
int isAggregateType( const Type t );
int isAggregate( Variable a );
Variable VARis_type_shifter( Variable a );
const char * ENTITYget_CORBAname( Entity ent );
const char * GetTypeDescriptorName( Type t );
void TYPEselect_lib_print( const Type type, FILE * f );
int multiple_inheritance = 1;
int print_logging = 0;
int corba_binding = 0;
int old_accessors = 0;
/* several classes use attr_count for naming attr dictionary entry
@ -176,9 +174,6 @@ int Handle_FedPlus_Args( int i, char * arg ) {
if( ( char )i == 'L' ) {
print_logging = 1;
}
if( ( ( char )i == 'c' ) || ( ( char )i == 'C' ) ) {
corba_binding = 1;
}
return 0;
}

2
src/exp2python/src/classes_wrapper_python.cc
View file

@ -4,8 +4,6 @@
#include "complexSupport.h"
extern int corba_binding;
void use_ref( Schema, Express, FILES * );
/******************************************************************

68
src/exp2python/src/fedex_main_python.c
View file

@ -1,75 +1,9 @@
/************************************************************************
** Driver for Fed-X Express parser.
************************************************************************/
/* Driver for exp2python (generation of python from EXPRESS) */
/*
* This software was developed by U.S. Government employees as part of
* their official duties and is not subject to copyright.
*
* $Log: fedex_main.c,v $
* Revision 3.0.1.3 1997/11/05 23:12:18 sauderd
* Adding a new state DP3.1 and associated revision
*
* Revision 3.0.1.2 1997/09/26 15:59:10 sauderd
* Finished implementing the -a option (changed from -e) to generate the early
* bound access functions the old way. Implemented the change to generate them
* the new correct way by default.
*
* Revision 3.0.1.1 1997/09/18 21:18:41 sauderd
* Added a -e or -E option to generate attribute get and put functions the old
* way (without an underscore). It sets the variable old_accessors. This doesn't
* currently do anything. It needs to be implemented to generate attr funcs
* correctly.
*
* Revision 3.0.1.0 1997/04/16 19:29:03 dar
* Setting the first branch
*
* Revision 3.0 1997/04/16 19:29:02 dar
* STEP Class Library Pre Release 3.0
*
* Revision 2.1.0.5 1997/03/11 15:33:59 sauderd
* Changed code so that if exp2python is passed the -c or -C option it would
* generate implementation objects for Orbix (CORBA). Look for code that is
* inside stmts such as if(corba_binding)
*
* Revision 2.1.0.4 1996/09/25 22:56:55 sauderd
* Added a command line argument for logging SCL use. The option added is -l or
* -L. It also says the option in the usage stmt when you run exp2python without
* an argument. Added the options to the EXPRESSgetopt_options string.
*
* Revision 2.1.0.3 1996/06/18 18:14:17 sauderd
* Changed the line that gets printed when you run exp2python with no
* arguments to include the option for single inheritance.
*
* Revision 2.1.0.2 1995/05/19 22:40:03 sauderd
* Added a command line argument -s or -S for generating code based on the old
* method as opposed to the new method of multiple inheritance.
*
* Revision 2.1.0.1 1995/05/16 19:52:18 lubell
* setting state to dp21
*
* Revision 2.1.0.0 1995/05/12 18:53:48 lubell
* setting branch
*
* Revision 2.1 1995/05/12 18:53:47 lubell
* changing version to 2.1
*
* Revision 1.7 1995/03/16 20:58:50 sauderd
* ? changes.
*
* Revision 1.6 1992/09/29 15:46:55 libes
* added messages for KC
*
* Revision 1.5 1992/08/27 23:28:52 libes
* moved Descriptor "new"s to precede assignments
* punted SELECT type
*
* Revision 1.4 1992/08/19 18:49:59 libes
* registry support
*
* Revision 1.3 1992/06/05 19:55:28 libes
* Added * to typedefs. Replaced warning kludges with ERRORoption.
*/
#include <stdlib.h>