mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Bug 486915 - Unmarshalling error during indexing

Browse source 
Implemented clone() method for PDOMCPPAliasTemplateInstance and
CompositeCPPAliasTemplateInstance.

Change-Id: Id9d9a86ef154112cc7ee4e2f397fe8615461125c
This commit is contained in:
Sergey Prigogin 2016-02-01 15:06:10 -08:00
parent 23dc890167
commit f1e935c1ad
4 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPAliasTemplateInstanceClone.java Normal file
View file

@ -0,0 +1,33 @@
/*******************************************************************************
* Copyright (c) 2016 Google, Inc 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:
* Sergey Prigogin (Google) - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.internal.core.index;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPAliasTemplate;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPAliasTemplateInstance;
/**
* Delegating clone implementation for index classes implementing {@link ICPPAliasTemplateInstance} interface.
*/
public class CPPAliasTemplateInstanceClone extends CPPTypedefClone implements ICPPAliasTemplateInstance {
public CPPAliasTemplateInstanceClone(ICPPAliasTemplateInstance original) {
super(original);
}
@Override
public Object clone() {
return new CPPAliasTemplateInstanceClone(this);
}
@Override
public ICPPAliasTemplate getTemplateDefinition() {
return ((ICPPAliasTemplateInstance) delegate).getTemplateDefinition();
}
}

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPTypedefClone.java
View file

@ -19,6 +19,9 @@ import org.eclipse.cdt.core.dom.ast.ITypedef;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding;
import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
/**
* Delegating clone implementation for index classes implementing {@link ITypedef} interface.
*/
public class CPPTypedefClone implements ITypedef, ITypeContainer, IIndexType, ICPPBinding {
protected final ITypedef delegate;
private IType type;

11
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPAliasTemplateInstance.java
View file

@ -13,6 +13,7 @@ package org.eclipse.cdt.internal.core.index.composite.cpp;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPAliasTemplate;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPAliasTemplateInstance;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding;
import org.eclipse.cdt.internal.core.index.CPPAliasTemplateInstanceClone;
import org.eclipse.cdt.internal.core.index.IIndexFragmentBinding;
import org.eclipse.cdt.internal.core.index.composite.ICompositesFactory;
@ -21,14 +22,14 @@ class CompositeCPPAliasTemplateInstance extends CompositeCPPTypedef implements I
super(cf, delegate);
}
@Override
public Object clone() {
fail(); return null;
}
@Override
public ICPPAliasTemplate getTemplateDefinition() {
ICPPAliasTemplate templateDefinition = ((ICPPAliasTemplateInstance) rbinding).getTemplateDefinition();
return (ICPPAliasTemplate) cf.getCompositeBinding((IIndexFragmentBinding) templateDefinition);
}
@Override
public Object clone() {
return new CPPAliasTemplateInstanceClone(this);
}
}

6
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPAliasTemplateInstance.java
View file

@ -14,6 +14,7 @@ import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.dom.ast.DOMException;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPAliasTemplate;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPAliasTemplateInstance;
import org.eclipse.cdt.internal.core.index.CPPAliasTemplateInstanceClone;
import org.eclipse.cdt.internal.core.index.IIndexCPPBindingConstants;
import org.eclipse.cdt.internal.core.pdom.db.Database;
import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding;
@ -63,4 +64,9 @@ class PDOMCPPAliasTemplateInstance extends PDOMCPPTypedef implements ICPPAliasTe
protected int getRecordSize() {
return RECORD_SIZE;
}
@Override
public Object clone() {
return new CPPAliasTemplateInstanceClone(this);
}
}