Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Add operators support #163

Merged
merged 6 commits into from
Oct 10, 2016
Merged

Add operators support #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3830041
Add operators support
MaximSokolov Sep 15, 2016
08a1705
:green_heart: Fix tests
MaximSokolov Sep 15, 2016
eeb16bf
Merge branch 'master' into operators-support
MaximSokolov Oct 8, 2016
80db385
Fix destructors
MaximSokolov Oct 8, 2016
a822549
Fix boundaries of sizeof operator
MaximSokolov Oct 8, 2016
2a5fafe
Add 'bitwise.shift' subscope for <<, >> operators
MaximSokolov Oct 8, 2016
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
6 changes: 3 additions & 3 deletions grammars/c++.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
{
'include': '#strings'
}
{
'include': 'source.c'
}
{
'match': '\\b(friend|explicit|virtual|override|final|noexcept)\\b'
'name': 'storage.modifier.cpp'
Expand Down Expand Up @@ -129,6 +126,9 @@
}
]
}
{
'include': 'source.c'
}
]
'repository':
'angle_brackets':
Expand Down
69 changes: 64 additions & 5 deletions grammars/c.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
'name': 'constant.language.c'
}
{
'include': '#sizeof'
'include': '#operators'
}
{
'include': '#numbers'
Expand Down Expand Up @@ -371,7 +371,7 @@
(?=\\s)
(?:(?<=else|new|return) | (?<!\\w)) (\\s+)
)?

# Actual name
(
\\b
Expand Down Expand Up @@ -769,9 +769,68 @@
'include': '#block_innards'
}
]
'sizeof':
'match': '\\b(sizeof)\\b'
'name': 'keyword.operator.sizeof.c'
'operators':
'patterns': [
{
'match': '(?<![\\w$])(sizeof)(?![\\w$])'
'name': 'keyword.operator.sizeof.c'
}
{
'match': '--'
'name': 'keyword.operator.decrement.c'
}
{
'match': '\\+\\+'
'name': 'keyword.operator.increment.c'
}
{
'match': '%=|\\+=|-=|\\*=|(?<!\\()/='
'name': 'keyword.operator.assignment.compound.c'
}
{
'match': '&=|\\^=|<<=|>>=|\\|='
'name': 'keyword.operator.assignment.compound.bitwise.c'
}
{
'match': '<<|>>'
'name': 'keyword.operator.bitwise.shift.c'
}
{
'match': '!=|<=|>=|==|<|>'
'name': 'keyword.operator.comparison.c'
}
{
'match': '&&|!|\\|\\|'
'name': 'keyword.operator.logical.c'
}
{
'match': '&|\\||\\^|~'
'name': 'keyword.operator.c'
Copy link
Contributor

@winstliu winstliu Sep 19, 2016

Choose a reason for hiding this comment

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

.logical.bitwise?

Copy link
Contributor Author

@MaximSokolov MaximSokolov Oct 8, 2016

Choose a reason for hiding this comment

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

It's not possible to distinguish an indirection operator and a multiplication operator

a * b
*a

Same for bitwise NOT and address-of operators

&a
a & b

I didn't add bitwise subscope for |, ~, ^ for consistency with &. I made an exception for shift operators(see 2a5fafe)

Copy link
Contributor

@winstliu winstliu Oct 8, 2016

Choose a reason for hiding this comment

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

Good point. This isn't something that the grammar can handle right now.

}
{
'match': '='
'name': 'keyword.operator.assignment.c'
}
{
'match': '%|\\*|/|-|\\+'
'name': 'keyword.operator.c'
}
{
'begin': '\\?'
'beginCaptures':
'0':
'name': 'keyword.operator.ternary.c'
'end': ':'
'endCaptures':
'0':
'name': 'keyword.operator.ternary.c'
'patterns': [
{
'include': '$self'
}
]
}
]
'strings':
'patterns': [
{
Expand Down
Loading