Fixes for last commit; version is now 1.10.0.

[rmac] / expr.h

diff --git a/expr.h b/expr.h
index 148157f33af4bc1f708ec52071f879c65323169c..6ebbe673305ffb17e573fc5a476686a63cd8f017 100644 (file)
--- a/expr.h
+++ b/expr.h
@@ -1,9 +1,9 @@
 //
 //

-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers

 // EXPR.H - Expression Analyzer
 // EXPR.H - Expression Analyzer

-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends

 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __EXPR_H__
 //
 
 #ifndef __EXPR_H__


@@ -12,29 +12,29 @@
 #include "rmac.h"
 
 // Tunable definitions
 #include "rmac.h"
 
 // Tunable definitions

-#define STKSIZE      64                        // Size of expression stacks
-#define EVSTACKSIZE  64                        // Expression evaluator stack size
+#define STKSIZE      64                // Size of expression stacks
+#define EVSTACKSIZE  64                // Expression evaluator stack size

 
 // Token classes in order of precedence
 
 // Token classes in order of precedence

-#define END          0                 // End/beginning of input
-#define ID           1                 // Symbol or constant
-#define OPAR         2                 // (
-#define CPAR         3                 // )
-#define SUNARY       4                 // Special unary (^^defined, etc.)
-#define UNARY        5                 // Unary class: ! ~ -
-#define MULT         6                 // Multiplicative class: * / %
-#define ADD          7                 // Additive class: + -
-#define SHIFT        8                 // Shift class: << >>
-#define REL          9                 // Relational class: <= >= < > <> = !=
-#define AND          10                        // Bitwise and: &
-#define XOR          11                        // Bitwise xor: ^
-#define OR           12                        // Bitwise or: |
+#define END          0         // End/beginning of input
+#define ID           1         // Symbol or constant
+#define OPAR         2         // (
+#define CPAR         3         // )
+#define SUNARY       4         // Special unary (^^defined, etc.)
+#define UNARY        5         // Unary class: ! ~ -
+#define MULT         6         // Multiplicative class: * / %
+#define ADD          7         // Additive class: + -
+#define SHIFT        8         // Shift class: << >>
+#define REL          9         // Relational class: <= >= < > <> = !=
+#define AND          10                // Bitwise and: &
+#define XOR          11                // Bitwise xor: ^
+#define OR           12                // Bitwise or: |

 
 

-// Prototypes
+// Exported functions

 void InitExpression(void);
 int expr1(void);
 int expr2(void);
 void InitExpression(void);
 int expr1(void);
 int expr2(void);

-int expr(TOKEN *, VALUE *, WORD *, SYM **);
-int evexpr(TOKEN *, VALUE *, WORD *, SYM **);
+int expr(TOKENPTR, uint64_t *, WORD *, SYM **);
+int evexpr(TOKENPTR, uint64_t *, WORD *, SYM **);

 
 #endif // __EXPR_H__
 
 #endif // __EXPR_H__