search

stardot / beebasm

A portable 6502 assembler with BBC Micro style syntax
http://www.retrosoftware.co.uk/wiki/index.php/BeebAsm
GNU General Public License v3.0
83 stars 26 forks source link

Insist on a space #81

Closed Homo-carbonis closed 1 year ago

Homo-carbonis commented 1 year ago

I changed the if statement which rejects letters and underscores after instruction mnemonics to just reject anything which isn't a space which resolves my macro issue, though possibly breaks someone else's code.

I also changed the deprecated ifstream::streampos type so it compiles without warnings.

ZornsLemma commented 1 year ago

Thanks, this looks good to me. I've given it a quick manual test and it seems to work. I'm not sure exactly what was supposed to be happening with ifstream::streampos - there was quite a lot of discussion about this at one point - but FWIW this code builds fine for me on Ubuntu 20.04.5 LTS with gcc 9.4.0.

mungre commented 1 year ago

Thanks for the fix.

The latest version of beebasm is in the proposed-updates branch. This includes a fix for the streampos thing which, unfortunately, clashes with your fix. Would you mind rebasing this pr on the proposed-updates branch?

In the very near future, when v1.10 is released, we are moving development to the master branch to avoid this confusion.