diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2010-01-12 15:16:19 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-01-12 15:16:19 +0200 |
| commit | 4326461b99a97153dd20a24570712adb04df89a9 (patch) | |
| tree | 475544d981c5baf196c380d2597b4772c75b33d9 /xsde/cxx/parser/name-processor.cxx | |
| parent | 8bf1bbd61d7d9aa50752b647f24f139512628b0e (diff) | |
Include file component in regex strings for schema being compiled
Diffstat (limited to 'xsde/cxx/parser/name-processor.cxx')
| -rw-r--r-- | xsde/cxx/parser/name-processor.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/xsde/cxx/parser/name-processor.cxx b/xsde/cxx/parser/name-processor.cxx index a168c28..2cd1020 100644 --- a/xsde/cxx/parser/name-processor.cxx +++ b/xsde/cxx/parser/name-processor.cxx @@ -29,9 +29,10 @@ namespace CXX public: Context (CLI::Options const& ops, SemanticGraph::Schema& root, - SemanticGraph::Path const& file) + SemanticGraph::Path const& path) : CXX::Context (std::wcerr, root, + path, "p:name", "char", ops.value<CLI::char_encoding> (), @@ -45,11 +46,8 @@ namespace CXX ops.value<CLI::include_regex_trace> (), ops.value<CLI::generate_inline> (), ops.value<CLI::reserved_name> ()), - schema_path_ (file), skel_suffix_ (ops.value<CLI::skel_type_suffix> ()), impl_suffix_ (ops.value<CLI::impl_type_suffix> ()), - schema (root), - schema_path (schema_path_), impl (ops.value<CLI::generate_noop_impl> () || ops.value<CLI::generate_print_impl> () || ops.value<CLI::generate_test_driver> ()), @@ -66,8 +64,6 @@ namespace CXX protected: Context (Context& c) : CXX::Context (c), - schema (c.schema), - schema_path (c.schema_path), impl (c.impl), tiein (c.tiein), skel_suffix (c.skel_suffix), @@ -102,15 +98,12 @@ namespace CXX } private: - SemanticGraph::Path const schema_path_; String const skel_suffix_; String const impl_suffix_; Cult::Containers::Map<String, NameSet*> global_type_names_; public: - SemanticGraph::Schema& schema; - SemanticGraph::Path const& schema_path; Boolean const impl; Boolean const tiein; String const& skel_suffix; |