From: kgv Date: Thu, 6 Nov 2014 14:35:24 +0000 (+0300) Subject: 0025452: TKCDLFront - CDLTranslate does not fill the list of dependencies (uses) X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=a8038321b25f51d3bc28ad1777db7ffda1a63e5d;p=occt-wok.git 0025452: TKCDLFront - CDLTranslate does not fill the list of dependencies (uses) --- diff --git a/src/CDLFront/CDLFront.cxx b/src/CDLFront/CDLFront.cxx index c42b7aa..f83c6e0 100755 --- a/src/CDLFront/CDLFront.cxx +++ b/src/CDLFront/CDLFront.cxx @@ -315,7 +315,7 @@ void CDL_InitVariable() TheListOfCPPType = new TColStd_HSequenceOfInteger(); TheListOfInteger = new TColStd_HSequenceOfHAsciiString(); TheListOfGlobalUsed.Nullify(); - TheListOfGlobalUsed.Nullify(); + TheListOfTypeUsed.Nullify(); TheListOfInst.Nullify(); TheListOfGen.Nullify(); } @@ -421,7 +421,7 @@ Standard_Boolean VerifyClassUses(const Handle(TCollection_HAsciiString)& theType { if (TheMetaSchema->IsDefined(theTypeName)) { - TheListOfGlobalUsed->Append(theTypeName); + TheListOfTypeUsed->Append(theTypeName); return Standard_True; } @@ -1243,7 +1243,7 @@ void Interface_Class() Handle(TCollection_HAsciiString) aPackageName = new TCollection_HAsciiString(ThePackName); TheInterface->Class(MS::BuildFullName(aPackageName,aClassName)); - TheListOfGlobalUsed->Append(MS::BuildFullName(aPackageName,aClassName)); + TheListOfTypeUsed->Append(MS::BuildFullName(aPackageName,aClassName)); } void Method_TypeName() @@ -1251,7 +1251,7 @@ void Method_TypeName() Handle(TCollection_HAsciiString) aClassName = new TCollection_HAsciiString(TheTypeName); Handle(TCollection_HAsciiString) aPackageName = new TCollection_HAsciiString(ThePackName); - TheListOfGlobalUsed->Append(MS::BuildFullName(aPackageName,aClassName)); + TheListOfTypeUsed->Append(MS::BuildFullName(aPackageName,aClassName)); } void Interface_Method(char* entityName) @@ -1372,7 +1372,7 @@ void Alias_Type() TheAlias->Type(anAliasName,aPackageName); - TheListOfGlobalUsed->Append(TheAlias->Type()); + TheListOfTypeUsed->Append(TheAlias->Type()); } void Alias_End() @@ -1406,7 +1406,7 @@ void Pointer_Type() Handle(TCollection_HAsciiString) aPackageName = new TCollection_HAsciiString(ThePackName); ThePointer->Type(athetypename,aPackageName); - TheListOfGlobalUsed->Append(ThePointer->Type()); + TheListOfTypeUsed->Append(ThePointer->Type()); } void Pointer_End() @@ -1566,7 +1566,7 @@ void Inc_Class_Dec() ThePackage->Class (TheStdClass->Name()); TheStdClass->Package (ThePackage->FullName()); - TheListOfGlobalUsed->Append(TheStdClass->FullName()); + TheListOfTypeUsed->Append(TheStdClass->FullName()); TheStdClass.Nullify(); @@ -2172,7 +2172,7 @@ void Add_Std_Ancestors() TheSimpleClass->Use(TheListOfTypes->Value(i),TheListOfPackages->Value(i)); - TheListOfGlobalUsed->Append(aFullName); + TheListOfTypeUsed->Append(aFullName); } else { @@ -2222,7 +2222,7 @@ void Add_Std_Uses() TheSimpleClass->Use(TheListOfTypes->Value(i),TheListOfPackages->Value(i)); - TheListOfGlobalUsed->Append(aFullName); + TheListOfTypeUsed->Append(aFullName); } TheListOfComments->Clear(); @@ -2346,7 +2346,7 @@ void Add_Friend_Class() if (TheMetaSchema->IsDefined(theTypeName)) { TheSimpleClass->Friend(aClassName,aPackName); - TheListOfGlobalUsed->Append(theTypeName); + TheListOfTypeUsed->Append(theTypeName); } else { @@ -2631,7 +2631,7 @@ void Construct_Begin() void Friend_Construct_Begin() { - TheConstruc = new MS_Construc(TheMethodName,TheListOfGlobalUsed->Value(TheListOfGlobalUsed->Length())); + TheConstruc = new MS_Construc(TheMethodName,TheListOfTypeUsed->Value(TheListOfTypeUsed->Length())); TheMethod = TheConstruc; TheMemberMet = TheConstruc; TheMethod->MetaSchema(TheMetaSchema); @@ -2652,7 +2652,7 @@ void InstMet_Begin() void Friend_InstMet_Begin() { - TheInstMet = new MS_InstMet(TheMethodName,TheListOfGlobalUsed->Value(TheListOfGlobalUsed->Length())); + TheInstMet = new MS_InstMet(TheMethodName,TheListOfTypeUsed->Value(TheListOfTypeUsed->Length())); TheMethod = TheInstMet; TheMemberMet = TheInstMet; TheMethod->MetaSchema(TheMetaSchema); @@ -2673,7 +2673,7 @@ void ClassMet_Begin() void Friend_ClassMet_Begin() { - TheClassMet = new MS_ClassMet(TheMethodName,TheListOfGlobalUsed->Value(TheListOfGlobalUsed->Length())); + TheClassMet = new MS_ClassMet(TheMethodName,TheListOfTypeUsed->Value(TheListOfTypeUsed->Length())); TheMethod = TheClassMet; TheMemberMet = TheClassMet; TheMethod->MetaSchema(TheMetaSchema); @@ -3146,7 +3146,7 @@ int CDLTranslate(const Handle(MS_MetaSchema)& aMetaSchema, TheMetaSchema = aMetaSchema; TheListOfGlobalUsed = aGlobalList; - TheListOfGlobalUsed = aTypeList; + TheListOfTypeUsed = aTypeList; TheListOfInst = anInstList; TheListOfGen = anGenList; @@ -3172,7 +3172,7 @@ int CDLTranslate(const Handle(MS_MetaSchema)& aMetaSchema, TheMetaSchema.Nullify(); TheListOfGlobalUsed.Nullify(); - TheListOfGlobalUsed.Nullify(); + TheListOfTypeUsed.Nullify(); TheListOfInst.Nullify(); TheListOfGen.Nullify(); TheListOfComments.Nullify(); diff --git a/src/MS/MS_Class.cdl b/src/MS/MS_Class.cdl index 297d826..37d1af2 100755 --- a/src/MS/MS_Class.cdl +++ b/src/MS/MS_Class.cdl @@ -32,9 +32,6 @@ deferred class Class is Initialize(aName: HAsciiString; aPackage: HAsciiString); - Initialize(aName, aPackage : HAsciiString; - Mother : HAsciiString from TCollection; - aPrivate, aDeferred, aInComplete: Boolean); Validity(me; aName: HAsciiString; aPackage: HAsciiString) is deferred; diff --git a/src/MS/MS_Class.cxx b/src/MS/MS_Class.cxx index 4e2a15b..b11ff57 100755 --- a/src/MS/MS_Class.cxx +++ b/src/MS/MS_Class.cxx @@ -32,40 +32,6 @@ MS_Class::MS_Class(const Handle(TCollection_HAsciiString)& aName, } } -MS_Class::MS_Class(const Handle(TCollection_HAsciiString)& aName, - const Handle(TCollection_HAsciiString)& aPackage, - const Handle(TCollection_HAsciiString)& Mother, - const Standard_Boolean aPrivate, - const Standard_Boolean aDeferred, - const Standard_Boolean aInComplete) : MS_Type(aName) -{ - if (!aPackage.IsNull()) { - Handle(TCollection_HAsciiString) aFullName = MS::BuildFullName(aPackage,aName); - - if (GetMetaSchema() != 0) { - Package(aPackage); - } - - myIncomplete = aInComplete; - myPrivate = aPrivate; - myDeferred = aDeferred; - myMother = Mother; - myInherits = new TColStd_HSequenceOfHAsciiString; - myUses = new TColStd_HSequenceOfHAsciiString; - myRaises = new TColStd_HSequenceOfHAsciiString; - myMethods = new MS_HSequenceOfMemberMet; - myFields = new MS_HSequenceOfField; - myFriendMets = new TColStd_HSequenceOfHAsciiString; - myFriends = new TColStd_HSequenceOfHAsciiString; - myComment = new TCollection_HAsciiString(""); - - FullName(aFullName); - } - else { - Standard_NullObject::Raise("MS_Class::MS_Class - aPakage is NULL"); - } -} - void MS_Class::Deferred(const Standard_Boolean aDeferred) { myDeferred = aDeferred; diff --git a/src/MS/MS_Error.cdl b/src/MS/MS_Error.cdl index 5db967c..c86eedf 100755 --- a/src/MS/MS_Error.cdl +++ b/src/MS/MS_Error.cdl @@ -19,10 +19,6 @@ is Create(aName: HAsciiString; aPackage: HAsciiString) returns mutable Error from MS; - Create(aName, aPackage, Mother : HAsciiString; - aPrivate, aDeferred, aInComplete: Boolean) - returns mutable Error from MS; - Validity(me; aName: HAsciiString; aPackage: HAsciiString) is redefined; end Error from MS; diff --git a/src/MS/MS_Error.cxx b/src/MS/MS_Error.cxx index 7f0f9d0..fd9f2bf 100755 --- a/src/MS/MS_Error.cxx +++ b/src/MS/MS_Error.cxx @@ -7,16 +7,6 @@ MS_Error::MS_Error(const Handle(TCollection_HAsciiString)& aName, Incomplete(Standard_False); } -MS_Error::MS_Error(const Handle(TCollection_HAsciiString)& aName, - const Handle(TCollection_HAsciiString)& aPackage, - const Handle(TCollection_HAsciiString)& Mother, - const Standard_Boolean aPrivate, - const Standard_Boolean aDeferred, - const Standard_Boolean aInComplete) : MS_StdClass(aName,aPackage,Mother,aPrivate,aDeferred,aInComplete) -{ - Incomplete(Standard_False); -} - //void MS_Error::Validity(const Handle(TCollection_HAsciiString)& aName, const Handle(TCollection_HAsciiString)& aPackage) const void MS_Error::Validity(const Handle(TCollection_HAsciiString)& , const Handle(TCollection_HAsciiString)& ) const { diff --git a/src/MS/MS_InstClass.cdl b/src/MS/MS_InstClass.cdl index 60291d5..3e87110 100755 --- a/src/MS/MS_InstClass.cdl +++ b/src/MS/MS_InstClass.cdl @@ -24,12 +24,7 @@ is Create(aName: HAsciiString from TCollection; aPackage: HAsciiString from TCollection) returns mutable InstClass from MS; - - Create(aName, aPackage : HAsciiString from TCollection; - Mother: HAsciiString from TCollection; - aPrivate, aDeferred, aInComplete: Boolean) - returns mutable InstClass from MS; - + Validity(me; aName: HAsciiString from TCollection; aPackage: HAsciiString from TCollection); InstType(me : mutable; aType: HAsciiString from TCollection; aPackage: HAsciiString from TCollection); diff --git a/src/MS/MS_InstClass.cxx b/src/MS/MS_InstClass.cxx index e42f080..2bb0376 100755 --- a/src/MS/MS_InstClass.cxx +++ b/src/MS/MS_InstClass.cxx @@ -17,19 +17,6 @@ MS_InstClass::MS_InstClass(const Handle(TCollection_HAsciiString)& aName, myComment = new TCollection_HAsciiString(""); } -MS_InstClass::MS_InstClass(const Handle(TCollection_HAsciiString)& aName, - const Handle(TCollection_HAsciiString)& aPackage, - const Handle(TCollection_HAsciiString)& Mother, - const Standard_Boolean aPrivate, - const Standard_Boolean aDeferred, - const Standard_Boolean aInComplete) -: MS_Class(aName,aPackage,Mother,aPrivate,aDeferred,aInComplete), myGenClass(new TCollection_HAsciiString),myBasicInsType(new TColStd_HSequenceOfHAsciiString),myInstType(new TColStd_HSequenceOfHAsciiString), - myGenType(new TColStd_HSequenceOfHAsciiString),myNestStd(new TColStd_HSequenceOfHAsciiString), - myNestIns(new TColStd_HSequenceOfHAsciiString),myNestNeu(new TColStd_HSequenceOfHAsciiString),myInstFlag(Standard_False) -{ - myComment = new TCollection_HAsciiString(""); -} - void MS_InstClass::Validity(const Handle(TCollection_HAsciiString)& , const Handle(TCollection_HAsciiString)& ) const { diff --git a/src/MS/MS_StdClass.cdl b/src/MS/MS_StdClass.cdl index 99ea02b..f759703 100755 --- a/src/MS/MS_StdClass.cdl +++ b/src/MS/MS_StdClass.cdl @@ -17,11 +17,7 @@ is Create(aName: HAsciiString; aPackage: HAsciiString) returns mutable StdClass from MS; - - Create(aName, aPackage, Mother: HAsciiString; - aPrivate, aDeferred, aInComplete: Boolean) - returns mutable StdClass from MS; - + Validity(me; aName: HAsciiString; aPackage: HAsciiString) is virtual; CreatedBy(me : mutable; anInstClass : InstClass from MS); diff --git a/src/MS/MS_StdClass.cxx b/src/MS/MS_StdClass.cxx index f0cc080..77a6759 100755 --- a/src/MS/MS_StdClass.cxx +++ b/src/MS/MS_StdClass.cxx @@ -10,17 +10,6 @@ MS_StdClass::MS_StdClass(const Handle(TCollection_HAsciiString)& aName, myComment = new TCollection_HAsciiString(""); } -MS_StdClass::MS_StdClass(const Handle(TCollection_HAsciiString)& aName, - const Handle(TCollection_HAsciiString)& aPackage, - const Handle(TCollection_HAsciiString)& Mother, - const Standard_Boolean aPrivate, - const Standard_Boolean aDeferred, - const Standard_Boolean aInComplete) -: MS_Class(aName,aPackage,Mother,aPrivate,aDeferred,aInComplete), myNestingState(Standard_False) -{ - myComment = new TCollection_HAsciiString(""); -} - void MS_StdClass::Validity(const Handle(TCollection_HAsciiString)& , const Handle(TCollection_HAsciiString)& ) const {