new/sch_lpid.*, fix Doxygen errors in /new (29e829b7) · Commits · Elphel / kicad-source-mirror

CMakeModules/TokenList2DsnLexer.cmake

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -220,6 +220,13 @@ extern const unsigned ${result}_keyword_count;

	using namespace DSN; // enum ${enum} is in this namespace		using namespace DSN; // enum ${enum} is in this namespace


			/**
			* Classs ${RESULT}_LEXER
			* is an automatically generated class using the TokenList2DnsLexer.cmake
			* technology, based on keywords provided by file:
			* ${inputFile}
			*/
	class ${RESULT}_LEXER : public DSNLEXER		class ${RESULT}_LEXER : public DSNLEXER
	{		{
	public:		public:

new/CMakeLists.txt

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -77,6 +77,11 @@ target_link_libraries( test_sch_lib_table ${wxWidgets_LIBRARIES} )
	add_executable( test_sch_part sch_part.cpp )		add_executable( test_sch_part sch_part.cpp )
	target_link_libraries( test_sch_part ${wxWidgets_LIBRARIES} )		target_link_libraries( test_sch_part ${wxWidgets_LIBRARIES} )

			add_executable( test_lpid
			sch_lpid.cpp
			)
			target_link_libraries( test_lpid ${wxWidgets_LIBRARIES} )


	make_lexer(		make_lexer(
	${CMAKE_CURRENT_SOURCE_DIR}/sch_lib_table.keywords		${CMAKE_CURRENT_SOURCE_DIR}/sch_lib_table.keywords
	@@ -84,4 +89,3 @@ make_lexer(
	${CMAKE_CURRENT_SOURCE_DIR}/sch_lib_table_keywords.cpp		${CMAKE_CURRENT_SOURCE_DIR}/sch_lib_table_keywords.cpp
	ELT_T		ELT_T
	)		)

new/design.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -443,4 +443,6 @@ public:
	} // namespace SCH		} // namespace SCH


			/// @todo remove endsWithRev() in favor of EndsWithRev(), find home for it.

	// EOF		// EOF

new/sch_dir_lib_source.cpp

+18 −3

Original line number	Original line	Diff line number	Diff line
	@@ -140,6 +140,13 @@ static const char* strrstr( const char* haystack, const char* needle )
	return ret;		return ret;
	}		}

			#if 1 // @todo switch over to EndsWithRev() global

			static inline bool isDigit( char c )
			{
			return c >= '0' && c <= '9';
			}


	static inline bool isDigit( char c )		static inline bool isDigit( char c )
	{		{
	@@ -185,6 +192,8 @@ static inline const char* endsWithRev( const STRING& aPartName, char separator )
	return endsWithRev( aPartName.c_str(), aPartName.c_str()+aPartName.size(), separator );		return endsWithRev( aPartName.c_str(), aPartName.c_str()+aPartName.size(), separator );
	}		}

			#endif


	// see struct BY_REV		// see struct BY_REV
	bool BY_REV::operator() ( const STRING& s1, const STRING& s2 ) const		bool BY_REV::operator() ( const STRING& s1, const STRING& s2 ) const
	@@ -587,9 +596,9 @@ void DIR_LIB_SOURCE::cacheOneDir( const STRING& aCategory ) throw( IO_ERROR )
	}		}


	#if (1 \|\| defined( TEST_DIR_LIB_SOURCE )) && defined(DEBUG)		#if 1 && defined(DEBUG)

	int main( int argc, char** argv )		void DIR_LIB_SOURCE::Test( int argc, char** argv )
	{		{
	STRINGS partnames;		STRINGS partnames;
	STRINGS sweets;		STRINGS sweets;
	@@ -601,7 +610,8 @@ int main( int argc, char** argv )
	// DIR_LIB_SOURCE uut( argv[1] ? argv[1] : "", "" );		// DIR_LIB_SOURCE uut( argv[1] ? argv[1] : "", "" );
	DIR_LIB_SOURCE uut( argv[1] ? argv[1] : "", "useVersioning" );		DIR_LIB_SOURCE uut( argv[1] ? argv[1] : "", "useVersioning" );

	// initially, only the NAME_CACHE sweets and STRING categories are loaded:		// show the cached content, only the directory information is cached,
			// parts are cached in class LIB, not down here.
	uut.Show();		uut.Show();

	uut.GetCategoricalPartNames( &partnames, "lions" );		uut.GetCategoricalPartNames( &partnames, "lions" );
	@@ -649,7 +659,12 @@ int main( int argc, char** argv )
	{		{
	printf( "exception: %s\n", (const char*) wxConvertWX2MB( ioe.errorText ) );		printf( "exception: %s\n", (const char*) wxConvertWX2MB( ioe.errorText ) );
	}		}
			}


			int main( int argc, char** argv )
			{
			DIR_LIB_SOURCE::Test( argc, argv );
	return 0;		return 0;
	}		}

new/sch_dir_lib_source.h

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -132,8 +132,7 @@ class DIR_LIB_SOURCE : public LIB_SOURCE
	*/		*/
	STRING makeFileName( const STRING& aPartName );		STRING makeFileName( const STRING& aPartName );

	//protected:		protected:
	public:

	/**		/**
	* Constructor DIR_LIB_SOURCE( const STRING& aDirectoryPath )		* Constructor DIR_LIB_SOURCE( const STRING& aDirectoryPath )
	@@ -151,8 +150,7 @@ public:
	* tree, otherwise only a single version of each part is recognized, namely the		* tree, otherwise only a single version of each part is recognized, namely the
	* one without the ".revN[N..]" trailer.		* one without the ".revN[N..]" trailer.
	*/		*/
	DIR_LIB_SOURCE( const STRING& aDirectoryPath, const STRING& aOptions = "" )		DIR_LIB_SOURCE( const STRING& aDirectoryPath, const STRING& aOptions = "" ) throw( IO_ERROR );
	throw( IO_ERROR );

	~DIR_LIB_SOURCE();		~DIR_LIB_SOURCE();

	@@ -187,6 +185,10 @@ public:
	* will output a debug dump of contents.		* will output a debug dump of contents.
	*/		*/
	void Show();		void Show();

			public:
			static void Test( int argc, char** argv );

	#endif		#endif
	};		};

Admin message