Skip to content

Commit

Permalink
[C] Add support for decimal floating-point types
Browse files Browse the repository at this point in the history 
This was introduced in C23 and adds support for the new type
keywords, the new suffixes for the new types, and the new
length modifiers for printf and scanf.

Furthermore, the existing matching rules for floats was changed
to remove the possibility of '1f' being classified as a floating
point literal. This is actually considered to be an integral
literal with an invalid suffix instead of a floating point literal
by all compilers that I know of and such produces compiler errors
if such code is compiled.
  • Loading branch information
James Buren committed Nov 10, 2024
1 parent beeb734 commit 0dbaaed
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 22 deletions.
32 changes: 14 additions & 18 deletions C++/C.sublime-syntax
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@ variables:
oct_suffix: '[8-9g-zG-Z_][[:alnum:]_]*'
dec_suffix: '[a-zA-Z_][[:alnum:]_]*'
hex_suffix: '[g-zG-Z_][[:alnum:]_]*'
double_suffix: '[fFlL]'
float_suffix: '[fF]'
double_suffix: 'df|DF|dd|DD|dl|DL|[fFlL]'
integer_suffix: 'u?wb|[lL]{1,2}[uU]?|[uU][lL]{0,2}'

identifier: \b[[:alpha:]_][[:alnum:]_]*\b # upper and lowercase
macro_identifier: \b[[:upper:]_][[:upper:][:digit:]_]{2,}\b # only uppercase, at least 3 chars
control_keywords: 'break|case|continue|default|do|else|for|goto|if|_Pragma|return|switch|while'
basic_types: 'asm|__asm__|auto|bool|_Bool|char|_Complex|double|float|_Imaginary|int|long|short|signed|unsigned|void'
basic_types: 'asm|__asm__|auto|bool|_Bool|char|_Complex|double|float|_Imaginary|_Decimal(32|64|128)|int|long|short|signed|unsigned|void'
before_tag: 'struct|union|enum'
microsoft_types: '__int8|__int16|__int32|__int64'
windows_types: 'APIENTRY|ATOM|BOOL|BOOLEAN|BYTE|CALLBACK|CCHAR|CHAR|COLORREF|CONST|DWORD|DWORDLONG|DWORD_PTR|DWORD32|DWORD64|FLOAT|HACCEL|HALF_PTR|HANDLE|HBITMAP|HBRUSH|HCOLORSPACE|HCONV|HCONVLIST|HCURSOR|HDC|HDDEDATA|HDESK|HDROP|HDWP|HENHMETAFILE|HFILE|HFONT|HGDIOBJ|HGLOBAL|HHOOK|HICON|HINSTANCE|HKEY|HKL|HLOCAL|HMENU|HMETAFILE|HMODULE|HMONITOR|HPALETTE|HPEN|HRESULT|HRGN|HRSRC|HSZ|HWINSTA|HWND|INT|INT_PTR|INT8|INT16|INT32|INT64|LANGID|LCID|LCTYPE|LGRPID|LONG|LONGLONG|LONG_PTR|LONG32|LONG64|LPARAM|LPBOOL|LPBYTE|LPCOLORREF|LPCSTR|LPCTSTR|LPCVOID|LPCWSTR|LPDWORD|LPHANDLE|LPINT|LPLONG|LPSTR|LPTSTR|LPVOID|LPWORD|LPWSTR|LRESULT|PBOOL|PBOOLEAN|PBYTE|PCHAR|PCSTR|PCTSTR|PCWSTR|PDWORD|PDWORDLONG|PDWORD_PTR|PDWORD32|PDWORD64|PFLOAT|PHALF_PTR|PHANDLE|PHKEY|PINT|PINT_PTR|PINT8|PINT16|PINT32|PINT64|PLCID|PLONG|PLONGLONG|PLONG_PTR|PLONG32|PLONG64|POINTER_32|POINTER_64|POINTER_SIGNED|POINTER_UNSIGNED|PSHORT|PSIZE_T|PSSIZE_T|PSTR|PTBYTE|PTCHAR|PTSTR|PUCHAR|PUHALF_PTR|PUINT|PUINT_PTR|PUINT8|PUINT16|PUINT32|PUINT64|PULONG|PULONGLONG|PULONG_PTR|PULONG32|PULONG64|PUSHORT|PVOID|PWCHAR|PWORD|PWSTR|QWORD|SC_HANDLE|SC_LOCK|SERVICE_STATUS_HANDLE|SHORT|SIZE_T|SSIZE_T|TBYTE|TCHAR|UCHAR|UHALF_PTR|UINT|UINT_PTR|UINT8|UINT16|UINT32|UINT64|ULONG|ULONGLONG|ULONG_PTR|ULONG32|ULONG64|UNICODE_STRING|USHORT|USN|VOID|WCHAR|WINAPI|WORD|WPARAM'
Expand Down Expand Up @@ -190,13 +189,13 @@ contexts:
string_placeholder:
- match: |-
(?x)%
(\d+\$)? # field (argument #)
[#0\- +']* # flags
[,;:_]? # separator character (AltiVec)
((-?\d+)|\*(-?\d+\$)?)? # minimum field width
(\.((-?\d+)|\*(-?\d+\$)?)?)? # precision
(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl|wf?[0-9]+)? # length modifier
(\[[^\]]+\]|[am]s|[diouxXbDOUeEfFgGaACcSspn%]) # conversion type
(\d+\$)? # field (argument #)
[#0\- +']* # flags
[,;:_]? # separator character (AltiVec)
((-?\d+)|\*(-?\d+\$)?)? # minimum field width
(\.((-?\d+)|\*(-?\d+\$)?)?)? # precision
(hh|h|ll|l|j|t|z|q|L|H|D|DD|vh|vl|v|hv|hl|wf?[0-9]+)? # length modifier
(\[[^\]]+\]|[am]s|[diouxXbDOUeEfFgGaACcSspn%]) # conversion type
scope: constant.other.placeholder.c
keywords:
Expand Down Expand Up @@ -321,8 +320,6 @@ contexts:
# 1e1 1e1f 1e1L
| {{dec_exponent}}
) ({{double_suffix}})?
# 1f
| ({{float_suffix}})
) ({{dec_suffix}})?
# .1, .1e1, .1e-1, .1f, .1e1f, .1e-1f, .1L, .1e1L, .1e-1L
| ( (\.) {{dec_digit}}+ {{dec_exponent}}? ) (?: ({{double_suffix}}) | ({{dec_suffix}}) )?
Expand All @@ -333,12 +330,11 @@ contexts:
2: constant.numeric.value.c
3: punctuation.separator.decimal.c
4: constant.numeric.suffix.c
5: constant.numeric.suffix.c
6: invalid.illegal.numeric.suffix.c
7: constant.numeric.value.c
8: punctuation.separator.decimal.c
9: constant.numeric.suffix.c
10: invalid.illegal.numeric.suffix.c
5: invalid.illegal.numeric.suffix.c
6: constant.numeric.value.c
7: punctuation.separator.decimal.c
8: constant.numeric.suffix.c
9: invalid.illegal.numeric.suffix.c
# hexadecimal float (C99)
- match: \b(0[xX])({{hex_digit}}*(\.){{hex_digit}}*{{hex_exponent}})(?:([fFlL]\b)|({{dec_suffix}}))?
Expand Down
12 changes: 10 additions & 2 deletions C++/syntax_test_c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,15 @@ bool still_C_code_here = true;
/* <- storage.type */
/* ^ constant.language */

_Decimal32 d32;
/* <- storage.type */

_Decimal64 d64;
/* <- storage.type */

_Decimal128 d128;
/* <- storage.type */

complex complex_t_var;
/* <- support.type.complex */

Expand Down Expand Up @@ -1112,9 +1121,8 @@ dec1 = 1234567890;
/* ^ punctuation.terminator - constant */

dec2 = 1234567890f;
/* ^^^^^^^^^^^ meta.number.float.decimal.c */
/* ^^^^^^^^^^ constant.numeric.value.c */
/* ^ constant.numeric.suffix.c */
/* ^ invalid.illegal.numeric.suffix.c */
/* ^ punctuation.terminator - constant */

dec3 = 1234567890L;
Expand Down
3 changes: 1 addition & 2 deletions Objective-C/syntax_test_objc.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -868,9 +868,8 @@ - (void)debugOutput:(NSString *)format, ... NS_FORMAT_FUNCTION(1,2)
/* ^ punctuation.terminator - constant */
dec2 = 1234567890f;
/* ^^^^^^^^^^^ meta.number.float.decimal.c */
/* ^^^^^^^^^^ constant.numeric.value.c */
/* ^ constant.numeric.suffix.c */
/* ^ invalid.illegal.numeric.suffix.c */
/* ^ punctuation.terminator - constant */
dec3 = 1234567890L;
Expand Down

0 comments on commit 0dbaaed

Please sign in to comment.