Skip to content

Commit 5126b48

Browse files
committed
Rename fedex_python and fedex_plus to exp2python and exp2cxx respectively.
1 parent 76e2b2b commit 5126b48

File tree

105 files changed

+248
-248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+248
-248
lines changed

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ OPTION_WITH_DEFAULT(SC_BUILD_SHARED_LIBS "Build shared libs" ON )
7979
# don't build static libs by default
8080
OPTION_WITH_DEFAULT(SC_BUILD_STATIC_LIBS "Build static libs" OFF)
8181

82-
OPTION_WITH_DEFAULT(SC_PYTHON_GENERATOR "Compile fedex_python" ON)
83-
OPTION_WITH_DEFAULT(SC_CPP_GENERATOR "Compile fedex_plus" ON)
82+
OPTION_WITH_DEFAULT(SC_PYTHON_GENERATOR "Compile exp2python" ON)
83+
OPTION_WITH_DEFAULT(SC_CPP_GENERATOR "Compile exp2cxx" ON)
8484

8585
OPTION_WITH_DEFAULT(SC_MEMMGR_ENABLE_CHECKS "Enable sc_memmgr's memory leak detection" OFF)
86-
OPTION_WITH_DEFAULT(SC_TRACE_FPRINTF "Enable extra comments in generated code so the code's source in fedex_plus may be located" OFF)
86+
OPTION_WITH_DEFAULT(SC_TRACE_FPRINTF "Enable extra comments in generated code so the code's source in exp2cxx may be located" OFF)
8787

8888
if(NOT DEFINED SC_SDAI_ADDITIONAL_EXES_SRCS )
8989
set( SC_SDAI_ADDITIONAL_EXES_SRCS "" CACHE STRING "Source files for additional executables to be linked with SDAI libs" )
@@ -386,8 +386,8 @@ include_directories(
386386
ADD_SUBDIRECTORY(src/base)
387387
ADD_SUBDIRECTORY(src/express)
388388
ADD_SUBDIRECTORY(src/exppp)
389-
ADD_SUBDIRECTORY(src/fedex_plus)
390-
ADD_SUBDIRECTORY(src/fedex_python)
389+
ADD_SUBDIRECTORY(src/exp2cxx)
390+
ADD_SUBDIRECTORY(src/exp2python)
391391
ADD_SUBDIRECTORY(src/clstepcore)
392392
ADD_SUBDIRECTORY(src/cleditor)
393393
ADD_SUBDIRECTORY(src/cldai)
@@ -404,7 +404,7 @@ ADD_SUBDIRECTORY(doc)
404404

405405
# this is for testing - 'make core' builds everything that isn't generated
406406
add_custom_target( core )
407-
add_dependencies( core stepdai check-express stepeditor fedex_plus )
407+
add_dependencies( core stepdai check-express stepeditor exp2cxx )
408408

409409
if(NOT SC_IS_SUBBUILD)
410410
###############################################################################

NEWS

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ New since v0.5:
3131
* Add AP219, AP238, PDM schema, AP203a1, syntax highlighting files
3232
* Improvements to CMake files, mostly from Cliff @ BRL-CAD (#143, #163, #181)
3333
* Allow runtime bounds for aggregates (discovered with AP209e2) (#166)
34-
* fedex_plus fprintf's can be traced with -DSCL_TRACE_FPRINTF=ON (#176)
34+
* exp2cxx fprintf's can be traced with -DSCL_TRACE_FPRINTF=ON (#176)
3535
************************************************************************
3636
Release 0.5 (Feb 23, 2012)
3737

@@ -42,7 +42,7 @@ New since v0.4:
4242
with the exception of AP209 CD, are parsed without error. Enums are
4343
now in their own dictionary. Allow indexing on aggregates, generics,
4444
and binaries.
45-
* Changes to fedex_plus that improve the generated c++ - use a
45+
* Changes to exp2cxx that improve the generated c++ - use a
4646
namespace, break up large static strings, make EXPRESS multiple
4747
inheritance work by not printing multiple copies of inherited members.
4848
All schemas now compile without error, but there are numerous warnings.
@@ -55,7 +55,7 @@ Release 0.4 (Nov 13, 2011)
5555

5656
New since v0.3:
5757
* Improve p21read performance by ~30%
58-
* Improve fedex_plus performance by ~4300% (!)
58+
* Improve exp2cxx performance by ~4300% (!)
5959
* A variable defined in a LOCAL is not required to have a type label
6060
(affected ap242,210e3,209)
6161
* Enums and entities are allowed to have the same names
@@ -81,7 +81,7 @@ Release 0.2 (Oct 1, 2011)
8181
What's new since v0.1?
8282

8383
* Retrieve aggregate type from the underlying type (issue #4)
84-
* Fix aggregate select types naming convention in fedex_plus (issue #59)
84+
* Fix aggregate select types naming convention in exp2cxx (issue #59)
8585
* Fix several segfaults and double free's in p21read (issue #63)
8686
* Fix several file read/write bugs in p21read, including
8787
* don't write '$' for empty string
@@ -113,7 +113,7 @@ What's new since the SCL 3.2 release in 1998?
113113
* Bring SCL closer to alignment with modern coding standards - replace
114114
String class with std::string, fix all GCC warnings
115115
* Builds on Linux, OSX, and Windows; requires mingw on Windows.
116-
* Add debugging option -d 9 -l nnn -u nnn to fedex_plus. This limits
116+
* Add debugging option -d 9 -l nnn -u nnn to exp2cxx. This limits
117117
parser debug output to a specified range of lines in the schema.
118118

119119
For a detailed list of changes, see
@@ -194,7 +194,7 @@ REFERENCE FROM clauses, global rules, PROCEDUREs, and
194194
FUNCTIONS. Information about these objects is available but validation
195195
based on it is not performed.
196196

197-
- enhanced fedex_plus C++ code generator to generate the necessary
197+
- enhanced exp2cxx C++ code generator to generate the necessary
198198
dictionary objects for the above EXPRESS constructs for a particular
199199
schema. Also enhanced schema dictionary code generation to add
200200
information necessary to generate an EXPRESS schema (i.e. which
@@ -332,14 +332,14 @@ namespace or prefix as is necessary. To change the SDAI namespace name
332332
or prefix name the macro definition for SDAI_ could be changed in
333333
the sclprefixes.h file.
334334

335-
The early bound access functions that are generated by fedex_plus from
335+
The early bound access functions that are generated by exp2cxx from
336336
EXPRESS defined entities have been updated to the latest version of
337337
Part 23's C++ binding to SDAI. A previous early bound function defined
338338
as "const SdaiLabel Name()" would now be defined according to Part 23 as
339339
"const SdaiLabel name_()". *notice* that application schema defined
340340
types are not yet defined in a namespace. Compatibility with previous
341341
versions of SCL early bound functions has been maintained via the -a
342-
fedex_plus option.
342+
exp2cxx option.
343343

344344
-----------------------------------------------------
345345
SDAI Session Schema objects implemented (model_contents, extents, etc)
@@ -349,7 +349,7 @@ Several classes and types defined as part of SDAI Part 23's Session
349349
Schema have been implemented (where before they mostly had stub
350350
functions). These have been implemented for use with or without the
351351
ObjectStore object oriented database. Model_contents_<schema_name> is
352-
now being generated by fedex_plus allowing Entity_extents to be
352+
now being generated by exp2cxx allowing Entity_extents to be
353353
maintained for entities as desired.
354354

355355
-----------------------------------------------------
@@ -365,7 +365,7 @@ database.
365365

366366
The SCL application, fedex_os, uses an application schema written in
367367
EXPRESS to generate additional code needed for use with ObjectStore.
368-
Fedex_os is used in conjunction with fedex_plus for generating the C++
368+
Fedex_os is used in conjunction with exp2cxx for generating the C++
369369
necessary to implement your application schema.
370370

371371
Although building SCL libraries for use with ObjectStore is
@@ -410,7 +410,7 @@ schema. The generation of IDL schemas by fedex_idl is according to
410410
STEP's Part 26 Interface Definition Language binding to the SDAI. The
411411
Orbix IDL compiler is then used to generate the client and server code
412412
necessary for communication through an Orbix ORB. The SCL application,
413-
fedex_plus, would then be run with the -c option on your application's
413+
exp2cxx, would then be run with the -c option on your application's
414414
EXPRESS schema to generate the server implementation objects required
415415
to build an Orbix server (it uses the TIE approach). You would be
416416
required to write the C++ main() function for the server code.
@@ -457,15 +457,15 @@ MULTIPLE SCHEMA SUPPORT
457457

458458
A library and Data Probe can now be generated for an EXPRESS file
459459
containing multiple schemas. This is done primarily by dividing the
460-
source code generated by fedex_plus into separate files. Separate
460+
source code generated by exp2cxx into separate files. Separate
461461
files are generated for each schema contained in the EXPRESS file. In
462462
addition, often schemas are dependent on one another. This will be
463463
the case if the schemas use and reference entities and types from each
464464
other. If, for example, entity X in schema A is a subtype of entity Y
465465
in schema B, X will not be processed until B in schema Y is processed.
466466
Other such cases of interdependence occur if an entity in schema A
467467
contains as an attribute an enumeration or select type defined in
468-
another schema. To address such cases, fedex_plus may process a
468+
another schema. To address such cases, exp2cxx may process a
469469
schema in multiple passes. At each pass, only the objects in the
470470
schema which are not dependent on not-yet-processed objects in other
471471
schemas are processed. At each successive pass through the schemas as
@@ -477,16 +477,16 @@ B which is a supertype of C, etc.).
477477
For an EXPRESS file with multiple dependent schemas, it is advisable
478478
to organize the file with bottom-up design. Schemas containing the
479479
simpler, building block types and entities should appear first. By
480-
doing so, when fedex_plus begins processing the more complex schemas,
480+
doing so, when exp2cxx begins processing the more complex schemas,
481481
there will be fewer cases in which the parser will encounter not-yet-
482482
defined objects from other schemas. (The objects which are referenced
483483
the most will have already been defined.) This will minimize the
484-
number of times fedex_plus is required to divide output files.
484+
number of times exp2cxx is required to divide output files.
485485

486-
One known case of interdependence which fedex_plus is not able to
486+
One known case of interdependence which exp2cxx is not able to
487487
support occurs if say select A has select B as an item, and select B
488488
has select A as an item. (This is unsupported even if A and B are in
489-
the same schema.) fedex_plus has no way in which it can generate
489+
the same schema.) exp2cxx has no way in which it can generate
490490
compilable source code for the selects because each is dependent on
491491
the other. In addition, this would cause the parser to fall into an
492492
endless loop, so we strongly discourage it. ;-)
@@ -598,18 +598,18 @@ see below, next section.)
598598
level, bypassing STEPfile. STEPentity will allow the initialization
599599
but will place a warning in its errorDesc field.)
600600

601-
3. fedex_plus may be compiled with the flag COMPLEX_INFO. If this
602-
flag is turned on, fedex_plus prints out (to `cout') a large amount of
601+
3. exp2cxx may be compiled with the flag COMPLEX_INFO. If this
602+
flag is turned on, exp2cxx prints out (to `cout') a large amount of
603603
detail on the complex entities it finds and their overall structure.
604604
This is useful to see how fedex interpreted the complex information of
605605
an EXPRESS file, and to get a simple graphical view of the supertype-
606606
subtype hierarchy of the file.
607607

608-
fedex_plus's makefile contains the commented-out line,
608+
exp2cxx's makefile contains the commented-out line,
609609

610610
#USER_DEFS = -DCOMPLEX_INFO
611611

612-
If this line is uncommented, a fedex_plus executable will be built
612+
If this line is uncommented, a exp2cxx executable will be built
613613
which prints such information.
614614

615615
Limitations
@@ -646,12 +646,12 @@ the renaming of an individual entity places it out of order, the nodes
646646
will be printed out of order.
647647

648648
4. "Diamond inheritance" is not handled automatically and must be
649-
fixed by hand in the code generated by fedex_plus. (See
649+
fixed by hand in the code generated by exp2cxx. (See
650650
whatsnew.2-1.txt, section "Multiple Inheritance".)
651651

652652
5. Selects between aggregates: A select containing two aggregate
653653
choices of the same type (e.g., ARRAY and ARRAY, as opposed to ARRAY
654-
and SET) will cause fedex_plus to generate code which cannot be
654+
and SET) will cause exp2cxx to generate code which cannot be
655655
compiled.
656656

657657
6. Problem with sparcworks compiler version 4.0(?) - operator int() =
@@ -692,14 +692,14 @@ ANY OTHER PARTY.
692692
What's new in the STEP Class Library and Data Probe release 2.1
693693
June 1995
694694

695-
This release of the STEP Class Library (SCL), fedex_plus code
695+
This release of the STEP Class Library (SCL), exp2cxx code
696696
generator, and Data Probe also contains the latest releases of the
697697
fedex syntax and semantic checker, the NIST Express Toolkit (also new
698698
on SOLIS as of June 12, 1995), and the Express Pretty Printer Toolkit.
699699
The NIST Express Toolkit and fedex have been updated to handle the IS
700700
version of Express and various problems have been fixed as a result of
701701
pre-validation conformance testing. Following is an overview of
702-
what's new in the STEP Class Library (and hence fedex_plus) and the
702+
what's new in the STEP Class Library (and hence exp2cxx) and the
703703
Data Probe.
704704

705705
--------------------
@@ -775,10 +775,10 @@ inheritance hierarchy. This will not have an adverse affect on the
775775
implemementation. The user may choose to use the current or previous
776776
method of handling multiple inheritance. The current method is the
777777
default behavior. The previous method is obtained by supplying the
778-
-s (or -S) option with the fedex_plus code generator or the mkProbe
778+
-s (or -S) option with the exp2cxx code generator or the mkProbe
779779
script.
780780

781-
When the fedex_plus code generator is generating the C++ class library
781+
When the exp2cxx code generator is generating the C++ class library
782782
representation of a schema, it outputs information calling attention
783783
to the cases of multiple inheritance.
784784

@@ -1038,7 +1038,7 @@ functions.
10381038
--------
10391039
Attributes of type Boolean and aggregate of Boolean were previously
10401040
implemented using the Logical and Logicals classes (respectively).
1041-
The fedex_plus code generator now generates classes Boolean and
1041+
The exp2cxx code generator now generates classes Boolean and
10421042
Booleans to implement attributes of type Boolean and aggregate of
10431043
Boolean respectively.
10441044

data/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ FUNCTION(BUILD_A_SCHEMA SCHEMA_FILE)
4040
# read the schema name from a line like 'SCHEMA AUTOMOTIVE_DESIGN;'
4141
file(STRINGS ${SCHEMA_FILE} SCHEMA_STATEMENT LIMIT_COUNT 1 REGEX "^SCHEMA .*")
4242
string(REGEX REPLACE "^SCHEMA \(.*\)\;$" "\\1" SCHEMA_N ${SCHEMA_STATEMENT} )
43-
string(TOUPPER ${SCHEMA_N} SCHEMA_LONG_NAME) #fedex_plus always uses upper case for file names
43+
string(TOUPPER ${SCHEMA_N} SCHEMA_LONG_NAME) #exp2cxx always uses upper case for file names
4444
get_filename_component( SCHEMA_SN ${SCHEMA_FILE} NAME )
4545
string( REGEX REPLACE "\(.*\).[Ee][Xx][Pp]" "\\1" SCHEMA_SHORT_NAME ${SCHEMA_SN} )
4646

@@ -64,10 +64,10 @@ FUNCTION(BUILD_A_SCHEMA SCHEMA_FILE)
6464
COMMAND ${CMAKE_COMMAND} ARGS -E make_directory ${SCHEMA_OUTPUT_DIR}
6565
COMMENT "Creating ${SCHEMA_OUTPUT_DIR} for schema ${SCHEMA_SHORT_NAME}")
6666
add_custom_command( OUTPUT ${FEDEX_OUT}
67-
COMMAND fedex_plus ARGS ${SCHEMA_FILE}
67+
COMMAND exp2cxx ARGS ${SCHEMA_FILE}
6868
DEPENDS ${SCHEMA_FILE} ${SCHEMA_OUTPUT_DIR}
6969
WORKING_DIRECTORY ${SCHEMA_OUTPUT_DIR}
70-
COMMENT "Running fedex_plus for ${SCHEMA_SHORT_NAME}..."
70+
COMMENT "Running exp2cxx for ${SCHEMA_SHORT_NAME}..."
7171
VERBATIM )
7272
add_custom_target( generate_cpp_${SCHEMA_SHORT_NAME} DEPENDS ${FEDEX_OUT} SOURCES ${FEDEX_OUT} )
7373

data/STEPTools_merged_schema/modified_step_merged_cad_schema.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ SCHEMA step_merged_cad_schema;
33
(* this is a MODIFIED version of the merged schema
44
* original is at http://www.steptools.com/support/stdev_docs/stpcad/step_merged_cad_schema.exp
55
*
6-
* modified to eliminate fedex_plus errors. To view changes, use one of
6+
* modified to eliminate exp2cxx errors. To view changes, use one of
77
* - `git log -p data/STEPTools_merged_schema/step_merged_cad_schema.exp`
88
* - http://github.com/stepcode/stepcode/commits/master/data/STEPTools_merged_schema
99
*)

doc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SET(sc_MANS
22
man/man1/dataprobe.1
33
man/man1/fedex.1
4-
man/man1/fedex_plus.1
4+
man/man1/exp2cxx.1
55
man/man1/mkProbe.1
66
)
77

doc/doxyassist.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<input>./src/clutils</input>
133133
<input>./src/exppp</input>
134134
<input>./src/express</input>
135-
<input>./src/fedex_plus</input>
135+
<input>./src/exp2cxx</input>
136136
<input>./src/test</input>-->
137137
<!-- A list of files/paths to exclude. Add one <exclude> tag per path to
138138
exclude. This will automatically be expanded to exclude input directories
@@ -240,7 +240,7 @@
240240
<project>
241241
<name>Fedex Plus</name>
242242
<version> </version>
243-
<input>./src/fedex_plus</input>
243+
<input>./src/exp2cxx</input>
244244
</project>
245245
<project>
246246
<name>Tests</name>

doc/man/man1/dataprobe.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Data Probe - STEP editing tool
3333
.LP
3434
The Validation Testing System (VTS) Data Probe software is a program
3535
for browsing and editing data corresponding to a conceptual model
36-
described using the language Express. A separate program (fedex_plus)
36+
described using the language Express. A separate program (exp2cxx)
3737
reads in a schema and generates source code to represent the schema in
3838
C++. This code is linked with the libraries in the STEP Class Library
3939
to create a schema specific editor. The editor is X Windows based and

doc/man/man1/fedex_plus.1

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
.\" part of their official duties and is, therefore, a work of the U.S.
33
.\" Government and not subject to copyright.
44
.\"
5-
.\" $Id: fedex_plus.1,v 2.1.0.2 1998/02/27 23:54:30 sauderd Exp $
5+
.\" $Id: exp2cxx.1,v 2.1.0.2 1998/02/27 23:54:30 sauderd Exp $
66
.TH FEDEX_PLUS 1 "19 November 1997"
77
.SH NAME
8-
fedex_plus - EXPRESS compiler and translater
8+
exp2cxx - EXPRESS compiler and translater
99
.SH SYNOPSIS
10-
fedex_plus [ options ] [ express-file ]
10+
exp2cxx [ options ] [ express-file ]
1111
.nf
1212

1313
Command Arguments:
@@ -19,36 +19,36 @@ Command Arguments:
1919
.fi
2020
.SH DESCRIPTION
2121
.LP
22-
fedex_plus is based on the NIST EXPRESS compiler fedex. fedex_plus
22+
exp2cxx is based on the NIST EXPRESS compiler fedex. exp2cxx
2323
translates an EXPRESS file into C++ code and a class library. The C++
2424
library includes classes for representing all the types and entities
2525
in the input EXPRESS file, and a dictionary for describing those
2626
classes. The translation depends on base classes provided in the NIST
2727
STEP Class Library.
2828

29-
fedex_plus does not create C++ representations of the rules,
29+
exp2cxx does not create C++ representations of the rules,
3030
procedures, or any EXPRESS constructs other than schemas, types and
3131
entities. It supports multiple schemas contained in a single file and
3232
complex entities. It generates code which can be integrated with
3333
orbix and ObjectStore.
3434

3535
Combined with the NIST STEP Class Library, the translator provides a
36-
"C++ working form" of an EXPRESS schema. fedex_plus was designed for
36+
"C++ working form" of an EXPRESS schema. exp2cxx was designed for
3737
use together with a graphical data editing system (see dataprobe(1)),
38-
but care has been taken to keep fedex_plus separate so that it can be
38+
but care has been taken to keep exp2cxx separate so that it can be
3939
used as a component of other software systems.
4040

41-
The fedex_plus compiler makes two passes through the EXPRESS file. In
42-
the first pass fedex_plus reads the syntax of the EXPRESS file and
43-
detects any errors. In the second pass fedex_plus converts the
41+
The exp2cxx compiler makes two passes through the EXPRESS file. In
42+
the first pass exp2cxx reads the syntax of the EXPRESS file and
43+
detects any errors. In the second pass exp2cxx converts the
4444
EXPRESS code into C++ source code. The C++ source code is generated
45-
in files in the directory in which fedex_plus was run. The files are
45+
in files in the directory in which exp2cxx was run. The files are
4646
named according to the schema names in the input EXPRESS file.
4747

4848
.SH OPTIONS
4949
.TP
5050
.B -s|S
51-
Tells fedex_plus to use only single-inheritance, rather than multiple
51+
Tells exp2cxx to use only single-inheritance, rather than multiple
5252
inheritance.
5353
.TP
5454
.B -c|C
@@ -94,7 +94,7 @@ If no arguments are given in the command line, a list and description
9494
of the options available are sent to stdout.
9595

9696
.SH OUTPUT
97-
fedex_plus sends the following to stdout subject to the options
97+
exp2cxx sends the following to stdout subject to the options
9898
specified when executed:
9999

100100
- a statement indicating that the Express schema is being

0 commit comments

Comments
 (0)