Skip to content

Commit a0eee27

Browse files
aeschliaeschli
committed
[c] update grammar
1 parent 27d17e3 commit a0eee27

6 files changed

Lines changed: 1485 additions & 215 deletions

File tree

‎extensions/cpp/syntaxes/c++.json‎

Lines changed: 74 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"include": "#special_block"
2727
},
2828
{
29-
"include": "source.c"
29+
"include": "#strings"
3030
},
3131
{
3232
"match": "\\b(friend|explicit|virtual|override|final|noexcept)\\b",
@@ -45,7 +45,6 @@
4545
"name": "keyword.control.cpp"
4646
},
4747
{
48-
"comment": "common C++ instance var naming idiom -- fMemberName",
4948
"match": "\\b(f|m)[A-Z]\\w*\\b",
5049
"name": "variable.other.readwrite.member.cpp"
5150
},
@@ -78,7 +77,7 @@
7877
"name": "storage.modifier.cpp"
7978
},
8079
{
81-
"begin": "(?x)\n \t\t\t\t(?: ^ # begin-of-line\n \t\t\t\t | (?: (?<!else|new|=) ) # or word + space before name\n \t\t\t\t)\n \t\t\t\t((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n \t\t\t\t \\s*(\\() # start bracket or end-of-line\n \t\t\t",
80+
"begin": "(?x)\n(?:\n ^ | # beginning of line\n (?:(?<!else|new|=)) # or word + space before name\n)\n((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n\\s*(\\() # opening bracket",
8281
"beginCaptures": {
8382
"1": {
8483
"name": "entity.name.function.cpp"
@@ -101,7 +100,7 @@
101100
]
102101
},
103102
{
104-
"begin": "(?x)\n \t\t\t\t(?: ^ # begin-of-line\n \t\t\t\t | (?: (?<!else|new|=) ) # or word + space before name\n \t\t\t\t)\n \t\t\t\t((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n \t\t\t\t \\s*(\\() # terminating semi-colon\n \t\t\t",
103+
"begin": "(?x)\n(?:\n ^ | # beginning of line\n (?:(?<!else|new|=)) # or word + space before name\n)\n((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n\\s*(\\() # opening bracket",
105104
"beginCaptures": {
106105
"1": {
107106
"name": "entity.name.function.cpp"
@@ -122,6 +121,9 @@
122121
"include": "$base"
123122
}
124123
]
124+
},
125+
{
126+
"include": "source.c"
125127
}
126128
],
127129
"repository": {
@@ -162,7 +164,7 @@
162164
"name": "punctuation.definition.parameters.c"
163165
}
164166
},
165-
"match": "(?x)\n \t\t\t\t(\n \t\t\t\t\t(?!while|for|do|if|else|switch|catch|enumerate|return|r?iterate)(?: \\b[A-Za-z_][A-Za-z0-9_]*+\\b | :: )*+ # actual name\n \t\t\t\t)\n \t\t\t\t \\s*(\\()",
167+
"match": "(?x)\n(\n (?!while|for|do|if|else|switch|catch|enumerate|return|r?iterate)\n (?:\\b[A-Za-z_][A-Za-z0-9_]*+\\b|::)*+ # actual name\n)\n\\s*(\\() # opening bracket",
166168
"name": "meta.function-call.c"
167169
},
168170
{
@@ -173,7 +175,7 @@
173175
"constructor": {
174176
"patterns": [
175177
{
176-
"begin": "(?x)\n \t\t\t\t(?: ^\\s*) # begin-of-line\n \t\t\t\t((?!while|for|do|if|else|switch|catch|enumerate|r?iterate)[A-Za-z_][A-Za-z0-9_:]*) # actual name\n \t\t\t\t \\s*(\\() # start bracket or end-of-line\n \t\t\t",
178+
"begin": "(?x)\n(?:^\\s*) # beginning of line\n((?!while|for|do|if|else|switch|catch|enumerate|r?iterate)[A-Za-z_][A-Za-z0-9_:]*) # actual name\n\\s*(\\() # opening bracket",
177179
"beginCaptures": {
178180
"1": {
179181
"name": "entity.name.function.cpp"
@@ -196,7 +198,7 @@
196198
]
197199
},
198200
{
199-
"begin": "(?x)\n \t\t\t\t(:) # begin-of-line\n \t\t\t\t((?=\\s*[A-Za-z_][A-Za-z0-9_:]* # actual name\n \t\t\t\t \\s*(\\())) # start bracket or end-of-line\n \t\t\t",
201+
"begin": "(?x)\n(:)\n(\n (?=\n \\s*[A-Za-z_][A-Za-z0-9_:]* # actual name\n \\s* (\\() # opening bracket\n )\n)",
200202
"beginCaptures": {
201203
"1": {
202204
"name": "punctuation.definition.parameters.c"
@@ -383,7 +385,71 @@
383385
]
384386
}
385387
]
388+
},
389+
"strings": {
390+
"patterns": [
391+
{
392+
"begin": "(u|u8|U|L)?\"",
393+
"beginCaptures": {
394+
"0": {
395+
"name": "punctuation.definition.string.begin.cpp"
396+
},
397+
"1": {
398+
"name": "meta.encoding.cpp"
399+
}
400+
},
401+
"end": "\"",
402+
"endCaptures": {
403+
"0": {
404+
"name": "punctuation.definition.string.end.cpp"
405+
}
406+
},
407+
"name": "string.quoted.double.cpp",
408+
"patterns": [
409+
{
410+
"match": "\\\\u\\h{4}|\\\\U\\h{8}",
411+
"name": "constant.character.escape.cpp"
412+
},
413+
{
414+
"match": "\\\\['\"?\\\\abfnrtv]",
415+
"name": "constant.character.escape.cpp"
416+
},
417+
{
418+
"match": "\\\\[0-7]{1,3}",
419+
"name": "constant.character.escape.cpp"
420+
},
421+
{
422+
"match": "\\\\x\\h+",
423+
"name": "constant.character.escape.cpp"
424+
}
425+
]
426+
},
427+
{
428+
"begin": "(u|u8|U|L)?R\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
429+
"beginCaptures": {
430+
"0": {
431+
"name": "punctuation.definition.string.begin.cpp"
432+
},
433+
"1": {
434+
"name": "meta.encoding.cpp"
435+
},
436+
"3": {
437+
"name": "invalid.illegal.delimiter-too-long.cpp"
438+
}
439+
},
440+
"end": "\\)\\2(\\3)\"",
441+
"endCaptures": {
442+
"0": {
443+
"name": "punctuation.definition.string.end.cpp"
444+
},
445+
"1": {
446+
"name": "invalid.illegal.delimiter-too-long.cpp"
447+
}
448+
},
449+
"name": "string.quoted.double.raw.cpp"
450+
}
451+
]
386452
}
387453
},
388-
"version": "https://github.com/atom/language-c/commit/7922a226b706d3125601561ed670eed97c4d674b"
454+
"version": "https://github.com/atom/language-c/commit/80db38512efabb3030d600a8d8f8b6d91abbc96b"
389455
}

‎extensions/cpp/syntaxes/c.json‎

Lines changed: 77 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"scopeName": "source.c",
33
"fileTypes": [
44
"c",
5-
"h"
5+
"h.in"
66
],
77
"firstLineMatch": "(?i)-\\*-[^*]*(Mode:\\s*)?C(\\s*;.*?)?\\s*-\\*-",
88
"name": "C",
@@ -32,7 +32,6 @@
3232
"name": "storage.modifier.c"
3333
},
3434
{
35-
"comment": "common C constant naming idiom -- kConstantVariable",
3635
"match": "\\bk[A-Z]\\w*\\b",
3736
"name": "constant.other.variable.mac-classic.c"
3837
},
@@ -49,7 +48,7 @@
4948
"name": "constant.language.c"
5049
},
5150
{
52-
"include": "#sizeof"
51+
"include": "#operators"
5352
},
5453
{
5554
"include": "#numbers"
@@ -216,27 +215,26 @@
216215
"name": "support.type.pthread.c"
217216
},
218217
{
219-
"match": "\\b(int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t)\\b",
218+
"match": "(?x) \\b\n(int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t\n|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t\n|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t\n|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t\n|uintmax_t|uintmax_t)\n\\b",
220219
"name": "support.type.stdint.c"
221220
},
222221
{
223222
"match": "\\b(noErr|kNilOptions|kInvalidID|kVariableLengthArray)\\b",
224223
"name": "support.constant.mac-classic.c"
225224
},
226225
{
227-
"match": "\\b(AbsoluteTime|Boolean|Byte|ByteCount|ByteOffset|BytePtr|CompTimeValue|ConstLogicalAddress|ConstStrFileNameParam|ConstStringPtr|Duration|Fixed|FixedPtr|Float32|Float32Point|Float64|Float80|Float96|FourCharCode|Fract|FractPtr|Handle|ItemCount|LogicalAddress|OptionBits|OSErr|OSStatus|OSType|OSTypePtr|PhysicalAddress|ProcessSerialNumber|ProcessSerialNumberPtr|ProcHandle|Ptr|ResType|ResTypePtr|ShortFixed|ShortFixedPtr|SignedByte|SInt16|SInt32|SInt64|SInt8|Size|StrFileName|StringHandle|StringPtr|TimeBase|TimeRecord|TimeScale|TimeValue|TimeValue64|UInt16|UInt32|UInt64|UInt8|UniChar|UniCharCount|UniCharCountPtr|UniCharPtr|UnicodeScalarValue|UniversalProcHandle|UniversalProcPtr|UnsignedFixed|UnsignedFixedPtr|UnsignedWide|UTF16Char|UTF32Char|UTF8Char)\\b",
226+
"match": "(?x) \\b\n(AbsoluteTime|Boolean|Byte|ByteCount|ByteOffset|BytePtr|CompTimeValue|ConstLogicalAddress|ConstStrFileNameParam\n|ConstStringPtr|Duration|Fixed|FixedPtr|Float32|Float32Point|Float64|Float80|Float96|FourCharCode|Fract|FractPtr\n|Handle|ItemCount|LogicalAddress|OptionBits|OSErr|OSStatus|OSType|OSTypePtr|PhysicalAddress|ProcessSerialNumber\n|ProcessSerialNumberPtr|ProcHandle|Ptr|ResType|ResTypePtr|ShortFixed|ShortFixedPtr|SignedByte|SInt16|SInt32|SInt64\n|SInt8|Size|StrFileName|StringHandle|StringPtr|TimeBase|TimeRecord|TimeScale|TimeValue|TimeValue64|UInt16|UInt32\n|UInt64|UInt8|UniChar|UniCharCount|UniCharCountPtr|UniCharPtr|UnicodeScalarValue|UniversalProcHandle|UniversalProcPtr\n|UnsignedFixed|UnsignedFixedPtr|UnsignedWide|UTF16Char|UTF32Char|UTF8Char)\n\\b",
228227
"name": "support.type.mac-classic.c"
229228
},
230229
{
231-
"comment": "Reserved POSIX types",
232230
"match": "\\b([A-Za-z0-9_]+_t)\\b",
233231
"name": "support.type.posix-reserved.c"
234232
},
235233
{
236234
"include": "#block"
237235
},
238236
{
239-
"begin": "(?x)\n(?:\n ^ |\n (?:\n (?=\\s)(?<!else|new|return)(?<=\\w) # word + space before name\n |\n (?=\\s*[A-Za-z_])(?<!&&)(?<=[*&>]) # type modifier before name\n )\n)\n(\\s*)(?!(while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n(\n (?:[A-Za-z_][A-Za-z0-9_]*+|::)++ # actual name\n |\n (?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\])) # if it is a C++ operator\n)\n\\s*(?=\\()",
237+
"begin": "(?x)\n(?:\n ^ |\n (?:\n (?=\\s)(?<!else|new|return)(?<=\\w) # word + space before name\n |\n (?=\\s*[A-Za-z_])(?<!&&)(?<=[*&>]) # type modifier before name\n )\n)\n(\\s*)(?!(while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()\n(\n (?:[A-Za-z_][A-Za-z0-9_]*+|::)++ # actual name\n |\n (?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(?=\\()",
240238
"beginCaptures": {
241239
"1": {
242240
"name": "punctuation.whitespace.function.leading.c"
@@ -341,7 +339,7 @@
341339
"name": "punctuation.definition.parameters.c"
342340
}
343341
},
344-
"match": "(?x)\n\t\t\t (?x)\n\t\t\t(?: \n\t\t\t (?: (?= \\s ) (?<!else|new|return) (?<=\\w)\\s+ # or word + space before name\n\t\t\t )\n\t\t\t)\n\t\t\t(\n\t\t\t\t(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++ | # actual name\n\t\t\t\t(?: (?<=operator) (?: [-*&<>=+!]+ | \\(\\) | \\[\\] ) ) # if it is a C++ operator\n\t\t\t)\n\t\t\t \\s*(\\()",
342+
"match": "(?x)\n(?:\n (?:\n (?=\\s)(?<!else|new|return)\n (?<=\\w) \\s+ # or word + space before name\n )\n)\n(\n (?:[A-Za-z_][A-Za-z0-9_]*+ | :: )++ # actual name\n |\n (?:(?<=operator) (?:[-*&<>=+!]+ | \\(\\) | \\[\\]))\n)\n\\s*(\\() # opening bracket",
345343
"name": "meta.initialization.c"
346344
},
347345
{
@@ -364,7 +362,7 @@
364362
"name": "punctuation.definition.parameters.c"
365363
}
366364
},
367-
"match": "(?x) (?: (?= \\s ) (?:(?<=else|new|return) | (?<!\\w)) (\\s+))?\n\t\t\t(\\b \n\t\t\t\t(?!(while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\\s*\\()(?:(?!NS)[A-Za-z_][A-Za-z0-9_]*+\\b | :: )++ # actual name\n\t\t\t)\n\t\t\t \\s*(\\()",
365+
"match": "(?x)\n(?:\n (?=\\s)\n (?:(?<=else|new|return) | (?<!\\w)) (\\s+)\n)?\n\n# Actual name\n(\n \\b\n (?!\n (while|for|do|if|else|switch|catch|enumerate|return|sizeof|r?iterate)\n \\s* \\(\n )\n (?:(?!NS)[A-Za-z_][A-Za-z0-9_]*+\\b | ::)++\n)\n\\s*(\\() # Opening bracket",
368366
"name": "meta.function-call.c"
369367
},
370368
"comments": {
@@ -436,7 +434,6 @@
436434
},
437435
"disabled": {
438436
"begin": "^\\s*#\\s*if(n?def)?\\b.*$",
439-
"comment": "eat nested preprocessor if(def)s",
440437
"end": "^\\s*#\\s*endif\\b",
441438
"patterns": [
442439
{
@@ -456,7 +453,7 @@
456453
"name": "support.function.C99.c"
457454
}
458455
},
459-
"match": "(\\s*)\\b(hypot(f|l)?|s(scanf|ystem|nprintf|ca(nf|lb(n(f|l)?|ln(f|l)?))|i(n(h(f|l)?|f|l)?|gn(al|bit))|tr(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|k|f|l(d|l)?)|error|pbrk|ftime|len|rchr|xfrm)|printf|et(jmp|vbuf|locale|buf)|qrt(f|l)?|w(scanf|printf)|rand)|n(e(arbyint(f|l)?|xt(toward(f|l)?|after(f|l)?))|an(f|l)?)|c(s(in(h(f|l)?|f|l)?|qrt(f|l)?)|cos(h(f)?|f|l)?|imag(f|l)?|t(ime|an(h(f|l)?|f|l)?)|o(s(h(f|l)?|f|l)?|nj(f|l)?|pysign(f|l)?)|p(ow(f|l)?|roj(f|l)?)|e(il(f|l)?|xp(f|l)?)|l(o(ck|g(f|l)?)|earerr)|a(sin(h(f|l)?|f|l)?|cos(h(f|l)?|f|l)?|tan(h(f|l)?|f|l)?|lloc|rg(f|l)?|bs(f|l)?)|real(f|l)?|brt(f|l)?)|t(ime|o(upper|lower)|an(h(f|l)?|f|l)?|runc(f|l)?|gamma(f|l)?|mp(nam|file))|i(s(space|n(ormal|an)|cntrl|inf|digit|u(nordered|pper)|p(unct|rint)|finite|w(space|c(ntrl|type)|digit|upper|p(unct|rint)|lower|al(num|pha)|graph|xdigit|blank)|l(ower|ess(equal|greater)?)|al(num|pha)|gr(eater(equal)?|aph)|xdigit|blank)|logb(f|l)?|max(div|abs))|di(v|fftime)|_Exit|unget(c|wc)|p(ow(f|l)?|ut(s|c(har)?|wc(har)?)|error|rintf)|e(rf(c(f|l)?|f|l)?|x(it|p(2(f|l)?|f|l|m1(f|l)?)?))|v(s(scanf|nprintf|canf|printf|w(scanf|printf))|printf|f(scanf|printf|w(scanf|printf))|w(scanf|printf)|a_(start|copy|end|arg))|qsort|f(s(canf|e(tpos|ek))|close|tell|open|dim(f|l)?|p(classify|ut(s|c|w(s|c))|rintf)|e(holdexcept|set(e(nv|xceptflag)|round)|clearexcept|testexcept|of|updateenv|r(aiseexcept|ror)|get(e(nv|xceptflag)|round))|flush|w(scanf|ide|printf|rite)|loor(f|l)?|abs(f|l)?|get(s|c|pos|w(s|c))|re(open|e|ad|xp(f|l)?)|m(in(f|l)?|od(f|l)?|a(f|l|x(f|l)?)?))|l(d(iv|exp(f|l)?)|o(ngjmp|cal(time|econv)|g(1(p(f|l)?|0(f|l)?)|2(f|l)?|f|l|b(f|l)?)?)|abs|l(div|abs|r(int(f|l)?|ound(f|l)?))|r(int(f|l)?|ound(f|l)?)|gamma(f|l)?)|w(scanf|c(s(s(tr|pn)|nc(py|at|mp)|c(spn|hr|oll|py|at|mp)|to(imax|d|u(l(l)?|max)|k|f|l(d|l)?|mbs)|pbrk|ftime|len|r(chr|tombs)|xfrm)|to(b|mb)|rtomb)|printf|mem(set|c(hr|py|mp)|move))|a(s(sert|ctime|in(h(f|l)?|f|l)?)|cos(h(f|l)?|f|l)?|t(o(i|f|l(l)?)|exit|an(h(f|l)?|2(f|l)?|f|l)?)|b(s|ort))|g(et(s|c(har)?|env|wc(har)?)|mtime)|r(int(f|l)?|ound(f|l)?|e(name|alloc|wind|m(ove|quo(f|l)?|ainder(f|l)?))|a(nd|ise))|b(search|towc)|m(odf(f|l)?|em(set|c(hr|py|mp)|move)|ktime|alloc|b(s(init|towcs|rtowcs)|towc|len|r(towc|len))))\\b"
456+
"match": "(?x) (\\s*) \\b\n(_Exit|(?:nearbyint|nextafter|nexttoward|netoward|nan)[fl]?|a(?:cos|sin)h?[fl]?|abort|abs|asctime|assert\n|atan(?:[h2]?[fl]?)?|atexit|ato[ifl]|atoll|bsearch|btowc|cabs[fl]?|cacos|cacos[fl]|cacosh[fl]?\n|calloc|carg[fl]?|casinh?[fl]?|catanh?[fl]?|cbrt[fl]?|ccosh?[fl]?|ceil[fl]?|cexp[fl]?|cimag[fl]?\n|clearerr|clock|clog[fl]?|conj[fl]?|copysign[fl]?|cosh?[fl]?|cpow[fl]?|cproj[fl]?|creal[fl]?\n|csinh?[fl]?|csqrt[fl]?|ctanh?[fl]?|ctime|difftime|div|erfc?[fl]?|exit|fabs[fl]?\n|exp(?:2[fl]?|[fl]|m1[fl]?)?|fclose|fdim[fl]?|fe[gs]et(?:env|exceptflag|round)|feclearexcept\n|feholdexcept|feof|feraiseexcept|ferror|fetestexcept|feupdateenv|fflush|fgetpos|fgetw?[sc]\n|floor[fl]?|fmax?[fl]?|fmin[fl]?|fmod[fl]?|fopen|fpclassify|fprintf|fputw?[sc]|fread|free|freopen\n|frexp[fl]?|fscanf|fseek|fsetpos|ftell|fwide|fwprintf|fwrite|fwscanf|genv|get[sc]|getchar|gmtime\n|gwc|gwchar|hypot[fl]?|ilogb[fl]?|imaxabs|imaxdiv|isalnum|isalpha|isblank|iscntrl|isdigit|isfinite\n|isgraph|isgreater|isgreaterequal|isinf|isless(?:equal|greater)?|isw?lower|isnan|isnormal|isw?print\n|isw?punct|isw?space|isunordered|isw?upper|iswalnum|iswalpha|iswblank|iswcntrl|iswctype|iswdigit|iswgraph\n|isw?xdigit|labs|ldexp[fl]?|ldiv|lgamma[fl]?|llabs|lldiv|llrint[fl]?|llround[fl]?|localeconv|localtime\n|log[2b]?[fl]?|log1[p0][fl]?|longjmp|lrint[fl]?|lround[fl]?|malloc|mbr?len|mbr?towc|mbsinit|mbsrtowcs\n|mbstowcs|memchr|memcmp|memcpy|memmove|memset|mktime|modf[fl]?|perror|pow[fl]?|printf|puts|putw?c(?:har)?\n|qsort|raise|rand|remainder[fl]?|realloc|remove|remquo[fl]?|rename|rewind|rint[fl]?|round[fl]?|scalbl?n[fl]?\n|scanf|setbuf|setjmp|setlocale|setvbuf|signal|signbit|sinh?[fl]?|snprintf|sprintf|sqrt[fl]?|srand|sscanf\n|strcat|strchr|strcmp|strcoll|strcpy|strcspn|strerror|strftime|strlen|strncat|strncmp|strncpy|strpbrk\n|strrchr|strspn|strstr|strto[kdf]|strtoimax|strtol[dl]?|strtoull?|strtoumax|strxfrm|swprintf|swscanf\n|system|tan|tan[fl]|tanh[fl]?|tgamma[fl]?|time|tmpfile|tmpnam|tolower|toupper|trunc[fl]?|ungetw?c|va_arg\n|va_copy|va_end|va_start|vfw?printf|vfw?scanf|vprintf|vscanf|vsnprintf|vsprintf|vsscanf|vswprintf|vswscanf\n|vwprintf|vwscanf|wcrtomb|wcscat|wcschr|wcscmp|wcscoll|wcscpy|wcscspn|wcsftime|wcslen|wcsncat|wcsncmp|wcsncpy\n|wcspbrk|wcsrchr|wcsrtombs|wcsspn|wcsstr|wcsto[dkf]|wcstoimax|wcstol[dl]?|wcstombs|wcstoull?|wcstoumax|wcsxfrm\n|wctom?b|wmem(?:set|chr|cpy|cmp|move)|wprintf|wscanf)\\b"
460457
},
461458
"line_continuation_character": {
462459
"patterns": [
@@ -834,9 +831,72 @@
834831
}
835832
]
836833
},
837-
"sizeof": {
838-
"match": "\\b(sizeof)\\b",
839-
"name": "keyword.operator.sizeof.c"
834+
"operators": {
835+
"patterns": [
836+
{
837+
"match": "(?<![\\w$])(sizeof)(?![\\w$])",
838+
"name": "keyword.operator.sizeof.c"
839+
},
840+
{
841+
"match": "--",
842+
"name": "keyword.operator.decrement.c"
843+
},
844+
{
845+
"match": "\\+\\+",
846+
"name": "keyword.operator.increment.c"
847+
},
848+
{
849+
"match": "%=|\\+=|-=|\\*=|(?<!\\()/=",
850+
"name": "keyword.operator.assignment.compound.c"
851+
},
852+
{
853+
"match": "&=|\\^=|<<=|>>=|\\|=",
854+
"name": "keyword.operator.assignment.compound.bitwise.c"
855+
},
856+
{
857+
"match": "<<|>>",
858+
"name": "keyword.operator.bitwise.shift.c"
859+
},
860+
{
861+
"match": "!=|<=|>=|==|<|>",
862+
"name": "keyword.operator.comparison.c"
863+
},
864+
{
865+
"match": "&&|!|\\|\\|",
866+
"name": "keyword.operator.logical.c"
867+
},
868+
{
869+
"match": "&|\\||\\^|~",
870+
"name": "keyword.operator.c"
871+
},
872+
{
873+
"match": "=",
874+
"name": "keyword.operator.assignment.c"
875+
},
876+
{
877+
"match": "%|\\*|/|-|\\+",
878+
"name": "keyword.operator.c"
879+
},
880+
{
881+
"begin": "\\?",
882+
"beginCaptures": {
883+
"0": {
884+
"name": "keyword.operator.ternary.c"
885+
}
886+
},
887+
"end": ":",
888+
"endCaptures": {
889+
"0": {
890+
"name": "keyword.operator.ternary.c"
891+
}
892+
},
893+
"patterns": [
894+
{
895+
"include": "$self"
896+
}
897+
]
898+
}
899+
]
840900
},
841901
"strings": {
842902
"patterns": [
@@ -894,7 +954,7 @@
894954
"string_escaped_char": {
895955
"patterns": [
896956
{
897-
"match": "\\\\(\\\\|[abefnprtv'\"?]|[0-3]\\d{,2}|[4-7]\\d?|x[a-fA-F0-9]{,2}|u[a-fA-F0-9]{,4}|U[a-fA-F0-9]{,8})",
957+
"match": "(?x)\\\\ (\n\\\\ |\n[abefnprtv'\"?] |\n[0-3]\\d{,2} |\n[4-7]\\d? |\nx[a-fA-F0-9]{,2} |\nu[a-fA-F0-9]{,4} |\nU[a-fA-F0-9]{,8} )",
898958
"name": "constant.character.escape.c"
899959
},
900960
{
@@ -906,7 +966,7 @@
906966
"string_placeholder": {
907967
"patterns": [
908968
{
909-
"match": "(?x)%\n \t\t\t\t\t\t(\\d+\\$)? # field (argument #)\n \t\t\t\t\t\t[#0\\- +']* # flags\n \t\t\t\t\t\t[,;:_]? # separator character (AltiVec)\n \t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)? # minimum field width\n \t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)? # precision\n \t\t\t\t\t\t(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\n \t\t\t\t\t\t[diouxXDOUeEfFgGaACcSspn%] # conversion type\n \t\t\t\t\t",
969+
"match": "(?x) %\n(\\d+\\$)? # field (argument #)\n[#0\\- +']* # flags\n[,;:_]? # separator character (AltiVec)\n((-?\\d+)|\\*(-?\\d+\\$)?)? # minimum field width\n(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)? # precision\n(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\n[diouxXDOUeEfFgGaACcSspn%] # conversion type",
910970
"name": "constant.other.placeholder.c"
911971
},
912972
{
@@ -916,5 +976,5 @@
916976
]
917977
}
918978
},
919-
"version": "https://github.com/atom/language-c/commit/3fe925ae573a67f67ef8cec4428939ae0997e81f"
979+
"version": "https://github.com/atom/language-c/commit/2a5fafe1d86f690b5ab2c877cea2fc6a598e001a"
920980
}

0 commit comments

Comments
 (0)