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 227 by Douglas Thrift, 2004-09-06T13:23:39-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,
11 >        const ext::String& relative) : include(include),
12 >        args(1, FeepingCreaturism::program)
13   {
14 <        std::vector<std::string> args(1, FeepingCreaturism::program);
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");
15
16        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";
27   }
28  
29 < std::ostream& operator<<(std::ostream& sout, const Jargon& jargon)
29 > ios::PrintWriter& operator<<(ios::PrintWriter& pout, const Jargon& jargon)
30   {
31 <        ios::StreamBufOutputAdapter adaptor(*sout.rdbuf());
31 >        redi::ipstream pin("/usr/local/bin/Xalan", jargon.args);
32 >
33 >        if (jargon.include)
34 >        {
35 >                std::string ignore;
36 >
37 >                std::getline(pin, ignore);
38 >        }
39  
40 <        sout << jargon.word << '\n' << jargon.pronunciation << '\n'
41 <                << jargon.grammar << '\n' << jargon.definition.GetSize() << '\n';
40 >        do
41 >        {
42 >                std::string line;
43  
44 < /*      ios::PrintWriter writer(adaptor);
44 >                std::getline(pin, line);
45  
46 <        writer << jargon.definition << '\n';*/
46 >                pout << line << '\n';
47 >        }
48 >        while (pin.good());
49  
50 <        return sout;
50 >        return pout;
51   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines