|
|
|
@ -2465,10 +2465,6 @@ struct PIN_REF : public ELEM |
|
|
|
// the quotes unconditional on this one. |
|
|
|
const char* newline = nestLevel ? "\n" : ""; |
|
|
|
|
|
|
|
#if 0 |
|
|
|
return out->Print( nestLevel, "\"%s\"-\"%s\"%s", |
|
|
|
component_id.c_str(), pin_id.c_str(), newline ); |
|
|
|
#else |
|
|
|
const char* cquote = out->GetQuoteChar( component_id.c_str() ); |
|
|
|
const char* pquote = out->GetQuoteChar( pin_id.c_str() ); |
|
|
|
|
|
|
|
@ -2476,7 +2472,6 @@ struct PIN_REF : public ELEM |
|
|
|
cquote, component_id.c_str(), cquote, |
|
|
|
pquote, pin_id.c_str(), pquote, |
|
|
|
newline ); |
|
|
|
#endif |
|
|
|
} |
|
|
|
}; |
|
|
|
typedef std::vector<PIN_REF> PIN_REFS; |
|
|
|
@ -2583,7 +2578,11 @@ public: |
|
|
|
}; |
|
|
|
typedef boost::ptr_vector<COMP_ORDER> COMP_ORDERS; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* Class NET |
|
|
|
* corresponds to a <net_descriptor> |
|
|
|
* in the DSN spec. |
|
|
|
*/ |
|
|
|
class NET : public ELEM |
|
|
|
{ |
|
|
|
friend class SPECCTRA_DB; |
|
|
|
@ -2635,7 +2634,6 @@ public: |
|
|
|
delete comp_order; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
int FindPIN_REF( const std::string& aComponent ) |
|
|
|
{ |
|
|
|
for( unsigned i=0; i<pins.size(); ++i ) |
|
|
|
@ -2646,7 +2644,6 @@ public: |
|
|
|
return -1; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError ) |
|
|
|
{ |
|
|
|
const char* quote = out->GetQuoteChar( net_id.c_str() ); |
|
|
|
@ -2669,22 +2666,25 @@ public: |
|
|
|
|
|
|
|
out->Print( 0, "\n" ); |
|
|
|
|
|
|
|
const int RIGHTMARGIN = 80; |
|
|
|
int perLine = out->Print( nestLevel+1, "(%s", LEXER::GetTokenText( pins_type ) ); |
|
|
|
|
|
|
|
for( PIN_REFS::iterator i=pins.begin(); i!=pins.end(); ++i ) |
|
|
|
if( pins.size() ) |
|
|
|
{ |
|
|
|
if( perLine > RIGHTMARGIN ) |
|
|
|
const int RIGHTMARGIN = 80; |
|
|
|
int perLine = out->Print( nestLevel+1, "(%s", LEXER::GetTokenText( pins_type ) ); |
|
|
|
|
|
|
|
for( PIN_REFS::iterator i=pins.begin(); i!=pins.end(); ++i ) |
|
|
|
{ |
|
|
|
out->Print( 0, "\n"); |
|
|
|
perLine = out->Print( nestLevel+2, "%s", "" ); |
|
|
|
} |
|
|
|
else |
|
|
|
perLine += out->Print( 0, " " ); |
|
|
|
if( perLine > RIGHTMARGIN ) |
|
|
|
{ |
|
|
|
out->Print( 0, "\n"); |
|
|
|
perLine = out->Print( nestLevel+2, "%s", "" ); |
|
|
|
} |
|
|
|
else |
|
|
|
perLine += out->Print( 0, " " ); |
|
|
|
|
|
|
|
perLine += i->FormatIt( out, 0 ); |
|
|
|
perLine += i->FormatIt( out, 0 ); |
|
|
|
} |
|
|
|
out->Print( 0, ")\n" ); |
|
|
|
} |
|
|
|
out->Print( 0, ")\n" ); |
|
|
|
|
|
|
|
if( comp_order ) |
|
|
|
comp_order->Format( out, nestLevel+1 ); |
|
|
|
|