Merge pull request #67 from puguo/main

Enhanced resolver for Macro Expansion

Author: cdstanford

data/results/test_all.csv

@@ -1,15 +1,15 @@
 crate, effects, macros, macro LoC, conditional blocks, conditional LoC, skipped calls, skipped call LoC, skipped fn pointers, skipped pointers LoC, skipped other, skipped other LoC, unsafe traits, unsafe trait LoC, unsafe impls, unsafe impl LoC, public fns, public fns with effects, public total effects, audited fns, audited LoC, total LoC
-caller-checked, 15, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 4, 31, 10, 58, 85
+caller-checked, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 4, 9, 10, 58, 85
 cfg-ex, 3, 2, 2, 4, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 4, 11, 55
-dependency-ex, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 18, 23
+dependency-ex, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 3, 2, 18, 23
 dependency-parent, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 11, 13
 dummy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 103
 ffi-ex, 16, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 17, 16, 16, 16, 49, 118
-fns-closures, 7, 9, 9, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 7, 3, 5, 6, 20, 136
+fns-closures, 8, 9, 9, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 7, 3, 6, 6, 20, 136
 fnv_minimal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 135
 inline-ex, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 13
 libc-ex, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 1, 12, 15
-macro_test, 0, 16, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 162
+macro_test, 0, 18, 158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 196
 num_cpus_minimal, 2, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 24, 37
 parsing-ex, 0, 7, 13, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 146
 permissions-ex, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 10, 3, 10, 17

data/results/test_metadata.csv

@@ -1,20 +1,20 @@
-crate, [ClosureCreation], [FFI Call], [FFI Declaration], [FnPtrCreation], [PtrDeref], [StaticExtVar], [StaticMutVar], [UnionField], [UnsafeCall], libc, std::env, std::ffi, std::fs, std::io, std::net, std::path, std::process
-caller-checked, 0, 4, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0
-cfg-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0
-dependency-ex, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0
-dependency-parent, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-dummy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-ffi-ex, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-fns-closures, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 1
-fnv_minimal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-inline-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-libc-ex, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0
-macro_test, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-num_cpus_minimal, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0
-parsing-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-permissions-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 4
-recursion-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4
-resolution-ex, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-toy-crates, 1, 0, 0, 0, 1, 0, 0, 0, 6, 0, 1, 1, 0, 0, 2, 0, 3
-trait-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-unsafe-test, 0, 2, 1, 0, 2, 1, 1, 3, 1, 0, 0, 0, 2, 1, 0, 0, 0
+crate, [ClosureCreation], [FFI Call], [FFI Declaration], [FnPtrCreation], [PtrDeref], [StaticExtVar], [StaticMutVar], [UnionField], [UnsafeCall], std::env, std::ffi, std::fs, std::io, std::net, std::path, std::process
+caller-checked, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+cfg-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0
+dependency-ex, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0
+dependency-parent, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+dummy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ffi-ex, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+fns-closures, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 2
+fnv_minimal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+inline-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+libc-ex, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+macro_test, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+num_cpus_minimal, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+parsing-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+permissions-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 4
+recursion-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4
+resolution-ex, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+toy-crates, 1, 0, 0, 0, 1, 0, 0, 0, 6, 1, 1, 0, 0, 2, 0, 3
+trait-ex, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+unsafe-test, 0, 2, 1, 0, 2, 1, 1, 3, 1, 0, 0, 2, 1, 0, 0, 0

data/results/test_patterns.csv

@@ -1,13 +1,13 @@
 crate, effects
 ffi-ex, 16
-caller-checked, 15
 toy-crates, 15
 unsafe-test, 14
-fns-closures, 7
+fns-closures, 8
 permissions-ex, 6
+caller-checked, 5
 recursion-ex, 4
 cfg-ex, 3
-dependency-ex, 2
+dependency-ex, 3
 libc-ex, 2
 num_cpus_minimal, 2
 resolution-ex, 2