[kaffe] [bug] kaffeh can't handle overloaded native methods

[Helmer Krämer]

This is a multi-part message in MIME format.

--Multipart_Sun__29_Dec_2002_21:21:40_+0100_091c89c0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Fri, 27 Dec 2002 15:00:14 -0800 (PST)
Dalibor Topic <robilad@yahoo.com> wrote:

Hi Dalibor,

> So I'd be glad if someone with more kaffeh hacking
> experience could
> take a closer look at it and tell me if I'm missing
> something
> obvious. As a bit of background motivation, this is
> the last bit
> holding back the merge of the ALSA based sound backend
> from
> tritonus.org.

AFAIK, readClass simply calls addMethod for each method
in the class file so that you won't get an initialized
CLASS_METHODS in kaffeh since its addMethod does nothing
but generating a c declaration if necessary.

Since I was already digging through the sources, I've
attached a small patch that seems to work for me (it's
just a quick hack, so don't take it too seriously ;)).

Greetings,
Helmer
--Multipart_Sun__29_Dec_2002_21:21:40_+0100_091c89c0
Content-Type: application/octet-stream;
 name="kaffeh-patch"
Content-Disposition: attachment;
 filename="kaffeh-patch"
Content-Transfer-Encoding: base64

SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL2thZmZlL2thZmZlL0No
YW5nZUxvZyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMjMzCmRpZmYgLXcgLXUgLXAgLXIxLjEy
MzMgQ2hhbmdlTG9nCi0tLSBDaGFuZ2VMb2cJMTEgRGVjIDIwMDIgMDE6NDM6MjEgLTAwMDAJMS4x
MjMzCisrKyBDaGFuZ2VMb2cJMjkgRGVjIDIwMDIgMjA6MDg6MzcgLTAwMDAKQEAgLTEsMyArMSwx
NCBAQAorMjAwMi0xMi0yOSAgSGVsbWVyIEtyYWVtZXIgIDxoa3JhZW1lckBmcmVlbmV0LmRlPgor
CisJKiBrYWZmZS9rYWZmZXZtL3JlYWRDbGFzcy5jIChyZWFkTWV0aG9kcykgW0tBRkZFSF06IGNh
bGwgCisJZmluaXNoTWV0aG9kcyBhZnRlciByZWFkaW5nIGFsbCBtZXRob2RzIGZyb20gYSBjbGFz
cyBmaWxlCisKKwkqIGthZmZlL2thZmZlaC9zdXBwb3J0LmMgKGZwcmludGZKbmkpOiBuZXcgbWV0
aG9kCisJKGFkZE1ldGhvZCk6IGRvbid0IGdlbmVyYXRlIGMgZGVjbGFyYXRpb25zIGZvciBuYXRp
dmUgbWV0aG9kcworCWJ1dCBjb2xsZWN0IHRoZW0gaW4gYSBsaXN0CisJKGZpbmlzaE1ldGhvZHMp
OiBuZXcgbWV0aG9kIHRoYXQgdHJhdmVyc2VzIHRoZSBsaXN0IG9mIG5hdGl2ZQorCW1ldGhvZHMg
YW5kIGdlbmVyYXRlcyBhcHByb3ByaWF0ZSBjIGRlY2xhcmF0aW9ucworCiAyMDAyLTEyLTEwIERh
bGlib3IgVG9waWMgPHJvYmlsYWRAeWFob28uY29tPgogCiAJKiBjb25maWd1cmUuaW46IHRlc3Qg
Zm9yIEMrKyBjb21waWxlciBlYXJseSBvbi4gRG9uJ3QgcmVxdWlyZQpJbmRleDoga2FmZmUva2Fm
ZmV2bS9yZWFkQ2xhc3MuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL2thZmZlL2thZmZlL2th
ZmZlL2thZmZldm0vcmVhZENsYXNzLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTYKZGlmZiAt
dyAtdSAtcCAtcjEuMTYgcmVhZENsYXNzLmMKLS0tIGthZmZlL2thZmZldm0vcmVhZENsYXNzLmMJ
MTUgQXVnIDIwMDIgMTE6MTE6MTEgLTAwMDAJMS4xNgorKysga2FmZmUva2FmZmV2bS9yZWFkQ2xh
c3MuYwkyOSBEZWMgMjAwMiAyMDowODozOCAtMDAwMApAQCAtMzM4LDggKzMzOCw4IEBAIHJlYWRN
ZXRob2RzKGNsYXNzRmlsZSogZnAsIEhqYXZhX2xhbmdfQ2wKIAkJCXJldHVybiBmYWxzZTsKIAkJ
fQogCX0KLQkKLQkvLyBmaW5pc2hNZXRob2RzKHRoaXMpOwotCisjaWZkZWYgS0FGRkVICQorCWZp
bmlzaE1ldGhvZHModGhpcyk7CisjZW5kaWYKIAlyZXR1cm4gKHRydWUpOwogfQpJbmRleDoga2Fm
ZmUva2FmZmVoL3N1cHBvcnQuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL2thZmZlL2thZmZl
L2thZmZlL2thZmZlaC9zdXBwb3J0LmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjYKZGlmZiAt
dyAtdSAtcCAtcjEuMjYgc3VwcG9ydC5jCi0tLSBrYWZmZS9rYWZmZWgvc3VwcG9ydC5jCTE1IEF1
ZyAyMDAyIDExOjExOjExIC0wMDAwCTEuMjYKKysrIGthZmZlL2thZmZlaC9zdXBwb3J0LmMJMjkg
RGVjIDIwMDIgMjA6MDg6MzggLTAwMDAKQEAgLTUwLDYgKzUwLDE1IEBAIHN0cnVjdCBfQ29sbGVj
dG9yOwogc3RhdGljIGlubGluZSBpbnQKIGJpbmFyeV9vcGVuKGNvbnN0IGNoYXIgKmZpbGUsIGlu
dCBtb2RlLCBpbnQgcGVybSwgaW50ICopOwogCisvKiBjaXJjdWxhciBsaXN0IGNvbnRhaW5pbmcg
YWxsIG5hdGl2ZSBtZXRob2RzIG9mIHRoZSBjbGFzcyB0aGF0J3MgY3VycmVudGx5IGJlaW5nIHBy
b2Nlc3NlZCAoc29ydGVkIGJ5IG5hbWUpICovCitzdHJ1Y3QgX21ldGhvZFJpbmcgeworCXN0cnVj
dCBfbWV0aG9kUmluZyogbmV4dDsKKwlzdHJ1Y3QgX21ldGhvZFJpbmcqIHByZXY7CisKKwljb25z
dCBjaGFyKiBuYW1lOworCWNvbnN0IGNoYXIqIHNpZzsKKwl1MiBhY2Nlc3NfZmxhZ3M7Cit9ICpt
ZXRob2RSaW5nOwogCiBzdGF0aWMgaW50IAoga3JlYWQoaW50IGZkLCB2b2lkICpidWYsIHNpemVf
dCBsZW4sIHNzaXplX3QgKm91dCkKQEAgLTMzNiw2ICszNDUsNDQgQEAgam5pVHlwZShjb25zdCBj
aGFyICpzaWcpCiAJfQogfQogCisvKgorICogUHJpbnQgYSBwcm9wZXJseSBtYW5nbGVkIG1ldGhv
ZCBuYW1lIG9yIGFyZ3VtZW50IHNpZ25hdHVyZS4gIAorICovCitzdGF0aWMgdm9pZAorZnByaW50
ZkpuaSAoRklMRSAqZiwgY29uc3QgY2hhciAqcykgCit7CisJd2hpbGUgKCpzICYmICpzICE9ICcp
JykKKwl7CisJCXN3aXRjaCAoKnMpCisJCXsKKwkJCWNhc2UgJy8nOgorCQkJCWZwcmludGYgKGYs
ICJfIik7CisJCQkJYnJlYWs7CisgICAgICAKKwkJCWNhc2UgJ18nOgorCQkJCWZwcmludGYgKGYs
ICJfMSIpOworCQkJCWJyZWFrOworICAgICAgCisJCQljYXNlICc7JzoKKwkJCQlmcHJpbnRmIChm
LCAiXzIiKTsKKwkJCQlicmVhazsKKyAgICAgIAorCQkJY2FzZSAnWyc6CisJCQkJZnByaW50ZiAo
ZiwgIl8zIik7CisJCQkJYnJlYWs7CisJCQkKKwkJCWNhc2UgJyQnOgorCQkJCWZwcmludGYgKGYs
ICJfMDAwMjQiKTsKKwkJCQlicmVhazsKKworCQkJZGVmYXVsdDoKKwkJCQlmcHJpbnRmIChmLCAi
JWMiLCAqcyk7CisJCQkJYnJlYWs7CisJCX0KKwkJcysrOworCX0KK30KKwogaW50CiBzdGFydEZp
ZWxkcyhIamF2YV9sYW5nX0NsYXNzKiB0aGlzLCB1MiBmY3QsIGVycm9ySW5mbyAqZWluZm8pCiB7
CkBAIC01MDIsMTAgKzU0OSw4IEBAIGFkZE1ldGhvZChIamF2YV9sYW5nX0NsYXNzKiB0aGlzLAog
CWNvbnN0YW50cyogY3Bvb2w7CiAJY29uc3QgY2hhciogbmFtZTsKIAljb25zdCBjaGFyKiBzaWc7
Ci0JY29uc3QgY2hhciogc3RyOwotCWNoYXIqIHJldDsKLQljb25zdCBjaGFyKiB0c2lnOwotCWlu
dCBhcmdzOworICAgICAgICBzdHJ1Y3QgX21ldGhvZFJpbmcqIGxpc3Q7CisJc3RydWN0IF9tZXRo
b2RSaW5nKiBpOwogCiAJLyogSWYgd2Ugc2hvdWxkbid0IGdlbmVyYXRlIG1ldGhvZCBwcm90b3R5
cGVzLCBxdWl0IG5vdyAqLwogCWlmIChvYmplY3REZXB0aCA+IDApIHsKQEAgLTU0MCwyOSArNTg1
LDEwMiBAQCBhZGRNZXRob2QoSGphdmFfbGFuZ19DbGFzcyogdGhpcywKIAkJLyogUmV0dXJuICJz
dWNjZXNzIi4uLiAqLwogCQlyZXR1cm4gKE1ldGhvZCopMTsKIAl9Ci0JYXJncyA9IDA7CisKKwkv
KiBhZGQgdGhlIG1ldGhvZCBpbnRvIHRoZSBsaXN0IG9mIG5hdGl2ZSBtZXRob2RzIG9mIHRoaXMg
Y2xhc3MgKi8KKwlsaXN0ID0gKHN0cnVjdCBfbWV0aG9kUmluZyAqKW1hbGxvYyAoc2l6ZW9mIChz
dHJ1Y3QgX21ldGhvZFJpbmcpKTsgCisKKyAgICAgICAgbGlzdC0+bmFtZSA9IG5hbWU7CisgICAg
ICAgIGxpc3QtPnNpZyAgPSBzaWc7CisJbGlzdC0+YWNjZXNzX2ZsYWdzID0gYWNjZXNzX2ZsYWdz
OworCisJaWYgKG1ldGhvZFJpbmcgPT0gTlVMTCkgeworCQltZXRob2RSaW5nID0gbGlzdDsKKwkJ
CisJCWxpc3QtPm5leHQgPSBsaXN0LT5wcmV2ID0gbGlzdDsKKwl9IGVsc2UgeworCQlpID0gbWV0
aG9kUmluZzsKKworCQlkbyB7CisJCQkKKwkJCWlmICghc3RyY21wIChsaXN0LT5uYW1lLCBpLT5u
YW1lKSkgeworCQkJICAKKwkJCQlpLT5uZXh0LT5wcmV2ID0gbGlzdDsKKwkJCQlsaXN0LT5uZXh0
ID0gaS0+bmV4dDsKKworCQkJCWktPm5leHQgPSBsaXN0OworCQkJCWxpc3QtPnByZXYgPSBpOwor
CisJCQkJcmV0dXJuIChNZXRob2QqKTE7CQorCQkJfQorCQorCQkJaSA9IGktPm5leHQ7CisJCisJ
CX0gd2hpbGUgKGkgIT0gbWV0aG9kUmluZyk7CisJCisJCS8qIGlmIHdlIGRpZG4ndCBmaW5kIGEg
c3VpdGFibGUgcGxhY2UsIGFkZCBpdCBhdCB0aGUgZW5kIG9mIHRoZSBsaXN0ICovCQorCQlpZiAo
aSA9PSBtZXRob2RSaW5nKSB7CisJCQkgIGktPnByZXYtPm5leHQgPSBsaXN0OworCQkJICBsaXN0
LT5wcmV2ID0gaS0+cHJldjsKKworCQkJICBpLT5wcmV2ID0gbGlzdDsKKwkJCSAgbGlzdC0+bmV4
dCA9IGk7CisJCX0KKwl9CisKKwlyZXR1cm4gKE1ldGhvZCopMTsKK30KKwordm9pZAorZmluaXNo
TWV0aG9kcyAoSGphdmFfbGFuZ19DbGFzcyAqdGhpcykKK3sKKwljb25zdCBjaGFyICpzdHI7CisJ
Y29uc3QgY2hhciAqdHNpZzsKKwlzdHJ1Y3QgX21ldGhvZFJpbmcqIGk7CisJc3RydWN0IF9tZXRo
b2RSaW5nKiB0bXA7CisKKwkvKiBkb24ndCBkbyBhbnl0aGluZyBpZiB0aGVyZSBhcmVuJ3QgYW55
IG1ldGhvZHMgKi8KKwlpZiAobWV0aG9kUmluZyA9PSBOVUxMKSB7CisJCXJldHVybjsKKwl9CisK
KwlpID0gbWV0aG9kUmluZzsKKwlkbyB7CisJCWludCBhcmdzID0gMDsKKwkJY2hhciogcmV0Owog
CiAJLyogR2VuZXJhdGUgbWV0aG9kIHByb3RvdHlwZSAqLwotCXJldCA9IHN0cmNocihzaWcsJykn
KTsKKwkJcmV0ID0gc3RyY2hyKGktPnNpZywnKScpOwogCXJldCsrOwogCiAJaWYgKGluY2x1ZGUg
IT0gMCkgewogCQlmcHJpbnRmKGluY2x1ZGUsICJleHRlcm4gJXMiLCB0cmFuc2xhdGVTaWcocmV0
LCAwLCAwKSk7Ci0JCWZwcmludGYoaW5jbHVkZSwgIiAlc18lcygiLCBjbGFzc05hbWUsIG5hbWUp
OwotCQlpZiAoIShhY2Nlc3NfZmxhZ3MgJiBBQ0NfU1RBVElDKSkgeworCQkJZnByaW50ZihpbmNs
dWRlLCAiICVzXyVzKCIsIGNsYXNzTmFtZSwgaS0+bmFtZSk7CisJCQlpZiAoIShpLT5hY2Nlc3Nf
ZmxhZ3MgJiBBQ0NfU1RBVElDKSkgewogCQkJZnByaW50ZihpbmNsdWRlLCAic3RydWN0IEglcyoi
LCBjbGFzc05hbWUpOwotCQkJaWYgKHNpZ1sxXSAhPSAnKScpIHsKKwkJCQlpZiAoaS0+c2lnWzFd
ICE9ICcpJykgewogCQkJCWZwcmludGYoaW5jbHVkZSwgIiwgIik7CiAJCQl9Ci0JCX0gZWxzZSBp
ZiAoc2lnWzFdID09ICcpJykgeworCQkJfSBlbHNlIGlmIChpLT5zaWdbMV0gPT0gJyknKSB7CiAJ
CQlmcHJpbnRmKGluY2x1ZGUsICJ2b2lkIik7CiAJCX0KIAl9CiAKIAlpZiAoam5pX2luY2x1ZGUg
IT0gMCkgewotCQlmcHJpbnRmKGpuaV9pbmNsdWRlLCAiSk5JRVhQT1JUICVzIEpOSUNBTEwgSmF2
YV8lc18lcyhKTklFbnYqIiwKLQkJCWpuaVR5cGUocmV0KSwgY2xhc3NOYW1lLCBuYW1lKTsKLQkJ
aWYgKChhY2Nlc3NfZmxhZ3MgJiBBQ0NfU1RBVElDKSkgeworCQkJZnByaW50ZihqbmlfaW5jbHVk
ZSwgIkpOSUVYUE9SVCAlcyBKTklDQUxMIEphdmFfJXNfIiwKKwkJCQlqbmlUeXBlKHJldCksIGNs
YXNzTmFtZSk7CisJCQkKKwkJCWZwcmludGZKbmkoam5pX2luY2x1ZGUsIGktPm5hbWUpOworCisJ
CQkvKiBpZiB0aGVyZSBhcmUgb3RoZXIgbWV0aG9kcyB3aXRoIHRoZSBzYW1lIG5hbWUsIHdlIGhh
dmUgdG8gYXBwZW5kIHRoZSBtYW5nbGVkIHNpZ25hdHVyZSAqLworCQkJaWYgKGkgIT0gaS0+bmV4
dCAmJiAoIXN0cmNtcCAoaS0+bmFtZSwgaS0+cHJldi0+bmFtZSkgfHwgIXN0cmNtcCAoaS0+bmFt
ZSwgaS0+bmV4dC0+bmFtZSkpKSB7CisJCQkJZnByaW50ZihqbmlfaW5jbHVkZSwgIl9fIik7CisJ
CQkJCisJCQkJZnByaW50ZkpuaShqbmlfaW5jbHVkZSwgaS0+c2lnKzEpOworCQkJfQorCisJCQlm
cHJpbnRmKGpuaV9pbmNsdWRlLCAiKEpOSUVudioiKTsKKworCQkJaWYgKChpLT5hY2Nlc3NfZmxh
Z3MgJiBBQ0NfU1RBVElDKSkgewogCQkJZnByaW50ZihqbmlfaW5jbHVkZSwgIiwgamNsYXNzIik7
CiAJCX0KIAkJZWxzZSB7CkBAIC01NzAsNyArNjg4LDcgQEAgYWRkTWV0aG9kKEhqYXZhX2xhbmdf
Q2xhc3MqIHRoaXMsCiAJCX0KIAl9CiAKLQlzdHIgPSBzaWcgKyAxOworCQlzdHIgPSBpLT5zaWcg
KyAxOwogCWFyZ3MrKzsKIAl3aGlsZSAoc3RyWzBdICE9ICcpJykgewogCQlpZiAoam5pX2luY2x1
ZGUgIT0gMCkKQEAgLTU5MCw3ICs3MDgsMTcgQEAgYWRkTWV0aG9kKEhqYXZhX2xhbmdfQ2xhc3Mq
IHRoaXMsCiAJCWZwcmludGYoam5pX2luY2x1ZGUsICIpO1xuIik7CiAJfQogCi0JcmV0dXJuIChN
ZXRob2QqKTE7CisJCS8qIG1vdmUgdG8gbmV4dCBtZXRob2QgKi8KKwkJdG1wID0gaTsKKwkJaSA9
IGktPm5leHQ7CisKKwkJLyogZnJlZSBvbGQgb25lICovCisJCWZyZWUgKHRtcCk7CisKKwl9IHdo
aWxlIChpICE9IG1ldGhvZFJpbmcpOyAKKworICAgICAgICAvKiB3ZSBkb24ndCBoYXZlIGFueSBt
ZXRob2RzIGFueSBtb3JlICovCQorCW1ldGhvZFJpbmcgPSBOVUxMOwogfQogCiBib29sIAo=

--Multipart_Sun__29_Dec_2002_21:21:40_+0100_091c89c0--