Changeset 35664

Timestamp:

10/21/09 20:34:30 (4 years ago)

Author:

hoge1e3

Message:

 

Location:

lang/haxe/Tonyu2

Files:

• Parser.hx (modified) (8 diffs)
• Test.hx (modified) (1 diff)
• make.hxml (modified) (1 diff)

lang/haxe/Tonyu2/Parser.hx

@@ -6 +6 @@
         public function new(mesg:String){this.message=mesg;}
 }
-typedef ParserSub = Void->Dynamic;
+typedef ParserSub = Parser->Dynamic;
 //public delegate object ParserSub();
 //public delegate void VoidSub();
 class Parser {
         var input:String;
-        var context;
+        var context:Dynamic;
         var p:Int;
         var maxErrorPos:Int;
@@ -21 +21 @@
         public var rest(getRest,null):String;
         function getRest():String {
-                return input.Substring(p);
+                return input.substr(p);
         }
         public function  proceed(by:Int):Int {return p+=by;}
-        public var eos(isEOS,null):Boolean;
-        function isEOS():Boolean {
-           return p>=rest.Length;
+        public var eos(isEOS,null):Bool;
+        function isEOS():Bool {
+           return p>=rest.length;
         }
         var lastError:String;
@@ -61 +61 @@
                   var message:String=match+" expected";
                   var m:String=match;
-                  return function() {
-                        if (startsWith(rest,m)) {
-                                proceed(m.length);
+                  return function(t:Parser) {
+                        if (startsWith(t.rest,m)) {
+                                t.proceed(m.length);
                                 return m;
                         }
-                        raise(message);
+                        t.raise(message);
                         return null;
                   };
            } else if (Std.is(match , EReg)) {
-                  var message=match+" expected";
+                  var message=Std.string(match)+" expected";
                   var r:EReg=match;
-                  return function() {
-                        skipSpace();
-                        if (r.match(rest)) {
-                                if (r.matchedPos.pos()>0) throw new Exception("Invalid regex; it must start with ^ :"+r);
-                                proceed(r.matched(0).length);
+                  return function(t:Parser) {
+                        t.skipSpace();
+                        if (r.match(t.rest)) {
+                                if (r.matchedPos().pos>0) throw ("Invalid regex; it must start with ^ :"+r);
+                                t.proceed(r.matched(0).length);
                                 return r.matched(0);
                         }
-                        raise(message);
+                        t.raise(message);
                         return null;
                   };
@@ -101 +101 @@
         public function cache(name:String, sub:ParserSub ) {
            trace("Parsing "+name);
-           return sub();
+           return sub(this);
         }
                         //# combinator
         public function seq(seq:Array<Dynamic>):ParserSub {
                 var cls= toClosures(seq);
-                return function() {
+                return function(t:Parser) {
                    var res=[];
-                   for (var r in cls) {
-                                res.push(r());
+                   var r:ParserSub;
+                   for (r in cls) {
+                                res.push(r(t));
                    }
                    return res;
@@ -115 +116 @@
         }
         public function parseSeq(s:Array<Dynamic>):Array<Dynamic> {
-                return seq(s)();
-        }
-        public function tryThese(_:Array<Dynamic>) {                    
+                return seq(s)(this);
+        }
+        public function tryThese(_:Array<Dynamic>):ParserSub {                  
                 var subs=toClosures(_); 
-                return function () {
+                return function (t:Parser) {
                    var res=null;
-                   //#my $trID=rand(10000);
-                   var trID=100;
+                   var trID=Std.random(10000);
                    trace("Trying "+trID);
                    var lastError:ParseError =null;
-                   for (var sub in subs) {
-                          var st=saveState();
+                   var sub:ParserSub;
+                   for (sub in subs) {
+                          var st=t.saveState();
                           lastError=null;
                           try {
-                                 res=sub();
+                                 res=sub(t);
                           } catch (p:ParseError) {
                                 lastError=p;
-                                restoreState(st);
+                                t.restoreState(st);
                           }
                           if (lastError==null) {trace("Trial "+trID+" OK res="+res); return res;}
@@ -149 +150 @@
         }
         public function maybe(_:Array<Dynamic>):ParserSub {
-           return function () {
-                 var res: Array<Dynamic> = reptN(0,1,seqAry(_))();
+           return function (t:Parser) {
+                 var res: Array<Dynamic> = (t.reptN(0,1,t.seq(_)))(t);
                  if (res.length==1) return res[0];
                  return null;
@@ -156 +157 @@
         }
 
-        public function reptN(min:int , max:int, sub:ParserSub):ParserSub  {
-           return function() {
+        public function reptN(min:Int , max:Int, sub:ParserSub):ParserSub  {
+           return function(t:Parser) {
                  var res=[];
-                 while (res.Count<max) {
+                 while (res.length<max) {
                         var suc=true;
-                        var fail=function(){suc=false;return null;};
-                        var tres=tryThese(sub, fail)();
+                        var fail=function(t:Parser){suc=false;return null;};
+                        var tres=(t.tryThese([sub, fail]))(t);
                         if (suc) {
                                 res.push(tres);
@@ -169 +170 @@
                         }
                  }
-                 if (res.length<min) {raise("only "+res.Count+" time for ("+min+" - "+max+")");}
-                 trace("repeated "+res.Count+"("+min+" - "+max+")  OK, proceed");
+                 if (res.length<min) {
+                        t.raise("only "+res.length+" time for ("+min+" - "+max+")");
+                }
+                 trace("repeated "+res.length+"("+min+" - "+max+")  OK, proceed");
                  //#if ($cnt!=@res) {die("Why $cnt ".scalar(@res));}
                  return res;

lang/haxe/Tonyu2/Test.hx

@@ -1 +1 @@
 
-class TestParser:Parser {
-        var alpha=~/^[a-z]+/;
-        public TestParser(string src):base(src) {}
-        public void parse() {
-                var res=parseSeq(alpha,alpha);
-                foreach (var r in res) {
-                        System.Console.Write("found :"+r+"\n");
+class TestParser extends Parser {
+        static var alpha=~/^[a-z]+/;
+        public function new(src:String) {super(src);}
+        public function parse() {
+                var res=parseSeq([alpha,alpha]);
+                var r;
+                for (r in res) {
+                        trace("found :"+r);
                 }
         }
 }
 class Test {
-        public static void Main() {
-                new TestParser("  aho baka ").parse();
+        static function main() {
+                new TestParser(" (1+2)*3 ").parse();
                 //System.Console.Write("Test");
         }

lang/haxe/Tonyu2/make.hxml

@@ -10 +10 @@
 -neko scratch.n
 -main Scratch.hx
+
+--next
+-neko parser.n
+-main Test.hx