-
Notifications
You must be signed in to change notification settings - Fork 58
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
relative file path of a include statement relatives to directory of including file #115
Conversation
CLA signed by all contributors. |
Anyone can review this change ? |
This looks like it could work. Did you explore my idea in #114 (comment) and find it didn't help? |
This generally seems good. @caseywilliams interested in doing a review? |
I followed your idea to find out the key issue exists the isolation of context for each parseable instance. The parseable_file of included file has not any information from including file. I didn't override function "relative_to" for sub-classes of parseable since we don't have a particular path for "resource", like java, in c++ for now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good generally, just a few minor comments.
lib/src/parseable.cc
Outdated
@@ -105,17 +105,38 @@ namespace hocon { | |||
// if it starts with "/" then remove the "/", for consistency |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this comment is no longer accurate.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, I'll try to correct it
…relative file path problem of include statements in hocon files.(A test case is added into conf_parser_test.cc)
6f9292b
to
d865508
Compare
@MikaelSmith I take your advises and modify a little. Take another glance please |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good. I'd like to get another person reviewing it however. I'll work on that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Except for one spelling thing, I think this looks okay. The test cases look thorough, so 👍
lib/inc/internal/simple_includer.hpp
Outdated
} | ||
} | ||
|
||
bool context_initialed() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should be initialized
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Except for one spelling thing, I think this looks okay. The test cases look thorough, so 👍
Thanks for reviewing. I'll correct that ASAP.
Done. @MikaelSmith @Magisus |
Thanks so much for your work on this! |
I was caught by this bug too with latest release. Happily found the fix was already in master. Thanks! |
This change is another solution for #114