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.

Sign up for GitHub

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

Map putchar('{char}') calls to printf '{char}` #130

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Map putchar('{char}') calls to printf '{char}` #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
208df32
Map putchar('{char}') calls to printf '{char}`
laurenthuberdeau Jan 7, 2025
961931c
Regenerate examples
laurenthuberdeau Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions examples/compiled/base64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ _encode() {
printf \\$(((_$((_codes + (b1 >> 2))))/64))$(((_$((_codes + (b1 >> 2))))/8%8))$(((_$((_codes + (b1 >> 2))))%8))
if [ $b2 -lt 0 ] ; then
printf \\$(((_$((_codes + (63 & (b1 << 4)))))/64))$(((_$((_codes + (63 & (b1 << 4)))))/8%8))$(((_$((_codes + (63 & (b1 << 4)))))%8))
printf \\$(((__EQ__)/64))$(((__EQ__)/8%8))$(((__EQ__)%8))
printf \\$(((__EQ__)/64))$(((__EQ__)/8%8))$(((__EQ__)%8))
printf "="
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much shorter and easier to read!

printf "="
break
else
printf \\$(((_$((_codes + (63 & ((b1 << 4) | (b2 >> 4))))))/64))$(((_$((_codes + (63 & ((b1 << 4) | (b2 >> 4))))))/8%8))$(((_$((_codes + (63 & ((b1 << 4) | (b2 >> 4))))))%8))
_getchar b3
if [ $b3 -lt 0 ] ; then
printf \\$(((_$((_codes + (63 & (b2 << 2)))))/64))$(((_$((_codes + (63 & (b2 << 2)))))/8%8))$(((_$((_codes + (63 & (b2 << 2)))))%8))
printf \\$(((__EQ__)/64))$(((__EQ__)/8%8))$(((__EQ__)%8))
printf "="
break
else
printf \\$(((_$((_codes + (63 & ((b2 << 2) | (b3 >> 6))))))/64))$(((_$((_codes + (63 & ((b2 << 2) | (b3 >> 6))))))/8%8))$(((_$((_codes + (63 & ((b2 << 2) | (b3 >> 6))))))%8))
Expand Down Expand Up @@ -164,7 +164,6 @@ _main() { let argc $2; let myargv $3
readonly __NUL__=0
readonly __NEWLINE__=10
readonly __MINUS__=45
readonly __EQ__=61
readonly __d__=100
# Runtime library
__stdin_buf=
Expand Down
5 changes: 2 additions & 3 deletions examples/compiled/sha256sum.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ _process_file() { let filename $2
_hex __ $h
: $((i += 1))
done
printf \\$(((__SPACE__)/64))$(((__SPACE__)/8%8))$(((__SPACE__)%8))
printf \\$(((__SPACE__)/64))$(((__SPACE__)/8%8))$(((__SPACE__)%8))
printf " "
printf " "
while [ $((_$filename)) != 0 ]; do
printf \\$(((_$filename)/64))$(((_$filename)/8%8))$(((_$filename)%8))
: $((filename += 1))
Expand All @@ -233,7 +233,6 @@ _main() { let argc $2; let myargv $3

# Character constants
readonly __NEWLINE__=10
readonly __SPACE__=32
# Runtime library

unpack_escaped_string() {
Expand Down
10 changes: 8 additions & 2 deletions sh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1445,15 +1445,21 @@ text fun_call_params(ast params) {

#ifdef INCLUDE_COMP_PUTCHAR_INLINE
text comp_putchar_inline(ast param) {
text res = comp_rvalue(param, RVALUE_CTX_ARITH_EXPANSION);
text res;
ast ident;

if (get_op(param) == CHARACTER && get_val(param) >= 32 && get_val(param) <= 126) { // Printable ASCII characters
return string_concat3(wrap_str_lit("printf \""), escape_text(wrap_char(get_val(param)), true), wrap_char('\"'));
}

res = comp_rvalue(param, RVALUE_CTX_ARITH_EXPANSION);

if (contains_side_effects) {
ident = fresh_ident();
append_glo_decl(string_concat4(comp_lvalue(ident), wrap_str_lit("=$(("), res, wrap_str_lit("))")));
res = comp_lvalue(ident);
} else if (get_op(param) != IDENTIFIER) {
res = string_concat3(wrap_char('('), res, wrap_char(')'));
res = string_concat3(wrap_char('('), res, wrap_char(')')); // Wrap in parentheses to avoid priority of operations issues
}

res =
Expand Down
Loading