From: <js...@us...> - 2006-12-04 20:08:26
|
Revision: 41 http://svn.sourceforge.net/jcontracts/?rev=41&view=rev Author: jstuyts Date: 2006-12-04 12:08:21 -0800 (Mon, 04 Dec 2006) Log Message: ----------- Replaced input streams with readers. Modified Paths: -------------- trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java trunk/source/java/net/sf/jcontracts/antlr/Tool.java trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Hierarchy.java trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java trunk/source/java/net/sf/jcontracts/argparser/Parser.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.antlr; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import net.sf.jcontracts.antlr.collections.impl.BitSet; @@ -31,7 +31,7 @@ super.caseSensitiveLiterals = true; } - public ANTLRLexer(InputStream in) + public ANTLRLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } Modified: trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/ANTLRTokdefLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.antlr; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import net.sf.jcontracts.antlr.collections.impl.BitSet; @@ -16,7 +16,7 @@ super.caseSensitiveLiterals = true; } - public ANTLRTokdefLexer(InputStream in) + public ANTLRTokdefLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } Modified: trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/CharBufferNoBacktrackingNoInteractive.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,14 +1,14 @@ package net.sf.jcontracts.antlr; import java.io.IOException; -import java.io.InputStream; +import java.io.Reader; public class CharBufferNoBacktrackingNoInteractive { - public CharBufferNoBacktrackingNoInteractive(InputStream input_) + public CharBufferNoBacktrackingNoInteractive(Reader input_) { - readAheadBuffer = new byte[1024]; + readAheadBuffer = new char[1024]; input = input_; queue = new CharQueue(1024); } @@ -34,7 +34,7 @@ { for (int i = 0; i < nbrRead; i++) { - queue.append((char) (readAheadBuffer[i] & 0xff)); + queue.append(readAheadBuffer[i]); } } @@ -50,11 +50,11 @@ return queue.elementAt(i - 1); } - transient InputStream input; + transient Reader input; CharQueue queue; static final int maxReadAhead = 1024; - byte readAheadBuffer[]; + char readAheadBuffer[]; } Modified: trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/TokdefTokenManager.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.antlr; -import java.io.FileInputStream; +import java.io.FileReader; import java.io.IOException; class TokdefTokenManager extends SimpleTokenManager @@ -14,7 +14,7 @@ filename = filename_; try { - FileInputStream fileIn = new FileInputStream(filename); + FileReader fileIn = new FileReader(filename); ANTLRTokdefLexer tokdefLexer = new ANTLRTokdefLexer(fileIn); ANTLRTokdefParser tokdefParser = new ANTLRTokdefParser(tokdefLexer); tokdefParser.file(this); Modified: trunk/source/java/net/sf/jcontracts/antlr/Tool.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/Tool.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/Tool.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,11 +1,13 @@ package net.sf.jcontracts.antlr; -import java.io.DataInputStream; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; -import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import net.sf.jcontracts.antlr.collections.impl.Vector; @@ -16,7 +18,7 @@ { hasError = false; genDiagnostics = false; - f = System.in; + f = new InputStreamReader(System.in); in = null; errorHandler = new DefaultToolErrorHandler(); } @@ -41,7 +43,6 @@ { if (destination_file.isFile()) { - new DataInputStream(System.in); if (!destination_file.canWrite()) { throw new FileCopyException("FileCopy: destination file is unwriteable: " + dest_name); @@ -116,9 +117,9 @@ { if (grammarFile != null) { - f = new FileInputStream(grammarFile); + f = new FileReader(grammarFile); } - in = new DataInputStream(f); + in = new BufferedReader(f); } catch (IOException _ex) { @@ -437,9 +438,9 @@ String grammarFile; - transient InputStream f; + transient Reader f; - transient DataInputStream in; + transient Reader in; protected static String literalsPrefix = "LITERAL_"; Modified: trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/actions/ActionLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -19,14 +19,14 @@ super.caseSensitiveLiterals = true; } - public ActionLexer(InputStream in) + public ActionLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } public ActionLexer(String s, RuleBlock currentRule, CodeGenerator generator, ActionTransInfo transInfo) { - this(((InputStream) (new StringBufferInputStream(s)))); + this(new StringReader(s)); this.currentRule = currentRule; this.generator = generator; this.transInfo = transInfo; Modified: trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Hierarchy.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Hierarchy.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/preprocessor/Hierarchy.java 2006-12-04 20:08:21 UTC (rev 41) @@ -5,8 +5,8 @@ package net.sf.jcontracts.antlr.preprocessor; -import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileReader; import java.util.Enumeration; import java.util.Hashtable; @@ -94,7 +94,7 @@ public void readGrammarFile(String file) throws FileNotFoundException { - FileInputStream grStream = new FileInputStream(file); + FileReader grStream = new FileReader(file); addGrammarFile(new GrammarFile(file)); PreprocessorLexer ppLexer = new PreprocessorLexer(grStream); Preprocessor pp = new Preprocessor(ppLexer); Modified: trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/antlr/preprocessor/PreprocessorLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -5,7 +5,7 @@ package net.sf.jcontracts.antlr.preprocessor; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import net.sf.jcontracts.antlr.*; @@ -31,7 +31,7 @@ super.caseSensitiveLiterals = true; } - public PreprocessorLexer(InputStream in) + public PreprocessorLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.argparser; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import net.sf.jcontracts.antlr.CharBufferNoBacktrackingNoInteractive; @@ -72,7 +72,7 @@ super.caseSensitiveLiterals = true; } - public ArgLexer(InputStream in) + public ArgLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } Modified: trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/argparser/ArgParser.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,8 @@ package net.sf.jcontracts.argparser; -import java.io.FileInputStream; +import java.io.FileReader; +import java.io.InputStreamReader; +import java.io.Reader; import java.util.Vector; import net.sf.jcontracts.antlr.LLkParserNoInteractive; @@ -98,14 +100,14 @@ { try { - java.io.InputStream is; + Reader is; if (args.length != 0) { - is = new FileInputStream(args[0]); + is = new FileReader(args[0]); } else { - is = System.in; + is = new InputStreamReader(System.in); } ArgLexer lexer = new ArgLexer(is); lexer.setTokenObjectClass("net.sf.jcontracts.argParser.ExtendedToken"); Modified: trunk/source/java/net/sf/jcontracts/argparser/Parser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/argparser/Parser.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.argparser; -import java.io.StringBufferInputStream; +import java.io.StringReader; import java.util.Vector; import net.sf.jcontracts.antlr.ParserException; @@ -15,7 +15,7 @@ public Parser(String s) { - StringBufferInputStream is = new StringBufferInputStream(s); + StringReader is = new StringReader(s); _lexer = new ArgLexer(is); _lexer.setTokenObjectClass("net.sf.jcontracts.argParser.ExtendedToken"); _argparser = new ArgParser(_lexer); Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/ArchitectureSpecification.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,7 +1,7 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; import java.io.IOException; -import java.io.StringBufferInputStream; +import java.io.StringReader; import java.util.Enumeration; import java.util.Vector; @@ -351,7 +351,7 @@ { for (int i = 0; i < specLines.length; i++) { - StringBufferInputStream is = new StringBufferInputStream(specLines[i]); + StringReader is = new StringReader(specLines[i]); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); try @@ -393,7 +393,7 @@ { for (int i = 0; i < gs.length; i++) { - StringBufferInputStream is = new StringBufferInputStream(gs[i]); + StringReader is = new StringReader(gs[i]); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); try @@ -415,7 +415,7 @@ { for (int i = 0; i < ids.length; i++) { - StringBufferInputStream is = new StringBufferInputStream(ids[i]); + StringReader is = new StringReader(ids[i]); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); try Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/Idiom.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import java.util.Enumeration; import java.util.Vector; @@ -62,7 +62,7 @@ System.err.println("could resolve up to: " + c); throw new RuntimeException("Could not reolve all group names.\n\nSee Console for details!"); } - StringBufferInputStream is = new StringBufferInputStream(c); + StringReader is = new StringReader(c); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); Idiom idiom = null; Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/IsolateIdiom.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import net.sf.jcontracts.antlr.ParserException; @@ -17,7 +17,7 @@ { Idiom newIdiom = substitute(spec.getGroups()); String patternString = newIdiom.toStringWithoutType(); - StringBufferInputStream is = new StringBufferInputStream(patternString); + StringReader is = new StringReader(patternString); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); Pattern p = null; Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/LayerIdiom.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import net.sf.jcontracts.antlr.ParserException; @@ -17,7 +17,7 @@ { Idiom newIdiom = substitute(spec.getGroups()); String patternString = newIdiom.toStringWithoutType(); - StringBufferInputStream is = new StringBufferInputStream(patternString); + StringReader is = new StringReader(patternString); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); Pattern p = null; Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecLexer.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.InputStream; +import java.io.Reader; import java.util.Hashtable; import net.sf.jcontracts.antlr.ANTLRHashString; @@ -37,7 +37,7 @@ super.caseSensitiveLiterals = true; } - public PSpecLexer(InputStream in) + public PSpecLexer(Reader in) { this(new CharBufferNoBacktrackingNoInteractive(in)); } Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PSpecParser.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import java.util.Vector; import net.sf.jcontracts.antlr.LLkParserNoInteractive; @@ -142,7 +142,7 @@ try { String s = "\"label 12 #\"a.*\\x.y.* may * b.*"; - StringBufferInputStream is = new StringBufferInputStream(s); + StringReader is = new StringReader(s); PSpecLexer lexer = new PSpecLexer(is); PSpecParser parser = new PSpecParser(lexer); SingleDependencyConstraint r = parser.rule(); Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/PatternFactory.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import net.sf.jcontracts.antlr.ParserException; @@ -11,7 +11,7 @@ public static Pattern createFrom(String p_expression) throws PatternSyntaxException { Pattern result = null; - StringBufferInputStream is = new StringBufferInputStream(p_expression); + StringReader is = new StringReader(p_expression); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); try Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/SingleDependencyConstraint.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import java.util.Enumeration; import java.util.Vector; @@ -435,7 +435,7 @@ System.err.println("could resolve up to: " + c); throw new IllFormedSpecificationException("Could not reolve all group names.\n\nSee Console for details!"); } - StringBufferInputStream is = new StringBufferInputStream(c); + StringReader is = new StringReader(c); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); SingleDependencyConstraint r = null; Modified: trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java =================================================================== --- trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java 2006-12-04 19:46:56 UTC (rev 40) +++ trunk/source/java/net/sf/jcontracts/idarwin/specification/impl/primitive_language/StrictlyLayerIdiom.java 2006-12-04 20:08:21 UTC (rev 41) @@ -1,6 +1,6 @@ package net.sf.jcontracts.idarwin.specification.impl.primitive_language; -import java.io.StringBufferInputStream; +import java.io.StringReader; import net.sf.jcontracts.antlr.ParserException; @@ -17,7 +17,7 @@ { Idiom newIdiom = substitute(spec.getGroups()); String patternString = newIdiom.toStringWithoutType(); - StringBufferInputStream is = new StringBufferInputStream(patternString); + StringReader is = new StringReader(patternString); PSpecLexer speclexer = new PSpecLexer(is); PSpecParser specparser = new PSpecParser(speclexer); Pattern p = null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |