Changeset 77

Timestamp:

11/07/06 16:55:23 (2 years ago)

Author:

Jan-Klaas Kollhof

Message:

new 'code precompilation' support for simpler method and class creation, support for destructuring assignment( [a,b] = [1,2]), ...

Files:

• branches/experimental/jsolait/jsolait.js (modified) (4 diffs)
• branches/experimental/jsolait/jsolait.wsf (modified) (5 diffs)
• branches/experimental/jsolait/lib/asyncimprt.js (deleted)
• branches/experimental/jsolait/lib/codecs.js (modified) (2 diffs)
• branches/experimental/jsolait/lib/crypto.js (modified) (2 diffs)
• branches/experimental/jsolait/lib/dom.js (modified) (8 diffs)
• branches/experimental/jsolait/lib/forms.js (modified) (13 diffs)
• branches/experimental/jsolait/lib/itertools.js (modified) (24 diffs)
• branches/experimental/jsolait/lib/jsonrpc.js (modified) (38 diffs)
• branches/experimental/jsolait/lib/lang.js (modified) (78 diffs)
• branches/experimental/jsolait/lib/logging.js (modified) (14 diffs)
• branches/experimental/jsolait/lib/operators.js (modified) (11 diffs)
• branches/experimental/jsolait/lib/sets.js (modified) (22 diffs)
• branches/experimental/jsolait/lib/strings.js (modified) (9 diffs)
• branches/experimental/jsolait/lib/testing.js (modified) (20 diffs)
• branches/experimental/jsolait/lib/urllib.js (modified) (16 diffs)
• branches/experimental/jsolait/lib/xml.js (modified) (12 diffs)
• branches/experimental/jsolait/lib/xmlrpc.js (modified) (49 diffs)
• branches/experimental/test/test.html (modified) (1 diff)
• branches/experimental/test/test.js (modified) (1 diff)
• branches/experimental/test/test_codecs.js (modified) (2 diffs)
• branches/experimental/test/test_core.js (modified) (4 diffs)
• branches/experimental/test/test_crypto.js (modified) (2 diffs)
• branches/experimental/test/test_itertools.js (modified) (3 diffs)
• branches/experimental/test/test_jsonrpc.js (modified) (2 diffs)
• branches/experimental/test/test_sets.js (modified) (2 diffs)
• branches/experimental/test/test_strings.js (modified) (2 diffs)
• branches/experimental/test/test_testing.js (modified) (2 diffs)
• branches/experimental/test/test_urllib.js (modified) (2 diffs)
• branches/experimental/test/test_xmlrpc.js (modified) (2 diffs)

branches/experimental/jsolait/jsolait.js

@@ -518 +518 @@
-    });
-    
-
-
-
-
-
-
-
-
+
+
+
-        try{
-            var xmlhttp = mod.getHTTPRequestObject();
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            xmlhttp.send("");
-        }catch(e){
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    
-    /**
@@ -599 +628 @@
-    
-    /**
-
+ asynchronously
-       jsolait.getSearchURIsForModuleName() will be used to determine the possible locations for the source of the module.
-      
-       @param name   The name of the module to load.
-
-
-
+
+
+
+
-
-        if(mod.modules[name]){ //module already loaded
-return mod.modules[name]
+loadedCB(mod.modules[name])
-        }else{
-            var src,sourceURI;
-            var searchURIs = mod.getSearchURIsForModuleName(name);
+            
-            var failedURIs=[];
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }catch(e){
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }else{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    mod.ModuleClass=Class(function(publ,priv,supr){
@@ -739 +819 @@
-    };
-    
-    mod.createModuleFromSource=function(name, source, sourceURI){
-        var newMod = new mod.ModuleClass(name, source, sourceURI);
-            
-        var deps=mod.getModuleDependenciesFromSource(source);
-        
-        var locals={
-            str:str,
-            repr:repr,
-            id:id,
-            bind:bind,
-            isinstance:isinstance,
-            issubclass:issubclass,
-            Class:Class
-        };
-        
-        for(var i=0;i<deps.length;i++){
-            mod.__imprt__(deps[i], locals);
-        }
-            
-        var argNames = ['mod', 'imprt', 'jsolait'];
-        var args = [];
-        
-        args.push(newMod);
-        args.push(new Function("",""));
-        args.push(mod);
-                
-        for(var key in locals){
-            argNames.push(key);
-            args.push(locals[key]);
-        }               
-
-        var modFn = new Function(argNames.join(","), source);
-            
-        try{//to run the module source
-            modFn.apply(newMod, args);
-        }catch(e){
-            throw new mod.CreateModuleFailed(newMod, e);
-        }
-        
-        applyNames(newMod);
-        mod.modules[name] = newMod;
-        return newMod;
-    };     
-    
-    mod.Module = function(name, modFn){
-
+unknown
-    };
-    
@@ -796 +833 @@
-    };
-
+    mod.compileSource=function(src){
+        var or=function(){
+            var a=[];
+            for(var i=0;i<arguments.length;i++){
+                a.push(grp(arguments[i]));
+            }
+            return a.join('|');
+        }
+        
+        var grp=function(a){
+            return '(' + a + ')';
+        }
+
+        var wrd=function(w){
+            w= w.replace(/\\/g,'\\\\');
+            w= w.replace(/\(/g,'\\(');
+            w= w.replace(/\)/g,'\\)');
+            w= w.replace(/\//g,'\\/');
+            w= w.replace(/\*/g,'\\*');
+            w= w.replace(/\./g,'\\.');
+            w= w.replace(/\]/g,'\\]');
+            w= w.replace(/\[/g,'\\[');
+            w= w.replace(/\{/g,'\\{');
+            w= w.replace(/\}/g,'\\}');
+            
+            return '\\b' + w + '\\b';
+        };
+        
+
+        var parens= function(a){
+            return '\\('+a+'\\)';
+        }
+        
+        var re=function(s){
+            return new RegExp(s,'g');
+        };
+        
+        var string=function(d){
+            return   d + '(\\\\'+d+'|.' + d + ')*?' ;
+        };
+        
+        var identifier=function(){
+           return '\\w+';
+        };
+        
+        var anyWhiteSpaceStart= grp('(^|[\\n\\r])\\s*') ;
+        var someWhiteSpaceStart= grp('(^|[\\n\\r])\\s*') ;
+        var startOfLine= grp('^|[\\n\\r]');
+        
+        var blockComment='/\\*([\\n\\r]|.)*?\\*/';
+        
+        var comment='//' + '.*' ;
+        
+        var methodDecl= grp([wrd('function'), wrd('def'),wrd('publ')].join('|')) ;
+        
+        var moduleFunctionStatement = startOfLine + methodDecl +'\\s+' +grp(identifier()) + '\\s*' +  grp(parens('.*?'));
+        
+        var classMethodStatement = someWhiteSpaceStart + methodDecl +'\\s+' +grp(identifier()) +  '\\s*' + grp(parens('.*?'));
+        
+        var classMember= someWhiteSpaceStart + wrd('publ')+ '\\s+'  +grp(identifier());
+        
+        var classStatement = anyWhiteSpaceStart + wrd('class')+'\\s+'  +grp(identifier()) + '\\s+' + wrd('extends') +'\\s+' + grp('.+?') + '\\(\\{';
+        var simpleClassStatement = anyWhiteSpaceStart + wrd('class')+'\\s+'  +grp(identifier()) + '\\s*\\(\\{';
+        
+        var importStatement = anyWhiteSpaceStart + wrd('import')+'\\s+'  + grp('.+?') + '[\\r\\n;]';
+        
+        var iterStatement= anyWhiteSpaceStart + wrd('iter') + '\\s+' +grp(identifier())+  '\\s+' + wrd('in') + '\\s+' + grp('.+?') + '\\{';
+        
+        var modLevelAssignment=startOfLine +grp(identifier())+'\\s*=';
+        
+        var modGlobaling =wrd('mod') + '\\s+' + grp(identifier())  +'\\s*=';
+        
+        var tupleAssingnment ='\\s\\[' + grp('.*?')  + '\\]\\s*=' + grp('.+?') + ';';
+        
+        
+        var allStatments=re(or(blockComment, comment, string("'"), string('"'), 
+                                        classStatement, simpleClassStatement, classMethodStatement,  moduleFunctionStatement, 
+                                        classMember,importStatement,iterStatement,modLevelAssignment,modGlobaling,tupleAssingnment));
+        
+
+        var Replacer=Class(function(publ,priv,supr){
+            publ.__init__=function(match, repl){
+                this.match=re(match);
+                this.replacement=repl;
+            };
+            
+            publ.run = function(a){
+                if(a.match(this.match)){
+                    return a.replace(this.match, this.replacement);
+                }else{
+                    return null;
+                }
+            };
+        });
+        
+        
+        var compile=function(src){
+            var replacers=[
+                new Replacer(moduleFunctionStatement, '$1var $3 = mod.$3=function$4' ),
+                new Replacer(classMethodStatement, '$1publ.$4=function$5' ) ,      
+                new Replacer(classStatement, '$1var $3 = mod.$3=Class("$3", $4, function(publ,priv,supr){' ),       
+                new Replacer(simpleClassStatement, '$1var $3 = mod.$3=Class("$3", function(publ,priv,supr){' ),       
+                new Replacer(classMember, '$1publ.$3' ),
+                new Replacer(modLevelAssignment, '$1var $2 = mod.$2 =' ),
+                new Replacer(modGlobaling, '$1 = mod.$1 =' )
+            ];
+            
+            var importRE=re(importStatement);
+            var iterRE =re(iterStatement);
+            var tupleRE =re(tupleAssingnment);
+            
+            var imports=[];
+            
+            src =src.replace(allStatments, function(a){
+                var reslt=null;
+
+                
+                for(var i=0;i<replacers.length;i++){
+                    rslt=replacers[i].run(a);
+                    if(rslt!=null){ 
+                        return rslt;
+                    }else{
+                        if(a.match(importRE)){
+                            imports.push(RegExp.$3);
+                            return '/*' + a + '*/';
+                        }else if(a.match(iterRE)){
+                            imports.push('itertools:iter');
+
+                            return a.replace(iterRE, "$1for(var $3,  _$3_iterator_= iter($4);  ($3=_$3_iterator_.next())!== undefined;){");
+                        }else if(a.match(tupleRE)){
+                            var names= RegExp.$1;
+                            var expr= RegExp.$2;
+                            
+                            names = names.replace(/\s/g,'').split(',');
+                            var s =' var ' + names.join(',')+', _' + names.join('_') + '=' + expr +';'
+                            for(var i=0;i<names.length;i++){
+                                s+=names[i] + '= _' + names.join('_') + '['+i+'];';
+                            }
+                            return s;
+                        }
+                    }
+                }
+                return a;
+            });
+            
+            return {imports: imports, src:src};
+        };
+        var src = compile(src);
+        //print(src.src)
+        return src;
+    };
+    
+    
+    
+    mod.run=function(modName, methodName, alertError){
+        mod.loadModule(modName, function(m, err){
+            if(err){
+                if(alertError){
+                    alert(err);
+                }
+                throw err;
+            }else{
+                try{
+                    m[methodName].call(m);
+                }catch(e){
+                    if(alertError){
+                        alert(e);
+                    }
+                    throw e
+                }
+            }
+        });
+    
+    };
-//---------------------------------------------------String Format -------------------------------------------------------
-    /**

branches/experimental/jsolait/jsolait.wsf

@@ -32 +32 @@
-    
-    <script language="JavaScript"> <![CDATA[
-
+
+
+
-    jsolait.Module("jsolaitws", function(mod){
+
-        mod.__version__ = "$Revision$"
-        mod.__sourceURI__ = 'file://' + WScript.scriptFullName;
-        jsolait.__sourceURI__ = 'file://' + WScript.scriptFullName.slice(0,-3) + "js";
-        
-        var fs= new ActiveXObject("Scripting.FileSystemObject");
@@ -82 +84 @@
-            return  this.name +": " + this.message;
-        }
-
-
+
+finishedCB
-            
-            if (WScript.arguments.unnamed.length==0){
@@ -93 +95 @@
-                //todo:check if file exists
-            }
-            
+
-            //get the base of the file to execute
-            var fileBase= fs.getParentFolderName(fileName);
@@ -99 +101 @@
-            jsolait.moduleSearchURIs = [fileBase,  "%(baseURI)s/lib"];
-            
-            
-            //see if there are any jsolait config files in any of the parent folders
-            var parentFolder= fileBase;
-            while(parentFolder){
-                try{
-                    var src = jsolait.loadURI(parentFolder+'/.jsolait');
-                    try{
-                        var f = new Function('__baseURI__',src);
-                        f(parentFolder);
-                        break;
-                    }catch(e){
-                        print('error in .jsolait', parentFolder);
-                        break;
-                    }
-                }catch(e){
-                }
-                parentFolder=fs.getParentFolderName(parentFolder);
-            }
-
-
-            //change working dir to the file's location
-            //todo:is it OK to change cwd?
@@ -124 +106 @@
-                wshShell.currentDirectory = fileBase.slice('file://'.length);
-            }
-
+
-            if(fileName.toLowerCase() != jsolait.__sourceURI__.toLowerCase()  &&  fileName.toLowerCase() != mod.__sourceURI__.toLowerCase()){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-
-
-
-
-
-
-
-
+
-            }
-        };
-    });
-
-
-
+
+
+
+
+
+
+
+
+
-    }catch(e){
-WScript.echo(""+e);
+
-    }
-       

branches/experimental/jsolait/lib/codecs.js

@@ -28 +28 @@
-    @lastchangeddate    $Date$
-*/
-mod.
+
-/**
-    Returns all all available encoders.
-    @return  An array of encoder names.
-**/
-mod.listEncoders=function
+def listEncoders
-    var c=[];
-    for(var attr in String.prototype){
@@ -46 +46 @@
-    @return  An array of decoder names.
-**/
-mod.listDecoders=function
+def listDecoders
-    var c=[];
-    for(var attr in String.prototype){

branches/experimental/jsolait/lib/crypto.js

@@ -27 +27 @@
-    @lastchangeddate    $Date$
-*/
-mod.
+
-/**
-    Returns all all available encrypters.
-    @return  An array of encrypters names.
-**/
-mod.listEncrypters=function
+def listEncrypters
-    var c=[];
-    for(var attr in String.prototype){
@@ -45 +45 @@
-    @return  An array of decrypters names.
-**/
-mod.listDecrypters=function
+def listDecrypters
-    var c=[];
-    for(var attr in String.prototype){

branches/experimental/jsolait/lib/dom.js

@@ -25 +25 @@
-    @lastchangeddate    $Date$
-**/
-mod.
+
-
-rt("sets")
+ort sets
-
-/**
-    Event class.
-**/
-mod.Event=Class(function(publ, supr)
-.__init__=function
+class Event(
+ __init__
-        this.type = type;
-        this.target = target;
-    };
-    ///The event type.
-.
+ 
-    ///The target of the event
-.
+ 
-});
-
@@ -47 +47 @@
-    An EventTarget implementation.
-**/
-mod.EventTarget =Class(function(publ, supr)
-.__init__=function
+class EventTarget(
+ __init__
-        this.eventListeners={};
-    };
@@ -55 +55 @@
-        @param evt The event to dispatch.
-    **/
-.dispatchEvent = function
+ dispatchEvent
-        if(this.eventListeners[evt.type]){
-            var l = this.eventListeners[evt.type].items;
@@ -73 +73 @@
-        @param useCapture  todo: Not used yet.
-    **/
-.addEventListener=function
+ addEventListener
-        if(this.eventListeners[evtType]===undefined){
-            this.eventListeners[evtType] = new sets.Set();
@@ -87 +87 @@
-        @param useCapture  todo: Not used yet.
-    **/
-.removeEventListener=function
+ removeEventListener
-        if(this.eventListeners[evtType]){
-            this.eventListeners[evtType].discard(listener);
@@ -98 +98 @@
-    It forwards all events to handler methods using the evt.type as the name for the method.
-**/
-mod.EventListener=Class(function(publ)
+class EventListener(
-    /**
-        Handles events dispatched by an EventTarget.
@@ -104 +104 @@
-        @param  evt  The event to handle.
-    **/
-.handleEvent=function
+ handleEvent
-        if(this['handleEvent_' +evt.type]){
-            this['handleEvent_' + evt.type](evt);
@@ -114 +114 @@
-    A combination of an EventTarget and a EventListener.
-**/
-mod.EventListenerTarget=Class(mod.EventTarget, mod.EventListener, function(publ, supr)
+class EventListenerTarget extends EventTarget, EventListener(
-});

branches/experimental/jsolait/lib/forms.js

@@ -28 +28 @@
-**/
-
-
+
+
+
+
-/**
-    A class that resembles the functionality of an HTML form.
@@ -34 +37 @@
-    by accessing the element as a named property of the form object(formObj.elemName ...).
-**/
-mod.Form=Class(function(publ, supr)
+class Form(
-    ///Contains the form elements.
-.
+ 
-    ///The URL to submit the form to.
-.
+ 
-    ///The method to use for subitting the form(GET/POST)
-.
+ 
-    
-    /**
@@ -47 +50 @@
-        @param method="GET"  The method to use for submitting(GET, POST).
-    **/
-.__init__=function
+ __init__
-        this.elements=[];
-        this.action= (action==null)?"":action;
@@ -59 +62 @@
-        @return The Element set.
-    **/
-.set=function
+ set
-        var f = null;
-        for(var i=0;i<this.elements;i++){
@@ -68 +71 @@
-        }
-        if(f == null){//add a new element
-mod.
+
-            this.eleme