summaryrefslogtreecommitdiff
path: root/py/parse.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2015-01-01 20:27:54 +0000
committerDamien George <damien.p.george@gmail.com>2015-01-01 20:32:09 +0000
commit51dfcb4bb7613ed164952712d9a5235a7b833cde (patch)
treec1856c7db0ff6d5ae51190be4325804a0aad43f4 /py/parse.c
parentdb1ac360c39aeedd28b6ef5d653faaa14c3ce01e (diff)
py: Move to guarded includes, everywhere in py/ core.
Addresses issue #1022.
Diffstat (limited to 'py/parse.c')
-rw-r--r--py/parse.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/py/parse.c b/py/parse.c
index ae1fe65e7..c7c85e035 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -30,13 +30,10 @@
#include <assert.h>
#include <string.h>
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "lexer.h"
-#include "parsenumbase.h"
-#include "parse.h"
-#include "smallint.h"
+#include "py/lexer.h"
+#include "py/parse.h"
+#include "py/parsenum.h"
+#include "py/smallint.h"
#define RULE_ACT_ARG_MASK (0x0f)
#define RULE_ACT_KIND_MASK (0x30)
@@ -69,7 +66,7 @@ typedef struct _rule_t {
enum {
#define DEF_RULE(rule, comp, kind, ...) RULE_##rule,
-#include "grammar.h"
+#include "py/grammar.h"
#undef DEF_RULE
RULE_maximum_number_of,
RULE_string, // special node for non-interned string
@@ -91,7 +88,7 @@ enum {
#else
#define DEF_RULE(rule, comp, kind, ...) static const rule_t rule_##rule = { RULE_##rule, kind, { __VA_ARGS__ } };
#endif
-#include "grammar.h"
+#include "py/grammar.h"
#undef or
#undef and
#undef list
@@ -105,7 +102,7 @@ enum {
STATIC const rule_t *rules[] = {
#define DEF_RULE(rule, comp, kind, ...) &rule_##rule,
-#include "grammar.h"
+#include "py/grammar.h"
#undef DEF_RULE
};