Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cop: Cherry pick several PRs to release-3.0 #5048

Merged
merged 6 commits into from Jul 12, 2019
Merged

cop: Cherry pick several PRs to release-3.0 #5048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4fe49d
Cherry pick #5007
breezewish Jul 9, 2019
cc1f0af
cop: add rpn function ABS (#4982)
mapleFU Jul 4, 2019
259dfde
cop: RPN function IN() (#5016)
breezewish Jul 5, 2019
6ff4127
cop: Support CASE_WHEN (#5020)
breezewish Jul 5, 2019
956eb33
Support RPN function validator
breezewish Jul 8, 2019
5db350f
Merge branch 'release-3.0' into release-3.0-cop2
breezewish Jul 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 4 additions & 18 deletions components/cop_codegen/src/lib.rs
View file
Open in desktop
Expand Up @@ -14,15 +14,9 @@ extern crate proc_macro;
mod aggr_function;
mod rpn_function;

use self::rpn_function::RpnFnGenerator;

use darling::FromDeriveInput;
use proc_macro::{Diagnostic, TokenStream};
use syn::parse::Parser;
use syn::punctuated::Punctuated;
use syn::{DeriveInput, Ident, ItemFn};

type Result<T> = std::result::Result<T, Diagnostic>;
use proc_macro::TokenStream;
use syn::DeriveInput;

#[proc_macro_derive(AggrFunction, attributes(aggr_function))]
pub fn aggr_function_derive(input: TokenStream) -> TokenStream {
Expand All @@ -36,16 +30,8 @@ pub fn aggr_function_derive(input: TokenStream) -> TokenStream {

#[proc_macro_attribute]
pub fn rpn_fn(attr: TokenStream, input: TokenStream) -> TokenStream {
let meta_parser = Punctuated::<Ident, Token![,]>::parse_terminated;
let meta = meta_parser.parse(attr).unwrap().into_iter().collect();
let item_fn = parse_macro_input!(input as ItemFn);

let input = RpnFnGenerator::new(meta, item_fn);
match input.map(RpnFnGenerator::generate) {
match rpn_function::transform(attr.into(), input.into()) {
Ok(tokens) => TokenStream::from(tokens),
Err(e) => {
e.emit();
TokenStream::new()
}
Err(e) => TokenStream::from(e.to_compile_error()),
}
}