FOR GREAT JUSTICE

[rmac] / direct.c

diff --git a/direct.c b/direct.c
index 6f94402c4c0502564942368273a17cac1b0781eb..67a6ffdfcf014fa7111a1afd4e7330ce1046f15b 100644 (file)
--- a/direct.c
+++ b/direct.c
@@ -83,6 +83,9 @@ int (*dirtab[])() = {
        d_ccundef,                      // 51 .ccundef
        d_print,                        // 52 .print
        d_cstruct,                      // 53 .cstruct
+       d_jpad,                         // 54 .jpad (deprecated)
+       d_nojpad,                       // 55 .nojpad (deprecated)
+       d_gpumain,                      // 56 .gpumain (deprecated)
 };
 
 
@@ -116,15 +119,15 @@ int d_org(void)
 //
 int d_print(void)
 {
-       char prntstr[LNSIZ];                                     // String for PRINT directive
-       char format[LNSIZ];                                      // Format for PRINT directive
-       int formatting = 0;                                      // Formatting on/off
-       int wordlong = 0;                                        // WORD = 0, LONG = 1
-       int outtype = 0;                                         // 0:hex, 1:decimal, 2:unsigned
-
-       VALUE eval;                                              // Expression value
-       WORD eattr;                                              // Expression attributes
-       SYM * esym;                                              // External symbol involved in expr.
+       char prntstr[LNSIZ];                                    // String for PRINT directive
+       char format[LNSIZ];                                             // Format for PRINT directive
+       int formatting = 0;                                             // Formatting on/off
+       int wordlong = 0;                                               // WORD = 0, LONG = 1
+       int outtype = 0;                                                // 0:hex, 1:decimal, 2:unsigned
+
+       VALUE eval;                                                             // Expression value
+       WORD eattr;                                                             // Expression attributes
+       SYM * esym;                                                             // External symbol involved in expr.
        TOKEN r_expr[EXPRSIZE];
 
        while (*tok != EOL)
@@ -199,7 +202,7 @@ int d_print(void)
        }
 
        printf("\n");
-       println("\n");
+//     println("\n");
 
        return 0;
 
@@ -225,7 +228,8 @@ int d_ccundef(void)
 
        if (*tok != SYMBOL)
        {
-               error(syntax_error);
+//             error(syntax_error);
+               error("syntax error; expected symbol");
                return ERROR;
        }
 
@@ -268,7 +272,8 @@ int d_equrundef(void)
                // Check we are dealing with a symbol
                if (*tok != SYMBOL)
                {
-                       error(syntax_error);
+//                     error(syntax_error);
+                       error("syntax error; expected symbol");
                        return ERROR;
                }
 
@@ -315,7 +320,8 @@ int d_incbin(void)
 
        if (*tok != STRING)
        {
-               error(syntax_error);
+//             error(syntax_error);
+               error("syntax error; string missing");
                return ERROR;
        }
 
@@ -1557,3 +1563,23 @@ int d_undmac(void)
        return 0;
 }
 
+
+int d_jpad(void)
+{
+       warn("JPAD directive is deprecated/non-functional");
+       return OK;
+}
+
+
+int d_nojpad(void)
+{
+       warn("NOJPAD directive is deprecated/non-functional");
+       return OK;
+}
+
+
+int d_gpumain(void)
+{
+       return error("What the hell? Do you think we adhere to the Goof standard?");
+}
+