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

Jump to bottom

Change formatting of PostScriptOp #44

Merged
merged 7 commits into from
Oct 30, 2024
Merged

Change formatting of PostScriptOp #44

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0349ea1
Make postscript op owned
LaurenzV Oct 27, 2024
aa14c67
Change separators & fix float handling
LaurenzV Oct 27, 2024
fd360b1
Revert to push decimal
LaurenzV Oct 27, 2024
9e686a2
Make PostScriptOp copyable again
LaurenzV Oct 27, 2024
577bdbb
make copyable
LaurenzV Oct 27, 2024
81c9a9b
Align with previosu code
LaurenzV Oct 27, 2024
6fe04a7
remove reference
LaurenzV Oct 27, 2024
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
12 changes: 6 additions & 6 deletions src/functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,11 @@ impl<'a> PostScriptOp<'a> {
fn write_slice(ops: &[Self], buf: &mut Vec<u8>) {
buf.push(b'{');
if ops.len() > 1 {
buf.push(b'\n');
buf.push(b' ');
}
for op in ops {
op.write(buf);
buf.push(b'\n');
buf.push(b' ');
}
if ops.len() == 1 {
buf.pop();
Expand All @@ -362,14 +362,14 @@ impl<'a> PostScriptOp<'a> {
Self::Integer(i) => buf.push_val(i),
Self::If(ops) => {
Self::write_slice(ops, buf);
buf.push(b'\n');
buf.push(b' ');
buf.extend(self.operator());
}
Self::IfElse(ops1, ops2) => {
Self::write_slice(ops1, buf);
buf.push(b'\n');
buf.push(b' ');
Self::write_slice(ops2, buf);
buf.push(b'\n');
buf.push(b' ');
buf.extend(self.operator());
}
_ => buf.extend(self.operator()),
Expand Down Expand Up @@ -447,7 +447,7 @@ mod tests {

assert_eq!(
PostScriptOp::encode(&ops),
b"{\n3.0\n2.0\nmul\nexch\ndup\n0.0\nge\n{\n1.0\nadd\n}\n{neg}\nifelse\nadd\n}"
b"{ 3.0 2.0 mul exch dup 0.0 ge { 1.0 add } {neg} ifelse add }"
);
}
}