info2: iterator count starts at 0, cleanup

info2.cpp

@@ -15,15 +15,6 @@ int main(int argc, char *argv[]) {
     auto scop = osl_scop_read(fp);
     fclose(fp);
 
-#if 0
-    int i = 0;
-    for(auto s = scop->statement; s; s = s->next, i++) {
-        for(int j = 0; j < s->domain->nb_output_dims; j++) {
-            std::cout << i << " " << j << "\n";
-        }
-    }
-#endif
-
     /*  want: list of statements to perforate
      * scop0 statement0 statement1 statement2
      */
@@ -32,17 +23,20 @@ int main(int argc, char *argv[]) {
     osl_statement_p current_scop = NULL;
 
     auto print_scop = [&i, &i_, &j, &current_scop]() {
+        if(!(current_scop->domain->nb_output_dims > 0))
+            return;
         std::cout << "scop" << j << ";";
         for(int x = i_; x < i; x++) {
             std::cout << x;
             if(x+1 < i)
-                std::cout << " ";
+                std::cout << "_";
         }
-        std::cout << ";" << current_scop->domain->nb_output_dims << "\n";
+        std::cout << ";" << current_scop->domain->nb_output_dims - 1 << "\n";
     };
 
     while(s) {
-        if(!current_scop || !osl_relation_equal(current_scop->domain, s->domain)) {
+        if(!current_scop
+               || !(osl_relation_equal(current_scop->domain, s->domain))) {
             /* new scop */
             if(current_scop) {
                 print_scop();

perf2.cpp

@@ -56,7 +56,7 @@ main(int argc, char *argv[]) {
             /* FIXME: iterator can also be no char but string, d'oh! */
             char it = 0;
             i = iterator;
-            for(auto cc: iter) {
+            for(auto cc : iter) {
                 if(std::isspace(cc))
                     continue;
                 if(!i) {