Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

Make cpp_expr usable without having a full PreProcessor #441

Merged
merged 15 commits into from
May 22, 2020
Merged

Make cpp_expr usable without having a full PreProcessor #441

merged 15 commits into from
May 22, 2020

Conversation

jyn514
Copy link
Owner

@jyn514 jyn514 commented May 20, 2020 •
edited
Loading

Replaces #440

jyn514 added 11 commits May 19, 2020 23:57
@jyn514
Separate macro replacement from macro parsing
356fc1f 
- Return Vec of replaced tokens
- Add Peekable trait to allow using any `std::iter::Peekable` iterator
- Split up file handling and preprocessing
- Make `impl Debug for InternedStr` actually useful

I was staring at a lot of debugged identifiers while working on this;
I figured they should at least be useful.

- Only perform replacement _after_ processing `defined`
- Document edge cases
- Export `replace`
- Add doc-comments about architecture
@jyn514
Remove unused Unimplemented enum
c4b1413 
It was just there temporarily
@jyn514
Move around code to be closer to master
6cf56e0
@jyn514
Remove more commented-out code
79990ba
@jyn514
Remove even more commented out code
9188f0b
@jyn514
Make cpp_expr an associated function
eb70314 
This allows using it without having a full `PreProcessor` built
@jyn514
Remove unnecessary self fields for MacroReplacer
bfe7744
@jyn514
Make MacroReplacer less stateful
1a8868d
@jyn514
Remove MacroReplacer altogether
f2d83e5
@jyn514
Make cpp_expr pub
4e703f7
@jyn514
Remove commented-out code
3bfa955
@jyn514 jyn514 added this to the Preprocessor for bindgen milestone May 20, 2020
@jyn514 jyn514 changed the title [WIP] Make cpp_expr usable without having a full PreProcessor Make cpp_expr usable without having a full PreProcessor May 20, 2020
@jyn514 jyn514 mentioned this pull request May 20, 2020
Closed
@jyn514
Copy link
Owner Author

jyn514 commented May 20, 2020

Changes from 440: MacroReplacer is no longer a thing and replace is now a free-standing function. This has the advantage that you no longer have to passed an owned HashMap of definitions, and also makes things better for the PreProcessor by allowing it to use self.file_processor instead of self.replacer.inner everywhere.

@jyn514 jyn514 merged commit fb4dcde into master May 22, 2020
@jyn514 jyn514 deleted the cpp-expr branch May 22, 2020 02:48
This was referenced May 22, 2020
Closed
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Preprocessor for bindgen
Development

Successfully merging this pull request may close these issues.
1 participant
@jyn514