netless zone support fix to specctra export

This commit is contained in:
dickelbeck 2009-02-07 16:45:07 +00:00
parent d58296c804
commit 3a618567bb
1 changed files with 21 additions and 21 deletions

View File

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