-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
libexpr: split yacc prologue & epilogue (NFC) #9059
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| #ifdef __clang__ | ||
| #pragma clang diagnostic ignored "-Wunneeded-internal-declaration" | ||
| #endif | ||
|
|
||
| #include <boost/lexical_cast.hpp> | ||
|
|
||
| #include "nixexpr.hh" | ||
| #include "parser-tab.hh" | ||
|
|
||
| using namespace nix; | ||
|
|
||
| namespace nix { | ||
|
|
||
| static inline PosIdx makeCurPos(const YYLTYPE & loc, ParseData * data) | ||
| { | ||
| return data->state.positions.add(data->origin, loc.first_line, loc.first_column); | ||
| } | ||
|
|
||
| #define CUR_POS makeCurPos(*yylloc, data) | ||
|
|
||
| // backup to recover from yyless(0) | ||
| thread_local YYLTYPE prev_yylloc; | ||
|
|
||
| static void initLoc(YYLTYPE * loc) | ||
| { | ||
| loc->first_line = loc->last_line = 1; | ||
| loc->first_column = loc->last_column = 1; | ||
| } | ||
|
|
||
| static void adjustLoc(YYLTYPE * loc, const char * s, size_t len) | ||
| { | ||
| prev_yylloc = *loc; | ||
|
|
||
| loc->first_line = loc->last_line; | ||
| loc->first_column = loc->last_column; | ||
|
|
||
| for (size_t i = 0; i < len; i++) { | ||
| switch (*s++) { | ||
| case '\r': | ||
| if (*s == '\n') { /* cr/lf */ | ||
| i++; | ||
| s++; | ||
| } | ||
| /* fall through */ | ||
| case '\n': | ||
| ++loc->last_line; | ||
| loc->last_column = 1; | ||
| break; | ||
| default: | ||
| ++loc->last_column; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // we make use of the fact that the parser receives a private copy of the input | ||
| // string and can munge around in it. | ||
| static StringToken unescapeStr(SymbolTable & symbols, char * s, size_t length) | ||
| { | ||
| char * result = s; | ||
| char * t = s; | ||
| char c; | ||
| // the input string is terminated with *two* NULs, so we can safely take | ||
| // *one* character after the one being checked against. | ||
| while ((c = *s++)) { | ||
| if (c == '\\') { | ||
| c = *s++; | ||
| if (c == 'n') | ||
| *t = '\n'; | ||
| else if (c == 'r') | ||
| *t = '\r'; | ||
| else if (c == 't') | ||
| *t = '\t'; | ||
| else | ||
| *t = c; | ||
| } else if (c == '\r') { | ||
| /* Normalise CR and CR/LF into LF. */ | ||
| *t = '\n'; | ||
| if (*s == '\n') | ||
| s++; /* cr/lf */ | ||
| } else | ||
| *t = c; | ||
| t++; | ||
| } | ||
| return {result, size_t(t - result)}; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| #define YY_USER_INIT initLoc(yylloc) | ||
| #define YY_USER_ACTION adjustLoc(yylloc, yytext, yyleng); | ||
|
|
||
| #define PUSH_STATE(state) yy_push_state(state, yyscanner) | ||
| #define POP_STATE() yy_pop_state(yyscanner) | ||
This file contains 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
Oops, something went wrong.
Oops, something went wrong.
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.
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.
We should really avoid custom extensions like
.inc, because that breaks syntax highlighting etc. in most editors.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.
Would you like to kindly suggest which extension should I use :) ?
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.
@edolstra Yeah the issue is that we don't want the wildcard rules to install this with the other headers with the wildcards that would pick them up.
Besides using a different extension, the only other thing I can think of would be a different directory, e.g.
src/*.hhfor private headers, andinclude/*.hhfor public headers is pretty convention. But I recall you didn't want that public headers moved away from the source files they go with :).