From e20a9c03e01488093cb4e6ecce24981e99b133ce Mon Sep 17 00:00:00 2001 From: Rob Greene Date: Sun, 15 Jul 2018 18:03:13 -0500 Subject: [PATCH] Decided that exempting "A=150" wasn't really getting anywhere. If that's in a loop, that 150 should be pre-assigned to a "constant". --- .../api/optimizations/ExtractConstantValues.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/api/src/main/java/io/github/applecommander/bastools/api/optimizations/ExtractConstantValues.java b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/ExtractConstantValues.java index 3ec78c5..82643fe 100644 --- a/api/src/main/java/io/github/applecommander/bastools/api/optimizations/ExtractConstantValues.java +++ b/api/src/main/java/io/github/applecommander/bastools/api/optimizations/ExtractConstantValues.java @@ -114,14 +114,13 @@ public class ExtractConstantValues extends BaseVisitor { public Statement visit(Statement statement) { try { if (!statement.tokens.isEmpty()) { - int size = statement.tokens.size(); Token t = statement.tokens.get(0); - // Special logic for "A=5+1" while trying to skip constant forms of "A=1234" (don't replicate) - if (t.type == Token.Type.IDENT && size > 3) { + // Assignment + if (t.type == Token.Type.IDENT) { this.consumer = this::numberToIdentTransformation; } - // Special logic for "LET A=5+1" while trying to skip constant forms of "LET A=1234" (don't replicate) - if (t.type == Token.Type.KEYWORD && t.keyword == ApplesoftKeyword.LET && size > 4) { + // Assignment with LET + if (t.type == Token.Type.KEYWORD && t.keyword == ApplesoftKeyword.LET) { this.consumer = this::numberToIdentTransformation; } }