[jruby-joni] 23/194: more compact debug info
Hideki Yamane
henrich at moszumanska.debian.org
Thu Feb 1 12:04:09 UTC 2018
This is an automated email from the git hooks/post-receive script.
henrich pushed a commit to branch debian/sid
in repository jruby-joni.
commit 632c96bde372b38923be3f96ca00e5355e312992
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date: Fri Dec 22 16:24:38 2017 +0100
more compact debug info
---
src/org/joni/CodeRangeBuffer.java | 2 +-
src/org/joni/Option.java | 26 +++++++++++++-------------
src/org/joni/ast/AnchorNode.java | 2 +-
src/org/joni/ast/CTypeNode.java | 5 ++---
src/org/joni/ast/CallNode.java | 2 +-
src/org/joni/ast/EncloseNode.java | 13 ++++++-------
src/org/joni/ast/QuantifierNode.java | 10 +++++-----
7 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/src/org/joni/CodeRangeBuffer.java b/src/org/joni/CodeRangeBuffer.java
index 7e7e5e3..137772a 100644
--- a/src/org/joni/CodeRangeBuffer.java
+++ b/src/org/joni/CodeRangeBuffer.java
@@ -54,7 +54,7 @@ public final class CodeRangeBuffer {
StringBuilder buf = new StringBuilder();
buf.append("CodeRange");
buf.append("\n used: " + used);
- buf.append("\n code point: " + p[0]);
+ buf.append(", size: " + p[0]);
buf.append("\n ranges: ");
for (int i=0; i<p[0]; i++) {
diff --git a/src/org/joni/Option.java b/src/org/joni/Option.java
index 607a6e0..ce086dd 100644
--- a/src/org/joni/Option.java
+++ b/src/org/joni/Option.java
@@ -53,19 +53,19 @@ public class Option {
public static String toString(int option) {
String options = "";
- if (isIgnoreCase(option)) options += "IGNORECASE ";
- if (isExtend(option)) options += "EXTEND ";
- if (isMultiline(option)) options += "MULTILINE ";
- if (isSingleline(option)) options += "SINGLELINE ";
- if (isFindLongest(option)) options += "FIND_LONGEST ";
- if (isFindNotEmpty(option)) options += "FIND_NOT_EMPTY ";
- if (isNegateSingleline(option)) options += "NEGATE_SINGLELINE ";
- if (isDontCaptureGroup(option)) options += "DONT_CAPTURE_GROUP ";
- if (isCaptureGroup(option)) options += "CAPTURE_GROUP ";
-
- if (isNotBol(option)) options += "NOTBOL ";
- if (isNotEol(option)) options += "NOTEOL ";
- if (isPosixRegion(option)) options += "POSIX_REGION ";
+ if (isIgnoreCase(option)) options += "IGNORECASE";
+ if (isExtend(option)) options += "EXTEND";
+ if (isMultiline(option)) options += "MULTILINE";
+ if (isSingleline(option)) options += "SINGLELINE";
+ if (isFindLongest(option)) options += "FIND_LONGEST";
+ if (isFindNotEmpty(option)) options += "FIND_NOT_EMPTY";
+ if (isNegateSingleline(option)) options += "NEGATE_SINGLELINE";
+ if (isDontCaptureGroup(option)) options += "DONT_CAPTURE_GROUP";
+ if (isCaptureGroup(option)) options += "CAPTURE_GROUP";
+
+ if (isNotBol(option)) options += "NOTBOL";
+ if (isNotEol(option)) options += "NOTEOL";
+ if (isPosixRegion(option)) options += "POSIX_REGION";
return options;
}
diff --git a/src/org/joni/ast/AnchorNode.java b/src/org/joni/ast/AnchorNode.java
index 498f1a6..4a487a8 100644
--- a/src/org/joni/ast/AnchorNode.java
+++ b/src/org/joni/ast/AnchorNode.java
@@ -61,7 +61,7 @@ public final class AnchorNode extends Node {
public String toString(int level) {
StringBuilder value = new StringBuilder();
value.append("\n type: " + typeToString());
- value.append("\n ascii: " + asciiRange);
+ value.append(", ascii: " + asciiRange);
value.append("\n target: " + pad(target, level + 1));
return value.toString();
}
diff --git a/src/org/joni/ast/CTypeNode.java b/src/org/joni/ast/CTypeNode.java
index 0472e9a..fec4bf4 100644
--- a/src/org/joni/ast/CTypeNode.java
+++ b/src/org/joni/ast/CTypeNode.java
@@ -44,9 +44,8 @@ public final class CTypeNode extends Node {
public String toString(int level) {
StringBuilder value = new StringBuilder();
value.append("\n ctype: " + ctype);
- value.append("\n not: " + not);
- value.append("\n ascii: " + asciiRange);
-
+ value.append(", not: " + not);
+ value.append(", ascii: " + asciiRange);
return value.toString();
}
diff --git a/src/org/joni/ast/CallNode.java b/src/org/joni/ast/CallNode.java
index 59425ee..4733f39 100644
--- a/src/org/joni/ast/CallNode.java
+++ b/src/org/joni/ast/CallNode.java
@@ -76,7 +76,7 @@ public final class CallNode extends StateNode {
public String toString(int level) {
StringBuilder value = new StringBuilder(super.toString(level));
value.append("\n name: " + new String(name, nameP, nameEnd - nameP));
- value.append("\n groupNum: " + groupNum);
+ value.append(", groupNum: " + groupNum);
value.append("\n unsetAddrList: " + pad(unsetAddrList, level + 1));
value.append("\n target: " + pad(target.getAddressName(), level + 1));
return value.toString();
diff --git a/src/org/joni/ast/EncloseNode.java b/src/org/joni/ast/EncloseNode.java
index 0a39325..e984222 100644
--- a/src/org/joni/ast/EncloseNode.java
+++ b/src/org/joni/ast/EncloseNode.java
@@ -85,12 +85,12 @@ public final class EncloseNode extends StateNode implements EncloseType {
StringBuilder value = new StringBuilder(super.toString(level));
value.append("\n type: " + typeToString());
value.append("\n regNum: " + regNum);
- value.append("\n option: " + Option.toString(option));
- value.append("\n callAddr: " + callAddr);
- value.append("\n minLength: " + minLength);
- value.append("\n maxLength: " + maxLength);
- value.append("\n charLength: " + charLength);
- value.append("\n optCount: " + optCount);
+ value.append(", option: " + Option.toString(option));
+ value.append(", callAddr: " + callAddr);
+ value.append(", minLength: " + minLength);
+ value.append(", maxLength: " + maxLength);
+ value.append(", charLength: " + charLength);
+ value.append(", optCount: " + optCount);
value.append("\n target: " + pad(target, level + 1));
return value.toString();
}
@@ -101,7 +101,6 @@ public final class EncloseNode extends StateNode implements EncloseType {
if (isMemory()) types.append("MEMORY ");
if (isOption()) types.append("OPTION ");
if (isCondition()) types.append("CONDITION ");
-
return types.toString();
}
diff --git a/src/org/joni/ast/QuantifierNode.java b/src/org/joni/ast/QuantifierNode.java
index e16005b..206e887 100644
--- a/src/org/joni/ast/QuantifierNode.java
+++ b/src/org/joni/ast/QuantifierNode.java
@@ -85,13 +85,13 @@ public final class QuantifierNode extends StateNode {
public String toString(int level) {
StringBuilder value = new StringBuilder(super.toString(level));
value.append("\n lower: " + lower);
- value.append("\n upper: " + upper);
- value.append("\n greedy: " + greedy);
- value.append("\n targetEmptyInfo: " + targetEmptyInfo);
+ value.append(", upper: " + upper);
+ value.append(", greedy: " + greedy);
+ value.append(", isRefered: " + isRefered);
+ value.append(", targetEmptyInfo: " + targetEmptyInfo);
+ value.append(", combExpCheckNum: " + combExpCheckNum);
value.append("\n headExact: " + pad(headExact, level + 1));
value.append("\n nextHeadExact: " + pad(nextHeadExact, level + 1));
- value.append("\n isRefered: " + isRefered);
- value.append("\n combExpCheckNum: " + combExpCheckNum);
value.append("\n target: " + pad(target, level + 1));
return value.toString();
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-joni.git
More information about the pkg-java-commits
mailing list