Miroirs/arabica
1
0
Fork 0
mirror of https://github.com/jezhiggins/arabica synced 2025-01-30 08:38:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

s/XPathValuePtr/XPathValue/

Browse source
This commit is contained in:
jez 2009-02-18 08:37:16 +00:00
parent 0b2bb658b9
commit b22708f126
6 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/XSLT/impl/xslt_apply_templates.hpp
View file

@ -39,10 +39,10 @@ public:
nodes.push_back(n);
else
{
Arabica::XPath::XPathValuePtr<std::string> value = select_->evaluate(node, context.xpathContext());
if(value->type() != Arabica::XPath::NODE_SET)
Arabica::XPath::XPathValue<std::string> value = select_->evaluate(node, context.xpathContext());
if(value.type() != Arabica::XPath::NODE_SET)
throw std::runtime_error("apply-templates select expression is not a node-set");
nodes = value->asNodeSet();
nodes = value.asNodeSet();
}
sort(node, nodes, context);
context.stylesheet().applyTemplates(nodes, context, mode_);

2
include/XSLT/impl/xslt_compilation_context.hpp
View file

@ -174,6 +174,8 @@ private:
if(name == "document")
return new DocumentFunction(parser_.currentBase(), argExprs);
// key
if(name == "key")
return new KeyFunction(argExprs);
// format-number
if((name == "current") && (current_allowed_))
return new CurrentFunction(argExprs);

14
include/XSLT/impl/xslt_compiled_stylesheet.hpp
View file

@ -21,7 +21,7 @@ class CompiledStylesheet : public Stylesheet
typedef Arabica::XPath::BoolValue<std::string, Arabica::default_string_adaptor<std::string> > BoolValue;
typedef Arabica::XPath::NumericValue<std::string, Arabica::default_string_adaptor<std::string> > NumericValue;
typedef Arabica::XPath::StringValue<std::string, Arabica::default_string_adaptor<std::string> > StringValue;
typedef Arabica::XPath::XPathValuePtr<std::string> ValuePtr;
typedef Arabica::XPath::XPathValue<std::string> Value;
public:
CompiledStylesheet() :
@ -43,19 +43,19 @@ public:
virtual void set_parameter(const std::string& name, bool value)
{
set_parameter(name, ValuePtr(new BoolValue(value)));
set_parameter(name, Value(new BoolValue(value)));
} // set_parameter
virtual void set_parameter(const std::string& name, double value)
{
set_parameter(name, ValuePtr(new NumericValue(value)));
set_parameter(name, Value(new NumericValue(value)));
} // set_parameter
virtual void set_parameter(const std::string& name, const char* value)
{
set_parameter(name, ValuePtr(new StringValue(value)));
set_parameter(name, Value(new StringValue(value)));
} // set_parameter
virtual void set_parameter(const std::string& name, const std::string& value)
{
set_parameter(name, ValuePtr(new StringValue(value)));
set_parameter(name, Value(new StringValue(value)));
} // set_parameter
virtual void set_output(Sink& sink)
@ -265,12 +265,12 @@ private:
} // switch
} // defaultAction
void set_parameter(const std::string& name, ValuePtr value)
void set_parameter(const std::string& name, Value value)
{
params_.push_back(new TopLevelParam("", name, value));
} // set_parameter
void set_parameter(const std::string& namespace_uri, const std::string& name, ValuePtr value)
void set_parameter(const std::string& namespace_uri, const std::string& name, Value value)
{
params_.push_back(new TopLevelParam(namespace_uri, name, value));
} // set_parameter

8
include/XSLT/impl/xslt_copy.hpp
View file

@ -101,14 +101,14 @@ public:
virtual void execute(const DOM::Node<std::string>& node, ExecutionContext& context) const
{
Arabica::XPath::XPathValuePtr<std::string> value = select_->evaluate(node, context.xpathContext());
if(value->type() != Arabica::XPath::NODE_SET)
Arabica::XPath::XPathValue<std::string> value = select_->evaluate(node, context.xpathContext());
if(value.type() != Arabica::XPath::NODE_SET)
{
context.sink().characters(value->asString());
context.sink().characters(value.asString());
return;
}
Arabica::XPath::NodeSet<std::string> nodes = value->asNodeSet();
Arabica::XPath::NodeSet<std::string> nodes = value.asNodeSet();
for(Arabica::XPath::NodeSet<std::string>::const_iterator n = nodes.begin(), e = nodes.end(); n != e; ++n)
copy(*n, context);
} // execute

2
include/XSLT/impl/xslt_execution_context.hpp
View file

@ -154,7 +154,7 @@ private:
mutable DOMSink sink_;
const DOM::Node<std::string> node_;
mutable ExecutionContext context_;
mutable Arabica::XPath::XPathValuePtr<std::string> value_;
mutable Arabica::XPath::XPathValue<std::string> value_;
VariableClosure();
VariableClosure(const VariableClosure&);

4
include/XSLT/impl/xslt_top_level_param.hpp
View file

@ -11,7 +11,7 @@ class TopLevelParam : public Variable_declaration
public:
TopLevelParam(const std::string& namespace_uri,
const std::string& name,
Arabica::XPath::XPathValuePtr<std::string> value) :
Arabica::XPath::XPathValue<std::string> value) :
namespace_uri_(namespace_uri),
name_(name),
value_(value)
@ -39,7 +39,7 @@ private:
static DOM::Node<std::string> null_node;
std::string namespace_uri_;
std::string name_;
Arabica::XPath::XPathValuePtr<std::string> value_;
Arabica::XPath::XPathValue<std::string> value_;
}; // class TopLevelParam
DOM::Node<std::string> TopLevelParam::null_node;