Skip to content

inverse attributes...finally! #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpictor merged 110 commits into from
Dec 26, 2014
Merged

inverse attributes...finally! #303

Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
60141ce
abstract class with non-virtual destructor
mpictor Oct 13, 2013
5b14529
warning about comparison that was always true
mpictor Oct 13, 2013
bf39d90
_mainRegistry wasn't initialized
mpictor Oct 13, 2013
ffd0da9
default to case insensitive when searching by instance type
mpictor Oct 13, 2013
6419146
functions to look up instance type in file
mpictor Dec 6, 2013
2d060e7
minor changes to judyLArray.h, judy.c
mpictor Dec 8, 2013
6004ba4
remove outdated comment from inverse_attr2.cc
mpictor Dec 9, 2013
9144443
doxify comments in classes_misc.c
mpictor Dec 15, 2013
259750e
split a big fprintf up for readability
mpictor Dec 15, 2013
57d3d2f
improve some comments for doxygen
mpictor Dec 17, 2013
7867505
macro CONST -> const
mpictor Dec 19, 2013
f3cd328
add a FIXME
mpictor Mar 6, 2014
6e636d1
add variable names to some prototypes in ErrorDescriptor header
mpictor Mar 16, 2014
d1062cd
use lazyInstMgr for inverse_attr3.cc
mpictor Oct 13, 2013
b1387b7
improve comments, a few other small changes that don't affect behavior
mpictor Oct 13, 2013
35ead38
include subsuperiterators header
mpictor Oct 28, 2013
0188910
add lazyRefs.h
mpictor Oct 28, 2013
b3b4646
trivial changes
mpictor Dec 6, 2013
ca56023
use lazyRefs in lazyInstMgr
mpictor Dec 8, 2013
bd402b2
add STEPinvAttrList for inv attr descs and setter/getter pointers
mpictor Dec 15, 2013
d5f693a
use STEPinvAttrList in sdaiApplication_Instance
mpictor Dec 15, 2013
e17938a
generated c++: static setter/getter for inverse attrs
mpictor Dec 15, 2013
ef2c01d
in generated c++: in constructors, populate iAttrs
mpictor Dec 15, 2013
647ecbc
in generated c++: ensure that pointers are zeroed (DataMemberInitiali…
mpictor Dec 16, 2013
1fddd17
in generated c++: ensure pointer is non-null before calling shallowCopy
mpictor Dec 17, 2013
4b3e433
in generated c++: create data members for null pointers
mpictor Dec 17, 2013
f6078d8
eliminate unused buffer
mpictor Dec 16, 2013
ebb7a92
use InstMgrBase instead of InstMgr in most stepcore classes
mpictor Dec 17, 2013
51acb99
whoops, don't pretend an instance can't be found if it is already loaded
mpictor Dec 17, 2013
7222c91
update inverse attr test 3
mpictor Dec 17, 2013
fdcdd5a
forgot to replace InstMgr with InstMgrBase in selects.c
mpictor Dec 17, 2013
d9c89b9
when printing initializers, skip derived attrs
mpictor Dec 17, 2013
a74dc1d
forgot to add 'const' keyword in several places after changing the ..…
mpictor Dec 19, 2013
800453e
split entity methods out of ATTRprint_access_methods into 2 new funcs
mpictor Dec 19, 2013
d4f13e0
replace entity access member code with call to new func
mpictor Dec 19, 2013
aaa1ca0
fix a few comments
mpictor Dec 19, 2013
23a5a62
formatting
mpictor Dec 19, 2013
2ae605d
rename var - 'class' may not be a C keyword, but it's confusing
mpictor Mar 1, 2014
64dd1d2
two libstructor_print calls missing neededAttr param
mpictor Mar 1, 2014
118d8b2
merge with instMgrBase commit
mpictor Mar 1, 2014
6cb750a
don't print const for getter
mpictor Mar 1, 2014
d6bb20d
use instMgrBase in SDAI_Select operator test
mpictor Mar 2, 2014
236778a
generated code: also print a const getter in class header when attr i…
mpictor Mar 2, 2014
d64bbc3
move count var so that derived attrs are counted
mpictor Mar 2, 2014
5c0bea3
add braces and indenting to two LISTdo..LISTod's
mpictor Mar 2, 2014
3132089
note that unity headers are probably useless since the main schema he…
mpictor Mar 2, 2014
4a01038
fix a couple comments
mpictor Mar 2, 2014
cd08570
print const and non-const getters for select attrs
mpictor Mar 2, 2014
f638355
move string/binary access methods into 2 small funcs
mpictor Mar 2, 2014
47d42ad
invert sense of test in logging code - wouldn't print unless null
mpictor Mar 2, 2014
521a999
change const getter for entity attr's
mpictor Mar 2, 2014
62ef3c6
add const getter for string/bin attr's
mpictor Mar 2, 2014
14d7b32
remove duplicate function prototypes that masked a signature change
mpictor Mar 4, 2014
ea339e2
exp2cxx: move select getters into own function, print const and non-c…
mpictor Mar 4, 2014
9cf54cf
add attrIsObj(), which returns true if const and non-const methods ar…
mpictor Mar 4, 2014
acdc338
static setter/getter won't always have the same signature
mpictor Mar 4, 2014
ea24200
make STEPinvAttrList work with the new setter/getter variants
mpictor Mar 4, 2014
b9db456
CONST -> const in a few more places
mpictor Mar 4, 2014
6117e53
move much of ATTRprint_access_methods into a series of smaller funcs
mpictor Mar 4, 2014
3133165
modify const-ness in AGGRprint_access_methods
mpictor Mar 4, 2014
9e1d078
add 2 protos to classes_attribute header
mpictor Mar 4, 2014
66deaaf
change behavior of attrIsObj() fn in classes_attribute
mpictor Mar 4, 2014
73b3c1b
fix assertion - can either be aggregate or instance
mpictor Mar 6, 2014
06bfc7d
handle both aggr and non-aggr inverses
mpictor Mar 6, 2014
b31ffa3
more changes to attrIsObj()
mpictor Mar 6, 2014
6955a03
check for both aggr and non-aggr inverse attributes
mpictor Mar 16, 2014
4bde538
add comment with express that fails
mpictor Mar 16, 2014
4093158
fix test dependency so 'make test ARGS=-jN' works
mpictor Mar 30, 2014
7089bdb
when loading instance dependencies, seek to original position afterwards
mpictor Mar 30, 2014
9db1170
improve some comments in lazy loading code
mpictor Mar 30, 2014
674fa94
delete the array of names after creating a STEPcomplex
mpictor Mar 30, 2014
c2c0a64
reformat some error message code, add one message for complex insts
mpictor Mar 30, 2014
7842742
redo some comments
mpictor May 11, 2014
4df86e5
schema name changed for some p21 tests - update it
mpictor May 11, 2014
1e95f8f
remove LIBcopy_constructor() - unused since 1992(!)
mpictor May 18, 2014
7ae3434
indents in generated code
mpictor May 19, 2014
168e7a9
split up a 32-line fprintf
mpictor May 19, 2014
712d965
improve comments, whitespace
mpictor Jun 1, 2014
01db378
silence a signed-unsigned warning by using size_t
mpictor Jun 1, 2014
14689c6
split ENTITYprint_new() into two, print into different files
mpictor Jun 1, 2014
c6d8417
initialize entity iAttrs using eDesc
mpictor Jun 1, 2014
2374029
cleanup
mpictor Jun 1, 2014
65c703b
work on inverse attrs
mpictor Aug 21, 2014
98283dc
more work on inverse attrs, code generation
mpictor Nov 29, 2014
9efd75e
add some small schemas and a .p21; should be examined, maybe moved/si…
mpictor Nov 29, 2014
c8cfac3
some types still print in SdaiAll
mpictor Nov 29, 2014
86bbc32
cleanup
mpictor Nov 29, 2014
d36d12c
fix failing schema
mpictor Dec 8, 2014
0b42b2f
oops, move eDesc initialization back into SdaiAll
mpictor Dec 8, 2014
7976c8b
loop through ed's with inverse attrs, connecting them to what they po…
mpictor Dec 8, 2014
febbb63
allow const or non-const for ed iter
mpictor Dec 8, 2014
c91109b
add functions to access schema class members
mpictor Dec 8, 2014
87c66bb
flesh out InitIAttrs() in eDesc, instance
mpictor Dec 8, 2014
31bf315
const correctness in superInvAttrIter
mpictor Dec 8, 2014
5df2f69
inching forward on inverse attrs
mpictor Dec 22, 2014
921de86
closer...
mpictor Dec 22, 2014
9313b8e
move some attr-specific stuff from classes_entity to classes_attribut…
mpictor Dec 23, 2014
ff3fd1f
_complex is now bool, not int - update STEPcomplex ctors
mpictor Dec 26, 2014
6bac26d
add index to struct Variable_, fix some whitespace
mpictor Dec 26, 2014
37901af
redo attribute numbering, print inverse attr access members separately
mpictor Dec 26, 2014
efb8285
don't print code for inverse data members, they're in iAMap now
mpictor Dec 26, 2014
8273ce1
lazyRefs works now
mpictor Dec 26, 2014
5f702fb
fix dumpComplexInst func, stupid mistake - was using wrong data member
mpictor Dec 26, 2014
653625f
fix crash with lazy loading and unexpected newlines, found in cd209 f…
mpictor Dec 26, 2014
e74d4dc
fix inverse attr initialization; attr was being found but it wasn't e…
mpictor Dec 26, 2014
50452e8
fix inv attr code in SDAI_Application_instance
mpictor Dec 26, 2014
dfe69a9
bug in superInvAttrIter allowed null pointer return for ia
mpictor Dec 26, 2014
bfbd8df
minor cleanup
mpictor Dec 26, 2014
0f5179e
oops, forgot an include
mpictor Dec 26, 2014
c8f14a0
bump version (0.8), update AUTHORS, NEWS for v0.8, add travis-ci buil…
mpictor Dec 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
loop through ed's with inverse attrs, connecting them to what they po… 
…int at
  • Loading branch information
@mpictor
mpictor committed Dec 26, 2014
commit 7976c8bee542c6aa5dbfcfc1948c8c6e083445ee
26 changes: 14 additions & 12 deletions src/exp2cxx/classes_wrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,18 @@ void closeUnityFiles( FILES * files ) {
FILEclose( files->unity.entity.impl );
}

///write tail of initfile, close it
void INITFileFinish( FILE * initfile, Schema schema ) {
fprintf( initfile, "\n /* loop through any entities with inverse attrs, calling InitIAttrs */\n");
fprintf( initfile, " EntityDescItr edi( *%s::schema->EntsWInverse() );\n", SCHEMAget_name( schema ) );
fprintf( initfile, " EntityDescriptor * ed;\n");
fprintf( initfile, " const char * nm = %s::schema->Name();\n", SCHEMAget_name( schema ) );
fprintf( initfile, " while( 0 != ( ed = edi.NextEntityDesc_nc() ) ) {\n");
fprintf( initfile, " ed->InitIAttrs( reg, nm );\n");
fprintf( initfile, " }\n}\n" );
FILEclose( initfile );
}

/** ****************************************************************
** Procedure: SCHEMAprint
** Parameters: const Schema schema - schema to print
Expand Down Expand Up @@ -528,8 +540,7 @@ void SCHEMAprint( Schema schema, FILES * files, void * complexCol, int suffix )
FILEclose( libfile );
FILEclose( incfile );
if( schema->search_id == PROCESSED ) {
fprintf( initfile, "\n}\n" );
FILEclose( initfile );
INITFileFinish( initfile, schema );
} else {
fclose( initfile );
}
Expand Down Expand Up @@ -664,20 +675,11 @@ void EXPRESSPrint( Express express, ComplexCollect & col, FILES * files ) {
SCOPEPrint( schema, files, schema, &col, 0 );
}

fprintf( initfile, "\n /* loop through any entities with inverse attrs, calling InitIAttrs */\n");
fprintf( initfile, " EntityDescItr edi( %s::schema->EntsWInverse() );\n", SCHEMAget_name( schema ) );
fprintf( initfile, " EntityDescriptor * ed;\n");
fprintf( initfile, " const char * nm = %s::schema->Name();\n", SCHEMAget_name( schema ) );
fprintf( initfile, " while( 0 != ( ed = edi.NextEntityDesc() ) ) {\n");
fprintf( initfile, " ed->InitIAttrs(reg.FindEntity, nm);\n");
fprintf( initfile, " }\n}\n" );

/********** close the files ***********/
closeUnityFiles( files );
FILEclose( libfile );
FILEclose( incfile );
FILEclose( initfile );

INITFileFinish( initfile, schema );
}

/**
Expand Down