Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Algorithms Library Toolkit Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Algorithms Library Toolkit
Algorithms Library Toolkit Core
Commits
ec10b4ea
Commit
ec10b4ea
authored
9 years ago
by
Jan Trávníček
Browse files
Options
Downloads
Patches
Plain Diff
fix parsing prefix ranked notation
parent
42f24ecc
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
alib2data/src/XmlApi.cpp
+1
-1
1 addition, 1 deletion
alib2data/src/XmlApi.cpp
alib2data/src/tree/TreeFromXMLParser.cpp
+6
-3
6 additions, 3 deletions
alib2data/src/tree/TreeFromXMLParser.cpp
with
7 additions
and
4 deletions
alib2data/src/XmlApi.cpp
+
1
−
1
View file @
ec10b4ea
...
@@ -1142,7 +1142,7 @@ tree::PrefixRankedNotation xmlApi<tree::PrefixRankedNotation>::parse(std::deque<
...
@@ -1142,7 +1142,7 @@ tree::PrefixRankedNotation xmlApi<tree::PrefixRankedNotation>::parse(std::deque<
}
}
bool
xmlApi
<
tree
::
PrefixRankedNotation
>::
first
(
const
std
::
deque
<
sax
::
Token
>&
input
)
{
bool
xmlApi
<
tree
::
PrefixRankedNotation
>::
first
(
const
std
::
deque
<
sax
::
Token
>&
input
)
{
return
sax
::
FromXMLParserHelper
::
isToken
(
input
,
sax
::
Token
::
TokenType
::
START_ELEMENT
,
Names
::
TREE_
RANKED_TREE
);
return
sax
::
FromXMLParserHelper
::
isToken
(
input
,
sax
::
Token
::
TokenType
::
START_ELEMENT
,
Names
::
TREE_
PREFIX_RANKED_NOTATION
);
}
}
void
xmlApi
<
tree
::
PrefixRankedNotation
>::
compose
(
std
::
deque
<
sax
::
Token
>&
output
,
const
tree
::
PrefixRankedNotation
&
data
)
{
void
xmlApi
<
tree
::
PrefixRankedNotation
>::
compose
(
std
::
deque
<
sax
::
Token
>&
output
,
const
tree
::
PrefixRankedNotation
&
data
)
{
...
...
This diff is collapsed.
Click to expand it.
alib2data/src/tree/TreeFromXMLParser.cpp
+
6
−
3
View file @
ec10b4ea
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
namespace
tree
{
namespace
tree
{
Tree
TreeFromXMLParser
::
parseTree
(
std
::
deque
<
sax
::
Token
>
&
input
)
const
{
Tree
TreeFromXMLParser
::
parseTree
(
std
::
deque
<
sax
::
Token
>
&
input
)
const
{
return
parseTree
(
input
,
std
::
set
<
FEATURES
>
({
FEATURES
::
RANKED_TREE
,
FEATURES
::
UNRANKED_TREE
}));
return
parseTree
(
input
,
std
::
set
<
FEATURES
>
({
FEATURES
::
RANKED_TREE
,
FEATURES
::
UNRANKED_TREE
,
FEATURES
::
PREFIX_RANKED_NOTATION
}));
}
}
Tree
TreeFromXMLParser
::
parseTree
(
std
::
deque
<
sax
::
Token
>&
input
,
const
std
::
set
<
FEATURES
>&
features
)
const
{
Tree
TreeFromXMLParser
::
parseTree
(
std
::
deque
<
sax
::
Token
>&
input
,
const
std
::
set
<
FEATURES
>&
features
)
const
{
...
@@ -24,8 +24,11 @@ Tree TreeFromXMLParser::parseTree(std::deque<sax::Token>& input, const std::set<
...
@@ -24,8 +24,11 @@ Tree TreeFromXMLParser::parseTree(std::deque<sax::Token>& input, const std::set<
}
else
if
(
alib
::
xmlApi
<
UnrankedTree
>::
first
(
input
))
{
}
else
if
(
alib
::
xmlApi
<
UnrankedTree
>::
first
(
input
))
{
if
(
!
features
.
count
(
FEATURES
::
UNRANKED_TREE
))
throw
exception
::
AlibException
();
if
(
!
features
.
count
(
FEATURES
::
UNRANKED_TREE
))
throw
exception
::
AlibException
();
return
Tree
(
parseUnrankedTree
(
input
));
return
Tree
(
parseUnrankedTree
(
input
));
}
else
if
(
alib
::
xmlApi
<
PrefixRankedNotation
>::
first
(
input
))
{
if
(
!
features
.
count
(
FEATURES
::
PREFIX_RANKED_NOTATION
))
throw
exception
::
AlibException
();
return
Tree
(
parsePrefixRankedNotation
(
input
));
}
else
}
else
throw
sax
::
ParserException
(
sax
::
Token
(
"Tree / RankedTree / UnrankedTree"
,
sax
::
Token
::
TokenType
::
START_ELEMENT
),
input
.
front
());
throw
sax
::
ParserException
(
sax
::
Token
(
"Tree / RankedTree /
PrefixRankedNotation /
UnrankedTree"
,
sax
::
Token
::
TokenType
::
START_ELEMENT
),
input
.
front
());
}
}
RankedTree
TreeFromXMLParser
::
parseRankedTree
(
std
::
deque
<
sax
::
Token
>&
input
)
const
{
RankedTree
TreeFromXMLParser
::
parseRankedTree
(
std
::
deque
<
sax
::
Token
>&
input
)
const
{
...
@@ -118,7 +121,7 @@ UnrankedNode * TreeFromXMLParser::parseUnrankedNode(std::deque<sax::Token> &inpu
...
@@ -118,7 +121,7 @@ UnrankedNode * TreeFromXMLParser::parseUnrankedNode(std::deque<sax::Token> &inpu
}
}
bool
TreeFromXMLParser
::
first
(
const
std
::
deque
<
sax
::
Token
>&
input
)
const
{
bool
TreeFromXMLParser
::
first
(
const
std
::
deque
<
sax
::
Token
>&
input
)
const
{
if
(
alib
::
xmlApi
<
RankedTree
>::
first
(
input
)
||
alib
::
xmlApi
<
UnrankedTree
>::
first
(
input
))
{
if
(
alib
::
xmlApi
<
RankedTree
>::
first
(
input
)
||
alib
::
xmlApi
<
PrefixRankedNotation
>::
first
(
input
)
||
alib
::
xmlApi
<
UnrankedTree
>::
first
(
input
))
{
return
true
;
return
true
;
}
else
{
}
else
{
return
false
;
return
false
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment