Skip to content

Commit 057bf63

Browse files
agdlagdl
committed
This fixes #4572 
1 parent 06e9981 commit 057bf63

File tree

2 files changed

+114
-110
lines changed

2 files changed

+114
-110
lines changed

‎app/src/processing/app/syntax/PdeKeywords.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,11 @@ private void fillMissingTokenType() {
148148
if (!keywordTokenTypeAsString.containsKey(keyword)) {
149149
if ("KEYWORD1".equals(oldTokenEntry.getValue())) {
150150
parseRSyntaxTextAreaTokenType("DATA_TYPE", keyword);
151-
} else {
151+
}
152+
else if ("LITERAL1".equals(oldTokenEntry.getValue())) {
153+
parseRSyntaxTextAreaTokenType("RESERVED_WORD_2", keyword);
154+
}
155+
else {
152156
parseRSyntaxTextAreaTokenType("FUNCTION", keyword);
153157
}
154158
}

‎build/shared/lib/keywords.txt

+109-109
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,119 @@
11
#FUNCTIONS COLOR #D35400 - ORANGE KEYWORD1
22
#FUNCTIONS COLOR #D35400 - ORANGE KEYWORD2
3-
#STRUCTURE COLORS #728E00 - GREEN KEYWORD3
4-
#VARIABLES COLOR #00979C - BLUE LITERAL2
3+
#STRUCTURE COLORS #728E00 - GREEN KEYWORD3
4+
#VARIABLES COLOR #00979C - BLUE LITERAL1
55

6-
# LITERAL2 specifies constants
6+
# LITERAL1 specifies constants
77

8-
HIGH LITERAL2 Constants RESERVED_WORD_2
9-
LOW LITERAL2 Constants RESERVED_WORD_2
10-
INPUT LITERAL2 Constants RESERVED_WORD_2
11-
INPUT_PULLUP LITERAL2 Constants RESERVED_WORD_2
12-
OUTPUT LITERAL2 Constants RESERVED_WORD_2
13-
DEC LITERAL2 Serial_Print RESERVED_WORD_2
14-
BIN LITERAL2 Serial_Print RESERVED_WORD_2
15-
HEX LITERAL2 Serial_Print RESERVED_WORD_2
16-
OCT LITERAL2 Serial_Print RESERVED_WORD_2
17-
PI LITERAL2 RESERVED_WORD_2
18-
HALF_PI LITERAL2 RESERVED_WORD_2
19-
TWO_PI LITERAL2 RESERVED_WORD_2
20-
LSBFIRST LITERAL2 ShiftOut RESERVED_WORD_2
21-
MSBFIRST LITERAL2 ShiftOut RESERVED_WORD_2
22-
CHANGE LITERAL2 AttachInterrupt RESERVED_WORD_2
23-
FALLING LITERAL2 AttachInterrupt RESERVED_WORD_2
24-
RISING LITERAL2 AttachInterrupt RESERVED_WORD_2
25-
DEFAULT LITERAL2 AnalogReference RESERVED_WORD_2
26-
EXTERNAL LITERAL2 AnalogReference RESERVED_WORD_2
27-
INTERNAL LITERAL2 AnalogReference RESERVED_WORD_2
28-
INTERNAL1V1 LITERAL2 AnalogReference RESERVED_WORD_2
29-
INTERNAL2V56 LITERAL2 AnalogReference RESERVED_WORD_2
30-
LED_BUILTIN LITERAL2 Constants RESERVED_WORD_2
31-
LED_BUILTIN_RX LITERAL2 Constants RESERVED_WORD_2
32-
LED_BUILTIN_TX LITERAL2 Constants RESERVED_WORD_2
8+
HIGH LITERAL1 Constants RESERVED_WORD_2
9+
LOW LITERAL1 Constants RESERVED_WORD_2
10+
INPUT LITERAL1 Constants RESERVED_WORD_2
11+
INPUT_PULLUP LITERAL1 Constants RESERVED_WORD_2
12+
OUTPUT LITERAL1 Constants RESERVED_WORD_2
13+
DEC LITERAL1 Serial_Print RESERVED_WORD_2
14+
BIN LITERAL1 Serial_Print RESERVED_WORD_2
15+
HEX LITERAL1 Serial_Print RESERVED_WORD_2
16+
OCT LITERAL1 Serial_Print RESERVED_WORD_2
17+
PI LITERAL1 RESERVED_WORD_2
18+
HALF_PI LITERAL1 RESERVED_WORD_2
19+
TWO_PI LITERAL1 RESERVED_WORD_2
20+
LSBFIRST LITERAL1 ShiftOut RESERVED_WORD_2
21+
MSBFIRST LITERAL1 ShiftOut RESERVED_WORD_2
22+
CHANGE LITERAL1 AttachInterrupt RESERVED_WORD_2
23+
FALLING LITERAL1 AttachInterrupt RESERVED_WORD_2
24+
RISING LITERAL1 AttachInterrupt RESERVED_WORD_2
25+
DEFAULT LITERAL1 AnalogReference RESERVED_WORD_2
26+
EXTERNAL LITERAL1 AnalogReference RESERVED_WORD_2
27+
INTERNAL LITERAL1 AnalogReference RESERVED_WORD_2
28+
INTERNAL1V1 LITERAL1 AnalogReference RESERVED_WORD_2
29+
INTERNAL2V56 LITERAL1 AnalogReference RESERVED_WORD_2
30+
LED_BUILTIN LITERAL1 Constants RESERVED_WORD_2
31+
LED_BUILTIN_RX LITERAL1 Constants RESERVED_WORD_2
32+
LED_BUILTIN_TX LITERAL1 Constants RESERVED_WORD_2
3333

34-
DIGITAL_MESSAGE LITERAL2 Constants RESERVED_WORD_2
35-
FIRMATA_STRING LITERAL2 Constants RESERVED_WORD_2
36-
ANALOG_MESSAGE LITERAL2 Constants RESERVED_WORD_2
37-
REPORT_DIGITAL LITERAL2 Constants RESERVED_WORD_2
38-
REPORT_ANALOG LITERAL2 Constants RESERVED_WORD_2
39-
SET_PIN_MODE LITERAL2 Constants RESERVED_WORD_2
40-
SYSTEM_RESET LITERAL2 Constants RESERVED_WORD_2
41-
SYSEX_START LITERAL2 Constants RESERVED_WORD_2
34+
DIGITAL_MESSAGE LITERAL1 Constants RESERVED_WORD_2
35+
FIRMATA_STRING LITERAL1 Constants RESERVED_WORD_2
36+
ANALOG_MESSAGE LITERAL1 Constants RESERVED_WORD_2
37+
REPORT_DIGITAL LITERAL1 Constants RESERVED_WORD_2
38+
REPORT_ANALOG LITERAL1 Constants RESERVED_WORD_2
39+
SET_PIN_MODE LITERAL1 Constants RESERVED_WORD_2
40+
SYSTEM_RESET LITERAL1 Constants RESERVED_WORD_2
41+
SYSEX_START LITERAL1 Constants RESERVED_WORD_2
4242

43-
auto LITERAL2 RESERVED_WORD_2
44-
int8_t LITERAL2 RESERVED_WORD_2
45-
int16_t LITERAL2 RESERVED_WORD_2
46-
int32_t LITERAL2 RESERVED_WORD_2
47-
int64_t LITERAL2 RESERVED_WORD_2
48-
uint8_t LITERAL2 RESERVED_WORD_2
49-
uint16_t LITERAL2 RESERVED_WORD_2
50-
uint32_t LITERAL2 RESERVED_WORD_2
51-
uint64_t LITERAL2 RESERVED_WORD_2
43+
auto LITERAL1 RESERVED_WORD_2
44+
int8_t LITERAL1 RESERVED_WORD_2
45+
int16_t LITERAL1 RESERVED_WORD_2
46+
int32_t LITERAL1 RESERVED_WORD_2
47+
int64_t LITERAL1 RESERVED_WORD_2
48+
uint8_t LITERAL1 RESERVED_WORD_2
49+
uint16_t LITERAL1 RESERVED_WORD_2
50+
uint32_t LITERAL1 RESERVED_WORD_2
51+
uint64_t LITERAL1 RESERVED_WORD_2
5252

53-
char16_t LITERAL2 RESERVED_WORD_2
54-
char32_t LITERAL2 RESERVED_WORD_2
55-
operator LITERAL2 RESERVED_WORD_2
56-
enum LITERAL2 RESERVED_WORD_2
57-
delete LITERAL2 RESERVED_WORD_2
58-
bool LITERAL2 RESERVED_WORD_2
59-
boolean LITERAL2 BooleanVariables RESERVED_WORD_2
60-
byte LITERAL2 Byte RESERVED_WORD_2
61-
char LITERAL2 Char RESERVED_WORD_2
62-
const LITERAL2 Const RESERVED_WORD_2
63-
false LITERAL2 Constants LITERAL_BOOLEAN
64-
float LITERAL2 Float RESERVED_WORD_2
65-
double LITERAL2 RESERVED_WORD_2
66-
null LITERAL2 RESERVED_WORD_2
67-
NULL LITERAL2 RESERVED_WORD_2
68-
int LITERAL2 Int RESERVED_WORD_2
69-
long LITERAL2 Long RESERVED_WORD_2
70-
new LITERAL2 RESERVED_WORD_2
71-
private LITERAL2 RESERVED_WORD_2
72-
protected LITERAL2 RESERVED_WORD_2
73-
public LITERAL2 RESERVED_WORD_2
74-
short LITERAL2 RESERVED_WORD_2
75-
signed LITERAL2 RESERVED_WORD_2
76-
static LITERAL2 Static RESERVED_WORD_2
77-
volatile LITERAL2 Volatile RESERVED_WORD_2
78-
String LITERAL2 String RESERVED_WORD_2
79-
string LITERAL2 string RESERVED_WORD_2
80-
void LITERAL2 Void RESERVED_WORD_2
81-
true LITERAL2 LITERAL_BOOLEAN
82-
unsigned LITERAL2 RESERVED_WORD_2
83-
word LITERAL2 RESERVED_WORD_2
84-
array LITERAL2 Constants RESERVED_WORD_2
85-
sizeof LITERAL2 Constants RESERVED_WORD_2
86-
dynamic_cast LITERAL2 Constants RESERVED_WORD_2
87-
typedef LITERAL2 Constants RESERVED_WORD_2
88-
const_cast LITERAL2 Constants RESERVED_WORD_2
89-
struct LITERAL2 Constants RESERVED_WORD_2
90-
static_cast LITERAL2 Constants RESERVED_WORD_2
91-
union LITERAL2 Constants RESERVED_WORD_2
92-
friend LITERAL2 Constants RESERVED_WORD_2
93-
extern LITERAL2 Constants RESERVED_WORD_2
94-
class LITERAL2 Constants RESERVED_WORD_2
95-
reinterpret_cast LITERAL2 Constants RESERVED_WORD_2
96-
register LITERAL2 Constants RESERVED_WORD_2
97-
explicit LITERAL2 Constants RESERVED_WORD_2
98-
inline LITERAL2 Constants RESERVED_WORD_2
99-
_Bool LITERAL2 Constants RESERVED_WORD_2
100-
complex LITERAL2 Constants RESERVED_WORD_2
101-
_Complex LITERAL2 Constants RESERVED_WORD_2
102-
_Imaginary LITERAL2 Constants RESERVED_WORD_2
103-
atomic_bool LITERAL2 Constants RESERVED_WORD_2
104-
atomic_char LITERAL2 Constants RESERVED_WORD_2
105-
atomic_schar LITERAL2 Constants RESERVED_WORD_2
106-
atomic_uchar LITERAL2 Constants RESERVED_WORD_2
107-
atomic_short LITERAL2 Constants RESERVED_WORD_2
108-
atomic_ushort LITERAL2 Constants RESERVED_WORD_2
109-
atomic_int LITERAL2 Constants RESERVED_WORD_2
110-
atomic_uint LITERAL2 Constants RESERVED_WORD_2
111-
atomic_long LITERAL2 Constants RESERVED_WORD_2
112-
atomic_ulong LITERAL2 Constants RESERVED_WORD_2
113-
atomic_llong LITERAL2 Constants RESERVED_WORD_2
114-
atomic_ullong LITERAL2 Constants RESERVED_WORD_2
115-
virtual LITERAL2 Constants RESERVED_WORD_2
116-
PROGMEM LITERAL2 Constants RESERVED_WORD_2
53+
char16_t LITERAL1 RESERVED_WORD_2
54+
char32_t LITERAL1 RESERVED_WORD_2
55+
operator LITERAL1 RESERVED_WORD_2
56+
enum LITERAL1 RESERVED_WORD_2
57+
delete LITERAL1 RESERVED_WORD_2
58+
bool LITERAL1 RESERVED_WORD_2
59+
boolean LITERAL1 BooleanVariables RESERVED_WORD_2
60+
byte LITERAL1 Byte RESERVED_WORD_2
61+
char LITERAL1 Char RESERVED_WORD_2
62+
const LITERAL1 Const RESERVED_WORD_2
63+
false LITERAL1 Constants LITERAL_BOOLEAN
64+
float LITERAL1 Float RESERVED_WORD_2
65+
double LITERAL1 RESERVED_WORD_2
66+
null LITERAL1 RESERVED_WORD_2
67+
NULL LITERAL1 RESERVED_WORD_2
68+
int LITERAL1 Int RESERVED_WORD_2
69+
long LITERAL1 Long RESERVED_WORD_2
70+
new LITERAL1 RESERVED_WORD_2
71+
private LITERAL1 RESERVED_WORD_2
72+
protected LITERAL1 RESERVED_WORD_2
73+
public LITERAL1 RESERVED_WORD_2
74+
short LITERAL1 RESERVED_WORD_2
75+
signed LITERAL1 RESERVED_WORD_2
76+
static LITERAL1 Static RESERVED_WORD_2
77+
volatile LITERAL1 Volatile RESERVED_WORD_2
78+
String LITERAL1 String RESERVED_WORD_2
79+
string LITERAL1 string RESERVED_WORD_2
80+
void LITERAL1 Void RESERVED_WORD_2
81+
true LITERAL1 LITERAL_BOOLEAN
82+
unsigned LITERAL1 RESERVED_WORD_2
83+
word LITERAL1 RESERVED_WORD_2
84+
array LITERAL1 Constants RESERVED_WORD_2
85+
sizeof LITERAL1 Constants RESERVED_WORD_2
86+
dynamic_cast LITERAL1 Constants RESERVED_WORD_2
87+
typedef LITERAL1 Constants RESERVED_WORD_2
88+
const_cast LITERAL1 Constants RESERVED_WORD_2
89+
struct LITERAL1 Constants RESERVED_WORD_2
90+
static_cast LITERAL1 Constants RESERVED_WORD_2
91+
union LITERAL1 Constants RESERVED_WORD_2
92+
friend LITERAL1 Constants RESERVED_WORD_2
93+
extern LITERAL1 Constants RESERVED_WORD_2
94+
class LITERAL1 Constants RESERVED_WORD_2
95+
reinterpret_cast LITERAL1 Constants RESERVED_WORD_2
96+
register LITERAL1 Constants RESERVED_WORD_2
97+
explicit LITERAL1 Constants RESERVED_WORD_2
98+
inline LITERAL1 Constants RESERVED_WORD_2
99+
_Bool LITERAL1 Constants RESERVED_WORD_2
100+
complex LITERAL1 Constants RESERVED_WORD_2
101+
_Complex LITERAL1 Constants RESERVED_WORD_2
102+
_Imaginary LITERAL1 Constants RESERVED_WORD_2
103+
atomic_bool LITERAL1 Constants RESERVED_WORD_2
104+
atomic_char LITERAL1 Constants RESERVED_WORD_2
105+
atomic_schar LITERAL1 Constants RESERVED_WORD_2
106+
atomic_uchar LITERAL1 Constants RESERVED_WORD_2
107+
atomic_short LITERAL1 Constants RESERVED_WORD_2
108+
atomic_ushort LITERAL1 Constants RESERVED_WORD_2
109+
atomic_int LITERAL1 Constants RESERVED_WORD_2
110+
atomic_uint LITERAL1 Constants RESERVED_WORD_2
111+
atomic_long LITERAL1 Constants RESERVED_WORD_2
112+
atomic_ulong LITERAL1 Constants RESERVED_WORD_2
113+
atomic_llong LITERAL1 Constants RESERVED_WORD_2
114+
atomic_ullong LITERAL1 Constants RESERVED_WORD_2
115+
virtual LITERAL1 Constants RESERVED_WORD_2
116+
PROGMEM LITERAL1 Constants RESERVED_WORD_2
117117

118118
# KEYWORD2 specifies methods and functions
119119

0 commit comments

Comments
 (0)