Skip to content

Remove angle brackets when displaying objects #281

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

Merged
bahmanm merged 1 commit into from
Dec 27, 2024
Merged

Remove angle brackets when displaying objects #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion bjforth/src/main/java/bjforth/primitives/DOTSTACK.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void execute(Machine machine) {
if (obj == null) {
str = "null";
} else {
str = "%s<%s>".formatted(obj.getClass().getTypeName(), obj.toString());
str = "%s: %s".formatted(obj.getClass().getTypeName(), obj.toString());
}
machine.pushToParameterStack(str);
PRINTLN().execute(machine);
Expand Down
2 changes: 1 addition & 1 deletion bjforth/src/main/java/bjforth/primitives/INTERPRET.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void execute(Machine machine) {
} catch (MachineException __ex) { // Not a number. Exit with error.
System.out.print(
colorize(
"%s Pushing unknown word or invalid number onto stack: <%s>"
"%s Pushing unknown word or invalid number onto stack: %s"
.formatted(WARN_EMOJI, obj.toString()),
FOREGROUND_COLOR,
BACKGROUND_COLOR));
Expand Down
6 changes: 3 additions & 3 deletions bjforth/src/test/java/bjforth/primitives/DOTSTACKTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ void worksOk() {

// THEN
var expectedStr = new StringBuilder();
expectedStr.append(colorize("java.lang.String<hi>", FOREGROUND_COLOR, BACKGROUND_COLOR));
expectedStr.append(colorize("java.lang.String: hi", FOREGROUND_COLOR, BACKGROUND_COLOR));
expectedStr.append("\n");
expectedStr.append(colorize("null", FOREGROUND_COLOR, BACKGROUND_COLOR));
expectedStr.append("\n");
expectedStr.append(colorize("java.lang.Integer<10>", FOREGROUND_COLOR, BACKGROUND_COLOR));
expectedStr.append(colorize("java.lang.Integer: 10", FOREGROUND_COLOR, BACKGROUND_COLOR));
expectedStr.append("\n");
expectedStr.append(colorize("java.lang.Character<a>", FOREGROUND_COLOR, BACKGROUND_COLOR));
expectedStr.append(colorize("java.lang.Character: a", FOREGROUND_COLOR, BACKGROUND_COLOR));
expectedStr.append("\n");
assertThat(outputStream.toString()).isEqualTo(expectedStr.toString());
}
Expand Down