Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Parse external source mods in normal .rs files #4003

Closed
wants to merge 59 commits into from
Closed

Parse external source mods in normal .rs files #4003

wants to merge 59 commits into from

Conversation

brson
Copy link
Contributor

@brson brson commented Nov 19, 2012

Part of #2176

I need this snapshotted. It adds the ability to parse mod foo; from an external file.

I have no idea why github decided to include so many commits in this pull (oh, it's because the pull request is against master, not incoming). The relevant commit is brson@72cc1ac

brson and others added 30 commits November 12, 2012 16:21
@brson
Convert most codemap types from records to structs
4c68084
@brson
Remove filemap box typedef from codemap
5f881b4
@brson
Move filemap ctors to static methods
1f33031
@brson
Move codemap doc comments to the proper place
9fc75e8
@brson
Reformatting in codemap
385a466
@brson
Remove CodeMap box typedef from codemap
5b248a6
@brson
Reorder codemap decls
18a825b
@brson
Remove expn_info box typedef from codemap
d115944
@brson
Convert codemap from legacy_exports
15a5d2c
@brson
Objectify the codemap
2ec09c4
@brson
Make it clearer which codemap functions use chars vs. bytes
b22f941
@brson
Remove unused get_snippet function from codemap
38b9740
@brson
Camel case all the codemap types except span
9ecf863
@brson
Add types for character position and byte position in the codemap
f67bfe9
@brson
Track character and byte positions together in the parser
8069d2f
@brson
Factor out some position management code in the lexer
3a9ccd5
@brson
Create CodeMap.add_filemap
b1dff40
@brson
Refactor the lexer to use FilePos types
4a0f4f5
@brson
Add some comments to codemap and lexer
bcccf33
@brson
Convert CodeMap and FileMap to use &self instead of @self
d5e35e3
@brson
Remove CodeMap.lookup_byte_pos
8cba337
@brson
Change spans to use byte offsets instead of char offsets
81d2015
@brson
Stop storing char positions in CodeMap
2374154
@brson
Stop tracking CodeMap offsets in the parse session. Big simplification
4a5b28f
@brson
Remove unused types from codemap
1ac28c3
@brson
Remove incorrect comment from codemap
2af0885
@catamorphism
Forbid duplicate supertraits
428c58b 
I actually already pushed most of this by accident before I meant to, but
r=nmatsakis anyway.

Closes rust-lang#3953
@brson
Add some docs to codemap
7c72fd8
@brson
Remove unused MultiByteChar.sum field from codemap
e621e68
@jesse99
Made Map.contains_key, contains_key_ref, and get pure.
ec8bfdd
jesse99 and others added 27 commits November 17, 2012 09:27
@jesse99
Made the time to string functions pure as well as empty_tm.
d999588 
This closes rust-lang#3919.
@jesse99
Made Result.get, get_ref, is_ok, is_err, and iter methods pure.
a3f845d 
Note that the function versions were already pure.
@jesse99
Made most of the URL functions pure.
e0805cb 
This closes rust-lang#3782.
@jesse99
Made more stuff pure.
dc5ff64 
escape functions in char, io.with_str_reader, base64 and md5sum, cell.empty_cell
and is_empty.
@jesse99
Made merge_sort pure
27cca5b
@jesse99
Fixing warnings for long and blank lines
0c11a12
@jesse99
Made from_str pure
401093e
@brson
Merge remote-tracking branch 'brson/codemap'
1a1e99c 
Conflicts:
	src/libsyntax/ext/source_util.rs
@jesse99
Added support for options that take no arguments and may be repeated.
340955b 
Closes rust-lang#3568.
@jesse99 @brson
Made Map.contains_key, contains_key_ref, and get pure.
68c852a
@jesse99 @brson
Moved strptime and strftime into private helper functions.
a9e1358 
Makes the public API much easier to see and prepares the way for making them pure.
@jesse99 @brson
Replace TmMut with inherited mutability
c58951e
@jesse99 @brson
Made the time to string functions pure as well as empty_tm.
2c0dab0 
This closes rust-lang#3919.
@jesse99 @brson
Made Result.get, get_ref, is_ok, is_err, and iter methods pure.
c5ab47e 
Note that the function versions were already pure.
@jesse99 @brson
Made most of the URL functions pure.
15989ec 
This closes rust-lang#3782.
@jesse99 @brson
Made more stuff pure.
6d99a2f 
escape functions in char, io.with_str_reader, base64 and md5sum, cell.empty_cell
and is_empty.
@jesse99 @brson
Made merge_sort pure
333d268
@jesse99 @brson
Fixing warnings for long and blank lines
361aea9
@jesse99 @brson
Made from_str pure
0fd9c9d
@jesse99 @brson
Merge with incoming.
e2f4f06 
Merge branch 'feature/purity' of github.com:jesse99/rust into feature/purity
@catamorphism
Merge pull request rust-lang#3998 from jesse99/feature/getopts
5e4ed70 
Added support for options that take no arguments and may be repeated.
@brson
Remove some unused code from lexer
a41903d
@brson
Whitespace
68c73dc
@brson
syntax: Remove cdir_syntax. Unused
ddbff6f
@brson
Parse file mods from .rs files
72cc1ac
@brson
Report errors better when failing to open files for sub-parsers
74b2e99
@brson
Remove unused file_type enum from the parser
371be3c
@brson
Copy link
Contributor Author

brson commented Nov 19, 2012

r=pcwalton

@brson brson closed this Nov 19, 2012
RalfJung pushed a commit to RalfJung/rust that referenced this pull request Nov 10, 2024
@saethlin
Merge pull request rust-lang#4003 from YohDeadfall/windows-shim-typo
445a340 
Fixed a typo in the GetThreadDescription shim
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@brson @graydon @jruderman @catamorphism @jesse99