Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-08 17:46:25 +01:00
Code Issues Releases Wiki Activity

LISP format improvements (Thanks Steve)

Browse Source 
- Readable by Lisp and humans (now), but indentation still a bit strange because of how it is being generated.
This commit is contained in:
James Crook
2018-02-12 21:40:04 +00:00
committed by Paul Licameli
parent 6236a9fb94
commit 15aad64f7b
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/commands/CommandTargets.cpp
View File

@@ -94,7 +94,7 @@ void LispyCommandMessageTarget::StartArray()
{ {
wxString Padding; wxString Padding;
Padding.Pad( mCounts.GetCount() *2 -2); Padding.Pad( mCounts.GetCount() *2 -2);
Update( wxString::Format( "%s%s( ", ( mCounts.Last() > 0 ) ? ",\n" : "\n", Padding )); Update( wxString::Format( "\n%s(", Padding ));
mCounts.Last() += 1; mCounts.Last() += 1;
mCounts.push_back( 0 ); mCounts.push_back( 0 );
} }
@@ -103,12 +103,12 @@ void LispyCommandMessageTarget::EndArray(){
if( mCounts.GetCount() > 1 ){ if( mCounts.GetCount() > 1 ){
mCounts.pop_back(); mCounts.pop_back();
} }
Update( " )" ); Update( ")" );
} }
void LispyCommandMessageTarget::StartStruct(){ void LispyCommandMessageTarget::StartStruct(){
wxString Padding; wxString Padding;
Padding.Pad( mCounts.GetCount() *2 -2); Padding.Pad( mCounts.GetCount() *2 -2);
Update( wxString::Format( "%s%s( ", ( mCounts.Last() > 0 ) ? ",\n" : "\n", Padding )); Update( wxString::Format( "\n%s(", Padding ));
mCounts.Last() += 1; mCounts.Last() += 1;
mCounts.push_back( 0 ); mCounts.push_back( 0 );
} }
@@ -116,36 +116,33 @@ void LispyCommandMessageTarget::EndStruct(){
if( mCounts.GetCount() > 1 ){ if( mCounts.GetCount() > 1 ){
mCounts.pop_back(); mCounts.pop_back();
} }
Update( " )" ); Update( ")" );
} }
void LispyCommandMessageTarget::AddItem(const wxString &value, const wxString &name){ void LispyCommandMessageTarget::AddItem(const wxString &value, const wxString &name){
wxString Padding; wxString Padding = "";
Padding.Pad( mCounts.GetCount() *2 -2);
Padding = (( value.length() < 15 ) || (mCounts.Last()<=0)) ? "" : wxString("\n") + Padding;
if( name.IsEmpty() ) if( name.IsEmpty() )
Update( wxString::Format( "%s%s\"%s\"", (mCounts.Last()>0)?", ":"", Padding, value)); Update( wxString::Format( "%s%s\"%s\"", (mCounts.Last()>0)?" ":"", Padding, value));
else else
Update( wxString::Format( "%s%s( %s, \"%s\" )", (mCounts.Last()>0)?", ":"", Padding, name, value)); Update( wxString::Format( "%s%s(%s \"%s\")", (mCounts.Last()>0)?" ":"", Padding, name, value));
mCounts.Last() += 1; mCounts.Last() += 1;
} }
void LispyCommandMessageTarget::AddBool(const bool value, const wxString &name){ void LispyCommandMessageTarget::AddBool(const bool value, const wxString &name){
if( name.IsEmpty() ) if( name.IsEmpty() )
Update( wxString::Format( "%s%s", (mCounts.Last()>0)?", ":"",value?"True":"False")); Update( wxString::Format( "%s%s", (mCounts.Last()>0)?" ":"",value?"True":"False"));
else else
Update( wxString::Format( "%s( %s, %s )", (mCounts.Last()>0)?", ":"", name,value?"True":"False")); Update( wxString::Format( "%s(%s %s)", (mCounts.Last()>0)?" ":"", name,value?"True":"False"));
mCounts.Last() += 1; mCounts.Last() += 1;
} }
void LispyCommandMessageTarget::AddItem(const double value, const wxString &name){ void LispyCommandMessageTarget::AddItem(const double value, const wxString &name){
if( name.IsEmpty() ) if( name.IsEmpty() )
Update( wxString::Format( "%s%g", (mCounts.Last()>0)?", ":"", value)); Update( wxString::Format( "%s%g", (mCounts.Last()>0)?" ":"", value));
else else
Update( wxString::Format( "%s( %s, %g )", (mCounts.Last()>0)?", ":"", name,value)); Update( wxString::Format( "%s(%s %g)", (mCounts.Last()>0)?" ":"", name,value));
mCounts.Last() += 1; mCounts.Last() += 1;
} }
void LispyCommandMessageTarget::StartField(const wxString &name){ void LispyCommandMessageTarget::StartField(const wxString &name){
Update( wxString::Format( "%s( %s, ", (mCounts.Last()>0)?", ":"", name )); Update( wxString::Format( "%s(%s", (mCounts.Last()>0)?" ":"", name ));
mCounts.Last() += 1; mCounts.Last() += 1;
mCounts.push_back( 0 ); mCounts.push_back( 0 );
} }
@@ -154,7 +151,7 @@ void LispyCommandMessageTarget::EndField(){
if( mCounts.GetCount() > 1 ){ if( mCounts.GetCount() > 1 ){
mCounts.pop_back(); mCounts.pop_back();
} }
Update( " )" ); Update( ")" );
} }