diff options
Diffstat (limited to 'docs/jacoco-ut/bjc.everge/Everge.java.html')
| -rw-r--r-- | docs/jacoco-ut/bjc.everge/Everge.java.html | 453 |
1 files changed, 223 insertions, 230 deletions
diff --git a/docs/jacoco-ut/bjc.everge/Everge.java.html b/docs/jacoco-ut/bjc.everge/Everge.java.html index 8416daa..82fd293 100644 --- a/docs/jacoco-ut/bjc.everge/Everge.java.html +++ b/docs/jacoco-ut/bjc.everge/Everge.java.html @@ -1,84 +1,77 @@ <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/><link rel="stylesheet" href="../jacoco-resources/report.css" type="text/css"/><link rel="shortcut icon" href="../jacoco-resources/report.gif" type="image/gif"/><title>Everge.java</title><link rel="stylesheet" href="../jacoco-resources/prettify.css" type="text/css"/><script type="text/javascript" src="../jacoco-resources/prettify.js"></script></head><body onload="window['PR_TAB_WIDTH']=4;prettyPrint()"><div class="breadcrumb" id="breadcrumb"><span class="info"><a href="../jacoco-sessions.html" class="el_session">Sessions</a></span><a href="../index.html" class="el_report">everge</a> > <a href="index.source.html" class="el_package">bjc.everge</a> > <span class="el_source">Everge.java</span></div><h1>Everge.java</h1><pre class="source lang-java linenums">package bjc.everge; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintStream; +import java.io.*; import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; +import java.nio.file.*; -import java.util.ArrayList; -import java.util.Deque; -import java.util.LinkedList; -import java.util.List; -import java.util.Scanner; +import java.util.*; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.concurrent.locks.*; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; +import java.util.regex.*; /** * Everge front-end application. * * @author Ben Culkin */ -<span class="fc" id="L33">public class Everge {</span> +<span class="fc" id="L20">public class Everge {</span> /** * Details how we handle our input. */ -<span class="fc" id="L37"> public static enum InputStatus {</span> +<span class="fc" id="L24"> public static enum InputStatus {</span> /** * Process the input as a single string. */ -<span class="fc" id="L41"> ALL,</span> +<span class="fc" id="L28"> ALL,</span> /** * Process the input line-by-line. */ -<span class="fc" id="L45"> LINE,</span> +<span class="fc" id="L32"> LINE,</span> /** * Process the input, splitting it around occurances of a regex. */ -<span class="fc" id="L49"> REGEX;</span> +<span class="fc" id="L36"> REGEX;</span> } // Options for doing repl-pairs -<span class="fc" id="L53"> private ReplOpts ropts = new ReplOpts();</span> +<span class="fc" id="L40"> private ReplOpts ropts = new ReplOpts();</span> // Loaded repl-pairs -<span class="fc" id="L56"> private List<ReplPair> lrp = new ArrayList<>();</span> +<span class="fc" id="L43"> private List<ReplPair> lrp = new ArrayList<>();</span> // Input status -<span class="fc" id="L59"> private InputStatus inputStat = InputStatus.ALL;</span> +<span class="fc" id="L46"> private InputStatus inputStat = InputStatus.ALL;</span> // Are we processing CLI args? (haven't seen a -- yet) -<span class="fc" id="L62"> private boolean doingArgs = true;</span> +<span class="fc" id="L49"> private boolean doingArgs = true;</span> // Should an NL be printed after each replace? -<span class="fc" id="L65"> private boolean printNL = true;</span> +<span class="fc" id="L52"> private boolean printNL = true;</span> // Verbosity level -<span class="fc" id="L68"> private int verbosity = 0;</span> +<span class="fc" id="L55"> private int verbosity = 0;</span> // The pattern to use for REGEX input mode private String pattern; // The queue of arguments to process -<span class="fc" id="L74"> private Deque<String> argQue = new LinkedList<>();</span> +<span class="fc" id="L61"> private Deque<String> argQue = new LinkedList<>();</span> // Used to prevent inter-mixing argument alterations with input processing. -<span class="fc" id="L77"> private ReadWriteLock argLock = new ReentrantReadWriteLock();</span> +<span class="fc" id="L64"> private ReadWriteLock argLock = new ReentrantReadWriteLock();</span> // Input/output streams -<span class="fc" id="L80"> public PrintStream outStream = System.out;</span> -<span class="fc" id="L81"> public PrintStream errStream = System.err;</span> + /** + * Stream to use for normal output. + */ +<span class="fc" id="L70"> public PrintStream outStream = System.out;</span> + /** + * Stream to use for error output. + */ +<span class="fc" id="L74"> public PrintStream errStream = System.err;</span> /** * Main method for front end, @@ -87,10 +80,10 @@ import java.util.regex.PatternSyntaxException; * The CLI arguments. */ public static void main(String[] args) { -<span class="nc" id="L90"> Everge evg = new Everge();</span> +<span class="nc" id="L83"> Everge evg = new Everge();</span> -<span class="nc" id="L92"> evg.processArgs(args);</span> -<span class="nc" id="L93"> }</span> +<span class="nc" id="L85"> evg.processArgs(args);</span> +<span class="nc" id="L86"> }</span> /** * Process one or more command line arguments. @@ -100,16 +93,16 @@ import java.util.regex.PatternSyntaxException; * @return Whether we processed succesfully or not. */ public boolean processArgs(String... args) { -<span class="nc" id="L103"> List<String> errs = new ArrayList<>();</span> +<span class="nc" id="L96"> List<String> errs = new ArrayList<>();</span> -<span class="nc" id="L105"> boolean stat = processArgs(errs, args);</span> -<span class="nc bnc" id="L106" title="All 2 branches missed."> if (!stat) {</span> -<span class="nc bnc" id="L107" title="All 2 branches missed."> for (String err : errs) {</span> -<span class="nc" id="L108"> errStream.println(err);</span> -<span class="nc" id="L109"> }</span> +<span class="nc" id="L98"> boolean stat = processArgs(errs, args);</span> +<span class="nc bnc" id="L99" title="All 2 branches missed."> if (!stat) {</span> +<span class="nc bnc" id="L100" title="All 2 branches missed."> for (String err : errs) {</span> +<span class="nc" id="L101"> errStream.println(err);</span> +<span class="nc" id="L102"> }</span> } -<span class="nc" id="L112"> return stat;</span> +<span class="nc" id="L105"> return stat;</span> } /** @@ -122,185 +115,185 @@ import java.util.regex.PatternSyntaxException; * @return Whether we processed succesfully or not. */ public boolean processArgs(List<String> errs, String... args) { -<span class="fc" id="L125"> argLock.writeLock().lock();</span> +<span class="fc" id="L118"> argLock.writeLock().lock();</span> -<span class="fc" id="L127"> boolean retStat = true;</span> +<span class="fc" id="L120"> boolean retStat = true;</span> try { -<span class="fc" id="L130"> loadQueue(args);</span> +<span class="fc" id="L123"> loadQueue(args);</span> // Process CLI args -<span class="fc bfc" id="L133" title="All 2 branches covered."> while(argQue.size() > 0) {</span> -<span class="fc" id="L134"> String arg = argQue.pop();</span> +<span class="fc bfc" id="L126" title="All 2 branches covered."> while(argQue.size() > 0) {</span> +<span class="fc" id="L127"> String arg = argQue.pop();</span> -<span class="pc bpc" id="L136" title="1 of 2 branches missed."> if (arg.equals("--")) {</span> -<span class="nc" id="L137"> doingArgs = false;</span> -<span class="nc" id="L138"> continue;</span> +<span class="pc bpc" id="L129" title="1 of 2 branches missed."> if (arg.equals("--")) {</span> +<span class="nc" id="L130"> doingArgs = false;</span> +<span class="nc" id="L131"> continue;</span> } // Process an argument -<span class="pc bpc" id="L142" title="1 of 4 branches missed."> if (doingArgs && arg.startsWith("-")) {</span> -<span class="fc" id="L143"> String argName = arg;</span> -<span class="fc" id="L144"> String argBody = "";</span> +<span class="pc bpc" id="L135" title="1 of 4 branches missed."> if (doingArgs && arg.startsWith("-")) {</span> +<span class="fc" id="L136"> String argName = arg;</span> +<span class="fc" id="L137"> String argBody = "";</span> // Process arguments to arguments -<span class="fc" id="L147"> int idx = arg.indexOf("=");</span> -<span class="pc bpc" id="L148" title="1 of 2 branches missed."> if (idx != -1) {</span> -<span class="nc" id="L149"> argName = arg.substring(0, idx);</span> -<span class="nc" id="L150"> argBody = arg.substring(idx + 1);</span> +<span class="fc" id="L140"> int idx = arg.indexOf("=");</span> +<span class="pc bpc" id="L141" title="1 of 2 branches missed."> if (idx != -1) {</span> +<span class="nc" id="L142"> argName = arg.substring(0, idx);</span> +<span class="nc" id="L143"> argBody = arg.substring(idx + 1);</span> } -<span class="pc bpc" id="L153" title="11 of 13 branches missed."> switch (argName) {</span> +<span class="pc bpc" id="L146" title="11 of 13 branches missed."> switch (argName) {</span> case "-n": case "--newline": -<span class="nc" id="L156"> printNL = true;</span> -<span class="nc" id="L157"> break;</span> +<span class="nc" id="L149"> printNL = true;</span> +<span class="nc" id="L150"> break;</span> case "-N": case "--no-newline": -<span class="nc" id="L160"> printNL = false;</span> -<span class="nc" id="L161"> break;</span> +<span class="nc" id="L153"> printNL = false;</span> +<span class="nc" id="L154"> break;</span> case "-v": case "--verbose": -<span class="fc" id="L164"> verbosity += 1;</span> -<span class="fc" id="L165"> break;</span> +<span class="fc" id="L157"> verbosity += 1;</span> +<span class="fc" id="L158"> break;</span> case "-q": case "--quiet": -<span class="nc" id="L168"> verbosity -= 1;</span> -<span class="nc" id="L169"> break;</span> +<span class="nc" id="L161"> verbosity -= 1;</span> +<span class="nc" id="L162"> break;</span> case "--verbosity": -<span class="nc bnc" id="L171" title="All 2 branches missed."> if (argQue.size() < 1) {</span> -<span class="nc" id="L172"> errs.add("[ERROR] No parameter to --verbosity");</span> -<span class="nc" id="L173"> retStat = false;</span> -<span class="nc" id="L174"> break;</span> +<span class="nc bnc" id="L164" title="All 2 branches missed."> if (argQue.size() < 1) {</span> +<span class="nc" id="L165"> errs.add("[ERROR] No parameter to --verbosity");</span> +<span class="nc" id="L166"> retStat = false;</span> +<span class="nc" id="L167"> break;</span> } -<span class="nc" id="L176"> argBody = argQue.pop();</span> -<span class="nc" id="L177"> break;</span> +<span class="nc" id="L169"> argBody = argQue.pop();</span> +<span class="nc" id="L170"> break;</span> case "-V": try { -<span class="nc" id="L180"> verbosity = Integer.parseInt(argBody);</span> -<span class="nc" id="L181"> } catch (NumberFormatException nfex) {</span> -<span class="nc" id="L182"> String msg = String.format("[ERROR] Invalid verbosity: '%s' is not an integer",</span> +<span class="nc" id="L173"> verbosity = Integer.parseInt(argBody);</span> +<span class="nc" id="L174"> } catch (NumberFormatException nfex) {</span> +<span class="nc" id="L175"> String msg = String.format("[ERROR] Invalid verbosity: '%s' is not an integer",</span> argBody); -<span class="nc" id="L184"> errs.add(msg);</span> -<span class="nc" id="L185"> retStat = false;</span> -<span class="nc" id="L186"> }</span> -<span class="nc" id="L187"> break;</span> +<span class="nc" id="L177"> errs.add(msg);</span> +<span class="nc" id="L178"> retStat = false;</span> +<span class="nc" id="L179"> }</span> +<span class="nc" id="L180"> break;</span> case "--pattern": -<span class="nc bnc" id="L189" title="All 2 branches missed."> if (argQue.size() < 1) {</span> -<span class="nc" id="L190"> errs.add("[ERROR] No parameter to --pattern");</span> -<span class="nc" id="L191"> retStat = false;</span> -<span class="nc" id="L192"> break;</span> +<span class="nc bnc" id="L182" title="All 2 branches missed."> if (argQue.size() < 1) {</span> +<span class="nc" id="L183"> errs.add("[ERROR] No parameter to --pattern");</span> +<span class="nc" id="L184"> retStat = false;</span> +<span class="nc" id="L185"> break;</span> } -<span class="nc" id="L194"> argBody = argQue.pop();</span> +<span class="nc" id="L187"> argBody = argQue.pop();</span> case "-p": try { -<span class="nc" id="L197"> pattern = argBody;</span> - -<span class="nc" id="L199"> Pattern.compile(argBody);</span> -<span class="nc" id="L200"> } catch (PatternSyntaxException psex) {</span> -<span class="nc" id="L201"> String msg = String.format("[ERROR] Pattern '%s' is invalid: %s",</span> -<span class="nc" id="L202"> pattern, psex.getMessage());</span> -<span class="nc" id="L203"> errs.add(msg);</span> -<span class="nc" id="L204"> retStat = false;</span> -<span class="nc" id="L205"> }</span> -<span class="nc" id="L206"> break;</span> +<span class="nc" id="L190"> pattern = argBody;</span> + +<span class="nc" id="L192"> Pattern.compile(argBody);</span> +<span class="nc" id="L193"> } catch (PatternSyntaxException psex) {</span> +<span class="nc" id="L194"> String msg = String.format("[ERROR] Pattern '%s' is invalid: %s",</span> +<span class="nc" id="L195"> pattern, psex.getMessage());</span> +<span class="nc" id="L196"> errs.add(msg);</span> +<span class="nc" id="L197"> retStat = false;</span> +<span class="nc" id="L198"> }</span> +<span class="nc" id="L199"> break;</span> case "--file": -<span class="pc bpc" id="L208" title="1 of 2 branches missed."> if (argQue.size() < 1) {</span> -<span class="nc" id="L209"> errs.add("[ERROR] No argument to --file");</span> -<span class="nc" id="L210"> retStat = false;</span> -<span class="nc" id="L211"> break;</span> +<span class="pc bpc" id="L201" title="1 of 2 branches missed."> if (argQue.size() < 1) {</span> +<span class="nc" id="L202"> errs.add("[ERROR] No argument to --file");</span> +<span class="nc" id="L203"> retStat = false;</span> +<span class="nc" id="L204"> break;</span> } -<span class="fc" id="L213"> argBody = argQue.pop();</span> +<span class="fc" id="L206"> argBody = argQue.pop();</span> case "-f": -<span class="fc" id="L215"> try (FileInputStream fis = new FileInputStream(argBody);</span> -<span class="fc" id="L216"> Scanner scn = new Scanner(fis)) {</span> -<span class="fc" id="L217"> List<ReplError> ferrs = new ArrayList<>();</span> +<span class="fc" id="L208"> try (FileInputStream fis = new FileInputStream(argBody);</span> +<span class="fc" id="L209"> Scanner scn = new Scanner(fis)) {</span> +<span class="fc" id="L210"> List<ReplError> ferrs = new ArrayList<>();</span> -<span class="fc" id="L219"> lrp = ReplPair.readList(lrp, scn, ferrs, ropts);</span> +<span class="fc" id="L212"> lrp = ReplPair.readList(lrp, scn, ferrs, ropts);</span> -<span class="pc bpc" id="L221" title="1 of 2 branches missed."> if (ferrs.size() > 0) {</span> -<span class="nc" id="L222"> StringBuilder sb = new StringBuilder();</span> +<span class="pc bpc" id="L214" title="1 of 2 branches missed."> if (ferrs.size() > 0) {</span> +<span class="nc" id="L215"> StringBuilder sb = new StringBuilder();</span> -<span class="nc" id="L224"> String errString = "an error";</span> -<span class="nc bnc" id="L225" title="All 2 branches missed."> if (ferrs.size() > 1) errString = String.format("%d errors");</span> +<span class="nc" id="L217"> String errString = "an error";</span> +<span class="nc bnc" id="L218" title="All 2 branches missed."> if (ferrs.size() > 1) errString = String.format("%d errors");</span> { -<span class="nc" id="L228"> String msg = String.format(</span> - "[ERROR] Encountered errors parsing data file'%s'\n", - argBody); -<span class="nc" id="L231"> sb.append(msg);</span> +<span class="nc" id="L221"> String msg = String.format(</span> + "[ERROR] Encountered %s parsing data file'%s'\n", + errString, argBody); +<span class="nc" id="L224"> sb.append(msg);</span> } -<span class="nc bnc" id="L234" title="All 2 branches missed."> for (ReplError err : ferrs) {</span> -<span class="nc" id="L235"> sb.append(String.format("\t%s\n", err));</span> -<span class="nc" id="L236"> }</span> +<span class="nc bnc" id="L227" title="All 2 branches missed."> for (ReplError err : ferrs) {</span> +<span class="nc" id="L228"> sb.append(String.format("\t%s\n", err));</span> +<span class="nc" id="L229"> }</span> -<span class="nc" id="L238"> errs.add(sb.toString());</span> -<span class="nc" id="L239"> retStat = false;</span> +<span class="nc" id="L231"> errs.add(sb.toString());</span> +<span class="nc" id="L232"> retStat = false;</span> } -<span class="nc" id="L241"> } catch (FileNotFoundException fnfex) {</span> -<span class="nc" id="L242"> String msg = String.format("[ERROR] Could not open data file '%s' for input",</span> +<span class="nc" id="L234"> } catch (FileNotFoundException fnfex) {</span> +<span class="nc" id="L235"> String msg = String.format("[ERROR] Could not open data file '%s' for input",</span> argBody); -<span class="nc" id="L244"> errs.add(msg);</span> -<span class="nc" id="L245"> retStat = false;</span> -<span class="nc" id="L246"> } catch (IOException ioex) {</span> -<span class="nc" id="L247"> String msg = String.format("[ERROR] Unknown I/O error reading data file '%s': %s",</span> -<span class="nc" id="L248"> argBody, ioex.getMessage());</span> -<span class="nc" id="L249"> errs.add(msg);</span> -<span class="nc" id="L250"> retStat = false;</span> -<span class="pc" id="L251"> }</span> -<span class="nc" id="L252"> break;</span> +<span class="nc" id="L237"> errs.add(msg);</span> +<span class="nc" id="L238"> retStat = false;</span> +<span class="nc" id="L239"> } catch (IOException ioex) {</span> +<span class="nc" id="L240"> String msg = String.format("[ERROR] Unknown I/O error reading data file '%s': %s",</span> +<span class="nc" id="L241"> argBody, ioex.getMessage());</span> +<span class="nc" id="L242"> errs.add(msg);</span> +<span class="nc" id="L243"> retStat = false;</span> +<span class="pc" id="L244"> }</span> +<span class="nc" id="L245"> break;</span> case "--arg-file": -<span class="nc bnc" id="L254" title="All 2 branches missed."> if (argQue.size() < 1) {</span> -<span class="nc" id="L255"> errs.add("[ERROR] No argument to --arg-file");</span> -<span class="nc" id="L256"> break;</span> +<span class="nc bnc" id="L247" title="All 2 branches missed."> if (argQue.size() < 1) {</span> +<span class="nc" id="L248"> errs.add("[ERROR] No argument to --arg-file");</span> +<span class="nc" id="L249"> break;</span> } -<span class="nc" id="L258"> argBody = argQue.pop();</span> +<span class="nc" id="L251"> argBody = argQue.pop();</span> case "-F": -<span class="nc" id="L260"> try (FileInputStream fis = new FileInputStream(argBody);</span> -<span class="nc" id="L261"> Scanner scn = new Scanner(fis)) {</span> -<span class="nc" id="L262"> List<String> sl = new ArrayList<>();</span> - -<span class="nc bnc" id="L264" title="All 2 branches missed."> while (scn.hasNextLine()) {</span> -<span class="nc" id="L265"> String ln = scn.nextLine().trim();</span> - -<span class="nc bnc" id="L267" title="All 2 branches missed."> if (ln.equals("")) continue;</span> -<span class="nc bnc" id="L268" title="All 2 branches missed."> if (ln.startsWith("#")) continue;</span> - -<span class="nc" id="L270"> sl.add(ln);</span> -<span class="nc" id="L271"> }</span> - -<span class="nc" id="L273"> processArgs(sl.toArray(new String[0]));</span> -<span class="nc" id="L274"> } catch (FileNotFoundException fnfex) {</span> -<span class="nc" id="L275"> String msg = String.format("[ERROR] Could not open argument file '%s' for input", argBody);</span> -<span class="nc" id="L276"> errs.add(msg);</span> -<span class="nc" id="L277"> retStat = false;</span> -<span class="nc" id="L278"> } catch (IOException ioex) {</span> -<span class="nc" id="L279"> String msg = String.format("[ERROR] Unknown I/O error reading input file '%s': %s",</span> -<span class="nc" id="L280"> argBody, ioex.getMessage());</span> -<span class="nc" id="L281"> errs.add(msg);</span> -<span class="nc" id="L282"> retStat = false;</span> -<span class="nc" id="L283"> }</span> -<span class="nc" id="L284"> break;</span> +<span class="nc" id="L253"> try (FileInputStream fis = new FileInputStream(argBody);</span> +<span class="nc" id="L254"> Scanner scn = new Scanner(fis)) {</span> +<span class="nc" id="L255"> List<String> sl = new ArrayList<>();</span> + +<span class="nc bnc" id="L257" title="All 2 branches missed."> while (scn.hasNextLine()) {</span> +<span class="nc" id="L258"> String ln = scn.nextLine().trim();</span> + +<span class="nc bnc" id="L260" title="All 2 branches missed."> if (ln.equals("")) continue;</span> +<span class="nc bnc" id="L261" title="All 2 branches missed."> if (ln.startsWith("#")) continue;</span> + +<span class="nc" id="L263"> sl.add(ln);</span> +<span class="nc" id="L264"> }</span> + +<span class="nc" id="L266"> processArgs(sl.toArray(new String[0]));</span> +<span class="nc" id="L267"> } catch (FileNotFoundException fnfex) {</span> +<span class="nc" id="L268"> String msg = String.format("[ERROR] Could not open argument file '%s' for input", argBody);</span> +<span class="nc" id="L269"> errs.add(msg);</span> +<span class="nc" id="L270"> retStat = false;</span> +<span class="nc" id="L271"> } catch (IOException ioex) {</span> +<span class="nc" id="L272"> String msg = String.format("[ERROR] Unknown I/O error reading input file '%s': %s",</span> +<span class="nc" id="L273"> argBody, ioex.getMessage());</span> +<span class="nc" id="L274"> errs.add(msg);</span> +<span class="nc" id="L275"> retStat = false;</span> +<span class="nc" id="L276"> }</span> +<span class="nc" id="L277"> break;</span> default: { -<span class="nc" id="L287"> String msg = String.format("[ERROR] Unrecognised CLI argument name '%s'\n", argName);</span> -<span class="nc" id="L288"> errs.add(msg);</span> -<span class="nc" id="L289"> retStat = false;</span> +<span class="nc" id="L280"> String msg = String.format("[ERROR] Unrecognised CLI argument name '%s'\n", argName);</span> +<span class="nc" id="L281"> errs.add(msg);</span> +<span class="nc" id="L282"> retStat = false;</span> } } -<span class="fc" id="L292"> } else {</span> +<span class="fc" id="L285"> } else {</span> // Strip off an escaped initial dash -<span class="pc bpc" id="L294" title="1 of 2 branches missed."> if (arg.startsWith("\\-")) arg = arg.substring(1);</span> +<span class="pc bpc" id="L287" title="1 of 2 branches missed."> if (arg.startsWith("\\-")) arg = arg.substring(1);</span> -<span class="fc" id="L296"> processInputFile(arg);</span> +<span class="fc" id="L289"> processInputFile(arg);</span> } -<span class="fc" id="L298"> }</span> +<span class="fc" id="L291"> }</span> } finally { -<span class="fc" id="L300"> argLock.writeLock().unlock();</span> +<span class="fc" id="L293"> argLock.writeLock().unlock();</span> } -<span class="fc" id="L303"> return retStat;</span> +<span class="fc" id="L296"> return retStat;</span> } /** @@ -311,16 +304,16 @@ import java.util.regex.PatternSyntaxException; * @return Whether we processed succesfully or not. */ public boolean processInputFile(String fle) { -<span class="fc" id="L314"> List<String> errs = new ArrayList<>();</span> +<span class="fc" id="L307"> List<String> errs = new ArrayList<>();</span> -<span class="fc" id="L316"> boolean stat = processInputFile(errs, fle);</span> -<span class="pc bpc" id="L317" title="1 of 2 branches missed."> if (!stat) {</span> -<span class="nc bnc" id="L318" title="All 2 branches missed."> for (String err : errs) {</span> -<span class="nc" id="L319"> errStream.println(err);</span> -<span class="nc" id="L320"> }</span> +<span class="fc" id="L309"> boolean stat = processInputFile(errs, fle);</span> +<span class="pc bpc" id="L310" title="1 of 2 branches missed."> if (!stat) {</span> +<span class="nc bnc" id="L311" title="All 2 branches missed."> for (String err : errs) {</span> +<span class="nc" id="L312"> errStream.println(err);</span> +<span class="nc" id="L313"> }</span> } -<span class="fc" id="L323"> return stat;</span> +<span class="fc" id="L316"> return stat;</span> } /** @@ -333,58 +326,58 @@ import java.util.regex.PatternSyntaxException; * @return Whether we processed succesfully or not. */ public boolean processInputFile(List<String> errs, String fle) { -<span class="fc" id="L336"> argLock.readLock().lock();</span> +<span class="fc" id="L329"> argLock.readLock().lock();</span> // Read in and do replacements on a file try { -<span class="pc bpc" id="L340" title="1 of 2 branches missed."> if (verbosity > 2) {</span> -<span class="nc" id="L341"> errStream.printf("[TRACE] Reading file (%s) in mode (%s)\n", fle, inputStat);</span> +<span class="pc bpc" id="L333" title="1 of 2 branches missed."> if (verbosity > 2) {</span> +<span class="nc" id="L334"> errStream.printf("[TRACE] Reading file (%s) in mode (%s)\n", fle, inputStat);</span> } -<span class="pc bpc" id="L344" title="1 of 2 branches missed."> if (inputStat == InputStatus.ALL) {</span> -<span class="fc" id="L345"> Path pth = Paths.get(fle);</span> +<span class="pc bpc" id="L337" title="1 of 2 branches missed."> if (inputStat == InputStatus.ALL) {</span> +<span class="fc" id="L338"> Path pth = Paths.get(fle);</span> -<span class="pc bpc" id="L347" title="1 of 2 branches missed."> if (!Files.isReadable(pth)) {</span> -<span class="nc" id="L348"> String msg = String.format("[ERROR] File '%s' is not readable\n", fle);</span> -<span class="nc" id="L349"> errs.add(msg);</span> -<span class="nc" id="L350"> return false;</span> - } else { -<span class="fc" id="L352"> byte[] inp = Files.readAllBytes(pth);</span> +<span class="pc bpc" id="L340" title="1 of 2 branches missed."> if (!Files.isReadable(pth)) {</span> +<span class="nc" id="L341"> String msg = String.format("[ERROR] File '%s' is not readable\n", fle);</span> +<span class="nc" id="L342"> errs.add(msg);</span> +<span class="nc" id="L343"> return false;</span> + } -<span class="fc" id="L354"> String strang = new String(inp, Charset.forName("UTF-8"));</span> +<span class="fc" id="L346"> byte[] inp = Files.readAllBytes(pth);</span> -<span class="fc" id="L356"> processString(strang);</span> - } -<span class="pc bnc" id="L358" title="All 2 branches missed."> } else if (inputStat == InputStatus.LINE) {</span> -<span class="nc" id="L359"> try (FileInputStream fis = new FileInputStream(fle); Scanner scn = new Scanner(fis)) {</span> -<span class="nc bnc" id="L360" title="All 2 branches missed."> while(scn.hasNextLine()) {</span> -<span class="nc" id="L361"> processString(scn.nextLine());</span> +<span class="fc" id="L348"> String strang = new String(inp, Charset.forName("UTF-8"));</span> + +<span class="fc" id="L350"> processString(strang);</span> +<span class="pc bnc" id="L351" title="All 2 branches missed."> } else if (inputStat == InputStatus.LINE) {</span> +<span class="nc" id="L352"> try (FileInputStream fis = new FileInputStream(fle); Scanner scn = new Scanner(fis)) {</span> +<span class="nc bnc" id="L353" title="All 2 branches missed."> while(scn.hasNextLine()) {</span> +<span class="nc" id="L354"> processString(scn.nextLine());</span> } -<span class="nc" id="L363"> }</span> -<span class="nc bnc" id="L364" title="All 2 branches missed."> } else if (inputStat == InputStatus.REGEX) {</span> -<span class="nc" id="L365"> try (FileInputStream fis = new FileInputStream(fle); Scanner scn = new Scanner(fis)) {</span> -<span class="nc" id="L366"> scn.useDelimiter(pattern);</span> +<span class="nc" id="L356"> }</span> +<span class="nc bnc" id="L357" title="All 2 branches missed."> } else if (inputStat == InputStatus.REGEX) {</span> +<span class="nc" id="L358"> try (FileInputStream fis = new FileInputStream(fle); Scanner scn = new Scanner(fis)) {</span> +<span class="nc" id="L359"> scn.useDelimiter(pattern);</span> -<span class="nc bnc" id="L368" title="All 2 branches missed."> while(scn.hasNext()) {</span> -<span class="nc" id="L369"> processString(scn.next());</span> +<span class="nc bnc" id="L361" title="All 2 branches missed."> while(scn.hasNext()) {</span> +<span class="nc" id="L362"> processString(scn.next());</span> } -<span class="nc" id="L371"> }</span> +<span class="nc" id="L364"> }</span> } else { -<span class="nc" id="L373"> String msg = String.format("[INTERNAL-ERROR] Input status '%s' is not yet implemented\n",</span> +<span class="nc" id="L366"> String msg = String.format("[INTERNAL-ERROR] Input status '%s' is not yet implemented\n",</span> inputStat); -<span class="nc" id="L375"> errs.add(msg);</span> -<span class="nc" id="L376"> return false;</span> +<span class="nc" id="L368"> errs.add(msg);</span> +<span class="nc" id="L369"> return false;</span> } -<span class="nc" id="L378"> } catch (IOException ioex) {</span> -<span class="nc" id="L379"> String msg = String.format("[ERROR] Unknown I/O related error for file '%s'\n\tError was %s",</span> -<span class="nc" id="L380"> fle, ioex.getMessage());</span> -<span class="nc" id="L381"> errs.add(msg);</span> -<span class="nc" id="L382"> return false;</span> +<span class="nc" id="L371"> } catch (IOException ioex) {</span> +<span class="nc" id="L372"> String msg = String.format("[ERROR] Unknown I/O related error for file '%s'\n\tError was %s",</span> +<span class="nc" id="L373"> fle, ioex.getMessage());</span> +<span class="nc" id="L374"> errs.add(msg);</span> +<span class="nc" id="L375"> return false;</span> } finally { -<span class="fc" id="L384"> argLock.readLock().unlock();</span> +<span class="fc" id="L377"> argLock.readLock().unlock();</span> } -<span class="fc" id="L387"> return true;</span> +<span class="fc" id="L380"> return true;</span> } /** @@ -394,43 +387,43 @@ import java.util.regex.PatternSyntaxException; * The input string to process. */ public void processString(String inp) { -<span class="fc" id="L397"> argLock.readLock().lock();</span> +<span class="fc" id="L390"> argLock.readLock().lock();</span> try { -<span class="fc" id="L400"> String strang = inp;</span> +<span class="fc" id="L393"> String strang = inp;</span> -<span class="fc bfc" id="L402" title="All 2 branches covered."> for (ReplPair rp : lrp) {</span> -<span class="fc" id="L403"> strang = rp.apply(strang);</span> -<span class="fc" id="L404"> }</span> +<span class="fc bfc" id="L395" title="All 2 branches covered."> for (ReplPair rp : lrp) {</span> +<span class="fc" id="L396"> strang = rp.apply(strang);</span> +<span class="fc" id="L397"> }</span> -<span class="fc" id="L406"> outStream.print(strang);</span> -<span class="pc bpc" id="L407" title="1 of 2 branches missed."> if (printNL) outStream.println();</span> +<span class="fc" id="L399"> outStream.print(strang);</span> +<span class="pc bpc" id="L400" title="1 of 2 branches missed."> if (printNL) outStream.println();</span> } finally { -<span class="fc" id="L409"> argLock.readLock().unlock();</span> +<span class="fc" id="L402"> argLock.readLock().unlock();</span> } -<span class="fc" id="L411"> }</span> +<span class="fc" id="L404"> }</span> // Load arguments into the argument queue. private void loadQueue(String... args) { -<span class="fc" id="L415"> boolean doArgs = true;</span> -<span class="fc bfc" id="L416" title="All 2 branches covered."> for (String arg : args) {</span> -<span class="pc bpc" id="L417" title="1 of 2 branches missed."> if (arg.equals("--")) doArgs = false;</span> +<span class="fc" id="L408"> boolean doArgs = true;</span> +<span class="fc bfc" id="L409" title="All 2 branches covered."> for (String arg : args) {</span> +<span class="pc bpc" id="L410" title="1 of 2 branches missed."> if (arg.equals("--")) doArgs = false;</span> // Handle things like -nNv correctly -<span class="pc bpc" id="L420" title="1 of 2 branches missed."> if (doArgs) {</span> -<span class="fc bfc" id="L421" title="All 4 branches covered."> if (arg.startsWith("-") && !arg.startsWith("--")) {</span> -<span class="fc" id="L422"> char[] car = arg.substring(1).toCharArray();</span> -<span class="fc bfc" id="L423" title="All 2 branches covered."> for (char c : car) {</span> -<span class="fc" id="L424"> String argstr = String.format("-%c", c);</span> -<span class="fc" id="L425"> argQue.add(argstr);</span> +<span class="pc bpc" id="L413" title="1 of 2 branches missed."> if (doArgs) {</span> +<span class="fc bfc" id="L414" title="All 4 branches covered."> if (arg.startsWith("-") && !arg.startsWith("--")) {</span> +<span class="fc" id="L415"> char[] car = arg.substring(1).toCharArray();</span> +<span class="fc bfc" id="L416" title="All 2 branches covered."> for (char c : car) {</span> +<span class="fc" id="L417"> String argstr = String.format("-%c", c);</span> +<span class="fc" id="L418"> argQue.add(argstr);</span> } -<span class="fc" id="L427"> } else {</span> -<span class="fc" id="L428"> argQue.add(arg);</span> +<span class="fc" id="L420"> } else {</span> +<span class="fc" id="L421"> argQue.add(arg);</span> } } else { -<span class="nc" id="L431"> argQue.add(arg);</span> +<span class="nc" id="L424"> argQue.add(arg);</span> } } -<span class="fc" id="L434"> }</span> +<span class="fc" id="L427"> }</span> } </pre><div class="footer"><span class="right">Created with <a href="http://www.jacoco.org/jacoco">JaCoCo</a> 0.8.2.201808211720</span></div></body></html>
\ No newline at end of file |