Created
June 12, 2015 20:06
-
-
Save erica/fa37ec43c065dace43f5 to your computer and use it in GitHub Desktop.
diffing
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
12,13d11 | |
< statement → defer-statement;opt | |
< statement → do-statement:opt | |
20c18 | |
< loop-statement → repeat-while-statement | |
--- | |
> loop-statement → do-while-statement | |
28c26 | |
< for-in-statement → forcaseoptpatterninexpressioncode-blockwhere-clauseopt | |
--- | |
> for-in-statement → forpatterninexpressioncode-block | |
31,40c29,33 | |
< while-statement → whilecondition-clausecode-block | |
< condition-clause → expression | |
< condition-clause → expression,condition-list | |
< condition-clause → condition-list | |
< condition-clause → availability-condition,expression | |
< condition-list → condition condition,condition-list | |
< condition → availability-condition case-condition optional-binding-condition | |
< case-condition → casepatterninitializerwhere-clauseopt | |
< optional-binding-condition → optional-binding-headoptional-binding-continuation-listoptwhere-clauseopt | |
< optional-binding-head → letpatterninitializer varpatterninitializer | |
--- | |
> while-statement → whilewhile-conditioncode-block | |
> while-condition → expression expressionoptoptional-binding-list | |
> optional-binding-list → optional-binding-clause optional-binding-clause,optional-binding-list | |
> optional-binding-clause → optional-binding-headoptional-binding-continuation-listoptguard-clauseopt | |
> optional-binding-head → letidentifier-patterninitializer varidentifier-patterninitializer | |
42,43c35,36 | |
< optional-binding-continuation → patterninitializer optional-binding-head | |
< GRAMMAR OF A REPEAT-WHILE STATEMENT | |
--- | |
> optional-binding-continuation → identifier-patterninitializer optional-binding-head | |
> GRAMMAR OF A DO-WHILE STATEMENT | |
45c38 | |
< repeat-while-statement → repeatcode-blockwhileexpression | |
--- | |
> do-while-statement → docode-blockwhileexpression | |
49d41 | |
< branch-statement → guard-statement | |
53c45,46 | |
< if-statement → ifcondition-clausecode-blockelse-clauseopt | |
--- | |
> if-statement → ifif-conditioncode-blockelse-clauseopt | |
> if-condition → expression expressionoptoptional-binding-list | |
55,57d47 | |
< GRAMMAR OF A GUARD STATEMENT | |
< | |
< guard-statement → guardcondition-clauseelsecode-block | |
65c55 | |
< case-item-list → patternwhere-clauseopt patternwhere-clauseopt,case-item-list | |
--- | |
> case-item-list → patternguard-clauseopt patternguard-clauseopt,case-item-list | |
67,68c57,58 | |
< where-clause → wherewhere-expression | |
< where-expression → expression | |
--- | |
> guard-clause → whereguard-expression | |
> guard-expression → expression | |
71c61 | |
< labeled-statement → statement-labelloop-statement statement-labelif-statement statement-labelswitch-statement | |
--- | |
> labeled-statement → statement-labelloop-statement statement-labelswitch-statement | |
80d69 | |
< control-transfer-statement → throw-statement | |
93,115d81 | |
< GRAMMAR OF AN AVAILABILITY CONDITION | |
< | |
< availability-condition → #available(availability-arguments) | |
< availability-arguments → availability-argument availability-argument,availability-arguments | |
< availability-argument → platform-nameplatform-version | |
< availability-argument → * | |
< platform-name → iOS iOSApplicationExtension | |
< platform-name → OSX OSXApplicationExtension | |
< platform-name → watchOS | |
< platform-version → decimal-digits | |
< platform-version → decimal-digits.decimal-digits | |
< platform-version → decimal-digits.decimal-digits.decimal-digits | |
< GRAMMAR OF A THROW STATEMENT | |
< | |
< throw-statement → throwexpression | |
< GRAMMAR OF A DEFER STATEMENT | |
< | |
< defer-statement → defercode-block | |
< GRAMMAR OF A DO STATEMENT | |
< | |
< do-statement → docode-blockcatch-clausesopt | |
< catch-clauses → catch-clausecatch-clausesopt | |
< catch-clause → catchpatternoptwhere-clauseoptcode-block | |
207,208c173 | |
< function-signature → parameter-clausesthrowsoptfunction-resultopt | |
< function-signature → parameter-clausesrethrowsfunction-resultopt | |
--- | |
> function-signature → parameter-clausesfunction-resultopt | |
214,215c179,180 | |
< parameter → inoutoptletoptexternal-parameter-nameoptlocal-parameter-nametype-annotationdefault-argument-clauseopt | |
< parameter → inoutoptvarexternal-parameter-nameoptlocal-parameter-nametype-annotationdefault-argument-clauseopt | |
--- | |
> parameter → inoutoptletopt#optexternal-parameter-nameoptlocal-parameter-nametype-annotationdefault-argument-clauseopt | |
> parameter → inoutoptvar#optexternal-parameter-nameoptlocal-parameter-nametype-annotationdefault-argument-clauseopt | |
326d290 | |
< pattern → optional-pattern | |
346,348d309 | |
< GRAMMAR OF AN OPTIONAL PATTERN | |
< | |
< optional-pattern → identifier-pattern? | |
375c336 | |
< expression → try-operatoroptprefix-expressionbinary-expressionsopt | |
--- | |
> expression → prefix-expressionbinary-expressionsopt | |
382,384d342 | |
< GRAMMAR OF A TRY EXPRESSION | |
< | |
< try-operator → try try! | |
388,389c346,347 | |
< binary-expression → assignment-operatortry-operatoroptprefix-expression | |
< binary-expression → conditional-operatortry-operatoroptprefix-expression | |
--- | |
> binary-expression → assignment-operatorprefix-expression | |
> binary-expression → conditional-operatorprefix-expression | |
630,631c588 | |
< function-type → typethrowsopt->type | |
< function-type → typerethrows->type | |
--- | |
> function-type → type->type |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment