From 7607d3d64a25180bc8ec78ffb81637a744addfa2 Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Sun, 27 Dec 2020 03:35:20 +0100
Subject: [PATCH] check for unexecuted statements in blocks is now done for all
 blocks, not only main

---
 .../src/prog8/ast/processing/AstChecker.kt    | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/compiler/src/prog8/ast/processing/AstChecker.kt b/compiler/src/prog8/ast/processing/AstChecker.kt
index 7239d4795..c3a240507 100644
--- a/compiler/src/prog8/ast/processing/AstChecker.kt
+++ b/compiler/src/prog8/ast/processing/AstChecker.kt
@@ -35,24 +35,6 @@ internal class AstChecker(private val program: Program,
                 if (startSub.parameters.isNotEmpty() || startSub.returntypes.isNotEmpty())
                     errors.err("program entrypoint subroutine can't have parameters and/or return values", startSub.position)
             }
-
-            // the main module cannot contain 'regular' statements (they will never be executed!)
-            for (statement in mainBlock.statements) {
-                val ok = when (statement) {
-                    is Block -> true
-                    is Directive -> true
-                    is Label -> true
-                    is VarDecl -> true
-                    is InlineAssembly -> true
-                    is INameScope -> true
-                    is NopStatement -> true
-                    else -> false
-                }
-                if (!ok) {
-                    errors.err("main block contains regular statements, this is not allowed (they'll never get executed). Use subroutines.", statement.position)
-                    break
-                }
-            }
         }
 
         // there can be an optional single 'irq' block with a 'irq' subroutine in it,
@@ -186,6 +168,23 @@ internal class AstChecker(private val program: Program,
             errors.err("block memory address must be valid integer 0..\$ffff", block.position)
         }
 
+        for (statement in block.statements) {
+            val ok = when (statement) {
+                is Block,
+                is Directive,
+                is Label,
+                is VarDecl,
+                is InlineAssembly,
+                is INameScope,
+                is NopStatement -> true
+                else -> false
+            }
+            if (!ok) {
+                errors.err("statement occurs in a block, where it will never be executed. Use it in a subroutine instead.", statement.position)
+                break
+            }
+        }
+
         super.visit(block)
     }
 
@@ -616,7 +615,7 @@ internal class AstChecker(private val program: Program,
                         err("memory address must be valid integer 0..\$ffff", decl.value?.position)
                     }
                 } else {
-                    err("value of memory mapped variable can only be a number, perhaps you meant to use an address pointer type instead?", decl.value?.position)
+                    err("value of memory mapped variable can only be a fixed number, perhaps you meant to use an address pointer type instead?", decl.value?.position)
                 }
             }
         }