ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/FeepingCreaturism/Jargon.cpp
(Generate patch)

Comparing FeepingCreaturism/Jargon.cpp (file contents):
Revision 202 by Douglas Thrift, 2004-08-30T23:18:58-07:00 vs.
Revision 225 by Douglas Thrift, 2004-09-06T04:03:48-07:00

# Line 5 | Line 5
5   // $Id$
6  
7   #include "Jargon.hpp"
8 + #include "Matcher.hpp"
9  
10 < Jargon::Jargon(const std::string& path)
10 > Jargon::Jargon(const ext::String& path, bool include, const ext::String& relative)
11   {
12          std::vector<std::string> args(1, FeepingCreaturism::program);
13  
14 +        args.push_back("-p");
15 +        args.push_back("include");
16 +        args.push_back(lexical_cast<ext::String>(include) + "()");
17 +
18 +        if (!relative.IsEmpty())
19 +        {
20 +                args.push_back("-p");
21 +                args.push_back("relative");
22 +                args.push_back("\"" + relative + "\"");
23 +        }
24 +
25          args.push_back(path);
26          args.push_back("jargon.xsl");
27  
28 <        redi::pstreambuf pin("/usr/local/bin/Xalan", args, std::ios_base::in);
17 <        ios::StreamBufInputAdapter adaptor(pin);
18 <        ext::Handle<xml::Document> document(xml::Parse(adaptor));
19 <        ext::Handle<xml::Node> jargon(*document/"jargon");
20 <
21 <        word = *jargon/"word";
22 <        pronunciation = *jargon/"pronunciation";
23 <        grammar = *jargon/"grammar";
24 <        definition = *jargon/"definition";
25 < }
28 >        redi::ipstream pin("/usr/local/bin/Xalan", args);
29  
30 < std::ostream& operator<<(std::ostream& sout, const Jargon& jargon)
31 < {
32 <        ios::StreamBufOutputAdapter adaptor(*sout.rdbuf());
30 >        if (include)
31 >        {
32 >                std::string ignore;
33  
34 <        sout << jargon.word << '\n' << jargon.pronunciation << '\n'
35 <                << jargon.grammar << '\n' << jargon.definition.GetSize() << '\n';
34 >                std::getline(pin, ignore);
35 >        }
36  
37 < /*      ios::PrintWriter writer(adaptor);
37 >        do
38 >        {
39 >                std::string line;
40  
41 <        writer << jargon.definition << '\n';*/
41 >                std::getline(pin, line);
42  
43 <        return sout;
43 >                buffer << line << '\n';
44 >        }
45 >        while (pin.good());
46   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines