diff options
| author | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2012-04-16 23:10:28 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@users.sourceforge.net> | 2012-04-16 23:10:28 +0200 |
| commit | 2fb235addd4893bab692504a69006eff083dc71f (patch) | |
| tree | 28039c5b5b16cfd3461c1eb4d8e8f4a6d1f61b0d /src/block-parser.c | |
| parent | 6f0b21b11f8711ef425069b277a1c743202174a7 (diff) | |
| download | cataract-2fb235addd4893bab692504a69006eff083dc71f.tar.xz | |
block-parser: Allow indented token arguments
Some of us like to have indented arguments from a function name.
Diffstat (limited to 'src/block-parser.c')
| -rw-r--r-- | src/block-parser.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/block-parser.c b/src/block-parser.c index 8bf7181..0697d2a 100644 --- a/src/block-parser.c +++ b/src/block-parser.c @@ -262,12 +262,12 @@ block_parser_read_and_parse (BlockParser *parser, FILE *stream) g_free (s); /* match conditionals */ - if (parser->conditionals && (g_str_has_prefix (token, "ifdef(") || g_str_has_prefix (token, "ifndef("))) { + if (parser->conditionals && (token_has_prefix (token, "ifdef") || token_has_prefix (token, "ifndef"))) { data = g_new0 (BlockData, 1); data->is_conditional = TRUE; data->conditional_key = extract_token_arg (token); - data->should_ignore = ((g_str_has_prefix (token, "ifdef(") && g_hash_table_lookup (parser->conditionals, data->conditional_key) == NULL) || - (g_str_has_prefix (token, "ifndef(") && g_hash_table_lookup (parser->conditionals, data->conditional_key) != NULL)); + data->should_ignore = ((token_has_prefix (token, "ifdef") && g_hash_table_lookup (parser->conditionals, data->conditional_key) == NULL) || + (token_has_prefix (token, "ifndef") && g_hash_table_lookup (parser->conditionals, data->conditional_key) != NULL)); if (data->should_ignore && parser->ignore_level == 0) parser->ignore_level = 1; else @@ -277,7 +277,7 @@ block_parser_read_and_parse (BlockParser *parser, FILE *stream) handled = TRUE; } - if (parser->conditionals && g_str_has_prefix (token, "endif(")) { + if (parser->conditionals && token_has_prefix (token, "endif")) { s = extract_token_arg (token); data = g_queue_peek_head (parser->active_tree); if (data == NULL || !data->is_conditional || strcmp (data->conditional_key, s) != 0) { @@ -293,7 +293,7 @@ block_parser_read_and_parse (BlockParser *parser, FILE *stream) g_free (s); } - if (parser->conditionals && g_str_has_prefix (token, "else(")) { + if (parser->conditionals && token_has_prefix (token, "else")) { s = extract_token_arg (token); data = g_queue_peek_head (parser->active_tree); if (data == NULL || !data->is_conditional || strcmp (data->conditional_key, s) != 0) { |