Another crack at highexpect.

This seems to give better results.
Raku · Dec 8, 2012 · fb3f186 · fb3f186
1 parent 8d297b2
commit fb3f186
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/QAST/Compiler.nqp b/src/QAST/Compiler.nqp
@@ -1241,8 +1241,9 @@ class QAST::Compiler is HLL::Compiler {
     }
 
     method dba($node) {
-        # Doesn't compile into another; really just for the NFA.
-        self.post_new('Ops', :result(%*REG<cur>))
+        my $ops := self.post_new('Ops', :result(%*REG<cur>));
+        $ops.push_pirop('callmethod', '"!dba"', %*REG<cur>, %*REG<pos>, self.escape($node.name));
+        $ops
     }
 
     my %cclass_code;

diff --git a/src/QRegex/Cursor.nqp b/src/QRegex/Cursor.nqp
@@ -3,6 +3,7 @@ my class ParseShared {
     has $!orig;
     has str $!target;
     has int $!highwater;
+    has @!highexpect;
 }
 
 role NQPCursorRole is export {
@@ -79,6 +80,7 @@ role NQPCursorRole is export {
             nqp::bindattr_s($shared, ParseShared, '$!target',
                 pir::trans_encoding__Ssi($orig, pir::find_encoding__Is('ucs4')));
             nqp::bindattr_i($shared, ParseShared, '$!highwater', 0);
+            nqp::bindattr($shared, ParseShared, '@!highexpect', nqp::list());
         }
         nqp::bindattr($new, $?CLASS, '$!shared', $shared);
         if nqp::defined($c) {
@@ -308,11 +310,31 @@ role NQPCursorRole is export {
         }
     }
 
+    method !dba(int $pos, str $dba) {
+        my $shared := $!shared;
+        my int $highwater := nqp::getattr_i($shared, ParseShared, '$!highwater');
+        my $highexpect;
+        if $pos >= $highwater {
+            $highexpect := nqp::getattr($shared, ParseShared, '@!highexpect');
+            if $pos > $highwater {
+                pir::assign__0Pi($highexpect, 0);
+                nqp::bindattr_i($shared, ParseShared, '$!highwater', $pos);
+            }
+            nqp::push_s($highexpect, $dba);
+        }
+    }
+
     method !highwater() {
         nqp::getattr_i($!shared, ParseShared, '$!highwater')
     }
 
+    method !highexpect() {
+        nqp::getattr($!shared, ParseShared, '@!highexpect')    
+    }
+
     method !clear_highwater() {
+        my $highexpect := nqp::getattr($!shared, ParseShared, '@!highexpect');
+        pir::assign__0Pi($highexpect, 0);
         nqp::bindattr_i($!shared, ParseShared, '$!highwater', -1)
     }
 

diff --git a/src/QRegex/NFA.nqp b/src/QRegex/NFA.nqp
@@ -74,6 +74,10 @@ class QRegex::NFA {
     method anchor($node, int $from, int $to) { 
         self.addedge($from, $to, $EDGE_EPSILON, 0);
     }
+
+    method dba($node, int $from, int $to) { 
+        self.addedge($from, $to, $EDGE_EPSILON, 0);
+    }
 
     my %cclass_code;
     INIT {