tseeker-pub/demotool
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Parser - Errors when using inputs in initialisation

Browse source
This commit is contained in:
Emmanuel BENOîT 2017-11-11 16:16:22 +01:00
parent 5d3aa32e9d
commit 773efeff54
1 changed files with 61 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
opparser.cc
View file

@ -685,67 +685,69 @@ bool T_ParserImpl_::checkIdentifierExpressions( ) noexcept
T_StringBuilder esb; T_StringBuilder esb;
for ( cfi = 0 ; cfi < output->root.nFunctions( ) ; cfi ++ ) { for ( cfi = 0 ; cfi < output->root.nFunctions( ) ; cfi ++ ) {
auto& function( output->root.function( cfi ) ); auto& function( output->root.function( cfi ) );
visitor.visit( function , visitor.visit( function , [&]( A_Node& n , const bool exit ) -> bool {
[&]( A_Node& n , const bool exit ) -> bool { if ( exit ) {
if ( exit ) { return true;
return true; }
// Check get-input expressions
if ( n.type( ) == A_Node::EXPR_INPUT ) {
auto& e( dynamic_cast< T_InputExprNode& >( n ) );
auto const* const t( output->types.get( e.id( ) ) );
if ( !t ) {
errors.addNew( "no such input" , e.idLocation( ) );
} else if ( *t != E_DataType::INPUT ) {
esb << "'" << e.id( ) << "' used as input but declared as a "
<< *t;
errors.addNew( std::move( esb ) , e.idLocation( ) );
} else if ( callInfo[ cfi ] & E_InstrRestriction::INIT ) {
errors.addNew( "input used in initialisation" ,
e.location( ) );
} }
// Check get-input expressions
if ( n.type( ) == A_Node::EXPR_INPUT ) {
auto& e( dynamic_cast< T_InputExprNode& >( n ) );
auto const* const t( output->types.get( e.id( ) ) );
if ( !t ) {
errors.addNew( "no such input" , e.idLocation( ) );
} else if ( *t != E_DataType::INPUT ) {
esb << "'" << e.id( ) << "' used as input but declared as a "
<< *t;
errors.addNew( std::move( esb ) , e.idLocation( ) );
}
return false;
}
if ( n.type( ) != A_Node::EXPR_ID ) {
return true;
}
// Check use of identifiers in expressions
auto& e( dynamic_cast< T_IdentifierExprNode& >( n ) );
auto const* const gType{ output->types.get( e.id( ) ) };
if ( gType ) {
// FIXME handle aliases
// Variables are fine
if ( *gType == E_DataType::VARIABLE ) {
return false;
}
// Check builtins
if ( *gType == E_DataType::BUILTIN ) {
if ( ( callInfo[ cfi ] & E_InstrRestriction::INIT )
&& e.id( ) == "time" ) {
errors.addNew( "'time' built-in used in initialisation" ,
e.location( ) );
}
return false;
}
// We'll allow other types to be used in an expression
// in the context of the call instruction.
if ( e.parent( ).type( ) == A_Node::OP_CALL ) {
return false;
}
esb << "'" << e.id( ) << "' used as a variable but declared as a "
<< *gType;
errors.addNew( std::move( esb ) , e.location( ) );
return false;
}
// FIXME check locals
return false; return false;
} ); }
if ( n.type( ) != A_Node::EXPR_ID ) {
return true;
}
// Check use of identifiers in expressions
auto& e( dynamic_cast< T_IdentifierExprNode& >( n ) );
auto const* const gType{ output->types.get( e.id( ) ) };
if ( gType ) {
// FIXME handle aliases
// Variables are fine
if ( *gType == E_DataType::VARIABLE ) {
return false;
}
// Check builtins
if ( *gType == E_DataType::BUILTIN ) {
if ( ( callInfo[ cfi ] & E_InstrRestriction::INIT )
&& e.id( ) == "time" ) {
errors.addNew( "'time' built-in used in initialisation" ,
e.location( ) );
}
return false;
}
// We'll allow other types to be used in an expression
// in the context of the call instruction.
if ( e.parent( ).type( ) == A_Node::OP_CALL ) {
return false;
}
esb << "'" << e.id( ) << "' used as a variable but declared as a "
<< *gType;
errors.addNew( std::move( esb ) , e.location( ) );
return false;
}
// FIXME check locals
return false;
} );
} }
return errors.empty( ); return errors.empty( );
} }