summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/test/evg-test1.evg (renamed from data/test/evg-test1.rp)0
-rw-r--r--data/test/test1-empty.evg (renamed from data/test/test1-empty.rp)0
-rw-r--r--data/test/test10-guard.evg (renamed from data/test/test10-guard.rp)0
-rw-r--r--data/test/test11-bodyinlinemulti.evg (renamed from data/test/test11-bodyinlinemulti.rp)0
-rw-r--r--data/test/test2-singlereplace.evg (renamed from data/test/test2-singlereplace.rp)0
-rw-r--r--data/test/test3-multireplace.evg (renamed from data/test/test3-multireplace.rp)0
-rw-r--r--data/test/test4-implicitorder.evg (renamed from data/test/test4-implicitorder.rp)0
-rw-r--r--data/test/test5-explicitorder.evg (renamed from data/test/test5-explicitorder.rp)0
-rw-r--r--data/test/test6-staging.evg (renamed from data/test/test6-staging.rp)0
-rw-r--r--data/test/test7-error.evg (renamed from data/test/test7-error.rp)0
-rw-r--r--data/test/test8-globals.evg (renamed from data/test/test8-globals.rp)0
-rw-r--r--data/test/test9.evg (renamed from data/test/test9.rp)0
-rw-r--r--src/main/java/bjc/everge/Everge.java55
-rw-r--r--src/main/java/bjc/everge/ReplPairSet.java10
-rw-r--r--src/test/java/bjc/everge/EvergeTest.java6
-rw-r--r--src/test/java/bjc/everge/ReplPairTest.java22
16 files changed, 46 insertions, 47 deletions
diff --git a/data/test/evg-test1.rp b/data/test/evg-test1.evg
index b6da7c5..b6da7c5 100644
--- a/data/test/evg-test1.rp
+++ b/data/test/evg-test1.evg
diff --git a/data/test/test1-empty.rp b/data/test/test1-empty.evg
index f736b8e..f736b8e 100644
--- a/data/test/test1-empty.rp
+++ b/data/test/test1-empty.evg
diff --git a/data/test/test10-guard.rp b/data/test/test10-guard.evg
index a647a3a..a647a3a 100644
--- a/data/test/test10-guard.rp
+++ b/data/test/test10-guard.evg
diff --git a/data/test/test11-bodyinlinemulti.rp b/data/test/test11-bodyinlinemulti.evg
index 35eb329..35eb329 100644
--- a/data/test/test11-bodyinlinemulti.rp
+++ b/data/test/test11-bodyinlinemulti.evg
diff --git a/data/test/test2-singlereplace.rp b/data/test/test2-singlereplace.evg
index ea05d12..ea05d12 100644
--- a/data/test/test2-singlereplace.rp
+++ b/data/test/test2-singlereplace.evg
diff --git a/data/test/test3-multireplace.rp b/data/test/test3-multireplace.evg
index 8121c8c..8121c8c 100644
--- a/data/test/test3-multireplace.rp
+++ b/data/test/test3-multireplace.evg
diff --git a/data/test/test4-implicitorder.rp b/data/test/test4-implicitorder.evg
index 28b14d5..28b14d5 100644
--- a/data/test/test4-implicitorder.rp
+++ b/data/test/test4-implicitorder.evg
diff --git a/data/test/test5-explicitorder.rp b/data/test/test5-explicitorder.evg
index 2ee18ce..2ee18ce 100644
--- a/data/test/test5-explicitorder.rp
+++ b/data/test/test5-explicitorder.evg
diff --git a/data/test/test6-staging.rp b/data/test/test6-staging.evg
index 34fd9dd..34fd9dd 100644
--- a/data/test/test6-staging.rp
+++ b/data/test/test6-staging.evg
diff --git a/data/test/test7-error.rp b/data/test/test7-error.evg
index 3a8f995..3a8f995 100644
--- a/data/test/test7-error.rp
+++ b/data/test/test7-error.evg
diff --git a/data/test/test8-globals.rp b/data/test/test8-globals.evg
index 8fd2165..8fd2165 100644
--- a/data/test/test8-globals.rp
+++ b/data/test/test8-globals.evg
diff --git a/data/test/test9.rp b/data/test/test9.evg
index 17c7c02..17c7c02 100644
--- a/data/test/test9.rp
+++ b/data/test/test9.evg
diff --git a/src/main/java/bjc/everge/Everge.java b/src/main/java/bjc/everge/Everge.java
index 4638fb5..96b20ff 100644
--- a/src/main/java/bjc/everge/Everge.java
+++ b/src/main/java/bjc/everge/Everge.java
@@ -195,7 +195,7 @@ public class Everge {
return returnStatus;
}
- private boolean processArg(List<String> errs, boolean retStat, String arg, Deque<String> argQueue) {
+ private boolean processArg(List<String> errors, boolean retStat, String arg, Deque<String> argQueue) {
boolean newReturnStatus = retStat;
if (arg.equals("--")) {
@@ -223,6 +223,7 @@ public class Everge {
break;
case "-N":
case "--no-newline":
+ case "--nonewline":
printNLAfterReplace = false;
break;
@@ -230,17 +231,17 @@ public class Everge {
case "--verbose":
verbosity += 1;
errorStream.louder();
- System.err.printf("[TRACE] Incremented verbosity\n");
+ //System.err.printf("[TRACE] Incremented verbosity\n");
break;
case "-q":
case "--quiet":
verbosity -= 1;
errorStream.quieter();
- System.err.printf("[TRACE] Decremented verbosity\n");
+ //System.err.printf("[TRACE] Decremented verbosity\n");
break;
case "--verbosity":
if (argQueue.size() < 1) {
- errs.add("[ERROR] No parameter to --verbosity");
+ errors.add("[ERROR] No parameter to --verbosity");
newReturnStatus = false;
break;
}
@@ -249,18 +250,18 @@ public class Everge {
try {
verbosity = Integer.parseInt(argBody);
errorStream.verbosity(verbosity);
- System.err.printf("[TRACE] Set verbosity to %d\n", verbosity);
+ //System.err.printf("[TRACE] Set verbosity to %d\n", verbosity);
} catch (NumberFormatException nfex) {
String msg = String.format(
"[ERROR] Invalid verbosity: '%s' is not an integer", argBody);
- errs.add(msg);
+ errors.add(msg);
newReturnStatus = false;
}
break;
case "--pattern":
if (argQueue.size() < 1) {
- errs.add("[ERROR] No parameter to --pattern");
+ errors.add("[ERROR] No parameter to --pattern");
newReturnStatus = false;
break;
}
@@ -276,14 +277,14 @@ public class Everge {
} catch (PatternSyntaxException psex) {
String msg = String.format("[ERROR] Pattern '%s' is invalid: %s",
regexPattern, psex.getMessage());
- errs.add(msg);
+ errors.add(msg);
newReturnStatus = false;
}
break;
case "--file":
if (argQueue.size() < 1) {
- errs.add("[ERROR] No argument to --file");
+ errors.add("[ERROR] No argument to --file");
newReturnStatus = false;
break;
}
@@ -293,9 +294,9 @@ public class Everge {
Scanner scn = new Scanner(fis)) {
List<ReplPairError> ferrs = new ArrayList<>();
- List<ReplPair> lrp = new ArrayList<>();
+ List<ReplPair> pairList = new ArrayList<>();
ReplPairParser parser = new ReplPairParser();
- lrp = parser.readList(lrp, scn, ferrs, replOptions);
+ pairList = parser.readList(pairList, scn, ferrs, replOptions);
if (ferrs.size() > 0) {
StringBuilder sb = new StringBuilder();
@@ -310,32 +311,31 @@ public class Everge {
errString, argBody);
sb.append(msg);
- for (ReplPairError err : ferrs) {
+ for (ReplPairError err : ferrs)
sb.append(String.format("\t%s\n", err));
- }
- errs.add(sb.toString());
+ errors.add(sb.toString());
newReturnStatus = false;
}
- replSet.addPairs(lrp);
+ replSet.addPairs(pairList);
} catch (FileNotFoundException fnfex) {
String msg = String.format(
"[ERROR] Could not open data file '%s' for input", argBody);
- errs.add(msg);
+ errors.add(msg);
newReturnStatus = false;
} catch (IOException ioex) {
String msg = String.format(
"[ERROR] Unknown I/O error reading data file '%s': %s",
argBody, ioex.getMessage());
- errs.add(msg);
+ errors.add(msg);
newReturnStatus = false;
}
break;
case "--arg-file":
if (argQueue.size() < 1) {
- errs.add("[ERROR] No argument to --arg-file");
+ errors.add("[ERROR] No argument to --arg-file");
break;
}
argBody = argQueue.pop();
@@ -347,33 +347,34 @@ public class Everge {
while (scn.hasNextLine()) {
String ln = scn.nextLine().trim();
- if (ln.equals(""))
- continue;
- if (ln.startsWith("#"))
- continue;
+ if (ln.equals("")) continue;
+ if (ln.startsWith("#")) continue;
sl.add(ln);
}
+ // @FixMe :ArgFile
+ // This won't work properly when using the 'non-inline' arguments
+ // oops. It should. -- bculkin, Oct 31
processArgs(sl.toArray(new String[0]));
} catch (FileNotFoundException fnfex) {
String msg = String.format(
"[ERROR] Could not open argument file '%s' for input",
argBody);
- errs.add(msg);
+ errors.add(msg);
newReturnStatus = false;
} catch (IOException ioex) {
String msg = String.format(
"[ERROR] Unknown I/O error reading input file '%s': %s",
argBody, ioex.getMessage());
- errs.add(msg);
+ errors.add(msg);
newReturnStatus = false;
}
break;
case "--input-status":
if (argQueue.size() < 1) {
- errs.add("[ERROR] No argument to --input-status");
+ errors.add("[ERROR] No argument to --input-status");
break;
}
argBody = argQueue.pop();
@@ -383,14 +384,14 @@ public class Everge {
} catch (IllegalArgumentException iaex) {
String msg = String.format("[ERROR] '%s' is not a valid input status",
argBody);
- errs.add(msg);
+ errors.add(msg);
}
break;
default: {
String msg = String.format(
"[ERROR] Unrecognised CLI argument name '%s'\n", argName);
- errs.add(msg);
+ errors.add(msg);
newReturnStatus = false;
}
}
diff --git a/src/main/java/bjc/everge/ReplPairSet.java b/src/main/java/bjc/everge/ReplPairSet.java
index 3d173c7..f10fe60 100644
--- a/src/main/java/bjc/everge/ReplPairSet.java
+++ b/src/main/java/bjc/everge/ReplPairSet.java
@@ -75,9 +75,7 @@ public class ReplPairSet {
* The pairs to add to the ReplSet.
*/
public void addPairs(ReplPair... pars) {
- for (ReplPair par : pars) {
- pairList.add(par);
- }
+ for (ReplPair par : pars) pairList.add(par);
// Resort the pairs into priority order
pairList.sort(null);
@@ -95,10 +93,10 @@ public class ReplPairSet {
String ret = val;
for (ReplPair par : pairList) {
- System.err.printf("Applying pair '%s' to string '%s' (original was '%s')\n", par, ret, val);
- String tmp = par.apply(ret);
+ //System.err.printf("Applying pair '%s' to string '%s' (original was '%s')\n", par, ret, val);
+ String msg = par.apply(ret);
- ret = tmp;
+ ret = msg;
}
return ret;
diff --git a/src/test/java/bjc/everge/EvergeTest.java b/src/test/java/bjc/everge/EvergeTest.java
index b70fd26..3f4e113 100644
--- a/src/test/java/bjc/everge/EvergeTest.java
+++ b/src/test/java/bjc/everge/EvergeTest.java
@@ -47,8 +47,8 @@ public class EvergeTest {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ByteArrayOutputStream errBaos = new ByteArrayOutputStream();
- OutputStream normOut = new MirrorOutputStream(baos, System.out);
- OutputStream normErr = new MirrorOutputStream(errBaos, System.err);
+ OutputStream normOut = new MirrorOutputStream(baos/*, System.out*/);
+ OutputStream normErr = new MirrorOutputStream(errBaos/*, System.err*/);
Everge evg = new Everge();
evg.setOutput(normOut);
@@ -57,7 +57,7 @@ public class EvergeTest {
evg.processArgs("--verbosity", "4");
List<String> errs = new ArrayList<>();
boolean stat = evg.processArgs(errs, "--input-status", "line", "--file",
- "data/test/evg-test1.rp", "data/test/evg-test1.inp");
+ "data/test/evg-test1.evg", "data/test/evg-test1.inp");
if (!stat) {
System.err.println("[ERROR] Did not succesfully process args");
for (String err : errs) {
diff --git a/src/test/java/bjc/everge/ReplPairTest.java b/src/test/java/bjc/everge/ReplPairTest.java
index 860a420..650ee14 100644
--- a/src/test/java/bjc/everge/ReplPairTest.java
+++ b/src/test/java/bjc/everge/ReplPairTest.java
@@ -22,7 +22,7 @@ public class ReplPairTest {
@Test
public void testLoadFile() {
List<ReplPair> lrp = null;
- String fName = "data/test/test1-empty.rp";
+ String fName = "data/test/test1-empty.evg";
try (FileInputStream fis = new FileInputStream(fName);
Scanner scn = new Scanner(fis)) {
@@ -38,28 +38,28 @@ public class ReplPairTest {
@Test
public void testSingleReplace() {
- assertMultiReplace("data/test/test2-singlereplace.rp", "test2", "test1", "test2", "test2");
+ assertMultiReplace("data/test/test2-singlereplace.evg", "test2", "test1", "test2", "test2");
}
@Test
public void testMultiReplace() {
- assertMultiReplace("data/test/test3-multireplace.rp", "A B C", "a b c", "A A B", "a a b",
+ assertMultiReplace("data/test/test3-multireplace.evg", "A B C", "a b c", "A A B", "a a b",
"AAB", "aab");
}
@Test
public void testReplaceOrder() {
- assertMultiReplace("data/test/test4-implicitorder.rp", "a", "a", "d", "ab");
+ assertMultiReplace("data/test/test4-implicitorder.evg", "a", "a", "d", "ab");
}
@Test
public void testReplaceExpOrder() {
- assertMultiReplace(false, "data/test/test5-explicitorder.rp", "a", "a", "aa", "ab");
+ assertMultiReplace(false, "data/test/test5-explicitorder.evg", "a", "a", "aa", "ab");
}
@Test
public void testStaging() {
- assertMultiReplace("data/test/test6-staging.rp", "c", "a", "y2", "x");
+ assertMultiReplace("data/test/test6-staging.evg", "c", "a", "y2", "x");
}
@Test
@@ -69,7 +69,7 @@ public class ReplPairTest {
+ " replacement body for raw name 'a'"
+ "\n\t\tContext: No associated line";
- assertThrownMessage(msg, "data/test/test7-error.rp");
+ assertThrownMessage(msg, "data/test/test7-error.evg");
}
@Test
@@ -85,19 +85,19 @@ public class ReplPairTest {
@Test
public void testGlobals() {
- assertMultiReplace("data/test/test8-globals.rp", "b1d\n1d\n1b1", "acca");
+ assertMultiReplace("data/test/test8-globals.evg", "b1d\n1d\n1b1", "acca");
}
@Test
public void testGuards() {
- assertMultiReplace("data/test/test10-guard.rp", "a", "a", "bbb", "aaa");
+ assertMultiReplace("data/test/test10-guard.evg", "a", "a", "bbb", "aaa");
}
@Test
public void testMultiControl() {
- assertMultiReplace("data/test/test11-bodyinlinemulti.rp", "bc", "a", "z\na", "d", "m", "po");
+ assertMultiReplace("data/test/test11-bodyinlinemulti.evg", "bc", "a", "z\na", "d", "m", "po");
// NOTE Uncomment when :EndingSlash is fixed
- //assertMultiReplace("data/test/test11.rp", "q\\", "FG");
+ //assertMultiReplace("data/test/test11-bodyinlinemulti.evg", "q\\", "FG");
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-09 23:12:07 +0000