aboutsummaryrefslogtreecommitdiff
path: root/demos/sample-files/calc-defs.c
diff options
context:
space:
mode:
Diffstat (limited to 'demos/sample-files/calc-defs.c')
-rw-r--r--demos/sample-files/calc-defs.c40
1 files changed, 27 insertions, 13 deletions
diff --git a/demos/sample-files/calc-defs.c b/demos/sample-files/calc-defs.c
index 656ab1c..7321a88 100644
--- a/demos/sample-files/calc-defs.c
+++ b/demos/sample-files/calc-defs.c
@@ -2,12 +2,9 @@
#include "parts/symbol.h"
enum symbol {
- PLUS = 0,
- MINUS,
- LPAREN,
- RPAREN,
- NUM,
- END_INPUT,
+ PLUS, MINUS, TIMES,
+ LPAREN, RPAREN,
+ NUM, END_INPUT,
EP, E, T,
SYMBOLS_END,
@@ -20,14 +17,14 @@ IMPLEMENT_FUNCPTR(int, symbol_is_input_end, (symbol s)) { return s == END_INPUT;
IMPLEMENT_FUNCPTR(int, symbol_is_valid, (symbol s)) { return s < SYMBOLS_END; }
#include "parts/grammar.h"
-#define PROD(LHS, _, ...) {LHS, (symbol[]){__VA_ARGS__}, sizeof((symbol[]){__VA_ARGS__})/sizeof(symbol), 0}
+#define PROD(LHS, _, ...) {LHS, (symbol[]){__VA_ARGS__}, sizeof((symbol[]){__VA_ARGS__})/sizeof(symbol)}
static struct production _grammar[] = {
PROD(EP, ->, E, END_INPUT),
- PROD(E, -->, E, PLUS, T),
- PROD(E, -->, E, MINUS, T),
- PROD(E, -->, T),
- PROD(T, -->, LPAREN, E, RPAREN),
- PROD(T, -->, NUM),
+ PROD(E, -->, E, PLUS, E),
+ PROD(E, -->, E, MINUS, E),
+ PROD(E, -->, E, TIMES, E),
+ PROD(E, -->, LPAREN, E, RPAREN),
+ PROD(E, -->, NUM),
};
struct production *grammar = _grammar;
@@ -38,7 +35,24 @@ char **semantic_action_str = (char *([])){
"v = A(0);",
"v = A(0) + A(2);",
"v = A(0) - A(2);",
- "v = A(0);",
+ "v = A(0) * A(2);",
"v = A(1);",
"v = A(0);",
};
+
+#include "parts/precedence.h"
+
+struct precedence_def {
+ int flag;
+ int *list;
+ size_t nlist;
+};
+#define PREC(f, ...) {f, (int[]){__VA_ARGS__}, sizeof((int[]){__VA_ARGS__})/sizeof(int)}
+struct precedence_def _precedence_defs[] = {
+ PREC(PRECEDENCE_LEFT_ASSOC, MINUS, PLUS),
+ PREC(PRECEDENCE_LEFT_ASSOC, TIMES),
+ PREC(PRECEDENCE_LEFT_ASSOC, LPAREN, RPAREN),
+};
+
+struct precedence_def *precedence_defs = _precedence_defs;
+size_t nprecedence_defs = sizeof(_precedence_defs)/sizeof(*_precedence_defs);