From 52873022ceb1f5696b63e2fc15f5fb1283c91bfb Mon Sep 17 00:00:00 2001 From: Marco Maccaferri Date: Mon, 31 Dec 2018 09:19:54 +0100 Subject: [PATCH] Fixed if without else statement --- src/com/maccasoft/tools/IntelHexBuilder.java | 8 ++++++-- src/com/maccasoft/tools/ListingBuilder.java | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/com/maccasoft/tools/IntelHexBuilder.java b/src/com/maccasoft/tools/IntelHexBuilder.java index fe4efc7..754a68c 100644 --- a/src/com/maccasoft/tools/IntelHexBuilder.java +++ b/src/com/maccasoft/tools/IntelHexBuilder.java @@ -85,12 +85,16 @@ public class IntelHexBuilder { if (line.getInstructionObject() != null) { nl.grauw.glass.instructions.If ins = (nl.grauw.glass.instructions.If) line.getInstruction(); build(ins.getThenSource()); - build(ins.getElseSource()); + if (ins.getElseSource() != null) { + build(ins.getElseSource()); + } } else { If ins = (If) line.getDirective(); build(ins.getThenSource()); - build(ins.getElseSource()); + if (ins.getElseSource() != null) { + build(ins.getElseSource()); + } } } } catch (AssemblyException e) { diff --git a/src/com/maccasoft/tools/ListingBuilder.java b/src/com/maccasoft/tools/ListingBuilder.java index f753d0e..4a8e9b5 100644 --- a/src/com/maccasoft/tools/ListingBuilder.java +++ b/src/com/maccasoft/tools/ListingBuilder.java @@ -96,12 +96,16 @@ public class ListingBuilder { if (line.getInstructionObject() != null) { nl.grauw.glass.instructions.If ins = (nl.grauw.glass.instructions.If) line.getInstruction(); build(ins.getThenSource()); - build(ins.getElseSource()); + if (ins.getElseSource() != null) { + build(ins.getElseSource()); + } } else { If ins = (If) line.getDirective(); build(ins.getThenSource()); - build(ins.getElseSource()); + if (ins.getElseSource() != null) { + build(ins.getElseSource()); + } } } } catch (AssemblyException e) {