zawz/lxsh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix minify on heredocument at end of case

Browse source
This commit is contained in:
zawz 2021-06-30 09:48:54 +02:00
parent aef06f4932
commit 6e87d180c2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/generate.cpp
View file

@ -6,6 +6,9 @@
#include "options.hpp" #include "options.hpp"
#include "parse.hpp" #include "parse.hpp"
// global
bool prev_is_heredoc=false;
bool is_sub_special_cmd(std::string in) bool is_sub_special_cmd(std::string in)
{ {
return in == "%include_sub" || in == "%resolve_sub"; return in == "%include_sub" || in == "%resolve_sub";
@ -78,6 +81,7 @@ std::string condlist::generate(int ind)
ret += opt_minify ? "&&" : " && "; ret += opt_minify ? "&&" : " && ";
ret += pls[i+1]->generate(ind, &ctx); ret += pls[i+1]->generate(ind, &ctx);
} }
prev_is_heredoc=false;
if(ret=="") if(ret=="")
return ""; return "";
if(ctx.here_document != nullptr) if(ctx.here_document != nullptr)
@ -87,6 +91,7 @@ std::string condlist::generate(int ind)
ret += '\n'; ret += '\n';
ret += ctx.here_document->generate(0); ret += ctx.here_document->generate(0);
ret += '\n'; ret += '\n';
prev_is_heredoc=true;
} }
else if(parallel) else if(parallel)
{ {
@ -308,7 +313,7 @@ std::string case_block::generate(int ind, generate_context* ctx)
// commands // commands
ret += cs.second->generate(ind+1); ret += cs.second->generate(ind+1);
// end of case: ;; // end of case: ;;
if(opt_minify && ret[ret.size()-1] == '\n') // ;; can be right after command if(opt_minify && !prev_is_heredoc && ret[ret.size()-1] == '\n') // ;; can be right after command
ret.pop_back(); ret.pop_back();
ret += indented(";;", ind+1); ret += indented(";;", ind+1);
if(!opt_minify) if(!opt_minify)