From ca57e201500667e996e546731a5a2fcff1e58a38 Mon Sep 17 00:00:00 2001
From: Per <Per Lindgren>
Date: Mon, 19 Feb 2018 09:09:26 +0100
Subject: [PATCH] resource names correctly quoted
---
macros/src/trans.rs | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/macros/src/trans.rs b/macros/src/trans.rs
index ffdafae..1d1a5a6 100644
--- a/macros/src/trans.rs
+++ b/macros/src/trans.rs
@@ -426,6 +426,15 @@ fn init(app: &App, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) {
});
} else {
// code generation for klee mode
+ let mut tasks = vec![];
+ let mut index = 0;
+
+ for (name, task) in &app.tasks {
+ tasks.push(quote!{
+ 0 => { _EXTI1(); },
+ });
+ }
+
main.push(quote! {
// type check
//let init: fn(#(#tys,)*) #ret = #init;
@@ -481,11 +490,12 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
if cfg!(feature = "klee_mode") {
// collect the identifiers for our resources
- let mut names = Vec::new();
+ let mut names = vec![];
for name in ownerships.keys() {
let _name = Ident::new(format!("_{}", name.as_ref()));
+ let _nameq = Ident::new(format!("\"_{}\"", name.as_ref()));
names.push(quote!{
- k_symbol!(&mut #_name, "#_name");
+ k_symbol!(&mut #_name, #_nameq);
});
}
--
GitLab