fixed type mismatch issues

Author: calebwin

Cargo.lock

@@ -16,4 +16,4 @@ edition = "2018"
 
 [dependencies]
 ocl = "0.19.3"
-emu_macro = "0.1.0"
+emu_macro = { path = "../emu_macro" }

em/Cargo.toml

@@ -144,10 +144,10 @@ macro_rules! get_buffer_key {
 /// 3. Launching on the GPU with `gpu_do!(launch())`
 ///
 /// Note that data must be an identifier. The only hard requirement for data is
-/// that it must have the 2 following methods. 
+/// that it must have the 2 following methods.
 /// - `fn as_slice(&self) -> &[f32]`
 /// - `fn as_mut_slice(&mut self) -> &mut [f32]`
-/// 
+///
 /// There is a soft requirement that the data should be representing a list of
 /// `f32`s and indexing it with `data[i]` should return an `f32`. But this is
 /// really just to ensure that when we lift code from CPU to GPU it is

em/src/lib.rs

@@ -25,9 +25,8 @@ fn main() {
 // 	for (i, chunk) in x.chunks(10).enumerate() {
 // 		let mut scratch = vec![0.0; 10];
 // 		for (j, _) in chunk.enumerate() {
-			
+
 // 		}
 // 	}
 
-
-// }
+// }

emu_examples/arithmetic/src/main.rs

@@ -13,9 +13,9 @@ use syn::visit::Visit;
 use syn::*;
 
 // for etc.use crate::generator::Generator;
+use crate::generator::Generator;
 use crate::identifier::get_global_work_size;
 use crate::identifier::Dim;
-use crate::generator::Generator;
 
 // there is passing
 // then there is accelerating

emu_macro/src/accelerating.rs

@@ -16,11 +16,11 @@ use syn::fold::Fold;
 use syn::*;
 
 // THE TABLE OF CONTENTS
-// 
+//
 // these modules are the main modules Emu uses
 mod accelerating; // for looking through code for gpu_do!() and using the GPU appropriately
 mod passing; // for passing around a reference to the GPU from function to function
-// these modules are more linke utilities for Emu
+             // these modules are more linke utilities for Emu
 mod generator; // for generating OpenCL from Rust
 mod identifier; // for identifying a for loop as potentially something we can work with
 mod inspector; // for inspecting a function for more info

emu_macro/src/lib.rs

@@ -236,9 +236,7 @@ impl Fold for HelperFunctionReturnModifier {
 // modifies return statements
 // this mainly just creates an instance of the above "folder" that we defined
 // we then just invoke it's "fold_item_fn" method to fold on the function
-pub fn modify_returns_for_helper_function(
-    input: TokenStream,
-) -> Result<TokenStream, Vec<Error>> {
+pub fn modify_returns_for_helper_function(input: TokenStream) -> Result<TokenStream, Vec<Error>> {
     // parse into function
     let maybe_ast = syn::parse::<ItemFn>(input.clone());
 
@@ -340,8 +338,9 @@ impl Fold for HelperFunctionInvocationModifier {
                 }
 
                 if is_helper_function_invocation {
-                    let gpu_ident = quote! {gpu}.into();
-                    i.args.insert(0, gpu_ident);
+                    let gpu_ident = syn::Ident::new("gpu", syn::export::Span::call_site());
+                    i.args
+                        .insert(0, syn::Expr::Verbatim(gpu_ident.to_token_stream()));
 
                     let new_code = quote! {
                         {