Fix several issues with project assembly

Version 2.0.0 RC1

Author: PaperFanz

.gitignore

@@ -1,7 +1,7 @@
 # ignore build artifacts
 *.o
 laser
-laser.exe
+laser-*
 
 # ignore test files
 *.txt

README.md

@@ -8,20 +8,33 @@ and LC3Edit through new pseudoops, along with a project assembly mode.
 
 ## Installing
 
-For now, the only way to get Laser is to build from source. See 
+Under the releases tab, there are pre-compiled binaries for Windows, Mac, and 
+Linux. In addition, it is highly recommended that you use this program with an 
+extensible editor like VSCode or Notepad++, and to add Laser as a shortcut in 
+your editor. If all this installation stuff is not up your alley or you'd like 
+to learn more about how Laser was created, take a loot at 
 [BUILDING.md](BUILDING.md) for instructions on how to build Laser from source.
 
-### Linux
+### Linux/Mac OS X
 
-Coming soon!
+Once you've downloaded the precompiled binary (building from source is actually 
+recommended on Linux due to all the different distrubutions and their 
+differences, but Laser has practically 0 dependencies so it should be fine), 
+copy the file to either `/usr/bin` or `/usr/local/bin` and make it executable. 
+Alternatively, put it wherever and add it to your PATH environment variable.
 
 ### Windows
 
-Coming soon!
+Download the `laser-x-x-x.exe` from the releases tab and place it somewhere 
+permanent (I.E. not your Downloads folder), and add it to your Windows PATH.
 
-### Mac OSX
-
-Coming soon!
+To add the program to your PATH, open the file explorer, right click on This PC,
+and select 'properties'. Then, click on 'advanced system settings' and click on 
+the 'environment variables' button. In the window that pops up, highlight the 
+'Path' variable and select 'edit'. From there, click 'new' and input the file 
+path of where you placed the downloaded laser executable. Afterwards, click 
+'ok' and then 'apply'. You should then be able to invoke laser from the command 
+line.
 
 ## Usage
 
@@ -31,4 +44,25 @@ See [USAGE.md](USAGE.md)
 
 see [BUILDING.md](BUILDING.md)
 
-## Copyright
+## Copyright
+
+Laser- a command line utility to assemble LC3 assembly code
+
+Copyright Notice:
+
+    Copyright 2018, 2019 Zhiyuan Fan
+
+License Notice:
+
+    Laser is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Laser is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Laser.  If not, see <https://www.gnu.org/licenses/>.

USAGE.md

@@ -1,7 +1,8 @@
 # Laser Usage Guide
 
-After installing Laser on your system, invoke Laser by opening a terminal and 
-typing in 'laser' and hit enter. This will print an 'About' message. Typing in 
+After installing Laser on your system using the instructions on the 
+[README.md](README.md), invoke Laser by opening a terminal and typing in 
+'laser' and hit enter. This will print an 'About' message. Typing in 
 'laser -h' will display the following help message:
 
 ```
@@ -15,4 +16,55 @@ Usage:
     -p: 'laser -p <file1> <file2>' assembles the specified files as a project
         'laser -p *.asm' assembles all files in current directory as a project
     -c: 'laser -c <file>' removes all files generated during assembly
-```
+```
+---
+## Editors
+
+It is a very good idea to find a code editor that you enjoy using- it will make 
+you much more efficient and may even lessen the pain of editing. Below are some 
+recommended editors along with instructions on how to set them up.
+
+### VS Code
+
+This is my current recommendation; it is what I used to develop Laser and it is 
+what I will be using for the forseeable future. It's a competent text editor, 
+but it stands out in its extensibility and hackability. I have written and 
+published an LC3 Extension that should be all you need to get up and running, 
+including syntax highlighting, tab completion, snippets, and build tasks.
+
+You can download VS Code [here](https://code.visualstudio.com/) and my LC3 
+Extension [here](https://marketplace.visualstudio.com/items?itemName=PaperFanz.lc3-assembly). 
+Both are available for free on Windows, Linux, and Mac OS.
+
+### Notepad++
+
+*TODO, contributions appreciated*
+
+<!-- Notepad++ is another very good editor, and is a huge improvement over the 
+default Notepad in Windows. However, the downside is that it is only available 
+for the Windows operating system and requires a bit of configuration to get to 
+the level of productivity that VS Code affords. However, this is the editor 
+that Professor Yeraballi uses, and he has syntax highlighting packs and build 
+tasks available to copy and use for free. -->
+
+Notepad++ can be found for free [here](https://notepad-plus-plus.org/).
+
+### Atom
+
+Atom is very similar to VS Code, and is built on the same underlying 
+technologies. However, at this time there is no extension pack for the LC3 as 
+there is on VS Code, so you will have to manually set things up if you prefer 
+Atom. If you really love Atom, you can consider authoring your own extension 
+pack.
+
+Atom can be found for free [here](https://atom.io/) for Windows, Linux, and Mac 
+OS.
+
+### Sublime Text
+
+Sublime Text is also very similar to VS Code, but like Atom lacks an LC3 
+extension. Much like Atom, there are extensive APIs for you to author your own 
+extension if you so wish.
+
+Sublime Text is avalable on Windows, Linux, and Mac OS for free on their 
+[website](https://www.sublimetext.com/).

src/Makefile

@@ -4,7 +4,7 @@ IDIR = ../include
 ODIR = obj
 
 CC = gcc
-CFLAGS = -I $(IDIR) -g
+CFLAGS = -I $(IDIR)
 
 _DEPS = laser.h token.h
 DEPS = $(patsubst %, $(IDIR)/%,$(_DEPS))

src/alias.c

@@ -75,4 +75,4 @@ void freealiasarr (aliasarr_t *a)
 
     free (a->arr);
     free (a);
-}
+}

src/assemble.c

@@ -226,7 +226,9 @@ uint8_t passone (uint32_t ln, uint16_t *addr, TokenBuffer *buf, arrs_t *arrs)
         }
     }
 
-    if (opcount > opnum) {
+    if (opnum == -1) {
+        
+    } else if (opcount > opnum) {
         warning (ln, "'%s' expects %d operands", tok, opnum);
     } else if (opcount < opnum) {
         error (ln,	"'%s' expects %d operands", tok, opnum);
@@ -521,7 +523,7 @@ uint8_t passtwo (uint32_t tbufind, uint16_t *addr, arrs_t *arrs)
         }
 
     } else {
-        error (ln, "Unrecognized token '%s'", token[0]);
+        error (ln, "Unrecognized token '%s'", token[0]->str);
     }
 
     if (end) return 1;

src/offset.c

@@ -54,7 +54,8 @@ int16_t hextodec (char hex[])
 int16_t hexoffset (char *offset)
 {
     int16_t offval = 0;
-    char *hex = strchr (offset, 'x');
+    char *hex = strchr (offset, 'x');       // for normal people who use 0x00
+    if (!hex) hex = strchr (offset, 'X');   // for the heathens that use 0X00
     hex++;
     if (hex[0] == '-') {
         hex++;
@@ -95,7 +96,9 @@ int16_t binoffset (char *offset)
     int8_t neg = 0;
     int16_t offval = 0;
     // move pointer past leading characters
-    char *bin = strchr (offset, 'b');
+    char *bin = strchr (offset, 'b');       // for normal people who use 0b00
+    if (!bin) bin = strchr (offset, 'B');   // for the heathens that use 0B00
+
     bin++;
     if (bin[0] == '-') {
         bin++;
@@ -157,14 +160,14 @@ uint8_t offtype (Token *tok)
     char *token = tok->str;
     char *tmp;
     char c;
-    if ((tmp = strchr (token, 'x')) != NULL) {
+    if ((tmp = strchr (token, 'x')) || (tmp = strchr (token, 'X'))) {
         tmp++;
         if (*tmp == '-') tmp++;
         for (uint16_t i = 0; (c = tmp[i]); i++) {
             if (!isxdigit (c)) return INVALID_OFF;
         }
         return HEX;
-    } else if ((tmp = strchr (token, 'b')) != NULL) {
+    } else if ((tmp = strchr (token, 'b')) || (tmp = strchr (token, 'B'))) {
         tmp++;
         if (*tmp == '-') tmp++;
         for (uint16_t i = 0; (c = tmp[i]); i++) {

src/operand.c

@@ -33,6 +33,16 @@ int8_t arrcmp (char *str, const char *arr[][2], uint8_t size)
     return -1;
 }
 
+int8_t brrcmp (char *str, const char *arr[][3], uint8_t size)
+{
+    for (uint8_t i = 0; i < size; i++) {
+        if (strcmp (str, arr[i][0]) == 0 ||
+            strcmp (str, arr[i][1]) == 0 ||
+            strcmp (str, arr[i][2]) == 0) return i;
+    }
+    return -1;
+}
+
 int8_t isregister (Token *token)
 {
     const char *regs[][2] = {
@@ -51,18 +61,18 @@ int8_t isregister (Token *token)
 
 int8_t isbranch (Token *token)
 {
-    const char *brs[][2] = {
-        {"BR", "br"},
-        {"BRp", "brp"},
-        {"BRz", "brz"},
-        {"BRzp", "brzp"},
-        {"BRn", "brn"},
-        {"BRnp", "brnp"},
-        {"BRnz", "brnz"},
-        {"BRnzp", "brnzp"}
+    const char *brs[][3] = {
+        {"BR", "BR", "br"},
+        {"BRP", "BRp", "brp"},
+        {"BRZ", "BRz", "brz"},
+        {"BRZP", "BRzp", "brzp"},
+        {"BRN", "BRn", "brn"},
+        {"BRNP", "BRnp", "brnp"},
+        {"BRNZ", "BRnz", "brnz"},
+        {"BRNZP", "BRnzp", "brnzp"}
     };
 
-    int8_t tmp = arrcmp (token->str, brs, 8);
+    int8_t tmp = brrcmp (token->str, brs, 8);
     tmp = (tmp == 0) ? 7 : tmp;
     return tmp;
 }

src/token.c

@@ -79,9 +79,9 @@ Token* putstr (char *line, uint16_t *lineptr)
 int8_t iseow (char c)
 {
     int8_t eow = 0;
-    const char eowchars[] = {0, 32, 44, 9, 10, 13};
+    const char eowchars[] = {0, 13, '\t', '\n', ' ', ',', ';'};
 
-    for (uint8_t i = 0; i < 6; i++) {
+    for (uint8_t i = 0; i < 7; i++) {
         if (c == eowchars[i]) eow++;
     }