Changeset 33

Timestamp:

01/10/06 18:12:52 (3 years ago)

Author:

Jan-Klaas Kollhof

Message:

added hash() and bind() function, fixed sets and added a name argument to testing.test()

Files:

• trunk/jsolait/jsolait.js (modified) (8 diffs)
• trunk/jsolait/lib/sets.js (modified) (5 diffs)
• trunk/jsolait/lib/testing.js (modified) (3 diffs)

trunk/jsolait/jsolait.js

@@ -63 +63 @@
-                         __name__ : name,
-                         __bases__: bases,
-
+ '@' + 
-                         __hash__: function(){
-                            return this.__id__;
@@ -115 +115 @@
-        proto.__hash__=function(){
-            if(this.__id__ === undefined){
-Class.__idcount__++
+'@' + (Class.__idcount__++)
-            }
-            return this.__id__;
@@ -197 +197 @@
-        };
-    }
-    
-
-    //reset the constructor for new objects to the actual constructor.
@@ -234 +233 @@
-str = function(obj){
-    return "" + obj;
+};
+
+/**
+    Returns a hash value for an object.
+    The same object will always return the same hash. 
+    Most objects are hashable. The following steps are taken to find a hash value:
+    If the obj has an __id__ property that id will be returned. (all jsolait classes have an __id__ property)
+    If the obj has a __hash__ method the return value of that method will be returned.(all jsolait objects have a __hash__ method which sets an __id__ property)
+    If the obj is a String  the string prefixed with $ is returned.
+    If the obj is a Number the number prefixed with a # is returned as a string.
+    All other objects are not safely hashable and an exception is thrown unless forceId is true. In that case the object will get a unique __id__ property applied which is returned.
+    
+    @param obj The object to hash.
+    @param forceId=false if true it forces hash() to set an __id__ property onto a non hashable object, making it hashable.
+    @return A String containing a hash value for the obj.
+**/
+hash = function(obj, forceId){
+    if(obj.__id__){
+        return obj.__id__;
+    }else  if(obj.__hash__){
+        return obj.__hash__();
+    }else if(obj instanceof String || typeof obj == 'string'){
+        return '$' + obj;
+    }else if(obj instanceof Number || typeof obj == 'number'){
+        return '#' + obj;
+    }else if(forceId){
+        obj.__id__ = '@' + (Class.__idcount__++);
+        return obj.__id__;
+    }else{
+        throw new jsolait.Exception('Objec cannot be hashed: %s'.format(obj));
+    };
+};
+
+/**
+    Returns a bound method.
+    A bound method is a function which is bound to a specific object.
+    Calling the bound method will call the given function with the this-object inside that function's scope being the object specified.
+    
+    @param obj  The object the function should be bound to.
+    @param fn   A function object the obj will be bound to.
+    @return A method which when run executes the function with the this-object being the obj specified.
+**/
+bind = function(obj, fn){
+    return function(){
+        return fn.apply(obj, arguments);
+    };
-};
-
@@ -261 +306 @@
-
-/**
-s
+f
-    
-    A class is always a subclass of itself and Object is the base for all classes.
@@ -304 +349 @@
-**/
-Module=function(name, version, moduleScope){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    try{//to execute the scope of the module
-        moduleScope.call(newMod, newMod);
@@ -324 +356 @@
-        throw new Module.ModuleScopeExecFailed(newMod, e);
-    }
-
+
-    //set __name__  for methods and classes
-    for(var n in newMod){
@@ -332 +364 @@
-        }
-    }
+    
-    jsolait.registerModule(newMod);
-    return newMod;
-};
+
+Module.ModuleClass=Class(function(publ){
+    publ.name;
+    publ.version;
+    publ.__sourceURI__;
+    publ.Exception;
+    
+    publ.__init__=function(name,version,sourceURI){
+        this.name=name;
+        this.version=version;
+        this.__sourceURI__ = sourceURI;
+        this.Exception = Class(Module.Exception, function(){});
+        this.Exception.prototype.module = this;
+    };
+    
+    publ.__str__=function(){
+        //todo:SVN adaption
+        return "[module '%s' version: %s]".format(this.name, (this.version+'').replace(/\$Revision:\s(\d+) \$/, "rev.$1"));
+    };
+});
+
-
-Module.toString=function(){

trunk/jsolait/lib/sets.js

@@ -85 +85 @@
-        /**
-            Adds an item to the set if it does not exist yet.
-Th
+ A hashabl
-            @return        The item added.
-        **/
-        publ.add=function(item){
-
-
-
-
-
-
-
+
-            return item;
-        };
@@ -108 +102 @@
-        **/
-        publ.remove=function(item){
-
-
-
-
-
-
+
-            if(this.items[h] === undefined){
-                throw new mod.ItemNotFoundInSet(this, item);
@@ -129 +118 @@
-        **/
-        publ.discard=function(item){
-
-
-
-
-
-
+
-            item = this.items[h];
-            delete this.items[h];
@@ -146 +130 @@
-        **/
-        publ.contains=function(item){
-
-
-
-
-
-
-
+
-        };
-        /**
@@ -346 +324 @@
-        var testing=imprt('testing');
-
-
+'sets', 
-            testing.assertEquals("checking %s | %s".format(s1, s2),
-                                        new mod.Set("0123456789"), s1.union(s2));

trunk/jsolait/lib/testing.js

@@ -116 +116 @@
-        publ.report=function(){
-            if(this.error){
-%s
+'%s'
-            }else{
-%s
+'%s'
-            }
-        };
@@ -130 +130 @@
-    /**
-        Runs a test on the given function.
+        @param name='anonymous' The name for the test.
-        @param testScope  A function to test.
-    **/
-
-
+
+
+
+
+
+
-        t.run();
-        return t.report();
@@ -277 +282 @@
-
-    mod.__main__=function(){
-
+'assertion test', 
-            mod.assert(true);
-            mod.assertTrue(true);