[jruby-joni] 201/223: Move some structures

[Hideki Yamane]

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 3883b00426905cdc49d3127862fcd09e623abc7c
Author: Marcin Mielzynski <lopx at gazeta.pl>
Date:   Tue Apr 7 23:56:06 2015 +0200

    Move some structures
---
 src/org/joni/Parser.java              |  4 ++--
 src/org/joni/ast/CClassNode.java      | 15 +++++++++++++--
 src/org/joni/constants/CCSTATE.java   | 27 ---------------------------
 src/org/joni/constants/CCVALTYPE.java | 26 --------------------------
 4 files changed, 15 insertions(+), 57 deletions(-)

diff --git a/src/org/joni/Parser.java b/src/org/joni/Parser.java
index 39bf422..f52c623 100644
--- a/src/org/joni/Parser.java
+++ b/src/org/joni/Parser.java
@@ -31,7 +31,9 @@ import org.joni.ast.AnchorNode;
 import org.joni.ast.AnyCharNode;
 import org.joni.ast.BackRefNode;
 import org.joni.ast.CClassNode;
+import org.joni.ast.CClassNode.CCSTATE;
 import org.joni.ast.CClassNode.CCStateArg;
+import org.joni.ast.CClassNode.CCVALTYPE;
 import org.joni.ast.CTypeNode;
 import org.joni.ast.CallNode;
 import org.joni.ast.ConsAltNode;
@@ -40,8 +42,6 @@ import org.joni.ast.Node;
 import org.joni.ast.QuantifierNode;
 import org.joni.ast.StringNode;
 import org.joni.constants.AnchorType;
-import org.joni.constants.CCSTATE;
-import org.joni.constants.CCVALTYPE;
 import org.joni.constants.EncloseType;
 import org.joni.constants.NodeType;
 import org.joni.constants.TokenType;
diff --git a/src/org/joni/ast/CClassNode.java b/src/org/joni/ast/CClassNode.java
index 177e2c0..f47b100 100644
--- a/src/org/joni/ast/CClassNode.java
+++ b/src/org/joni/ast/CClassNode.java
@@ -29,8 +29,6 @@ import org.joni.BitSet;
 import org.joni.CodeRangeBuffer;
 import org.joni.Config;
 import org.joni.ScanEnvironment;
-import org.joni.constants.CCSTATE;
-import org.joni.constants.CCVALTYPE;
 import org.joni.exception.ErrorMessages;
 import org.joni.exception.InternalException;
 import org.joni.exception.SyntaxException;
@@ -425,6 +423,19 @@ public final class CClassNode extends Node {
         } // switch
     }
 
+    public static enum CCVALTYPE {
+        SB,
+        CODE_POINT,
+        CLASS
+    }
+
+    public static enum CCSTATE {
+        VALUE,
+        RANGE,
+        COMPLETE,
+        START
+    }
+
     public static final class CCStateArg {
         public int v;
         public int vs;
diff --git a/src/org/joni/constants/CCSTATE.java b/src/org/joni/constants/CCSTATE.java
deleted file mode 100644
index 669b821..0000000
--- a/src/org/joni/constants/CCSTATE.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package org.joni.constants;
-
-public enum CCSTATE {
-    VALUE,
-    RANGE,
-    COMPLETE,
-    START
-}
diff --git a/src/org/joni/constants/CCVALTYPE.java b/src/org/joni/constants/CCVALTYPE.java
deleted file mode 100644
index b2bcb30..0000000
--- a/src/org/joni/constants/CCVALTYPE.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package org.joni.constants;
-
-public enum CCVALTYPE {
-    SB,
-    CODE_POINT,
-    CLASS
-}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-joni.git