Changeset 56

Timestamp:

09/11/07 11:02:42 (5 years ago)

Author:

BCS

Message:

Lots of updates!!
firstly all the debugs stuff now uses debug identifiers:

dparse_verbose for compile time stuff
dParse_runtime for run time stuff
dparse_unittest to turn on the main unittest

also a bunch of updates to the asserts (they now all have messages)
a few more logging line salted around
at the current line 1000 a 'this.' got removed so that parser can be created at module scope (sometimes this generates like errors, I'll have to talk to W on this one)
It will now (at compile time) warn you about some unusable grammars like A ::= A B;
there is now a waning about unparsed data in the input.
the struct Frame was moved to get rid of some issues with duplicate code. see "Well that was stupid of me" in the main NG (9/10/07)
rearranged the PObject hierarchy, adding:
PObjectFill // pass/fail, no content object
PObjectList // generic list builder
PObjectListLeft // derived from PObjectList but adds to the left side
PObject.fail is now abstract (and should have been all along)

Most of these come from typing to get a big grammar working so expect more to come, including some preprocessor apps.

Files:

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

trunk/dparser/dparse.d

@@ -61 +61 @@
-   Value v = cast(Value)set.Parser(a);
-
-
+,"ERR0R"
-   writef("%d\n", v.value);
-}
@@ -123 +123 @@
-abstract class PObject
-{
-
+abstract 
-}
-
@@ -194 +194 @@
-/**
-*/
-
+,bool str = true
-{
-    T t;
@@ -206 +206 @@
-    char[] string()
-    {
-
-
+
+
+
+
+
+
+
-        else
-std.string.toString(t)
+"<<"~T.stringof~">>"
-    }
-}
-//typedef PObjectVector!(5) Five;
+
+/**
+*/
+class PObjectList(T) : PObject
+{
+    T[] list;
+    int at=0;
+
+    this(){ list = null; }
+
+    this(T ti)
+    {
+        static if(is(T :Object)) assert(ti !is null);
+        list = new T[5];
+        list[at] = ti;
+        at++;
+
+    }
+
+    /// Add a T
+    uint Add(T ti)
+    {
+        static if(is(T :Object)) assert(ti !is null);
+        if(list.length <= at) list.length = at + 5;
+        list[at] = ti;
+        at++;
+        return at-1;
+    }
+
+    /// return the number of items stored
+    uint Count(){return at;}
+
+    T[] get()
+    {
+        return list[0..at];
+    }
+
+    bool fail() { return false; }
+}
+
+class PObjectListLeft(T) : PObjectList!(T)
+{
+    this(T t){super(t);}
+    this(){}
+    
+    /// Add a T
+    uint Add(T ti)
+    {
+        static if(is(T :Object)) assert(ti !is null);
+
+        if(list.length <= at)
+        {
+            auto t = list[$-at..$].dup;
+            list.length = at + 5;
+            list[$-at..$] = t;
+        }
+        list[$-1-at] = ti;
+        at++;
+        return at-1;
+    }
+
+    T[] get()
+    {
+        return list[$-at..$];
+    }
+}
+
+unittest
+{
+    writef("unittest@"__FILE__":"~itoa!(__LINE__)~\n);
+    
+    auto o = new PObjectListLeft!(int);
+    o.Add(1);
+    o.Add(2);
+    o.Add(3);
+    o.Add(4);
+    o.Add(5);
+    o.Add(6);
+
+    assert(o.get == [6,5,4,3,2,1], "PObjectListLeft failed");
+}
-
-
@@ -219 +305 @@
-    A sub class of PObject that is used for repeated reductions
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    /// Discard some PObjects
-    void Back(uint b)
-    {
-
-
-
-
+
+
-}
-
@@ -269 +339 @@
-
-    bool fail() { return true; }
+}
+
+class PObjectFill : PObject
+{
+    bool b;
+    this(bool _b){b=_b;}
+    bool fail(){return b;}
-}
-
@@ -327 +404 @@
-
-
-
+public 
-{
-    bool pass = true;
@@ -696 +773 @@
-        static const char[] Remaining = str[Used.length .. $];
-
+        // Get a given rule
-        template Rule(char[] str)
-        {
@@ -750 +828 @@
-    const int Revert = i*(Places.max+1) + Places.Revert;
-    const int Start  = i*(Places.max+1) + Places.Start;
-
+debug(dparse_verbose) 
-}
-
@@ -760 +838 @@
-SEQUENCE : ID SEQUENCE | ;
-*/
-
-
-
+
+
+
+
+
-{
-    private alias Parse_Grammar!(rules) grammar;
-    static assert(grammar.Match);
-
+    static if(grammar.Match && DropWhiteF(grammar.Remaining).length != 0)
+        pragma(msg, "Unparsed data: "~DropWhiteF(grammar.Remaining));
+
-    PObject Rule(char[] ruleIs)(IParser p)
-    {
-
+(dParse_runtime)
-        {
-            int ind = counter++;
-            bool worked = false;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        Stack!(Frame) backups;
-        Frame store;
@@ -787 +869 @@
-        {
-            alias grammar.Rule!(ruleIs).Is rule;
-
+debug(dparse_verbose) 
-                        // record start location
-                    uint start = p.pos;
@@ -794 +876 @@
-                    caseLoop: foreach(ci,casev;rule.Disjuncts)
-                    {
- std.stdio.
+(dParse_runtime) 
-
-                            // dump all checkpoints
@@ -800 +882 @@
-
-                            // return to start location
-
+
+
+
+
+
-
-                            // allocate storage for returns
@@ -807 +893 @@
-                        static assert(count == temps.length);
-
-
-
+
-
-                        static const int FirstCase = -1;
@@ -823 +908 @@
-                            foreach(index, cl; casev.Clauses)
-                            {
+                                static if(/*ci == 0 &&*/ index == 0 && ruleIs == cl.Text) pragma(msg, "Directly recursive rule: "~ruleIs)
-                                    // static stuff
-
- std.stdio.
-
-
+(dParse_runtime) 
+
+debug(dparse_verbose) 
-
-                                static if(cl.Type != ItemType.single)
@@ -841 +927 @@
-                                    // for cases where empty match is not allowed
-                                        // get one
-
+debug(dparse_verbose) 
-                                    auto tmpStore1 = Rule!(cl.Text)(p);
-
+debug(dparse_verbose) 
-
-                                        // test it
@@ -884 +970 @@
-                                    store.count = (cast(PObjectSet)temps[index]).Count();
-
-
+debug(dparse_verbose) 
-                                    auto tmpStore2 = Rule!(cl.Text)(p);
-
+debug(dparse_verbose) 
-
-                                    if(!tmpStore2.fail())
@@ -909 +995 @@
-                            }
-                        }
-
-
+
+
+
+
-                    }
-
-
+
+
+
-                }
-                else
-                {
-
- std.stdio.
-
+debug(dparse_verbose) 
+(dParse_runtime) 
+
-            auto ret = Terminal!(ruleIs)(p);
-            assert(ret !is null);
-
+
+
+
-            return ret;
-        }
-
-
+debug(dparse_verbose) 
-    }
-    alias Rule!(start) Parser;
@@ -976 +1067 @@
-    unittest // unittest Stack!(T)
-    {
+        writef("unittest@"__FILE__":"~itoa!(__LINE__)~"!("~T.stringof~")\n");
+
-        Stack!(int) st;
-        int i;
@@ -997 +1090 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+