authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-29 00:28:52-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-29 00:28:52-07:00
log9b2ed1fac53319cbddb2752409e166334bb339bf
treefe546d1f1e6ad720bd9f1b999f7b08d88b05a8ec
parent923e78785d8505d16026f1c2b78079b79adac8fa

parseh understands simple character literal macro

5 files changed, 111 insertions(+), 46 deletions(-)

src/ast_render.cpp+15-1
...@@ -497,6 +497,12 @@ static bool is_node_void(AstNode *node) {...@@ -497,6 +497,12 @@ static bool is_node_void(AstNode *node) {
497 return node->type == NodeTypeSymbol && buf_eql_str(&node->data.symbol_expr.symbol, "void");497 return node->type == NodeTypeSymbol && buf_eql_str(&node->data.symbol_expr.symbol, "void");
498}498}
499499
500static bool is_printable(uint8_t c) {
501 return (c >= 'a' && c <= 'z') ||
502 (c >= 'A' && c <= 'A') ||
503 (c >= '0' && c <= '9');
504}
505
500static void render_node(AstRender *ar, AstNode *node) {506static void render_node(AstRender *ar, AstNode *node) {
501 assert(node->type == NodeTypeRoot || *node->parent_field == node);507 assert(node->type == NodeTypeRoot || *node->parent_field == node);
502508
...@@ -601,7 +607,15 @@ static void render_node(AstRender *ar, AstNode *node) {...@@ -601,7 +607,15 @@ static void render_node(AstRender *ar, AstNode *node) {
601 case NodeTypeStringLiteral:607 case NodeTypeStringLiteral:
602 zig_panic("TODO");608 zig_panic("TODO");
603 case NodeTypeCharLiteral:609 case NodeTypeCharLiteral:
604 zig_panic("TODO");610 {
611 uint8_t c = node->data.char_literal.value;
612 if (is_printable(c)) {
613 fprintf(ar->f, "'%c'", c);
614 } else {
615 fprintf(ar->f, "'\\x%x'", (int)c);
616 }
617 break;
618 }
605 case NodeTypeSymbol:619 case NodeTypeSymbol:
606 fprintf(ar->f, "%s", buf_ptr(&node->data.symbol_expr.symbol));620 fprintf(ar->f, "%s", buf_ptr(&node->data.symbol_expr.symbol));
607 break;621 break;
src/parseh.cpp+91-8
...@@ -31,6 +31,7 @@ struct Context {...@@ -31,6 +31,7 @@ struct Context {
31 HashMap<Buf *, bool, buf_hash, buf_eql_buf> struct_type_table;31 HashMap<Buf *, bool, buf_hash, buf_eql_buf> struct_type_table;
32 HashMap<Buf *, bool, buf_hash, buf_eql_buf> enum_type_table;32 HashMap<Buf *, bool, buf_hash, buf_eql_buf> enum_type_table;
33 HashMap<Buf *, bool, buf_hash, buf_eql_buf> fn_table;33 HashMap<Buf *, bool, buf_hash, buf_eql_buf> fn_table;
34 HashMap<Buf *, bool, buf_hash, buf_eql_buf> macro_table;
34 SourceManager *source_manager;35 SourceManager *source_manager;
35 ZigList<AstNode *> aliases;36 ZigList<AstNode *> aliases;
36};37};
...@@ -132,12 +133,17 @@ static AstNode *create_param_decl_node(Context *c, const char *name, AstNode *ty...@@ -132,12 +133,17 @@ static AstNode *create_param_decl_node(Context *c, const char *name, AstNode *ty
132 return node;133 return node;
133}134}
134135
136static AstNode *create_char_lit_node(Context *c, uint8_t value) {
137 AstNode *node = create_node(c, NodeTypeCharLiteral);
138 node->data.char_literal.value = value;
139 return node;
140}
141
135static AstNode *create_num_lit_unsigned(Context *c, uint64_t x) {142static AstNode *create_num_lit_unsigned(Context *c, uint64_t x) {
136 AstNode *node = create_node(c, NodeTypeNumberLiteral);143 AstNode *node = create_node(c, NodeTypeNumberLiteral);
137 node->data.number_literal.kind = NumLitUInt;144 node->data.number_literal.kind = NumLitUInt;
138 node->data.number_literal.data.x_uint = x;145 node->data.number_literal.data.x_uint = x;
139146
140 normalize_parent_ptrs(node);
141 return node;147 return node;
142}148}
143149
...@@ -713,6 +719,69 @@ static void render_aliases(Context *c) {...@@ -713,6 +719,69 @@ static void render_aliases(Context *c) {
713 }719 }
714}720}
715721
722static int parse_c_char_lit(Buf *value, uint8_t *out_c) {
723 enum State {
724 StateExpectStartQuot,
725 StateExpectChar,
726 StateExpectEndQuot,
727 StateExpectEnd,
728 };
729 State state = StateExpectStartQuot;
730 for (int i = 0; i < buf_len(value); i += 1) {
731 uint8_t c = buf_ptr(value)[i];
732 switch (state) {
733 case StateExpectStartQuot:
734 switch (c) {
735 case '\'':
736 state = StateExpectChar;
737 break;
738 default:
739 return -1;
740 }
741 break;
742 case StateExpectChar:
743 switch (c) {
744 case '\\':
745 case '\'':
746 return -1;
747 default:
748 *out_c = c;
749 state = StateExpectEndQuot;
750 }
751 break;
752 case StateExpectEndQuot:
753 switch (c) {
754 case '\'':
755 state = StateExpectEnd;
756 break;
757 default:
758 return -1;
759 }
760 break;
761 case StateExpectEnd:
762 return -1;
763 }
764 }
765 return (state == StateExpectEnd) ? 0 : -1;
766}
767
768static void process_macro(Context *c, Buf *name, Buf *value) {
769 // maybe it's a character literal
770 uint8_t ch;
771 if (!parse_c_char_lit(value, &ch)) {
772 c->macro_table.put(name, true);
773 AstNode *var_node = create_var_decl_node(c, buf_ptr(name), create_char_lit_node(c, ch));
774 c->root->data.root.top_level_decls.append(var_node);
775 return;
776 }
777 // maybe it's a string literal
778 // TODO
779 // maybe it's a number literal
780 // TODO
781 // maybe it's a symbol
782 // TODO
783}
784
716static void process_preprocessor_entities(Context *c, ASTUnit &unit) {785static void process_preprocessor_entities(Context *c, ASTUnit &unit) {
717 for (PreprocessedEntity *entity : unit.getLocalPreprocessingEntities()) {786 for (PreprocessedEntity *entity : unit.getLocalPreprocessingEntities()) {
718 switch (entity->getKind()) {787 switch (entity->getKind()) {
...@@ -724,14 +793,27 @@ static void process_preprocessor_entities(Context *c, ASTUnit &unit) {...@@ -724,14 +793,27 @@ static void process_preprocessor_entities(Context *c, ASTUnit &unit) {
724 {793 {
725 MacroDefinitionRecord *macro = static_cast<MacroDefinitionRecord *>(entity);794 MacroDefinitionRecord *macro = static_cast<MacroDefinitionRecord *>(entity);
726 const char *name = macro->getName()->getNameStart();795 const char *name = macro->getName()->getNameStart();
727 fprintf(stderr, "definition macro: %s\n", name);
728 SourceRange range = macro->getSourceRange();796 SourceRange range = macro->getSourceRange();
729 SourceLocation begin_loc = range.getBegin();797 SourceLocation begin_loc = range.getBegin();
730 SourceLocation end_loc = range.getEnd();798 SourceLocation end_loc = range.getEnd();
731799
732 const char *start_c = c->source_manager->getCharacterData(begin_loc);800 if (begin_loc == end_loc) {
801 // this means it is a macro without a value
802 // we don't care about such things
803 continue;
804 }
805
733 const char *end_c = c->source_manager->getCharacterData(end_loc);806 const char *end_c = c->source_manager->getCharacterData(end_loc);
734 fprintf(stderr, "source: '%.*s'\n", (int)(end_c - start_c), start_c);807 Buf *value = buf_alloc();
808 while (*end_c && *end_c != '\n') {
809 buf_append_char(value, *end_c);
810 if (end_c[0] == '\\' && end_c[1] == '\n') {
811 end_c += 2;
812 } else {
813 end_c += 1;
814 }
815 }
816 process_macro(c, buf_create_from_str(name), value);
735 }817 }
736 }818 }
737 }819 }
...@@ -771,10 +853,11 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors,...@@ -771,10 +853,11 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors,
771 c->import = import;853 c->import = import;
772 c->errors = errors;854 c->errors = errors;
773 c->visib_mod = VisibModPub;855 c->visib_mod = VisibModPub;
774 c->root_type_table.init(16);856 c->root_type_table.init(8);
775 c->enum_type_table.init(16);857 c->enum_type_table.init(8);
776 c->struct_type_table.init(16);858 c->struct_type_table.init(8);
777 c->fn_table.init(16);859 c->fn_table.init(8);
860 c->macro_table.init(8);
778861
779 char *ZIG_PARSEH_CFLAGS = getenv("ZIG_PARSEH_CFLAGS");862 char *ZIG_PARSEH_CFLAGS = getenv("ZIG_PARSEH_CFLAGS");
780 if (ZIG_PARSEH_CFLAGS) {863 if (ZIG_PARSEH_CFLAGS) {
src/tokenizer.cpp-36
...@@ -1140,42 +1140,6 @@ void print_tokens(Buf *buf, ZigList<Token> *tokens) {...@@ -1140,42 +1140,6 @@ void print_tokens(Buf *buf, ZigList<Token> *tokens) {
1140 }1140 }
1141}1141}
11421142
1143bool is_printable(uint8_t c) {
1144 switch (c) {
1145 default:
1146 return false;
1147 case DIGIT:
1148 case ALPHA:
1149 case '!':
1150 case '#':
1151 case '$':
1152 case '%':
1153 case '&':
1154 case '\'':
1155 case '(':
1156 case ')':
1157 case '*':
1158 case '+':
1159 case ',':
1160 case '-':
1161 case '.':
1162 case '/':
1163 case ':':
1164 case ';':
1165 case '<':
1166 case '=':
1167 case '>':
1168 case '?':
1169 case '@':
1170 case '^':
1171 case '_':
1172 case '`':
1173 case '~':
1174 case ' ':
1175 return true;
1176 }
1177}
1178
1179bool valid_symbol_starter(uint8_t c) {1143bool valid_symbol_starter(uint8_t c) {
1180 switch (c) {1144 switch (c) {
1181 case SYMBOL_START:1145 case SYMBOL_START:
src/tokenizer.hpp-1
...@@ -126,7 +126,6 @@ void tokenize(Buf *buf, Tokenization *out_tokenization);...@@ -126,7 +126,6 @@ void tokenize(Buf *buf, Tokenization *out_tokenization);
126126
127void print_tokens(Buf *buf, ZigList<Token> *tokens);127void print_tokens(Buf *buf, ZigList<Token> *tokens);
128128
129bool is_printable(uint8_t c);
130int get_digit_value(uint8_t c);129int get_digit_value(uint8_t c);
131130
132const char * token_name(TokenId id);131const char * token_name(TokenId id);
test/run_tests.cpp+5
...@@ -1979,6 +1979,11 @@ struct Foo *some_func(struct Foo *foo, int x);...@@ -1979,6 +1979,11 @@ struct Foo *some_func(struct Foo *foo, int x);
1979 )SOURCE", R"OUTPUT(pub const struct_Foo = u8;1979 )SOURCE", R"OUTPUT(pub const struct_Foo = u8;
1980pub extern fn some_func(foo: ?&struct_Foo, x: c_int) -> ?&struct_Foo;1980pub extern fn some_func(foo: ?&struct_Foo, x: c_int) -> ?&struct_Foo;
1981pub const Foo = struct_Foo;)OUTPUT");1981pub const Foo = struct_Foo;)OUTPUT");
1982
1983
1984 add_parseh_case("#define a char literal", R"SOURCE(
1985#define A_CHAR 'a'
1986 )SOURCE", R"OUTPUT(pub const A_CHAR = 'a';)OUTPUT");
1982}1987}
19831988
1984static void print_compiler_invocation(TestCase *test_case) {1989static void print_compiler_invocation(TestCase *test_case) {