[jruby-joni] 73/279: Moved compile before setting regex.stackPopLevel to fix http://jira.codehaus.org/browse/JRUBY-5340. This now matches code in oniguruma.

[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 8ed3c8e994f279d9c540d00f6686f436a8f0a472
Author: Joel Hockey <joel.hockey at gmail.com>
Date:   Sun Jan 16 08:57:59 2011 +1000

    Moved compile before setting regex.stackPopLevel to fix http://jira.codehaus.org/browse/JRUBY-5340.  This now matches code in oniguruma.
---
 src/org/joni/Analyser.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/org/joni/Analyser.java b/src/org/joni/Analyser.java
index 7051652..a3b1bec 100644
--- a/src/org/joni/Analyser.java
+++ b/src/org/joni/Analyser.java
@@ -150,6 +150,9 @@ final class Analyser extends Parser {
 
         env.memNodes = null;
 
+        new ArrayCompiler(this).compile();
+        //new AsmCompiler(this).compile();
+
         if (regex.numRepeat != 0 || regex.btMemEnd != 0) {
             regex.stackPopLevel = StackPopLevel.ALL;
         } else {
@@ -160,9 +163,6 @@ final class Analyser extends Parser {
             }
         }
 
-        new ArrayCompiler(this).compile();
-        //new AsmCompiler(this).compile();
-
         if (Config.DEBUG_COMPILE) {
             if (Config.USE_NAMED_GROUP) Config.log.print(regex.nameTableToString());
             Config.log.println("stack used: " + regex.stackNeeded);

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