From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id qOFxNvY+8Wa1+AAAqHPOHw:P1 (envelope-from ) for ; Mon, 23 Sep 2024 12:12:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id qOFxNvY+8Wa1+AAAqHPOHw (envelope-from ) for ; Mon, 23 Sep 2024 12:12:07 +0200 X-Envelope-To: patches@johnnyrichard.com Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=lists.sr.ht header.s=20240113 header.b=H2W46Q9h; dkim=pass header.d=maniero.me header.s=hostingermail1 header.b=vJ3+fbE8; spf=pass (aspmx1.migadu.com: domain of lists@sr.ht designates 46.23.81.152 as permitted sender) smtp.mailfrom=lists@sr.ht; dmarc=pass (policy=none) header.from=maniero.me; arc=pass ("mailchannels.net:s=arc-2022:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=johnnyrichard.com; s=key1; t=1727086326; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=raM5mpa8tDGrgR4PPQDj+nH9MWkB6TqnJtuoc/EvBWY=; b=NUBwKNOMJ83rp3+J0FQrt9uc/pKLc5j8DVtHtFuuh8gSoGdOk6qeoaKzN6nN0IxpBO7D11 xlpUzDclTlxGKyEkN0ZqPwcnhCnWpC7EMlHpuzNNdGH0XTLG6N0Q7JckX2Pg2pmsgxNaPX RQCqfBjwYqdNqL/3OSyhG1iEpcn0n+HQH1/Adoo+MEccBlANoxUOUdOfet6grU9kOoTXR/ 8IO/rDosKKUtsGJSucIc+Pd8v/sTx45BvDjJXHLll+KfoX/JeWTq++sjwtCdt2D4FF1eKA VPTUouoJrEc+CESVo10yjp77C2G80XhmdY6lWwPgw15JPpxoyDpKnaKsaMwMJw== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=pass header.d=lists.sr.ht header.s=20240113 header.b=H2W46Q9h; dkim=pass header.d=maniero.me header.s=hostingermail1 header.b=vJ3+fbE8; spf=pass (aspmx1.migadu.com: domain of lists@sr.ht designates 46.23.81.152 as permitted sender) smtp.mailfrom=lists@sr.ht; dmarc=pass (policy=none) header.from=maniero.me; arc=pass ("mailchannels.net:s=arc-2022:i=1") ARC-Seal: i=2; s=key1; d=johnnyrichard.com; t=1727086326; a=rsa-sha256; cv=pass; b=CMoUx3+db4Q8mY9Xdra4HibvxcvvNsb5p3urkJWVRf+bBOufZPRDLcDmb9yAImKpwyZ5Dc Ztvr6fzeqMX4iqGTCOOJYyPEd9SqfFD6FB45mjSQG9edSJfGKjFMZHId6Cgtk6zKwp1Qum sv114AtA1hj52/7lBVfxSvFv8wJrTg7+nBKN+HMmLhsNKZiY7d6LrAjSHnp29c/EpjArTH c27V9mYGjWLM04ds6KRBgGUeOy8G3DqaOzo8OO7Yz0CGYJaYBSy71hHV6l/yzFfq5/Z4mn KklHRIeYp9WukDBHdKCDA8qJsG7usLO9jEZ92347T5hGZM77kk44klIwgRqmwg== Received: from mail-a.sr.ht (mail-a.sr.ht [46.23.81.152]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CBDB036594 for ; Mon, 23 Sep 2024 12:12:06 +0200 (CEST) DKIM-Signature: a=rsa-sha256; bh=YwaNlXE6JlGwcdsF0cm6ezNXmW7M+wTu03RCvfluiLc=; c=simple/simple; d=lists.sr.ht; h=From:To:Cc:Subject:In-Reply-To:References:Date:List-Unsubscribe:List-Subscribe:List-Archive:List-Post:List-ID; q=dns/txt; s=20240113; t=1727086326; v=1; b=H2W46Q9hR7dqiHDOZhVLbKSfD/l27BP/i5wYTV+x37SZjLotMdmDaTUdOwOfENhewXKbivnS UhhRVLgQVcqv1wiaUuQb2n0FL9oAIRvGsxDB9wYRmausqJb9qOEdqaBCvIp1qjOzPpLFMGvtaaC jwo4c1pzLyNhFilhQoW82BI5GerAVfyspXkCNIKASFQsH1UzcHZeTTUnCEiv7WQjm472MnSov4U mjoPzaaKkkZK8ze69iaBOh2zTdjypA5xTjaFQUJoy+v6/qgGOKAyVU9Obv4w7TMI/AHjP4fZZy/ QrOq0CIZnaxKzbJK0SVWXDDNhAI0AHDxId+tk+G2UyVqw== Received: from lists.sr.ht (unknown [46.23.81.154]) by mail-a.sr.ht (Postfix) with ESMTPSA id 5B4FB20179 for ; Mon, 23 Sep 2024 10:12:06 +0000 (UTC) Received: from panther.cherry.relay.mailchannels.net (panther.cherry.relay.mailchannels.net [23.83.223.141]) by mail-a.sr.ht (Postfix) with ESMTPS id 9253E20236 for <~johnnyrichard/olang-devel@lists.sr.ht>; Mon, 23 Sep 2024 10:12:01 +0000 (UTC) X-Sender-Id: hostingeremail|x-authuser|carlos@maniero.me Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 2EE58908A4A for <~johnnyrichard/olang-devel@lists.sr.ht>; Mon, 23 Sep 2024 10:12:00 +0000 (UTC) Received: from uk-fast-smtpout10.hostinger.io (unknown [127.0.0.6]) (Authenticated sender: hostingeremail) by relay.mailchannels.net (Postfix) with ESMTPA id 64D799079B5 for <~johnnyrichard/olang-devel@lists.sr.ht>; Mon, 23 Sep 2024 10:11:59 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1727086319; a=rsa-sha256; cv=none; b=BgzVZTJuqvjAAp1Opg0mfdLHsHMTGs8+4cqU+XxrReU2FN0+az+TuRY43DOKeh+mQSqYVH lC7pDgmlIpXat2NdDiwng0ns/nOEgY1jRK0sMmHbO/vMBixGkIq6d0KVmPOqnbQML85NMR YfBev9Ws/PQvpR0tJq6zytf9cNgb6FVkHcMZgCAvPD/IWViF/yRcSIcrG5qnUbubHQb7oM kDogB4yK7M2Zk/2d6qoQecHe18ekXrSy8lOZhllLJaKu4lYUbSoYnj/t1gro/twO0rXH0j 6if1gwsvTwL9jvoyyTTFU4EYkunktwKHNMw9bPDwrFWoZkl2wZHWVA6FMdiOWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1727086319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=raM5mpa8tDGrgR4PPQDj+nH9MWkB6TqnJtuoc/EvBWY=; b=yYJXCtzeuYdduH2te3BA0j0vVA3Al9ByF5KbhyHlQ0aPzyUgbMSHxLwwOvy/s0lQ6iIRx0 DNq21U2y8SOhq34XZjSV2OCxXoW2gzKFOixfRfZFNFemyLOXVsn90FdWh6xdxCwe/4/azc Yi+6d+VOD0ln3eaEGkM7M1gMAvofK7jW6saBa3XWjeDN+u0MOoZS2cdCoMZO/vp0ADQP+M E2ND8f5aY8kyuz/iXBENjc2IpDn4svHRUOTneyar9SX9f9lL+al845zE2daowPxKgELz46 HBx8OMyXWzw4r+Ys7LKpForSHFKSyA6WUWgOhAWP4mDSGgUwYMyIpyWs3L67nQ== ARC-Authentication-Results: i=1; rspamd-b5ccff48b-bxtmn; auth=pass smtp.auth=hostingeremail smtp.mailfrom=carlos@maniero.me X-Sender-Id: hostingeremail|x-authuser|carlos@maniero.me X-MC-Relay: Neutral X-MailChannels-SenderId: hostingeremail|x-authuser|carlos@maniero.me X-MailChannels-Auth-Id: hostingeremail X-Dime-Invention: 3ca6529b2793e45c_1727086320042_2597629231 X-MC-Loop-Signature: 1727086320042:693835117 X-MC-Ingress-Time: 1727086320042 Received: from uk-fast-smtpout10.hostinger.io (uk-fast-smtpout10.hostinger.io [145.14.155.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.110.32.30 (trex/7.0.2); Mon, 23 Sep 2024 10:12:00 +0000 From: Carlos Maniero DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maniero.me; s=hostingermail1; t=1727086317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=raM5mpa8tDGrgR4PPQDj+nH9MWkB6TqnJtuoc/EvBWY=; b=vJ3+fbE8ZxzQ9943yJH9WWGsX1mEtKcuiCGtB+kskDph+wbWfoUxXw+RmmYUyegSFibiZU ZGMFwWYF6i5dhMEzaX7JSl7r+1u4ApCVlR+IA/KlwVFM+EuxOgr1O/koMvdA6D+z2AJ5J/ nowX+UXtQvhFpwco35ScY+uZyTX7pKbAFJvMF0tz9C9Zdz2AE0gzaE2NZS3j3lUs3IYUa9 +1bLNv8U32m8Go0mkcWKb6EtpNvwYKcSBWNCNUomA2pO2lO+c/KNXsusAP2mt6XehjQ5uD SPgWiTROcH8A9T+Rt9cNHziVqj1y5vSMyt+Ye+G8QEFQ7vJto6JCzDWB5UaIgg== To: ~johnnyrichard/olang-devel@lists.sr.ht Cc: Carlos Maniero Subject: [PATCH olang v1 3/3] naming: rename all identifier symbols to id Message-Id: <20240923101141.76783-4-carlos@maniero.me> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240923101141.76783-1-carlos@maniero.me> References: <20240923101141.76783-1-carlos@maniero.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Date: Mon, 23 Sep 2024 10:11:57 +0000 (UTC) X-CM-Envelope: MS4xfHjafLs1K85IJ4KqLyyioaLptDuL0V7+8+XzQ+HNC8TwjV/JvFSc4lwHhuZZ9iJ1g/P3fRPQqYWzM6XF7Yua4py1I8BFeZZoZ8acvKl0v/4JSqgaVKrb tTQUkYVth32rqX+IE15lxKFYmIxUo7Q5x9mWXX4Kj1VgpR2PMrFdQoXDEn3zzr1IOVMjB25uC4nILeKg+qzDGqgET97jEwzMz2cvg26z/quQLob3Nz46tmSs X-CM-Analysis: v=2.4 cv=TcnEtgQh c=1 sm=1 tr=0 ts=66f13eed a=WwxFCuf3mf1fs3oSi6/dng==:117 a=WwxFCuf3mf1fs3oSi6/dng==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=eBUTmN6UxVzgX44n37YA:9 a=BXDaF_L80NY05PYiAFlV:22 X-AuthUser: carlos@maniero.me X-Sourcehut-Patchset-Status: PROPOSED List-Unsubscribe: List-Subscribe: List-Archive: Archived-At: List-Post: List-ID: ~johnnyrichard/olang-devel <~johnnyrichard/olang-devel.lists.sr.ht> Sender: ~johnnyrichard/olang-devel <~johnnyrichard/olang-devel@lists.sr.ht> X-Migadu-Flow: FLOW_IN X-Migadu-Country: NL X-Migadu-Spam-Score: -0.16 X-Spam-Score: -0.16 X-Migadu-Queue-Id: CBDB036594 X-Migadu-Scanner: mx10.migadu.com X-TUID: 2cpTly+uzasi We were already using this pattern but initially we were callig them the full name. Signed-off-by: Carlos Maniero --- src/ast.c | 12 ++++++------ src/ast.h | 12 ++++++------ src/checker.c | 2 +- src/codegen_linux_aarch64.c | 4 ++-- src/codegen_linux_x86_64.c | 8 ++++---- src/lexer.c | 4 ++-- src/lexer.h | 2 +- src/parser.c | 12 ++++++------ src/pretty_print_ast.c | 6 +++--- tests/unit/parser_test.c | 2 +- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/ast.c b/src/ast.c index a136182..7019316 100644 --- a/src/ast.c +++ b/src/ast.c @@ -37,7 +37,7 @@ ast_new_program(arena_t *arena, ast_node_t *fn_def) } ast_node_t * -ast_new_node_fn_def(arena_t *arena, string_view_t identifier, string_view_t return_type, ast_node_t *block) +ast_new_node_fn_def(arena_t *arena, string_view_t id, string_view_t return_type, ast_node_t *block) { ast_node_t *node_fn_def = (ast_node_t *)arena_alloc(arena, sizeof(ast_node_t)); assert(node_fn_def); @@ -45,7 +45,7 @@ ast_new_node_fn_def(arena_t *arena, string_view_t identifier, string_view_t retu node_fn_def->kind = AST_NODE_FN_DEF; ast_fn_definition_t *fn_def = &node_fn_def->as_fn_def; - fn_def->identifier = identifier; + fn_def->id = id; fn_def->return_type = return_type; fn_def->block = block; @@ -53,7 +53,7 @@ ast_new_node_fn_def(arena_t *arena, string_view_t identifier, string_view_t retu } ast_node_t * -ast_new_node_var_def(arena_t *arena, string_view_t identifier, string_view_t type, ast_node_t *value) +ast_new_node_var_def(arena_t *arena, string_view_t id, string_view_t type, ast_node_t *value) { ast_node_t *node_var_def = (ast_node_t *)arena_alloc(arena, sizeof(ast_node_t)); assert(node_var_def); @@ -61,7 +61,7 @@ ast_new_node_var_def(arena_t *arena, string_view_t identifier, string_view_t typ node_var_def->kind = AST_NODE_VAR_DEF; ast_var_definition_t *var_def = &node_var_def->as_var_def; - var_def->identifier = identifier; + var_def->id = id; var_def->type = type; var_def->value = value; @@ -96,13 +96,13 @@ ast_new_node_literal_u32(arena_t *arena, uint32_t value) } ast_node_t * -ast_new_node_ref(arena_t *arena, string_view_t identifier) +ast_new_node_ref(arena_t *arena, string_view_t id) { ast_node_t *node_ref = (ast_node_t *)arena_alloc(arena, sizeof(ast_node_t)); assert(node_ref); node_ref->kind = AST_NODE_REF; - node_ref->as_ref.identifier = identifier; + node_ref->as_ref.id = id; return node_ref; } diff --git a/src/ast.h b/src/ast.h index e618314..df65e59 100644 --- a/src/ast.h +++ b/src/ast.h @@ -53,7 +53,7 @@ typedef struct ast_program typedef struct ast_fn_definition { - string_view_t identifier; + string_view_t id; string_view_t return_type; ast_node_t *block; scope_t *scope; @@ -61,7 +61,7 @@ typedef struct ast_fn_definition typedef struct ast_var_definition { - string_view_t identifier; + string_view_t id; string_view_t type; ast_node_t *value; scope_t *scope; @@ -83,7 +83,7 @@ typedef struct ast_literal typedef struct ast_ref { - string_view_t identifier; + string_view_t id; scope_t *scope; } ast_ref_t; @@ -149,10 +149,10 @@ ast_node_t * ast_new_program(arena_t *arena, ast_node_t *fn_def); ast_node_t * -ast_new_node_fn_def(arena_t *arena, string_view_t identifier, string_view_t return_type, ast_node_t *block); +ast_new_node_fn_def(arena_t *arena, string_view_t id, string_view_t return_type, ast_node_t *block); ast_node_t * -ast_new_node_var_def(arena_t *arena, string_view_t identifier, string_view_t type, ast_node_t *value); +ast_new_node_var_def(arena_t *arena, string_view_t id, string_view_t type, ast_node_t *value); ast_node_t * ast_new_node_bin_op(arena_t *arena, ast_binary_op_kind_t kind, ast_node_t *lhs, ast_node_t *rhs); @@ -161,7 +161,7 @@ ast_node_t * ast_new_node_literal_u32(arena_t *arena, uint32_t value); ast_node_t * -ast_new_node_ref(arena_t *arena, string_view_t identifier); +ast_new_node_ref(arena_t *arena, string_view_t id); ast_node_t * ast_new_node_return_stmt(arena_t *arena, ast_node_t *expr); diff --git a/src/checker.c b/src/checker.c index def7e86..090920c 100644 --- a/src/checker.c +++ b/src/checker.c @@ -106,7 +106,7 @@ populate_scope(checker_t *checker, scope_t *scope, ast_node_t *ast) } case AST_NODE_VAR_DEF: { - string_view_t id = ast->as_var_def.identifier; + string_view_t id = ast->as_var_def.id; symbol_t *symbol = symbol_new(checker->arena, id, type_from_id(ast->as_var_def.type)); diff --git a/src/codegen_linux_aarch64.c b/src/codegen_linux_aarch64.c index 18173ce..93dde4f 100644 --- a/src/codegen_linux_aarch64.c +++ b/src/codegen_linux_aarch64.c @@ -51,7 +51,7 @@ codegen_linux_aarch64_emit_program(FILE *out, ast_node_t *node) ast_fn_definition_t fn = program.fn->as_fn_def; - assert(string_view_eq_to_cstr(fn.identifier, "main")); + assert(string_view_eq_to_cstr(fn.id, "main")); codegen_linux_aarch64_emit_function(out, &fn); } @@ -88,7 +88,7 @@ codegen_linux_aarch64_emit_function(FILE *out, ast_fn_definition_t *fn) assert(literal_u32.kind == AST_LITERAL_U32); uint32_t exit_code = literal_u32.as_u32; - fprintf(out, "" SV_FMT ":\n", SV_ARG(fn->identifier)); + fprintf(out, "" SV_FMT ":\n", SV_ARG(fn->id)); fprintf(out, " mov x0, #%d\n", exit_code); fprintf(out, " ret\n"); } diff --git a/src/codegen_linux_x86_64.c b/src/codegen_linux_x86_64.c index 2e329ca..a0d9d97 100644 --- a/src/codegen_linux_x86_64.c +++ b/src/codegen_linux_x86_64.c @@ -65,7 +65,7 @@ codegen_linux_x86_64_emit_program(codegen_x86_64_t *codegen, ast_node_t *node) ast_fn_definition_t fn = program.fn->as_fn_def; - assert(string_view_eq_to_cstr(fn.identifier, "main")); + assert(string_view_eq_to_cstr(fn.id, "main")); codegen_linux_x86_64_emit_function(codegen, &fn); } @@ -103,7 +103,7 @@ codegen_linux_x86_64_emit_expression(codegen_x86_64_t *codegen, ast_node_t *expr case AST_NODE_REF: { ast_ref_t ref = expr_node->as_ref; - symbol_t *symbol = scope_lookup(ref.scope, ref.identifier); + symbol_t *symbol = scope_lookup(ref.scope, ref.id); assert(symbol); char symbol_ptr[PTR_HEX_CSTR_SIZE]; @@ -366,7 +366,7 @@ codegen_linux_x86_64_emit_block(codegen_x86_64_t *codegen, ast_block_t *block) ast_var_definition_t var_def = node->as_var_def; scope_t *scope = var_def.scope; - symbol_t *symbol = scope_lookup(scope, var_def.identifier); + symbol_t *symbol = scope_lookup(scope, var_def.id); assert(symbol); char symbol_ptr[PTR_HEX_CSTR_SIZE]; @@ -486,7 +486,7 @@ codegen_linux_x86_64_emit_function(codegen_x86_64_t *codegen, ast_fn_definition_ codegen->base_offset = X86_CALL_EIP_STACK_OFFSET; ast_node_t *block_node = fn->block; - fprintf(codegen->out, "" SV_FMT ":\n", SV_ARG(fn->identifier)); + fprintf(codegen->out, "" SV_FMT ":\n", SV_ARG(fn->id)); fprintf(codegen->out, " mov %%rsp, %%rbp\n"); diff --git a/src/lexer.c b/src/lexer.c index 12b4719..ebc21b7 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -278,7 +278,7 @@ lexer_next_token(lexer_t *lexer, token_t *token) static char *token_kind_str_table[] = { [TOKEN_UNKNOWN] = "unknown", - [TOKEN_IDENTIFIER] = "identifier", + [TOKEN_ID] = "identifier", [TOKEN_NUMBER] = "number", [TOKEN_FN] = "fn", [TOKEN_RETURN] = "return", @@ -432,7 +432,7 @@ lexer_str_to_token_kind(string_view_t text) return TOKEN_FN; } - return TOKEN_IDENTIFIER; + return TOKEN_ID; } void diff --git a/src/lexer.h b/src/lexer.h index 4a0e2e1..717d21d 100644 --- a/src/lexer.h +++ b/src/lexer.h @@ -32,7 +32,7 @@ typedef struct lexer typedef enum token_kind { TOKEN_UNKNOWN, - TOKEN_IDENTIFIER, + TOKEN_ID, TOKEN_NUMBER, // Keywords diff --git a/src/parser.c b/src/parser.c index a63a724..3cae763 100644 --- a/src/parser.c +++ b/src/parser.c @@ -236,7 +236,7 @@ parser_parse_factor(parser_t *parser) case TOKEN_NUMBER: return ast_new_node_literal_u32(parser->arena, string_view_to_u32(token.value)); - case TOKEN_IDENTIFIER: + case TOKEN_ID: return ast_new_node_ref(parser->arena, token.value); case TOKEN_OPAREN: { @@ -269,7 +269,7 @@ parser_parse_fn_definition(parser_t *parser) token_t fn_name_token; - if (!expected_next_token(parser, &fn_name_token, TOKEN_IDENTIFIER)) { + if (!expected_next_token(parser, &fn_name_token, TOKEN_ID)) { return NULL; } @@ -313,7 +313,7 @@ parser_parse_type(parser_t *parser, string_view_t *type) token_t token; - if (!expected_next_token(parser, &token, TOKEN_IDENTIFIER)) { + if (!expected_next_token(parser, &token, TOKEN_ID)) { return false; } @@ -459,8 +459,8 @@ parser_parse_var_def(parser_t *parser) return NULL; } - token_t identifier_token; - if (!expected_next_token(parser, &identifier_token, TOKEN_IDENTIFIER)) { + token_t id_token; + if (!expected_next_token(parser, &id_token, TOKEN_ID)) { return NULL; } @@ -479,7 +479,7 @@ parser_parse_var_def(parser_t *parser) return NULL; } - ast_node_t *var_node = ast_new_node_var_def(parser->arena, identifier_token.value, var_type, expr); + ast_node_t *var_node = ast_new_node_var_def(parser->arena, id_token.value, var_type, expr); skip_line_feeds(parser->lexer); diff --git a/src/pretty_print_ast.c b/src/pretty_print_ast.c index a7c75e8..1d5576d 100644 --- a/src/pretty_print_ast.c +++ b/src/pretty_print_ast.c @@ -127,7 +127,7 @@ ast_node_to_pretty_print_node(ast_node_t *ast, arena_t *arena) char name[256]; sprintf(name, "Function_Definition ", - SV_ARG(fn_def.identifier), + SV_ARG(fn_def.id), SV_ARG(fn_def.return_type)); node->name = (char *)arena_alloc(arena, sizeof(char) * (strlen(name) + 1)); strcpy(node->name, name); @@ -203,7 +203,7 @@ ast_node_to_pretty_print_node(ast_node_t *ast, arena_t *arena) ast_var_definition_t var = ast->as_var_def; char name[256]; - sprintf(name, "Var_Definition ", SV_ARG(var.identifier)); + sprintf(name, "Var_Definition ", SV_ARG(var.id)); node->name = (char *)arena_alloc(arena, sizeof(char) * (strlen(name) + 1)); strcpy(node->name, name); @@ -217,7 +217,7 @@ ast_node_to_pretty_print_node(ast_node_t *ast, arena_t *arena) ast_ref_t ref = ast->as_ref; char name[256]; - sprintf(name, "Reference ", SV_ARG(ref.identifier)); + sprintf(name, "Reference ", SV_ARG(ref.id)); node->name = (char *)arena_alloc(arena, sizeof(char) * (strlen(name) + 1)); strcpy(node->name, name); diff --git a/tests/unit/parser_test.c b/tests/unit/parser_test.c index ccec460..8ad16b5 100644 --- a/tests/unit/parser_test.c +++ b/tests/unit/parser_test.c @@ -50,7 +50,7 @@ parse_program_test(const MunitParameter params[], void *user_data_or_fixture) assert_uint(program.fn->kind, ==, AST_NODE_FN_DEF); ast_fn_definition_t fn = program.fn->as_fn_def; - assert_memory_equal(fn.identifier.size, fn.identifier.chars, "main"); + assert_memory_equal(fn.id.size, fn.id.chars, "main"); assert_memory_equal(fn.return_type.size, fn.return_type.chars, "u32"); ast_node_t *block = fn.block; -- 2.34.1