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

use separate privateKeyWord and externKeyWord instead of externOrPrivate #258

Merged
merged 1 commit into from
May 4, 2015
Merged

use separate privateKeyWord and externKeyWord instead of externOrPrivate #258

merged 1 commit into from
May 4, 2015

Conversation

as3boyan
Copy link
Contributor

@as3boyan as3boyan commented May 2, 2015

use separate privateKeyWord and externKeyWord instead of externOrPrivate

I had to make changes to rules suggested by @EBatTiVo

privateKeyword := 'private'
externKeyword := 'extern'
private externPrivate := externKeyword | privateKeyword
private privateExtern := privateKeyword | externKeyword
private externOrPrivate := privateKeyword | externKeyword | externPrivate | privateExtern

to

privateKeyWord ::= 'private'
externKeyWord ::= 'extern'

private externPrivate ::= externKeyWord privateKeyWord //use and instead of or
private privateExtern ::= privateKeyWord externKeyWord
//changed priority here so it won't get away with first possible case
private externOrPrivate ::= externPrivate | privateExtern | privateKeyWord | externKeyWord

@as3boyan as3boyan mentioned this pull request May 2, 2015
Merged
as3boyan
as3boyan reviewed May 2, 2015
View reviewed changes
grammar/haxe.bnf

private externAndMaybePrivate1 ::= privateKeyWord? externKeyWord
private externAndMaybePrivate2 ::= externKeyWord privateKeyWord?
private externAndMaybePrivate ::= externAndMaybePrivate2 | externAndMaybePrivate1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar changes for extern classes and interfaces

@EBatTiVo
Copy link
Contributor

EBatTiVo commented May 3, 2015

Approved for pull.

as3boyan added a commit that referenced this pull request May 4, 2015
@as3boyan
Merge pull request #258 from TiVo/UseSeparateExternKeyWordAndPrivateK…
6447b87 
…eyWordInsteadOfExternOrPrivateKeyword

use separate privateKeyWord and externKeyWord instead of externOrPrivate
@as3boyan as3boyan merged commit 6447b87 into master May 4, 2015
@as3boyan as3boyan deleted the UseSeparateExternKeyWordAndPrivateKeyWordInsteadOfExternOrPrivateKeyword branch May 4, 2015 06:44
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.
2 participants
@as3boyan @EBatTiVo