mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4467 from mikdusan/translate-c-error

Browse Source 
translate-c: change OutOfMemory → ASTUnitFailure
This commit is contained in:
Michael Dusan 2020-02-15 15:45:02 -05:00 committed by GitHub
commit 652efe38b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-self-hosted/stage1.zig
View File

@ -92,6 +92,7 @@ const Error = extern enum {
InvalidCpuFeatures,
InvalidLlvmCpuFeaturesFormat,
UnknownApplicationBinaryInterface,
ASTUnitFailure,
};
const FILE = std.c.FILE;
@ -114,6 +115,7 @@ export fn stage2_translate_c(
out_errors_len.* = errors.len;
return Error.CCompileErrors;
},
error.ASTUnitFailure => return Error.ASTUnitFailure,
error.OutOfMemory => return Error.OutOfMemory,
};
return Error.None;

2
src-self-hosted/translate_c.zig
View File

@ -264,7 +264,7 @@ pub fn translate(
&errors.len,
resources_path,
) orelse {
if (errors.len == 0) return error.OutOfMemory;
if (errors.len == 0) return error.ASTUnitFailure;
return error.SemanticAnalyzeFail;
};
defer ZigClangASTUnit_delete(ast_unit);

1
src/error.cpp
View File

@ -64,6 +64,7 @@ const char *err_str(Error err) {
case ErrorInvalidCpuFeatures: return "invalid CPU features";
case ErrorInvalidLlvmCpuFeaturesFormat: return "invalid LLVM CPU features format";
case ErrorUnknownApplicationBinaryInterface: return "unknown application binary interface";
case ErrorASTUnitFailure: return "ASTUnit failure";
}
return "(invalid error)";
}

1
src/userland.h
View File

@ -84,6 +84,7 @@ enum Error {
ErrorInvalidCpuFeatures,
ErrorInvalidLlvmCpuFeaturesFormat,
ErrorUnknownApplicationBinaryInterface,
ErrorASTUnitFailure,
};
// ABI warning