Merge pull request #160 from Movax12/definedinstr

.DEFINEDINSTR

src/ca65/expr.c

@@ -62,6 +62,7 @@
 #include "symtab.h"
 #include "toklist.h"
 #include "ulabel.h"
+#include "macro.h"
 
 
 
@@ -417,6 +418,34 @@ static ExprNode* FuncDefined (void)
 
 
 
+static ExprNode* FuncIsMnemonic (void)
+/* Handle the .ISMNEMONIC, .ISMNEM builtin function */
+{
+    int Instr = -1;
+
+    /* Check for a macro or an instruction depending on UbiquitousIdents */
+
+    if (CurTok.Tok == TOK_IDENT) {
+        if (UbiquitousIdents) {
+            /* Macros CAN be instructions, so check for them first */
+            if (FindMacro (&CurTok.SVal) == 0) {
+                Instr = FindInstruction (&CurTok.SVal);
+            }
+        } else {
+            /* Macros and symbols may NOT use the names of instructions, so just check for the instruction */
+            Instr = FindInstruction (&CurTok.SVal);
+        }
+    } else {
+        Error ("Identifier expected.");
+    }
+    /* Skip the name */
+    NextTok ();
+
+    return GenLiteralExpr (Instr > 0);
+}
+
+
+
 ExprNode* FuncHiByte (void)
 /* Handle the .HIBYTE builtin function */
 {
@@ -1065,6 +1094,10 @@ static ExprNode* Factor (void)
             N = Function (FuncDefined);
             break;
 
+        case TOK_ISMNEMONIC:
+            N = Function (FuncIsMnemonic);
+            break;
+
         case TOK_HIBYTE:
             N = Function (FuncHiByte);
             break;

src/ca65/pseudo.c

@@ -2040,6 +2040,7 @@ static CtrlDesc CtrlCmdTab [] = {
     { ccNone,           DoIncBin        },
     { ccNone,           DoInclude       },
     { ccNone,           DoInterruptor   },
+    { ccNone,           DoUnexpected    },      /* .ISMNEMONIC */
     { ccNone,           DoInvalid       },      /* .LEFT */
     { ccNone,           DoLineCont      },
     { ccNone,           DoList          },

src/ca65/scanner.c

@@ -223,6 +223,8 @@ struct DotKeyword {
     { ".INCBIN",        TOK_INCBIN      },
     { ".INCLUDE",       TOK_INCLUDE     },
     { ".INTERRUPTOR",   TOK_INTERRUPTOR },
+    { ".ISMNEM",        TOK_ISMNEMONIC  },
+    { ".ISMNEMONIC",    TOK_ISMNEMONIC  },
     { ".LEFT",          TOK_LEFT        },
     { ".LINECONT",      TOK_LINECONT    },
     { ".LIST",          TOK_LIST        },

src/ca65/token.h

@@ -199,6 +199,7 @@ typedef enum token_t {
     TOK_INCBIN,
     TOK_INCLUDE,
     TOK_INTERRUPTOR,
+    TOK_ISMNEMONIC,
     TOK_LEFT,
     TOK_LINECONT,
     TOK_LIST,