projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
flush
[m6w6/ext-psi]
/
src
/
cpp.h
diff --git
a/src/cpp.h
b/src/cpp.h
index 671d2da17c89927c437e9a2e4d88fce4ff29f554..be7a54caec378b6f31d60d1ccf9f94c6fb484a76 100644
(file)
--- a/
src/cpp.h
+++ b/
src/cpp.h
@@
-29,7
+29,7
@@
#include "data.h"
#ifndef PSI_CPP_DEBUG
#include "data.h"
#ifndef PSI_CPP_DEBUG
-# define PSI_CPP_DEBUG
0
+# define PSI_CPP_DEBUG
1
#endif
struct psi_cpp {
#endif
struct psi_cpp {
@@
-39,7
+39,9
@@
struct psi_cpp {
struct {
struct psi_plist *iter;
struct psi_plist *next;
struct {
struct psi_plist *iter;
struct psi_plist *next;
+ struct psi_plist *exec;
} tokens;
} tokens;
+ HashTable expanding;
const char *search;
size_t index;
unsigned level;
const char *search;
size_t index;
unsigned level;
@@
-47,10
+49,12
@@
struct psi_cpp {
unsigned seen;
unsigned expanded;
unsigned counter;
unsigned seen;
unsigned expanded;
unsigned counter;
+ bool do_cpp;
};
struct psi_cpp *psi_cpp_init(struct psi_parser *parser);
};
struct psi_cpp *psi_cpp_init(struct psi_parser *parser);
-bool psi_cpp_process(struct psi_cpp *cpp, struct psi_plist **tokens);
+bool psi_cpp_process(struct psi_cpp *cpp, struct psi_plist **tokens,
+ struct psi_token *expanding);
void psi_cpp_free(struct psi_cpp **cpp_ptr);
bool psi_cpp_if(struct psi_cpp *cpp, struct psi_cpp_exp *exp);
void psi_cpp_free(struct psi_cpp **cpp_ptr);
bool psi_cpp_if(struct psi_cpp *cpp, struct psi_cpp_exp *exp);