# HG changeset patch
# User kono
# Date 1201481892 -32400
# Node ID 31278b74094b5186e14bd24b96ce04f10c1e4c7d
# Parent  b508608e3ccea9b268e37c61c78af20056706c10
*** empty log message ***

diff -r b508608e3cce -r 31278b74094b build.xml
--- a/build.xml	Mon Jan 21 09:29:52 2008 +0900
+++ b/build.xml	Mon Jan 28 09:58:12 2008 +0900
@@ -8,7 +8,8 @@
 
   <target name="build">
     <mkdir dir="build"/> 
-    <javac encoding="UTF-8" srcdir="src" destdir="build">
+    <javac encoding="UTF-8" srcdir="src" destdir="build" fork="yes">
+	<compilerarg value="-J-Dfile.encoding=UTF8"/>
         <sourcepath>
 	 <pathelement path="src"/>
         </sourcepath>
@@ -52,7 +53,7 @@
             </fileset>
         </delete>
     </target>
-   <!-- tar zcvf JavaLite.tgz --exclude CVS JavaLite -->
+   <!-- tar zcvf JavaLite.tgz \-\-exclude CVS JavaLite -->
 
 
 </project>
diff -r b508608e3cce -r 31278b74094b src/lite/BDDSolver.java
--- a/src/lite/BDDSolver.java	Mon Jan 21 09:29:52 2008 +0900
+++ b/src/lite/BDDSolver.java	Mon Jan 28 09:58:12 2008 +0900
@@ -10,7 +10,7 @@
 	 */
 	public ITLSolver var;
 	public BDDSolver high; // true
-	public BDDSolver low;  // flase
+	public BDDSolver low;  // false
 	public BDDID id;
 	
 	public BDDSolver(ITLSolver var, BDDSolver high, BDDSolver low) {
diff -r b508608e3cce -r 31278b74094b src/lite/ChopSolver.java
--- a/src/lite/ChopSolver.java	Mon Jan 21 09:29:52 2008 +0900
+++ b/src/lite/ChopSolver.java	Mon Jan 28 09:58:12 2008 +0900
@@ -92,7 +92,7 @@
 			try {
 				sat.empty.setValue(false);
 				if (value==null) {
-					// former is falied on empty, try more
+					// former is failed on empty, try more
 					return former.sat(sat,  new ChopSolver4(next));
 				} else {
 					// former is true on empty try later part on outer interval
@@ -154,7 +154,7 @@
 		
 		public ITLSolver next(ITLSatisfier sat, ITLSolver value) throws Backtrack {
 			try {
-				if (value==null) {  // former is fail on more inerval
+				if (value==null) {  // former is fail on more interval
 					return next.next(sat,later1);
 				} else {
 					// we don't have to execute later case now, do it on next clock
diff -r b508608e3cce -r 31278b74094b src/parser/ITLCommander.java
--- a/src/parser/ITLCommander.java	Mon Jan 21 09:29:52 2008 +0900
+++ b/src/parser/ITLCommander.java	Mon Jan 28 09:58:12 2008 +0900
@@ -16,12 +16,12 @@
 
 
 	private ITLNodeFactoryInterface<Node> lf;
-	private ITLNodeParser parser;
+	private ITLNodeParser<Node> parser;
 	public BDDSatisfier sat;
 	private TreeMap<Integer,Node> examples;
 	private BDDDiagnosis diag;
 
-	public ITLCommander(ITLNodeFactoryInterface<Node> lf, ITLNodeParser parser) {
+	public ITLCommander(ITLNodeFactoryInterface<Node> lf, ITLNodeParser<Node> parser) {
 		this.lf = lf;
 		this.parser = parser;
 		this.examples = new TreeMap<Integer,Node>();
@@ -47,14 +47,14 @@
 		
 		// All names used here have to be reserved. Otherwise, parser generated name becomes 
 		// different string at run time, as a result, name=="less" will fail even if name contains "less". 
-		// If we reseve it, paredicateNode.varaibleNode.name contains pregenerated String which is 
+		// If we reserve it, paredicateNode.varaibleNode.name contains pregenerated String which is 
 		// equivalent to used here. Of course name.equal("less") works fine, but it is time consuming. 
 		// Although it is practically allowed but I cannot accept.
 		
 		// We can also define Command as internal interface class in ITLNodeParser. In this case
 		// reserve operation is not required, like "length" macro.
 
-		// I put most intepretive command here, because it is easy to do so. But it should
+		// I put most interpretive command here, because it is easy to do so. But it should
 		// be in Executer. Otherwise, all other expressions remain unchecked.
 		
 		String name = predicate.toString();
@@ -137,7 +137,7 @@
 	}
 
 	private int atoi(LinkedList<Node> args) {
-		// should have more strcit check..
+		// should have more strict check..
 		int i=-1;
 		if (args.size()==0) return i;
 		Node n = args.get(0);
diff -r b508608e3cce -r 31278b74094b src/parser/LogicNodeScanner.java
--- a/src/parser/LogicNodeScanner.java	Mon Jan 21 09:29:52 2008 +0900
+++ b/src/parser/LogicNodeScanner.java	Mon Jan 28 09:58:12 2008 +0900
@@ -29,7 +29,7 @@
 	public Matcher scan;
 	public Token<Node> nextToken;
 	public Dictionary<Node> dict;
-	public LogicNodeScanner next;
+	public LogicNodeScanner<Node> next;
 	protected CharBuffer cb;
 	private InputStreamReader file;
 	private String filename;
@@ -73,8 +73,8 @@
 	 *    may return nullToken. So nextToken.type is always valid.
 	 *    nullToken means the end of the input.
 	 *    
-	 *    Token is a syntax element and it may have macro binidng as
-	 *    predicate, infix or prefix operaotor. To get the value, use
+	 *    Token is a syntax element and it may have macro binding as
+	 *    predicate, infix or prefix operator. To get the value, use
 	 *    makeVariable(). Operator order for infix and prefix is in
 	 *    Token.order. TokenID.order is default order for fix element and
 	 *    currently never used.
diff -r b508608e3cce -r 31278b74094b src/parser/LogicNodeScope.java
--- a/src/parser/LogicNodeScope.java	Mon Jan 21 09:29:52 2008 +0900
+++ b/src/parser/LogicNodeScope.java	Mon Jan 28 09:58:12 2008 +0900
@@ -3,12 +3,12 @@
 import java.util.TreeMap;
 
 /*
- * Scope mechnism for local variable
+ * Scope mechanism for local variable
  *    define("<>(x)","~(true& ~x)");
- *    previous x token is stored in an assocation list
+ *    previous x token is stored in an association list
  *    pop() remove local x token and restore previous x.
  *    previous x may be null. We cannot use this scope
- *    for quantifiers since our macro evaluator alreday
+ *    for quantifiers since our macro evaluator already
  *    convert everything in symbols.
  */
 public class LogicNodeScope<Node> {
diff -r b508608e3cce -r 31278b74094b src/parser/MacroNodeParser.java
--- a/src/parser/MacroNodeParser.java	Mon Jan 21 09:29:52 2008 +0900
+++ b/src/parser/MacroNodeParser.java	Mon Jan 28 09:58:12 2008 +0900
@@ -12,12 +12,12 @@
 	/*
 	 * Logic Node Parser with Macro Expansion
 	 *       parser.define("head(var)","body = var");
-	 *       "head(x+1)" is replcaed by "body = (x+1)" and parsed
+	 *       "head(x+1)" is replaced by "body = (x+1)" and parsed
 	 *       
 	 *  A macro definition is stored in MacroNode. The MacroNode is stored in
 	 *  dict by MacroNodeFactory.predicateNode(); MacroNode has to know the parser
 	 *  to parse expanded macro. It is possible to parse macro body before expansion,
-	 *  but its implementation is sligtly complex.      
+	 *  but its implementation is slightly complex.      
 	 */
 	
 	public LogicNodeFactoryInterface<Node> logicNodeFactory;
@@ -52,7 +52,7 @@
 	}
 
 	/*
-	 *   Recurseive Decent with operator order
+	 *   Recursive Decent with operator order
 	 *      n1 op n2 op2 ...
 	 *      
 	 *      When the nextToken is a macro, nextToken.type is
diff -r b508608e3cce -r 31278b74094b src/sbdd/BDDDiagnosis.java
--- a/src/sbdd/BDDDiagnosis.java	Mon Jan 21 09:29:52 2008 +0900
+++ b/src/sbdd/BDDDiagnosis.java	Mon Jan 28 09:58:12 2008 +0900
@@ -199,7 +199,7 @@
 		// if (length<0) return;
 		trace.addFirst(e);
 		if (e==start) throw new Result();
-		for(SBDDEntry p: reachable) {   // linear serach ?! should we create reverse index?
+		for(SBDDEntry p: reachable) {   // linear search ?! should we create reverse index?
 			if (trace.contains(p)) continue; 
 			if (p.nexts!=null && p.nexts.contains(e)) {
 				if (p==start)
diff -r b508608e3cce -r 31278b74094b src/sbdd/BDDSatisfier.java
--- a/src/sbdd/BDDSatisfier.java	Mon Jan 21 09:29:52 2008 +0900
+++ b/src/sbdd/BDDSatisfier.java	Mon Jan 28 09:58:12 2008 +0900
@@ -52,7 +52,7 @@
 	
 	public BDDSatisfier() {
 		init();
-		lf = sf; // this is strage.
+		lf = sf; // this is strange.
 		// the parser uses ITLNodeFactory for syntax tree, but in Satisfier,
 		// SBDDFactory have be used. 
 		true_ = SBDDFactory.trueSolver;
diff -r b508608e3cce -r 31278b74094b src/sbdd/SBDDFactory.java
--- a/src/sbdd/SBDDFactory.java	Mon Jan 21 09:29:52 2008 +0900
+++ b/src/sbdd/SBDDFactory.java	Mon Jan 28 09:58:12 2008 +0900
@@ -37,7 +37,7 @@
 	}
 
 	public BDDSolver chopNode(ITLSolver solver, ITLSolver solver2) {
-		BDDSolver former = solver.toSBDD(this); // unnecesarry?
+		BDDSolver former = solver.toSBDD(this); // unnecessary?
 		BDDSolver later = solver2.toSBDD(this);
 		if (former==emptySolver) return hash.put(later); 
 		if (later==emptySolver) return hash.put(former); 
diff -r b508608e3cce -r 31278b74094b src/sbdd/SBDDSet.java
--- a/src/sbdd/SBDDSet.java	Mon Jan 21 09:29:52 2008 +0900
+++ b/src/sbdd/SBDDSet.java	Mon Jan 28 09:58:12 2008 +0900
@@ -22,7 +22,7 @@
 	public Object lastEntry;
 	SBDDFactory sf;
 	int size = 0;
-	// Multiple SBDDSet is not recomended, but just in case, we make variable
+	// Multiple SBDDSet is not recommended, but just in case, we make variable
 	// order is shared among existing SBDDSet.
 	static final int INITIAL_SUBTERMS = 10;
 	static int subterms = INITIAL_SUBTERMS;