haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup formatting and coding style.

This commit is contained in:
Jeff Young 2020-07-22 14:31:11 +01:00
parent a6b6084a60
commit 150c781f27
1 changed files with 47 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
common/libeval_compiler/libeval_compiler.cpp
View File

@ -62,6 +62,7 @@ static void libeval_dbg( int level, const char* fmt, ... )
#endif #endif
} }
static const std::string formatOpName( int op ) static const std::string formatOpName( int op )
{ {
static const struct static const struct
@ -127,14 +128,17 @@ std::string UOP::Format() const
return str; return str;
} }
std::string UCODE::Dump() const std::string UCODE::Dump() const
{ {
std::string rv; std::string rv;
for( auto op : m_ucode ) for( auto op : m_ucode )
{ {
rv += op->Format(); rv += op->Format();
rv += "\n"; rv += "\n";
} }
return rv; return rv;
}; };
@ -151,24 +155,26 @@ std::string TOKENIZER::GetChars( std::function<bool( int )> cond ) const
std::string rv; std::string rv;
size_t p = m_pos; size_t p = m_pos;
// printf("p %d len %d\n", p, str.length() ); // printf("p %d len %d\n", p, str.length() );
while( p < m_str.length() && cond( m_str[p] ) ) while( p < m_str.length() && cond( m_str[p] ) )
{ {
rv.append( 1, m_str[p] ); rv.append( 1, m_str[p] );
p++; p++;
} }
return rv; return rv;
} }
bool TOKENIZER::MatchAhead( const std::string& match, std::function<bool( int )> stopCond ) const bool TOKENIZER::MatchAhead( const std::string& match, std::function<bool( int )> stopCond ) const
{ {
int remaining = m_str.length() - m_pos; int remaining = m_str.length() - m_pos;
if( remaining < (int) match.length() ) if( remaining < (int) match.length() )
return false; return false;
if( m_str.substr( m_pos, match.length() ) == match ) if( m_str.substr( m_pos, match.length() ) == match )
{
return ( remaining == (int) match.length() || stopCond( m_str[m_pos + match.length()] ) ); return ( remaining == (int) match.length() || stopCond( m_str[m_pos + match.length()] ) );
}
return false; return false;
} }
@ -221,7 +227,6 @@ bool COMPILER::Compile( const std::string& aString, UCODE* aCode )
{ {
// Feed parser token after token until end of input. // Feed parser token after token until end of input.
newString( aString ); newString( aString );
m_errorStatus.pendingError = false; m_errorStatus.pendingError = false;
m_tree = nullptr; m_tree = nullptr;
@ -277,6 +282,7 @@ COMPILER::T_TOKEN COMPILER::getToken()
{ {
T_TOKEN rv; T_TOKEN rv;
bool done = false; bool done = false;
do do
{ {
switch( m_lexerState ) switch( m_lexerState )
@ -297,7 +303,7 @@ COMPILER::T_TOKEN COMPILER::getToken()
bool COMPILER::lexString( COMPILER::T_TOKEN& aToken ) bool COMPILER::lexString( COMPILER::T_TOKEN& aToken )
{ {
auto str = m_tokenizer.GetChars( []( int c ) -> bool { return c != '\''; } ); std::string str = m_tokenizer.GetChars( []( int c ) -> bool { return c != '\''; } );
//printf("STR LIT '%s'\n", (const char *)str.c_str() ); //printf("STR LIT '%s'\n", (const char *)str.c_str() );
aToken.token = G_STRING; aToken.token = G_STRING;
@ -312,7 +318,8 @@ bool COMPILER::lexString( COMPILER::T_TOKEN& aToken )
int COMPILER::resolveUnits() int COMPILER::resolveUnits()
{ {
int unitId = 0; int unitId = 0;
for( auto unitName : m_unitResolver->GetSupportedUnits() )
for( const std::string& unitName : m_unitResolver->GetSupportedUnits() )
{ {
if( m_tokenizer.MatchAhead( unitName, []( int c ) -> bool { return !isalnum( c ); } ) ) if( m_tokenizer.MatchAhead( unitName, []( int c ) -> bool { return !isalnum( c ); } ) )
{ {
@ -332,7 +339,6 @@ bool COMPILER::lexDefault( COMPILER::T_TOKEN& aToken )
{ {
T_TOKEN retval; T_TOKEN retval;
std::string current; std::string current;
size_t idx;
int convertFrom; int convertFrom;
retval.token = G_ENDS; retval.token = G_ENDS;
@ -355,7 +361,6 @@ bool COMPILER::lexDefault( COMPILER::T_TOKEN& aToken )
[&]() [&]()
{ {
bool haveSeparator = false; bool haveSeparator = false;
idx = 0;
int ch = m_tokenizer.GetChar(); int ch = m_tokenizer.GetChar();
do do
@ -379,7 +384,6 @@ bool COMPILER::lexDefault( COMPILER::T_TOKEN& aToken )
current[i - 1] = m_localeDecimalSeparator; current[i - 1] = m_localeDecimalSeparator;
} }
//printf("-> NUM: '%s'\n", (const char *) current.c_str() ); //printf("-> NUM: '%s'\n", (const char *) current.c_str() );
}; };
@ -477,44 +481,23 @@ bool COMPILER::lexDefault( COMPILER::T_TOKEN& aToken )
// Single char tokens // Single char tokens
switch( ch ) switch( ch )
{ {
case '+': case '+': retval.token = G_PLUS; break;
retval.token = G_PLUS; case '!': retval.token = G_BOOL_NOT; break;
break; case '-': retval.token = G_MINUS; break;
case '!': case '*': retval.token = G_MULT; break;
retval.token = G_BOOL_NOT; case '/': retval.token = G_DIVIDE; break;
break; case '<': retval.token = G_LESS_THAN; break;
case '-': case '>': retval.token = G_GREATER_THAN; break;
retval.token = G_MINUS; case '(': retval.token = G_PARENL; break;
break; case ')': retval.token = G_PARENR; break;
case '*': case ';': retval.token = G_SEMCOL; break;
retval.token = G_MULT; case '.': retval.token = G_STRUCT_REF; break;
break;
case '/':
retval.token = G_DIVIDE;
break;
case '<':
retval.token = G_LESS_THAN;
break;
case '>':
retval.token = G_GREATER_THAN;
break;
case '(':
retval.token = G_PARENL;
break;
case ')':
retval.token = G_PARENR;
break;
case ';':
retval.token = G_SEMCOL;
break;
case '.':
retval.token = G_STRUCT_REF;
break;
default: default:
m_errorStatus.stage = ERROR_STATUS::CST_PARSE; m_errorStatus.stage = ERROR_STATUS::CST_PARSE;
m_errorStatus.message.Printf( _( "Unrecognized character '%c'" ), (char) ch ); m_errorStatus.message.Printf( _( "Unrecognized character '%c'" ), (char) ch );
m_errorStatus.srcPos = m_tokenizer.GetPos(); m_errorStatus.srcPos = m_tokenizer.GetPos();
break; /* invalid character */ break;
} }
m_tokenizer.NextChar(); m_tokenizer.NextChar();
@ -526,19 +509,24 @@ bool COMPILER::lexDefault( COMPILER::T_TOKEN& aToken )
const std::string formatNode( TREE_NODE* tok ) const std::string formatNode( TREE_NODE* tok )
{ {
char str[1024];
// printf("fmt tok %p v %p ", tok, tok->value.v ); // printf("fmt tok %p v %p ", tok, tok->value.v );
fflush( stdout ); // fflush( stdout );
sprintf( str, "%s", (const char*) tok->value.str );
char str[LIBEVAL_MAX_LITERAL_LENGTH];
snprintf( str, LIBEVAL_MAX_LITERAL_LENGTH, "%s", (const char*) tok->value.str );
return str; return str;
} }
void dumpNode( std::string& buf, TREE_NODE* tok, int depth = 0 ) void dumpNode( std::string& buf, TREE_NODE* tok, int depth = 0 )
{ {
char str[1024]; char str[LIBEVAL_MAX_LITERAL_LENGTH];
sprintf( str, "\n[%p L0:%-20p L1:%-20p] ", tok, tok->leaf[0], tok->leaf[1] ); //[tok %p] ", tok); snprintf( str, LIBEVAL_MAX_LITERAL_LENGTH, "\n[%p L0:%-20p L1:%-20p] ",
tok,
tok->leaf[0],
tok->leaf[1] );
buf += str; buf += str;
for( int i = 0; i < 2 * depth; i++ ) for( int i = 0; i < 2 * depth; i++ )
buf += " "; buf += " ";
@ -559,25 +547,30 @@ void dumpNode( std::string& buf, TREE_NODE* tok, int depth = 0 )
dumpNode( buf, tok->leaf[0], depth + 1 ); dumpNode( buf, tok->leaf[0], depth + 1 );
break; break;
case TR_STRING: case TR_STRING:
buf += "STRING: "; buf += "STRING: ";
buf += formatNode( tok ); buf += formatNode( tok );
break; break;
case TR_IDENTIFIER: case TR_IDENTIFIER:
buf += "ID: "; buf += "ID: ";
buf += formatNode( tok ); buf += formatNode( tok );
break; break;
case TR_STRUCT_REF: case TR_STRUCT_REF:
buf += "SREF: "; buf += "SREF: ";
dumpNode( buf, tok->leaf[0], depth + 1 ); dumpNode( buf, tok->leaf[0], depth + 1 );
dumpNode( buf, tok->leaf[1], depth + 1 ); dumpNode( buf, tok->leaf[1], depth + 1 );
break; break;
case TR_OP_FUNC_CALL: case TR_OP_FUNC_CALL:
buf += "CALL '"; buf += "CALL '";
buf += tok->leaf[0]->value.str; buf += tok->leaf[0]->value.str;
buf += "': "; buf += "': ";
dumpNode( buf, tok->leaf[1], depth + 1 ); dumpNode( buf, tok->leaf[1], depth + 1 );
break; break;
case TR_UNIT: case TR_UNIT:
sprintf( str, "UNIT: %d ", tok->value.type ); sprintf( str, "UNIT: %d ", tok->value.type );
buf += str; buf += str;
@ -585,12 +578,14 @@ void dumpNode( std::string& buf, TREE_NODE* tok, int depth = 0 )
} }
} }
void COMPILER::ReportError( const wxString& aErrorMsg ) void COMPILER::ReportError( const wxString& aErrorMsg )
{ {
m_errorStatus.pendingError = true; m_errorStatus.pendingError = true;
m_errorStatus.message = aErrorMsg; m_errorStatus.message = aErrorMsg;
} }
void COMPILER::setRoot( TREE_NODE root ) void COMPILER::setRoot( TREE_NODE root )
{ {
m_tree = copyNode( root ); m_tree = copyNode( root );
@ -614,11 +609,8 @@ bool COMPILER::generateUCode( UCODE* aCode )
std::string dump; std::string dump;
dumpNode( dump, m_tree, 0 ); dumpNode( dump, m_tree, 0 );
libeval_dbg(3,"Tree dump:\n%s\n\n", dump.c_str() ); libeval_dbg(3,"Tree dump:\n%s\n\n", dump.c_str() );
while( !stack.empty() ) while( !stack.empty() )
{ {
TREE_NODE* node = stack.back(); TREE_NODE* node = stack.back();
@ -731,7 +723,7 @@ bool COMPILER::generateUCode( UCODE* aCode )
case TR_NUMBER: case TR_NUMBER:
{ {
auto son = node->leaf[0]; TREE_NODE* son = node->leaf[0];
double value = atof( node->value.str ); // fixme: locale double value = atof( node->value.str ); // fixme: locale
@ -776,8 +768,8 @@ bool COMPILER::generateUCode( UCODE* aCode )
visitedNodes.insert( node ); visitedNodes.insert( node );
if(node->uop) if( node->uop )
aCode->AddOp(node->uop); aCode->AddOp( node->uop );
stack.pop_back(); stack.pop_back();
} }
@ -790,7 +782,6 @@ bool COMPILER::generateUCode( UCODE* aCode )
void UOP::Exec( CONTEXT* ctx, UCODE* ucode ) void UOP::Exec( CONTEXT* ctx, UCODE* ucode )
{ {
switch( m_op ) switch( m_op )
{ {
case TR_UOP_PUSH_VAR: case TR_UOP_PUSH_VAR:
@ -853,16 +844,10 @@ void UOP::Exec( CONTEXT* ctx, UCODE* ucode )
result = arg1->EqualTo( arg2 ) ? 0 : 1; result = arg1->EqualTo( arg2 ) ? 0 : 1;
break; break;
case TR_OP_BOOL_AND: case TR_OP_BOOL_AND:
result = ( ( arg1->AsDouble() != 0.0 ? true : false ) result = arg1->AsDouble() != 0.0 && arg2->AsDouble() != 0.0 ? 1 : 0;
&& ( arg2->AsDouble() != 0.0 ? true : false ) ) ?
1 :
0;
break; break;
case TR_OP_BOOL_OR: case TR_OP_BOOL_OR:
result = ( ( arg1->AsDouble() != 0.0 ? true : false ) result = arg1->AsDouble() != 0.0 || arg2->AsDouble() != 0.0 ? 1 : 0;
|| ( arg2->AsDouble() != 0.0 ? true : false ) ) ?
1 :
0;
break; break;
default: default:
result = 0.0; result = 0.0;