Fix for #976 to Ignore Unused Stock Variables

compiler/semantics.cpp

@@ -2307,6 +2307,18 @@ bool Semantics::CheckExprStmt(ExprStmt* stmt) {
     return true;
 }
 
+bool Semantics::IsIncluded(Decl* sym) {
+    const auto fileno = cc().sources()->GetSourceFileIndex(sym->pos());
+    if (fileno >= cc().sources()->opened_files().size()) { return false; }
+
+    return ! cc().sources()->opened_files()[fileno]->is_main_file();
+}
+
+template <typename DeclType>
+bool Semantics::IsIncludedStock(DeclType* sym) {
+    return sym->is_stock() && IsIncluded(sym);
+}
+
 /*  testsymbols - test for unused local or global variables
  *
  *  "Public" functions are excluded from the check, since these
@@ -2355,9 +2367,14 @@ bool Semantics::TestSymbol(Decl* sym, bool testconst) {
         default: {
             auto var = sym->as<VarDeclBase>();
             /* a variable */
-            if (!var->is_used() && !var->is_public()) {
-                report(sym, 203) << sym->name(); /* symbol isn't used (and not public) */
-            } else if (!var->is_public() && !var->is_read()) {
+
+            // We ignore variables that are marked as public or stock that was included.
+            if (var->is_public() || IsIncludedStock(var))
+                break;
+
+            if (!var->is_used()) {
+                report(sym, 203) << sym->name(); /* symbol isn't used (and not public/stock) */
+            } else if (!var->is_read()) {
                 report(sym, 204) << sym->name(); /* value assigned to symbol is never used */
             }
         }

compiler/semantics.h

@@ -251,6 +251,11 @@ class Semantics final
 
     bool CheckScalarType(Expr* expr);
 
+    bool IsIncluded(Decl* expr);
+
+    template <typename DeclType>
+    bool IsIncludedStock(DeclType* expr);
+
   private:
     CompileContext& cc_;
     TypeManager* types_ = nullptr;

tests/compile-only/fail-stock-array-unused.sp

@@ -0,0 +1,9 @@
+// warnings_are_errors: true
+
+stock const char messages[2][] =
+{
+    "first",
+    "second"
+};
+
+public void main() {}

tests/compile-only/fail-stock-array-unused.txt

@@ -0,0 +1 @@
+(3) : error 203: symbol is never used: "messages"

tests/compile-only/fail-stock-var-unused.sp

@@ -0,0 +1,5 @@
+// warnings_are_errors: true
+
+stock const int X = 1;
+
+public void main() {}

tests/compile-only/fail-stock-var-unused.txt

@@ -0,0 +1 @@
+(3) : error 204: symbol is assigned a value that is never used: "X"

tests/compile-only/ok-included-stock-array-unused.inc

@@ -0,0 +1,5 @@
+stock const char messages[2][] =
+{
+    "first",
+    "second"
+};

tests/compile-only/ok-included-stock-array-unused.sp

@@ -0,0 +1,5 @@
+// warnings_are_errors: true
+
+#include "ok-included-stock-array-unused.inc"
+
+public void main() {}

tests/compile-only/ok-included-stock-var-unused.inc

@@ -0,0 +1 @@
+stock const int X = 1;

tests/compile-only/ok-included-stock-var-unused.sp

@@ -0,0 +1,5 @@
+// warnings_are_errors: true
+
+#include "ok-included-stock-var-unused.inc"
+
+public void main() {}