This repository was archived by the owner on Mar 2, 2025. It is now read-only.
Feature/token improvement #3
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
moosbruggerj
commented
Mar 25, 2019
- added factory methods for tokens
- added convenience constructors for generating asts without the need to provide all tokens
- added support for delimiter tokens in lists
added 9 commits
March 22, 2019 12:14
changed Token class to include generation script hooks various: removed GrammarToken.h reference used token singletons instead
* identifier: if name starts with '$' or '$$' the modifier is correctly set
Codecov Report
@@ Coverage Diff @@
## master #3 +/- ##
==========================================
- Coverage 44.54% 40.36% -4.18%
==========================================
Files 35 37 +2
Lines 1805 2113 +308
==========================================
+ Hits 804 853 +49
- Misses 1001 1260 +259
Continue to review full report at Codecov.
|
ppaulweber
suggested changes
Mar 25, 2019
There was a problem hiding this comment.
Really good work @moosbruggerj, I've found some minor issues, please fix them and then we can merge this PR ASAP 🚀
| TCF, | ||
| }; | ||
|
|
||
| using FormulaFlags = libstdhl::Enum::Flags< FormulaFlag >; |
|
|
||
| t.add< FormulaDefinition >( | ||
| uToken, uToken, y, uToken, Role::axiom(), uToken, f, uToken, uToken ); | ||
| t.add< FormulaDefinition >( y, Role::axiom(), f ); |
| AT "@" | ||
| AND "&" | ||
| DOLLAR "$" | ||
| DOLLARDOLLAR "$$" |
src/Helper.cpp
Outdated
| #include "Helper.h" | ||
|
|
||
| using namespace libtptp; | ||
| /* |
There was a problem hiding this comment.
Please remove this compilation unit file Helper.cpp, because it does not contain any implementation!
src/Helper.h
Outdated
| using ListNodeElements = ListElements< Node >; | ||
|
|
||
| } | ||
| #endif /* _LIBTPTP_HELPER_H_ */ |
There was a problem hiding this comment.
Suggested change
| #endif /* _LIBTPTP_HELPER_H_ */ | |
| #endif // _LIBTPTP_HELPER_H_ | |
| } | ||
|
|
||
| const Token::Ptr Identifier::systemModifier( void ) const | ||
| const Token::Ptr& Identifier::modifier( void ) const |
src/Identifier.h
Outdated
| private: | ||
| const Token::Ptr m_systemModifier; | ||
| const Token::Ptr m_definedModifier; | ||
| const std::pair< const Token::Ptr, const std::string > modifierTokenFromName( |
There was a problem hiding this comment.
Why is this function a class method? It is only used in the compilation unit Identifier.cpp, please remove this line here and use a static function implementation inside of the compilation unit.
| , m_rightBraceToken( rightBraceToken ) | ||
| { | ||
| } | ||
| ListLiteral::ListLiteral( const ListNodeElements::Ptr& elements ) |
There was a problem hiding this comment.
Suggested change
| ListLiteral::ListLiteral( const ListNodeElements::Ptr& elements ) | |
| ListLiteral::ListLiteral( const ListNodeElements::Ptr& elements ) |
ppaulweber
approved these changes
Mar 26, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.