fixed nesasm3 error parsing; started github republish

This commit is contained in:
Steven Hugg 2019-08-26 17:39:14 -04:00
parent 95b5e797bc
commit 80c02a98d5
4 changed files with 8 additions and 6 deletions

View File

@ -161,6 +161,7 @@ TODO:
- support projects with subdirectories, file list? - support projects with subdirectories, file list?
- switching platform of a repo? - switching platform of a repo?
- make sure to flatten subdirs - make sure to flatten subdirs
- re-publish repo (bug: doesn't put all files in local repo after publishing)
- astrocade - astrocade
- keyboard shortcuts - keyboard shortcuts
- ctrl+alt+l on ubuntu locks screen - ctrl+alt+l on ubuntu locks screen

View File

@ -147,9 +147,10 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
<a tabindex="-1" href="#">Game Consoles</a> <a tabindex="-1" href="#">Game Consoles</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a class="dropdown-item" href="?platform=vcs">Atari 2600</a></li> <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=astrocade">Bally Astrocade</a></li>
<li><a class="dropdown-item" href="?platform=coleco">ColecoVision</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-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=sms-sms-libcv">Sega Master System</a></li>
<li><a class="dropdown-item" href="?platform=atari7800">Atari 7800</a></li> <li><a class="dropdown-item" href="?platform=atari7800">Atari 7800</a></li>

View File

@ -509,8 +509,8 @@ function _importProjectFromGithub(e) {
function _publishProjectToGithub(e) { function _publishProjectToGithub(e) {
if (repo_id) { if (repo_id) {
alertError("This project (" + current_project.mainPath + ") is already bound to a Github repository. Choose 'Push Changes' to update."); 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; return;
} }
var modal = $("#publishGithubModal"); var modal = $("#publishGithubModal");
var btn = $("#publishGithubButton"); var btn = $("#publishGithubButton");

View File

@ -2055,10 +2055,10 @@ function assembleXASM6809(step:BuildStep) {
// http://www.nespowerpak.com/nesasm/ // http://www.nespowerpak.com/nesasm/
function assembleNESASM(step:BuildStep) { function assembleNESASM(step:BuildStep) {
loadNative("nesasm"); 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_insn = /\s+(\d+)\s+([0-9A-F]+):([0-9A-F]+)/;
var re_error = /\s+(.+)/; var re_error = /\s+(.+)/;
var errors = []; var errors : WorkerError[] = [];
var state = 0; var state = 0;
var lineno = 0; var lineno = 0;
var filename; var filename;
@ -2079,7 +2079,7 @@ function assembleNESASM(step:BuildStep) {
case 1: case 1:
m = re_error.exec(s); m = re_error.exec(s);
if (m) { if (m) {
errors.push({line:lineno, msg:m[1]}); errors.push({path:filename, line:lineno, msg:m[1]});
state = 0; state = 0;
} }
break; break;