Changeset 15

Timestamp:

02/04/07 23:20:47 (5 years ago)

Author:

BCS

Message:

added +, ? and *

Files:

• trunk/dparser/dparse.d (modified) (7 diffs)

trunk/dparser/dparse.d

@@ -154 +154 @@
-}
-
+template DropID(char[] string)
+{
+    const char[] DropID = string[GetID!(string).length .. $];
+}
+
+
-/***********
-    return tuple with string  broken up by d
@@ -216 +222 @@
-    bool fail;
-    this(){fail = true;}
+}
+
+
+class PObjectSet : PObject
+{
+    PObject[] set;
+    this(){ set = null; }
+
+    uint Add(PObject o)
+    {
+        uint ret = set.length;
+        set ~= o;
+        fail = false;
+        return ret;
+    }
+
+    void Back(uint b)
+    {
+        set.length = b;
+    }
-}
-
@@ -246 +272 @@
-
-        debug writef("Try\t(%d)%s...\n", ind, ruleIs);
-
+
+
-
-        pragma(msg, "Seeking: "~ruleIs);
+
+        struct Frame{uint pos; uint rule; uint count;}
+        Stack!(Frame) backups;
+        Frame store;
+
-        foreach(int i, char[] str; V)
-        {
@@ -267 +299 @@
-                    debug writef("*\t(%d)%s:%s...\n", ind, ruleIs,DiscardTill!(Case,'/'));
-
+                    backups.Empty();
+                    store.rule = -1;    // init case
+
-                        // return to start location
-                    p.pos = start;
@@ -274 +309 @@
-                    const int count = clauses.length;
-                    PObject[count] temps;
-
-
+
+
+
-                    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -305 +470 @@
-            debug writef("T\t(%d)%s...\n", ind, ruleIs);
-            auto ret = Terminal!(ruleIs)(p);
+            assert(ret !is null);
-            debug worked = !ret.fail;
-            return ret;
@@ -312 +478 @@
-    alias Rule!(start) Parser;
-}
+
+unittest
+{
+    Stack!(int) st;
+    int i;
+    for(i = 0; i < 20; i++)
+    {
+        assert(st.Count == i);
+        st.Push(i);
+    }
+
+    i--;
+
+    for(; i >= 0; i--)
+    {
+        int j = st.Pop;
+        assert(j == i);
+        assert(st.Count == i);
+    }
+
+    assert(st.Count == 0);
+
+
+}
+
+struct Stack(T)
+{
+    private T[] data = null;
+    private int at = 0;
+
+    void Push(T din)
+    {
+        if(data.length <= at)
+            data.length = data.length + 10;
+        data[at] = din;
+        at++;
+    }
+
+    T Pop()
+    {
+        if(at)
+        {
+            at--;
+            return data[at];
+        }
+        else
+            throw new Error("Stack Underflow");
+    }
+
+    uint Count(){return at;}
+
+    void Empty(){ at = 0; }
+
+    void Dist(){delete data;}
+}