1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00

Restoring keyword.txt loading and parsing. Added token type identifiers and related style in theme.txt

This commit is contained in:
Federico Fissore
2015-04-27 17:23:44 +02:00
parent 5eca70b1d0
commit 9ebe916fac
12 changed files with 474 additions and 410 deletions

View File

@ -5,57 +5,57 @@
# LITERAL2 specifies constants
HIGH LITERAL2 Constants
LOW LITERAL2 Constants
INPUT LITERAL2 Constants
INPUT_PULLUP LITERAL2 Constants
OUTPUT LITERAL2 Constants
DEC LITERAL2 Serial_Print
BIN LITERAL2 Serial_Print
HEX LITERAL2 Serial_Print
OCT LITERAL2 Serial_Print
PI LITERAL2
HALF_PI LITERAL2
TWO_PI LITERAL2
LSBFIRST LITERAL2 ShiftOut
MSBFIRST LITERAL2 ShiftOut
CHANGE LITERAL2 AttachInterrupt
FALLING LITERAL2 AttachInterrupt
RISING LITERAL2 AttachInterrupt
DEFAULT LITERAL2 AnalogReference
EXTERNAL LITERAL2 AnalogReference
INTERNAL LITERAL2 AnalogReference
INTERNAL1V1 LITERAL2 AnalogReference
INTERNAL2V56 LITERAL2 AnalogReference
HIGH LITERAL2 Constants RESERVED_WORD_2
LOW LITERAL2 Constants RESERVED_WORD_2
INPUT LITERAL2 Constants RESERVED_WORD_2
INPUT_PULLUP LITERAL2 Constants RESERVED_WORD_2
OUTPUT LITERAL2 Constants RESERVED_WORD_2
DEC LITERAL2 Serial_Print RESERVED_WORD_2
BIN LITERAL2 Serial_Print RESERVED_WORD_2
HEX LITERAL2 Serial_Print RESERVED_WORD_2
OCT LITERAL2 Serial_Print RESERVED_WORD_2
PI LITERAL2 RESERVED_WORD_2
HALF_PI LITERAL2 RESERVED_WORD_2
TWO_PI LITERAL2 RESERVED_WORD_2
LSBFIRST LITERAL2 ShiftOut RESERVED_WORD_2
MSBFIRST LITERAL2 ShiftOut RESERVED_WORD_2
CHANGE LITERAL2 AttachInterrupt RESERVED_WORD_2
FALLING LITERAL2 AttachInterrupt RESERVED_WORD_2
RISING LITERAL2 AttachInterrupt RESERVED_WORD_2
DEFAULT LITERAL2 AnalogReference RESERVED_WORD_2
EXTERNAL LITERAL2 AnalogReference RESERVED_WORD_2
INTERNAL LITERAL2 AnalogReference RESERVED_WORD_2
INTERNAL1V1 LITERAL2 AnalogReference RESERVED_WORD_2
INTERNAL2V56 LITERAL2 AnalogReference RESERVED_WORD_2
boolean LITERAL2 BooleanVariables
byte LITERAL2 Byte
char LITERAL2 Char
const LITERAL2 Const
false LITERAL2 Constants
float LITERAL2 Float
null LITERAL2
int LITERAL2 Int
long LITERAL2 Long
new LITERAL2
private LITERAL2
protected LITERAL2
public LITERAL2
short LITERAL2
signed LITERAL2
static LITERAL2 Static
String LITERAL2 String
void LITERAL2 Void
true LITERAL2
unsigned LITERAL2
boolean LITERAL2 BooleanVariables RESERVED_WORD_2
byte LITERAL2 Byte RESERVED_WORD_2
char LITERAL2 Char RESERVED_WORD_2
const LITERAL2 Const RESERVED_WORD_2
false LITERAL2 Constants LITERAL_BOOLEAN
float LITERAL2 Float RESERVED_WORD_2
null LITERAL2 RESERVED_WORD_2
int LITERAL2 Int RESERVED_WORD_2
long LITERAL2 Long RESERVED_WORD_2
new LITERAL2 RESERVED_WORD_2
private LITERAL2 RESERVED_WORD_2
protected LITERAL2 RESERVED_WORD_2
public LITERAL2 RESERVED_WORD_2
short LITERAL2 RESERVED_WORD_2
signed LITERAL2 RESERVED_WORD_2
static LITERAL2 Static RESERVED_WORD_2
String LITERAL2 String RESERVED_WORD_2
void LITERAL2 Void RESERVED_WORD_2
true LITERAL2 LITERAL_BOOLEAN
unsigned LITERAL2 RESERVED_WORD_2
boolean LITERAL2 boolean_
byte LITERAL2 byte_
char LITERAL2 char_
float LITERAL2 float_
int LITERAL2 int_
long LITERAL2 long_
word LITERAL2 word_
boolean LITERAL2 boolean_ RESERVED_WORD_2
byte LITERAL2 byte_ RESERVED_WORD_2
char LITERAL2 char_ RESERVED_WORD_2
float LITERAL2 float_ RESERVED_WORD_2
int LITERAL2 int_ RESERVED_WORD_2
long LITERAL2 long_ RESERVED_WORD_2
word LITERAL2 word_ RESERVED_WORD_2
# KEYWORD2 specifies methods and functions
@ -113,11 +113,11 @@ shiftOut KEYWORD2 ShiftOut
tone KEYWORD2 Tone
yield KEYWORD2 Yield
Serial KEYWORD1 Serial
Serial1 KEYWORD1 Serial
Serial2 KEYWORD1 Serial
Serial3 KEYWORD1 Serial
SerialUSB KEYWORD1 Serial
Serial KEYWORD1 Serial DATA_TYPE
Serial1 KEYWORD1 Serial DATA_TYPE
Serial2 KEYWORD1 Serial DATA_TYPE
Serial3 KEYWORD1 Serial DATA_TYPE
SerialUSB KEYWORD1 Serial DATA_TYPE
begin KEYWORD2 Serial_Begin
end KEYWORD2 Serial_End
peek KEYWORD2 Serial_Peek
@ -156,8 +156,8 @@ substring KEYWORD2
toCharArray KEYWORD2
toInt KEYWORD2
Keyboard KEYWORD1
Mouse KEYWORD1
Keyboard KEYWORD1 DATA_TYPE
Mouse KEYWORD1 DATA_TYPE
press KEYWORD2
release KEYWORD2
releaseAll KEYWORD2
@ -168,28 +168,28 @@ isPressed KEYWORD2
# KEYWORD3 specifies structures
break KEYWORD3 Break
case KEYWORD3 SwitchCase
class KEYWORD3
continue KEYWORD3 Continue
default KEYWORD3 SwitchCase
do KEYWORD3 DoWhile
double KEYWORD3 Double
else KEYWORD3 Else
for KEYWORD3 For
if KEYWORD3 If
register KEYWORD3
return KEYWORD3 Return
break KEYWORD3 Break RESERVED_WORD
case KEYWORD3 SwitchCase RESERVED_WORD
class KEYWORD3 RESERVED_WORD
continue KEYWORD3 Continue RESERVED_WORD
default KEYWORD3 SwitchCase RESERVED_WORD
do KEYWORD3 DoWhile RESERVED_WORD
double KEYWORD3 Double RESERVED_WORD
else KEYWORD3 Else RESERVED_WORD
for KEYWORD3 For RESERVED_WORD
if KEYWORD3 If RESERVED_WORD
register KEYWORD3 RESERVED_WORD
return KEYWORD3 Return RESERVED_WORD
switch KEYWORD3 SwitchCase
this KEYWORD3
throw KEYWORD3
try KEYWORD3
while KEYWORD3 While
word KEYWORD3 Word
switch KEYWORD3 SwitchCase RESERVED_WORD
this KEYWORD3 RESERVED_WORD
throw KEYWORD3 RESERVED_WORD
try KEYWORD3 RESERVED_WORD
while KEYWORD3 While RESERVED_WORD
word KEYWORD3 Word RESERVED_WORD
setup KEYWORD3 Setup
loop KEYWORD3 Loop
setup KEYWORD3 Setup RESERVED_WORD
loop KEYWORD3 Loop RESERVED_WORD
# operators aren't highlighted, but may have documentation
@ -199,15 +199,15 @@ loop KEYWORD3 Loop
= assign
& BitwiseAnd
| BitwiseAnd
,
,
// Comments
?:
?:
{} Braces
-- Increment
/ Arithmetic
/* Comments
. dot
==
==
< greaterthan
<= greaterthanorequalto
++ Increment

View File

@ -18,7 +18,7 @@
<marginLine fg="b0b4b9"/>
<markAllHighlight color="ffc800"/>
<markOccurrencesHighlight color="d4d4d4" border="false"/>
<matchedBracket fg="000080" bg="eaeaff" highlightBoth="false" animate="true"/>
<matchedBracket fg="000080" bg="ffffff" highlightBoth="false" animate="true"/>
<hyperlinks fg="0000ff"/>
<secondaryLanguages>
<language index="1" bg="fff0cc"/>
@ -40,7 +40,7 @@
<style token="VARIABLE" fg="cc6600" bold="true"/>
<style token="RESERVED_WORD" fg="024f8b" bold="true"/>
<style token="RESERVED_WORD_2" fg="008080" bold="false"/>
<style token="PREPROCESSOR" fg="024f8b" bold="false"/>
<style token="PREPROCESSOR" fg="000000" bold="false"/>
<style token="ANNOTATION" fg="808080"/>
<style token="COMMENT_DOCUMENTATION" fg="7e7e7e"/>
@ -48,13 +48,13 @@
<style token="COMMENT_MULTILINE" fg="7e7e7e"/>
<style token="COMMENT_KEYWORD" fg="7F9FBF" bold="true"/>
<style token="COMMENT_MARKUP" fg="7f7f9f"/>
<style token="LITERAL_BOOLEAN" fg="ff0000" bold="false"/>
<style token="LITERAL_NUMBER_DECIMAL_INT" fg="ff0000"/>
<style token="LITERAL_NUMBER_FLOAT" fg="ff0000"/>
<style token="LITERAL_NUMBER_HEXADECIMAL" fg="ff0000"/>
<style token="LITERAL_BOOLEAN" fg="000000" bold="false"/>
<style token="LITERAL_NUMBER_DECIMAL_INT" fg="000000"/>
<style token="LITERAL_NUMBER_FLOAT" fg="000000"/>
<style token="LITERAL_NUMBER_HEXADECIMAL" fg="000000"/>
<style token="LITERAL_STRING_DOUBLE_QUOTE" fg="006699"/>
<style token="LITERAL_CHAR" fg="DC009C"/>
<style token="LITERAL_BACKQUOTE" fg="DC009C"/>
<style token="LITERAL_CHAR" fg="006699"/>
<style token="LITERAL_BACKQUOTE" fg="000000"/>
<style token="OPERATOR" fg="804040"/>
<style token="REGEX" fg="008040"/>

View File

@ -77,12 +77,15 @@ editor.brackethighlight.color = #006699
# FUNCTIONS
editor.keyword1.style = #d35400,bold
editor.data_type.style = #d35400,bold
# METHODS
editor.keyword2.style = #D35400,plain
editor.function.style = #d35400,plain
# STRUCTURES
editor.keyword3.style = #5E6D03,plain
editor.reserved_word.style = #5E6D03,plain
# TEXT - LITERALS
@ -92,6 +95,10 @@ editor.literal1.style = #006699,plain
# p5 built in variables: e.g. mouseX, width, pixels
editor.literal2.style = #00979C,plain
editor.variable.style = #00979C,plain
editor.reserved_word_2.style = #00979C,plain
editor.literal_char.style = #00979C,plain
editor.literal_string_double_quote.style = #00979C,plain
# http://arduino.cc/
editor.url.style = #0000ff,underlined