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 224 by Douglas Thrift, 2004-09-06T02:13:51-07:00 vs.
Revision 792 by douglas, 2006-06-01T23:55:43-07:00

# Line 4 | Line 4
4   //
5   // $Id$
6  
7 + #include <cxx/standard.hh>
8 +
9 + #include <api/pcre/regex.hpp>
10 +
11   #include "Jargon.hpp"
8 #include "Matcher.hpp"
12  
13 < Jargon::Jargon(const ext::String& path, bool include)
13 > Jargon::Jargon(const cse::String &path, const cse::String &jargon, bool include, const cse::String &relative) : include(include)
14   {
15 <        std::vector<std::string> args(1, FeepingCreaturism::program);
15 >        args.InsertLast(_B("--stringparam"));
16 >        args.InsertLast(_B("jargon"));
17 >        args.InsertLast(jargon);
18 >        args.InsertLast(_B("--param"));
19 >        args.InsertLast(("include"));
20 >        args.InsertLast(_S<ios::String>() << include << _B("()"));
21  
22 <        args.push_back("-p");
23 <        args.push_back("include");
24 <        args.push_back(lexical_cast<ext::String>(include) + "()");
25 <        args.push_back(path);
26 <        args.push_back("jargon.xsl");
22 >        if (!relative.IsEmpty())
23 >        {
24 >                args.InsertLast(_B("--stringparam"));
25 >                args.InsertLast(_B("relative"));
26 >                args.InsertLast(relative);
27 >        }
28  
29 <        redi::ipstream pin("/usr/local/bin/Xalan", args);
29 >        args.InsertLast(_B("jargon.xsl"));
30 >        args.InsertLast(_S<ios::String>() << path << _B("/") << jargon);
31 > }
32  
33 <        if (include)
34 <        {
35 <                std::string ignore;
33 > ios::PrintWriter &operator<<(ios::PrintWriter &output, const Jargon &jargon)
34 > {
35 >        _S<api::Process> xslt(_B("/usr/local/bin/xsltproc"), jargon.args);
36  
37 <                std::getline(pin, ignore);
27 <        }
37 >        if (jargon.include) ios::ReadLine(*xslt.GetReader());
38  
39 <        do
39 >        if (jargon.include)
40          {
41 <                std::string line;
41 >                ext::Buffer line;
42 >                api::Pcre::RegEx matcher(_B("^(.*) xmlns=\"http://www.w3.org/1999/xhtml\"(.*)$"));
43  
44 <                std::getline(pin, line);
44 >                while (ios::ReadLine(*xslt.GetReader(), line))
45 >                {
46 >                        while (api::Pcre::RegEx::Match match = matcher(line))
47 >                                line = _S<ios::Buffer>() << match[1] << match[2];
48  
49 <                buffer << line << '\n';
49 >                        output << line << ios::NewLine;
50 >                }
51          }
52 <        while (pin.good());
52 >        else
53 >                ios::ReadToWrite(*xslt.GetReader(), output);
54 >
55 >        return output;
56   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines