Skip to content

/ rust-hubbub

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Rust 0.6 syntax. #1

Merged
merged 3 commits into from Apr 1, 2013
+88 −88
Merged

Update to Rust 0.6 syntax. #1

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f44ad2d
Update to Rust 0.6 syntax.
metajack Mar 29, 2013
f070c67
Remove unused imports.
metajack Apr 1, 2013
2693ac1
Remove fail_unless!.
metajack Apr 1, 2013
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

Update to Rust 0.6 syntax.

  • Loading branch information
@metajack
metajack committed Mar 29, 2013
commit f44ad2d6c6c8641754ebdc53f728bc400278fc2b
76 hubbub.rs
View file
Open in desktop
@@ -44,28 +44,28 @@ pub struct Tag {
pub type NodeDataPtr = uint;

pub struct TreeHandler {
create_comment: @fn(data: ~str) -> NodeDataPtr,
create_doctype: @fn(doctype: ~Doctype) -> NodeDataPtr,
create_element: @fn(tag: ~Tag) -> NodeDataPtr,
create_text: @fn(data: ~str) -> NodeDataPtr,
ref_node: @fn(node: NodeDataPtr),
unref_node: @fn(node: NodeDataPtr),
append_child: @fn(parent: NodeDataPtr, child: NodeDataPtr) -> NodeDataPtr,
insert_before: @fn(parent: NodeDataPtr, child: NodeDataPtr) -> NodeDataPtr,
remove_child: @fn(parent: NodeDataPtr, child: NodeDataPtr) -> NodeDataPtr,
clone_node: @fn(node: NodeDataPtr, deep: bool) -> NodeDataPtr,
reparent_children: @fn(node: NodeDataPtr, new_parent: NodeDataPtr) -> NodeDataPtr,
get_parent: @fn(node: NodeDataPtr, element_only: bool) -> NodeDataPtr,
has_children: @fn(node: NodeDataPtr) -> bool,
form_associate: @fn(form: NodeDataPtr, node: NodeDataPtr),
add_attributes: @fn(node: NodeDataPtr, attributes: ~[Attribute]),
set_quirks_mode: @fn(mode: QuirksMode),
encoding_change: @fn(encname: ~str),
complete_script: @fn(script: NodeDataPtr)
create_comment: ~fn(data: ~str) -> NodeDataPtr,
create_doctype: ~fn(doctype: ~Doctype) -> NodeDataPtr,
create_element: ~fn(tag: ~Tag) -> NodeDataPtr,
create_text: ~fn(data: ~str) -> NodeDataPtr,
ref_node: ~fn(node: NodeDataPtr),
unref_node: ~fn(node: NodeDataPtr),
append_child: ~fn(parent: NodeDataPtr, child: NodeDataPtr) -> NodeDataPtr,
insert_before: ~fn(parent: NodeDataPtr, child: NodeDataPtr) -> NodeDataPtr,
remove_child: ~fn(parent: NodeDataPtr, child: NodeDataPtr) -> NodeDataPtr,
clone_node: ~fn(node: NodeDataPtr, deep: bool) -> NodeDataPtr,
reparent_children: ~fn(node: NodeDataPtr, new_parent: NodeDataPtr) -> NodeDataPtr,
get_parent: ~fn(node: NodeDataPtr, element_only: bool) -> NodeDataPtr,
has_children: ~fn(node: NodeDataPtr) -> bool,
form_associate: ~fn(form: NodeDataPtr, node: NodeDataPtr),
add_attributes: ~fn(node: NodeDataPtr, attributes: ~[Attribute]),
set_quirks_mode: ~fn(mode: QuirksMode),
encoding_change: ~fn(encname: ~str),
complete_script: ~fn(script: NodeDataPtr)
}

pub struct TreeHandlerPair {
tree_handler: @TreeHandler,
tree_handler: ~TreeHandler,
ll_tree_handler: ll::TreeHandler
}

@@ -96,7 +96,7 @@ pub fn Parser(encoding: &str, fix_encoding: bool) -> Parser {
}

pub impl Parser {
fn set_tree_handler(&mut self, tree_handler: @TreeHandler) {
fn set_tree_handler(&mut self, tree_handler: ~TreeHandler) {
self.tree_handler = Some(TreeHandlerPair {
tree_handler: tree_handler,
ll_tree_handler: ll::TreeHandler {
@@ -280,7 +280,7 @@ pub mod tree_callbacks {
-> ll::Error {
debug!("ll create comment");
let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
unsafe {
let data: &ll::String = cast::transmute(data);
*result = to_hubbub_node((self.tree_handler.create_comment)(from_hubbub_string(data)));
@@ -292,7 +292,7 @@ pub mod tree_callbacks {
-> ll::Error {
debug!("ll create doctype");
let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
unsafe {
let doctype: &ll::Doctype = cast::transmute(doctype);
*result = to_hubbub_node((self.tree_handler.create_doctype)(from_hubbub_doctype(doctype)));
@@ -304,7 +304,7 @@ pub mod tree_callbacks {
-> ll::Error {
debug!("ll create element");
let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
unsafe {
let tag: &ll::Tag = cast::transmute(tag);
*result = to_hubbub_node((self.tree_handler.create_element)(from_hubbub_tag(tag)));
@@ -316,7 +316,7 @@ pub mod tree_callbacks {
-> ll::Error {
debug!("ll create text");
let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
unsafe {
let data: &ll::String = cast::transmute(data);
*result = to_hubbub_node((self.tree_handler.create_text)(from_hubbub_string(data)));
@@ -327,15 +327,15 @@ pub mod tree_callbacks {
pub extern fn ref_node(ctx: *c_void, node: *c_void) -> ll::Error {
debug!("ll ref node");
let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
(self.tree_handler.ref_node)(from_hubbub_node(node));
return ll::OK;
}

pub extern fn unref_node(ctx: *c_void, node: *c_void) -> ll::Error {
debug!("ll unref node");
let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
(self.tree_handler.unref_node)(from_hubbub_node(node));
return ll::OK;
}
@@ -344,7 +344,7 @@ pub mod tree_callbacks {
-> ll::Error {
debug!("ll append child");
let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
unsafe {
*result = to_hubbub_node((self.tree_handler.append_child)(from_hubbub_node(parent),
from_hubbub_node(child)));
@@ -356,7 +356,7 @@ pub mod tree_callbacks {
result: *mut *c_void) -> ll::Error {
debug!("ll insert before");
let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
unsafe {
*result = to_hubbub_node((self.tree_handler.insert_before)(from_hubbub_node(parent),
from_hubbub_node(child)));
@@ -369,7 +369,7 @@ pub mod tree_callbacks {
debug!("ll remove child");

let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
unsafe {
*result = to_hubbub_node((self.tree_handler.remove_child)(from_hubbub_node(parent),
from_hubbub_node(child)));
@@ -382,7 +382,7 @@ pub mod tree_callbacks {
debug!("ll clone node");

let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
unsafe {
*result = to_hubbub_node((self.tree_handler.clone_node)(from_hubbub_node(node), deep));
}
@@ -394,7 +394,7 @@ pub mod tree_callbacks {
debug!("ll reparent children");

let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
(self.tree_handler.reparent_children)(from_hubbub_node(node),
from_hubbub_node(new_parent));
return ll::OK;
@@ -405,7 +405,7 @@ pub mod tree_callbacks {
debug!("ll get parent");

let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
unsafe {
*result = to_hubbub_node((self.tree_handler.get_parent)(from_hubbub_node(node),
element_only));
@@ -418,7 +418,7 @@ pub mod tree_callbacks {
debug!("ll has children");

let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
unsafe {
*result = (self.tree_handler.has_children)(from_hubbub_node(node));
}
@@ -429,7 +429,7 @@ pub mod tree_callbacks {
debug!("ll form associate");

let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
(self.tree_handler.form_associate)(from_hubbub_node(form), from_hubbub_node(node));
return ll::OK;
}
@@ -442,7 +442,7 @@ pub mod tree_callbacks {
debug!("ll add attributes");

let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
(self.tree_handler.add_attributes)(from_hubbub_node(node),
from_hubbub_attributes(attributes, n_attributes));
return ll::OK;
@@ -452,7 +452,7 @@ pub mod tree_callbacks {
debug!("ll set quirks mode");

let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
(self.tree_handler.set_quirks_mode)(from_hubbub_quirks_mode(mode));
return ll::OK;
}
@@ -461,7 +461,7 @@ pub mod tree_callbacks {
debug!("ll encoding change");

let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
(self.tree_handler.encoding_change)(unsafe { str::raw::from_c_str(encname) });
return ll::OK;
}
@@ -470,7 +470,7 @@ pub mod tree_callbacks {
debug!("ll complete script");

let self_opt: &Option<TreeHandlerPair> = unsafe { cast::transmute(ctx) };
let self = self_opt.get();
let self = self_opt.get_ref();
(self.tree_handler.complete_script)(from_hubbub_node(script));
return ll::OK;
}
82 ll.rs
View file
Open in desktop
@@ -3,17 +3,17 @@ use core::libc::{c_char, c_int, c_void, size_t};
// errors.h

pub type Error = c_int;
pub const OK: c_int = 0;
pub const REPROCESS: c_int = 1;
pub const ENCODINGCHANGE: c_int = 2;
pub const PAUSED: c_int = 3;
pub const NOMEM: c_int = 5;
pub const BADPARM: c_int = 6;
pub const INVALID: c_int = 7;
pub const FILENOTFOUND: c_int = 8;
pub const NEEDDATA: c_int = 9;
pub const BADENCODING: c_int = 10;
pub const UNKNOWN: c_int = 11;
pub static OK: c_int = 0;
pub static REPROCESS: c_int = 1;
pub static ENCODINGCHANGE: c_int = 2;
pub static PAUSED: c_int = 3;
pub static NOMEM: c_int = 5;
pub static BADPARM: c_int = 6;
pub static INVALID: c_int = 7;
pub static FILENOTFOUND: c_int = 8;
pub static NEEDDATA: c_int = 9;
pub static BADENCODING: c_int = 10;
pub static UNKNOWN: c_int = 11;

#[cfg(target_os = "macos")]
#[nolink]
@@ -35,13 +35,13 @@ pub extern mod error {
pub type Parser = c_void;

pub type ParserOptType = c_int;
pub const PARSER_TOKEN_HANDLER: c_int = 0;
pub const PARSER_ERROR_HANDLER: c_int = 1;
pub const PARSER_CONTENT_MODEL: c_int = 2;
pub const PARSER_TREE_HANDLER: c_int = 3;
pub const PARSER_DOCUMENT_NODE: c_int = 4;
pub const PARSER_ENABLE_SCRIPTING: c_int = 5;
pub const PARSER_PAUSE: c_int = 6;
pub static PARSER_TOKEN_HANDLER: c_int = 0;
pub static PARSER_ERROR_HANDLER: c_int = 1;
pub static PARSER_CONTENT_MODEL: c_int = 2;
pub static PARSER_TREE_HANDLER: c_int = 3;
pub static PARSER_DOCUMENT_NODE: c_int = 4;
pub static PARSER_ENABLE_SCRIPTING: c_int = 5;
pub static PARSER_PAUSE: c_int = 6;

pub struct ParserOptParamsTokenHandler {
handler: *u8,
@@ -104,39 +104,39 @@ pub struct TreeHandler {
// A client-dictated charset will override all others.
// A document-specified charset will override autodetection or the default.
pub type CharsetSource = c_int;
pub const CHARSET_UNKNOWN: c_int = 0;
pub const CHARSET_TENTATIVE: c_int = 1;
pub const CHARSET_CONFIDENT: c_int = 2;
pub static CHARSET_UNKNOWN: c_int = 0;
pub static CHARSET_TENTATIVE: c_int = 1;
pub static CHARSET_CONFIDENT: c_int = 2;

// Content model flag
pub type ContentModel = c_int;
pub const CONTENT_MODEL_PCDATA: c_int = 0;
pub const CONTENT_MODEL_RCDATA: c_int = 1;
pub const CONTENT_MODEL_CDATA: c_int = 2;
pub const CONTENT_MODEL_PLAINTEXT: c_int = 3;
pub static CONTENT_MODEL_PCDATA: c_int = 0;
pub static CONTENT_MODEL_RCDATA: c_int = 1;
pub static CONTENT_MODEL_CDATA: c_int = 2;
pub static CONTENT_MODEL_PLAINTEXT: c_int = 3;

// Quirks mode flag
pub type QuirksMode = c_int;
pub const QUIRKS_MODE_NONE: c_int = 0;
pub const QUIRKS_MODE_LIMITED: c_int = 1;
pub const QUIRKS_MODE_FULL: c_int = 2;
pub static QUIRKS_MODE_NONE: c_int = 0;
pub static QUIRKS_MODE_LIMITED: c_int = 1;
pub static QUIRKS_MODE_FULL: c_int = 2;

pub type TokenType = c_int;
pub const TOKEN_DOCTYPE: c_int = 0;
pub const TOKEN_START_TAG: c_int = 1;
pub const TOKEN_END_TAG: c_int = 2;
pub const TOKEN_COMMENT: c_int = 3;
pub const TOKEN_CHARACTER: c_int = 4;
pub const TOKEN_EOF: c_int = 5;
pub static TOKEN_DOCTYPE: c_int = 0;
pub static TOKEN_START_TAG: c_int = 1;
pub static TOKEN_END_TAG: c_int = 2;
pub static TOKEN_COMMENT: c_int = 3;
pub static TOKEN_CHARACTER: c_int = 4;
pub static TOKEN_EOF: c_int = 5;

pub type NS = c_int;
pub const NS_NULL: c_int = 0;
pub const NS_HTML: c_int = 1;
pub const NS_MATHML: c_int = 2;
pub const NS_SVG: c_int = 3;
pub const NS_XLINK: c_int = 4;
pub const NS_XML: c_int = 5;
pub const NS_XMLNS: c_int = 6;
pub static NS_NULL: c_int = 0;
pub static NS_HTML: c_int = 1;
pub static NS_MATHML: c_int = 2;
pub static NS_SVG: c_int = 3;
pub static NS_XLINK: c_int = 4;
pub static NS_XML: c_int = 5;
pub static NS_XMLNS: c_int = 6;

pub struct String {
ptr: *u8,
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.