Merge pull request #141 from Raiden1411/ast

ast: allow parsing of multiple state modifiers

Author: Raiden1411

src/ast/Ast.zig

@@ -177,18 +177,23 @@ pub fn stateVariableDecl(self: Ast, node: Node.Index) ast.StateVariableDecl {
 
     std.debug.assert(token_tags.len > state);
 
-    switch (token_tags[state]) {
-        .keyword_public => result.public = state,
-        .keyword_private => result.private = state,
-        .keyword_internal => result.internal = state,
-        .keyword_constant => result.constant = state,
-        .keyword_immutable => result.immutable = state,
-        .keyword_override => result.override = state,
-        else => {
-            if (nodes.len > state and nodes[state] == .override_specifier) {
-                result.override = self.nodes.items(.main_token)[state];
-            }
-        },
+    const modifier_range = self.extraData(state, Node.Range);
+    const modifier_node = self.extra_data[modifier_range.start..modifier_range.end];
+
+    for (modifier_node) |state_mod| {
+        switch (token_tags[state_mod]) {
+            .keyword_public => result.public = state_mod,
+            .keyword_private => result.private = state_mod,
+            .keyword_internal => result.internal = state_mod,
+            .keyword_constant => result.constant = state_mod,
+            .keyword_immutable => result.immutable = state_mod,
+            .keyword_override => result.override = state_mod,
+            else => {
+                if (nodes.len > state and nodes[state] == .override_specifier) {
+                    result.override = self.nodes.items(.main_token)[state];
+                }
+            },
+        }
     }
 
     return result;
@@ -1076,6 +1081,7 @@ pub fn firstToken(self: Ast, node: Node.Index) TokenIndex {
             => current_node = data[current_node].lhs,
             .modifier_specifiers,
             .specifiers,
+            .state_modifiers,
             => {
                 const extra = self.extraData(main_token[current_node], Node.Range);
 
@@ -1539,6 +1545,7 @@ pub fn lastToken(self: Ast, node: Node.Index) TokenIndex {
 
             .specifiers,
             .modifier_specifiers,
+            .state_modifiers,
             => {
                 const extra = self.extraData(main_token[current_node], Node.Range);
 
@@ -2375,6 +2382,9 @@ pub const Node = struct {
         /// rhs is the expression or null_node.
         state_variable_decl,
         constant_variable_decl,
+        /// main token is the state keywords range.
+        /// lhs and rhs are undefined.
+        state_modifiers,
     };
 
     /// Range used for params and others

src/ast/Parser.zig

@@ -749,16 +749,7 @@ pub fn parseStateVariableDecl(self: *Parser) ParserErrors!Node.Index {
     if (type_decl == 0)
         return null_node;
 
-    const state = switch (self.token_tags[self.token_index]) {
-        .keyword_public,
-        .keyword_private,
-        .keyword_internal,
-        .keyword_constant,
-        .keyword_immutable,
-        => self.nextToken(),
-        .keyword_override => try self.parseOverrideSpecifier(),
-        else => return null_node,
-    };
+    const state = try self.parseStateModifier();
 
     _ = try self.expectToken(.identifier);
 
@@ -793,6 +784,40 @@ pub fn parseStateVariableDecl(self: *Parser) ParserErrors!Node.Index {
         else => return self.fail(.expected_semicolon),
     }
 }
+/// [Grammar](https://docs.soliditylang.org/en/latest/grammar.html#a4.SolidityParser.stateVariableDeclaration)
+///
+/// Parses specifically the state modifiers since solidity can have multiple
+pub fn parseStateModifier(self: *Parser) ParserErrors!Node.Index {
+    const scratch = self.scratch.items.len;
+    defer self.scratch.shrinkRetainingCapacity(scratch);
+
+    while (true) {
+        switch (self.token_tags[self.token_index]) {
+            .keyword_public,
+            .keyword_private,
+            .keyword_internal,
+            .keyword_constant,
+            .keyword_immutable,
+            => try self.scratch.append(self.allocator, self.nextToken()),
+            .keyword_override => try self.scratch.append(
+                self.allocator,
+                try self.parseOverrideSpecifier(),
+            ),
+            else => break,
+        }
+    }
+
+    const slice = self.scratch.items[scratch..];
+
+    return self.addNode(.{
+        .tag = .state_modifiers,
+        .main_token = try self.addExtraData(try self.listToSpan(slice)),
+        .data = .{
+            .lhs = undefined,
+            .rhs = undefined,
+        },
+    });
+}
 /// [Grammar](https://docs.soliditylang.org/en/latest/grammar.html#a4.SolidityParser.functionDefinition)
 pub fn parseFunctionSpecifiers(self: *Parser) ParserErrors!Node.Index {
     const scratch = self.scratch.items.len;
@@ -876,7 +901,8 @@ pub fn parseModifierSpecifiers(self: *Parser) ParserErrors!Node.Index {
 }
 /// [Grammar](https://docs.soliditylang.org/en/latest/grammar.html#a4.SolidityParser.overrideSpecifier)
 pub fn parseOverrideSpecifier(self: *Parser) ParserErrors!Node.Index {
-    const override = self.consumeToken(.keyword_override) orelse null_node;
+    const override = self.consumeToken(.keyword_override) orelse
+        return null_node;
 
     const scratch = self.scratch.items.len;
     defer self.scratch.shrinkRetainingCapacity(scratch);

src/clients/optimism/clients/L1PubClient.zig

@@ -203,7 +203,10 @@ pub fn L1Client(comptime client_type: Clients) type {
             return list.toOwnedSlice();
         }
         /// Returns if a withdrawal has finalized or not.
-        pub fn getFinalizedWithdrawals(self: *L1, withdrawal_hash: Hash) (EncodeErrors || ClientType.BasicRequestErrors || error{ExpectOpStackContracts})!bool {
+        pub fn getFinalizedWithdrawals(
+            self: *L1,
+            withdrawal_hash: Hash,
+        ) (EncodeErrors || ClientType.BasicRequestErrors || error{ExpectOpStackContracts})!bool {
             const contracts = self.rpc_client.network_config.op_stack_contracts orelse return error.ExpectOpStackContracts;
 
             const encoded = try abi_items.get_finalized_withdrawal.encode(self.allocator, .{withdrawal_hash});

tests/ast/parser.test.zig

@@ -873,8 +873,8 @@ test "Uniswap V3" {
         \\}
         \\
         \\contract UniswapV3Liquidity is IERC721Receiver {
-        \\    IERC20 private dai = IERC20(DAI);
-        \\    IWETH private weth = IWETH(WETH);
+        \\    IERC20 private immutable dai = IERC20(DAI);
+        \\    IWETH private constant weth = IWETH(WETH);
         \\
         \\    int24 private MIN_TICK = -887272;
         \\    int24 private MAX_TICK = -MIN_TICK;