From 80c02a98d567ad90e4efc25c8f0f202a3030584b Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Mon, 26 Aug 2019 17:39:14 -0400
Subject: [PATCH] fixed nesasm3 error parsing; started github republish

---
 doc/notes.txt            | 1 +
 index.html               | 3 ++-
 src/ui.ts                | 4 ++--
 src/worker/workermain.ts | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/notes.txt b/doc/notes.txt
index 7c67e3a7..7d6aebcd 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -161,6 +161,7 @@ TODO:
   - support projects with subdirectories, file list?
   - switching platform of a repo?
   - make sure to flatten subdirs
+  - re-publish repo (bug: doesn't put all files in local repo after publishing)
 - astrocade
 - keyboard shortcuts
   - ctrl+alt+l on ubuntu locks screen
diff --git a/index.html b/index.html
index d4505efa..2dca1a45 100644
--- a/index.html
+++ b/index.html
@@ -147,9 +147,10 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
              <a tabindex="-1" href="#">Game Consoles</a>
              <ul class="dropdown-menu">
                <li><a class="dropdown-item" href="?platform=vcs">Atari 2600</a></li>
+               <li><a class="dropdown-item" href="?platform=nes">NES</a></li>
+               <hr>
                <li><a class="dropdown-item" href="?platform=astrocade">Bally Astrocade</a></li>
                <li><a class="dropdown-item" href="?platform=coleco">ColecoVision</a></li>
-               <li><a class="dropdown-item" href="?platform=nes">NES</a></li>
                <li><a class="dropdown-item" href="?platform=sms-sg1000-libcv">Sega SG-1000</a></li>
                <li><a class="dropdown-item" href="?platform=sms-sms-libcv">Sega Master System</a></li>
                <li><a class="dropdown-item" href="?platform=atari7800">Atari 7800</a></li>
diff --git a/src/ui.ts b/src/ui.ts
index 1d01d26d..bd6cc5ca 100644
--- a/src/ui.ts
+++ b/src/ui.ts
@@ -509,8 +509,8 @@ function _importProjectFromGithub(e) {
 
 function _publishProjectToGithub(e) {
   if (repo_id) {
-    alertError("This project (" + current_project.mainPath + ") is already bound to a Github repository. Choose 'Push Changes' to update.");
-    return;
+    if (!confirm("This project (" + current_project.mainPath + ") is already bound to a Github repository. Do you want to re-publish to a new repository? (You can instead choose 'Push Changes' to update files in the existing repository.)"))
+      return;
   }
   var modal = $("#publishGithubModal");
   var btn = $("#publishGithubButton");
diff --git a/src/worker/workermain.ts b/src/worker/workermain.ts
index 29938bdb..ad9433c4 100644
--- a/src/worker/workermain.ts
+++ b/src/worker/workermain.ts
@@ -2055,10 +2055,10 @@ function assembleXASM6809(step:BuildStep) {
 // http://www.nespowerpak.com/nesasm/
 function assembleNESASM(step:BuildStep) {
   loadNative("nesasm");
-  var re_filename = /[#](\d+)\s+(\S+)/;
+  var re_filename = /\#\[(\d+)\]\s+(\S+)/;
   var re_insn     = /\s+(\d+)\s+([0-9A-F]+):([0-9A-F]+)/;
   var re_error    = /\s+(.+)/;
-  var errors = [];
+  var errors : WorkerError[] = [];
   var state = 0;
   var lineno = 0;
   var filename;
@@ -2079,7 +2079,7 @@ function assembleNESASM(step:BuildStep) {
       case 1:
         m = re_error.exec(s);
         if (m) {
-          errors.push({line:lineno, msg:m[1]});
+          errors.push({path:filename, line:lineno, msg:m[1]});
           state = 0;
         }
         break;