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

bug 169134

Browse source
This commit is contained in:
Andrew Niefer 2007-01-03 22:56:30 +00:00
parent 481925b5dd
commit 6bb1949ce9
4 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2005, 2006 IBM Corporation and others. * Copyright (c) 2005, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -57,9 +57,9 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPClassType.CPPClassTypePro
* @author aniefer * @author aniefer
*/ */
public class CPPClassTemplate extends CPPTemplateDefinition implements public class CPPClassTemplate extends CPPTemplateDefinition implements
ICPPClassTemplate, ICPPClassType, ICPPInternalClassType { ICPPClassTemplate, ICPPClassType, ICPPInternalClassType, ICPPInternalClassTemplate {
public static class CPPClassTemplateDelegate extends CPPClassType.CPPClassTypeDelegate implements ICPPClassTemplate, ICPPInternalTemplate { public static class CPPClassTemplateDelegate extends CPPClassType.CPPClassTypeDelegate implements ICPPClassTemplate, ICPPInternalClassTemplate {
public CPPClassTemplateDelegate( IASTName name, ICPPClassType cls ) { public CPPClassTemplateDelegate( IASTName name, ICPPClassType cls ) {
super( name, cls ); super( name, cls );
} }
@ -81,6 +81,9 @@ public class CPPClassTemplate extends CPPTemplateDefinition implements
public ICPPSpecialization getInstance( IType[] arguments ) { public ICPPSpecialization getInstance( IType[] arguments ) {
return ((ICPPInternalTemplate)getBinding()).getInstance( arguments ); return ((ICPPInternalTemplate)getBinding()).getInstance( arguments );
} }
public void addPartialSpecialization( ICPPClassTemplatePartialSpecialization spec ) {
((ICPPInternalClassTemplate)getBinding()).addPartialSpecialization( spec );
}
} }
private ICPPClassTemplatePartialSpecialization [] partialSpecializations = null; private ICPPClassTemplatePartialSpecialization [] partialSpecializations = null;

15
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplateSpecialization.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2005 IBM Corporation and others. * Copyright (c) 2005, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -22,6 +22,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassTemplatePartialSpecialization;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPScope; import org.eclipse.cdt.core.dom.ast.cpp.ICPPScope;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization; import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
import org.eclipse.cdt.core.parser.util.ArrayUtil;
import org.eclipse.cdt.core.parser.util.ObjectMap; import org.eclipse.cdt.core.parser.util.ObjectMap;
/** /**
@ -29,9 +30,10 @@ import org.eclipse.cdt.core.parser.util.ObjectMap;
* *
*/ */
public class CPPClassTemplateSpecialization extends CPPClassSpecialization public class CPPClassTemplateSpecialization extends CPPClassSpecialization
implements ICPPClassTemplate, ICPPInternalTemplate { implements ICPPClassTemplate, ICPPInternalClassTemplate {
private ObjectMap instances = null; private ObjectMap instances = null;
private ICPPClassTemplatePartialSpecialization [] partialSpecializations = null;
/** /**
* @param specialized * @param specialized
@ -47,10 +49,11 @@ public class CPPClassTemplateSpecialization extends CPPClassSpecialization
* @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassTemplate#getPartialSpecializations() * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassTemplate#getPartialSpecializations()
*/ */
public ICPPClassTemplatePartialSpecialization[] getPartialSpecializations() { public ICPPClassTemplatePartialSpecialization[] getPartialSpecializations() {
// TODO Auto-generated method stub partialSpecializations = (ICPPClassTemplatePartialSpecialization[]) ArrayUtil.trim( ICPPClassTemplatePartialSpecialization.class, partialSpecializations );
return ICPPClassTemplatePartialSpecialization.EMPTY_PARTIAL_SPECIALIZATION_ARRAY; return partialSpecializations;
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateDefinition#getTemplateParameters() * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateDefinition#getTemplateParameters()
*/ */
@ -99,4 +102,8 @@ public class CPPClassTemplateSpecialization extends CPPClassSpecialization
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
public void addPartialSpecialization( ICPPClassTemplatePartialSpecialization spec ){
partialSpecializations = (ICPPClassTemplatePartialSpecialization[]) ArrayUtil.append( ICPPClassTemplatePartialSpecialization.class, partialSpecializations, spec );
}
} }

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplates.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2005 IBM Corporation and others. * Copyright (c) 2005, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -358,7 +358,8 @@ public class CPPTemplates {
} }
spec = new CPPClassTemplatePartialSpecialization( id ); spec = new CPPClassTemplatePartialSpecialization( id );
((CPPClassTemplate)template).addPartialSpecialization( (ICPPClassTemplatePartialSpecialization) spec ); if(template instanceof ICPPInternalClassTemplate)
((ICPPInternalClassTemplate)template).addPartialSpecialization( (ICPPClassTemplatePartialSpecialization) spec );
return spec; return spec;
} }
@ -1481,8 +1482,8 @@ public class CPPTemplates {
} }
} }
if( template instanceof CPPClassTemplate ){ if( template instanceof ICPPInternalTemplate ){
return ((CPPClassTemplate)template).instantiate( args ); return ((ICPPInternalTemplate)template).instantiate( args );
} }
return template; return template;
} }

21
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalClassTemplate.java Normal file
View file

@ -0,0 +1,21 @@
/*******************************************************************************
* Copyright (c) 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.internal.core.dom.parser.cpp;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassTemplatePartialSpecialization;
/**
* @author aniefer
*
*/
public interface ICPPInternalClassTemplate extends ICPPInternalTemplate {
public void addPartialSpecialization( ICPPClassTemplatePartialSpecialization spec );
}