svn commit: r517505 - /jakarta/regexp/trunk/src/java/org/apache/regexp/RECompiler.java

[vgritsenko]

Author: vgritsenko
Date: Mon Mar 12 20:12:35 2007
New Revision: 517505

URL: http://svn.apache.org/viewvc?view=rev&rev=517505
Log:
nits; quell warnings from IDE

Modified:
    jakarta/regexp/trunk/src/java/org/apache/regexp/RECompiler.java

Modified: jakarta/regexp/trunk/src/java/org/apache/regexp/RECompiler.java
URL: 
http://svn.apache.org/viewvc/jakarta/regexp/trunk/src/java/org/apache/regexp/RECompiler.java?view=diff&rev=517505&r1=517504&r2=517505
==============================================================================
--- jakarta/regexp/trunk/src/java/org/apache/regexp/RECompiler.java (original)
+++ jakarta/regexp/trunk/src/java/org/apache/regexp/RECompiler.java Mon Mar 12 
20:12:35 2007
@@ -143,9 +143,9 @@
 
         // Move everything from insertAt to the end down nodeSize elements
         System.arraycopy(instruction, insertAt, instruction, insertAt + 
RE.nodeSize, lenInstruction - insertAt);
-        instruction[insertAt + RE.offsetOpcode] = opcode;
-        instruction[insertAt + RE.offsetOpdata] = (char) opdata;
-        instruction[insertAt + RE.offsetNext] = 0;
+        instruction[insertAt /* + RE.offsetOpcode */] = opcode;
+        instruction[insertAt    + RE.offsetOpdata   ] = (char) opdata;
+        instruction[insertAt    + RE.offsetNext     ] = 0;
         lenInstruction += RE.nodeSize;
     }
 
@@ -203,9 +203,9 @@
         ensure(RE.nodeSize);
 
         // Add new node at end
-        instruction[lenInstruction + RE.offsetOpcode] = opcode;
-        instruction[lenInstruction + RE.offsetOpdata] = (char)opdata;
-        instruction[lenInstruction + RE.offsetNext] = 0;
+        instruction[lenInstruction /* + RE.offsetOpcode */] = opcode;
+        instruction[lenInstruction    + RE.offsetOpdata   ] = (char) opdata;
+        instruction[lenInstruction    + RE.offsetNext     ] = 0;
         lenInstruction += RE.nodeSize;
 
         // Return index of new node
@@ -931,15 +931,19 @@
                 // The current node can be null
                 flags[0] |= NODE_NULLABLE;
 
+                // Drop through
+
             case '+':
 
                 // Eat closure character
                 idx++;
 
+                // Drop through
+
             case '{':
 
                 // Don't allow blantant stupidity
-                int opcode = instruction[ret + RE.offsetOpcode];
+                int opcode = instruction[ret /* + RE.offsetOpcode */];
                 if (opcode == RE.OP_BOL || opcode == RE.OP_EOL)
                 {
                     syntaxError("Bad closure operand");
@@ -948,7 +952,6 @@
                 {
                     syntaxError("Closure operand can't be nullable");
                 }
-                break;
         }
 
         // If the next character is a '?', make the closure non-greedy 
(reluctant)



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]