aboutsummaryrefslogtreecommitdiff
path: root/xsd
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-05-07 09:41:11 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-05-07 09:41:11 +0200
commit67ba09efbc685093da252f8e04d8c588b4f1e3a3 (patch)
tree84778558e171e11c6058e47c3382cce482e6fbf9 /xsd
parentad2343698f84f5f5761880587b75f42ad6737799 (diff)
Update to reflect libxsd-frontend interface changes
Diffstat (limited to 'xsd')
-rw-r--r--xsd/elements.hxx15
-rw-r--r--xsd/processing/cardinality/processor.cxx6
-rw-r--r--xsd/processing/inheritance/processor.cxx2
3 files changed, 10 insertions, 13 deletions
diff --git a/xsd/elements.hxx b/xsd/elements.hxx
index fba8666..7f4baf8 100644
--- a/xsd/elements.hxx
+++ b/xsd/elements.hxx
@@ -20,18 +20,16 @@ namespace Traversal = XSDFrontend::Traversal;
// Anonymous feedback via belongs edge.
//
-struct AnonymousBase : Traversal::Element,
- Traversal::Attribute
+struct AnonymousBase : Traversal::Element, Traversal::Attribute
{
- AnonymousBase (Traversal::NodeDispatcherBase& d1)
+ AnonymousBase (Traversal::NodeDispatcher& d1)
: complex_ (&d1, 0)
{
edge_traverser (belongs_);
belongs_.node_traverser (complex_);
}
- AnonymousBase (Traversal::NodeDispatcherBase& d1,
- Traversal::NodeDispatcherBase& d2)
+ AnonymousBase (Traversal::NodeDispatcher& d1, Traversal::NodeDispatcher& d2)
: complex_ (&d1, &d2)
{
edge_traverser (belongs_);
@@ -106,8 +104,7 @@ public:
private:
struct Complex : Traversal::Complex
{
- Complex (Traversal::NodeDispatcherBase* d1,
- Traversal::NodeDispatcherBase* d2)
+ Complex (Traversal::NodeDispatcher* d1, Traversal::NodeDispatcher* d2)
: d1_ (d1), d2_ (d2)
{
}
@@ -123,8 +120,8 @@ private:
}
private:
- Traversal::NodeDispatcherBase* d1_;
- Traversal::NodeDispatcherBase* d2_;
+ Traversal::NodeDispatcher* d1_;
+ Traversal::NodeDispatcher* d2_;
} complex_;
diff --git a/xsd/processing/cardinality/processor.cxx b/xsd/processing/cardinality/processor.cxx
index 730c1a6..a47ed96 100644
--- a/xsd/processing/cardinality/processor.cxx
+++ b/xsd/processing/cardinality/processor.cxx
@@ -312,7 +312,7 @@ namespace Processing
i != t.el_map.end (); ++i)
{
ElementInfo& ei (i->second);
- FrontendElements::Context& ctx (ei.element ().context ());
+ SemanticGraph::Context& ctx (ei.element ().context ());
ctx.set ("min", ei.min);
ctx.set ("max", ei.max);
@@ -322,7 +322,7 @@ namespace Processing
i != t.any_map.end (); ++i)
{
AnyInfo& ai (i->second);
- FrontendElements::Context& ctx (ai.any ().context ());
+ SemanticGraph::Context& ctx (ai.any ().context ());
ctx.set ("min", ai.min);
ctx.set ("max", ai.max);
@@ -343,7 +343,7 @@ namespace Processing
virtual Void
traverse (Type& a)
{
- FrontendElements::Context& ctx (a.context ());
+ SemanticGraph::Context& ctx (a.context ());
ctx.set ("min", a.optional_p () ? 0UL : 1UL);
ctx.set ("max", 1UL);
diff --git a/xsd/processing/inheritance/processor.cxx b/xsd/processing/inheritance/processor.cxx
index 318e3e4..6bf307e 100644
--- a/xsd/processing/inheritance/processor.cxx
+++ b/xsd/processing/inheritance/processor.cxx
@@ -110,7 +110,7 @@ namespace Processing
if (!t.named_p () && types_seen_.find (&t) == types_seen_.end ())
{
- FrontendElements::Context& ctx (t.context ());
+ SemanticGraph::Context& ctx (t.context ());
last_xpath_ = xpath (m);