|
684 | 684 |
|
685 | 685 | function format(args){ |
686 | 686 |
|
687 | | - if (typeof args[0] !== "string") return args; |
688 | | - |
689 | | - let fmt = args[0]; |
690 | | - let out = []; |
691 | | - let argIndex = 1; |
692 | | - |
693 | | - out.push(fmt.replace(/%[sdifoO]/g, (match) => { |
694 | | - |
695 | | - const val = args[argIndex++]; |
696 | | - switch (match) { |
697 | | - case "%s": return ''+val; |
698 | | - case "%d": |
699 | | - case "%i": return parseInt(val, 10); |
700 | | - case "%f": return parseFloat(val); |
701 | | - case "%o": |
702 | | - case "%O": return format.fn(val); |
703 | | - default: |
704 | | - return match; |
705 | | - } |
706 | | - |
| 687 | + if(typeof args[0]!=='string')return args; |
| 688 | + |
| 689 | + let fmt = args[0]; |
| 690 | + let out = []; |
| 691 | + let argIndex = 1; |
| 692 | + |
| 693 | + out.push(fmt.replace(/%[sdifoO]/g,match=>{ |
| 694 | + |
| 695 | + var val = args[argIndex++]; |
| 696 | + |
| 697 | + switch (match) { |
| 698 | + |
| 699 | + case '%s' : return ''+val; |
| 700 | + case '%d' : |
| 701 | + case '%i' : return parseInt(val, 10); |
| 702 | + case '%f' : return parseFloat(val); |
| 703 | + case '%o' : |
| 704 | + case '%O' : return format.fn(val); |
| 705 | + default : return match; |
| 706 | + |
| 707 | + }//switch |
| 708 | + |
707 | 709 | })); |
708 | 710 |
|
709 | | - // Append any remaining args |
710 | | - while (argIndex < args.length) { |
711 | | - out.push(args[argIndex++]); |
712 | | - } |
| 711 | + |
| 712 | + while(argIndex<args.length){ |
| 713 | + |
| 714 | + var v = args[argIndex++]; |
| 715 | + out.push(v); |
| 716 | + |
| 717 | + }//while |
713 | 718 |
|
714 | 719 | return out; |
715 | 720 |
|
|
726 | 731 |
|
727 | 732 | }//switch |
728 | 733 |
|
729 | | - return JSON.stringify(val,null,2); |
| 734 | + return JSON.stringify(val,null,4); |
730 | 735 | }//fn |
731 | 736 |
|
732 | 737 | }//format |
|
755 | 760 |
|
756 | 761 | }//switch |
757 | 762 |
|
758 | | - var type = datatype(val); |
759 | 763 |
|
| 764 | + var type = datatype(val); |
| 765 | + console.log('format.fn',type); |
760 | 766 | if(type=='array'){ |
761 | 767 | return '['+val.map(v=>fn(v,seen)).join(', ')+']'; |
762 | 768 | } |
|
0 commit comments