Skip to content

Use macro magic to remove second copy of type names #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use macro magic to remove second copy of type names #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions re.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@
#define MAX_REGEXP_OBJECTS 30 /* Max number of regex symbols in expression. */
#define MAX_CHAR_CLASS_LEN 40 /* Max length of character-class buffer in. */

#define TYPES(T) T(UNUSED)T(DOT)T(BEGIN)T(END)T(QUESTIONMARK)T(STAR)T(PLUS)T(CHAR)T(CHAR_CLASS)T(INV_CHAR_CLASS)T(DIGIT)T(NOT_DIGIT)T(ALPHA)T(NOT_ALPHA)T(WHITESPACE)T(NOT_WHITESPACE)/*T(BRANCH)*/

enum { UNUSED, DOT, BEGIN, END, QUESTIONMARK, STAR, PLUS, CHAR, CHAR_CLASS, INV_CHAR_CLASS, DIGIT, NOT_DIGIT, ALPHA, NOT_ALPHA, WHITESPACE, NOT_WHITESPACE, /* BRANCH */ };
#define ENUM_MEMBER(Name) Name,
enum { TYPES(ENUM_MEMBER) };

typedef struct regex_t
{
Expand Down Expand Up @@ -250,7 +252,8 @@ re_t re_compile(const char* pattern)

void re_print(regex_t* pattern)
{
const char* types[] = { "UNUSED", "DOT", "BEGIN", "END", "QUESTIONMARK", "STAR", "PLUS", "CHAR", "CHAR_CLASS", "INV_CHAR_CLASS", "DIGIT", "NOT_DIGIT", "ALPHA", "NOT_ALPHA", "WHITESPACE", "NOT_WHITESPACE", "BRANCH" };
#define STRING_MEMBER(Name) #Name,
const char* types[] = { TYPES(STRING_MEMBER) };

int i;
int j;
Expand Down