mirror of
https://github.com/polserver/polserver
synced 2026-08-13 08:23:08 -04:00
7627e3d353
* Squash only prettify changes from escript_formating_try
* support of "format-off" / "format-on" comments to mark areas without
formatting
* fix typo
* added FormatterIdentLevel, FormatterMergeEmptyLines cfg entry
better line splits for dicts/arrays
* added several spacing options. the current setting list is now:
//LineWidth
FormatterLineWidth 80
// keep original keyword spelling
FormatterKeepKeywords 0
// number of spaces for ident
FormatterIdentLevel 2
// multiple newlines get merged to a single
FormatterMergeEmptyLines 1
// space between emtpy parenthesis eg foo() vs foo( )
FormatterEmptyParenthesisSpacing 0
// space between emtpy brackets eg struct{} vs struct{ }
FormatterEmptyBracketSpacing 0
// space after/before parenthesis in conditionals
// eg if ( true ) vs if (true)
FormatterConditionalParenthesisSpacing 1
// space after/before parenthesis
// eg foo( true ) vs foo(true)
FormatterParenthesisSpacing 1
// space after/before brackets
// eg array{ true } vs array{true}
FormatterBracketSpacing 1
// add space after delimiter comma or semi in for loops
// eg {1, 2, 3} vs {1,2,3}
FormatterDelimiterSpacing 1
// add space around assignment
// eg a := 1; vs a:=1;
FormatterAssignmentSpacing 1
// add space around comparison
// eg a == 1 vs a==1
FormatterComparisonSpacing 1
// add space around operations
// eg a + 1 vs a+1
FormatterOperatorSpacing 1
// use \r\n as newline instead of \n
FormatterWindowsLineEndings 0
* added tab support
// use tabs instead of spaces
FormatterUseTabs 0
// tab width
FormatterTabWidth 4
* extended example ecompile.cfg with formatter settings
* cleanup
* program args comma is optional...
fixed line comments in group splitting
* since tokenids are now correct no more guessing for linecomments needed
* comments use as start tokenid the whitespace token if its on the same
line
* splitted processing from linebuilding
* renamed TokenPart to FmtToken better matches the purpose.
Comments get directly stored as FmtToken
started with a context enum
* better(?) formatting for groups
* fix eof rawlines
added check that all comments/rawlines got parsed
* const correctness
* datatype adapted to antlr
* fixed warnings
* added InsertNewlineAtEOF
* add newline at the end if the original file had one
dont strip comment whitespace if its somejind of "header block"
use the defined lineending for /* */ comments
* docs
* \r\n is default on windows \n otherwise
* fixed warning
---------
Co-authored-by: Kevin Eady <8634912+KevinEady@users.noreply.github.com>
41 lines
1.2 KiB
C++
41 lines
1.2 KiB
C++
#include "PrettifyBuilder.h"
|
|
|
|
#include "bscript/compiler/Profile.h"
|
|
#include "bscript/compiler/Report.h"
|
|
#include "bscript/compiler/file/PrettifyFileProcessor.h"
|
|
#include "bscript/compiler/file/SourceFile.h"
|
|
#include "bscript/compiler/file/SourceFileIdentifier.h"
|
|
#include "bscript/compiler/file/SourceLocation.h"
|
|
|
|
namespace Pol::Bscript::Compiler
|
|
{
|
|
PrettifyBuilder::PrettifyBuilder( Profile& profile, Report& report )
|
|
: profile( profile ), report( report )
|
|
{
|
|
}
|
|
|
|
std::string PrettifyBuilder::build( const std::string& pathname, bool is_module )
|
|
{
|
|
auto ident = std::make_unique<SourceFileIdentifier>( 0, pathname );
|
|
|
|
SourceLocation source_location( ident.get(), 0, 0 );
|
|
|
|
auto sf = SourceFile::load( *ident, profile, report );
|
|
|
|
if ( !sf || report.error_count() )
|
|
{
|
|
report.error( *ident, "Unable to load '{}'.", pathname );
|
|
return {};
|
|
}
|
|
PrettifyFileProcessor prettify_processor( *ident, profile, report );
|
|
if ( is_module )
|
|
prettify_processor.process_module_unit( *sf );
|
|
else
|
|
prettify_processor.process_compilation_unit( *sf );
|
|
|
|
if ( report.error_count() )
|
|
return {};
|
|
return prettify_processor.prettify();
|
|
}
|
|
|
|
} // namespace Pol::Bscript::Compiler
|