Small html cleanup
This commit is contained in:
James Grogan
parent
c102ebb6da
commit
31b479e9f6
27 changed files with 330 additions and 252 deletions
|
|
@ -1,5 +1,11 @@
|
|||
#include "XmlParser.h"
|
||||
|
||||
#include "StringUtils.h"
|
||||
|
||||
#include "XmlDocument.h"
|
||||
#include "XmlElement.h"
|
||||
#include "XmlAttribute.h"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
using LS = XmlParser::LineState;
|
||||
|
|
@ -14,64 +20,64 @@ XmlParser::XmlParser()
|
|||
|
||||
}
|
||||
|
||||
void XmlParser::ProcessLine(const std::string& input)
|
||||
void XmlParser::processLine(const std::string& input)
|
||||
{
|
||||
for (std::size_t idx=0; idx<input.size(); idx++)
|
||||
{
|
||||
switch (input[idx])
|
||||
{
|
||||
case StringUtils::LEFT_BRACKET:
|
||||
OnLeftBracket();
|
||||
onLeftBracket();
|
||||
break;
|
||||
case StringUtils::RIGHT_BRACKET:
|
||||
OnRightBracket();
|
||||
onRightBracket();
|
||||
break;
|
||||
case StringUtils::QUESTION_MARK:
|
||||
OnQuestionMark();
|
||||
onQuestionMark();
|
||||
break;
|
||||
case StringUtils::FORWARD_SLASH:
|
||||
OnForwardSlash();
|
||||
onForwardSlash();
|
||||
break;
|
||||
case StringUtils::EQUALS:
|
||||
OnEquals();
|
||||
onEquals();
|
||||
break;
|
||||
case StringUtils::DOUBLE_QUOTE:
|
||||
OnDoubleQuote();
|
||||
onDoubleQuote();
|
||||
break;
|
||||
default:
|
||||
OnChar(input[idx]);
|
||||
onChar(input[idx]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnChar(char c)
|
||||
void XmlParser::onChar(char c)
|
||||
{
|
||||
if(StringUtils::IsAlphaNumeric(c))
|
||||
{
|
||||
OnAlphaNumeric(c);
|
||||
onAlphaNumeric(c);
|
||||
}
|
||||
else if(StringUtils::IsSpace(c))
|
||||
{
|
||||
OnSpace(c);
|
||||
onSpace(c);
|
||||
}
|
||||
else
|
||||
{
|
||||
OnNonAlphaNumeric(c);
|
||||
onNonAlphaNumeric(c);
|
||||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnAlphaNumeric(char c)
|
||||
void XmlParser::onAlphaNumeric(char c)
|
||||
{
|
||||
switch(mLineState)
|
||||
{
|
||||
case LS::Await_Tag_Open:
|
||||
OnTextStart(c);
|
||||
onTextStart(c);
|
||||
break;
|
||||
case LS::Await_Tag_Follower:
|
||||
case LS::Await_Tag_Name:
|
||||
{
|
||||
OnTagNameStart(c);
|
||||
onTagNameStart(c);
|
||||
break;
|
||||
}
|
||||
case LS::Await_Tag_Name_End:
|
||||
|
|
@ -81,7 +87,7 @@ void XmlParser::OnAlphaNumeric(char c)
|
|||
}
|
||||
case LS::Await_Attribute_Name:
|
||||
{
|
||||
OnAttributeNameStart(c);
|
||||
onAttributeNameStart(c);
|
||||
break;
|
||||
}
|
||||
case LS::Await_Attribute_Name_End:
|
||||
|
|
@ -108,7 +114,7 @@ void XmlParser::OnAlphaNumeric(char c)
|
|||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnNonAlphaNumeric(char c)
|
||||
void XmlParser::onNonAlphaNumeric(char c)
|
||||
{
|
||||
switch(mLineState)
|
||||
{
|
||||
|
|
@ -137,15 +143,15 @@ void XmlParser::OnNonAlphaNumeric(char c)
|
|||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnSpace(char c)
|
||||
void XmlParser::onSpace(char c)
|
||||
{
|
||||
switch(mLineState)
|
||||
{
|
||||
case LS::Await_Tag_Name_End:
|
||||
OnTagNameEnd();
|
||||
onTagNameEnd();
|
||||
break;
|
||||
case LS::Await_Attribute_Name_End:
|
||||
OnAttributeNameEnd();
|
||||
onAttributeNameEnd();
|
||||
break;
|
||||
case LS::Await_Text_End:
|
||||
mWorkingText.push_back(c);
|
||||
|
|
@ -158,28 +164,28 @@ void XmlParser::OnSpace(char c)
|
|||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnLeftBracket()
|
||||
void XmlParser::onLeftBracket()
|
||||
{
|
||||
switch(mLineState)
|
||||
{
|
||||
case LS::Await_Tag_Open:
|
||||
{
|
||||
OnTagOpen();
|
||||
onTagOpen();
|
||||
break;
|
||||
}
|
||||
case LS::Await_Text_End:
|
||||
{
|
||||
OnTextEnd();
|
||||
OnTagOpen();
|
||||
onTextEnd();
|
||||
onTagOpen();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
OnNonAlphaNumeric(StringUtils::LEFT_BRACKET);
|
||||
onNonAlphaNumeric(StringUtils::LEFT_BRACKET);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnRightBracket()
|
||||
void XmlParser::onRightBracket()
|
||||
{
|
||||
switch(mLineState)
|
||||
{
|
||||
|
|
@ -188,31 +194,31 @@ void XmlParser::OnRightBracket()
|
|||
case LS::Await_Attribute_Name_End:
|
||||
case LS::Await_Attribute_Value:
|
||||
{
|
||||
OnTagClose();
|
||||
onTagClose();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
OnNonAlphaNumeric(StringUtils::RIGHT_BRACKET);
|
||||
onNonAlphaNumeric(StringUtils::RIGHT_BRACKET);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnQuestionMark()
|
||||
void XmlParser::onQuestionMark()
|
||||
{
|
||||
if(mLineState == LS::Await_Tag_Follower)
|
||||
{
|
||||
if(mDocumentState == DS::Await_Prolog)
|
||||
{
|
||||
OnStartProlog();
|
||||
onStartProlog();
|
||||
}
|
||||
}
|
||||
else if(mDocumentState != DS::Build_Prolog)
|
||||
{
|
||||
OnNonAlphaNumeric(StringUtils::QUESTION_MARK);
|
||||
onNonAlphaNumeric(StringUtils::QUESTION_MARK);
|
||||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnForwardSlash()
|
||||
void XmlParser::onForwardSlash()
|
||||
{
|
||||
if(mLineState == LS::Await_Tag_Follower)
|
||||
{
|
||||
|
|
@ -223,36 +229,36 @@ void XmlParser::OnForwardSlash()
|
|||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnEquals()
|
||||
void XmlParser::onEquals()
|
||||
{
|
||||
if(mLineState == LS::Await_Attribute_Name_End)
|
||||
{
|
||||
OnAttributeNameEnd();
|
||||
onAttributeNameEnd();
|
||||
}
|
||||
else
|
||||
{
|
||||
OnNonAlphaNumeric(StringUtils::EQUALS);
|
||||
onNonAlphaNumeric(StringUtils::EQUALS);
|
||||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnDoubleQuote()
|
||||
void XmlParser::onDoubleQuote()
|
||||
{
|
||||
if(mLineState == LS::Await_Attribute_Value)
|
||||
{
|
||||
OnAttributeValueStart();
|
||||
onAttributeValueStart();
|
||||
}
|
||||
else if(mLineState == LS::Await_Attribute_Value_End)
|
||||
{
|
||||
OnAttributeValueEnd();
|
||||
onAttributeValueEnd();
|
||||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnTagOpen()
|
||||
void XmlParser::onTagOpen()
|
||||
{
|
||||
mLineState = LS::Await_Tag_Follower;
|
||||
}
|
||||
|
||||
void XmlParser::OnTagClose()
|
||||
void XmlParser::onTagClose()
|
||||
{
|
||||
if(mDocumentState == DS::Build_Prolog)
|
||||
{
|
||||
|
|
@ -262,7 +268,7 @@ void XmlParser::OnTagClose()
|
|||
{
|
||||
if(mLineState == LS::Await_Tag_Name_End)
|
||||
{
|
||||
OnTagNameEnd();
|
||||
onTagNameEnd();
|
||||
}
|
||||
onElementTagEnd();
|
||||
}
|
||||
|
|
@ -277,15 +283,15 @@ void XmlParser::OnTagClose()
|
|||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnTextStart(char c)
|
||||
void XmlParser::onTextStart(char c)
|
||||
{
|
||||
mWorkingText = c;
|
||||
mLineState = LS::Await_Text_End;
|
||||
}
|
||||
|
||||
void XmlParser::OnTextEnd()
|
||||
void XmlParser::onTextEnd()
|
||||
{
|
||||
mWorkingElements.top()->SetText(mWorkingText);
|
||||
mWorkingElements.top()->setText(mWorkingText);
|
||||
}
|
||||
|
||||
void XmlParser::onElementTagEnd()
|
||||
|
|
@ -294,7 +300,7 @@ void XmlParser::onElementTagEnd()
|
|||
mLineState = LS::Await_Tag_Open;
|
||||
}
|
||||
|
||||
void XmlParser::OnTagNameStart(char c)
|
||||
void XmlParser::onTagNameStart(char c)
|
||||
{
|
||||
mWorkingTagName = c;
|
||||
mLineState = LS::Await_Tag_Name_End;
|
||||
|
|
@ -304,11 +310,11 @@ void XmlParser::OnTagNameStart(char c)
|
|||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnTagNameEnd()
|
||||
void XmlParser::onTagNameEnd()
|
||||
{
|
||||
if(mDocumentState == DS::Build_Prolog)
|
||||
{
|
||||
mDocument->GetProlog()->SetTagName(mWorkingTagName);
|
||||
mDocument->getProlog()->setTagName(mWorkingTagName);
|
||||
mLineState = LS::Await_Attribute_Name;
|
||||
}
|
||||
else if(mDocumentState == DS::Build_Element)
|
||||
|
|
@ -316,59 +322,59 @@ void XmlParser::OnTagNameEnd()
|
|||
auto new_element = XmlElement::Create(mWorkingTagName);
|
||||
auto working_element = new_element.get();
|
||||
|
||||
if (!mDocument->GetRoot())
|
||||
if (!mDocument->getRoot())
|
||||
{
|
||||
mDocument->SetRoot(std::move(new_element));
|
||||
mDocument->setRoot(std::move(new_element));
|
||||
}
|
||||
else
|
||||
{
|
||||
mWorkingElements.top()->AddChild(std::move(new_element));
|
||||
mWorkingElements.top()->addChild(std::move(new_element));
|
||||
}
|
||||
mWorkingElements.push(working_element);
|
||||
mLineState = LS::Await_Attribute_Name;
|
||||
}
|
||||
}
|
||||
|
||||
void XmlParser::OnAttributeNameStart(char c)
|
||||
void XmlParser::onAttributeNameStart(char c)
|
||||
{
|
||||
mWorkingAttributeName = c;
|
||||
mLineState = LS::Await_Attribute_Name_End;
|
||||
}
|
||||
|
||||
void XmlParser::OnAttributeNameEnd()
|
||||
void XmlParser::onAttributeNameEnd()
|
||||
{
|
||||
auto attribute = XmlAttribute::Create(mWorkingAttributeName);
|
||||
if(mDocumentState == DS::Build_Prolog)
|
||||
{
|
||||
mDocument->GetProlog()->AddAttribute(std::move(attribute));
|
||||
mDocument->getProlog()->addAttribute(std::move(attribute));
|
||||
}
|
||||
else if(mDocumentState == DS::Build_Element)
|
||||
{
|
||||
mWorkingElements.top()->AddAttribute(std::move(attribute));
|
||||
mWorkingElements.top()->addAttribute(std::move(attribute));
|
||||
}
|
||||
mLineState = LS::Await_Attribute_Value;
|
||||
}
|
||||
|
||||
void XmlParser::OnAttributeValueStart()
|
||||
void XmlParser::onAttributeValueStart()
|
||||
{
|
||||
mWorkingAttributeValue = "";
|
||||
mLineState = LS::Await_Attribute_Value_End;
|
||||
}
|
||||
|
||||
void XmlParser::OnAttributeValueEnd()
|
||||
void XmlParser::onAttributeValueEnd()
|
||||
{
|
||||
if(mDocumentState == DS::Build_Prolog)
|
||||
{
|
||||
mDocument->GetProlog()->GetAttribute(mWorkingAttributeName)->SetValue(mWorkingAttributeValue);
|
||||
mDocument->getProlog()->getAttribute(mWorkingAttributeName)->setValue(mWorkingAttributeValue);
|
||||
}
|
||||
else if(mDocumentState == DS::Build_Element)
|
||||
{
|
||||
mWorkingElements.top()->GetAttribute(mWorkingAttributeName)->SetValue(mWorkingAttributeValue);
|
||||
mWorkingElements.top()->getAttribute(mWorkingAttributeName)->setValue(mWorkingAttributeValue);
|
||||
}
|
||||
mLineState = LS::Await_Attribute_Name;
|
||||
}
|
||||
|
||||
void XmlParser::OnStartProlog()
|
||||
void XmlParser::onStartProlog()
|
||||
{
|
||||
mDocumentState = DS::Build_Prolog;
|
||||
mLineState = LS::Await_Tag_Name_End;
|
||||
|
|
@ -376,12 +382,12 @@ void XmlParser::OnStartProlog()
|
|||
|
||||
void XmlParser::onFinishProlog()
|
||||
{
|
||||
mDocument->GetProlog()->Update();
|
||||
mDocument->getProlog()->update();
|
||||
mDocumentState = DS::Await_Element;
|
||||
mLineState = LS::Await_Tag_Open;
|
||||
}
|
||||
|
||||
XmlDocumentPtr XmlParser::GetDocument() const
|
||||
XmlDocumentPtr XmlParser::getDocument()
|
||||
{
|
||||
return mDocument;
|
||||
return std::move(mDocument);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue