Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

change IOError class name spelling to IO_ERROR to conform to coding standards

pull/1/head
Dick Hollenbeck 15 years ago
parent
7a92a96a85
commit
067bf8518c
16 changed files with 313 additions and 313 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      common/dsnlexer.cpp
  2. 24
      common/richio.cpp
  3. 4
      common/xnode.cpp
  4. 2
      eeschema/eeschema_config.cpp
  5. 2
      eeschema/netform.cpp
  6. 8
      eeschema/template_fieldnames.cpp
  7. 8
      eeschema/template_fieldnames.h
  8. 56
      include/dsnlexer.h
  9. 36
      include/richio.h
  10. 8
      include/xnode.h
  11. 8
      new/design.h
  12. 130
      pcbnew/specctra.cpp
  13. 296
      pcbnew/specctra.h
  14. 6
      pcbnew/specctra_export.cpp
  15. 8
      pcbnew/specctra_import.cpp
  16. 2
      pcbnew/specctra_test.cpp

28
common/dsnlexer.cpp
View File

@ -224,18 +224,18 @@ bool DSNLEXER::IsSymbol( int aTok )
}
void DSNLEXER::ThrowIOError( wxString aText, int charOffset ) throw (IOError)
void DSNLEXER::ThrowIOError( wxString aText, int charOffset ) throw( IO_ERROR )
{
// append to aText, do not overwrite
aText << wxT(" ") << _("in") << wxT(" \"") << CurSource()
<< wxT("\" ") << _("on line") << wxT(" ") << reader->LineNumber()
<< wxT(" ") << _("at offset") << wxT(" ") << charOffset;
throw IOError( aText );
throw IO_ERROR( aText );
}
void DSNLEXER::Expecting( int aTok ) throw( IOError )
void DSNLEXER::Expecting( int aTok ) throw( IO_ERROR )
{
wxString errText( _("Expecting") );
errText << wxT(" ") << GetTokenString( aTok );
@ -243,7 +243,7 @@ void DSNLEXER::Expecting( int aTok ) throw( IOError )
}
void DSNLEXER::Expecting( const wxString& text ) throw( IOError )
void DSNLEXER::Expecting( const wxString& text ) throw( IO_ERROR )
{
wxString errText( _("Expecting") );
errText << wxT(" '") << text << wxT("'");
@ -251,7 +251,7 @@ void DSNLEXER::Expecting( const wxString& text ) throw( IOError )
}
void DSNLEXER::Unexpected( int aTok ) throw( IOError )
void DSNLEXER::Unexpected( int aTok ) throw( IO_ERROR )
{
wxString errText( _("Unexpected") );
errText << wxT(" ") << GetTokenString( aTok );
@ -259,7 +259,7 @@ void DSNLEXER::Unexpected( int aTok ) throw( IOError )
}
void DSNLEXER::Unexpected( const wxString& text ) throw( IOError )
void DSNLEXER::Unexpected( const wxString& text ) throw( IO_ERROR )
{
wxString errText( _("Unexpected") );
errText << wxT(" '") << text << wxT("'");
@ -267,7 +267,7 @@ void DSNLEXER::Unexpected( const wxString& text ) throw( IOError )
}
void DSNLEXER::NeedLEFT() throw( IOError )
void DSNLEXER::NeedLEFT() throw( IO_ERROR )
{
int tok = NextTok();
if( tok != DSN_LEFT )
@ -275,7 +275,7 @@ void DSNLEXER::NeedLEFT() throw( IOError )
}
void DSNLEXER::NeedRIGHT() throw( IOError )
void DSNLEXER::NeedRIGHT() throw( IO_ERROR )
{
int tok = NextTok();
if( tok != DSN_RIGHT )
@ -283,7 +283,7 @@ void DSNLEXER::NeedRIGHT() throw( IOError )
}
int DSNLEXER::NeedSYMBOL() throw( IOError )
int DSNLEXER::NeedSYMBOL() throw( IO_ERROR )
{
int tok = NextTok();
if( !IsSymbol( tok ) )
@ -292,7 +292,7 @@ int DSNLEXER::NeedSYMBOL() throw( IOError )
}
int DSNLEXER::NeedSYMBOLorNUMBER() throw( IOError )
int DSNLEXER::NeedSYMBOLorNUMBER() throw( IO_ERROR )
{
int tok = NextTok();
if( !IsSymbol( tok ) && tok!=DSN_NUMBER )
@ -312,7 +312,7 @@ static inline bool isSpace( int cc )
}
int DSNLEXER::NextTok() throw (IOError)
int DSNLEXER::NextTok() throw( IO_ERROR )
{
char* cur = next;
char* head = cur;
@ -1380,7 +1380,7 @@ class DSNTEST : public wxApp
DSNLEXER* lexer;
int nestLevel;
void recursion() throw( IOError );
void recursion() throw( IO_ERROR );
void indent()
{
@ -1485,7 +1485,7 @@ bool DSNTEST::OnInit()
}
printf("\n");
}
catch( IOError ioe )
catch( IO_ERROR ioe )
{
fprintf( stderr, "%s\n", CONV_TO_UTF8( ioe.errorText ) );
}
@ -1494,7 +1494,7 @@ bool DSNTEST::OnInit()
}
void DSNTEST::recursion() throw(IOError)
void DSNTEST::recursion() throw( IO_ERROR )
{
int tok;
const char* space = "";

24
common/richio.cpp
View File

@ -90,7 +90,7 @@ FILE_LINE_READER::FILE_LINE_READER( FILE* aFile, const wxString& aFileName, unsi
}
unsigned FILE_LINE_READER::ReadLine() throw (IOError)
unsigned FILE_LINE_READER::ReadLine() throw( IO_ERROR )
{
length = 0;
line[0] = 0;
@ -101,7 +101,7 @@ unsigned FILE_LINE_READER::ReadLine() throw (IOError)
length += strlen( line + length );
if( length == maxLineLength )
throw IOError( _("Line length exceeded") );
throw IO_ERROR( _("Line length exceeded") );
// a normal line breaks here, once through while loop
if( length+1 < capacity || line[length-1] == '\n' )
@ -117,7 +117,7 @@ unsigned FILE_LINE_READER::ReadLine() throw (IOError)
}
unsigned STRING_LINE_READER::ReadLine() throw (IOError)
unsigned STRING_LINE_READER::ReadLine() throw( IO_ERROR )
{
size_t nlOffset = lines.find( '\n', ndx );
@ -129,7 +129,7 @@ unsigned STRING_LINE_READER::ReadLine() throw (IOError)
if( length )
{
if( length >= maxLineLength )
throw IOError( _("Line length exceeded") );
throw IO_ERROR( _("Line length exceeded") );
if( length+1 > capacity ) // +1 for terminating nul
expandCapacity( length+1 );
@ -186,7 +186,7 @@ const char* OUTPUTFORMATTER::GetQuoteChar( const char* wrapee, const char* quote
}
int OUTPUTFORMATTER::vprint( const char* fmt, va_list ap ) throw( IOError )
int OUTPUTFORMATTER::vprint( const char* fmt, va_list ap ) throw( IO_ERROR )
{
int ret = vsnprintf( &buffer[0], buffer.size(), fmt, ap );
if( ret >= (int) buffer.size() )
@ -202,7 +202,7 @@ int OUTPUTFORMATTER::vprint( const char* fmt, va_list ap ) throw( IOError )
}
int OUTPUTFORMATTER::sprint( const char* fmt, ... ) throw( IOError )
int OUTPUTFORMATTER::sprint( const char* fmt, ... ) throw( IO_ERROR )
{
va_list args;
@ -214,7 +214,7 @@ int OUTPUTFORMATTER::sprint( const char* fmt, ... ) throw( IOError )
}
int OUTPUTFORMATTER::Print( int nestLevel, const char* fmt, ... ) throw( IOError )
int OUTPUTFORMATTER::Print( int nestLevel, const char* fmt, ... ) throw( IO_ERROR )
{
#define NESTWIDTH 2 ///< how many spaces per nestLevel
@ -243,7 +243,7 @@ int OUTPUTFORMATTER::Print( int nestLevel, const char* fmt, ... ) throw( IOError
}
const char* OUTPUTFORMATTER::Quoted( std::string* aWrapee ) throw( IOError )
const char* OUTPUTFORMATTER::Quoted( std::string* aWrapee ) throw( IO_ERROR )
{
// derived class's notion of what a quote character is
char quote = *GetQuoteChar( "(" );
@ -268,7 +268,7 @@ const char* OUTPUTFORMATTER::Quoted( std::string* aWrapee ) throw( IOError )
// a decision was made to make all S-expression strings be on a single
// line. You can embedd \n (human readable) in the text but not
// '\n' which is 0x0a.
throw IOError( _( "S-expression string has newline" ) );
throw IO_ERROR( _( "S-expression string has newline" ) );
}
}
@ -285,7 +285,7 @@ const char* OUTPUTFORMATTER::Quoted( std::string* aWrapee ) throw( IOError )
//-----<STRING_FORMATTER>----------------------------------------------------
void STRING_FORMATTER::write( const char* aOutBuf, int aCount ) throw( IOError )
void STRING_FORMATTER::write( const char* aOutBuf, int aCount ) throw( IO_ERROR )
{
mystring.append( aOutBuf, aCount );
}
@ -314,7 +314,7 @@ const char* STREAM_OUTPUTFORMATTER::GetQuoteChar( const char* wrapee )
}
void STREAM_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount ) throw( IOError )
void STREAM_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount ) throw( IO_ERROR )
{
int lastWrite;
@ -326,7 +326,7 @@ void STREAM_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount ) throw( IOE
if( !os.IsOk() )
{
throw IOError( _( "OUTPUTSTREAM_OUTPUTFORMATTER write error" ) );
throw IO_ERROR( _( "OUTPUTSTREAM_OUTPUTFORMATTER write error" ) );
}
}
}

4
common/xnode.cpp
View File

@ -29,7 +29,7 @@
typedef wxXmlProperty XATTR;
void XNODE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void XNODE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
switch( GetType() )
{
@ -48,7 +48,7 @@ void XNODE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
}
void XNODE::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void XNODE::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
std::string utf8;

2
eeschema/eeschema_config.cpp
View File

@ -613,7 +613,7 @@ void WinEDA_SchematicFrame::LoadSettings()
{
m_TemplateFieldNames.Parse( &lexer );
}
catch( IOError e )
catch( IO_ERROR e )
{
// @todo show error msg
D(printf("templatefieldnames parsing error: '%s'\n",

2
eeschema/netform.cpp
View File

@ -1055,7 +1055,7 @@ bool EXPORT_HELP::WriteGENERICNetList( WinEDA_SchematicFrame* frame, const wxStr
STREAM_OUTPUTFORMATTER outputFormatter( os );
xroot->Format( &outputFormatter, 0 );
}
catch( IOError ioe )
catch( IO_ERROR ioe )
{
delete xroot;
goto L_error;

8
eeschema/template_fieldnames.cpp
View File

@ -31,7 +31,7 @@ wxString TEMPLATE_FIELDNAME::GetDefaultFieldName( int aFieldNdx )
}
}
void TEMPLATE_FIELDNAME::Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IOError )
void TEMPLATE_FIELDNAME::Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR )
{
// user may want spaces in his field name, ug, so quote them for the parser.
out->Print( nestLevel, "(field (name \"%s\")", CONV_TO_UTF8(m_Name) );
@ -46,7 +46,7 @@ void TEMPLATE_FIELDNAME::Format( OUTPUTFORMATTER* out, int nestLevel ) const thr
}
void TEMPLATE_FIELDNAME::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IOError )
void TEMPLATE_FIELDNAME::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IO_ERROR )
{
TFIELD_T tok;
@ -87,7 +87,7 @@ void TEMPLATE_FIELDNAME::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IOError )
}
void TEMPLATES::Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IOError )
void TEMPLATES::Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR )
{
// We'll keep this general, and include the \n, even though the only known
// use at this time will not want the newlines or the indentation.
@ -97,7 +97,7 @@ void TEMPLATES::Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IOErr
out->Print( 0, ")\n" );
}
void TEMPLATES::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IOError )
void TEMPLATES::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IO_ERROR )
{
TFIELD_T tok;

8
eeschema/template_fieldnames.h
View File

@ -66,7 +66,7 @@ struct TEMPLATE_FIELDNAME
* Function Format
* serializes this object out as text into the given OUTPUTFORMATTER.
*/
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IOError );
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR );
/**
* Function Parse
@ -81,7 +81,7 @@ struct TEMPLATE_FIELDNAME
*
* @param aSpec is the input token stream of keywords and symbols.
*/
void Parse( TEMPLATE_FIELDNAMES_LEXER* aSpec ) throw( IOError );
void Parse( TEMPLATE_FIELDNAMES_LEXER* aSpec ) throw( IO_ERROR );
/**
* Function GetDefaultFieldName
@ -106,13 +106,13 @@ public:
* Function Format
* serializes this object out as text into the given OUTPUTFORMATTER.
*/
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IOError );
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR );
/**
* Function Parse
* fills this object from information in the input stream handled by TEMPLATE_FIELDNAMES_LEXER
*/
void Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IOError );
void Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IO_ERROR );
/**

56
include/dsnlexer.h
View File

@ -102,7 +102,7 @@ class DSNLEXER
void init();
int readLine() throw (IOError)
int readLine() throw( IO_ERROR )
{
unsigned len = reader->ReadLine();
@ -213,29 +213,29 @@ public:
* this lower level function returning an int (so the enum does not collide
* with another usage).
* @return int - the type of token found next.
* @throw IOError - only if the LINE_READER throws it.
* @throw IO_ERROR - only if the LINE_READER throws it.
*/
int NextTok() throw (IOError);
int NextTok() throw( IO_ERROR );
/**
* Function NeedSYMBOL
* calls NextTok() and then verifies that the token read in
* satisfies bool IsSymbol().
* If not, an IOError is thrown.
* If not, an IO_ERROR is thrown.
* @return int - the actual token read in.
* @throw IOError, if the next token does not satisfy IsSymbol()
* @throw IO_ERROR, if the next token does not satisfy IsSymbol()
*/
int NeedSYMBOL() throw( IOError );
int NeedSYMBOL() throw( IO_ERROR );
/**
* Function NeedSYMBOLorNUMBER
* calls NextTok() and then verifies that the token read in
* satisfies bool IsSymbol() or tok==DSN_NUMBER.
* If not, an IOError is thrown.
* If not, an IO_ERROR is thrown.
* @return int - the actual token read in.
* @throw IOError, if the next token does not satisfy the above test
* @throw IO_ERROR, if the next token does not satisfy the above test
*/
int NeedSYMBOLorNUMBER() throw( IOError );
int NeedSYMBOLorNUMBER() throw( IO_ERROR );
/**
* Function CurTok
@ -311,58 +311,58 @@ public:
* encapsulates the formatting of an error message which contains the exact
* location within the input file of something the caller is rejecting.
*/
void ThrowIOError( wxString aText, int charOffset ) throw (IOError);
void ThrowIOError( wxString aText, int charOffset ) throw( IO_ERROR );
/**
* Function Expecting
* throws an IOError exception with an input file specific error message.
* throws an IO_ERROR exception with an input file specific error message.
* @param aTok is the token/keyword type which was expected at the current input location.
* @throw IOError with the location within the input file of the problem.
* @throw IO_ERROR with the location within the input file of the problem.
*/
void Expecting( int aTok ) throw( IOError );
void Expecting( int aTok ) throw( IO_ERROR );
/**
* Function Expecting
* throws an IOError exception with an input file specific error message.
* throws an IO_ERROR exception with an input file specific error message.
* @param aErrorMsg is the token/keyword type which was expected at the
* current input location.
* @throw IOError with the location within the input file of the problem.
* @throw IO_ERROR with the location within the input file of the problem.
*/
void Expecting( const wxString& aErrorMsg ) throw( IOError );
void Expecting( const wxString& aErrorMsg ) throw( IO_ERROR );
/**
* Function Unexpected
* throws an IOError exception with an input file specific error message.
* throws an IO_ERROR exception with an input file specific error message.
* @param aTok is the token/keyword type which was not expected at the
* current input location.
* @throw IOError with the location within the input file of the problem.
* @throw IO_ERROR with the location within the input file of the problem.
*/
void Unexpected( int aTok ) throw( IOError );
void Unexpected( int aTok ) throw( IO_ERROR );
/**
* Function Unexpected
* throws an IOError exception with an input file specific error message.
* throws an IO_ERROR exception with an input file specific error message.
* @param aErrorMsg is the token/keyword type which was not expected at the
* current input location.
* @throw IOError with the location within the input file of the problem.
* @throw IO_ERROR with the location within the input file of the problem.
*/
void Unexpected( const wxString& aErrorMsg ) throw( IOError );
void Unexpected( const wxString& aErrorMsg ) throw( IO_ERROR );
/**
* Function NeedLEFT
* calls NextTok() and then verifies that the token read in is a DSN_LEFT.
* If it is not, an IOError is thrown.
* @throw IOError, if the next token is not a DSN_LEFT
* If it is not, an IO_ERROR is thrown.
* @throw IO_ERROR, if the next token is not a DSN_LEFT
*/
void NeedLEFT() throw( IOError );
void NeedLEFT() throw( IO_ERROR );
/**
* Function NeedRIGHT
* calls NextTok() and then verifies that the token read in is a DSN_RIGHT.
* If it is not, an IOError is thrown.
* @throw IOError, if the next token is not a DSN_RIGHT
* If it is not, an IO_ERROR is thrown.
* @throw IO_ERROR, if the next token is not a DSN_RIGHT
*/
void NeedRIGHT() throw( IOError );
void NeedRIGHT() throw( IO_ERROR );
/**
* Function GetTokenText

36
include/richio.h
View File

@ -42,20 +42,20 @@
/**
* Struct IOError
* Struct IO_ERROR
* is a class used to hold an error message and may be used to throw exceptions
* containing meaningful error messages.
*/
struct IOError
struct IO_ERROR
{
wxString errorText;
IOError( const wxChar* aMsg ) :
IO_ERROR( const wxChar* aMsg ) :
errorText( aMsg )
{
}
IOError( const wxString& aMsg ) :
IO_ERROR( const wxString& aMsg ) :
errorText( aMsg )
{
}
@ -104,9 +104,9 @@ public:
* counter. If the line is larger than aMaxLineLength passed to the
* constructor, then an exception is thrown. The line is nul terminated.
* @return unsigned - The number of bytes read, 0 at end of file.
* @throw IOError when a line is too long.
* @throw IO_ERROR when a line is too long.
*/
virtual unsigned ReadLine() throw( IOError ) = 0;
virtual unsigned ReadLine() throw( IO_ERROR ) = 0;
/**
* Function GetSource
@ -181,7 +181,7 @@ public:
fclose( fp );
}
unsigned ReadLine() throw( IOError ); // see LINE_READER::ReadLine() description
unsigned ReadLine() throw( IO_ERROR ); // see LINE_READER::ReadLine() description
/**
* Function Rewind
@ -228,7 +228,7 @@ public:
source = aSource;
}
unsigned ReadLine() throw(IOError); // see LINE_READER::ReadLine() description
unsigned ReadLine() throw( IO_ERROR ); // see LINE_READER::ReadLine() description
};
@ -251,8 +251,8 @@ class OUTPUTFORMATTER
{
std::vector<char> buffer;
int sprint( const char* fmt, ... ) throw( IOError );
int vprint( const char* fmt, va_list ap ) throw( IOError );
int sprint( const char* fmt, ... ) throw( IO_ERROR );
int vprint( const char* fmt, va_list ap ) throw( IO_ERROR );
protected:
@ -283,9 +283,9 @@ protected:
*
* @param aOutBuf is the start of a byte buffer to write.
* @param aCount tells how many bytes to write.
* @throw IOError, if there is a problem outputting, such as a full disk.
* @throw IO_ERROR, if there is a problem outputting, such as a full disk.
*/
virtual void write( const char* aOutBuf, int aCount ) throw( IOError ) = 0;
virtual void write( const char* aOutBuf, int aCount ) throw( IO_ERROR ) = 0;
#if defined(__GNUG__) // The GNU C++ compiler defines this
@ -312,9 +312,9 @@ public:
* @param ... a variable list of parameters that will get blended into
* the output under control of the format string.
* @return int - the number of characters output.
* @throw IOError, if there is a problem outputting, such as a full disk.
* @throw IO_ERROR, if there is a problem outputting, such as a full disk.
*/
int PRINTF_FUNC Print( int nestLevel, const char* fmt, ... ) throw( IOError );
int PRINTF_FUNC Print( int nestLevel, const char* fmt, ... ) throw( IO_ERROR );
/**
* Function GetQuoteChar
@ -350,11 +350,11 @@ public:
*
* @return const char* - useful for passing to printf() style functions that
* must output utf8 streams.
* @throw IOError, if aWrapee has any \r or \n bytes in it which is
* @throw IO_ERROR, if aWrapee has any \r or \n bytes in it which is
* illegal according to the DSNLEXER who does not ever want them
* within a string.
*/
virtual const char* Quoted( std::string* aWrapee ) throw( IOError );
virtual const char* Quoted( std::string* aWrapee ) throw( IO_ERROR );
//-----</interface functions>-----------------------------------------
};
@ -402,7 +402,7 @@ public:
//-----<OUTPUTFORMATTER>------------------------------------------------
protected:
void write( const char* aOutBuf, int aCount ) throw( IOError );
void write( const char* aOutBuf, int aCount ) throw( IO_ERROR );
//-----</OUTPUTFORMATTER>-----------------------------------------------
};
@ -434,7 +434,7 @@ public:
const char* GetQuoteChar( const char* wrapee );
protected:
void write( const char* aOutBuf, int aCount ) throw( IOError );
void write( const char* aOutBuf, int aCount ) throw( IO_ERROR );
//-----</OUTPUTFORMATTER>-----------------------------------------------
};

8
include/xnode.h
View File

@ -52,9 +52,9 @@ public:
* writes this object as UTF8 out to an OUTPUTFORMATTER as an S-expression.
* @param out The formatter to write to.
* @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IOError if a system error writing the output, such as a full disk.
* @throw IO_ERROR if a system error writing the output, such as a full disk.
*/
virtual void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError );
virtual void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR );
/**
* Function FormatContents
@ -62,9 +62,9 @@ public:
* This is the same as Format() except that the outer wrapper is not included.
* @param out The formatter to write to.
* @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IOError if a system error writing the output, such as a full disk.
* @throw IO_ERROR if a system error writing the output, such as a full disk.
*/
virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError );
virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR );
// The following functions did not appear in the base class until recently.
// Overload them even if they are present in base class, just to make sure

8
new/design.h
View File

@ -294,7 +294,7 @@ protected: ///< derived classes must implement
* part is done, then LIBRARY::ReloadPart() must be called on this same part
* and all parts that inherit it must be reparsed.
*/
virtual void WritePart( const STRING& aPartName, const STRING& aSExpression ) throw ( IO_ERROR ) = 0;
virtual void WritePart( const STRING& aPartName, const STRING& aSExpression ) throw( IO_ERROR ) = 0;
protected:
@ -318,7 +318,7 @@ class LIBS
* will find it and load it into its containing LIBRARY, even if that means
* having to load a new LIBRARY as given in the library table.
*/
static PART* GetPart( const LPID& aLogicalPartID ) throw ( IO_ERROR );
static PART* GetPart( const LPID& aLogicalPartID ) throw( IO_ERROR );
/**
* Function GetLIBRARY
@ -444,9 +444,9 @@ public:
* There can be some self referential issues that mean all the parts in the PARTS_LIST
* have to reparsed.
*/
virtual void WritePart( PART* aPart ) throw ( IO_ERROR ) = 0;
virtual void WritePart( PART* aPart ) throw( IO_ERROR ) = 0;
virtual void SetPartBody( PART* aPart, const STRING& aSExpression ) throw ( IO_ERROR );
virtual void SetPartBody( PART* aPart, const STRING& aSExpression ) throw( IO_ERROR );
/**
* Function GetRevisions

130
pcbnew/specctra.cpp
View File

@ -533,7 +533,7 @@ int SPECCTRA_DB::findLayerName( const std::string& aLayerName ) const
}
void SPECCTRA_DB::ThrowIOError( const wxChar* fmt, ... ) throw( IOError )
void SPECCTRA_DB::ThrowIOError( const wxChar* fmt, ... ) throw( IO_ERROR )
{
wxString errText;
va_list args;
@ -542,18 +542,18 @@ void SPECCTRA_DB::ThrowIOError( const wxChar* fmt, ... ) throw( IOError )
errText.PrintfV( fmt, args );
va_end( args );
throw IOError( errText );
throw IO_ERROR( errText );
}
void SPECCTRA_DB::expecting( const char* text ) throw( IOError )
void SPECCTRA_DB::expecting( const char* text ) throw( IO_ERROR )
{
wxString errText = CONV_FROM_UTF8( text );
lexer->Expecting( errText );
}
void SPECCTRA_DB::unexpected( const char* text ) throw( IOError )
void SPECCTRA_DB::unexpected( const char* text ) throw( IO_ERROR )
{
wxString errText = CONV_FROM_UTF8( text );
lexer->Unexpected( errText );
@ -566,7 +566,7 @@ DSN_T SPECCTRA_DB::nextTok()
return ret;
}
void SPECCTRA_DB::readCOMPnPIN( std::string* component_id, std::string* pin_id ) throw( IOError )
void SPECCTRA_DB::readCOMPnPIN( std::string* component_id, std::string* pin_id ) throw( IO_ERROR )
{
DSN_T tok;
@ -609,7 +609,7 @@ void SPECCTRA_DB::readCOMPnPIN( std::string* component_id, std::string* pin_id )
}
void SPECCTRA_DB::readTIME( time_t* time_stamp ) throw( IOError )
void SPECCTRA_DB::readTIME( time_t* time_stamp ) throw( IO_ERROR )
{
DSN_T tok;
@ -675,7 +675,7 @@ void SPECCTRA_DB::readTIME( time_t* time_stamp ) throw( IOError )
}
void SPECCTRA_DB::LoadPCB( const wxString& filename ) throw( IOError )
void SPECCTRA_DB::LoadPCB( const wxString& filename ) throw( IO_ERROR )
{
FILE* fp = wxFopen( filename, wxT("r") );
@ -704,7 +704,7 @@ void SPECCTRA_DB::LoadPCB( const wxString& filename ) throw( IOError )
}
void SPECCTRA_DB::LoadSESSION( const wxString& filename ) throw( IOError )
void SPECCTRA_DB::LoadSESSION( const wxString& filename ) throw( IO_ERROR )
{
FILE* fp = wxFopen( filename, wxT("r") );
@ -733,7 +733,7 @@ void SPECCTRA_DB::LoadSESSION( const wxString& filename ) throw( IOError )
}
void SPECCTRA_DB::doPCB( PCB* growth ) throw( IOError )
void SPECCTRA_DB::doPCB( PCB* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -838,7 +838,7 @@ void SPECCTRA_DB::doPCB( PCB* growth ) throw( IOError )
}
void SPECCTRA_DB::doPARSER( PARSER* growth ) throw( IOError )
void SPECCTRA_DB::doPARSER( PARSER* growth ) throw( IO_ERROR )
{
DSN_T tok;
std::string const1;
@ -977,7 +977,7 @@ void SPECCTRA_DB::doPARSER( PARSER* growth ) throw( IOError )
}
void SPECCTRA_DB::doRESOLUTION( UNIT_RES* growth ) throw(IOError)
void SPECCTRA_DB::doRESOLUTION( UNIT_RES* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -1004,7 +1004,7 @@ void SPECCTRA_DB::doRESOLUTION( UNIT_RES* growth ) throw(IOError)
}
void SPECCTRA_DB::doUNIT( UNIT_RES* growth ) throw(IOError)
void SPECCTRA_DB::doUNIT( UNIT_RES* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -1025,7 +1025,7 @@ void SPECCTRA_DB::doUNIT( UNIT_RES* growth ) throw(IOError)
}
void SPECCTRA_DB::doLAYER_PAIR( LAYER_PAIR* growth ) throw( IOError )
void SPECCTRA_DB::doLAYER_PAIR( LAYER_PAIR* growth ) throw( IO_ERROR )
{
needSYMBOL();
growth->layer_id0 = lexer->CurText();
@ -1041,7 +1041,7 @@ void SPECCTRA_DB::doLAYER_PAIR( LAYER_PAIR* growth ) throw( IOError )
}
void SPECCTRA_DB::doLAYER_NOISE_WEIGHT( LAYER_NOISE_WEIGHT* growth ) throw( IOError )
void SPECCTRA_DB::doLAYER_NOISE_WEIGHT( LAYER_NOISE_WEIGHT* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -1060,7 +1060,7 @@ void SPECCTRA_DB::doLAYER_NOISE_WEIGHT( LAYER_NOISE_WEIGHT* growth ) throw( IOEr
}
void SPECCTRA_DB::doSTRUCTURE( STRUCTURE* growth ) throw(IOError)
void SPECCTRA_DB::doSTRUCTURE( STRUCTURE* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -1194,7 +1194,7 @@ L_place:
}
void SPECCTRA_DB::doSTRUCTURE_OUT( STRUCTURE_OUT* growth ) throw( IOError )
void SPECCTRA_DB::doSTRUCTURE_OUT( STRUCTURE_OUT* growth ) throw( IO_ERROR )
{
/*
<structure_out_descriptor >::=
@ -1237,7 +1237,7 @@ void SPECCTRA_DB::doSTRUCTURE_OUT( STRUCTURE_OUT* growth ) throw( IOError )
}
void SPECCTRA_DB::doKEEPOUT( KEEPOUT* growth ) throw( IOError )
void SPECCTRA_DB::doKEEPOUT( KEEPOUT* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -1326,7 +1326,7 @@ void SPECCTRA_DB::doKEEPOUT( KEEPOUT* growth ) throw( IOError )
}
void SPECCTRA_DB::doWINDOW( WINDOW* growth ) throw( IOError )
void SPECCTRA_DB::doWINDOW( WINDOW* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -1378,7 +1378,7 @@ void SPECCTRA_DB::doWINDOW( WINDOW* growth ) throw( IOError )
}
void SPECCTRA_DB::doBOUNDARY( BOUNDARY* growth ) throw( IOError )
void SPECCTRA_DB::doBOUNDARY( BOUNDARY* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -1425,7 +1425,7 @@ void SPECCTRA_DB::doBOUNDARY( BOUNDARY* growth ) throw( IOError )
}
void SPECCTRA_DB::doPATH( PATH* growth ) throw( IOError )
void SPECCTRA_DB::doPATH( PATH* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -1473,7 +1473,7 @@ void SPECCTRA_DB::doPATH( PATH* growth ) throw( IOError )
}
void SPECCTRA_DB::doRECTANGLE( RECTANGLE* growth ) throw( IOError )
void SPECCTRA_DB::doRECTANGLE( RECTANGLE* growth ) throw( IO_ERROR )
{
needSYMBOL();
growth->layer_id = lexer->CurText();
@ -1498,7 +1498,7 @@ void SPECCTRA_DB::doRECTANGLE( RECTANGLE* growth ) throw( IOError )
}
void SPECCTRA_DB::doCIRCLE( CIRCLE* growth ) throw( IOError )
void SPECCTRA_DB::doCIRCLE( CIRCLE* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -1526,7 +1526,7 @@ void SPECCTRA_DB::doCIRCLE( CIRCLE* growth ) throw( IOError )
}
void SPECCTRA_DB::doQARC( QARC* growth ) throw( IOError )
void SPECCTRA_DB::doQARC( QARC* growth ) throw( IO_ERROR )
{
needSYMBOL();
growth->layer_id = lexer->CurText();
@ -1550,7 +1550,7 @@ void SPECCTRA_DB::doQARC( QARC* growth ) throw( IOError )
}
void SPECCTRA_DB::doSTRINGPROP( STRINGPROP* growth ) throw( IOError )
void SPECCTRA_DB::doSTRINGPROP( STRINGPROP* growth ) throw( IO_ERROR )
{
needSYMBOL();
growth->value = lexer->CurText();
@ -1558,7 +1558,7 @@ void SPECCTRA_DB::doSTRINGPROP( STRINGPROP* growth ) throw( IOError )
}
void SPECCTRA_DB::doTOKPROP( TOKPROP* growth ) throw( IOError )
void SPECCTRA_DB::doTOKPROP( TOKPROP* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -1571,7 +1571,7 @@ void SPECCTRA_DB::doTOKPROP( TOKPROP* growth ) throw( IOError )
}
void SPECCTRA_DB::doVIA( VIA* growth ) throw( IOError )
void SPECCTRA_DB::doVIA( VIA* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -1600,7 +1600,7 @@ void SPECCTRA_DB::doVIA( VIA* growth ) throw( IOError )
}
void SPECCTRA_DB::doCONTROL( CONTROL* growth ) throw( IOError )
void SPECCTRA_DB::doCONTROL( CONTROL* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -1647,7 +1647,7 @@ void SPECCTRA_DB::doCONTROL( CONTROL* growth ) throw( IOError )
}
void SPECCTRA_DB::doPROPERTIES( PROPERTIES* growth ) throw( IOError )
void SPECCTRA_DB::doPROPERTIES( PROPERTIES* growth ) throw( IO_ERROR )
{
DSN_T tok;
PROPERTY property; // construct it once here, append multiple times.
@ -1670,7 +1670,7 @@ void SPECCTRA_DB::doPROPERTIES( PROPERTIES* growth ) throw( IOError )
}
void SPECCTRA_DB::doLAYER( LAYER* growth ) throw( IOError )
void SPECCTRA_DB::doLAYER( LAYER* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -1792,7 +1792,7 @@ void SPECCTRA_DB::doLAYER( LAYER* growth ) throw( IOError )
}
void SPECCTRA_DB::doRULE( RULE* growth ) throw( IOError )
void SPECCTRA_DB::doRULE( RULE* growth ) throw( IO_ERROR )
{
std::string builder;
int bracketNesting = 1; // we already saw the opening T_LEFT
@ -1838,7 +1838,7 @@ void SPECCTRA_DB::doRULE( RULE* growth ) throw( IOError )
#if 0
void SPECCTRA_DB::doPLACE_RULE( PLACE_RULE* growth, bool expect_object_type ) throw( IOError )
void SPECCTRA_DB::doPLACE_RULE( PLACE_RULE* growth, bool expect_object_type ) throw( IO_ERROR )
{
/* (place_rule [<structure_place_rule_object> ]
{[<spacing_descriptor> |
@ -1924,7 +1924,7 @@ void SPECCTRA_DB::doPLACE_RULE( PLACE_RULE* growth, bool expect_object_type ) th
#endif
void SPECCTRA_DB::doREGION( REGION* growth ) throw( IOError )
void SPECCTRA_DB::doREGION( REGION* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -1993,7 +1993,7 @@ void SPECCTRA_DB::doREGION( REGION* growth ) throw( IOError )
}
void SPECCTRA_DB::doCLASS_CLASS( CLASS_CLASS* growth ) throw( IOError )
void SPECCTRA_DB::doCLASS_CLASS( CLASS_CLASS* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -2038,7 +2038,7 @@ void SPECCTRA_DB::doCLASS_CLASS( CLASS_CLASS* growth ) throw( IOError )
}
void SPECCTRA_DB::doCLASSES( CLASSES* growth ) throw( IOError )
void SPECCTRA_DB::doCLASSES( CLASSES* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -2061,7 +2061,7 @@ void SPECCTRA_DB::doCLASSES( CLASSES* growth ) throw( IOError )
}
void SPECCTRA_DB::doGRID( GRID* growth ) throw( IOError )
void SPECCTRA_DB::doGRID( GRID* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -2126,7 +2126,7 @@ void SPECCTRA_DB::doGRID( GRID* growth ) throw( IOError )
}
void SPECCTRA_DB::doLAYER_RULE( LAYER_RULE* growth ) throw( IOError )
void SPECCTRA_DB::doLAYER_RULE( LAYER_RULE* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -2151,7 +2151,7 @@ void SPECCTRA_DB::doLAYER_RULE( LAYER_RULE* growth ) throw( IOError )
}
void SPECCTRA_DB::doPLACE( PLACE* growth ) throw( IOError )
void SPECCTRA_DB::doPLACE( PLACE* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -2266,7 +2266,7 @@ void SPECCTRA_DB::doPLACE( PLACE* growth ) throw( IOError )
}
void SPECCTRA_DB::doCOMPONENT( COMPONENT* growth ) throw( IOError )
void SPECCTRA_DB::doCOMPONENT( COMPONENT* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -2296,7 +2296,7 @@ void SPECCTRA_DB::doCOMPONENT( COMPONENT* growth ) throw( IOError )
}
void SPECCTRA_DB::doPLACEMENT( PLACEMENT* growth ) throw( IOError )
void SPECCTRA_DB::doPLACEMENT( PLACEMENT* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -2355,7 +2355,7 @@ void SPECCTRA_DB::doPLACEMENT( PLACEMENT* growth ) throw( IOError )
}
void SPECCTRA_DB::doPADSTACK( PADSTACK* growth ) throw( IOError )
void SPECCTRA_DB::doPADSTACK( PADSTACK* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -2455,7 +2455,7 @@ void SPECCTRA_DB::doPADSTACK( PADSTACK* growth ) throw( IOError )
}
void SPECCTRA_DB::doSHAPE( SHAPE* growth ) throw( IOError )
void SPECCTRA_DB::doSHAPE( SHAPE* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -2538,7 +2538,7 @@ L_done_that:
}
void SPECCTRA_DB::doIMAGE( IMAGE* growth ) throw( IOError )
void SPECCTRA_DB::doIMAGE( IMAGE* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -2634,7 +2634,7 @@ void SPECCTRA_DB::doIMAGE( IMAGE* growth ) throw( IOError )
}
void SPECCTRA_DB::doPIN( PIN* growth ) throw( IOError )
void SPECCTRA_DB::doPIN( PIN* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
@ -2681,7 +2681,7 @@ void SPECCTRA_DB::doPIN( PIN* growth ) throw( IOError )
}
void SPECCTRA_DB::doLIBRARY( LIBRARY* growth ) throw( IOError )
void SPECCTRA_DB::doLIBRARY( LIBRARY* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -2735,7 +2735,7 @@ void SPECCTRA_DB::doLIBRARY( LIBRARY* growth ) throw( IOError )
}
void SPECCTRA_DB::doNET( NET* growth ) throw( IOError )
void SPECCTRA_DB::doNET( NET* growth ) throw( IO_ERROR )
{
DSN_T tok = nextTok();
PIN_REFS* pin_refs;
@ -2875,7 +2875,7 @@ L_pins:
}
void SPECCTRA_DB::doTOPOLOGY( TOPOLOGY* growth ) throw( IOError )
void SPECCTRA_DB::doTOPOLOGY( TOPOLOGY* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -2913,7 +2913,7 @@ void SPECCTRA_DB::doTOPOLOGY( TOPOLOGY* growth ) throw( IOError )
}
void SPECCTRA_DB::doCLASS( CLASS* growth ) throw( IOError )
void SPECCTRA_DB::doCLASS( CLASS* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -3023,7 +3023,7 @@ void SPECCTRA_DB::doCLASS( CLASS* growth ) throw( IOError )
}
void SPECCTRA_DB::doNETWORK( NETWORK* growth ) throw( IOError )
void SPECCTRA_DB::doNETWORK( NETWORK* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -3068,7 +3068,7 @@ void SPECCTRA_DB::doNETWORK( NETWORK* growth ) throw( IOError )
}
void SPECCTRA_DB::doCOMP_ORDER( COMP_ORDER* growth ) throw( IOError )
void SPECCTRA_DB::doCOMP_ORDER( COMP_ORDER* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -3086,7 +3086,7 @@ void SPECCTRA_DB::doCOMP_ORDER( COMP_ORDER* growth ) throw( IOError )
}
void SPECCTRA_DB::doFROMTO( FROMTO* growth ) throw( IOError )
void SPECCTRA_DB::doFROMTO( FROMTO* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -3172,7 +3172,7 @@ void SPECCTRA_DB::doFROMTO( FROMTO* growth ) throw( IOError )
}
void SPECCTRA_DB::doWIRE( WIRE* growth ) throw( IOError )
void SPECCTRA_DB::doWIRE( WIRE* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -3295,7 +3295,7 @@ void SPECCTRA_DB::doWIRE( WIRE* growth ) throw( IOError )
}
void SPECCTRA_DB::doWIRE_VIA( WIRE_VIA* growth ) throw( IOError )
void SPECCTRA_DB::doWIRE_VIA( WIRE_VIA* growth ) throw( IO_ERROR )
{
DSN_T tok;
POINT point;
@ -3399,7 +3399,7 @@ void SPECCTRA_DB::doWIRE_VIA( WIRE_VIA* growth ) throw( IOError )
}
void SPECCTRA_DB::doWIRING( WIRING* growth ) throw( IOError )
void SPECCTRA_DB::doWIRING( WIRING* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -3455,7 +3455,7 @@ void SPECCTRA_DB::doWIRING( WIRING* growth ) throw( IOError )
}
void SPECCTRA_DB::doANCESTOR( ANCESTOR* growth ) throw( IOError )
void SPECCTRA_DB::doANCESTOR( ANCESTOR* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -3493,7 +3493,7 @@ void SPECCTRA_DB::doANCESTOR( ANCESTOR* growth ) throw( IOError )
}
void SPECCTRA_DB::doHISTORY( HISTORY* growth ) throw( IOError )
void SPECCTRA_DB::doHISTORY( HISTORY* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -3549,7 +3549,7 @@ void SPECCTRA_DB::doHISTORY( HISTORY* growth ) throw( IOError )
}
void SPECCTRA_DB::doSESSION( SESSION* growth ) throw( IOError )
void SPECCTRA_DB::doSESSION( SESSION* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -3626,7 +3626,7 @@ void SPECCTRA_DB::doSESSION( SESSION* growth ) throw( IOError )
}
void SPECCTRA_DB::doWAS_IS( WAS_IS* growth ) throw( IOError )
void SPECCTRA_DB::doWAS_IS( WAS_IS* growth ) throw( IO_ERROR )
{
DSN_T tok;
PIN_PAIR empty( growth );
@ -3667,7 +3667,7 @@ void SPECCTRA_DB::doWAS_IS( WAS_IS* growth ) throw( IOError )
}
void SPECCTRA_DB::doROUTE( ROUTE* growth ) throw( IOError )
void SPECCTRA_DB::doROUTE( ROUTE* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -3743,7 +3743,7 @@ void SPECCTRA_DB::doROUTE( ROUTE* growth ) throw( IOError )
}
void SPECCTRA_DB::doNET_OUT( NET_OUT* growth ) throw( IOError )
void SPECCTRA_DB::doNET_OUT( NET_OUT* growth ) throw( IO_ERROR )
{
DSN_T tok;
@ -3811,7 +3811,7 @@ void SPECCTRA_DB::doNET_OUT( NET_OUT* growth ) throw( IOError )
}
void SPECCTRA_DB::doSUPPLY_PIN( SUPPLY_PIN* growth ) throw( IOError )
void SPECCTRA_DB::doSUPPLY_PIN( SUPPLY_PIN* growth ) throw( IO_ERROR )
{
DSN_T tok;
PIN_REF empty(growth);
@ -3847,7 +3847,7 @@ void SPECCTRA_DB::doSUPPLY_PIN( SUPPLY_PIN* growth ) throw( IOError )
}
void SPECCTRA_DB::ExportPCB( wxString filename, bool aNameChange ) throw( IOError )
void SPECCTRA_DB::ExportPCB( wxString filename, bool aNameChange ) throw( IO_ERROR )
{
if( pcb )
{
@ -3938,7 +3938,7 @@ UNIT_RES* ELEM::GetUnits() const
}
void ELEM::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void ELEM::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s\n", Name() );
@ -3948,7 +3948,7 @@ void ELEM::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
}
void ELEM_HOLDER::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void ELEM_HOLDER::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
for( int i=0; i<Length(); ++i )
{
@ -4061,7 +4061,7 @@ PARSER::PARSER( ELEM* aParent ) :
}
void PARSER::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void PARSER::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(string_quote %c)\n", string_quote );
out->Print( nestLevel, "(space_in_quoted_tokens %s)\n", space_in_quoted_tokens ? "on" : "off" );
@ -4097,7 +4097,7 @@ void PARSER::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOErro
}
void PLACE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void PLACE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
bool useMultiLine;

296
pcbnew/specctra.h
View File

@ -554,9 +554,9 @@ struct POINT
* SPECCTRA DSN format.
* @param out The formatter to write to.
* @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IOError if a system error writing the output, such as a full disk.
* @throw IO_ERROR if a system error writing the output, such as a full disk.
*/
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR )
{
out->Print( nestLevel, " %.6g %.6g", x, y );
}
@ -576,9 +576,9 @@ struct PROPERTY
* SPECCTRA DSN format.
* @param out The formatter to write to.
* @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IOError if a system error writing the output, such as a full disk.
* @throw IO_ERROR if a system error writing the output, such as a full disk.
*/
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR )
{
const char* quoteName = out->GetQuoteChar( name.c_str() );
const char* quoteValue = out->GetQuoteChar( value.c_str() );
@ -654,9 +654,9 @@ public:
* SPECCTRA DSN format.
* @param out The formatter to write to.
* @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IOError if a system error writing the output, such as a full disk.
* @throw IO_ERROR if a system error writing the output, such as a full disk.
*/
virtual void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError );
virtual void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR );
/**
@ -666,9 +666,9 @@ public:
* wrapper is not included.
* @param out The formatter to write to.
* @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IOError if a system error writing the output, such as a full disk.
* @throw IO_ERROR if a system error writing the output, such as a full disk.
*/
virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
// overridden in ELEM_HOLDER
}
@ -700,7 +700,7 @@ public:
{
}
virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError );
virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR );
//-----< list operations >--------------------------------------------
@ -796,7 +796,7 @@ public:
PARSER( ELEM* aParent );
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError );
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR );
};
@ -831,7 +831,7 @@ public:
DSN_T GetEngUnits() const { return units; }
int GetValue() const { return value; }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
if( type == T_unit )
out->Print( nestLevel, "(%s %s)\n", Name(),
@ -874,7 +874,7 @@ public:
point1.FixNegativeZero();
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* newline = nestLevel ? "\n" : "";
@ -907,7 +907,7 @@ public:
{
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s", Name() );
@ -953,7 +953,7 @@ public:
delete rule;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s", Name() );
@ -1012,7 +1012,7 @@ public:
aperture_width = aWidth;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* newline = nestLevel ? "\n" : "";
@ -1071,7 +1071,7 @@ public:
delete rectangle;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s\n", Name() );
@ -1104,7 +1104,7 @@ public:
diameter = 0.0;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* newline = nestLevel ? "\n" : "";
@ -1151,7 +1151,7 @@ public:
aperture_width = 0.0;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* newline = nestLevel ? "\n" : "";
@ -1233,7 +1233,7 @@ public:
}
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s ", Name() );
@ -1316,7 +1316,7 @@ public:
windows.push_back( aWindow );
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* newline = "\n";
@ -1393,7 +1393,7 @@ public:
padstacks.push_back( aViaName );
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const int RIGHTMARGIN = 80;
int perLine = out->Print( nestLevel, "(%s", Name() );
@ -1447,7 +1447,7 @@ public:
{
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
for( STRINGS::iterator i=class_ids.begin(); i!=class_ids.end(); ++i )
{
@ -1485,7 +1485,7 @@ public:
delete classes;
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
if( classes )
classes->Format( out, nestLevel );
@ -1515,7 +1515,7 @@ public:
{
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s\n", Name() );
@ -1570,7 +1570,7 @@ public:
delete rules;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote = out->GetQuoteChar( name.c_str() );
@ -1644,7 +1644,7 @@ public:
layer_weight = 0.0;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote0 = out->GetQuoteChar( layer_id0.c_str() );
const char* quote1 = out->GetQuoteChar( layer_id1.c_str() );
@ -1671,7 +1671,7 @@ public:
{
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s\n", Name() );
@ -1717,7 +1717,7 @@ public:
{
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s %s)\n", Name(),
GetTokenText( value ) );
@ -1743,7 +1743,7 @@ public:
{
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote = out->GetQuoteChar( value.c_str() );
@ -1786,7 +1786,7 @@ public:
delete rules;
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
if( region_id.size() )
{
@ -1834,7 +1834,7 @@ public:
image_type= T_NONE;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s %s %.6g",
Name(),
@ -1878,7 +1878,7 @@ public:
delete rules;
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
for( LAYERS::iterator i=layers.begin(); i!=layers.end(); ++i )
i->Format( out, nestLevel );
@ -1962,7 +1962,7 @@ public:
place_boundary->SetParent( this );
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
if( unit )
unit->Format( out, nestLevel );
@ -2094,7 +2094,7 @@ public:
rotation = aRotation;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError );
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR );
};
typedef boost::ptr_vector<PLACE> PLACES;
@ -2131,7 +2131,7 @@ public:
*/
// static int Compare( IMAGE* lhs, IMAGE* rhs );
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote = out->GetQuoteChar( image_id.c_str() );
out->Print( nestLevel, "(%s %s%s%s\n", Name(),
@ -2142,7 +2142,7 @@ public:
out->Print( nestLevel, ")\n" );
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
for( PLACES::iterator i=places.begin(); i!=places.end(); ++i )
i->Format( out, nestLevel );
@ -2195,7 +2195,7 @@ public:
return added;
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
if( unit )
unit->Format( out, nestLevel );
@ -2261,7 +2261,7 @@ public:
connect = aConnect;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s ", Name() );
@ -2320,7 +2320,7 @@ public:
vertex.FixNegativeZero();
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote = out->GetQuoteChar( padstack_id.c_str() );
if( isRotated )
@ -2405,7 +2405,7 @@ public:
return image_id;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
std::string imageId = GetImageId();
@ -2420,7 +2420,7 @@ public:
}
// this is here for makeHash()
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
if( side != T_both )
out->Print( 0, " (side %s)", GetTokenText( side ) );
@ -2520,7 +2520,7 @@ public:
padstack_id = aPadstackId;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote = out->GetQuoteChar( padstack_id.c_str() );
@ -2534,7 +2534,7 @@ public:
// this factored out for use by Compare()
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
if( unit )
unit->Format( out, nestLevel );
@ -2763,7 +2763,7 @@ public:
return NULL;
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
if( unit )
unit->Format( out, nestLevel );
@ -2808,7 +2808,7 @@ struct PIN_REF : public ELEM
* is like Format() but is not virual and returns the number of characters
* that were output.
*/
int FormatIt( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
int FormatIt( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
// only print the newline if there is a nest level, and make
// the quotes unconditional on this one.
@ -2852,7 +2852,7 @@ public:
delete rules;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
// no quoting on these two, the lexer preserved the quotes on input
out->Print( nestLevel, "(%s %s %s ",
@ -2910,7 +2910,7 @@ public:
{
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s", Name() );
@ -2993,7 +2993,7 @@ public:
return -1;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote = out->GetQuoteChar( net_id.c_str() );
const char* space = " ";
@ -3070,7 +3070,7 @@ public:
{
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
for( FROMTOS::iterator i=fromtos.begin(); i!=fromtos.end(); ++i )
i->Format( out, nestLevel );
@ -3117,7 +3117,7 @@ public:
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote = out->GetQuoteChar( class_id.c_str() );
@ -3186,7 +3186,7 @@ public:
{
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
for( NETS::iterator i=nets.begin(); i!=nets.end(); ++i )
i->Format( out, nestLevel );
@ -3267,7 +3267,7 @@ public:
}
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
out->Print( nestLevel, "(%s ", Name() );
@ -3351,7 +3351,7 @@ public:
return padstack_id;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote = out->GetQuoteChar( padstack_id.c_str() );
@ -3477,7 +3477,7 @@ public:
delete unit;
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
if( unit )
unit->Format( out, nestLevel );
@ -3540,7 +3540,7 @@ public:
delete wiring;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote = out->GetQuoteChar( pcbname.c_str() );
@ -3603,7 +3603,7 @@ public:
time_stamp = time(NULL);
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
char temp[80];
struct tm* tmp;
@ -3647,7 +3647,7 @@ public:
time_stamp = time(NULL);
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
for( ANCESTORS::iterator i=ancestors.begin(); i!=ancestors.end(); ++i )
i->Format( out, nestLevel );
@ -3690,7 +3690,7 @@ public:
{
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
bool singleLine = pin_refs.size() <= 1;
out->Print( nestLevel, "(%s", Name() );
@ -3749,7 +3749,7 @@ public:
delete rules;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote = out->GetQuoteChar( net_id.c_str() );
@ -3816,7 +3816,7 @@ public:
return ELEM::GetUnits();
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
if( resolution )
resolution->Format( out, nestLevel );
@ -3879,7 +3879,7 @@ public:
{
}
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
for( PIN_PAIRS::iterator i=pin_pairs.begin(); i!=pin_pairs.end(); ++i )
{
@ -3936,7 +3936,7 @@ public:
delete route;
}
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
{
const char* quote = out->GetQuoteChar( session_id.c_str() );
out->Print( nestLevel, "(%s %s%s%s\n", Name(),
@ -4048,10 +4048,10 @@ class SPECCTRA_DB
/**
* Function needLEFT
* calls nextTok() and then verifies that the token read in is a T_LEFT.
* If it is not, an IOError is thrown.
* @throw IOError, if the next token is not a T_LEFT
* If it is not, an IO_ERROR is thrown.
* @throw IO_ERROR, if the next token is not a T_LEFT
*/
void needLEFT() throw( IOError )
void needLEFT() throw( IO_ERROR )
{
lexer->NeedLEFT();
}
@ -4059,10 +4059,10 @@ class SPECCTRA_DB
/**
* Function needRIGHT
* calls nextTok() and then verifies that the token read in is a T_RIGHT.
* If it is not, an IOError is thrown.
* @throw IOError, if the next token is not a T_RIGHT
* If it is not, an IO_ERROR is thrown.
* @throw IO_ERROR, if the next token is not a T_RIGHT
*/
void needRIGHT() throw( IOError )
void needRIGHT() throw( IO_ERROR )
{
lexer->NeedRIGHT();
}
@ -4071,11 +4071,11 @@ class SPECCTRA_DB
* Function needSYMBOL
* calls nextTok() and then verifies that the token read in
* satisfies bool isSymbol().
* If not, an IOError is thrown.
* If not, an IO_ERROR is thrown.
* @return DSN_T - the actual token read in.
* @throw IOError, if the next token does not satisfy isSymbol()
* @throw IO_ERROR, if the next token does not satisfy isSymbol()
*/
DSN_T needSYMBOL() throw( IOError )
DSN_T needSYMBOL() throw( IO_ERROR )
{
return (DSN_T) lexer->NeedSYMBOL();
}
@ -4084,11 +4084,11 @@ class SPECCTRA_DB
* Function needSYMBOLorNUMBER
* calls nextTok() and then verifies that the token read in
* satisfies bool isSymbol() or tok==T_NUMBER.
* If not, an IOError is thrown.
* If not, an IO_ERROR is thrown.
* @return DSN_T - the actual token read in.
* @throw IOError, if the next token does not satisfy the above test
* @throw IO_ERROR, if the next token does not satisfy the above test
*/
DSN_T needSYMBOLorNUMBER() throw( IOError )
DSN_T needSYMBOLorNUMBER() throw( IO_ERROR )
{
return (DSN_T) lexer->NeedSYMBOLorNUMBER();
}
@ -4106,10 +4106,10 @@ class SPECCTRA_DB
*
* @param component_id Where to put the text preceeding the '-' hyphen.
* @param pin_d Where to put the text which trails the '-'.
* @throw IOError, if the next token or two do no make up a pin_reference,
* @throw IO_ERROR, if the next token or two do no make up a pin_reference,
* or there is an error reading from the input stream.
*/
void readCOMPnPIN( std::string* component_id, std::string* pid_id ) throw( IOError );
void readCOMPnPIN( std::string* component_id, std::string* pid_id ) throw( IO_ERROR );
/**
@ -4123,80 +4123,80 @@ class SPECCTRA_DB
* time stamp.
*
* @param time_stamp Where to put the parsed time value.
* @throw IOError, if the next token or 8 do no make up a time stamp,
* @throw IO_ERROR, if the next token or 8 do no make up a time stamp,
* or there is an error reading from the input stream.
*/
void readTIME( time_t* time_stamp ) throw( IOError );
void readTIME( time_t* time_stamp ) throw( IO_ERROR );
/**
* Function expecting
* throws an IOError exception with an input file specific error message.
* throws an IO_ERROR exception with an input file specific error message.
* @param int is the token type which was expected at the current input location.
* @throw IOError with the location within the input file of the problem.
* @throw IO_ERROR with the location within the input file of the problem.
*/
void expecting( DSN_T aTok ) throw( IOError )
void expecting( DSN_T aTok ) throw( IO_ERROR )
{
lexer->Expecting( aTok );
}
void unexpected( DSN_T aTok ) throw( IOError )
void unexpected( DSN_T aTok ) throw( IO_ERROR )
{
lexer->Unexpected( aTok );
}
void expecting( const char* text ) throw( IOError );
void unexpected( const char* text ) throw( IOError );
void doPCB( PCB* growth ) throw(IOError);
void doPARSER( PARSER* growth ) throw(IOError);
void doRESOLUTION( UNIT_RES* growth ) throw(IOError);
void doUNIT( UNIT_RES* growth ) throw( IOError );
void doSTRUCTURE( STRUCTURE* growth ) throw( IOError );
void doSTRUCTURE_OUT( STRUCTURE_OUT* growth ) throw( IOError );
void doLAYER_NOISE_WEIGHT( LAYER_NOISE_WEIGHT* growth ) throw( IOError );
void doLAYER_PAIR( LAYER_PAIR* growth ) throw( IOError );
void doBOUNDARY( BOUNDARY* growth ) throw( IOError );
void doRECTANGLE( RECTANGLE* growth ) throw( IOError );
void doPATH( PATH* growth ) throw( IOError );
void doSTRINGPROP( STRINGPROP* growth ) throw( IOError );
void doTOKPROP( TOKPROP* growth ) throw( IOError );
void doVIA( VIA* growth ) throw( IOError );
void doCONTROL( CONTROL* growth ) throw( IOError );
void doLAYER( LAYER* growth ) throw( IOError );
void doRULE( RULE* growth ) throw( IOError );
void doKEEPOUT( KEEPOUT* growth ) throw( IOError );
void doCIRCLE( CIRCLE* growth ) throw( IOError );
void doQARC( QARC* growth ) throw( IOError );
void doWINDOW( WINDOW* growth ) throw( IOError );
void doREGION( REGION* growth ) throw( IOError );
void doCLASS_CLASS( CLASS_CLASS* growth ) throw( IOError );
void doLAYER_RULE( LAYER_RULE* growth ) throw( IOError );
void doCLASSES( CLASSES* growth ) throw( IOError );
void doGRID( GRID* growth ) throw( IOError );
void doPLACE( PLACE* growth ) throw( IOError );
void doCOMPONENT( COMPONENT* growth ) throw( IOError );
void doPLACEMENT( PLACEMENT* growth ) throw( IOError );
void doPROPERTIES( PROPERTIES* growth ) throw( IOError );
void doPADSTACK( PADSTACK* growth ) throw( IOError );
void doSHAPE( SHAPE* growth ) throw( IOError );
void doIMAGE( IMAGE* growth ) throw( IOError );
void doLIBRARY( LIBRARY* growth ) throw( IOError );
void doPIN( PIN* growth ) throw( IOError );
void doNET( NET* growth ) throw( IOError );
void doNETWORK( NETWORK* growth ) throw( IOError );
void doCLASS( CLASS* growth ) throw( IOError );
void doTOPOLOGY( TOPOLOGY* growth ) throw( IOError );
void doFROMTO( FROMTO* growth ) throw( IOError );
void doCOMP_ORDER( COMP_ORDER* growth ) throw( IOError );
void doWIRE( WIRE* growth ) throw( IOError );
void doWIRE_VIA( WIRE_VIA* growth ) throw( IOError );
void doWIRING( WIRING* growth ) throw( IOError );
void doSESSION( SESSION* growth ) throw( IOError );
void doANCESTOR( ANCESTOR* growth ) throw( IOError );
void doHISTORY( HISTORY* growth ) throw( IOError );
void doROUTE( ROUTE* growth ) throw( IOError );
void doWAS_IS( WAS_IS* growth ) throw( IOError );
void doNET_OUT( NET_OUT* growth ) throw( IOError );
void doSUPPLY_PIN( SUPPLY_PIN* growth ) throw( IOError );
void expecting( const char* text ) throw( IO_ERROR );
void unexpected( const char* text ) throw( IO_ERROR );
void doPCB( PCB* growth ) throw( IO_ERROR );
void doPARSER( PARSER* growth ) throw( IO_ERROR );
void doRESOLUTION( UNIT_RES* growth ) throw( IO_ERROR );
void doUNIT( UNIT_RES* growth ) throw( IO_ERROR );
void doSTRUCTURE( STRUCTURE* growth ) throw( IO_ERROR );
void doSTRUCTURE_OUT( STRUCTURE_OUT* growth ) throw( IO_ERROR );
void doLAYER_NOISE_WEIGHT( LAYER_NOISE_WEIGHT* growth ) throw( IO_ERROR );
void doLAYER_PAIR( LAYER_PAIR* growth ) throw( IO_ERROR );
void doBOUNDARY( BOUNDARY* growth ) throw( IO_ERROR );
void doRECTANGLE( RECTANGLE* growth ) throw( IO_ERROR );
void doPATH( PATH* growth ) throw( IO_ERROR );
void doSTRINGPROP( STRINGPROP* growth ) throw( IO_ERROR );
void doTOKPROP( TOKPROP* growth ) throw( IO_ERROR );
void doVIA( VIA* growth ) throw( IO_ERROR );
void doCONTROL( CONTROL* growth ) throw( IO_ERROR );
void doLAYER( LAYER* growth ) throw( IO_ERROR );
void doRULE( RULE* growth ) throw( IO_ERROR );
void doKEEPOUT( KEEPOUT* growth ) throw( IO_ERROR );
void doCIRCLE( CIRCLE* growth ) throw( IO_ERROR );
void doQARC( QARC* growth ) throw( IO_ERROR );
void doWINDOW( WINDOW* growth ) throw( IO_ERROR );
void doREGION( REGION* growth ) throw( IO_ERROR );
void doCLASS_CLASS( CLASS_CLASS* growth ) throw( IO_ERROR );
void doLAYER_RULE( LAYER_RULE* growth ) throw( IO_ERROR );
void doCLASSES( CLASSES* growth ) throw( IO_ERROR );
void doGRID( GRID* growth ) throw( IO_ERROR );
void doPLACE( PLACE* growth ) throw( IO_ERROR );
void doCOMPONENT( COMPONENT* growth ) throw( IO_ERROR );
void doPLACEMENT( PLACEMENT* growth ) throw( IO_ERROR );
void doPROPERTIES( PROPERTIES* growth ) throw( IO_ERROR );
void doPADSTACK( PADSTACK* growth ) throw( IO_ERROR );
void doSHAPE( SHAPE* growth ) throw( IO_ERROR );
void doIMAGE( IMAGE* growth ) throw( IO_ERROR );
void doLIBRARY( LIBRARY* growth ) throw( IO_ERROR );
void doPIN( PIN* growth ) throw( IO_ERROR );
void doNET( NET* growth ) throw( IO_ERROR );
void doNETWORK( NETWORK* growth ) throw( IO_ERROR );
void doCLASS( CLASS* growth ) throw( IO_ERROR );
void doTOPOLOGY( TOPOLOGY* growth ) throw( IO_ERROR );
void doFROMTO( FROMTO* growth ) throw( IO_ERROR );
void doCOMP_ORDER( COMP_ORDER* growth ) throw( IO_ERROR );
void doWIRE( WIRE* growth ) throw( IO_ERROR );
void doWIRE_VIA( WIRE_VIA* growth ) throw( IO_ERROR );
void doWIRING( WIRING* growth ) throw( IO_ERROR );
void doSESSION( SESSION* growth ) throw( IO_ERROR );
void doANCESTOR( ANCESTOR* growth ) throw( IO_ERROR );
void doHISTORY( HISTORY* growth ) throw( IO_ERROR );
void doROUTE( ROUTE* growth ) throw( IO_ERROR );
void doWAS_IS( WAS_IS* growth ) throw( IO_ERROR );
void doNET_OUT( NET_OUT* growth ) throw( IO_ERROR );
void doSUPPLY_PIN( SUPPLY_PIN* growth ) throw( IO_ERROR );
//-----<FromBOARD>-------------------------------------------------------
@ -4206,7 +4206,7 @@ class SPECCTRA_DB
* @param aBoard The BOARD to get information from in order to make the BOUNDARY.
* @param aBoundary The empty BOUNDARY to fill in.
*/
void fillBOUNDARY( BOARD* aBoard, BOUNDARY* aBoundary ) throw( IOError );
void fillBOUNDARY( BOARD* aBoard, BOUNDARY* aBoundary ) throw( IO_ERROR );
/**
@ -4280,7 +4280,7 @@ class SPECCTRA_DB
* Function makeTRACK
* creates a TRACK form the PATH and BOARD info.
*/
TRACK* makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) throw( IOError );
TRACK* makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) throw( IO_ERROR );
/**
@ -4288,7 +4288,7 @@ class SPECCTRA_DB
* instantiates a Kicad SEGVIA on the heap and initializes it with internal
* values consistent with the given PADSTACK, POINT, and netcode.
*/
SEGVIA* makeVIA( PADSTACK* aPadstack, const POINT& aPoint, int aNetCode ) throw( IOError );
SEGVIA* makeVIA( PADSTACK* aPadstack, const POINT& aPoint, int aNetCode ) throw( IO_ERROR );
//-----</FromSESSION>----------------------------------------------------
@ -4357,9 +4357,9 @@ public:
* missing only the silkscreen stuff).
*
* @param filename The name of the dsn file to load.
* @throw IOError if there is a lexer or parser error.
* @throw IO_ERROR if there is a lexer or parser error.
*/
void LoadPCB( const wxString& filename ) throw( IOError );
void LoadPCB( const wxString& filename ) throw( IO_ERROR );
/**
@ -4370,12 +4370,12 @@ public:
* tracks, vias, and component locations.
*
* @param filename The name of the dsn file to load.
* @throw IOError if there is a lexer or parser error.
* @throw IO_ERROR if there is a lexer or parser error.
*/
void LoadSESSION( const wxString& filename ) throw( IOError );
void LoadSESSION( const wxString& filename ) throw( IO_ERROR );
void ThrowIOError( const wxChar* fmt, ... ) throw( IOError );
void ThrowIOError( const wxChar* fmt, ... ) throw( IO_ERROR );
/**
@ -4385,9 +4385,9 @@ public:
* @param aFilename The file to save to.
* @param aNameChange If true, causes the pcb's name to change to "aFilename"
* and also to to be changed in the output file.
* @throw IOError, if an i/o error occurs saving the file.
* @throw IO_ERROR, if an i/o error occurs saving the file.
*/
void ExportPCB( wxString aFilename, bool aNameChange=false ) throw( IOError );
void ExportPCB( wxString aFilename, bool aNameChange=false ) throw( IO_ERROR );
/**
@ -4401,7 +4401,7 @@ public:
*
* @param aBoard The BOARD to convert to a PCB.
*/
void FromBOARD( BOARD* aBoard ) throw( IOError );
void FromBOARD( BOARD* aBoard ) throw( IO_ERROR );
/**
* Function FromSESSION
@ -4411,7 +4411,7 @@ public:
*
* @param aBoard The BOARD to merge the SESSION information into.
*/
void FromSESSION( BOARD* aBoard ) throw( IOError );
void FromSESSION( BOARD* aBoard ) throw( IO_ERROR );
/**
* Function ExportSESSION

6
pcbnew/specctra_export.cpp
View File

@ -112,7 +112,7 @@ void WinEDA_PcbFrame::ExportToSpecctra( wxCommandEvent& event )
// if an exception is thrown by FromBOARD or ExportPCB(), then
// ~SPECCTRA_DB() will close the file.
}
catch( IOError ioe )
catch( IO_ERROR ioe )
{
ok = false;
@ -719,7 +719,7 @@ PADSTACK* SPECCTRA_DB::makeVia( const SEGVIA* aVia )
}
void SPECCTRA_DB::fillBOUNDARY( BOARD* aBoard, BOUNDARY* boundary ) throw( IOError )
void SPECCTRA_DB::fillBOUNDARY( BOARD* aBoard, BOUNDARY* boundary ) throw( IO_ERROR )
{
TYPE_COLLECTOR items;
@ -905,7 +905,7 @@ typedef std::set<std::string> STRINGSET;
typedef std::pair<STRINGSET::iterator, bool> STRINGSET_PAIR;
void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IOError )
void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
{
TYPE_COLLECTOR items;

8
pcbnew/specctra_import.cpp
View File

@ -96,7 +96,7 @@ void WinEDA_PcbFrame::ImportSpecctraSession( wxCommandEvent& event )
db.LoadSESSION( fullFileName );
db.FromSESSION( GetBoard() );
}
catch( IOError ioe )
catch( IO_ERROR ioe )
{
SetLocaleTo_Default( ); // revert to the current locale
@ -193,7 +193,7 @@ static wxPoint mapPt( const POINT& aPoint, UNIT_RES* aResolution )
}
TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) throw( IOError )
TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) throw( IO_ERROR )
{
int layerNdx = findLayerName( aPath->layer_id );
@ -216,7 +216,7 @@ TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) thro
}
SEGVIA* SPECCTRA_DB::makeVIA( PADSTACK* aPadstack, const POINT& aPoint, int aNetCode ) throw( IOError )
SEGVIA* SPECCTRA_DB::makeVIA( PADSTACK* aPadstack, const POINT& aPoint, int aNetCode ) throw( IO_ERROR )
{
SEGVIA* via = 0;
SHAPE* shape;
@ -351,7 +351,7 @@ SEGVIA* SPECCTRA_DB::makeVIA( PADSTACK* aPadstack, const POINT& aPoint, int aNet
// no UI code in this function, throw exception to report problems to the
// UI handler: void WinEDA_PcbFrame::ImportSpecctraSession( wxCommandEvent& event )
void SPECCTRA_DB::FromSESSION( BOARD* aBoard ) throw( IOError )
void SPECCTRA_DB::FromSESSION( BOARD* aBoard ) throw( IO_ERROR )
{
sessionBoard = aBoard; // not owned here

2
pcbnew/specctra_test.cpp
View File

@ -63,7 +63,7 @@ int main( int argc, char** argv )
// db.LoadPCB( filename );
db.LoadSESSION( filename );
}
catch( IOError ioe )
catch( IO_ERROR ioe )
{
fprintf( stderr, "%s\n", CONV_TO_UTF8(ioe.errorText) );
failed = true;

Write Preview
Loading…
Cancel
Save