-
Notifications
You must be signed in to change notification settings - Fork 744
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7166882
commit 85b8dbc
Showing
7 changed files
with
162 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
use proc_macro2::{Ident, TokenStream, TokenTree}; | ||
use quote::{quote, ToTokens}; | ||
use std::iter::FromIterator; | ||
use syn::parse::{Parse, ParseBuffer, ParseStream}; | ||
use syn::punctuated::Punctuated; | ||
use syn::Token; | ||
use syn::{braced, Expr}; | ||
|
||
#[derive(Debug)] | ||
pub struct PyDictLiteral { | ||
pub py: Ident, | ||
pub items: Vec<KeyValue>, | ||
} | ||
|
||
#[derive(Debug)] | ||
pub struct KeyValue { | ||
key: syn::Expr, | ||
sep: Token![:], | ||
value: syn::Expr, | ||
} | ||
|
||
#[derive(Debug)] | ||
struct Key(syn::Expr); | ||
|
||
impl Parse for Key { | ||
fn parse(input: ParseStream) -> syn::Result<Self> { | ||
let mut tokens = vec![]; | ||
|
||
while !input.peek(Token![:]) || input.peek(Token![::]) { | ||
let tt = input.parse::<TokenTree>()?; | ||
tokens.push(tt); | ||
} | ||
let stream = TokenStream::from_iter(tokens.into_iter()); | ||
|
||
let expr = syn::parse2::<Expr>(stream)?; | ||
Ok(Self(expr)) | ||
} | ||
} | ||
|
||
impl Parse for KeyValue { | ||
fn parse(input: ParseStream) -> syn::Result<Self> { | ||
let key: Key = input.parse()?; | ||
let sep: Token![:] = input.parse()?; | ||
let value: syn::Expr = input.parse()?; | ||
|
||
Ok(Self { | ||
key: key.0, | ||
sep, | ||
value, | ||
}) | ||
} | ||
} | ||
|
||
impl Parse for PyDictLiteral { | ||
fn parse(input: ParseStream) -> syn::Result<Self> { | ||
let py: Ident = input.parse()?; | ||
let _arrow: Token![=>] = input.parse()?; | ||
|
||
let body: ParseBuffer; | ||
braced!(body in input); | ||
|
||
let items: Punctuated<KeyValue, Token![,]> = Punctuated::parse_terminated(&body)?; | ||
|
||
Ok(Self { | ||
py, | ||
items: items.into_iter().collect(), | ||
}) | ||
} | ||
} | ||
|
||
impl ToTokens for KeyValue { | ||
fn to_tokens(&self, tokens: &mut TokenStream) { | ||
let key = &self.key; | ||
let value = &self.value; | ||
let ts = quote! {(#key, #value)}; | ||
tokens.extend(ts); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
use pyo3::prelude::*; | ||
use pyo3::{py_dict, py_run, py_tuple}; | ||
|
||
#[test] | ||
fn test_dict_literal() { | ||
let gil = Python::acquire_gil(); | ||
let py = gil.python(); | ||
|
||
let dict = py_dict!(py => {"key": "value"}).expect("failed to create dict"); | ||
assert_eq!( | ||
"value", | ||
dict.get_item("key").unwrap().extract::<String>().unwrap() | ||
); | ||
|
||
let value = "value"; | ||
let multi_elem_dict = | ||
py_dict!(py => {"key1": value, 143: "abcde"}).expect("failed to create dict"); | ||
assert_eq!( | ||
"value", | ||
multi_elem_dict | ||
.get_item("key1") | ||
.unwrap() | ||
.extract::<&str>() | ||
.unwrap() | ||
); | ||
assert_eq!( | ||
"abcde", | ||
multi_elem_dict | ||
.get_item(143) | ||
.unwrap() | ||
.extract::<&str>() | ||
.unwrap() | ||
); | ||
|
||
let keys = &["key1", "key2"]; | ||
|
||
let expr_dict = | ||
py_dict!(py => { keys[0]: "value1", keys[1]: "value2", 3-7: py_tuple!(py, ("elem1", "elem2", 3)) }) | ||
.expect("failed to create dict"); | ||
|
||
py_run!( | ||
py, | ||
expr_dict, | ||
"assert expr_dict == {'key1': 'value1', 'key2': 'value2', -4: ('elem1', 'elem2', 3)}" | ||
); | ||
} |