From 7a8560805f0469f929c4bb3e222a3a4606bfe651 Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Thu, 18 Jan 2018 21:19:17 -0400 Subject: Update --- RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'RGens/src') diff --git a/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java b/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java index 5e0f5bf..5087ab4 100644 --- a/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java +++ b/RGens/src/main/java/bjc/rgens/newparser/RGrammarSet.java @@ -1,8 +1,8 @@ package bjc.rgens.newparser; -import java.io.File; -import java.io.FileReader; +import java.io.BufferedReader; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; @@ -255,15 +255,14 @@ public class RGrammarSet { * absolute path. */ Path convPath = cfgParent.resolve(path.toString()); - File fle = convPath.toFile(); - if (fle.isDirectory()) { + if(Files.isDirectory(convPath)) { /* @TODO implement subset grammars */ throw new GrammarException("Sub-grammar sets aren't implemented yet"); - } else if (fle.getName().endsWith(".gram")) { + } else if (convPath.getFileName().endsWith(".gram")) { /* Load grammar file. */ try { - FileReader fis = new FileReader(fle); + BufferedReader fis = Files.newBufferedReader(convPath); RGrammar gram = RGrammarParser.readGrammar(fis); fis.close(); -- cgit v1.2.3