Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-29 06:07:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Major grammar/lexer/compiler fixes

Browse source
This commit is contained in:
smallmodel 2023-08-13 03:33:50 +02:00
parent d2b3f6c12b
commit 5e83e03e33
No known key found for this signature in database
GPG key ID: A96F163ED4891440
11 changed files with 1385 additions and 1105 deletions
Download patch file Download diff file Expand all files Collapse all files

14
code/fgame/gamescript.cpp
View file

@ -193,7 +193,7 @@ bool StateScript::AddLabel( const_str label, unsigned char *pos, bool private_se
{
if( label_list.findKeyValue( label ) )
{
return true;
return false;
}
script_label_t &s = label_list.addKeyValue( label );
@ -209,7 +209,7 @@ bool StateScript::AddLabel( const_str label, unsigned char *pos, bool private_se
reverse_label_list.AddObject( &s );
return false;
return true;
}
bool StateScript::AddLabel( str label, unsigned char *pos, bool private_section )
@ -717,17 +717,21 @@ void GameScript::Load( const void *sourceBuffer, size_t sourceLength )
size_t nodeLength;
char *m_PreprocessedBuffer;
m_SourceBuffer = ( char * )glbs.Malloc( sourceLength + 1 );
m_SourceBuffer = ( char * )glbs.Malloc( sourceLength + 2 );
m_SourceLength = sourceLength;
m_SourceBuffer[ sourceLength ] = 0;
// Original mohaa doesn't reallocate the input string to append a newline
// This is a temporary workaround to handle the absolute disaster of newlines
// Both the lexer and grammar are extremely abhorrent at handling newlines followed by an EOF
m_SourceBuffer[ sourceLength ] = '\n';
m_SourceBuffer[ sourceLength + 1] = 0;
memcpy( m_SourceBuffer, sourceBuffer, sourceLength );
Compiler.Reset();
m_PreprocessedBuffer = Compiler.Preprocess( m_SourceBuffer );
nodeLength = Compiler.Parse( this, m_PreprocessedBuffer );
nodeLength = Compiler.Parse( this, m_PreprocessedBuffer, "script" );
Compiler.Preclean( m_PreprocessedBuffer );
if( !nodeLength )