summaryrefslogtreecommitdiff
path: root/clformat/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'clformat/src/main/java')
-rw-r--r--clformat/src/main/java/bjc/utils/ioutils/format/CLString.java7
-rw-r--r--clformat/src/main/java/bjc/utils/ioutils/format/ClauseDecree.java5
-rw-r--r--clformat/src/main/java/bjc/utils/ioutils/format/Decree.java31
-rw-r--r--clformat/src/main/java/bjc/utils/ioutils/format/GroupDecree.java5
4 files changed, 36 insertions, 12 deletions
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/CLString.java b/clformat/src/main/java/bjc/utils/ioutils/format/CLString.java
index d704df7..5e74cc1 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/CLString.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/CLString.java
@@ -97,7 +97,7 @@ public class CLString {
for (Edict edt : edicts) {
edt.format(formCTX);
}
- } catch (EscapeException eex) {
+ } catch (DirectiveEscape eex) {
// General escape exception, so stop formatting.
}
@@ -114,4 +114,9 @@ public class CLString {
return false;
}
+
+ @Override
+ public String toString() {
+ return String.format("CLString [edicts=%s]", edicts);
+ }
}
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/ClauseDecree.java b/clformat/src/main/java/bjc/utils/ioutils/format/ClauseDecree.java
index 2c34a0d..6965634 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/ClauseDecree.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/ClauseDecree.java
@@ -67,4 +67,9 @@ public class ClauseDecree {
public void addChild(Decree child) {
body.add(child);
}
+
+ @Override
+ public String toString() {
+ return String.format("ClauseDecree [body=%s, terminator=%s]", body, terminator);
+ }
}
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/Decree.java b/clformat/src/main/java/bjc/utils/ioutils/format/Decree.java
index a4bc005..cefe785 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/Decree.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/Decree.java
@@ -45,7 +45,7 @@ public class Decree {
* Create a new literal text directive.
*
* @param txt
- * The text of the directive.
+ * The text of the directive.
*/
public Decree(String txt) {
this.name = txt;
@@ -57,14 +57,15 @@ public class Decree {
* Create a new directive.
*
* @param name
- * The name of the directive. Whether or not it is an actual directive will
- * be auto-determined (if it starts with a ~, it's a directive.)
+ * The name of the directive. Whether or not it is an
+ * actual directive will be auto-determined (if it starts
+ * with a ~, it's a directive.)
*
* @param params
- * The prefix parameters to the directive.
+ * The prefix parameters to the directive.
*
* @param mods
- * The modifiers to the directive.
+ * The modifiers to the directive.
*/
public Decree(String name, CLParameters params, CLModifiers mods) {
this.name = name;
@@ -80,17 +81,19 @@ public class Decree {
* Create a new directive that may be a user function.
*
* @param name
- * The name of the directive. Whether or not it is an actual directive will
- * be auto-determined (if it starts with a ~ and is not a user function, it's a directive.)
+ * The name of the directive. Whether or not it is an
+ * actual directive will be auto-determined (if it starts
+ * with a ~ and is not a user function, it's a
+ * directive.)
*
* @param isUser
- * Is this directive a user function?
+ * Is this directive a user function?
*
* @param params
- * The prefix parameters to the directive.
+ * The prefix parameters to the directive.
*
* @param mods
- * The modifiers to the directive.
+ * The modifiers to the directive.
*/
public Decree(String name, boolean isUser, CLParameters params, CLModifiers mods) {
this.name = name;
@@ -108,7 +111,7 @@ public class Decree {
* Check if this decree is a non-literal, with a particular name.
*
* @param nam
- * The name to see if we have.
+ * The name to see if we have.
*
* @return Whether or not the provided name equals our name.
*/
@@ -118,4 +121,10 @@ public class Decree {
return name.equals(nam);
}
+
+ @Override
+ public String toString() {
+ return String.format("Decree [name=%s, isLiteral=%s, isUserCall=%s, parameters=%s, modifiers=%s]", name,
+ isLiteral, isUserCall, parameters, modifiers);
+ }
}
diff --git a/clformat/src/main/java/bjc/utils/ioutils/format/GroupDecree.java b/clformat/src/main/java/bjc/utils/ioutils/format/GroupDecree.java
index cdbe586..ddf9f6d 100644
--- a/clformat/src/main/java/bjc/utils/ioutils/format/GroupDecree.java
+++ b/clformat/src/main/java/bjc/utils/ioutils/format/GroupDecree.java
@@ -104,4 +104,9 @@ public class GroupDecree {
public List<Decree> unwrap() {
return body.get(0).body;
}
+
+ @Override
+ public String toString() {
+ return String.format("GroupDecree [opening=%s, closing=%s, body=%s]", opening, closing, body);
+ }
}