You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
204 lines
11 KiB
204 lines
11 KiB
From 26708b9e80110c14a9d9fe7f974fc544f86b702a Mon Sep 17 00:00:00 2001
|
|
From: Ola Bini <ola.bini@gmail.com>
|
|
Date: Mon, 1 Feb 2010 16:46:02 +0100
|
|
Subject: [PATCH] Fix bug #11 - sort out some bad casts on JRuby
|
|
|
|
---
|
|
ext/hpricot_scan/HpricotScanService.java | 33 +++++++++++++++++++----------
|
|
ext/hpricot_scan/hpricot_scan.java.rl | 33 +++++++++++++++++++----------
|
|
2 files changed, 42 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/ext/hpricot_scan/HpricotScanService.java b/ext/hpricot_scan/HpricotScanService.java
|
|
index d921309..c5fe796 100644
|
|
--- a/ext/hpricot_scan/HpricotScanService.java
|
|
+++ b/ext/hpricot_scan/HpricotScanService.java
|
|
@@ -139,62 +139,62 @@ public class HpricotScanService implements BasicLibraryService {
|
|
|
|
// H_ATTR(target)
|
|
public static IRubyObject hpricot_ele_set_target(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("target"), x);
|
|
+ H_ELE_GET_asHash(self, H_ELE_ATTR).fastASet(self.getRuntime().newSymbol("target"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_target(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("target"));
|
|
+ return H_ELE_GET_asHash(self, H_ELE_ATTR).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("target"));
|
|
}
|
|
|
|
// H_ATTR(encoding)
|
|
public static IRubyObject hpricot_ele_set_encoding(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("encoding"), x);
|
|
+ ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("encoding"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_encoding(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("encoding"));
|
|
+ return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("encoding"));
|
|
}
|
|
|
|
// H_ATTR(version)
|
|
public static IRubyObject hpricot_ele_set_version(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("version"), x);
|
|
+ ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("version"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_version(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("version"));
|
|
+ return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("version"));
|
|
}
|
|
|
|
// H_ATTR(standalone)
|
|
public static IRubyObject hpricot_ele_set_standalone(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("standalone"), x);
|
|
+ ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("standalone"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_standalone(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("standalone"));
|
|
+ return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("standalone"));
|
|
}
|
|
|
|
// H_ATTR(system_id)
|
|
public static IRubyObject hpricot_ele_set_system_id(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("system_id"), x);
|
|
+ ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("system_id"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_system_id(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("system_id"));
|
|
+ return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("system_id"));
|
|
}
|
|
|
|
// H_ATTR(public_id)
|
|
public static IRubyObject hpricot_ele_set_public_id(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("public_id"), x);
|
|
+ ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("public_id"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_public_id(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("public_id"));
|
|
+ return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("public_id"));
|
|
}
|
|
|
|
public static class Scanner {
|
|
@@ -1903,6 +1903,15 @@ case 5:
|
|
return ((IRubyObject[])recv.dataGetStruct())[n];
|
|
}
|
|
|
|
+ public static RubyHash H_ELE_GET_asHash(IRubyObject recv, int n) {
|
|
+ IRubyObject obj = ((IRubyObject[])recv.dataGetStruct())[n];
|
|
+ if(obj.isNil()) {
|
|
+ obj = RubyHash.newHash(recv.getRuntime());
|
|
+ ((IRubyObject[])recv.dataGetStruct())[n] = obj;
|
|
+ }
|
|
+ return (RubyHash)obj;
|
|
+ }
|
|
+
|
|
public static IRubyObject H_ELE_SET(IRubyObject recv, int n, IRubyObject value) {
|
|
((IRubyObject[])recv.dataGetStruct())[n] = value;
|
|
return value;
|
|
diff --git a/ext/hpricot_scan/hpricot_scan.java.rl b/ext/hpricot_scan/hpricot_scan.java.rl
|
|
index d1fb04b..1821761 100644
|
|
--- a/ext/hpricot_scan/hpricot_scan.java.rl
|
|
+++ b/ext/hpricot_scan/hpricot_scan.java.rl
|
|
@@ -137,62 +137,62 @@ public class HpricotScanService implements BasicLibraryService {
|
|
|
|
// H_ATTR(target)
|
|
public static IRubyObject hpricot_ele_set_target(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("target"), x);
|
|
+ H_ELE_GET_asHash(self, H_ELE_ATTR).fastASet(self.getRuntime().newSymbol("target"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_target(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("target"));
|
|
+ return H_ELE_GET_asHash(self, H_ELE_ATTR).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("target"));
|
|
}
|
|
|
|
// H_ATTR(encoding)
|
|
public static IRubyObject hpricot_ele_set_encoding(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("encoding"), x);
|
|
+ ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("encoding"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_encoding(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("encoding"));
|
|
+ return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("encoding"));
|
|
}
|
|
|
|
// H_ATTR(version)
|
|
public static IRubyObject hpricot_ele_set_version(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("version"), x);
|
|
+ ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("version"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_version(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("version"));
|
|
+ return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("version"));
|
|
}
|
|
|
|
// H_ATTR(standalone)
|
|
public static IRubyObject hpricot_ele_set_standalone(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("standalone"), x);
|
|
+ ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("standalone"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_standalone(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("standalone"));
|
|
+ return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("standalone"));
|
|
}
|
|
|
|
// H_ATTR(system_id)
|
|
public static IRubyObject hpricot_ele_set_system_id(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("system_id"), x);
|
|
+ ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("system_id"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_system_id(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("system_id"));
|
|
+ return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("system_id"));
|
|
}
|
|
|
|
// H_ATTR(public_id)
|
|
public static IRubyObject hpricot_ele_set_public_id(IRubyObject self, IRubyObject x) {
|
|
- ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("public_id"), x);
|
|
+ ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("public_id"), x);
|
|
return self;
|
|
}
|
|
|
|
public static IRubyObject hpricot_ele_get_public_id(IRubyObject self) {
|
|
- return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("public_id"));
|
|
+ return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("public_id"));
|
|
}
|
|
|
|
public static class Scanner {
|
|
@@ -965,6 +965,15 @@ public class HpricotScanService implements BasicLibraryService {
|
|
return ((IRubyObject[])recv.dataGetStruct())[n];
|
|
}
|
|
|
|
+ public static RubyHash H_ELE_GET_asHash(IRubyObject recv, int n) {
|
|
+ IRubyObject obj = ((IRubyObject[])recv.dataGetStruct())[n];
|
|
+ if(obj.isNil()) {
|
|
+ obj = RubyHash.newHash(recv.getRuntime());
|
|
+ ((IRubyObject[])recv.dataGetStruct())[n] = obj;
|
|
+ }
|
|
+ return (RubyHash)obj;
|
|
+ }
|
|
+
|
|
public static IRubyObject H_ELE_SET(IRubyObject recv, int n, IRubyObject value) {
|
|
((IRubyObject[])recv.dataGetStruct())[n] = value;
|
|
return value;
|
|
--
|
|
1.6.6.1
|
|
|