Fixes and updates

This commit is contained in:
Nico committed 2021-03-07 15:22:55 +01:00
1 parent d1710ea6a5
commit fb4da77359
211 files changed
+45363 -45571

No files matched your search

@@ -22,16 +22,15 @@ import org.fife.ui.rsyntaxtextarea.TokenImpl;
*
* This implementation was created using
* <a href="http://www.jflex.de/">JFlex</a> 1.4.1; however, the generated file
* was modified for performance. Memory allocation needs to be almost
* completely removed to be competitive with the handwritten lexers (subclasses
* of <code>AbstractTokenMaker</code>, so this class has been modified so that
* was modified for performance. Memory allocation needs to be almost completely
* removed to be competitive with the handwritten lexers (subclasses of
* <code>AbstractTokenMaker</code>, so this class has been modified so that
* Strings are never allocated (via yytext()), and the scanner never has to
* worry about refilling its buffer (needlessly copying chars around).
* We can achieve this because RText always scans exactly 1 line of tokens at a
* time, and hands the scanner this line as an array of characters (a Segment
* really). Since tokens contain pointers to char arrays instead of Strings
* holding their contents, there is no need for allocating new memory for
* Strings.
* worry about refilling its buffer (needlessly copying chars around). We can
* achieve this because RText always scans exactly 1 line of tokens at a time,
* and hands the scanner this line as an array of characters (a Segment really).
* Since tokens contain pointers to char arrays instead of Strings holding their
* contents, there is no need for allocating new memory for Strings.
* <p>
*
* The actual algorithm generated for scanning has, of course, not been
@@ -40,17 +39,17 @@ import org.fife.ui.rsyntaxtextarea.TokenImpl;
*
* If you wish to regenerate this file yourself, keep in mind the following:
* <ul>
* <li>The generated <code>IniTokenMaker.java</code> file will
* contain two definitions of both <code>zzRefill</code> and
* <code>yyreset</code>. You should hand-delete the second of each
* definition (the ones generated by the lexer), as these generated
* methods modify the input buffer, which we'll never have to do.
* <li>You should also change the declaration/definition of zzBuffer to NOT
* be initialized. This is a needless memory allocation for us since we
* will be pointing the array somewhere else anyway.
* <li>The generated <code>IniTokenMaker.java</code> file will contain two
* definitions of both <code>zzRefill</code> and <code>yyreset</code>. You
* should hand-delete the second of each definition (the ones generated by the
* lexer), as these generated methods modify the input buffer, which we'll never
* have to do.
* <li>You should also change the declaration/definition of zzBuffer to NOT be
* initialized. This is a needless memory allocation for us since we will be
* pointing the array somewhere else anyway.
* <li>You should NOT call <code>yylex()</code> on the generated scanner
* directly; rather, you should use <code>getTokenList</code> as you would
* with any other <code>TokenMaker</code> instance.
* directly; rather, you should use <code>getTokenList</code> as you would with
* any other <code>TokenMaker</code> instance.
* </ul>
*
* @author Robert Futrell
@@ -58,7 +57,7 @@ import org.fife.ui.rsyntaxtextarea.TokenImpl;
*
*/
public class IniTokenMaker extends AbstractJFlexTokenMaker {
/** This character denotes the end of file */
public static final int YYEOF = -1;
/** lexical states */
@@ -67,7 +66,8 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
/**
* Translates characters to character classes
*/
private static final String ZZ_CMAP_PACKED = "\11\0\1\3\1\5\25\0\1\3\2\0\1\4\27\0\1\4\1\0" + "\1\1\35\0\1\2\1\0\1\6\uffa2\0";
private static final String ZZ_CMAP_PACKED = "\11\0\1\3\1\5\25\0\1\3\2\0\1\4\27\0\1\4\1\0"
+ "\1\1\35\0\1\2\1\0\1\6\uffa2\0";
/**
* Translates characters to character classes
*/
@@ -77,14 +77,14 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
*/
private static final int[] ZZ_ACTION = zzUnpackAction();
private static final String ZZ_ACTION_PACKED_0 = "\1\1\1\2\1\1\1\3\1\4\1\5\1\6\1\2" + "\1\7\1\4";
private static int[] zzUnpackAction() {
int[] result = new int[10];
int offset = 0;
offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
return result;
}
private static int zzUnpackAction(String packed, int offset, int[] result) {
int i = 0; /* index in packed string */
int j = offset; /* index in unpacked array */
@@ -98,20 +98,20 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
}
return j;
}
/**
* Translates a state to a row index in the transition table
*/
private static final int[] ZZ_ROWMAP = zzUnpackRowMap();
private static final String ZZ_ROWMAP_PACKED_0 = "\0\0\0\7\0\16\0\25\0\34\0\43\0\52\0\61" + "\0\25\0\25";
private static int[] zzUnpackRowMap() {
int[] result = new int[10];
int offset = 0;
offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
return result;
}
private static int zzUnpackRowMap(String packed, int offset, int[] result) {
int i = 0; /* index in packed string */
int j = offset; /* index in unpacked array */
@@ -122,21 +122,21 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
}
return j;
}
/**
* The transition table of the DFA
*/
private static final int[] ZZ_TRANS = zzUnpackTrans();
private static final String ZZ_TRANS_PACKED_0 = "\1\3\1\4\1\5\1\6\1\7\1\0\1\3\1\10" + "\1\11\1\5\1\6\1\7\1\0\1\10\1\3\5\0"
+ "\1\3\7\0\6\5\1\12\3\0\1\6\3\0\5\7" + "\1\0\1\7\1\10\5\0\1\10";
private static final String ZZ_TRANS_PACKED_0 = "\1\3\1\4\1\5\1\6\1\7\1\0\1\3\1\10"
+ "\1\11\1\5\1\6\1\7\1\0\1\10\1\3\5\0" + "\1\3\7\0\6\5\1\12\3\0\1\6\3\0\5\7" + "\1\0\1\7\1\10\5\0\1\10";
private static int[] zzUnpackTrans() {
int[] result = new int[56];
int offset = 0;
offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
return result;
}
private static int zzUnpackTrans(String packed, int offset, int[] result) {
int i = 0; /* index in packed string */
int j = offset; /* index in unpacked array */
@@ -151,7 +151,7 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
}
return j;
}
/* error codes */
private static final int ZZ_UNKNOWN_ERROR = 0;
private static final int ZZ_NO_MATCH = 1;
@@ -164,14 +164,14 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
*/
private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();
private static final String ZZ_ATTRIBUTE_PACKED_0 = "\3\1\1\11\4\1\2\11";
private static int[] zzUnpackAttribute() {
int[] result = new int[10];
int offset = 0;
offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
return result;
}
private static int zzUnpackAttribute(String packed, int offset, int[] result) {
int i = 0; /* index in packed string */
int j = offset; /* index in unpacked array */
@@ -185,7 +185,7 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
}
return j;
}
/** the input device */
private java.io.Reader zzReader;
/** the current state of the DFA */
@@ -193,8 +193,8 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
/** the current lexical state */
private int zzLexicalState = YYINITIAL;
/**
* this buffer contains the current text to be matched and is
* the source of the yytext() string
* this buffer contains the current text to be matched and is the source of the
* yytext() string
*/
private char zzBuffer[];
/** the textposition at the last accepting state */
@@ -204,64 +204,55 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
/** startRead marks the beginning of the yytext() string in the buffer */
private int zzStartRead;
/**
* endRead marks the last character in the buffer, that has been read
* from input
* endRead marks the last character in the buffer, that has been read from input
*/
private int zzEndRead;
/** zzAtEOF == true <=> the scanner is at the EOF */
private boolean zzAtEOF;
/* user code: */
/**
* Constructor. This must be here because JFlex does not generate a
* no-parameter constructor.
* Constructor. This must be here because JFlex does not generate a no-parameter
* constructor.
*/
public IniTokenMaker() {
super();
}
/**
* Adds the token specified to the current linked list of tokens.
*
* @param tokenType
* The token's type.
* @param tokenType The token's type.
*/
private void addToken(int tokenType) {
addToken(zzStartRead, zzMarkedPos - 1, tokenType);
}
/**
* Adds the token specified to the current linked list of tokens.
*
* @param tokenType
* The token's type.
* @param tokenType The token's type.
*/
private void addToken(int start, int end, int tokenType) {
int so = start + offsetShift;
addToken(zzBuffer, start, end, tokenType, so);
}
/**
* Adds the token specified to the current linked list of tokens.
*
* @param array
* The character array.
* @param start
* The starting offset in the array.
* @param end
* The ending offset in the array.
* @param tokenType
* The token's type.
* @param startOffset
* The offset in the document at which this token
* occurs.
* @param array The character array.
* @param start The starting offset in the array.
* @param end The ending offset in the array.
* @param tokenType The token's type.
* @param startOffset The offset in the document at which this token occurs.
*/
@Override
public void addToken(char[] array, int start, int end, int tokenType, int startOffset) {
super.addToken(array, start, end, tokenType, startOffset);
zzStartRead = zzMarkedPos;
}
/**
* {@inheritDoc}
*/
@@ -269,21 +260,18 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
public String[] getLineCommentStartAndEnd(int languageIndex) {
return new String[] { ";", null };
}
/**
* Returns the first token in the linked list of tokens generated
* from <code>text</code>. This method must be implemented by
* subclasses so they can correctly implement syntax highlighting.
* Returns the first token in the linked list of tokens generated from
* <code>text</code>. This method must be implemented by subclasses so they can
* correctly implement syntax highlighting.
*
* @param text
* The text from which to get tokens.
* @param initialTokenType
* The token type we should start with.
* @param startOffset
* The offset into the document at which
* <code>text</code> starts.
* @return The first <code>Token</code> in a linked list representing
* the syntax highlighted text.
* @param text The text from which to get tokens.
* @param initialTokenType The token type we should start with.
* @param startOffset The offset into the document at which
* <code>text</code> starts.
* @return The first <code>Token</code> in a linked list representing the syntax
* highlighted text.
*/
@Override
public Token getTokenList(Segment text, int initialTokenType, int startOffset) {
@@ -301,36 +289,34 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
return new TokenImpl();
}
}
/**
* Refills the input buffer.
*
* @return <code>true</code> if EOF was reached, otherwise
* <code>false</code>.
* @return <code>true</code> if EOF was reached, otherwise <code>false</code>.
*/
private boolean zzRefill() {
return zzCurrentPos >= s.offset + s.count;
}
/**
* Resets the scanner to read from a new input stream.
* Does not close the old reader.
* Resets the scanner to read from a new input stream. Does not close the old
* reader.
*
* All internal variables are reset, the old input stream
* <b>cannot</b> be reused (internal buffer is discarded and lost).
* Lexical state is set to <tt>YY_INITIAL</tt>.
* All internal variables are reset, the old input stream <b>cannot</b> be
* reused (internal buffer is discarded and lost). Lexical state is set to
* <tt>YY_INITIAL</tt>.
*
* @param reader
* the new input stream
* @param reader the new input stream
*/
public final void yyreset(Reader reader) {
// 's' has been updated.
zzBuffer = s.array;
/*
* We replaced the line below with the two below it because zzRefill
* no longer "refills" the buffer (since the way we do it, it's always
* "full" the first time through, since it points to the segment's
* array). So, we assign zzEndRead here.
* We replaced the line below with the two below it because zzRefill no longer
* "refills" the buffer (since the way we do it, it's always "full" the first
* time through, since it points to the segment's array). So, we assign
* zzEndRead here.
*/
// zzStartRead = zzEndRead = s.offset;
zzStartRead = s.offset;
@@ -340,34 +326,31 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
zzReader = reader;
zzAtEOF = false;
}
/**
* Creates a new scanner
* There is also a java.io.InputStream version of this constructor.
* Creates a new scanner There is also a java.io.InputStream version of this
* constructor.
*
* @param in
* the java.io.Reader to read input from.
* @param in the java.io.Reader to read input from.
*/
public IniTokenMaker(java.io.Reader in) {
this.zzReader = in;
}
/**
* Creates a new scanner.
* There is also java.io.Reader version of this constructor.
* Creates a new scanner. There is also java.io.Reader version of this
* constructor.
*
* @param in
* the java.io.Inputstream to read input from.
* @param in the java.io.Inputstream to read input from.
*/
public IniTokenMaker(java.io.InputStream in) {
this(new java.io.InputStreamReader(in));
}
/**
* Unpacks the compressed character translation table.
*
* @param packed
* the packed character translation table
* @param packed the packed character translation table
* @return the unpacked character translation table
*/
private static char[] zzUnpackCMap(String packed) {
@@ -383,7 +366,7 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
}
return map;
}
/**
* Closes the input stream.
*/
@@ -393,69 +376,64 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
if (zzReader != null)
zzReader.close();
}
/**
* Returns the current lexical state.
*/
public final int yystate() {
return zzLexicalState;
}
/**
* Enters a new lexical state
*
* @param newState
* the new lexical state
* @param newState the new lexical state
*/
@Override
public final void yybegin(int newState) {
zzLexicalState = newState;
}
/**
* Returns the text matched by the current regular expression.
*/
public final String yytext() {
return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead);
}
/**
* Returns the character at position <tt>pos</tt> from the
* matched text.
* Returns the character at position <tt>pos</tt> from the matched text.
*
* It is equivalent to yytext().charAt(pos), but faster
*
* @param pos
* the position of the character to fetch.
* A value from 0 to yylength()-1.
* @param pos the position of the character to fetch. A value from 0 to
* yylength()-1.
*
* @return the character at position pos
*/
public final char yycharat(int pos) {
return zzBuffer[zzStartRead + pos];
}
/**
* Returns the length of the matched text region.
*/
public final int yylength() {
return zzMarkedPos - zzStartRead;
}
/**
* Reports an error that occured while scanning.
*
* In a wellformed scanner (no or only correct usage of
* yypushback(int) and a match-all fallback rule) this method
* will only be called with things that "Can't Possibly Happen".
* If this method is called, something is seriously wrong
* (e.g. a JFlex bug producing a faulty scanner etc.).
* In a wellformed scanner (no or only correct usage of yypushback(int) and a
* match-all fallback rule) this method will only be called with things that
* "Can't Possibly Happen". If this method is called, something is seriously
* wrong (e.g. a JFlex bug producing a faulty scanner etc.).
*
* Usual syntax/scanner level error handling should be done
* in error fallback rules.
* Usual syntax/scanner level error handling should be done in error fallback
* rules.
*
* @param errorCode
* the code of the errormessage to display
* @param errorCode the code of the errormessage to display
*/
private void zzScanError(int errorCode) {
String message;
@@ -466,29 +444,27 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
}
throw new Error(message);
}
/**
* Pushes the specified amount of characters back into the input stream.
*
* They will be read again by then next call of the scanning method
*
* @param number
* the number of characters to be read again.
* This number must not be greater than yylength()!
* @param number the number of characters to be read again. This number must not
* be greater than yylength()!
*/
public void yypushback(int number) {
if (number > yylength())
zzScanError(ZZ_PUSHBACK_2BIG);
zzMarkedPos -= number;
}
/**
* Resumes scanning until the next regular expression is matched,
* the end of input is encountered or an I/O-Error occurs.
* Resumes scanning until the next regular expression is matched, the end of
* input is encountered or an I/O-Error occurs.
*
* @return the next token
* @exception java.io.IOException
* if any I/O-Error occurs
* @exception java.io.IOException if any I/O-Error occurs
*/
public org.fife.ui.rsyntaxtextarea.Token yylex() throws java.io.IOException {
int zzInput;
@@ -507,8 +483,7 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
zzAction = -1;
zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
zzState = zzLexicalState;
zzForAction:
{
zzForAction: {
while (true) {
if (zzCurrentPosL < zzEndReadL)
zzInput = zzBufferL[zzCurrentPosL++];
@@ -548,66 +523,66 @@ public class IniTokenMaker extends AbstractJFlexTokenMaker {
// store back cached position
zzMarkedPos = zzMarkedPosL;
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
case 3: {
start = zzMarkedPos;
addToken(Token.OPERATOR);
yybegin(VALUE);
}
case 8:
break;
case 2: {
addToken(Token.IDENTIFIER);
}
case 9:
break;
case 5: {
addToken(Token.WHITESPACE);
}
case 10:
break;
case 7: {
start = zzMarkedPos;
addToken(Token.OPERATOR);
}
case 11:
break;
case 6: {
addToken(Token.COMMENT_EOL);
}
case 12:
break;
case 4: {
addToken(Token.PREPROCESSOR);
}
case 13:
break;
case 1: {
addToken(Token.DATA_TYPE);
}
case 14:
break;
default:
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
zzAtEOF = true;
switch (zzLexicalState) {
case YYINITIAL: {
addNullToken();
return firstToken;
}
case 11:
break;
case VALUE: {
addNullToken();
return firstToken;
}
case 12:
break;
default:
return null;
}
} else {
zzScanError(ZZ_NO_MATCH);
case 3: {
start = zzMarkedPos;
addToken(Token.OPERATOR);
yybegin(VALUE);
}
case 8:
break;
case 2: {
addToken(Token.IDENTIFIER);
}
case 9:
break;
case 5: {
addToken(Token.WHITESPACE);
}
case 10:
break;
case 7: {
start = zzMarkedPos;
addToken(Token.OPERATOR);
}
case 11:
break;
case 6: {
addToken(Token.COMMENT_EOL);
}
case 12:
break;
case 4: {
addToken(Token.PREPROCESSOR);
}
case 13:
break;
case 1: {
addToken(Token.DATA_TYPE);
}
case 14:
break;
default:
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
zzAtEOF = true;
switch (zzLexicalState) {
case YYINITIAL: {
addNullToken();
return firstToken;
}
case 11:
break;
case VALUE: {
addNullToken();
return firstToken;
}
case 12:
break;
default:
return null;
}
} else {
zzScanError(ZZ_NO_MATCH);
}
}
}
}