From c65b89daf36f4023c6e740ed9a4f224b7467a234 Mon Sep 17 00:00:00 2001
From: David Brown <dave.github@brownsmeet.com>
Date: Thu, 1 Dec 2016 18:39:02 +0000
Subject: [PATCH] Update confidence tests for arg handling move. Remove unused
 vars in Platform.

---
 src/runtime/Platformunix.Mod          | 4 ----
 src/runtime/Platformwindows.Mod       | 2 --
 src/test/confidence/lola/lola.Mod     | 4 ++--
 src/test/confidence/signal/signal.mod | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/runtime/Platformunix.Mod b/src/runtime/Platformunix.Mod
index 79ae5e7f..ff03a960 100644
--- a/src/runtime/Platformunix.Mod
+++ b/src/runtime/Platformunix.Mod
@@ -22,9 +22,6 @@ VAR
   LittleEndian-:   BOOLEAN;
   PID-:            INTEGER;    (* Note: Must be updated by Fork implementation *)
   CWD-:            ARRAY 256 OF CHAR;
-  ArgCount-:       INTEGER;
-
-  ArgVector-:      SYSTEM.ADDRESS;
   TimeStart:       LONGINT;
 
   SeekSet-:        INTEGER;
@@ -426,7 +423,6 @@ PROCEDURE -getpid(): INTEGER   "(INTEGER)getpid()";
 BEGIN
   TestLittleEndian;
 
-  HaltHandler := NIL;
   TimeStart   := 0;   TimeStart := Time();
   PID         := getpid();
   IF getcwd(CWD) = NIL THEN CWD := "" END;
diff --git a/src/runtime/Platformwindows.Mod b/src/runtime/Platformwindows.Mod
index 44337f22..4087c75b 100644
--- a/src/runtime/Platformwindows.Mod
+++ b/src/runtime/Platformwindows.Mod
@@ -35,8 +35,6 @@ VAR
   StdOut-:          FileHandle;
   StdErr-:          FileHandle;
 
-  InterruptHandler: SignalHandler;
-
   NL-:              ARRAY 3 OF CHAR;  (* Platform specific newline representation *)
 
 
diff --git a/src/test/confidence/lola/lola.Mod b/src/test/confidence/lola/lola.Mod
index eccebbfd..8f7faaa3 100644
--- a/src/test/confidence/lola/lola.Mod
+++ b/src/test/confidence/lola/lola.Mod
@@ -1,7 +1,7 @@
 MODULE Lola; (* Command line runner for Lola to verilog compilation *)
-  IMPORT LSB, LSC, LSV, Platform, Console;
+  IMPORT LSB, LSC, LSV, Modules, Console;
 BEGIN
-  IF Platform.ArgCount < 3 THEN
+  IF Modules.ArgCount < 3 THEN
     Console.String("Lola - compile lola source to verilog source."); Console.Ln; Console.Ln;
     Console.String("usage:"); Console.Ln; Console.Ln;
     Console.String("  lola lola-source-file verilog-source-file"); Console.Ln; Console.Ln;
diff --git a/src/test/confidence/signal/signal.mod b/src/test/confidence/signal/signal.mod
index 3a897392..294345f2 100644
--- a/src/test/confidence/signal/signal.mod
+++ b/src/test/confidence/signal/signal.mod
@@ -1,6 +1,6 @@
 (* Test that interrupt and quit are handled correctly. *)
 MODULE SignalTest;
-IMPORT Console, Platform, Files, SYSTEM;
+IMPORT Console, Platform, Modules, Files, SYSTEM;
 
 VAR result: Files.File; rider: Files.Rider;
 
@@ -42,7 +42,7 @@ END Take5;
 BEGIN
   result := Files.New("result");
   Files.Set(rider, result, 0);
-  IF Platform.ArgCount > 1 THEN
+  IF Modules.ArgCount > 1 THEN
     Platform.SetInterruptHandler(handle);
     Platform.SetQuitHandler(handle)
   END;