Mercurial > hg > Applications > JavaLite
changeset 92:23853660f8b7
*** empty log message ***
author | kono |
---|---|
date | Fri, 18 Jan 2008 21:20:23 +0900 |
parents | f9579d8afd29 |
children | 8b07eee8216e |
files | src/parser/LogicNodeParser.java src/parser/LogicNodeParserTest.java src/parser/LogicNodeScannerTest.java src/parser/MacroNodeParser.java |
diffstat | 4 files changed, 18 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/parser/LogicNodeParser.java Fri Jan 18 20:52:45 2008 +0900 +++ b/src/parser/LogicNodeParser.java Fri Jan 18 21:20:23 2008 +0900 @@ -6,9 +6,9 @@ import java.io.InputStream; import java.net.URL; import java.util.LinkedList; + import verifier.LogicSolver; - public class LogicNodeParser<Node extends LogicSolver> { /*
--- a/src/parser/LogicNodeParserTest.java Fri Jan 18 20:52:45 2008 +0900 +++ b/src/parser/LogicNodeParserTest.java Fri Jan 18 21:20:23 2008 +0900 @@ -1,27 +1,27 @@ package parser; -import verifier.LogicSolver; -import verifier.LogicSolverFactory; +import lite.ITLNodeFactory; +import lite.ITLSolver; public class LogicNodeParserTest { - static MacroNodeParser<LogicSolver> parser; + static MacroNodeParser<ITLSolver> parser; public static void main(String arg[]) { - LogicNodeParser<LogicSolver> p; - LogicSolver n; - LogicNodeFactoryInterface<LogicSolver> lf = new LogicSolverFactory(); + LogicNodeParser<ITLSolver> p; + ITLSolver n; + LogicNodeFactoryInterface<ITLSolver> lf = new ITLNodeFactory(); if (true) { - p = new LogicNodeParser<LogicSolver>("a,(b;~c)",lf); + p = new LogicNodeParser<ITLSolver>("a,(b;~c)",lf); n = p.parse(); if (n!=null) System.out.print(n); System.out.println("."); } - p = new LogicNodeParser<LogicSolver>("exists(x,(a,x))",lf); + p = new LogicNodeParser<ITLSolver>("exists(x,(a,x))",lf); n = p.parse(); if (n!=null) System.out.print(n); System.out.println("."); - parser = (MacroNodeParser<LogicSolver>) p; + parser = (MacroNodeParser<ITLSolver>) p; n = parser.parse(); if (n!=null) System.out.print(n); System.out.println("."); @@ -47,7 +47,7 @@ } public static void sat(String s) { - LogicSolver n = parser.parse(s); + ITLSolver n = parser.parse(s); if (n!=null) System.out.print(n); System.out.println("."); } }
--- a/src/parser/LogicNodeScannerTest.java Fri Jan 18 20:52:45 2008 +0900 +++ b/src/parser/LogicNodeScannerTest.java Fri Jan 18 21:20:23 2008 +0900 @@ -3,11 +3,11 @@ import java.io.FileNotFoundException; import java.io.FileReader; -import verifier.LogicSolver; +import lite.ITLSolver; public class LogicNodeScannerTest { - public static LogicNodeScanner<LogicSolver> scan; + public static LogicNodeScanner<ITLSolver> scan; public static void main(String arg[]) { initScanner(); @@ -25,20 +25,20 @@ } public static void initScanner() { - Dictionary<LogicSolver> dict = new Dictionary<LogicSolver>(); - scan = new LogicNodeScanner<LogicSolver>(dict); + Dictionary<ITLSolver> dict = new Dictionary<ITLSolver>(); + scan = new LogicNodeScanner<ITLSolver>(dict); } public static void scan(String exp) { - for(Token<LogicSolver> t : scan.scanToken(exp)) { + for(Token<ITLSolver> t : scan.scanToken(exp)) { System.out.print(t+" "); } System.out.println(); } public static void scan(FileReader file) { - for(Token<LogicSolver> t : scan.scanToken(file)) { + for(Token<ITLSolver> t : scan.scanToken(file)) { System.out.print(t+" "); System.out.println(); }
--- a/src/parser/MacroNodeParser.java Fri Jan 18 20:52:45 2008 +0900 +++ b/src/parser/MacroNodeParser.java Fri Jan 18 21:20:23 2008 +0900 @@ -4,6 +4,7 @@ import verifier.LogicSolver; + public class MacroNodeParser<Node extends LogicSolver> extends LogicNodeParser<Node> implements MacroNodeParserInterface<Node> {