A couple more steps toward nrx

sorear · Sep 1, 2010 · cd6e7c1 · cd6e7c1
1 parent 33f66ad
commit cd6e7c1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/lib/Cursor.cs b/lib/Cursor.cs
@@ -113,19 +113,17 @@ public struct State {
         }
     }
 
-    public Frame Exact(Frame th, string st) {
+    public bool Exact(string st) {
         if (bt.obj.pos + st.Length > end)
-            return Backtrack(th);
+            return false;
         foreach (char ch in st)
             if (orig[bt.obj.pos++] != ch)
-                return Backtrack(th);
-        return th;
+                return false;
+        return true;
     }
 
-    public Frame ExactOne(Frame th, char ch) {
-        if (bt.obj.pos == end || orig[bt.obj.pos++] != ch)
-            return Backtrack(th);
-        return th;
+    public bool ExactOne(char ch) {
+        return !(bt.obj.pos == end || orig[bt.obj.pos++] != ch);
     }
 
     public void OpenQuant() {
@@ -145,6 +143,22 @@ public struct State {
     public int GetQuant() {
         return bt.obj.reps.obj;
     }
+
+    /*
+    public static DynMetaObject ListMO;
+    public static DynMetaObject LLArrayMO;
+    public static DynMetaObject RegexBacktrackIteratorMO;
+    public static Variable FalseV;
+    public Frame End(Frame th) {
+        if (return_one) {
+            th.caller.resultSlot = MakeCursor();
+        } else {
+            DynObject lst = new DynObject(ListMO);
+            DynObject obs = new DynObject(LLArrayMO);
+            DynObject its = new DynObject(LLArrayMO);
+            DynObject it  = new RegexBacktrackIteratorMO;
+    }
+    */
 }
 
 public sealed class XAct {

diff --git a/t/RxUnitTest.cs b/t/RxUnitTest.cs
@@ -20,7 +20,9 @@ class RxExact: RxOp {
     public RxExact(string s) { this.s = s; }
     public override void Compile(CodeBuf cb) {
         cb.ops.Add(delegate(Frame th) {
-            return th.rx.Exact(th, s);
+            if (!th.rx.Exact(th, s))
+                return th.rx.Backtrack(th);
+            return th;
         });
     }
 }