Mercurial > hg > Applications > JavaLite

changeset 108:b508608e3cce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author kono
date Mon, 21 Jan 2008 09:29:52 +0900
parents 30e74062f06c
children 31278b74094b
files README src/data/README src/lite/BDDSolver.java src/lite/EmptySolver.java src/lite/NextSolver.java src/lite/ProjectionSolver.java src/parser/Command.java src/parser/ExecuterInterface.java src/parser/ExecutorInterface.java src/parser/ITLCommander.java src/parser/LogicNodeParser.java src/parser/NullExecuter.java src/parser/NullExecutor.java src/sbdd/BDDSatisfier.java
diffstat 14 files changed, 29 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/README	Sun Jan 20 18:22:55 2008 +0900
+++ b/README	Mon Jan 21 09:29:52 2008 +0900
@@ -1,4 +1,4 @@
-LITE: A little LITL Verifier version 0.1
+LITE: A little LITL Verifier version 0.11
 
 ************************************************************************
 ** Copyright (C) 1994,1991,2008
--- a/src/data/README	Sun Jan 20 18:22:55 2008 +0900
+++ b/src/data/README	Mon Jan 21 09:29:52 2008 +0900
@@ -1,4 +1,4 @@
-LITE: A little LITL Verifier version 0.1
+LITE: A little LITL Verifier version 0.11
 
 ************************************************************************
 ** Copyright (C) 1994,1991,2008
--- a/src/lite/BDDSolver.java	Sun Jan 20 18:22:55 2008 +0900
+++ b/src/lite/BDDSolver.java	Mon Jan 21 09:29:52 2008 +0900
@@ -171,7 +171,7 @@
 	}
 
 	public boolean equals(Object o) {
-		if (o==this) return true;
+		// if (o==this) return true;
 		// if (o.hashCode()!=hashCode()) return false;
 		if (o.getClass()==this.getClass()) {
 			BDDSolver v = (BDDSolver)o;
--- a/src/lite/EmptySolver.java	Sun Jan 20 18:22:55 2008 +0900
+++ b/src/lite/EmptySolver.java	Mon Jan 21 09:29:52 2008 +0900
@@ -54,7 +54,7 @@
 	
 
 	public boolean equals(Object o) {
-		if (o.hashCode()!=hashCode()) return false;
+		//if (o.hashCode()!=hashCode()) return false;
 		if (o.getClass()==this.getClass()) {
 			EmptySolver v = (EmptySolver)o;
 			return v.name == name;
--- a/src/lite/NextSolver.java	Sun Jan 20 18:22:55 2008 +0900
+++ b/src/lite/NextSolver.java	Mon Jan 21 09:29:52 2008 +0900
@@ -28,7 +28,7 @@
 	}
 
 	public boolean equals(Object o) {
-		if (o.hashCode()!=hashCode()) return false;
+		//if (o.hashCode()!=hashCode()) return false;
 		if (o.getClass()==this.getClass()) {
 			NextSolver v = (NextSolver)o;
 			return node.equals(v.node);
--- a/src/lite/ProjectionSolver.java	Sun Jan 20 18:22:55 2008 +0900
+++ b/src/lite/ProjectionSolver.java	Mon Jan 21 09:29:52 2008 +0900
@@ -97,7 +97,7 @@
 	}
 
 	public boolean equals(Object o) {
-		if (o.hashCode()!=hashCode()) return false;
+		//if (o.hashCode()!=hashCode()) return false;
 		if (o.getClass()==this.getClass()) {
 			ProjectionSolver v = (ProjectionSolver)o;
 			return clock.equals(v.clock)&& interval.equals(v.interval);
--- a/src/parser/Command.java	Sun Jan 20 18:22:55 2008 +0900
+++ b/src/parser/Command.java	Mon Jan 21 09:29:52 2008 +0900
@@ -4,5 +4,7 @@
 
 
 public interface Command<Node> {
+	// Macro command interface
+	//   Interpretive command should be in Executer ( Executer Interface )
 	Node exec(Node predicate, Node value, LinkedList<Node>args);
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/parser/ExecuterInterface.java	Mon Jan 21 09:29:52 2008 +0900
@@ -0,0 +1,5 @@
+package parser;
+
+public interface ExecuterInterface<T> {
+	public void exec(T n);
+}
--- a/src/parser/ExecutorInterface.java	Sun Jan 20 18:22:55 2008 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-package parser;
-
-public interface ExecutorInterface<Node> {
-
-	public void verify(Node n);
-
-}
\ No newline at end of file
--- a/src/parser/ITLCommander.java	Sun Jan 20 18:22:55 2008 +0900
+++ b/src/parser/ITLCommander.java	Mon Jan 21 09:29:52 2008 +0900
@@ -54,6 +54,9 @@
 		// 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
+		// be in Executer. Otherwise, all other expressions remain unchecked.
+		
 		String name = predicate.toString();
 		
 		if (name=="less") {
--- a/src/parser/LogicNodeParser.java	Sun Jan 20 18:22:55 2008 +0900
+++ b/src/parser/LogicNodeParser.java	Mon Jan 21 09:29:52 2008 +0900
@@ -39,7 +39,7 @@
 	public int position;
 	public int end;
 	public Token<Node> nextToken;
-	private ExecutorInterface<Node> exec = new NullExecutor<Node>();
+	private ExecuterInterface<Node> exec = new NullExecuter<Node>();
 
 	public LogicNodeParser() {
 		super();
@@ -119,7 +119,7 @@
 		Node n;
 		do {
 			n=parse();
-			exec.verify(n);
+			exec.exec(n);
 		} while(scanner.hasRemaining());
 		scanner = scanner.popScanner();
 		nextToken = scanner.nextToken;
@@ -270,7 +270,7 @@
 		return nextToken = scanner.nextToken();
 	}
 
-	public void setExecutor(ExecutorInterface<Node> exec) {
+	public void setExecutor(ExecuterInterface<Node> exec) {
 		this.exec = exec;
 	}
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/parser/NullExecuter.java	Mon Jan 21 09:29:52 2008 +0900
@@ -0,0 +1,8 @@
+package parser;
+
+public class NullExecuter<Node> implements ExecuterInterface<Node> {
+
+	public void exec(Node n) {
+	}
+
+}
--- a/src/parser/NullExecutor.java	Sun Jan 20 18:22:55 2008 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-package parser;
-
-public class NullExecutor<Node> implements ExecutorInterface<Node> {
-
-	public void verify(Node n) {
-	}
-
-}
--- a/src/sbdd/BDDSatisfier.java	Sun Jan 20 18:22:55 2008 +0900
+++ b/src/sbdd/BDDSatisfier.java	Mon Jan 21 09:29:52 2008 +0900
@@ -3,7 +3,7 @@
 import java.util.Date;
 import java.util.LinkedList;
 
-import parser.ExecutorInterface;
+//import parser.ExecutorInterface;
 import parser.ITLNodeParser;
 
 
@@ -16,7 +16,7 @@
 import lite.ITLSolver;
 import lite.Next;
 
-public class BDDSatisfier extends ITLSatisfier implements ExecutorInterface<ITLSolver> {
+public class BDDSatisfier extends ITLSatisfier {
 
 
 	public ITLNodeParser<ITLSolver> p;