mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix CompleteParseASTExpressionTest.testPrimaryCharLiteral under Scanner2

Browse source
This commit is contained in:
Andrew Niefer 2004-07-29 17:36:51 +00:00
parent d134c5e5d3
commit b5edc37774
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/complete/CompleteParseASTFactory.java
View file

@ -24,6 +24,7 @@ import org.eclipse.cdt.core.parser.IProblem;
import org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate; import org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate;
import org.eclipse.cdt.core.parser.IToken; import org.eclipse.cdt.core.parser.IToken;
import org.eclipse.cdt.core.parser.ITokenDuple; import org.eclipse.cdt.core.parser.ITokenDuple;
import org.eclipse.cdt.core.parser.ParserFactory;
import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
@ -1513,12 +1514,14 @@ public class CompleteParseASTFactory extends BaseASTFactory implements IASTFacto
|| (kind == IASTExpression.Kind.DELETE_VECTORCASTEXPRESSION) || (kind == IASTExpression.Kind.DELETE_VECTORCASTEXPRESSION)
){ ){
provider.setType( ITypeInfo.t_void ); provider.setType( ITypeInfo.t_void );
return;
} }
// types that resolve to int // types that resolve to int
if ((kind == IASTExpression.Kind.PRIMARY_INTEGER_LITERAL) if ((kind == IASTExpression.Kind.PRIMARY_INTEGER_LITERAL)
|| (kind == IASTExpression.Kind.POSTFIX_SIMPLETYPE_INT) || (kind == IASTExpression.Kind.POSTFIX_SIMPLETYPE_INT)
){ ){
provider.setType( ITypeInfo.t_int ); provider.setType( ITypeInfo.t_int );
return;
} }
// size of is always unsigned int // size of is always unsigned int
@ -1527,6 +1530,7 @@ public class CompleteParseASTFactory extends BaseASTFactory implements IASTFacto
){ ){
provider.setType( ITypeInfo.t_int ); provider.setType( ITypeInfo.t_int );
provider.setTypeBits( ITypeInfo.isUnsigned ); provider.setTypeBits( ITypeInfo.isUnsigned );
return;
} }
// types that resolve to char // types that resolve to char
@ -1535,20 +1539,23 @@ public class CompleteParseASTFactory extends BaseASTFactory implements IASTFacto
|| (kind == IASTExpression.Kind.PRIMARY_STRING_LITERAL) || (kind == IASTExpression.Kind.PRIMARY_STRING_LITERAL)
){ ){
provider.setType( ITypeInfo.t_char ); provider.setType( ITypeInfo.t_char );
return;
} }
// types that resolve to float // types that resolve to float
if((kind == IASTExpression.Kind.PRIMARY_FLOAT_LITERAL) if((kind == IASTExpression.Kind.PRIMARY_FLOAT_LITERAL)
|| (kind == IASTExpression.Kind.POSTFIX_SIMPLETYPE_FLOAT)){ || (kind == IASTExpression.Kind.POSTFIX_SIMPLETYPE_FLOAT)){
provider.setType( ITypeInfo.t_float ); provider.setType( ITypeInfo.t_float );
return;
} }
//types that resolve to double //types that resolve to double
if( kind == IASTExpression.Kind.POSTFIX_SIMPLETYPE_DOUBLE){ if( kind == IASTExpression.Kind.POSTFIX_SIMPLETYPE_DOUBLE){
provider.setType( ITypeInfo.t_double ); provider.setType( ITypeInfo.t_double );
return;
} }
//types that resolve to wchar //types that resolve to wchar
if(kind == IASTExpression.Kind.POSTFIX_SIMPLETYPE_WCHART){ if(kind == IASTExpression.Kind.POSTFIX_SIMPLETYPE_WCHART){
provider.setType( ITypeInfo.t_wchar_t ); provider.setType( ITypeInfo.t_wchar_t );
return;
} }
// types that resolve to bool // types that resolve to bool
if((kind == IASTExpression.Kind.PRIMARY_BOOLEAN_LITERAL) if((kind == IASTExpression.Kind.PRIMARY_BOOLEAN_LITERAL)
@ -1564,6 +1571,7 @@ public class CompleteParseASTFactory extends BaseASTFactory implements IASTFacto
) )
{ {
provider.setType(ITypeInfo.t_bool); provider.setType(ITypeInfo.t_bool);
return;
} }
} }
protected ExpressionResult getExpressionResultType( protected ExpressionResult getExpressionResultType(
@ -1598,13 +1606,21 @@ public class CompleteParseASTFactory extends BaseASTFactory implements IASTFacto
info = provider.completeConstruction(); info = provider.completeConstruction();
//types that need a pointer //types that need a pointer
if( ParserFactory.USE_NEW_SCANNER ){
if( kind == IASTExpression.Kind.PRIMARY_STRING_LITERAL ||
(literal.length > 3 && ( kind == IASTExpression.Kind.PRIMARY_CHAR_LITERAL ||
kind == IASTExpression.Kind.POSTFIX_SIMPLETYPE_CHAR )) )
{
info.addPtrOperator(new ITypeInfo.PtrOp(ITypeInfo.PtrOp.t_pointer));
}
} else {
if( kind == IASTExpression.Kind.PRIMARY_STRING_LITERAL || if( kind == IASTExpression.Kind.PRIMARY_STRING_LITERAL ||
(literal.length > 1 && ( kind == IASTExpression.Kind.PRIMARY_CHAR_LITERAL || (literal.length > 1 && ( kind == IASTExpression.Kind.PRIMARY_CHAR_LITERAL ||
kind == IASTExpression.Kind.POSTFIX_SIMPLETYPE_CHAR )) ) kind == IASTExpression.Kind.POSTFIX_SIMPLETYPE_CHAR )) )
{ {
info.addPtrOperator(new ITypeInfo.PtrOp(ITypeInfo.PtrOp.t_pointer)); info.addPtrOperator(new ITypeInfo.PtrOp(ITypeInfo.PtrOp.t_pointer));
} }
}
return new ExpressionResult( info ); return new ExpressionResult( info );
} }