mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Patch for Dave Daoust
Removed the Strings associated with constant value tokens and keywords -- it looks cleaner, and reduces the number of objects created (only by 30 to 40 K) (about 2% quicker) Buffered the File I/O associated with reading inclusions. Restructured the scanner into a large case statement with a few helper functions -- this is the start of removing the strings (or providing a preallocated buffer for string manipulation) (about 2% quicker)
This commit is contained in:
John Camelon
parent
fe5032ad4a
commit
f28275b669
3 changed files with 1260 additions and 1018 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2004-03-09 Dave Daoust
|
||||
Removed the Strings associated with constant value tokens and keywords -- it looks cleaner, and reduces the number of objects created (only by 30 to 40 K) (about 2% quicker)
|
||||
Buffered the File I/O associated with reading inclusions.
|
||||
Restructured the scanner into a large case statement with a few
|
||||
helper functions -- this is the start of removing the strings (or
|
||||
providing a preallocated buffer for string manipulation) (about 2% quicker)
|
||||
|
||||
2004-03-04 Andrew Niefer
|
||||
bug 53213 externalize strings
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -10,16 +10,31 @@
|
|||
******************************************************************************/
|
||||
package org.eclipse.cdt.internal.core.parser.token;
|
||||
|
||||
import org.eclipse.cdt.core.parser.Keywords;
|
||||
import org.eclipse.cdt.core.parser.IScanner;
|
||||
import org.eclipse.cdt.core.parser.IToken;
|
||||
import org.eclipse.cdt.internal.core.parser.scanner.*;
|
||||
|
||||
public class Token implements IToken {
|
||||
|
||||
public Token(int t, String i, IScannerContext context, int lineNumber ) {
|
||||
type = t;
|
||||
image = i;
|
||||
setType(t);
|
||||
setImage(i);
|
||||
filename = context.getFilename();
|
||||
offset = context.getOffset() - image.length() - context.undoStackSize();
|
||||
offset = context.getOffset() - getImage().length() - context.undoStackSize();
|
||||
this.lineNumber = lineNumber;
|
||||
macroOffset = context.getMacroOffset();
|
||||
macroLength = context.getMacroLength();
|
||||
|
||||
if( type == tLSTRING || type == tSTRING || type == tCHAR ){
|
||||
offset--;
|
||||
}
|
||||
}
|
||||
public Token(int t, IScannerContext context, int lineNumber ) {
|
||||
setType(t);
|
||||
setImage(null);
|
||||
filename = context.getFilename();
|
||||
offset = context.getOffset() - getImage().length() - context.undoStackSize();
|
||||
this.lineNumber = lineNumber;
|
||||
macroOffset = context.getMacroOffset();
|
||||
macroLength = context.getMacroLength();
|
||||
|
|
@ -29,21 +44,301 @@ public class Token implements IToken {
|
|||
}
|
||||
}
|
||||
|
||||
public Token(int t) {
|
||||
setType(t);
|
||||
setImage(null);
|
||||
}
|
||||
public Token(int t, String i) {
|
||||
type = t;
|
||||
image = i;
|
||||
setType(t);
|
||||
setImage(i);
|
||||
}
|
||||
|
||||
public String toString()
|
||||
{
|
||||
return "Token type=" + type + " image =" + image + " offset=" + offset; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
return "Token type=" + type + " image =" + getImage() + " offset=" + offset; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
}
|
||||
|
||||
public int type;
|
||||
public int getType() { return type; }
|
||||
|
||||
protected String image;
|
||||
public String getImage() { return image; }
|
||||
|
||||
public String getImage() {
|
||||
switch ( getType() ) {
|
||||
|
||||
case IToken.tIDENTIFIER :
|
||||
case IToken.tINTEGER :
|
||||
case IToken.tFLOATINGPT :
|
||||
case IToken.tSTRING :
|
||||
case IToken.tLSTRING :
|
||||
case IToken.tCHAR :
|
||||
case IToken.tLCHAR :
|
||||
return image;
|
||||
|
||||
case IToken.tCOLONCOLON :
|
||||
return "::" ; //$NON-NLS-1$
|
||||
case IToken.tCOLON :
|
||||
return ":" ; //$NON-NLS-1$
|
||||
case IToken.tSEMI :
|
||||
return ";" ; //$NON-NLS-1$
|
||||
case IToken.tCOMMA :
|
||||
return "," ; //$NON-NLS-1$
|
||||
case IToken.tQUESTION :
|
||||
return "?" ; //$NON-NLS-1$
|
||||
case IToken.tLPAREN :
|
||||
return "(" ; //$NON-NLS-1$
|
||||
case IToken.tRPAREN :
|
||||
return ")" ; //$NON-NLS-1$
|
||||
case IToken.tLBRACKET :
|
||||
return "[" ; //$NON-NLS-1$
|
||||
case IToken.tRBRACKET :
|
||||
return "]" ; //$NON-NLS-1$
|
||||
case IToken.tLBRACE :
|
||||
return "{" ; //$NON-NLS-1$
|
||||
case IToken.tRBRACE :
|
||||
return "}"; //$NON-NLS-1$
|
||||
case IToken.tPLUSASSIGN :
|
||||
return "+="; //$NON-NLS-1$
|
||||
case IToken.tINCR :
|
||||
return "++" ; //$NON-NLS-1$
|
||||
case IToken.tPLUS :
|
||||
return "+"; //$NON-NLS-1$
|
||||
case IToken.tMINUSASSIGN :
|
||||
return "-=" ; //$NON-NLS-1$
|
||||
case IToken.tDECR :
|
||||
return "--" ; //$NON-NLS-1$
|
||||
case IToken.tARROWSTAR :
|
||||
return "->*" ; //$NON-NLS-1$
|
||||
case IToken.tARROW :
|
||||
return "->" ; //$NON-NLS-1$
|
||||
case IToken.tMINUS :
|
||||
return "-" ; //$NON-NLS-1$
|
||||
case IToken.tSTARASSIGN :
|
||||
return "*=" ; //$NON-NLS-1$
|
||||
case IToken.tSTAR :
|
||||
return "*" ; //$NON-NLS-1$
|
||||
case IToken.tMODASSIGN :
|
||||
return "%=" ; //$NON-NLS-1$
|
||||
case IToken.tMOD :
|
||||
return "%" ; //$NON-NLS-1$
|
||||
case IToken.tXORASSIGN :
|
||||
return "^=" ; //$NON-NLS-1$
|
||||
case IToken.tXOR :
|
||||
return "^" ; //$NON-NLS-1$
|
||||
case IToken.tAMPERASSIGN :
|
||||
return "&=" ; //$NON-NLS-1$
|
||||
case IToken.tAND :
|
||||
return "&&" ; //$NON-NLS-1$
|
||||
case IToken.tAMPER :
|
||||
return "&" ; //$NON-NLS-1$
|
||||
case IToken.tBITORASSIGN :
|
||||
return "|=" ; //$NON-NLS-1$
|
||||
case IToken.tOR :
|
||||
return "||" ; //$NON-NLS-1$
|
||||
case IToken.tBITOR :
|
||||
return "|" ; //$NON-NLS-1$
|
||||
case IToken.tCOMPL :
|
||||
return "~" ; //$NON-NLS-1$
|
||||
case IToken.tNOTEQUAL :
|
||||
return "!=" ; //$NON-NLS-1$
|
||||
case IToken.tNOT :
|
||||
return "!" ; //$NON-NLS-1$
|
||||
case IToken.tEQUAL :
|
||||
return "==" ; //$NON-NLS-1$
|
||||
case IToken.tASSIGN :
|
||||
return "=" ; //$NON-NLS-1$
|
||||
case IToken.tSHIFTL :
|
||||
return "<<" ; //$NON-NLS-1$
|
||||
case IToken.tLTEQUAL :
|
||||
return "<=" ; //$NON-NLS-1$
|
||||
case IToken.tLT :
|
||||
return "<"; //$NON-NLS-1$
|
||||
case IToken.tSHIFTRASSIGN :
|
||||
return ">>=" ; //$NON-NLS-1$
|
||||
case IToken.tSHIFTR :
|
||||
return ">>" ; //$NON-NLS-1$
|
||||
case IToken.tGTEQUAL :
|
||||
return ">=" ; //$NON-NLS-1$
|
||||
case IToken.tGT :
|
||||
return ">" ; //$NON-NLS-1$
|
||||
case IToken.tSHIFTLASSIGN :
|
||||
return "<<=" ; //$NON-NLS-1$
|
||||
case IToken.tELLIPSIS :
|
||||
return "..." ; //$NON-NLS-1$
|
||||
case IToken.tDOTSTAR :
|
||||
return ".*" ; //$NON-NLS-1$
|
||||
case IToken.tDOT :
|
||||
return "." ; //$NON-NLS-1$
|
||||
case IToken.tDIVASSIGN :
|
||||
return "/=" ; //$NON-NLS-1$
|
||||
case IToken.tDIV :
|
||||
return "/" ; //$NON-NLS-1$
|
||||
case IToken.t_and :
|
||||
return Keywords.AND;
|
||||
case IToken.t_and_eq :
|
||||
return Keywords.AND_EQ ;
|
||||
case IToken.t_asm :
|
||||
return Keywords.ASM ;
|
||||
case IToken.t_auto :
|
||||
return Keywords.AUTO ;
|
||||
case IToken.t_bitand :
|
||||
return Keywords.BITAND ;
|
||||
case IToken.t_bitor :
|
||||
return Keywords.BITOR ;
|
||||
case IToken.t_bool :
|
||||
return Keywords.BOOL ;
|
||||
case IToken.t_break :
|
||||
return Keywords.BREAK ;
|
||||
case IToken.t_case :
|
||||
return Keywords.CASE ;
|
||||
case IToken.t_catch :
|
||||
return Keywords.CATCH ;
|
||||
case IToken.t_char :
|
||||
return Keywords.CHAR ;
|
||||
case IToken.t_class :
|
||||
return Keywords.CLASS ;
|
||||
case IToken.t_compl :
|
||||
return Keywords.COMPL ;
|
||||
case IToken.t_const :
|
||||
return Keywords.CONST ;
|
||||
case IToken.t_const_cast :
|
||||
return Keywords.CONST_CAST ;
|
||||
case IToken.t_continue :
|
||||
return Keywords.CONTINUE ;
|
||||
case IToken.t_default :
|
||||
return Keywords.DEFAULT ;
|
||||
case IToken.t_delete :
|
||||
return Keywords.DELETE ;
|
||||
case IToken.t_do :
|
||||
return Keywords.DO;
|
||||
case IToken.t_double :
|
||||
return Keywords.DOUBLE ;
|
||||
case IToken.t_dynamic_cast :
|
||||
return Keywords.DYNAMIC_CAST ;
|
||||
case IToken.t_else :
|
||||
return Keywords.ELSE;
|
||||
case IToken.t_enum :
|
||||
return Keywords.ENUM ;
|
||||
case IToken.t_explicit :
|
||||
return Keywords.EXPLICIT ;
|
||||
case IToken.t_export :
|
||||
return Keywords.EXPORT ;
|
||||
case IToken.t_extern :
|
||||
return Keywords.EXTERN;
|
||||
case IToken.t_false :
|
||||
return Keywords.FALSE;
|
||||
case IToken.t_float :
|
||||
return Keywords.FLOAT;
|
||||
case IToken.t_for :
|
||||
return Keywords.FOR;
|
||||
case IToken.t_friend :
|
||||
return Keywords.FRIEND;
|
||||
case IToken.t_goto :
|
||||
return Keywords.GOTO;
|
||||
case IToken.t_if :
|
||||
return Keywords.IF ;
|
||||
case IToken.t_inline :
|
||||
return Keywords.INLINE ;
|
||||
case IToken.t_int :
|
||||
return Keywords.INT ;
|
||||
case IToken.t_long :
|
||||
return Keywords.LONG ;
|
||||
case IToken.t_mutable :
|
||||
return Keywords.MUTABLE ;
|
||||
case IToken.t_namespace :
|
||||
return Keywords.NAMESPACE ;
|
||||
case IToken.t_new :
|
||||
return Keywords.NEW ;
|
||||
case IToken.t_not :
|
||||
return Keywords.NOT ;
|
||||
case IToken.t_not_eq :
|
||||
return Keywords.NOT_EQ;
|
||||
case IToken.t_operator :
|
||||
return Keywords.OPERATOR ;
|
||||
case IToken.t_or :
|
||||
return Keywords.OR ;
|
||||
case IToken.t_or_eq :
|
||||
return Keywords.OR_EQ;
|
||||
case IToken.t_private :
|
||||
return Keywords.PRIVATE ;
|
||||
case IToken.t_protected :
|
||||
return Keywords.PROTECTED ;
|
||||
case IToken.t_public :
|
||||
return Keywords.PUBLIC ;
|
||||
case IToken.t_register :
|
||||
return Keywords.REGISTER ;
|
||||
case IToken.t_reinterpret_cast :
|
||||
return Keywords.REINTERPRET_CAST ;
|
||||
case IToken.t_return :
|
||||
return Keywords.RETURN ;
|
||||
case IToken.t_short :
|
||||
return Keywords.SHORT ;
|
||||
case IToken.t_sizeof :
|
||||
return Keywords.SIZEOF ;
|
||||
case IToken.t_static :
|
||||
return Keywords.STATIC ;
|
||||
case IToken.t_static_cast :
|
||||
return Keywords.STATIC_CAST ;
|
||||
case IToken.t_signed :
|
||||
return Keywords.SIGNED ;
|
||||
case IToken.t_struct :
|
||||
return Keywords.STRUCT ;
|
||||
case IToken.t_switch :
|
||||
return Keywords.SWITCH ;
|
||||
case IToken.t_template :
|
||||
return Keywords.TEMPLATE ;
|
||||
case IToken.t_this :
|
||||
return Keywords.THIS ;
|
||||
case IToken.t_throw :
|
||||
return Keywords.THROW ;
|
||||
case IToken.t_true :
|
||||
return Keywords.TRUE ;
|
||||
case IToken.t_try :
|
||||
return Keywords.TRY ;
|
||||
case IToken.t_typedef :
|
||||
return Keywords.TYPEDEF ;
|
||||
case IToken.t_typeid :
|
||||
return Keywords.TYPEID ;
|
||||
case IToken.t_typename :
|
||||
return Keywords.TYPENAME ;
|
||||
case IToken.t_union :
|
||||
return Keywords.UNION ;
|
||||
case IToken.t_unsigned :
|
||||
return Keywords.UNSIGNED ;
|
||||
case IToken.t_using :
|
||||
return Keywords.USING ;
|
||||
case IToken.t_virtual :
|
||||
return Keywords.VIRTUAL ;
|
||||
case IToken.t_void :
|
||||
return Keywords.VOID ;
|
||||
case IToken.t_volatile :
|
||||
return Keywords.VOLATILE;
|
||||
case IToken.t_wchar_t :
|
||||
return Keywords.WCHAR_T ;
|
||||
case IToken.t_while :
|
||||
return Keywords.WHILE ;
|
||||
case IToken.t_xor :
|
||||
return Keywords.XOR ;
|
||||
case IToken.t_xor_eq :
|
||||
return Keywords.XOR_EQ ;
|
||||
case IToken.t__Bool :
|
||||
return Keywords._BOOL ;
|
||||
case IToken.t__Complex :
|
||||
return Keywords._COMPLEX ;
|
||||
case IToken.t__Imaginary :
|
||||
return Keywords._IMAGINARY ;
|
||||
case IToken.t_restrict :
|
||||
return Keywords.RESTRICT ;
|
||||
case IScanner.tPOUND:
|
||||
return "#"; //$NON-NLS-1$
|
||||
case IScanner.tPOUNDPOUND:
|
||||
return "##"; //$NON-NLS-1$
|
||||
|
||||
default :
|
||||
// we should never get here!
|
||||
return image;
|
||||
}
|
||||
}
|
||||
|
||||
public String filename;
|
||||
|
||||
|
|
@ -53,7 +348,9 @@ public class Token implements IToken {
|
|||
// All the tokens generated by the macro expansion
|
||||
// will have dimensions (offset and length) equal to the expanding symbol.
|
||||
public int getOffset() { return (macroOffset < 0) ? offset : macroOffset; }
|
||||
public int getLength() { return (macroLength < 0) ? image.length() : macroLength; }
|
||||
|
||||
public int getLength() { return (macroLength < 0) ? getImage().length() : macroLength; }
|
||||
|
||||
public int getEndOffset() { return getOffset() + getLength(); }
|
||||
|
||||
|
||||
|
|
@ -157,7 +454,6 @@ public class Token implements IToken {
|
|||
}
|
||||
|
||||
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see java.lang.Object#equals(java.lang.Object)
|
||||
*/
|
||||
|
|
@ -165,7 +461,7 @@ public class Token implements IToken {
|
|||
if( other == null ) return false;
|
||||
if( !( other instanceof IToken ) )
|
||||
return false;
|
||||
if( !(((IToken)other).getImage().equals( image )))
|
||||
if( !(((IToken)other).getImage().equals( getImage() )))
|
||||
return false;
|
||||
if( ((IToken)other).getType() != type )
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue