mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

39677, 74190 - fix problem with statements in expressions

Browse source
This commit is contained in:
Andrew Niefer 2004-10-20 16:51:54 +00:00
parent a8fc039327
commit a22cca2f6b
4 changed files with 48 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/GCCCompleteParseExtensionsTest.java
View file

@ -200,16 +200,23 @@ public class GCCCompleteParseExtensionsTest extends CompleteParseBaseTest {
writer.write( "else z = - y;\n" );//$NON-NLS-1$ writer.write( "else z = - y;\n" );//$NON-NLS-1$
writer.write( "z; }))\n" );//$NON-NLS-1$ writer.write( "z; }))\n" );//$NON-NLS-1$
parse( writer.toString() ); parse( writer.toString() );
writer = new StringWriter(); writer = new StringWriter();
writer.write( "int x = ({ int y = foo (); int z;\n" ); //$NON-NLS-1$ writer.write( "int x = ({ int y = foo (); int z;\n" ); //$NON-NLS-1$
writer.write( "if (y > 0) z = y;\n" ); //$NON-NLS-1$ writer.write( "if (y > 0) z = y;\n" ); //$NON-NLS-1$
writer.write( "else z = - y;\n" );//$NON-NLS-1$ writer.write( "else z = - y;\n" );//$NON-NLS-1$
writer.write( "z; });\n" );//$NON-NLS-1$ writer.write( "z; });\n" );//$NON-NLS-1$
parse( writer.toString() );
writer = new StringWriter(); writer = new StringWriter();
writer.write( "typeof({ int y = foo (); int z;\n" ); //$NON-NLS-1$ writer.write( "int foo(); \n" ); //$NON-NLS-1$
writer.write( "if (y > 0) z = y;\n" ); //$NON-NLS-1$ writer.write( "typeof({ int y = foo (); \n" ); //$NON-NLS-1$
writer.write( "else z = - y;\n" );//$NON-NLS-1$ writer.write( " int z; \n" ); //$NON-NLS-1$
writer.write( "z; }) zoot;\n" );//$NON-NLS-1$ writer.write( " if (y > 0) z = y; \n" ); //$NON-NLS-1$
writer.write( " else z = - y; \n" ); //$NON-NLS-1$
writer.write( " z; \n" ); //$NON-NLS-1$
writer.write( " }) zoot; \n" ); //$NON-NLS-1$
parse( writer.toString() );
} }
public void testBug75401() throws Exception public void testBug75401() throws Exception
@ -247,4 +254,16 @@ public class GCCCompleteParseExtensionsTest extends CompleteParseBaseTest {
assertFalse(i.hasNext()); assertFalse(i.hasNext());
} }
public void testBug74190_g_assert_1() throws Exception {
Writer writer = new StringWriter();
writer.write( "void log( int ); \n"); //$NON-NLS-1$
writer.write( "void f() { \n"); //$NON-NLS-1$
writer.write( " int a = 1; \n"); //$NON-NLS-1$
writer.write( " (void)({ if( a ){ } \n"); //$NON-NLS-1$
writer.write( " else{ log( a ); } \n"); //$NON-NLS-1$
writer.write( " }); \n"); //$NON-NLS-1$
writer.write( "} \n"); //$NON-NLS-1$
parse( writer.toString() );
}
} }

25
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
View file

@ -803,15 +803,16 @@ public class Parser implements IParserData, IParser
int startingOffset = la.getOffset(); int startingOffset = la.getOffset();
int ln = la.getLineNumber(); int ln = la.getLineNumber();
char [] fn = la.getFilename(); char [] fn = la.getFilename();
IASTExpression resultExpression = null; //moved to primary expression
if( la.getType() == IToken.tLPAREN && LT(2) == IToken.tLBRACE && extension.supportsStatementsInExpressions() ) // IASTExpression resultExpression = null;
{ // if( la.getType() == IToken.tLPAREN && LT(2) == IToken.tLBRACE && extension.supportsStatementsInExpressions() )
resultExpression = compoundStatementExpression(scope, la, resultExpression); // {
} // resultExpression = compoundStatementExpression(scope, la, resultExpression);
// }
if( resultExpression != null ) //
return resultExpression; // if( resultExpression != null )
// return resultExpression;
IASTExpression assignmentExpression = assignmentExpression(scope, kind, IASTExpression assignmentExpression = assignmentExpression(scope, kind,
key); key);
@ -2623,6 +2624,12 @@ public class Parser implements IParserData, IParser
throwBacktrack(t.getOffset(), t.getEndOffset(), t.getLineNumber(), t.getFilename()); throwBacktrack(t.getOffset(), t.getEndOffset(), t.getLineNumber(), t.getFilename());
} }
case IToken.tLPAREN : case IToken.tLPAREN :
if( LT(2) == IToken.tLBRACE && extension.supportsStatementsInExpressions() )
{
IASTExpression resultExpression = compoundStatementExpression(scope, LA(1), null);
if( resultExpression != null )
return resultExpression;
}
t = consume(); t = consume();
if (templateIdScopes.size() > 0) { if (templateIdScopes.size() > 0) {
templateIdScopes.push(IToken.tLPAREN); templateIdScopes.push(IToken.tLPAREN);

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ast/GCCASTExtension.java
View file

@ -90,8 +90,13 @@ public abstract class GCCASTExtension implements IASTFactoryExtension {
} }
else if ( kind == IASTGCCExpression.Kind.UNARY_TYPEOF_UNARYEXPRESSION ) else if ( kind == IASTGCCExpression.Kind.UNARY_TYPEOF_UNARYEXPRESSION )
{ {
if( lhs instanceof ASTExpression ) if( lhs instanceof ASTExpression ){
info = TypeInfoProvider.newTypeInfo( ((ASTExpression)lhs).getResultType().getResult() ); if( ((ASTExpression) lhs).getResultType() != null )
info = TypeInfoProvider.newTypeInfo( ((ASTExpression)lhs).getResultType().getResult() );
else {
info = TypeInfoProvider.newTypeInfo( ITypeInfo.t_void );
}
}
} }
if( info != null ) if( info != null )

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/BasicTokenDuple.java
View file

@ -224,8 +224,8 @@ public class BasicTokenDuple implements ITokenDuple {
int length = getCharArrayLength( f, l ); int length = getCharArrayLength( f, l );
char[] buff = new char[ length ]; char[] buff = new char[ length ];
int i = 0;
for( ; ; ) for( int i = 0; i < length; )
{ {
if( prev != null && if( prev != null &&
prev.getType() != IToken.tCOLONCOLON && prev.getType() != IToken.tCOLONCOLON &&