From 35ac0c104888247b7acaf9d02a3372f79ea4e893 Mon Sep 17 00:00:00 2001 From: Ed_ Date: Fri, 8 Sep 2023 15:14:43 -0400 Subject: [PATCH] Fix compile-error for singleheader found with scanner's scan_file. --- singleheader/singleheader.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/singleheader/singleheader.cpp b/singleheader/singleheader.cpp index ee7ed73..8590b70 100644 --- a/singleheader/singleheader.cpp +++ b/singleheader/singleheader.cpp @@ -152,13 +152,6 @@ int gen_main() header.print_fmt( "#pragma endregion Builder\n" ); } - if ( generate_scanner ) - { - header.print_fmt( "\n#pragma region Scanner\n" ); - header.print( scan_file( project_dir "auxillary/scanner.hpp" ) ); - header.print_fmt( "#pragma endregion Scanner\n\n" ); - } - header.print_fmt( "GEN_NS_END\n" ); } @@ -210,8 +203,8 @@ int gen_main() Code parsing = scan_file( project_dir "components/interface.parsing.cpp" ); Code untyped = scan_file( project_dir "components/interface.untyped.cpp" ); - CodeBody etoktype = gen_etoktype( project_dir "enums/ETokType.csv", project_dir "enums/AttributeTokens.csv" ); - CodeNS parser_nspace = def_namespace( name(Parser), def_namespace_body( args(etoktype)) ); + CodeBody etoktype = gen_etoktype( project_dir "enums/ETokType.csv", project_dir "enums/AttributeTokens.csv" ); + CodeNS parser_nspace = def_namespace( name(Parser), def_namespace_body( args(etoktype)) ); header.print_fmt( "\nGEN_NS_BEGIN\n"); header.print( static_data ); @@ -238,6 +231,14 @@ int gen_main() header.print_fmt( "\n#pragma endregion Builder\n\n" ); } + // Scanner header depends on implementation + if ( generate_scanner ) + { + header.print_fmt( "\n#pragma region Scanner\n" ); + header.print( scan_file( project_dir "auxillary/scanner.hpp" ) ); + header.print_fmt( "#pragma endregion Scanner\n\n" ); + } + #if 0 if ( generate_scanner ) {