From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id QN4FJ+dW9GbJPgAAe85BDQ:P1 (envelope-from ) for ; Wed, 25 Sep 2024 20:31:03 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id QN4FJ+dW9GbJPgAAe85BDQ (envelope-from ) for ; Wed, 25 Sep 2024 20:31:03 +0200 X-Envelope-To: patches@johnnyrichard.com Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=lists.sr.ht header.s=20240113 header.b=LR1gMFqo; dkim=pass header.d=maniero.me header.s=hostingermail1 header.b=TAMcCOVy; dmarc=pass (policy=none) header.from=maniero.me; spf=pass (aspmx1.migadu.com: domain of lists@sr.ht designates 46.23.81.152 as permitted sender) smtp.mailfrom=lists@sr.ht; 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=1727289062; 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:list-id: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=w4rOkaDSVTVFRRDvaY50HOi3aaDvCiLWYCR41j/GT3w=; b=tKI86cEaE4xDcsCk4oEFvXBliONJwJOkPHqLO8FV9KbqSWMiSJloSHhd4kck+VKpuUsukq HUUaI1Bx/fxn8wC4wy6tDGredzasYzQ20sZCnHQu0F6IFo2v6Anj/IKC72J+54VQUBpz/L +XqU9FCGmWlleOpcUTet2L7u3KeA7qQRkikVqIYz1CO3xhutr4jj3pIAO7+F31LJaFBaZK oP0RqQFji85j2Jm9IomSyiaMDDzUBNTR6THMgYnB/vZgpmk1P0fnvOvUQZD9JM+c/LpZxN 3XS0blCj4g/jmlu5us4XJjDFsjJ5OZOZD9bFhA6lY5YYK8aejeblZzjxv202tQ== ARC-Seal: i=2; s=key1; d=johnnyrichard.com; t=1727289062; a=rsa-sha256; cv=pass; b=2UaHcmRh/C9mF+1dbPZ9j5vRQTuebcnZNi1UPheADulizhz/AYAtd8VLy2LPiSlUmWwG3h jHsh/4TUN10ZqsZ6UpKTGKtUOh0YW+9NjTeLrufp3ov8ZCugzyj4y2D2zeaWB2wny+Els1 H5Z6MOK7K3XYB8hHCJPogWNJnpB3rlT+Nf1OAr0KDy+Khy9xy5RSPRMebSh4TIr6r+AG3B w8w9LBLJlTigAG4pEHCquKt6E+HBZFUaAEWnUOCqNyEr3NhlvD6+traP11tmgUVhhbNfHN VXTO48zwtkIWUSOI6CkDdHqhgYGZVVridh/FFVTB29TTs8841wmJ/JUJZrmUdA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=pass header.d=lists.sr.ht header.s=20240113 header.b=LR1gMFqo; dkim=pass header.d=maniero.me header.s=hostingermail1 header.b=TAMcCOVy; dmarc=pass (policy=none) header.from=maniero.me; spf=pass (aspmx1.migadu.com: domain of lists@sr.ht designates 46.23.81.152 as permitted sender) smtp.mailfrom=lists@sr.ht; arc=pass ("mailchannels.net:s=arc-2022:i=1") 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 A09FF17449 for ; Wed, 25 Sep 2024 20:30:58 +0200 (CEST) DKIM-Signature: a=rsa-sha256; bh=tlxxpaKhqp3256c3OTMefjt7faHMNClCt2QMY/zLenk=; c=simple/simple; d=lists.sr.ht; h=From:To:Cc:Subject:Date:List-Unsubscribe:List-Subscribe:List-Archive:List-Post:List-ID; q=dns/txt; s=20240113; t=1727289052; v=1; b=LR1gMFqoC+UoRVljpf37ASGCIXNwFgnrXPQjAIkDa0wKkJcruUOJEQ+kHrg+FJ5Rp8HrxnCk LcpC0xXbIABSjhJwmKrc09RV8yCXxEXgw5+V5vcWPUhQBcEh+1Jgn2kHlSJPv+orVjvIMgF0X8v BD4hN3COT0qipVuqcpE4n2wkIPKFIM/sOu/yYfQWWxWx/XlgzaBl1e924ItNyk+kKITgkKObgU+ jay9XiisUME8PIa5XWk5eaDHwRZGGNx/EqYQwru6/oqSqr3JUuOOLwqSWAXh2vKOMLqNiGPuMWi /5ZFeMBtL/KpwZ7MkWMeH8hgwi6OSSfpcxTxDlzbVmabQ== Received: from lists.sr.ht (unknown [46.23.81.154]) by mail-a.sr.ht (Postfix) with ESMTPSA id 787DF201FB for ; Wed, 25 Sep 2024 18:30:52 +0000 (UTC) Received: from antelope.elm.relay.mailchannels.net (antelope.elm.relay.mailchannels.net [23.83.212.4]) by mail-a.sr.ht (Postfix) with ESMTPS id 6F023201DF for <~johnnyrichard/olang-devel@lists.sr.ht>; Wed, 25 Sep 2024 18:30:51 +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 7F78B8A934E for <~johnnyrichard/olang-devel@lists.sr.ht>; Wed, 25 Sep 2024 18:30:49 +0000 (UTC) Received: from nl-srv-smtpout1.hostinger.io (trex-13.trex.outbound.svc.cluster.local [100.97.250.128]) (Authenticated sender: hostingeremail) by relay.mailchannels.net (Postfix) with ESMTPA id BB9678A72A8 for <~johnnyrichard/olang-devel@lists.sr.ht>; Wed, 25 Sep 2024 18:30:48 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1727289049; a=rsa-sha256; cv=none; b=Sev9UkgkusfFbQh7d2SBHiVogQ6V/wqeubHHjLYFexggTpqhxVWcvYwzpdFXUY1nH1+IhH w4XNt9w0OdR/PEKMRQy6F4f060oH5FI8HrEhaKyZlMcFKYbOOpAertDwFTDTbeNSgbST/Q A9iaSDUvOFo4quPKgnSMVO/MPpi7rcf3x0nWIP0UNFWmFGniyJfeQ65CnKTkW/uNfPO1GH OJ8Y/SPpfn78r5RWzXuzqpdiTSajGDS2WeIU93fYO9IA1ZGbCApa78x3Kx4j9Ota9UJO1z c46MOTInPMrPy48rNuw5dsZ78Jn/zMkPCFFxhNOQQ9Hrut8TyR/WjmL0RAiu9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1727289049; 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:dkim-signature; bh=w4rOkaDSVTVFRRDvaY50HOi3aaDvCiLWYCR41j/GT3w=; b=w2xCI09BMoVaHQfgP1OvW2N+ArSDOvD7sQomgoZGW4AIOlDv31Bv6XSrHjDmKZ70uK2btr okUTV1yp+92sMlTHlT9XvM2Khjm6fuCyypodQCgyXFwMrZAqDczMYjAsU/5L2LGpE/Qcb6 GWJAKoFj0U2WnT2QEbzrPm7r9FV2V6gdJj2WDWVWHc67iXYkL5mc2UhyEbxXESieguhsgo 9r5mcthw7U8s6mr1VRvewZksC8wHjnkokjkNOUi1DM1MdEH1D2BFq4tCFRjkDLrwnwBe4B r53jFSTgfdRZBThKPQ19aSs11bJuO0BfX7Ol6PfCpUBFCA1p7vpa5im5hamEsQ== ARC-Authentication-Results: i=1; rspamd-5b46bcd97f-tdrpd; 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-Society-Hook: 007c7f6007b128bc_1727289049251_497433742 X-MC-Loop-Signature: 1727289049251:1147796822 X-MC-Ingress-Time: 1727289049251 Received: from nl-srv-smtpout1.hostinger.io (nl-srv-smtpout1.hostinger.io [145.14.150.87]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.97.250.128 (trex/7.0.2); Wed, 25 Sep 2024 18:30:49 +0000 From: Carlos Maniero DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maniero.me; s=hostingermail1; t=1727289047; 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; bh=w4rOkaDSVTVFRRDvaY50HOi3aaDvCiLWYCR41j/GT3w=; b=TAMcCOVy+DxXoVpvafXZZ+1LsDG4qPP9UTeENv1nCmpzLDcWhY2pleqlZ7OGRAh09juAlQ 3lGF8Ydzh6Y7vE2RfqQIONlxSt3pf9wZWftx8E8sR4Jf7ZYCODdRONR5Z5BAWKNXazFqm5 yjy/NglZv3e2CslFlisWzvFrGp2TqbxnHb6gQGy6wiqpes9ZgY0QMZ+LfVrmKKslBxQ/Sk 84Zob8bQ6tKbfFH0tRubLPy2M53X00aBPdzQ5ZzCk0SdS/vWVTSk2cfakxvG/TL/Z0g/8f LvjlCvCQHi3H4HL+ZFJcbT8zucw7rDAQQki2HOV547vO8hP5SXawppsTYJqqNQ== To: ~johnnyrichard/olang-devel@lists.sr.ht Cc: Carlos Maniero Subject: [PATCH olang] parser: parse multiple function into a single translation unit Message-Id: <20240925183037.329803-1-carlos@maniero.me> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Date: Wed, 25 Sep 2024 18:30:46 +0000 (UTC) X-CM-Envelope: MS4xfN7U6IRowPzsQGJAdQ7N6jB6PfB/se/3JyaUrSC8NiuMto2v6ZNcYu8ub+R1PfVlJTI1h21WrMUK1U1OlAlxwjnVHirfIRZnm3EiUHd1pRVz9HHPQB0R H5UcRwLlllQCpcGi9AkPz4MvcuRKGkpARYe8W//YI+xITmLKatuETT3x9hCkB3XGExCefaU7tDFeeZ1iBw1KiFxOSMHHwmTKQkpiwYTy34eAALSe3Y4q5Bla X-CM-Analysis: v=2.4 cv=b6rg4cGx c=1 sm=1 tr=0 ts=66f456d6 a=WwxFCuf3mf1fs3oSi6/dng==:117 a=WwxFCuf3mf1fs3oSi6/dng==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=mDV3o1hIAAAA:8 a=ocB-ec-M_FaSG-8EHOwA:9 a=8BLBafn5BLLNjoW2i5ex:22 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-Country: NL X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -0.16 X-Spam-Score: -0.16 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Queue-Id: A09FF17449 X-TUID: 5gTDeuBYiWCL The parser was expecting a single function per translation unit, now it accepts many or none. It still only allowing functions definitions on translation units, soon variables and constants should also be allowed. Signed-off-by: Carlos Maniero --- src/parser.c | 21 +++++++++++++----- tests/olc/0028_function_call.ol | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 tests/olc/0028_function_call.ol diff --git a/src/parser.c b/src/parser.c index 11bb1cd..fba7b72 100644 --- a/src/parser.c +++ b/src/parser.c @@ -78,15 +78,24 @@ parser_init(parser_t *parser, lexer_t *lexer, arena_t *arena, char *file_path) ast_node_t * parser_parse_translation_unit(parser_t *parser) { + token_t token; + ast_node_t *translation_unit_node = ast_new_translation_unit(parser->arena); + skip_line_feeds(parser->lexer); - ast_node_t *fn = parser_parse_fn_definition(parser); - if (fn == NULL) { - return NULL; - } + lexer_peek_next(parser->lexer, &token); - ast_node_t *translation_unit_node = ast_new_translation_unit(parser->arena); + while (token.kind != TOKEN_EOF) { + ast_node_t *fn = parser_parse_fn_definition(parser); - list_append(translation_unit_node->as_translation_unit.decls, fn); + if (fn == NULL) { + return NULL; + } + + list_append(translation_unit_node->as_translation_unit.decls, fn); + + skip_line_feeds(parser->lexer); + lexer_peek_next(parser->lexer, &token); + } return translation_unit_node; } diff --git a/tests/olc/0028_function_call.ol b/tests/olc/0028_function_call.ol new file mode 100644 index 0000000..ccadc0d --- /dev/null +++ b/tests/olc/0028_function_call.ol @@ -0,0 +1,39 @@ +# Copyright (C) 2024 olang mantainers +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +fn main(): u8 { + # TODO: call the function once function call is implemented + return 0 +} + +fn add(a: u32, b: u32): u8 { + return a + b +} + +# TEST test_ast WITH +# Translation_Unit +# |-Function_Definition +# | `-Block +# | `-Return_Statement +# | `-Literal +# `-Function_Definition +# |-Param_Definition +# |-Param_Definition +# `-Block +# `-Return_Statement +# `-Binary_Operation (+) +# |-Reference +# `-Reference +# END base-commit: 75cfabf7da32ae460c6ecb4d4a705f4705fc2c86 -- 2.34.1