openharmony/third_party_rust_cxx
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_cxx synced 2024-11-24 07:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move error collection one level out of type checker

Browse Source
This commit is contained in:
David Tolnay 2020-05-03 23:43:33 -07:00
parent df344a82d9
commit 0dd85ff5f7
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gen/src/mod.rs
View File

@ -8,6 +8,7 @@ mod write;
use self::error::{format_err, Error, Result};
use crate::syntax::namespace::Namespace;
use crate::syntax::report::Errors;
use crate::syntax::{self, check, Types};
use quote::quote;
use std::fs;
@ -42,12 +43,14 @@ fn generate(path: &Path, opt: Opt, header: bool) -> Vec<u8> {
};
match (|| -> Result<_> {
proc_macro2::fallback::force();
let ref mut errors = Errors::new();
let syntax = syn::parse_file(&source)?;
let bridge = find_bridge_mod(syntax)?;
let ref namespace = bridge.namespace;
let ref apis = syntax::parse_items(bridge.module)?;
let ref types = Types::collect(apis)?;
check::typecheck(namespace, apis, types)?;
check::typecheck(errors, namespace, apis, types);
errors.propagate()?;
let out = write::gen(namespace, apis, types, opt, header);
Ok(out)
})() {

5
macro/src/expand.rs
View File

@ -1,5 +1,6 @@
use crate::syntax::atom::Atom::{self, *};
use crate::syntax::namespace::Namespace;
use crate::syntax::report::Errors;
use crate::syntax::symbol::Symbol;
use crate::syntax::{
self, check, mangle, Api, Enum, ExternFn, ExternType, Signature, Struct, Type, Types,
@ -9,6 +10,7 @@ use quote::{format_ident, quote, quote_spanned, ToTokens};
use syn::{parse_quote, Error, ItemMod, Result, Token};
pub fn bridge(namespace: &Namespace, ffi: ItemMod) -> Result<TokenStream> {
let ref mut errors = Errors::new();
let ident = &ffi.ident;
let content = ffi.content.ok_or(Error::new(
Span::call_site(),
@ -16,7 +18,8 @@ pub fn bridge(namespace: &Namespace, ffi: ItemMod) -> Result<TokenStream> {
))?;
let ref apis = syntax::parse_items(content.1)?;
let ref types = Types::collect(apis)?;
check::typecheck(namespace, apis, types)?;
check::typecheck(errors, namespace, apis, types);
errors.propagate()?;
let mut expanded = TokenStream::new();
let mut hidden = TokenStream::new();

12
syntax/check.rs
View File

@ -10,7 +10,6 @@ use quote::{quote, ToTokens};
use std::collections::HashSet;
use std::fmt::Display;
use std::u32;
use syn::Result;
pub(crate) struct Check<'a> {
namespace: &'a Namespace,
@ -19,16 +18,13 @@ pub(crate) struct Check<'a> {
errors: &'a mut Errors,
}
pub(crate) fn typecheck(namespace: &Namespace, apis: &[Api], types: &Types) -> Result<()> {
let mut errors = Errors::new();
let mut cx = Check {
pub(crate) fn typecheck(cx: &mut Errors, namespace: &Namespace, apis: &[Api], types: &Types) {
do_typecheck(&mut Check {
namespace,
apis,
types,
errors: &mut errors,
};
do_typecheck(&mut cx);
errors.propagate()
errors: cx,
});
}
fn do_typecheck(cx: &mut Check) {