fix bug 44338

core/org.eclipse.cdt.core.tests/ChangeLog

@@ -1,3 +1,9 @@
+2004-04-07 Andrew Niefer
+	fix bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=44338
+	- added parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTemplateTest.testBug44338() 
+	- added parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTemplateTest.testBug44338_2() 
+	- added parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTemplateTest.testBug44338_3() 
+
 2004-04-07 John Camelon
 	Updated test cases that used IExpressionParser::expression().  
 	Added CompletionParseTest::testCompletionInFunctionBodyFullyQualified(). 

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseASTTemplateTest.java

@@ -656,4 +656,47 @@ public class CompleteParseASTTemplateTest extends CompleteParseBaseTest {
 		
 		parse( writer.toString () );
 	}
+	
+	public void testBug44338() throws Exception
+	{
+		Writer writer = new StringWriter();
+		writer.write( "template < bool T > class A {   ");
+		writer.write( "   void foo( bool b = T );      ");
+		writer.write( "};                              ");
+		writer.write( "typedef A< 1 < 2 > A_TRUE;      ");
+		writer.write( "typedef A< ( 1 > 2 ) > A_FALSE; ");
+		
+		Iterator i = parse( writer.toString() ).getDeclarations();
+		
+		IASTTemplateDeclaration template = (IASTTemplateDeclaration) i.next();
+		IASTTypedefDeclaration  a_true = (IASTTypedefDeclaration) i.next();
+		IASTTypedefDeclaration  a_false = (IASTTypedefDeclaration) i.next();
+	}
+	
+	public void testBug44338_2() throws Exception
+	{
+		Writer writer = new StringWriter();
+		writer.write( "template < int i > class X {};   ");
+		writer.write( "template < class T > class Y {}; ");
+		writer.write( "Y< X < 1 > > y1;                 ");
+		writer.write( "Y< X < 6 >> 1 > > y2;            ");
+		
+		Iterator i = parse( writer.toString() ).getDeclarations();
+		
+		IASTTemplateDeclaration templateX = (IASTTemplateDeclaration) i.next();
+		IASTTemplateDeclaration templateY = (IASTTemplateDeclaration) i.next();
+		IASTVariable y1 = (IASTVariable) i.next();
+		IASTVariable y2 = (IASTVariable) i.next();
+	}
+	
+	public void testBug4338_3() throws Exception
+	{
+		try{
+			//this is expected to fail the parse
+			parse( "template < int i > class X {};  X< 1 > 2 > x; " );
+			assertTrue( false );
+		} catch ( ParserException e ){
+			assertTrue( e.getMessage().equals( "FAILURE" ) );
+		}
+	}
 }

core/org.eclipse.cdt.core/parser/ChangeLog-parser

@@ -1,3 +1,6 @@
+2004-04-07 Andrew Niefer
+	fix bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=44338
+
 2004-04-07 Andrew Niefer
 	small changes to get through iostream under standard make with discovered symbols
 	- check null pointer in GCCScannerExtension.handlePreprocessorDirective, the null is probably a symptom of whatever 

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/pst/TemplateEngine.java

@@ -175,7 +175,9 @@ public final class TemplateEngine {
 		} else {
 			Cost cost = null;
 			try {
-				cost = ParserSymbolTable.checkStandardConversionSequence( arg, param.getTypeInfo());
+				TypeInfo info = new TypeInfo( param.getTypeInfo() );
+				info.setType( info.getTemplateParameterType() );
+				cost = ParserSymbolTable.checkStandardConversionSequence( arg, info );
 			} catch (ParserSymbolTableException e) {
 			}
 			

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/TokenDuple.java

@@ -204,7 +204,6 @@ public class TokenDuple implements ITokenDuple {
 	    	if( ! iter.hasNext() )
 	    		return token;
 	    	
-	    	token = (IToken) iter.next();
 	    	LinkedList scopes = new LinkedList();
 	        scopes.add( LT );