Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify logical statement by swapping if/else branch in if-expr #64

Merged
merged 5 commits into from
May 4, 2022
Merged

Simplify logical statement by swapping if/else branch in if-expr #64

merged 5 commits into from
May 4, 2022

Conversation

ThibFrgsGmz
Copy link
Contributor

Originating Project/Creator
Affected Component
Affected Architectures(s)
Related Issue(s)
Has Unit Tests (y/n)
Builds Without Errors (y/n)
Unit Tests Pass (y/n)
Documentation Included (y/n)

Change Description

This PR includes the following change:

  1. Swap the if and else branches of an if-expression to make it not concise/readable [ref]
  2. Misc: fstring remaining to be placed
  3. Misc: remove Redundant f-string [ref]

Rationale

Negative conditions are harder to read than positive conditions, so they should be avoided if possible. We can reverse the condition and make it positive by swapping the if and else conditions.

Testing/Review Recommendations

(void)

Future Work

(void)

@github-actions
Copy link

github-actions bot commented Apr 29, 2022

@check-spelling-bot Report

Unrecognized words, please review:

  • onfig
Previously acknowledged words that are now absent Autocoders DEPS Dxyz filecmp isnumeric LGTM mkdtemp params Prm README rmd sset tempfile Tlm
To accept these unrecognized words as correct (and remove the previously acknowledged and now absent words), run the following commands

... in a clone of the git@github.com:ThibFrgsGmz/fprime-tools.git repository
on the feat/simplify-logical-statement branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spelling/expect.txt"');
@ARGV=@expect_files;
my @stale=qw('"$patch_remove"');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
next if /^(?:$re)(?:(?:\r|\n)*$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spelling/expect.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"$patch_add"');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
}

comment_json=$(mktemp)
curl -L -s -S \
  --header "Content-Type: application/json" \
  "https://api.github.com/repos/fprime-community/fprime-tools/issues/comments/1113851828" > "$comment_json"
comment_body=$(mktemp)
jq -r .body < "$comment_json" > $comment_body
rm $comment_json

patch_remove=$(perl -ne 'next unless s{^</summary>(.*)</details>$}{$1}; print' < "$comment_body")
  

patch_add=$(perl -e '$/=undef;
$_=<>;
s{<details>.*}{}s;
s{^#.*}{};
s{\n##.*}{};
s{(?:^|\n)\s*\*}{}g;
s{\s+}{ }g;
print' < "$comment_body")
  
update_files
rm $comment_body
git add -u

@lgtm-com
Copy link

lgtm-com bot commented Apr 29, 2022

This pull request introduces 1 alert when merging a745ea4 into b0b7666 - view on LGTM.com

new alerts:

  • 1 for Unused local variable

@ThibFrgsGmz
Copy link
Contributor Author

The last commit was a conflict resolution according to the last modification of gcovr.py

@LeStarch LeStarch merged commit 526448a into nasa:devel May 4, 2022
@ThibFrgsGmz ThibFrgsGmz deleted the feat/simplify-logical-statement branch July 20, 2022 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants