From e284bebbfbdbf5a85c28157221d83aa7cfa7f233 Mon Sep 17 00:00:00 2001 From: Curtis F Kaylor Date: Sun, 23 Feb 2020 14:27:04 -0500 Subject: [PATCH] Moved macro TF() and added macro NOT() --- src/common.h | 5 ++++- src/parse.h | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common.h b/src/common.h index 4e7cdaf..a6a46e9 100644 --- a/src/common.h +++ b/src/common.h @@ -37,9 +37,12 @@ #define ASMFMT "%-7s %-3s %-12s %s\n" //Assembly Language Line printf Format -/* Internal defines */ +/* Internal Constants and Macros */ #define TRUE -1 #define FALSE 0 +#define NOT(exp) (exp) == 0 +#define TF(x) (x) ? TRUE : FALSE; + void prtpos(); //Print current file name and position #define DEBUG(fmt, val) {if (debug) {prtpos(); printf(fmt, val);}} diff --git a/src/parse.h b/src/parse.h index 8c3b36e..1733031 100644 --- a/src/parse.h +++ b/src/parse.h @@ -2,8 +2,6 @@ * C02 Input File Parsing Routines * *************************************/ -#define TF(x) (x) ? TRUE : FALSE; - enum stypes {LITERAL, VARIABLE, REGISTER, ARRAY, STRUCTURE, FUNCTION, ADDRESS, INTEGER}; //Symbol Types enum etypes {ETDEF, ETMAC}; //Definition Types @@ -55,7 +53,7 @@ int prsbyt(); //Parse Numeric Byte void prslit(); //Parse Literal int prsnum(int maxval); //Parse Numeric void prsopr(); //Parse Arithmetic Operator -int prspst(char trmntr, int isint, char* name, char* index, char indtyp, char ispntr); //Parse Post Operator +int prspst(char oper, char trmntr, int isint, char* name, char* index, char indtyp, char ispntr); //Parse Post Operator int psizof(void); //Parse SizeOf Operator int pidxof(void); //Parse SizeOf Operator void skpchr(); //Skip Next Character