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.

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

Rollup of 8 pull requests #24784

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
fb64c7b
configure: Don't succeed if valgrind isn't available. Fixes #18588
brson Apr 15, 2015
31856a5
Typo
brson Apr 22, 2015
f1b40d7
Remove duplicate feature gate tests
lgrz Apr 20, 2015
38c3b62
Byte string literals are now fixed-size arrays
nwin Apr 24, 2015
b179f2b
Reference manual 3.5.2.1.5
SkylerLipthay Apr 24, 2015
15c3435
Remove reference to 'to'
steveklabnik Apr 24, 2015
7972fbb
[reference] Fix missing formatting.
mbrubeck Apr 24, 2015
331821e
[reference] Update 7.2.20: For expressions.
mbrubeck Apr 24, 2015
441e39f
Unrot and re-enable `run-pass-fulldeps/qquote.rs`
tamird Apr 23, 2015
c3f1d18
Re-enable test
tamird Apr 23, 2015
e22dd3e
`qquote-1.rs` -> `compile-fail-fulldeps/qquote.rs`
tamird Apr 23, 2015
1cc7b51
`qquote-2.rs` -> `run-fail/qquote.rs`
tamird Apr 23, 2015
8cf2552
Remove ebnf from reference
mdinger Apr 24, 2015
9ecfdad
Updates to grammar
mdinger Apr 24, 2015
7089c5e
Remove keywords from reference because they're already in grammar
mdinger Apr 24, 2015
0378f29
Rollup merge of #24477 - brson:valgrindconfig, r=nrc
steveklabnik Apr 24, 2015
e183df0
Rollup merge of #24718 - tamird:fix-quote-tests, r=alexcrichton
steveklabnik Apr 24, 2015
6acd655
Rollup merge of #24729 - mdinger:reference_grammar, r=steveklabnik
steveklabnik Apr 24, 2015
aaadb84
Rollup merge of #24751 - lstat:feature-gate-22820-dups, r=brson
steveklabnik Apr 24, 2015
9cdc76e
Rollup merge of #24766 - nwin:patch-1, r=steveklabnik
steveklabnik Apr 24, 2015
6b7f2d2
Rollup merge of #24769 - SkylerLipthay:patch-1, r=steveklabnik
steveklabnik Apr 24, 2015
b32d923
Rollup merge of #24772 - steveklabnik:gh24712, r=alexcrichton
steveklabnik Apr 24, 2015
37f8569
Rollup merge of #24775 - mbrubeck:reference, r=steveklabnik
steveklabnik Apr 24, 2015
1b5c7be
More small syntax changes in reference.md
Apr 24, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,15 @@ then
fi
fi

# By default the test suite *requires* valgrind. Detect its absence.
if [ -z "$CFG_VALGRIND" ]
then
if [ ! -z "$CFG_ENABLE_VALGRIND" ] || [ -z "$CFG_DISABLE_VALGRIND_RPASS" ]
then
err "valgrind not found, but needed. consider adding --disable-valgrind-rpass"
fi
fi

step_msg "looking for target specific programs"

probe CFG_ADB adb
Expand Down
39 changes: 24 additions & 15 deletions src/doc/grammar.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,19 +152,19 @@ token : simple_token | ident | literal | symbol | whitespace token ;

<p id="keyword-table-marker"></p>

| | | | | |
|----------|----------|----------|----------|--------|
| abstract | alignof | as | become | box |
| break | const | continue | crate | do |
| else | enum | extern | false | final |
| fn | for | if | impl | in |
| let | loop | match | mod | move |
| mut | offsetof | once | override | priv |
| proc | pub | pure | ref | return |
| sizeof | static | self | struct | super |
| true | trait | type | typeof | unsafe |
| unsized | use | virtual | where | while |
| yield | | | | |
| | | | | |
|----------|----------|----------|----------|---------|
| abstract | alignof | as | become | box |
| break | const | continue | crate | do |
| else | enum | extern | false | final |
| fn | for | if | impl | in |
| let | loop | macro | match | mod |
| move | mut | offsetof | override | priv |
| proc | pub | pure | ref | return |
| Self | self | sizeof | static | struct |
| super | trait | true | type | typeof |
| unsafe | unsized | use | virtual | where |
| while | yield | | | |


Each of these keywords has special meaning in its grammar, and all of them are
Expand Down Expand Up @@ -524,6 +524,15 @@ array_elems : [expr [',' expr]*] | [expr ',' ".." expr] ;
idx_expr : expr '[' expr ']' ;
```

### Range expressions

```antlr
range_expr : expr ".." expr |
expr ".." |
".." expr |
".." ;
```

### Unary operator expressions

**FIXME:** grammar?
Expand Down Expand Up @@ -610,7 +619,7 @@ lambda_expr : '|' ident_list '|' expr ;
### While loops

```antlr
while_expr : "while" no_struct_literal_expr '{' block '}' ;
while_expr : [ lifetime ':' ] "while" no_struct_literal_expr '{' block '}' ;
```

### Infinite loops
Expand All @@ -634,7 +643,7 @@ continue_expr : "continue" [ lifetime ];
### For expressions

```antlr
for_expr : "for" pat "in" no_struct_literal_expr '{' block '}' ;
for_expr : [ lifetime ':' ] "for" pat "in" no_struct_literal_expr '{' block '}' ;
```

### If expressions
Expand Down
Loading