Commit 8f3e1ea0f07cdc7e94b0816ae3c58733df0f2786 | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-10-25 10:50:47-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-10-25 10:50:47-07:00
log	8f3e1ea0f07cdc7e94b0816ae3c58733df0f2786
tree	056a6a26d0186e17249aa36d918d364c34b48841
parent	d4bf44024a005fcd6931fd0975d78c890dedb4e6

AstGen: move nodeMayEvalToError logic for builtins

to the declarative BuiltinFn.zig file which lists info about all the
builtin functions.

2 files changed, 18 insertions(+), 13 deletions(-)

src
- AstGen.zig
- BuiltinFn.zig

src/AstGen.zig+2-13

 @@ -8339,7 +8339,7 @@ fn nodeMayNeedMemoryLocation(tree: *const Ast, start_node: Ast.Node.Index) bool
     }
 }
-fn nodeMayEvalToError(tree: *const Ast, start_node: Ast.Node.Index) enum { never, always, maybe } {
+fn nodeMayEvalToError(tree: *const Ast, start_node: Ast.Node.Index) BuiltinFn.EvalToError {
     const node_tags = tree.nodes.items(.tag);
     const node_datas = tree.nodes.items(.data);
     const main_tokens = tree.nodes.items(.main_token);
 @@ -8546,18 +8546,7 @@ fn nodeMayEvalToError(tree: *const Ast, start_node: Ast.Node.Index) enum { never
                 // If the builtin is an invalid name, we don't cause an error here; instead
                 // let it pass, and the error will be "invalid builtin function" later.
                 const builtin_info = BuiltinFn.list.get(builtin_name) orelse return .maybe;
-                return switch (builtin_info.tag) {
+                return builtin_info.eval_to_error;
-                    .as,
-                    .call,
-                    .field,
-                    => .maybe,
-                    .err_set_cast,
-                    .int_to_error,
-                    => .always,
-                    else => .never,
-                };
             },
         }
     }

src/BuiltinFn.zig+16

 @@ -119,10 +119,21 @@ pub const MemLocRequirement = enum {
     forward1,
 };
+pub const EvalToError = enum {
+    /// The builtin cannot possibly evaluate to an error.
+    never,
+    /// The builtin will always evaluate to an error.
+    always,
+    /// The builtin may or may not evaluate to an error depending on the parameters.
+    maybe,
+};
 tag: Tag,
 /// Info about the builtin call's ability to take advantage of a result location pointer.
 needs_mem_loc: MemLocRequirement = .never,
+/// Info about the builtin call's possibility of returning an error.
+eval_to_error: EvalToError = .never,
 /// `true` if the builtin call can be the left-hand side of an expression (assigned to).
 allows_lvalue: bool = false,
 /// The number of parameters to this builtin function. `null` means variable number
 @@ -158,6 +169,7 @@ pub const list = list: {
             .{
                 .tag = .as,
                 .needs_mem_loc = .forward1,
+                .eval_to_error = .maybe,
                 .param_count = 2,
             },
         },
 @@ -258,6 +270,7 @@ pub const list = list: {
             .{
                 .tag = .call,
                 .needs_mem_loc = .always,
+                .eval_to_error = .maybe,
                 .param_count = 3,
             },
         },
 @@ -391,6 +404,7 @@ pub const list = list: {
             "@errSetCast",
             .{
                 .tag = .err_set_cast,
+                .eval_to_error = .always,
                 .param_count = 2,
             },
         },
 @@ -420,6 +434,7 @@ pub const list = list: {
             .{
                 .tag = .field,
                 .needs_mem_loc = .always,
+                .eval_to_error = .maybe,
                 .param_count = 2,
                 .allows_lvalue = true,
             },
 @@ -512,6 +527,7 @@ pub const list = list: {
             "@intToError",
             .{
                 .tag = .int_to_error,
+                .eval_to_error = .always,
                 .param_count = 1,
             },
         },