X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=xynt-base.js;h=de7cd258db2047e851bee47d36426b0511779306;hb=9a5980f2c66a4fb66cfdd40a978ee5d1544c225d;hp=80c924985a59ad4c5cd07fcfaeb90337baf04eea;hpb=4450618fd580a5491bafcc9d1238dd89e501f9cf;p=xynt.git

diff --git a/xynt-base.js b/xynt-base.js
index 80c9249..de7cd25 100644
--- a/xynt-base.js
+++ b/xynt-base.js
@@ -1,3 +1,4 @@
+
 function Extends(sub)
 {
     var proto;
@@ -6,7 +7,7 @@ function Extends(sub)
     inh.xynt_sup = [];
     inh.xynt_sup_cl = [];
 
-    console.log("INIZIO EXT");
+    console.log("EXT START");
 
     var multi = function(sub, super, is_last)
     {
@@ -18,10 +19,11 @@ function Extends(sub)
 
             console.log("LOOP: "+f);
             if( f != "constructor" && typeof(proto[f]) == "function" && !is_last){
-                console.log("M_FU: "+proto['name']+"  F: "+f);
+                console.log("M_FU: "+proto[f]+"  F: "+f);
                 // sub[f] = proto[f];
-                sub[f] = function(){
-                    console.log("INFU PR: " + proto['name'] + " FUNC: "+f+" THIS: " + this);
+                sub[f] = function() {
+                    // console.log("INFU PR: " + proto[f] + " FUNC: "+f+" THIS: " + this);
+                    console.log("SIMPLE LOG");
                     return proto[f].apply(this,arguments);
                 }
             }
@@ -39,11 +41,139 @@ function Extends(sub)
     }
 
     multi(inh, sub, true);
-    inh.super = function(cl, method) {
-        return this.xynt_sup_cl[cl].method.apply(this,arguments);
+
+
+    inh.callSuper = function(fnc){
+        var len = this.xynt_sup_cl.length;
+        for ( var i=0 ; i<len ; i++) {
+            var super = this.xynt_sup_cl[i];
+            if( (fnc in  super.prototype) && (typeof super.prototype[fnc] == "function") ){
+                return super.prototype[fnc].apply(this,[].splice.call(arguments,1));
+            }
+        }
+        return null;
+    }
+
+    /*
+    inh.superrr = function(cl, method) {
+        console.log("xyx "+cl);
+        // console.log("xx"+arguments[0]);
+    //    return this.xynt_sup_cl[cl].method.apply(this,arguments.slice(2));
     }
+    */
     sub.prototype = inh;
 
-    console.log(sub.prototype.xynt_sup);
-    console.log(sub.prototype.xynt_sup_cl);
+    console.log("EXT FINISH");
 }
+
+function ExtendsInst(sub)
+{
+    var proto, cl, args;
+    
+    console.log("INIZIO EXT INST");
+
+    var multi = function(sub, super, is_last)
+    {
+        var proto = super.prototype;
+
+        var single = function(sub, fun) {
+            var cur_fun = fun;
+            
+            sub[cur_fun] = function(){
+                // console.log("INFU PR: " + proto[f] + " FUNC: "+f+" THIS: " + this);
+                console.log("SIMPLE LOG INST: "+cur_fun);
+                console.log(proto[cur_fun]);
+                console.log(sub);
+                console.log(arguments);
+                return proto[cur_fun].apply(this, arguments);
+            }
+        };
+
+        if (typeof(sub.xynt_sup) == 'undefined')
+            sub.xynt_sup = new Array();
+        if (typeof(sub.xynt_sup_cl) == 'undefined')
+            sub.xynt_sup_cl = new Array();
+
+        for (var f in proto) {
+            /* NOTE: this allow potentially TO BREAK by the extending class
+               if we disable it we don't have a reason to keep the callSuper function,
+               I need to meditate on it */
+            if (f == "xynt_sup" || f == "xynt_sup_cl")
+                continue;
+            
+            console.log("ExtensInst::multi: "+f+" type: "+typeof(sub[f]));
+            if (typeof(sub[f]) != 'undefined') {
+                if (typeof(sub[f]) == typeof(proto[f]))
+                    continue;
+                console.log("MULTI: false1");
+                return false;
+            }
+
+            console.log("LOOP: "+f);
+            if( f != "constructor" && typeof(proto[f]) == "function" && !is_last){
+                console.log("M_FU: "+proto[f]+"  F: "+f);
+                single(sub, f);
+            }
+            else {
+                console.log("M_PR: "+proto.name+"  A: "+f+" FUN: "+proto[f]);
+                sub[f] = proto[f];
+            }
+        }
+        return true;
+    };
+
+    console.log("POST FUNC");
+
+    for( var i=1; i < arguments.length ; i++){
+        console.log("POST FUNC IN LOOP");
+        cl = arguments[i];
+        if (i+1 < arguments.length && typeof(arguments[i+1]) != 'function') {
+            i++;
+            args = arguments[i];
+        }
+        if (multi(sub, cl, false) == false) {
+            console.log("POST FUNC FALSE 1");
+            return (false);
+        }
+
+        console.log("POST FUNC PRE APPLY");
+        cl.apply(sub, args);
+        console.log("POST FUNC POST APPLY");
+
+        sub.xynt_sup.push(cl.prototype);
+        sub.xynt_sup_cl.push(cl);
+    }
+
+    sub.callSuper = function(fnc){
+        var len = this.xynt_sup_cl.length;
+        for ( var i=0 ; i<len ; i++) {
+            var super = this.xynt_sup_cl[i];
+            if( (fnc in  super.prototype) && (typeof super.prototype[fnc] == "function") ){
+                return super.prototype[fnc].apply(this,[].splice.call(arguments,1));
+            }
+        }
+        return null;
+    }
+
+    console.log("FINE EXT INST");
+    return true;
+}
+
+function show_class(cl) {
+    console.log("Attributes Class of "+cl);
+    for (f in cl.prototype) {
+        console.log(f+"-v");
+        console.log(cl.prototype[f]);
+    }
+    console.log("---");
+}
+
+function show_inst(inst) {
+    console.log("Attributes Instance of "+inst);
+    for (f in inst) {
+        console.log(f+"-v");
+        // console.log(inst[f]);
+    }
+    console.log("---");
+}
+