see CHANGELOG.txt (d2cc77ac) · Commits · Elphel / kicad-source-mirror

.bzrignore

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -5,9 +5,6 @@ eeschema/cmp_library_lexer.h
	eeschema/cmp_library_keywords.*		eeschema/cmp_library_keywords.*
	eeschema/template_fieldnames_keywords.*		eeschema/template_fieldnames_keywords.*
	eeschema/template_fieldnames_lexer.h		eeschema/template_fieldnames_lexer.h
	new/html
	new/sch_lib_table_keywords.cpp
	new/sch_lib_table_lexer.h
	pcbnew/dialogs/dialog_freeroute_exchange_help_html.h		pcbnew/dialogs/dialog_freeroute_exchange_help_html.h
	Makefile		Makefile
	CMakeFiles		CMakeFiles
	@@ -20,3 +17,8 @@ install_manifest.txt
	Documentation/doxygen		Documentation/doxygen
	*.cmake		*.cmake
	*.bak		*.bak
			new/html
			new/sch_lib_table_keywords.cpp
			new/sch_lib_table_lexer.h
			new/sweet_keywords.cpp
			new/sweet_lexer.h

CHANGELOG.txt

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,19 @@ KiCad ChangeLog 2010
	Please add newer entries at the top, list the date and your name with		Please add newer entries at the top, list the date and your name with
	email address.		email address.

			2010-Dec-28 UPDATE Dick Hollenbeck <dick@softplc.com>
			================================================================================
			++richio:
			* Deleted kicad_exceptions, because it required the big #include <wx/wx.h> and
			that was slowing down compiling. Moved that stuff back into richio.h where
			it came from.
			* Enhanced IO_ERROR to format an errorText.
			* Added THROW_IO_ERROR() and THROW_PARSE_ERROR() macros to capture the
			the call site of the thrower. If you have problems compiling, it is probably
			due to the definition of __LOC__ in richio.h. Some compilers may not support
			__func__ in C++ yet. Find a macro that identifies your compiler, and we can
			work out something in the #define of __LOC__.

	2010-Dec-28 UPDATE Dick Hollenbeck <dick@softplc.com>		2010-Dec-28 UPDATE Dick Hollenbeck <dick@softplc.com>
	================================================================================		================================================================================
	++new:		++new:

common/dsnlexer.cpp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -251,12 +251,14 @@ bool DSNLEXER::IsSymbol( int aTok )

	void DSNLEXER::ThrowIOError( wxString aText, int charOffset ) throw( IO_ERROR )		void DSNLEXER::ThrowIOError( wxString aText, int charOffset ) throw( IO_ERROR )
	{		{
			// @todo convert this to THROW_PARSE_ERROR()

	// append to aText, do not overwrite		// append to aText, do not overwrite
	aText << wxT(" ") << _("in") << wxT(" \"") << CurSource()		aText << wxT(" ") << _("in") << wxT(" \"") << CurSource()
	<< wxT("\" ") << _("on line") << wxT(" ") << reader->LineNumber()		<< wxT("\" ") << _("on line") << wxT(" ") << reader->LineNumber()
	<< wxT(" ") << _("at offset") << wxT(" ") << charOffset;		<< wxT(" ") << _("at offset") << wxT(" ") << charOffset;

	throw IO_ERROR( aText );		THROW_IO_ERROR( aText );
	}		}

common/richio.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -113,7 +113,7 @@ unsigned FILE_LINE_READER::ReadLine() throw( IO_ERROR )
	length += strlen( line + length );		length += strlen( line + length );

	if( length == maxLineLength )		if( length == maxLineLength )
	throw IO_ERROR( _("Line length exceeded") );		THROW_IO_ERROR( _("Line length exceeded") );

	// a normal line breaks here, once through while loop		// a normal line breaks here, once through while loop
	if( length+1 < capacity \|\| line[length-1] == '\n' )		if( length+1 < capacity \|\| line[length-1] == '\n' )
	@@ -164,7 +164,7 @@ unsigned STRING_LINE_READER::ReadLine() throw( IO_ERROR )
	if( length )		if( length )
	{		{
	if( length >= maxLineLength )		if( length >= maxLineLength )
	throw IO_ERROR( _("Line length exceeded") );		THROW_IO_ERROR( _("Line length exceeded") );

	if( length+1 > capacity ) // +1 for terminating nul		if( length+1 > capacity ) // +1 for terminating nul
	expandCapacity( length+1 );		expandCapacity( length+1 );
	@@ -305,7 +305,7 @@ std::string OUTPUTFORMATTER::Quoted( const std::string& aWrapee ) throw( IO_ERRO
	// a decision was made to make all S-expression strings be on a single		// a decision was made to make all S-expression strings be on a single
	// line. You can embed \n (human readable) in the text but not		// line. You can embed \n (human readable) in the text but not
	// '\n' which is 0x0a.		// '\n' which is 0x0a.
	throw IO_ERROR( _( "S-expression string has newline" ) );		THROW_IO_ERROR( _( "S-expression string has newline" ) );
	}		}
	}		}

	@@ -363,7 +363,7 @@ void STREAM_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount ) throw( IO_

	if( !os.IsOk() )		if( !os.IsOk() )
	{		{
	throw IO_ERROR( _( "OUTPUTSTREAM_OUTPUTFORMATTER write error" ) );		THROW_IO_ERROR( _( "OUTPUTSTREAM_OUTPUTFORMATTER write error" ) );
	}		}
	}		}
	}		}

eeschema/sch_component.h

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -17,25 +17,6 @@ class LIB_PIN;
	class LIB_COMPONENT;		class LIB_COMPONENT;


	/**
	* Holder of an error message and may be thrown from functions.
	*/
	struct Error
	{
	wxString errorText;

	Error( const wxChar* aMsg ) :
	errorText( aMsg )
	{
	}


	Error( const wxString& aMsg ) :
	errorText( aMsg )
	{
	}
	};

	/// A container for several SCH_FIELD items		/// A container for several SCH_FIELD items
	typedef std::vector<SCH_FIELD> SCH_FIELDS;		typedef std::vector<SCH_FIELD> SCH_FIELDS;