Changeset 28557

Timestamp:

01/17/09 20:52:36 (4 years ago)

Author:

hoge1e3

Message:

Upgrade parser functions
(under construction)

Location:

lang/javascript/nohada/js/parser

Files:

• Parser.js (modified) (6 diffs)
• ParserTest.js (modified) (1 diff)
• TParserTest.js (added)

lang/javascript/nohada/js/parser/Parser.js

@@ -5 +5 @@
    },
    parse: function (grammar) {
-           grammar.parse(this);
+                /*if (grammar instanceof Grammar) {
+                        return grammar.parse(this);
+                }*/
+                if (grammar instanceof Function) {
+                        return grammar(this);
+                }
+                throw "Not parseable : "+grammar;
    },
    getTrailString: function () {  
@@ -18 +24 @@
    match: function (str) {
                 var t=this.getTrailString();
-                if (str instanceof Grammar) {
-                        return str.parse(this);
+                if (str instanceof Function) {
+                        return str.apply(this.curObj,[this]);
                 }
             if (typeof(str)=="string") {
@@ -26 +32 @@
                                 return str;
                         }
-                        this.parseError("String '"+str+"' Expected" );
+                        this.parseError("String '"+str+"' Expected at "+t );
                 }
                 if (str instanceof RegExp) {
@@ -37 +43 @@
                                 return res;
                         }
-                        this.parseError("Regex '"+str+"' Expected" );
+                        this.parseError("Regex '"+str+"' Expected at "+t );
                 }
                 this.parseError("Invalid element "+str);
@@ -45 +51 @@
    }
 });
-Grammar=Class.create({
-   initialize: function (elems) {
-           this.elems=elems.map(function (e,i) {
-                        if (e instanceof Function) {
-                                return function (p) {
-                                   return e.apply(p.curObj,[p]);
-                                };
+function gram() {
+        var elems=$A(arguments);
+        /*elems=elems.map(function (e) {
+                if (e instanceof Array) {
+                        var rept=e.pop();
+                        var g=gram.apply(this,e);
+                        e.push(rept);
+                        if (rept=="*") {
+                                return gramRepeat(g,0);
                         }
-                return function (p) {
-                            return p.match(e);
-                        };
-           });
-   },
-   parse: function (parser) {
+                        if (rept=="+") {
+                                return gramRepeat(g,1);
+                        }
+                        return gramMaybe(g);
+                }
+                return e;
+        });*/
+        var _this;
+        _this=function (parser) {
            if (typeof(parser)=="string") {
                         var p=new Parser(parser);
-                        return this.parse(p);
+                        return p.parse(_this);
            }
            var sv=parser.saveState();
            try {
                    var svCur=parser.curObj;
-                   parser.curObj={};
-                   var res;
-                   for (var i=0 ; i<this.elems.length ; i++) {
-                           var e=this.elems[i];
-                           res=e(parser);   
-                           parser.curObj[i]=res;
-                   }
-                   //alert (" ARY "+Object.toJSON(parser.curObj));
-                   parser.length=this.elems.length;
+                   var res=[];
+                   parser.curObj=res;
+                   elems.each(function (e) {
+                           res.push(parser.match(e));   
+                   });
                    parser.curObj=svCur;
+                   //alert("P "+Object.toJSON(res));
                    return res;
            } catch(e) {
@@ -81 +89 @@
                    throw e;
            }
-   }
-   
-});
-function gram() {
-  var elems=$A(arguments);
-  return new Grammar(elems);
+    };
+        return _this;
 }
+function gramRepeat(grm,min) {
+        return function (p) {
+                var sv;
+                var res=[];
+            try {
+                        while (true) {
+                                sv=parser.saveState();
+                                res.push(grm(p));
+                        }
+            } catch(e) {
+                        parser.restoreState(sv);
+                    if (res.length>=min) return res;
+                        throw e;
+            }
+        }
+}
+
+
+

lang/javascript/nohada/js/parser/ParserTest.js

@@ -5 +5 @@
         var res=tag("span","X");
         TagBuilder.write([text,res]);
-        var num=gram(/[0-9]+/,function (p) {
-            //alert(Object.toJSON(this));       
-        var s=this;
+        function num(p) {
+            var s=p.parse(gram(/[0-9]+/));
                 return parseInt(s[0]);
-        });
-        var g=gram(num,/[\+\-]/,num,function (p) {
-            //alert(Object.toJSON(this));       
-
-            var s=this;
-                var op=s[1];
+        }
+        function g(p) {
+            var s=p.parse( gram(num,gramRepeat(grm(/[\+\-]/,num),0)));
+                //alert(Object.toJSON(s));
+                var head=s[0];
+                var tail=s[1];
+                tail.each
                 if (op=="+") return s[0]+s[2];
                 if (op=="-") return s[0]-s[2];
-        });     
+        }               
         function calc() {
-                res.set( g.parse(text.get()) );
+                res.set( new Parser(text.get()).parse(g) );
         }
   }