ed/refactor
1
0
Fork 0
mirror of https://github.com/Ed94/refactor.git synced 2024-11-10 04:14:53 -08:00
Code Issues Packages Projects Releases Wiki Activity

Got include refactors (sig to sub) to work.

Browse Source 
Just need to make sure the test case works with the refactored zpl file
This commit is contained in:
Edward R. Gonzalez 2023-03-30 13:59:49 -04:00
parent 1cd4287eb2
commit 17458b4b4c
1 changed files with 86 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
project/refactor.cpp
View File

@ -223,6 +223,11 @@ void refactor()
col += Amount_; \ col += Amount_; \
src += Amount_ \ src += Amount_ \
#define move_back( Amount_ ) \
left += Amount_; \
col -= Amount_; \
src -= Amount_ \
do do
{ {
if ( Spec::Ignore_Comments && src[0] == '/' && left - 2 > 0 ) if ( Spec::Ignore_Comments && src[0] == '/' && left - 2 > 0 )
@ -254,40 +259,49 @@ void refactor()
} }
// Includes to ignore // Includes to ignore
do
{ {
Spec::Entry* ignore = Spec::Ignore_Includes; Spec::Entry* ignore = Spec::Ignore_Includes;
sw ignores_left = zpl_array_count( Spec::Ignore_Includes); sw ignores_left = zpl_array_count( Spec::Ignore_Includes);
sw rewind = 0;
for ( ; ignores_left; ignores_left--, ignore++ )
{
if ( '#' != src[0] ) if ( '#' != src[0] )
continue; break;
move_forward( 1 ); move_forward( 1 );
rewind++;
// Ignore whitespace // Ignore whitespace
while ( zpl_char_is_space( src[0] ) ) while ( zpl_char_is_space( src[0] ) )
{ {
move_forward( 1 ); move_forward( 1 );
rewind++;
} }
if ( zpl_strncmp( include_sig, src, sizeof(include_sig) - 1 ) != 0 ) if ( zpl_strncmp( include_sig, src, sizeof(include_sig) - 1 ) != 0 )
{ {
move_back( rewind );
break; break;
} }
move_forward( sizeof(include_sig) - 1 ); const u32 sig_size = sizeof(include_sig) - 1;
move_forward( sig_size );
rewind += sig_size;
// Ignore whitespace // Ignore whitespace
while ( zpl_char_is_space( src[0] ) || src[0] == '\"' || src[0] == '<' ) while ( zpl_char_is_space( src[0] ) || src[0] == '\"' || src[0] == '<' )
{ {
move_forward(1); move_forward(1);
rewind++;
} }
for ( ; ignores_left; ignores_left--, ignore++ )
{
zpl_string_clear( current ); zpl_string_clear( current );
u32 sig_length = zpl_string_length( ignore->Sig ); u32 sig_length = zpl_string_length( ignore->Sig );
current = zpl_string_append_length( current, ignore->Sig, sig_length ); current = zpl_string_append_length( current, src, sig_length );
if ( zpl_string_are_equal( ignore->Sig, current ) ) if ( zpl_string_are_equal( ignore->Sig, current ) )
{ {
@ -307,7 +321,10 @@ void refactor()
goto Skip; goto Skip;
} }
} }
move_back( rewind );
} }
while (false);
// Word Ignores // Word Ignores
{ {
@ -385,41 +402,49 @@ void refactor()
} }
// Includes to match // Includes to match
do
{ {
Spec::Entry* include = Spec::Includes; Spec::Entry* include = Spec::Includes;
sw includes_left = zpl_array_count ( Spec::Includes); sw includes_left = zpl_array_count ( Spec::Includes);
sw rewind = 0;
for ( ; includes_left; includes_left--, include++ )
{
if ( '#' != src[0] ) if ( '#' != src[0] )
continue; break;
move_forward( 1 ); move_forward( 1 );
rewind++;
// Ignore whitespace // Ignore whitespace
while ( zpl_char_is_space( src[0] ) ) while ( zpl_char_is_space( src[0] ) )
{ {
move_forward( 1 ); move_forward( 1 );
rewind++;
} }
if ( zpl_strncmp( include_sig, src, sizeof(include_sig) - 1 ) != 0 ) if ( zpl_strncmp( include_sig, src, sizeof(include_sig) - 1 ) != 0 )
{ {
move_back( rewind );
break; break;
} }
src += sizeof(include_sig) - 1; const u32 sig_size = sizeof(include_sig) - 1;
move_forward( sig_size );
rewind += sig_size;
// Ignore whitespace // Ignore whitespace
while ( zpl_char_is_space( src[0] ) || src[0] == '\"' || src[0] == '<' ) while ( zpl_char_is_space( src[0] ) || src[0] == '\"' || src[0] == '<' )
{ {
move_forward( 1 ); move_forward( 1 );
rewind++;
} }
for ( ; includes_left; includes_left--, include++ )
{
zpl_string_clear( current ); zpl_string_clear( current );
u32 sig_length = zpl_string_length( include->Sig ); u32 sig_length = zpl_string_length( include->Sig );
current = zpl_string_append_length( current, include->Sig, sig_length ); current = zpl_string_append_length( current, src, sig_length );
if ( zpl_string_are_equal( include->Sig, current ) ) if ( zpl_string_are_equal( include->Sig, current ) )
{ {
@ -451,7 +476,10 @@ void refactor()
goto Skip; goto Skip;
} }
} }
move_back( rewind );
} }
while (false);
// Words to match // Words to match
{ {
@ -564,6 +592,10 @@ void refactor()
} }
move_forward( 1 ); move_forward( 1 );
// zpl_string_clear( preview );
// preview = zpl_string_append_length( preview, src, 100);
// log_fmt( "__PREVIEW: %d \nn%s\n\n__PREVIEW_END", left, preview );
} }
while ( left ); while ( left );
End_Search: End_Search: