Changeset 46

Timestamp:

03/10/06 10:51:26 (3 years ago)

Author:

Jan-Klaas Kollhof

Message:

fixing ticket:20

Files:

• trunk/jsolait/jsolait.js (modified) (4 diffs)

trunk/jsolait/jsolait.js

@@ -757 +757 @@
-        }
-        this.type = s[6];
+    };
+    
+    var pad=function(s, flag, len){
+        if(flag == "-"){
+            var c = " ";
+        }else{
+            var c ='' + flag;
+        }
+        var rslt = c.mul(len-s.length);
+        
+        if(flag == "-"){
+            rslt = s + rslt;
+        }else{
+            rslt += s;
+        }
+        return rslt;
-    };
-
@@ -863 +879 @@
-                        obj = "undefined";
-                    }
-obj.toString().pad(
+pad(obj.toString(), 
-
-                }else if(frmt.type == "c"){//Character
@@ -870 +886 @@
-                    }
-                    if(typeof obj == "number"){//get the character code
-String.fromCharCode(obj).pad(frmt.paddingFlag , frmt.minLength) 
+pad(String.fromCharCode(obj), frmt.paddingFlag , frmt.minLength)
-                    }else if(typeof obj == "string"){
-                        if(obj.length == 1){//make sure it's a single character
-obj.pad(
+pad(obj, 
-                        }else{
-                            throw new mod.Exception("Character of length 1 required.");
@@ -911 +927 @@
-                        case "b"://binary
-                            s = obj.toString(2);
-s.pad(
+pad(s, 
-                            break;
-                        case "o"://octal
-                            s = obj.toString(8);
-s.pad(
+pad(s.pad, 
-                            break;
-                        case "x"://hexadecimal
-                            s = obj.toString(16).toLowerCase();
-s.pad(
+pad(s.pad,
-                            break;
-                        case "X"://hexadecimal
-                            s = obj.toString(16).toUpperCase();
-s.pad(
+pad(s.pad,
-                            break;
-                        default://integers
-                            s = parseInt(obj).toString();
-s.pad(
+pad(s.pad, 
-                            break;
-                    }
-                    if(frmt.paddingFlag == "0"){//do 0-padding
-                        //make sure that the length of the possible sign is not ignored
-s.pad(
+pad(s, 
-                    }
-                    s=sign + s;//add sign
-s.pad(
+pad(s, 
-                }else{
-                    throw new mod.Exception("Number required.");