[Javabdd-checkins] JavaBDD_tests/trace TraceDriver.java,1.2,1.3

[John W. <joe...@us...>]

Update of /cvsroot/javabdd/JavaBDD_tests/trace
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7799/trace

Modified Files:
	TraceDriver.java 
Log Message:
Handle '-' in identifiers.




Index: TraceDriver.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD_tests/trace/TraceDriver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TraceDriver.java	6 May 2005 07:02:53 -0000	1.2
--- TraceDriver.java	6 May 2005 21:41:26 -0000	1.3
***************
*** 306,309 ****
--- 306,310 ----
      private int [] stack;
      private int stack_tos, nodes, cache, vars;
+     private static int auto_reorder = Integer.parseInt(System.getProperty("reorder", "0"));
      private HashMap map;
      private BDDPairing s2sp, sp2s;
***************
*** 422,425 ****
--- 423,431 ----
  
          bdd = BDDFactory.init(nodes, cache);
+         if (auto_reorder != 0) {
+             out.println("setting auto reorder to " + auto_reorder);
+             bdd.autoReorder(getReorderMethod(auto_reorder));
+             bdd.varBlockAll();
+         }
          //bdd.setNodeNames(new TracedNames() );
      }
***************
*** 586,592 ****
                  need("("); String str = need();   TracedVariable v = needVar(str);need(")"); need(";");
                  createSaveOperation(v);
!             } else if(ret.equals("check_point_for_force_reordering")) {
!                 out.println("NOTE: ignoring variable-reordering request");
!                 skip_eol();
              } else {
  
--- 592,601 ----
                  need("("); String str = need();   TracedVariable v = needVar(str);need(")"); need(";");
                  createSaveOperation(v);
!             } else if(ret.equals("check_point_for_force_reordering")) { 
!                 need("("); String str = need(); 
!                 int type = Integer.parseInt(str);
!                 need(")"); need(";");
!                 BDDFactory.ReorderMethod m = getReorderMethod(type);
!                 bdd.reorder(m);
              } else {
  
***************
*** 644,647 ****
--- 653,672 ----
      }
  
+     private static BDDFactory.ReorderMethod getReorderMethod(int type) {
+         BDDFactory.ReorderMethod m;
+         switch (type) {
+         case 0:  m = BDDFactory.REORDER_NONE; break;
+         case 1:  m = BDDFactory.REORDER_WIN2; break;
+         case 2:  m = BDDFactory.REORDER_WIN2ITE; break;
+         case 3:  m = BDDFactory.REORDER_WIN3; break;
+         case 4:  m = BDDFactory.REORDER_WIN3ITE; break;
+         case 5:  m = BDDFactory.REORDER_SIFT; break;
+         case 6:  m = BDDFactory.REORDER_SIFTITE; break;
+         default: m = BDDFactory.REORDER_NONE; break;
+         }
+         return m;
+     }
+ 
+ 
      // --------------------------------------------------------------------------------------------
  
***************
*** 761,765 ****
      }
      private boolean isSpace(int c) { return (c == ' ' || c == '\n' || c == '\t' || c == '\r'); }
!     private boolean isAlnum(int c) { return ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')  || c == '_'); }
  
      // -----------------------------------------------------
--- 786,790 ----
      }
      private boolean isSpace(int c) { return (c == ' ' || c == '\n' || c == '\t' || c == '\r'); }
!     private boolean isAlnum(int c) { return ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')  || c == '_' || c == '-'); }
  
      // -----------------------------------------------------