add decodeInternal to RefType

pull/7/head
yann300 8 years ago
parent 249dbdf64a
commit 39d7b2f006
  1. 4
      src/solidity/types/ArrayType.js
  2. 31
      src/solidity/types/RefType.js
  3. 4
      src/solidity/types/Struct.js

@ -67,10 +67,6 @@ class ArrayType extends RefType {
this.underlyingType.location = this.location
for (var k = 0; k < length; k++) {
var contentOffset = offset
if (this.underlyingType.basicType === 'RefType') {
contentOffset = memory.substr(2 * contentOffset, 64)
contentOffset = parseInt(contentOffset, 16)
}
ret.push(this.underlyingType.decode(contentOffset, memory))
offset += 32
}

@ -11,28 +11,31 @@ class RefType {
}
decodeFromStack (stackDepth, stack, memory, storage) {
if (!storage) {
storage = {} // TODO this is a fallback, should manage properly locals store in storage
}
if (stack.length - 1 < stackDepth) {
return { error: '<decoding failed - stack underflow ' + stackDepth + '>' }
}
var offset = stack[stack.length - 1 - stackDepth]
offset = parseInt(offset, 16)
return this.decode(offset, memory, storage)
return decodeInternal(this, offset, memory, storage)
}
decode (offset, memory, storage) {
if (!storage) {
storage = {} // TODO this is a fallback, should manage properly locals store in storage
}
if (util.storageStore(this)) {
return this.decodeFromStorage({ offset: 0, slot: offset }, storage)
} else if (util.memoryStore(this)) {
return this.decodeFromMemory(offset, memory)
} else {
return { error: '<decoding failed - no decoder for ' + this.location + '>' }
}
offset = memory.substr(2 * offset, 64)
offset = parseInt(offset, 16)
return decodeInternal(this, offset, memory, storage)
}
}
function decodeInternal (self, offset, memory, storage) {
if (!storage) {
storage = {} // TODO this is a fallback, should manage properly locals store in storage
}
if (util.storageStore(self)) {
return self.decodeFromStorage({ offset: 0, slot: offset }, storage)
} else if (util.memoryStore(self)) {
return self.decodeFromMemory(offset, memory)
} else {
return { error: '<decoding failed - no decoder for ' + self.location + '>' }
}
}

@ -24,10 +24,6 @@ class Struct extends RefType {
var ret = {}
this.members.map((item, i) => {
var contentOffset = offset
if (item.type.basicType === 'RefType') {
contentOffset = memory.substr(2 * contentOffset, 64)
contentOffset = parseInt(contentOffset, 16)
}
item.type.location = this.location
var member = item.type.decode(contentOffset, memory)
ret[item.name] = member

Loading…
Cancel
Save