changes based on SCL git d35f73f and 696d8e3

Nicholas Reed · Nicholas Reed · commit b25720d2121d · 2012-04-24T21:54:40.000Z
diff --git a/src/cldai/sdaiString.cc b/src/cldai/sdaiString.cc
@@ -19,11 +19,8 @@ SDAI_String & SDAI_String::operator= ( const char * s ) {
 
 void SDAI_String::STEPwrite( ostream & out ) const {
     const char * str = 0;
-// strings that exist but do not contain any chars should be written as '',
-// not $ --Josh L, 4/28/95
-//    if (is_null ())
     if( empty() ) {
-        out << "$";
+        out << "\'\'";
     } else {
         out << "\'";
         str = c_str();
@@ -40,11 +37,8 @@ void SDAI_String::STEPwrite( ostream & out ) const {
 
 void SDAI_String::STEPwrite( std::string & s ) const {
     const char * str = 0;
-// null strings should be represented by '', not $ --Josh L, 4/28/95
-//    if (is_null ())
     if( empty() ) {
-//  s.set_null(); // this would free up space? nope
-        s = "$";
+        s = "\'\'";
     } else {
         s = "\'";
         str = c_str();
diff --git a/src/clstepcore/ExpDict.h b/src/clstepcore/ExpDict.h
@@ -538,7 +538,7 @@ class Global_rule : public Dictionary_instance {
             return _parent_schema;
         }
         const char * rule_text_() {
-            return const_cast<char *>( _rule_text.c_str() );
+            return _rule_text.c_str();
         }
 
         void name_( Express_id & n ) {
@@ -1558,7 +1558,7 @@ class EntityDescriptor  :    public TypeDescriptor  {
             _supertype_stmt = s;
         }
         const char * Supertype_Stmt() {
-            return const_cast<char *>( _supertype_stmt.c_str() );
+            return _supertype_stmt.c_str();
         }
         std::string & supertype_stmt_() {
             return _supertype_stmt;
diff --git a/src/clstepcore/STEPattribute.cc b/src/clstepcore/STEPattribute.cc
@@ -791,20 +791,8 @@ int STEPattribute::is_null()  const {
     }
 }
 
-/******************************************************************
- ** Procedure:  operator ==
- ** Parameters:  STEPattribute & a1 and a2
- ** Returns:  int -- if 0 => not equal
- ** Description:  evaluates the equality of two attributes
- ** Side Effects:  none
- ** Status:  stub -- needs alot of work
- ******************************************************************/
-int operator == ( STEPattribute & a1, STEPattribute & a2 ) {
-    cerr << "Internal error:  " << __FILE__ << ": " <<  __LINE__
-         << "\n" << _POC_ "\n";
-    if( a1.aDesc->NonRefType() == a2.aDesc->NonRefType() )
-        ;
-    return 0;
+bool operator == ( STEPattribute & a1, STEPattribute & a2 ) {
+    return a1.aDesc == a2.aDesc;
 }
 
 
diff --git a/src/clstepcore/STEPattribute.h b/src/clstepcore/STEPattribute.h
@@ -226,7 +226,7 @@ class STEPattribute {
         //  UNDEFINED
         STEPattribute( const class AttrDescriptor & d, SCLundefined * p );
 
-        friend int operator == ( STEPattribute & a1, STEPattribute & a2 );
+        friend bool operator == ( STEPattribute & a1, STEPattribute & a2 );
 };
 
 #endif
diff --git a/src/clstepcore/STEPattributeList.cc b/src/clstepcore/STEPattributeList.cc
@@ -54,8 +54,23 @@ int STEPattributeList::list_length() {
 }
 
 void STEPattributeList::push( STEPattribute * a ) {
-    AttrListNode * saln = new AttrListNode( a );
-    AppendNode( saln );
+    bool push = true;
+
+    // if the attribute already exists in the list, we don't push it
+    // TODO: does it break anything?
+    AttrListNode * a2 = ( AttrListNode * )head;
+    while( a2 && push ) {
+        if( *a == *( a2 -> attr ) ) {
+            push = false;
+            break;
+        }
+        a2 = ( AttrListNode * )( a2->next );
+    }
+
+    if( push ) {
+        AttrListNode * saln = new AttrListNode( a );
+        AppendNode( saln );
+    }
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -538,7 +538,7 @@ class Global_rule : public Dictionary_instance {`
`538`	`538`	`return _parent_schema;`
`539`	`539`	`}`
`540`	`540`	`const char * rule_text_() {`
`541`		`- return const_cast<char *>( _rule_text.c_str() );`
	`541`	`+ return _rule_text.c_str();`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`void name_( Express_id & n ) {`
`@@ -1558,7 +1558,7 @@ class EntityDescriptor : public TypeDescriptor {`
`1558`	`1558`	`_supertype_stmt = s;`
`1559`	`1559`	`}`
`1560`	`1560`	`const char * Supertype_Stmt() {`
`1561`		`- return const_cast<char *>( _supertype_stmt.c_str() );`
	`1561`	`+ return _supertype_stmt.c_str();`
`1562`	`1562`	`}`
`1563`	`1563`	`std::string & supertype_stmt_() {`
`1564`	`1564`	`return _supertype_stmt;`