From 2963f116ce49d2ee7e508fd450ff61ea5cc15d9f Mon Sep 17 00:00:00 2001
From: Will Scullin <scullin@scullinsteel.com>
Date: Tue, 26 Mar 2019 21:12:05 -0700
Subject: [PATCH] Fix build, clean up lint comments.

---
 js/base64.js              | 2 --
 js/intbasic/decompiler.js | 2 --
 js/roms/6502test.js       | 4 ++--
 js/roms/65C02test.js      | 3 +--
 js/roms/apple2_char.js    | 2 --
 js/roms/apple2e.js        | 2 --
 js/roms/apple2enh.js      | 2 --
 js/roms/apple2enh_char.js | 2 --
 js/roms/apple2j.js        | 2 --
 js/roms/apple2j_char.js   | 2 --
 js/roms/apple2lc_char.js  | 2 --
 js/roms/pigfont_char.js   | 2 --
 js/roms/rmfont_char.js    | 2 --
 js/symbols.js             | 2 --
 webpack.config.js         | 3 +--
 15 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/js/base64.js b/js/base64.js
index 0bae274..f40cf2e 100644
--- a/js/base64.js
+++ b/js/base64.js
@@ -1,5 +1,3 @@
-/*exported base64_encode, base64_decode */
-
 export function base64_encode (data) {
     // Twacked by Will Scullin to handle arrays of "bytes"
 
diff --git a/js/intbasic/decompiler.js b/js/intbasic/decompiler.js
index 9ad1c83..ccbb188 100644
--- a/js/intbasic/decompiler.js
+++ b/js/intbasic/decompiler.js
@@ -1,5 +1,3 @@
-/*exported IntBasicDump */
-
 export default function IntBasicDump(mem)
 {
     var _mem = mem;
diff --git a/js/roms/6502test.js b/js/roms/6502test.js
index d0aca21..11686a6 100644
--- a/js/roms/6502test.js
+++ b/js/roms/6502test.js
@@ -1,6 +1,6 @@
 // From https://github.com/Klaus2m5/6502_65C02_functional_tests
-/*exported Test6502 */
-/*global toHex */
+
+import { toHex } from '../util';
 
 var LOG = false;
 
diff --git a/js/roms/65C02test.js b/js/roms/65C02test.js
index 483f8de..f4eba0f 100644
--- a/js/roms/65C02test.js
+++ b/js/roms/65C02test.js
@@ -1,7 +1,6 @@
 // From https://github.com/Klaus2m5/6502_65C02_functional_tests
 
-/*exported Test65C02 */
-/*global toHex */
+import { toHex } from '../util';
 
 var LOG = false;
 
diff --git a/js/roms/apple2_char.js b/js/roms/apple2_char.js
index b3d51be..32a4c8f 100644
--- a/js/roms/apple2_char.js
+++ b/js/roms/apple2_char.js
@@ -1,5 +1,3 @@
-/*exported apple2_charset */
-
 var apple2_charset = [
     0x00,0x1c,0x22,0x2a,0x2e,0x2c,0x20,0x1e,
     0x00,0x08,0x14,0x22,0x22,0x3e,0x22,0x22,
diff --git a/js/roms/apple2e.js b/js/roms/apple2e.js
index 62d9712..404faec 100644
--- a/js/roms/apple2e.js
+++ b/js/roms/apple2e.js
@@ -1,5 +1,3 @@
-/*exported Apple2eROM*/
-
 export default function Apple2eROM()
 {
     var rom = [
diff --git a/js/roms/apple2enh.js b/js/roms/apple2enh.js
index 15272f6..4002e80 100644
--- a/js/roms/apple2enh.js
+++ b/js/roms/apple2enh.js
@@ -1,5 +1,3 @@
-/*exported Apple2eEnhancedROM */
-
 export default function Apple2eEnhancedROM()
 {
     var rom = [
diff --git a/js/roms/apple2enh_char.js b/js/roms/apple2enh_char.js
index d21f258..7be009d 100644
--- a/js/roms/apple2enh_char.js
+++ b/js/roms/apple2enh_char.js
@@ -1,5 +1,3 @@
-/* exported apple2enh_charset */
-
 var apple2enh_charset = [
     0x1c,0x22,0x2a,0x3a,0x1a,0x02,0x3c,0x00,
     0x08,0x14,0x22,0x22,0x3e,0x22,0x22,0x00,
diff --git a/js/roms/apple2j.js b/js/roms/apple2j.js
index 135741f..c12b32f 100644
--- a/js/roms/apple2j.js
+++ b/js/roms/apple2j.js
@@ -1,5 +1,3 @@
-/*exported Apple2jROM */
-
 export default function Apple2jROM()
 {
     var rom = [
diff --git a/js/roms/apple2j_char.js b/js/roms/apple2j_char.js
index 0fdd08c..1bd2170 100644
--- a/js/roms/apple2j_char.js
+++ b/js/roms/apple2j_char.js
@@ -1,5 +1,3 @@
-/* exported apple2j_charset */
-
 var apple2j_charset = [
     0xff,0xef,0xe1,0xed,0xd5,0xfb,0xf7,0xef,
     0xff,0xfb,0xc7,0xf7,0xc1,0xf7,0xf7,0xef,
diff --git a/js/roms/apple2lc_char.js b/js/roms/apple2lc_char.js
index fac4f53..4e831aa 100644
--- a/js/roms/apple2lc_char.js
+++ b/js/roms/apple2lc_char.js
@@ -1,5 +1,3 @@
-/*exported apple2lc_charset */
-
 var apple2lc_charset = [
     0x1c,0x22,0x2a,0x2a,0x2c,0x20,0x1e,0x00,
     0x08,0x14,0x22,0x22,0x3e,0x22,0x22,0x00,
diff --git a/js/roms/pigfont_char.js b/js/roms/pigfont_char.js
index 9011df1..ab92b74 100644
--- a/js/roms/pigfont_char.js
+++ b/js/roms/pigfont_char.js
@@ -1,5 +1,3 @@
-/*exported pigfont_charset */
-
 var pigfont_charset = [
     0x00,0x1c,0x22,0x2a,0x2e,0x20,0x1e,0x00,
     0x0c,0x12,0x21,0x3f,0x21,0x21,0x00,0x00,
diff --git a/js/roms/rmfont_char.js b/js/roms/rmfont_char.js
index 6d1e8ed..b4aeb5e 100644
--- a/js/roms/rmfont_char.js
+++ b/js/roms/rmfont_char.js
@@ -1,5 +1,3 @@
-/*exported rmfont_charset */
-
 var rmfont_charset = [
     0x3c,0x42,0x59,0x55,0x55,0x39,0x02,0x3c,
     0x08,0x14,0x22,0x22,0x3e,0x22,0x22,0x00,
diff --git a/js/symbols.js b/js/symbols.js
index 4ec50f1..e54f589 100644
--- a/js/symbols.js
+++ b/js/symbols.js
@@ -1,5 +1,3 @@
-/*exported SYMBOLS */
-
 var SYMBOLS = {
 /*
     0x00: 'GOWARM',
diff --git a/webpack.config.js b/webpack.config.js
index 0f1c4a8..6733481 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,8 +6,7 @@ module.exports =
     devtool: 'source-map',
     entry: {
         main2: path.resolve('js/main2.js'),
-        main2e: path.resolve('js/main2e.js'),
-        test: path.resolve('js/test.js')
+        main2e: path.resolve('js/main2e.js')
     },
     output: {
         path: path.resolve('dist/')