diff options
| author | nsfisis <nsfisis@gmail.com> | 2025-07-31 06:19:17 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2025-08-15 10:04:49 +0900 |
| commit | 8fba2c682d190236b0e4c82b71404e6cfb62d6d0 (patch) | |
| tree | b702aefb2f86360f4f0754e80ffd0febad116b23 /preprocess.c | |
| parent | a7a805e3f11ed7d24c635aeefab7b7faed444d66 (diff) | |
| download | ducc-8fba2c682d190236b0e4c82b71404e6cfb62d6d0.tar.gz ducc-8fba2c682d190236b0e4c82b71404e6cfb62d6d0.tar.zst ducc-8fba2c682d190236b0e4c82b71404e6cfb62d6d0.zip | |
refactor: use struct assignment
Diffstat (limited to 'preprocess.c')
| -rw-r--r-- | preprocess.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/preprocess.c b/preprocess.c index 560b6b7..4d939fd 100644 --- a/preprocess.c +++ b/preprocess.c @@ -508,8 +508,7 @@ PpToken* process_ifdef_directive(Preprocessor* pp, PpToken* tok) { PpToken* read_include_header_name(PpToken* tok2, String* include_name) { if (tok2->kind == PpTokenKind_string_literal) { - include_name->data = tok2->raw.data; - include_name->len = tok2->raw.len; + *include_name = tok2->raw; ++tok2; return tok2; } else if (tok2->kind == PpTokenKind_punctuator && string_equals_cstr(&tok2->raw, "<")) { @@ -628,14 +627,11 @@ PpToken* process_define_directive(Preprocessor* pp, PpToken* tok) { if (tok3) { pp_macro = pp->pp_macros->data + pp->pp_macros->len; pp_macro->kind = PpMacroKind_func; - pp_macro->name.len = macro_name->raw.len; - pp_macro->name.data = macro_name->raw.data; + pp_macro->name = macro_name->raw; pp_macro->n_replacements = tok3 - tok2; pp_macro->replacements = calloc(pp_macro->n_replacements, sizeof(PpToken)); for (i = 0; i < pp_macro->n_replacements; ++i) { - pp_macro->replacements[i].kind = tok2[i].kind; - pp_macro->replacements[i].raw.len = tok2[i].raw.len; - pp_macro->replacements[i].raw.data = tok2[i].raw.data; + pp_macro->replacements[i] = tok2[i]; } ++pp->pp_macros->len; } @@ -645,14 +641,11 @@ PpToken* process_define_directive(Preprocessor* pp, PpToken* tok) { if (tok3) { pp_macro = pp->pp_macros->data + pp->pp_macros->len; pp_macro->kind = PpMacroKind_obj; - pp_macro->name.len = macro_name->raw.len; - pp_macro->name.data = macro_name->raw.data; + pp_macro->name = macro_name->raw; pp_macro->n_replacements = tok3 - tok2; pp_macro->replacements = calloc(pp_macro->n_replacements, sizeof(PpToken)); for (i = 0; i < pp_macro->n_replacements; ++i) { - pp_macro->replacements[i].kind = tok2[i].kind; - pp_macro->replacements[i].raw.len = tok2[i].raw.len; - pp_macro->replacements[i].raw.data = tok2[i].raw.data; + pp_macro->replacements[i] = tok2[i]; } ++pp->pp_macros->len; } |