Commit 6be7640c authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

fix minor /new compile error, swig warnings

parent 907117aa

CMakeModules/TokenList2DsnLexer.cmake

+1 −1
Original line number Original line Diff line number Diff line
@@ -380,7 +380,7 @@ const char* ${LEXERCLASS}::TokenName( T aTok ) 
    }

    }

    else if( aTok < 0 )

    else if( aTok < 0 )

    {

    {

        return DSNLEXER::Syntax( aTok );

        ret = DSNLEXER::Syntax( aTok );

    }

    }

    else

    else

        ret = \"token too big\";

        ret = \"token too big\";

include/dsnlexer.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ 




#include "richio.h"

#include "richio.h"







#ifndef SWIG

/**

/**

 * Struct KEYWORD

 * Struct KEYWORD

 * holds a keyword string and its unique integer token.

 * holds a keyword string and its unique integer token.
@@ -41,6 +41,7 @@ struct KEYWORD 
    const char* name;       ///< unique keyword.

    const char* name;       ///< unique keyword.

    int         token;      ///< a zero based index into an array of KEYWORDs

    int         token;      ///< a zero based index into an array of KEYWORDs

};

};

#endif





// something like this macro can be used to help initialize a KEYWORD table.

// something like this macro can be used to help initialize a KEYWORD table.

// see SPECCTRA_DB::keywords[] as an example.

// see SPECCTRA_DB::keywords[] as an example.
@@ -76,6 +77,7 @@ enum DSN_SYNTAX_T { 
 */

 */

class DSNLEXER

class DSNLEXER

{

{

#ifndef SWIG

protected:

protected:

    bool                iOwnReaders;            ///< on readerStack, should I delete them?

    bool                iOwnReaders;            ///< on readerStack, should I delete them?

    const char*         start;

    const char*         start;
@@ -155,7 +157,7 @@ protected: 




        return false;

        return false;

    }

    }



#endif





public:

public:

new/sch_lib_table.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ void LIB_TABLE::Parse( SCH_LIB_TABLE_LEXER* in ) throw( IO_ERROR ) 
            strcmp( in->CurText(), "subversion" ) &&

            strcmp( in->CurText(), "subversion" ) &&

            strcmp( in->CurText(), "http" ) )

            strcmp( in->CurText(), "http" ) )

        {

        {

            in->Expecting( wxT( "dir|schematic|subversion|http" ) );

            in->Expecting( "dir|schematic|subversion|http" );

        }

        }





        row->SetType( in->CurText() );

        row->SetType( in->CurText() );

new/sch_part.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -176,7 +176,7 @@ public: 
        for(  ; tok!=T_RIGHT;  tok = in->NextTok() )

        for(  ; tok!=T_RIGHT;  tok = in->NextTok() )

        {

        {

            if( tok==T_EOF )

            if( tok==T_EOF )

                in->Unexpected( _( "end of input" ) );

                in->Unexpected( T_EOF );





            if( tok == T_LEFT )

            if( tok == T_LEFT )

                tok = in->NextTok();

                tok = in->NextTok();
@@ -185,14 +185,13 @@ public: 
            {

            {

            default:

            default:

                // describe what we expect at this level

                // describe what we expect at this level

                in->Expecting( wxT(

                in->Expecting(

                    "anchor|value|footprint|model|keywords|alternates\n"

                    "anchor|value|footprint|model|keywords|alternates\n"

                    "|property\n"

                    "|property\n"

                    "  |property_del\n"

                    "  |property_del\n"

                    "|pin\n"

                    "|pin\n"

                    "  |pin_merge|pin_swap|pin_renum|pin_rename|route_pin_swap\n"

                    "  |pin_merge|pin_swap|pin_renum|pin_rename|route_pin_swap\n"

                    "|polyline|line|rectangle|circle|arc|bezier|text"

                    "|polyline|line|rectangle|circle|arc|bezier|text"

                    )

                 );

                 );

                break;

                break;

new/sweet.i

+5 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,10 @@ 




%ignore LINE_READER::operator char* () const;

%ignore LINE_READER::operator char* () const;





namespace SCH {

%ignore PART::operator=( const PART& other );

}



%include "richio.h"

%include "richio.h"

%include "dsnlexer.h"

%include "dsnlexer.h"

//%include "sch_lib_table_lexer.h"

//%include "sch_lib_table_lexer.h"
@@ -29,4 +33,5 @@ 
%include "sch_lib.h"

%include "sch_lib.h"

%include "sch_lib_table.h"

%include "sch_lib_table.h"

%include "sweet_lexer.h"

%include "sweet_lexer.h"



%include "sch_part.h"
 
%include "sch_part.h"