From 01637768cf19aedf85882b0d9f53284299239037 Mon Sep 17 00:00:00 2001
From: ISSOtm <eldredhabert0@gmail.com>
Date: Sun, 11 Oct 2020 21:03:41 +0200
Subject: [PATCH] Rename `asmy` to more explicit `parser`

This should make the purpose of that file clearer to newcomers
---
 Makefile                     | 4 ++--
 include/asm/rpn.h            | 2 +-
 src/CMakeLists.txt           | 8 ++++----
 src/asm/.gitignore           | 4 ++--
 src/asm/lexer.c              | 2 +-
 src/asm/main.c               | 2 +-
 src/asm/{asmy.y => parser.y} | 0
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename src/asm/{asmy.y => parser.y} (100%)

diff --git a/Makefile b/Makefile
index 16581a7d..b80154d6 100644
--- a/Makefile
+++ b/Makefile
@@ -53,13 +53,13 @@ RM		:= rm -rf
 all: rgbasm rgblink rgbfix rgbgfx
 
 rgbasm_obj := \
-	src/asm/asmy.o \
 	src/asm/charmap.o \
 	src/asm/fstack.o \
 	src/asm/lexer.o \
 	src/asm/macro.o \
 	src/asm/main.o \
 	src/asm/math.o \
+	src/asm/parser.o \
 	src/asm/output.o \
 	src/asm/rpn.o \
 	src/asm/section.o \
@@ -72,7 +72,7 @@ rgbasm_obj := \
 	src/hashmap.o \
 	src/linkdefs.o
 
-src/asm/lexer.o src/asm/main.o: src/asm/asmy.h
+src/asm/lexer.o src/asm/main.o: src/asm/parser.h
 
 rgblink_obj := \
 	src/link/assign.o \
diff --git a/include/asm/rpn.h b/include/asm/rpn.h
index 41127652..b525125f 100644
--- a/include/asm/rpn.h
+++ b/include/asm/rpn.h
@@ -27,7 +27,7 @@ struct Expression {
 	uint32_t nRPNPatchSize; // Size the expression will take in the obj file
 };
 
-/* FIXME: Should be defined in `asmy.h`, but impossible with POSIX Yacc */
+/* FIXME: Should be defined in `parser.h`, but impossible with POSIX Yacc */
 extern int32_t nPCOffset;
 
 /*
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63f155df..5a891c53 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,13 +22,13 @@ else()
   pkg_check_modules(LIBPNG REQUIRED libpng)
 endif()
 
-BISON_TARGET(ASMy "asm/asmy.y"
-             "${PROJECT_SOURCE_DIR}/src/asm/asmy.c"
-             DEFINES_FILE "${PROJECT_SOURCE_DIR}/src/asm/asmy.h"
+BISON_TARGET(PARSER "asm/parser.y"
+             "${PROJECT_SOURCE_DIR}/src/asm/parser.c"
+             DEFINES_FILE "${PROJECT_SOURCE_DIR}/src/asm/parser.h"
              )
 
 set(rgbasm_src
-    "${BISON_ASMy_OUTPUT_SOURCE}"
+    "${BISON_PARSER_OUTPUT_SOURCE}"
     "asm/charmap.c"
     "asm/fstack.c"
     "asm/lexer.c"
diff --git a/src/asm/.gitignore b/src/asm/.gitignore
index 9d9e3ce6..b73e7fb4 100644
--- a/src/asm/.gitignore
+++ b/src/asm/.gitignore
@@ -1,2 +1,2 @@
-asmy.c
-asmy.h
+/parser.c
+/parser.h
diff --git a/src/asm/lexer.c b/src/asm/lexer.c
index d6834d41..36c575c7 100644
--- a/src/asm/lexer.c
+++ b/src/asm/lexer.c
@@ -36,7 +36,7 @@
 #include "asm/util.h"
 #include "asm/warning.h"
 /* Include this last so it gets all type & constant definitions */
-#include "asmy.h" /* For token definitions, generated from asmy.y */
+#include "parser.h" /* For token definitions, generated from parser.y */
 
 #ifdef LEXER_DEBUG
   #define dbgPrint(...) fprintf(stderr, "[lexer] " __VA_ARGS__)
diff --git a/src/asm/main.c b/src/asm/main.c
index c57b7fba..8620f474 100644
--- a/src/asm/main.c
+++ b/src/asm/main.c
@@ -26,7 +26,7 @@
 #include "asm/rpn.h"
 #include "asm/symbol.h"
 #include "asm/warning.h"
-#include "asmy.h"
+#include "parser.h"
 
 #include "extern/err.h"
 #include "extern/getopt.h"
diff --git a/src/asm/asmy.y b/src/asm/parser.y
similarity index 100%
rename from src/asm/asmy.y
rename to src/asm/parser.y