rustwasm/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/rustwasm/wasm-bindgen.git synced 2024-12-25 02:53:07 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix parsing some Rust keywords in attributes

Browse Source 
Closes #193
This commit is contained in:
Alex Crichton 2018-05-09 08:01:57 -07:00
parent 8df5ea7084
commit 06664b34ce
2 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/backend/src/ast.rs
View File

@ -908,7 +908,7 @@ impl syn::synom::Synom for BindgenAttr {
call!(term, "getter") >>
val: option!(do_parse!(
punct!(=) >>
s: syn!(syn::Ident) >>
s: call!(term2ident) >>
(s)
)) >>
(val)
@ -918,7 +918,7 @@ impl syn::synom::Synom for BindgenAttr {
call!(term, "setter") >>
val: option!(do_parse!(
punct!(=) >>
s: syn!(syn::Ident) >>
s: call!(term2ident) >>
(s)
)) >>
(val)
@ -931,7 +931,7 @@ impl syn::synom::Synom for BindgenAttr {
do_parse!(
call!(term, "js_namespace") >>
punct!(=) >>
ns: syn!(syn::Ident) >>
ns: call!(term2ident) >>
(ns)
)=> { BindgenAttr::JsNamespace }
|
@ -952,7 +952,7 @@ impl syn::synom::Synom for BindgenAttr {
do_parse!(
call!(term, "js_name") >>
punct!(=) >>
ns: syn!(syn::Ident) >>
ns: call!(term2ident) >>
(ns)
)=> { BindgenAttr::JsName }
));
@ -995,6 +995,19 @@ fn term<'a>(cursor: syn::buffer::Cursor<'a>, name: &str) -> syn::synom::PResult<
syn::parse_error()
}
fn term2ident<'a>(cursor: syn::buffer::Cursor<'a>)
-> syn::synom::PResult<'a, syn::Ident>
{
if let Some((term, next)) = cursor.term() {
let n = term.to_string();
if !n.starts_with("'") {
let i = syn::Ident::new(&n, term.span());
return Ok((i, next));
}
}
syn::parse_error()
}
fn assert_no_lifetimes(decl: &mut syn::FnDecl) {
struct Walk;

35
tests/all/imports.rs
View File

@ -429,3 +429,38 @@ fn versions() {
"#)
.test();
}
#[test]
fn rust_keyword() {
project()
.file("src/lib.rs", r#"
#![feature(proc_macro, wasm_custom_section, wasm_import_module)]
extern crate wasm_bindgen;
use wasm_bindgen::prelude::*;
#[wasm_bindgen(module = "./test")]
extern {
#[wasm_bindgen(js_name = self)]
fn foo() -> u32;
}
#[wasm_bindgen]
pub fn run() {
assert_eq!(foo(), 2);
}
"#)
.file("test.ts", r#"
import { run } from "./out";
export function self() {
return 2;
}
export function test() {
run();
}
"#)
.test();
}