Changeset 30094

Timestamp:

02/15/09 21:45:40 (4 years ago)

Author:

fujidig

Message:

ビットシフトを使うように変更

Location:

lang/javascript/hsp-on-js/trunk/src

Files:

• binary-parser.js (modified) (4 diffs)
• formatter.js (modified) (1 diff)

lang/javascript/hsp-on-js/trunk/src/binary-parser.js

@@ -23 +23 @@
         p.prototype = {
                 readChar: function() {
-                        this.checkBuffer(this.offset + 1);
-                        var result = this.buffer[this.buffer.length - this.offset - 1];
-                        if(result & 0x80) result -= 0x100;
-                        ++ this.offset;
-                        return result;
+                        return this.readUChar() << 24 >> 24;
                 },
                 readUChar: function() {
@@ -36 +32 @@
                 },
                 readShort: function() {
-                        this.checkBuffer(this.offset + 2);
-                        var result = this.buffer[this.buffer.length - this.offset - 1];
-                        result |= this.buffer[this.buffer.length - this.offset - 2] << 8;
-                        if(result & 0x8000) result -= 0x10000;
-                        this.offset += 2;
-                        return result;
+                        return this.readUShort() << 16 >> 16;
                 },
                 readUShort: function() {
@@ -51 +42 @@
                 },
                 readInt24: function() {
-                        this.checkBuffer(this.offset + 3);
-                        var result = this.buffer[this.buffer.length - this.offset - 1];
-                        result |= this.buffer[this.buffer.length - this.offset - 2] << 8;
-                        result |= this.buffer[this.buffer.length - this.offset - 3] << 16;
-                        if(result & 0x800000) result -= 0x1000000;
-                        this.offset += 3;
-                        return result;
+                        return this.readUInt24() << 8 >> 8;
                 },
                 readUInt24: function() {
@@ -77 +62 @@
                 },
                 readUInt: function() {
-                        this.checkBuffer(this.offset + 4);
-                        var result = this.buffer[this.buffer.length - this.offset - 1];
-                        result |= this.buffer[this.buffer.length - this.offset - 2] << 8;
-                        result |= this.buffer[this.buffer.length - this.offset - 3] << 16;
-                        result += this.buffer[this.buffer.length - this.offset - 4] * 0x1000000;
-                        this.offset += 4;
-                        return result;
+                        return this.readInt() >>> 0;
                 },
                 readDouble: function() {

lang/javascript/hsp-on-js/trunk/src/formatter.js

@@ -92 +92 @@
         convertInt: function(val, flags, width, prec, signed, radix, pre) {
                 if(!signed) {
-                        if(val & 0x80000000) val += 0x100000000;
+                        val >>>= 0;
                 }
                 var isNegative = val < 0;