josh/propane
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

moved parse_input() to Parser::parseInputFile()

Browse Source
This commit is contained in:
Josh Holtrop 2010-04-27 13:52:21 -04:00
parent 2cc33bde74
commit 076cd122b0
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Parser.h
View File

@ -22,6 +22,7 @@ class Parser
m_rules.push_back(rd); m_rules.push_back(rd);
} }
void write(const std::string & fname); void write(const std::string & fname);
bool parseInputFile(char * buff, int size);
protected: protected:
std::vector< refptr< TokenDefinition > > m_tokens; std::vector< refptr< TokenDefinition > > m_tokens;

10
parse-input.cc → Parser_parseInputFile.cc
View File

@ -7,15 +7,15 @@
#include <map> #include <map>
#include <pcre.h> #include <pcre.h>
#include "parse-input.h"
#include "TokenDefinition.h"
#include "Parser.h" #include "Parser.h"
#include "TokenDefinition.h"
#include "RuleDefinition.h"
using namespace std; using namespace std;
enum Section{ none, tokens, rules }; enum Section{ none, tokens, rules };
bool parse_input(char * buff, int size, Parser & parser) bool Parser::parseInputFile(char * buff, int size)
{ {
pcre * empty; pcre * empty;
pcre * comment; pcre * comment;
@ -131,7 +131,7 @@ bool parse_input(char * buff, int size, Parser & parser)
refptr<TokenDefinition> td = new TokenDefinition(); refptr<TokenDefinition> td = new TokenDefinition();
if (td->create(name, definition, flags)) if (td->create(name, definition, flags))
{ {
parser.addTokenDefinition(td); addTokenDefinition(td);
} }
else else
{ {
@ -156,7 +156,7 @@ bool parse_input(char * buff, int size, Parser & parser)
refptr<RuleDefinition> rd = new RuleDefinition(); refptr<RuleDefinition> rd = new RuleDefinition();
if (rd->create(name, definition)) if (rd->create(name, definition))
{ {
parser.addRuleDefinition(rd); addRuleDefinition(rd);
} }
else else
{ {

4
imbecile.cc
View File

@ -5,7 +5,7 @@
#include <fstream> #include <fstream>
#include "refptr/refptr.h" #include "refptr/refptr.h"
#include "parse-input.h" #include "Parser.h"
using namespace std; using namespace std;
@ -48,7 +48,7 @@ int main(int argc, char * argv[])
Parser p; Parser p;
parse_input(buff, size, p); p.parseInputFile(buff, size);
if (output_fname == "") if (output_fname == "")
{ {

12
parse-input.h
View File

@ -1,12 +0,0 @@
#ifndef PARSE_INPUT_H
#define PARSE_INPUT_H
#include <vector>
#include "refptr/refptr.h"
#include "Parser.h"
bool parse_input(char * buff, int size, Parser & parser);
#endif