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

2005-01-22 Alain Magloire

Browse source 
PR 38958
	Part implementation of the CreateXXXOperation classes.
	* model/org/eclipse/cdt/core/model/ICElement.java
	* model/org/eclipse/cdt/core/model/IStructure.java
	* model/org/eclipse/cdt/core/model/IStructureDeclaration.java
	* model/org/eclipse/cdt/internal/core/model/CModelBuiilder.java
	* model/org/eclipse/cdt/internal/core/model/CModelOperation.java
	* model/org/eclipse/cdt/internal/core/model/CopyElementOperation.java
	* model/org/eclipse/cdt/internal/core/model/CreateElementIntTUOperation.java
	* model/org/eclipse/cdt/internal/core/model/CreateFieldOperation.java
	* model/org/eclipse/cdt/internal/core/model/CreateIncludeOperation.java
	* model/org/eclipse/cdt/internal/core/model/CreateMethodOperation.java
	* model/org/eclipse/cdt/internal/core/model/CreateSourceReferenceOperation.java
	* model/org/eclipse/cdt/internal/core/model/FuntionInfo.java
	* model/org/eclipse/cdt/internal/core/model/FuntionDeclaration.java
	* model/org/eclipse/cdt/internal/core/model/Structure.java
	* model/org/eclipse/cdt/internal/core/model/StructureDeclaratin.java
	* model/org/eclipse/cdt/internal/core/model/StructureInfo.java
	* model/org/eclipse/cdt/internal/core/model/MethodInfo.java
	* model/org/eclipse/cdt/internal/core/model/util.java
	* model/org/eclipse/cdt/internal/core/model/SurceManipulationInfo.java
This commit is contained in:
Alain Magloire 2005-01-23 04:44:37 +00:00
parent c67f6d2a40
commit a09eaa034f
26 changed files with 992 additions and 417 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/org.eclipse.cdt.core/ChangeLog
View file

@ -1,3 +1,26 @@
2005-01-22 Alain Magloire
PR 38958
Part implementation of the CreateXXXOperation classes.
* model/org/eclipse/cdt/core/model/ICElement.java
* model/org/eclipse/cdt/core/model/IStructure.java
* model/org/eclipse/cdt/core/model/IStructureDeclaration.java
* model/org/eclipse/cdt/internal/core/model/CModelBuiilder.java
* model/org/eclipse/cdt/internal/core/model/CModelOperation.java
* model/org/eclipse/cdt/internal/core/model/CopyElementOperation.java
* model/org/eclipse/cdt/internal/core/model/CreateElementIntTUOperation.java
* model/org/eclipse/cdt/internal/core/model/CreateFieldOperation.java
* model/org/eclipse/cdt/internal/core/model/CreateIncludeOperation.java
* model/org/eclipse/cdt/internal/core/model/CreateMethodOperation.java
* model/org/eclipse/cdt/internal/core/model/CreateSourceReferenceOperation.java
* model/org/eclipse/cdt/internal/core/model/FuntionInfo.java
* model/org/eclipse/cdt/internal/core/model/FuntionDeclaration.java
* model/org/eclipse/cdt/internal/core/model/Structure.java
* model/org/eclipse/cdt/internal/core/model/StructureDeclaratin.java
* model/org/eclipse/cdt/internal/core/model/StructureInfo.java
* model/org/eclipse/cdt/internal/core/model/MethodInfo.java
* model/org/eclipse/cdt/internal/core/model/util.java
* model/org/eclipse/cdt/internal/core/model/SurceManipulationInfo.java
2005-01-19 Alain Magloire
PR 83224
* model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java

18
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICElement.java
View file

@ -176,6 +176,24 @@ public interface ICElement extends IAdaptable {
*/
static final int C_TEMPLATE_VARIABLE = 84;
/**
* Declaration of a structure without the definition.
* struct C;
*/
static final int C_STRUCT_DECLARATION = 85;
/**
* Declaration of a class without the definition.
* class C;
*/
static final int C_CLASS_DECLARATION = 86;
/**
* Declaration of a union without the definition.
* struct C;
*/
static final int C_UNION_DECLARATION = 87;
/**
* Modifier indicating a class constructor
*/

23
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IStructure.java
View file

@ -14,7 +14,7 @@ package org.eclipse.cdt.core.model;
/**
* Represent struct(ure), class or union.
*/
public interface IStructure extends IInheritance, IParent, IVariableDeclaration {
public interface IStructure extends IInheritance, IParent, IStructureDeclaration {
public IField getField(String name);
/**
@ -39,27 +39,6 @@ public interface IStructure extends IInheritance, IParent, IVariableDeclaration
*/
public IMethodDeclaration [] getMethods() throws CModelException;
/**
* Checks if the structure is a Union
* @return boolean
* @throws CModelException
*/
public boolean isUnion() throws CModelException;
/**
* Checks if the structure is a class
* @return boolean
* @throws CModelException
*/
public boolean isClass() throws CModelException;
/**
* Checks if the structure is a struct
* @return boolean
* @throws CModelException
*/
public boolean isStruct() throws CModelException;
/**
* Checks if the structure is abstract
* @return boolean

45
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IStructureDeclaration.java Normal file
View file

@ -0,0 +1,45 @@
/**********************************************************************
* Copyright (c) 2002,2003,2004 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors:
* QNX Software Systems - Initial API and implementation
***********************************************************************/
package org.eclipse.cdt.core.model;
/**
* IStructureDeclaration
*/
public interface IStructureDeclaration extends IDeclaration {
/**
* Checks if the structure is a Union
* @return boolean
* @throws CModelException
*/
public boolean isUnion() throws CModelException;
/**
* Checks if the structure is a class
* @return boolean
* @throws CModelException
*/
public boolean isClass() throws CModelException;
/**
* Checks if the structure is a struct
* @return boolean
* @throws CModelException
*/
public boolean isStruct() throws CModelException;
/**
* Return "class", "struct", "union"
* @deprecated use isUnion(), isClass(), isStruct()
*/
String getTypeName() throws CModelException;
}

49
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelBuilder.java
View file

@ -72,6 +72,7 @@ public class CModelBuilder {
private org.eclipse.cdt.internal.core.model.TranslationUnit translationUnit;
private Map newElements;
private IQuickParseCallback quickParseCallback;
private static char[] EMPTY_CHAR_ARRAY = {};
// indicator if the unit has parse errors
private boolean hasNoErrors = false;
@ -103,7 +104,7 @@ public class CModelBuilder {
{
IProject currentProject = null;
boolean hasCppNature = true;
String code = ""; //$NON-NLS-1$
char[] code = EMPTY_CHAR_ARRAY; //$NON-NLS-1$
// get the current project
if (translationUnit != null && translationUnit.getCProject() != null) {
@ -116,7 +117,7 @@ public class CModelBuilder {
}
// get the code to parse
try{
code = translationUnit.getBuffer().getContents();
code = translationUnit.getBuffer().getCharacters();
} catch (CModelException e) {
}
@ -165,8 +166,8 @@ public class CModelBuilder {
CodeReader reader =
translationUnit.getUnderlyingResource() != null
? new CodeReader(translationUnit.getUnderlyingResource().getLocation().toOSString(), code.toCharArray())
: new CodeReader(code.toCharArray());
? new CodeReader(translationUnit.getUnderlyingResource().getLocation().toOSString(), code)
: new CodeReader(code);
parser = ParserFactory.createParser(
ParserFactory.createScanner(
reader,
@ -309,7 +310,7 @@ public class CModelBuilder {
private void generateModelElements (Parent parent, IASTAbstractTypeSpecifierDeclaration abstractDeclaration) throws CModelException, ASTNotImplementedException
{
// IASTAbstractTypeSpecifierDeclaration
CElement element = createAbstractElement(parent, abstractDeclaration, false);
CElement element = createAbstractElement(parent, abstractDeclaration, false, true);
}
private void generateModelElements (Parent parent, IASTTemplateDeclaration templateDeclaration) throws CModelException, ASTNotImplementedException
@ -318,7 +319,7 @@ public class CModelBuilder {
IASTDeclaration declaration = templateDeclaration.getOwnedDeclaration();
if(declaration instanceof IASTAbstractTypeSpecifierDeclaration){
IASTAbstractTypeSpecifierDeclaration abstractDeclaration = (IASTAbstractTypeSpecifierDeclaration)declaration ;
CElement element = createAbstractElement(parent, abstractDeclaration , true);
CElement element = createAbstractElement(parent, abstractDeclaration , true, true);
if(element != null){
// set the element position
element.setPos(templateDeclaration.getStartingOffset(), templateDeclaration.getEndingOffset() - templateDeclaration.getStartingOffset());
@ -360,7 +361,7 @@ public class CModelBuilder {
{
TypeDef typeDef = createTypeDef(parent, declaration);
IASTAbstractDeclaration abstractDeclaration = declaration.getAbstractDeclarator();
CElement element = createAbstractElement(parent, abstractDeclaration, false);
CElement element = createAbstractElement(parent, abstractDeclaration, false, true);
}
private CElement createClassSpecifierElement(Parent parent, IASTClassSpecifier classSpecifier, boolean isTemplate)throws ASTNotImplementedException, CModelException{
@ -377,7 +378,7 @@ public class CModelBuilder {
return element;
}
private CElement createAbstractElement(Parent parent, IASTTypeSpecifierOwner abstractDeclaration, boolean isTemplate)throws ASTNotImplementedException, CModelException{
private CElement createAbstractElement(Parent parent, IASTTypeSpecifierOwner abstractDeclaration, boolean isTemplate, boolean isDeclaration)throws ASTNotImplementedException, CModelException{
CElement element = null;
if(abstractDeclaration != null){
IASTTypeSpecifier typeSpec = abstractDeclaration.getTypeSpecifier();
@ -391,9 +392,11 @@ public class CModelBuilder {
else if (typeSpec instanceof IASTClassSpecifier){
IASTClassSpecifier classSpecifier = (IASTClassSpecifier) typeSpec;
element = createClassSpecifierElement (parent, classSpecifier, isTemplate);
} else if (typeSpec instanceof IASTElaboratedTypeSpecifier){
} else if (isDeclaration && typeSpec instanceof IASTElaboratedTypeSpecifier) {
// This is not a model element, so we don't create anything here.
// However, do we need to do anything else?
IASTElaboratedTypeSpecifier elabSpecifier = (IASTElaboratedTypeSpecifier) typeSpec;
element = createElaboratedTypeSpecifier(parent, elabSpecifier);
}
}
return element;
@ -414,6 +417,32 @@ public class CModelBuilder {
return element;
}
private StructureDeclaration createElaboratedTypeSpecifier(Parent parent, IASTElaboratedTypeSpecifier typeSpec) throws CModelException{
// create element
ASTClassKind classkind = typeSpec.getClassKind();
int kind = -1;
if (classkind == ASTClassKind.CLASS) {
kind = ICElement.C_CLASS_DECLARATION;
} else if (classkind == ASTClassKind.STRUCT) {
kind = ICElement.C_STRUCT_DECLARATION;
} else if (classkind == ASTClassKind.UNION) {
kind = ICElement.C_UNION_DECLARATION;
}
String className = (typeSpec.getName() == null)
? "" //$NON-NLS-1$
: typeSpec.getName().toString();
StructureDeclaration element = new StructureDeclaration(parent, className, kind);
// add to parent
parent.addChild(element);
// set position
element.setIdPos(typeSpec.getNameOffset(), typeSpec.getNameEndOffset() - typeSpec.getNameOffset());
element.setPos(typeSpec.getStartingOffset(), typeSpec.getEndingOffset() - typeSpec.getStartingOffset());
element.setLines(typeSpec.getStartingLine(), typeSpec.getEndingLine());
this.newElements.put(element, element.getElementInfo());
return element;
}
private Include createInclusion(Parent parent, IASTInclusion inclusion) throws CModelException{
// create element
Include element = new Include(parent, inclusion.getName(), !inclusion.isLocal());
@ -600,7 +629,7 @@ public class CModelBuilder {
}
IASTAbstractDeclaration abstractDeclaration = varDeclaration.getAbstractDeclaration();
CElement abstractElement = createAbstractElement (parent, abstractDeclaration , isTemplate);
CElement abstractElement = createAbstractElement (parent, abstractDeclaration , isTemplate, false);
VariableDeclaration element = null;
if(varDeclaration instanceof IASTField){

12
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelOperation.java
View file

@ -48,7 +48,7 @@ public abstract class CModelOperation implements IWorkspaceRunnable, IProgressMo
* or <code>null</code> if this operation
* does not operate with specific parent elements.
*/
protected ICElement[] fParentElements;
protected ICElement[] parentElements;
/**
* An empty collection of <code>ICElement</code>s - the common
@ -107,7 +107,7 @@ public abstract class CModelOperation implements IWorkspaceRunnable, IProgressMo
*/
protected CModelOperation(ICElement[] elementsToProcess, ICElement[] parentElements) {
fElementsToProcess = elementsToProcess;
fParentElements= parentElements;
this.parentElements= parentElements;
}
/**
@ -115,7 +115,7 @@ public abstract class CModelOperation implements IWorkspaceRunnable, IProgressMo
*/
protected CModelOperation(ICElement[] elementsToProcess, ICElement[] parentElements, boolean force) {
fElementsToProcess = elementsToProcess;
fParentElements= parentElements;
this.parentElements= parentElements;
fForce= force;
}
@ -387,10 +387,10 @@ public abstract class CModelOperation implements IWorkspaceRunnable, IProgressMo
* or <code>null</code> if not applicable.
*/
protected ICElement getParentElement() {
if (fParentElements == null || fParentElements.length == 0) {
if (parentElements == null || parentElements.length == 0) {
return null;
}
return fParentElements[0];
return parentElements[0];
}
/**
@ -398,7 +398,7 @@ public abstract class CModelOperation implements IWorkspaceRunnable, IProgressMo
* or <code>null</code> if not applicable.
*/
protected ICElement[] getParentElements() {
return fParentElements;
return parentElements;
}
/**

54
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyElementsOperation.java
View file

@ -9,6 +9,8 @@ import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICModelStatus;
import org.eclipse.cdt.core.model.ICModelStatusConstants;
import org.eclipse.cdt.core.model.IParent;
import org.eclipse.cdt.core.model.ISourceReference;
import org.eclipse.cdt.core.model.ITranslationUnit;
/**
* This operation copies/moves a collection of elements from their current
@ -77,27 +79,53 @@ public class CopyElementsOperation extends MultiOperation {
* Returns the nested operation to use for processing this element
*/
protected CModelOperation getNestedOperation(ICElement element) {
//ICElement dest = getDestinationParent(element);
switch (element.getElementType()) {
//case ICElement.C_INCLUDE:
// return new CreateIncludeOperation(element, dest);
//case ICElement.C_FUNCTION_DECLARATION :
// return new CreateFunctionDeclarationOperation(element, dest);
//case ICElement.C_FUNCTION :
// return new CreateFunctionOperation(element, dest);
ICElement dest = getDestinationParent(element);
ITranslationUnit unit = (ITranslationUnit)dest.getAncestor(ICElement.C_UNIT);
String name = element.getElementName();
int type = element.getElementType();
return new CreateSourceReferenceOperation(unit, name, type, getSourceFor(element));
// switch (element.getElementType()) {
// case ICElement.C_INCLUDE: {
// IInclude include = (IInclude)element;
// return new CreateIncludeOperation(include.getIncludeName(), include.isStandard(), unit);
// }
// case ICElement.C_FUNCTION_DECLARATION : {
// IFunctionDeclaration declaration = (IFunctionDeclaration)element;
// return new CreateFunctionDeclarationOperation(declaration.getElementName(), unit);
// }
// case ICElement.C_FUNCTION : {
// IFunction function = (IFunction)element;
// return new CreateFunctionOperation(function, unit);
// }
// case ICElement.C_STRUCTURE :
// return new CreateStructureOperation(element, dest, fForce);
//case ICElement.C_METHOD :
// return new CreateMethodOperation(element, dest, fForce);
// case ICElement.C_METHOD : {
// IMethod method = (IMethod)element;
// return new CreateMethodOperation(method, unit, fForce);
// }
// case ICElement.C_FIELD :
// return new CreateFieldOperation(element, dest, fForce);
// case ICElement.C_VARIABLE:
// return new CreateVariableOperation(element, dest);
default :
return null;
}
// default :
// return null;
// }
}
/**
* Returns the cached source for this element or compute it if not already cached.
*/
private String getSourceFor(ICElement element) {
if (element instanceof ISourceReference) {
ISourceReference source = (ISourceReference)element;
try {
return source.getSource();
} catch (CModelException e) {
//
}
}
return ""; //$NON-NLS-1$
}
/**
* Copy/move the element from the source to destination, renaming
* the elements as specified, honoring the collision policy.

135
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateElementInTUOperation.java
View file

@ -5,22 +5,14 @@ package org.eclipse.cdt.internal.core.model;
* All Rights Reserved.
*/
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import org.eclipse.cdt.core.model.*;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.IBuffer;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICModelStatus;
import org.eclipse.cdt.core.model.ICModelStatusConstants;
import org.eclipse.cdt.core.model.ISourceRange;
import org.eclipse.cdt.core.model.ISourceReference;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
/**
* <p>This abstract class implements behavior common to <code>CreateElementInCUOperations</code>.
@ -62,7 +54,7 @@ public abstract class CreateElementInTUOperation extends CModelOperation {
/**
* The element that is being created.
*/
protected ISourceReference fCreatedElement = null;
protected String fCreatedElement = null;
/**
* The element that the newly created element is
@ -129,6 +121,8 @@ public abstract class CreateElementInTUOperation extends CModelOperation {
setRelativePosition(sibling, INSERT_BEFORE);
}
protected abstract String generateElement(ITranslationUnit unit) throws CModelException;
/**
* Execute the operation - generate new source for the compilation unit
* and save the results.
@ -139,7 +133,7 @@ public abstract class CreateElementInTUOperation extends CModelOperation {
beginTask(getMainTaskName(), getMainAmountOfWork());
CElementDelta delta = newCElementDelta();
ITranslationUnit unit = getTranslationUnit();
// generateNewTranslationUnitDOM(unit);
fCreatedElement = generateElement(unit);
insertElement();
if (fCreationOccurred) {
//a change has really occurred
@ -147,29 +141,23 @@ public abstract class CreateElementInTUOperation extends CModelOperation {
if (buffer == null) return;
char[] bufferContents = buffer.getCharacters();
if (bufferContents == null) return;
//char[] elementContents = normalizeCRS(..);
char[] elementContents = fCreatedElement.getSource().toCharArray();
//IFile file = (IFile)((ICResource)unit).getResource();
//StringBuffer buffer = getContent(file);
char[] elementContents = Util.normalizeCRs(getCreatedElementCharacters(), bufferContents);
switch (fReplacementLength) {
case -1 :
// element is append at the end
//buffer.append(fCreatedElement.getSource());
buffer.append(elementContents);
break;
case 0 :
// element is inserted
//buffer.insert(fInsertionPosition, fCreatedElement.getSource());
buffer.replace(fInsertionPosition, 0, elementContents);
break;
default :
// element is replacing the previous one
buffer.replace(fInsertionPosition, fReplacementLength, fCreatedElement.getSource());
buffer.replace(fInsertionPosition, fReplacementLength, elementContents);
}
unit.save(null, false);
//save(buffer, file);
boolean isWorkingCopy = unit.isWorkingCopy();
//if (isWorkingCopy) {
// this.setAttributes(...);
@ -189,6 +177,10 @@ public abstract class CreateElementInTUOperation extends CModelOperation {
done();
}
private char[] getCreatedElementCharacters() {
return fCreatedElement.toCharArray();
}
/**
* Creates and returns the handle for the element this operation created.
*/
@ -314,9 +306,6 @@ public abstract class CreateElementInTUOperation extends CModelOperation {
}
if (fAnchorElement != null) {
ICElement domPresentParent = fAnchorElement.getParent();
//if (domPresentParent.getElementType() == ICElement.IMPORT_CONTAINER) {
// domPresentParent = domPresentParent.getParent();
//}
if (!domPresentParent.equals(getParentElement())) {
return new CModelStatus(ICModelStatusConstants.INVALID_SIBLING, fAnchorElement);
}
@ -324,106 +313,4 @@ public abstract class CreateElementInTUOperation extends CModelOperation {
return CModelStatus.VERIFIED_OK;
}
StringBuffer getContent(IFile file) throws CModelException {
InputStream stream = null;
try {
stream = new BufferedInputStream(file.getContents(true));
} catch (CoreException e) {
throw new CModelException(e);
}
try {
char [] b = getInputStreamAsCharArray(stream, -1, null);
return new StringBuffer(b.length).append(b);
} catch (IOException e) {
throw new CModelException(e, ICModelStatusConstants.IO_EXCEPTION);
} finally {
try {
if (stream != null)
stream.close();
} catch (IOException e) {
}
}
}
/**
* Returns the given input stream's contents as a character array.
* If a length is specified (ie. if length != -1), only length chars
* are returned. Otherwise all chars in the stream are returned.
* Note this doesn't close the stream.
* @throws IOException if a problem occured reading the stream.
*/
public static char[] getInputStreamAsCharArray(InputStream stream, int length, String encoding)
throws IOException {
InputStreamReader reader = null;
reader = encoding == null
? new InputStreamReader(stream)
: new InputStreamReader(stream, encoding);
char[] contents;
if (length == -1) {
contents = new char[0];
int contentsLength = 0;
int charsRead = -1;
do {
int available = stream.available();
// resize contents if needed
if (contentsLength + available > contents.length) {
System.arraycopy(
contents,
0,
contents = new char[contentsLength + available],
0,
contentsLength);
}
// read as many chars as possible
charsRead = reader.read(contents, contentsLength, available);
if (charsRead > 0) {
// remember length of contents
contentsLength += charsRead;
}
} while (charsRead > 0);
// resize contents if necessary
if (contentsLength < contents.length) {
System.arraycopy(
contents,
0,
contents = new char[contentsLength],
0,
contentsLength);
}
} else {
contents = new char[length];
int len = 0;
int readSize = 0;
while ((readSize != -1) && (len != length)) {
// See PR 1FMS89U
// We record first the read size. In this case len is the actual read size.
len += readSize;
readSize = reader.read(contents, len, length - len);
}
// See PR 1FMS89U
// Now we need to resize in case the default encoding used more than one byte for each
// character
if (len != length)
System.arraycopy(contents, 0, (contents = new char[len]), 0, len);
}
return contents;
}
void save (StringBuffer buffer, IFile file) throws CModelException {
byte[] bytes = buffer.toString().getBytes();
ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
// use a platform operation to update the resource contents
try {
boolean force = true;
file.setContents(stream, force, true, null); // record history
} catch (CoreException e) {
throw new CModelException(e);
}
}
}

30
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateFieldOperation.java
View file

@ -9,6 +9,7 @@ import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.IStructure;
import org.eclipse.cdt.core.model.ICModelStatus;
import org.eclipse.cdt.core.model.ITranslationUnit;
/**
* <p>This operation creates a field declaration in a type.
*
@ -19,6 +20,11 @@ import org.eclipse.cdt.core.model.ICModelStatus;
* </ul>
*/
public class CreateFieldOperation extends CreateMemberOperation {
/**
* Initializer for Element
*/
String fInitializer;
/**
* When executed, this operation will create a field with the given name
* in the given type with the specified source.
@ -27,8 +33,9 @@ public class CreateFieldOperation extends CreateMemberOperation {
* declaration, or as the first member in the type if there are no
* field declarations.
*/
public CreateFieldOperation(IStructure parentElement, String source, boolean force) {
super(parentElement, source, force);
public CreateFieldOperation(IStructure parentElement, String name, String returnType, String initializer, boolean force) {
super(parentElement, name, returnType, force);
fInitializer = initializer;
}
/**
@ -63,13 +70,28 @@ public class CreateFieldOperation extends CreateMemberOperation {
* @see CreateElementInCUOperation#generateResultHandle
*/
protected ICElement generateResultHandle() {
return getStructure().getField(fSource);
return getStructure().getField(fName);
}
/**
* @see CreateTypeMemberOperation#verifyNameCollision
*/
protected ICModelStatus verifyNameCollision() {
return CModelStatus.VERIFIED_OK;
return super.verifyNameCollision();
}
/* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.model.CreateElementInTUOperation#generateElement(org.eclipse.cdt.core.model.ITranslationUnit)
*/
protected String generateElement(ITranslationUnit unit) throws CModelException {
StringBuffer sb = new StringBuffer();
sb.append(fReturnType).append(' ');
sb.append(fName);
if (fInitializer != null && fInitializer.length() > 0) {
sb.append(' ').append('=').append(' ');
sb.append(fInitializer);
}
sb.append(';');
return sb.toString();
}
}

96
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateFunctionDeclarationOperation.java
View file

@ -1,96 +0,0 @@
package org.eclipse.cdt.internal.core.model;
/*
* (c) Copyright IBM Corp. 2000, 2001.
* All Rights Reserved.
*/
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.IInclude;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.core.model.ICModelStatus;
import org.eclipse.cdt.core.model.CModelException;
/**
* <p>This operation adds an include declaration to an existing translation unit.
* If the translation unit already includes the specified include declaration,
* the include is not generated (it does not generate duplicates).
*
* <p>Required Attributes:<ul>
* <li>Translation unit
* <li>Include name - the name of the include to add to the
* translation unit. For example: <code>"stdio.h"</code>
* </ul>
*/
public class CreateFunctionDeclarationOperation extends CreateElementInTUOperation {
/**
* The name of the include to be created.
*/
protected String fFunction;
/**
* When executed, this operation will add an include to the given translation unit.
*/
public CreateFunctionDeclarationOperation(String function, ITranslationUnit parentElement) {
super(parentElement);
fFunction = function;
}
/**
* @see CreateElementInCUOperation#generateResultHandle
*/
protected ICElement generateResultHandle() {
try {
return getTranslationUnit().getElement(fFunction);
} catch (CModelException e) {
}
return null;
}
/**
* @see CreateElementInCUOperation#getMainTaskName
*/
public String getMainTaskName(){
return "operation.createIncludeProgress"; //$NON-NLS-1$
}
/**
* Sets the correct position for the new include:<ul>
* <li> after the last include
* <li> if no include, before the first type
* <li> if no type, after the package statement
* <li> and if no package statement - first thing in the CU
*/
protected void initializeDefaultPosition() {
try {
ITranslationUnit tu = getTranslationUnit();
IInclude[] includes = tu.getIncludes();
if (includes.length > 0) {
createAfter(includes[includes.length - 1]);
return;
}
} catch (CModelException npe) {
}
}
/**
* Possible failures: <ul>
* <li>NO_ELEMENTS_TO_PROCESS - the compilation unit supplied to the operation is
* <code>null</code>.
* <li>INVALID_NAME - not a valid include declaration name.
* </ul>
* @see ICModelStatus
* @see CNamingConventions
*/
public ICModelStatus verify() {
ICModelStatus status = super.verify();
if (!status.isOK()) {
return status;
}
//if (CConventions.validateInclude(fIncludeName).getSeverity() == IStatus.ERROR) {
// return new CModelStatus(ICModelStatusConstants.INVALID_NAME, fIncludeName);
//}
return CModelStatus.VERIFIED_OK;
}
}

55
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateIncludeOperation.java
View file

@ -1,15 +1,26 @@
/**********************************************************************
* Copyright (c) 2002,2003,2004,2005 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors:
* QNX Software Systems - Initial API and implementation
***********************************************************************/
package org.eclipse.cdt.internal.core.model;
/*
* (c) Copyright IBM Corp. 2000, 2001.
* All Rights Reserved.
*/
import org.eclipse.cdt.core.CConventions;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICModelStatusConstants;
import org.eclipse.cdt.core.model.IInclude;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.core.model.ICModelStatus;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IStatus;
/**
* <p>This operation adds an include declaration to an existing translation unit.
@ -19,7 +30,7 @@ import org.eclipse.cdt.core.model.CModelException;
* <p>Required Attributes:<ul>
* <li>Translation unit
* <li>Include name - the name of the include to add to the
* translation unit. For example: <code>"stdio.h"</code>
* translation unit. For example: <code>stdio.h</code>
* </ul>
*/
public class CreateIncludeOperation extends CreateElementInTUOperation {
@ -29,11 +40,18 @@ public class CreateIncludeOperation extends CreateElementInTUOperation {
*/
protected String fIncludeName;
/**
* Whether the include is a std include.
*/
protected boolean fIsStandard;
/**
* When executed, this operation will add an include to the given translation unit.
*/
public CreateIncludeOperation(String includeName, ITranslationUnit parentElement) {
public CreateIncludeOperation(String includeName, boolean isStd, ITranslationUnit parentElement) {
super(parentElement);
fIsStandard = isStd;
fIncludeName = includeName;
}
@ -84,9 +102,28 @@ public class CreateIncludeOperation extends CreateElementInTUOperation {
if (!status.isOK()) {
return status;
}
//if (CConventions.validateInclude(fIncludeName).getSeverity() == IStatus.ERROR) {
// return new CModelStatus(ICModelStatusConstants.INVALID_NAME, fIncludeName);
//}
IProject project = getParentElement().getCProject().getProject();
if (CConventions.validateIncludeName(project, fIncludeName).getSeverity() == IStatus.ERROR) {
return new CModelStatus(ICModelStatusConstants.INVALID_NAME, fIncludeName);
}
return CModelStatus.VERIFIED_OK;
}
protected String generateElement(ITranslationUnit unit) throws CModelException {
StringBuffer sb = new StringBuffer();
sb.append("#include "); //$NON-NLS-1$;
if (fIsStandard) {
sb.append('<');
} else {
sb.append('"');
}
sb.append(fIncludeName);
if (fIsStandard) {
sb.append('>');
} else {
sb.append('"');
}
sb.append(Util.LINE_SEPARATOR);
return sb.toString();
}
}

36
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMemberOperation.java
View file

@ -1,14 +1,18 @@
/**********************************************************************
* Copyright (c) 2002,2003,2004,2005 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors:
* QNX Software Systems - Initial API and implementation
***********************************************************************/
package org.eclipse.cdt.internal.core.model;
/*
* (c) Copyright IBM Corp. 2000, 2001.
* All Rights Reserved.
*/
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.IStructure;
import org.eclipse.cdt.core.model.ICModelStatus;
import org.eclipse.cdt.core.model.ICModelStatusConstants;
/**
* Implements functionality common to
@ -16,9 +20,15 @@ import org.eclipse.cdt.core.model.ICModelStatusConstants;
*/
public abstract class CreateMemberOperation extends CreateElementInTUOperation {
/**
* The source code for the new member.
* The element Name
*/
protected String fSource = null;
protected String fName;
/**
* Element Type;
*/
protected String fReturnType;
/**
* The name of the <code>DOMNode</code> that may be used to
@ -31,9 +41,10 @@ public abstract class CreateMemberOperation extends CreateElementInTUOperation {
* When executed, this operation will create a type member
* in the given parent element with the specified source.
*/
public CreateMemberOperation(ICElement parentElement, String source, boolean force) {
public CreateMemberOperation(IStructure parentElement, String name, String returnType, boolean force) {
super(parentElement);
fSource= source;
fName = name;
fReturnType = returnType;
fForce= force;
}
@ -66,9 +77,6 @@ public abstract class CreateMemberOperation extends CreateElementInTUOperation {
if (!status.isOK()) {
return status;
}
if (fSource == null) {
return new CModelStatus(ICModelStatusConstants.INVALID_CONTENTS);
}
if (!fForce) {
//check for name collisions
//if (node == null) {

61
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMethodOperation.java
View file

@ -5,9 +5,12 @@ package org.eclipse.cdt.internal.core.model;
* All Rights Reserved.
*/
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICModelStatusConstants;
import org.eclipse.cdt.core.model.IStructure;
import org.eclipse.cdt.core.model.ICModelStatus;
import org.eclipse.cdt.core.model.ITranslationUnit;
/**
* <p>This operation creates an instance method.
@ -19,21 +22,33 @@ import org.eclipse.cdt.core.model.ICModelStatus;
* </ul>
*/
public class CreateMethodOperation extends CreateMemberOperation {
/**
* Parameter types of the element.
*/
protected String[] fParameterTypes;
/**
* The source code for the new member.
*/
protected String fSource;
/**
* When executed, this operation will create a method
* in the given type with the specified source.
*/
public CreateMethodOperation(IStructure parentElement, String source, boolean force) {
super(parentElement, source, force);
public CreateMethodOperation(IStructure parentElement, String name, String returnType, String source, String[] parameters, boolean force) {
super(parentElement, name, returnType, force);
fParameterTypes = parameters;
fSource = source;
}
/**
* @see CreateElementInCUOperation#generateResultHandle
*/
protected ICElement generateResultHandle() {
return getStructure().getMethod(fSource);
//TODO: what about collisions, we need the signature here.
return getStructure().getMethod(fName);
}
/**
@ -47,6 +62,46 @@ public class CreateMethodOperation extends CreateMemberOperation {
* @see CreateTypeMemberOperation#verifyNameCollision
*/
protected ICModelStatus verifyNameCollision() {
ICModelStatus status = super.verify();
if (!status.isOK()) {
return status;
}
if (fSource == null) {
return new CModelStatus(ICModelStatusConstants.INVALID_CONTENTS);
}
if (!fForce) {
//check for name collisions
//if (node == null) {
// return new CModelStatus(ICModelStatusConstants.INVALID_CONTENTS);
// }
//} catch (CModelException cme) {
//}
}
return CModelStatus.VERIFIED_OK;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.model.CreateElementInTUOperation#generateElement(org.eclipse.cdt.core.model.ITranslationUnit)
*/
protected String generateElement(ITranslationUnit unit) throws CModelException {
StringBuffer sb = new StringBuffer();
sb.append(fReturnType);
sb.append(' ');
sb.append(fName);
sb.append('(');
if (fParameterTypes != null) {
for (int i = 0; i < fParameterTypes.length; ++i) {
if (i != 0) {
sb.append(',').append(' ');
}
sb.append(fParameterTypes[i]);
}
}
sb.append(')').append(' ').append('{').append(Util.LINE_SEPARATOR);
sb.append(fSource);
sb.append(Util.LINE_SEPARATOR).append('}').append(Util.LINE_SEPARATOR);
return sb.toString();
}
}

83
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateSourceReferenceOperation.java Normal file
View file

@ -0,0 +1,83 @@
/**********************************************************************
* Copyright (c) 2002,2003,2004 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors:
* QNX Software Systems - Initial API and implementation
***********************************************************************/
package org.eclipse.cdt.internal.core.model;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ITranslationUnit;
/**
* CreateSourceReferenceOperation
*/
public class CreateSourceReferenceOperation extends CreateElementInTUOperation {
/**
* Element Name
*/
String fName;
/**
* Element Type
*/
int fElementType;
/**
* Source Reference element to copy to parent
*/
String fSource;
/**
* @param parentElement
*/
public CreateSourceReferenceOperation(ICElement parentElement, String name, int elementType, String source) {
super(parentElement);
fName = name;
fElementType = elementType;
fSource = source;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.model.CreateElementInTUOperation#generateElement(org.eclipse.cdt.core.model.ITranslationUnit)
*/
protected String generateElement(ITranslationUnit unit) throws CModelException {
return fSource;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.model.CreateElementInTUOperation#generateResultHandle()
*/
protected ICElement generateResultHandle() {
ITranslationUnit unit = getTranslationUnit();
try {
ICElement[] celements = unit.getChildren();
for (int i = 0; i < celements.length; ++i) {
if (celements[i].getElementType() == fElementType) {
String name = celements[i].getElementName();
if (name.equals(fName)) {
return celements[i];
}
}
}
} catch (CModelException e) {
//
}
return null;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.model.CreateElementInTUOperation#getMainTaskName()
*/
protected String getMainTaskName() {
return "operation.createsourceReference"; //$NON-NLS-1$
}
}

8
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java
View file

@ -10,21 +10,17 @@ import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.IFunctionDeclaration;
public class FunctionDeclaration extends SourceManipulation implements IFunctionDeclaration {
/**
* An empty list of Strings
*/
protected static final String[] fgEmptyList= new String[] {};
protected String[] fParameterTypes;
protected String returnType;
public FunctionDeclaration(ICElement parent, String name) {
super(parent, name, ICElement.C_FUNCTION_DECLARATION);
fParameterTypes= fgEmptyList;
fParameterTypes= fgEmptyStrings;
}
public FunctionDeclaration(ICElement parent, String name, int type) {
super(parent, name, type);
fParameterTypes= fgEmptyList;
fParameterTypes= fgEmptyStrings;
}
public String getReturnType(){

1
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionInfo.java
View file

@ -55,6 +55,7 @@ class FunctionInfo extends SourceManipulationInfo {
return (super.hasSameContentsAs(otherInfo)
&& (this.isStatic() == ((FunctionInfo)otherInfo).isStatic())
&& (this.isVolatile() == ((FunctionInfo)otherInfo).isVolatile())
&& (this.isConst() == ((FunctionInfo)otherInfo).isConst())
);
}

3
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionTemplate.java
View file

@ -17,12 +17,11 @@ import org.eclipse.cdt.core.model.ITemplate;
public class FunctionTemplate extends FunctionDeclaration implements ITemplate{
protected static final String[] fgEmptyList= new String[] {};
protected String[] templateParameterTypes;
public FunctionTemplate(ICElement parent, String name) {
super(parent, name, ICElement.C_TEMPLATE_FUNCTION);
templateParameterTypes= fgEmptyList;
templateParameterTypes= fgEmptyStrings;
}
/**

10
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodInfo.java
View file

@ -19,7 +19,6 @@ public class MethodInfo extends FunctionInfo {
boolean isInline = false;
boolean isVirtual = false;
boolean isFriend = false;
boolean isConst = false;
ASTAccessVisibility visibility = null;
MethodInfo(CElement element) {
@ -59,14 +58,6 @@ public class MethodInfo extends FunctionInfo {
this.isFriend = isFriend;
}
public boolean isConst(){
return isConst;
}
public void setConst(boolean isConst){
this.isConst = isConst;
}
/**
* Returns the visibility.
* @return int
@ -88,7 +79,6 @@ public class MethodInfo extends FunctionInfo {
*/
public boolean hasSameContentsAs(SourceManipulationInfo otherInfo) {
return (super.hasSameContentsAs(otherInfo)
&& (isConst == ((MethodInfo)otherInfo).isConst())
&& (isPureVirtual == ((MethodInfo)otherInfo).isPureVirtual())
&& (isInline == ((MethodInfo)otherInfo).isInline())
&& (isVirtual == ((MethodInfo)otherInfo).isVirtual())

5
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java
View file

@ -23,6 +23,11 @@ import org.eclipse.core.runtime.IProgressMonitor;
public class SourceManipulation extends Parent implements ISourceManipulation, ISourceReference {
/**
* An empty list of Strings
*/
protected static final String[] fgEmptyStrings = {};
public SourceManipulation(ICElement parent, String name, int type) {
super(parent, name, type);
}

51
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulationInfo.java
View file

@ -5,15 +5,12 @@ package org.eclipse.cdt.internal.core.model;
* All Rights Reserved.
*/
import java.io.IOException;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.IBuffer;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICModelStatusConstants;
import org.eclipse.cdt.core.model.ISourceRange;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IProgressMonitor;
/**
@ -43,23 +40,39 @@ class SourceManipulationInfo extends CElementInfo {
* @see ISourceReference
*/
public String getSource() throws CModelException {
ITranslationUnit tu = getTranslationUnit();
if (tu != null) {
ITranslationUnit unit = getTranslationUnit();
IBuffer buffer = unit.getBuffer();
if (buffer == null) {
return null;
}
int offset = getElement().getStartPos();
int length = getElement().getLength();
if (offset == -1 || length == 0 ) {
return null;
}
try {
IResource res = tu.getResource();
if (res != null && res instanceof IFile) {
StringBuffer buffer = Util.getContent((IFile)res);
return buffer.substring(getElement().getStartPos(),
getElement().getStartPos() + getElement().getLength());
return buffer.getText(offset, length);
} catch(RuntimeException e) {
return null;
}
} catch (IOException e) {
throw new CModelException(e, ICModelStatusConstants.IO_EXCEPTION);
} catch (StringIndexOutOfBoundsException bound) {
// This is not good we screwed up the offset some how
throw new CModelException(bound, ICModelStatusConstants.INDEX_OUT_OF_BOUNDS);
}
}
return ""; //$NON-NLS-1$
// ITranslationUnit tu = getTranslationUnit();
// if (tu != null) {
// try {
// IResource res = tu.getResource();
// if (res != null && res instanceof IFile) {
// StringBuffer buffer = Util.getContent((IFile)res);
// return buffer.substring(getElement().getStartPos(),
// getElement().getStartPos() + getElement().getLength());
// }
// } catch (IOException e) {
// throw new CModelException(e, ICModelStatusConstants.IO_EXCEPTION);
// } catch (StringIndexOutOfBoundsException bound) {
// // This is not good we screwed up the offset some how
// throw new CModelException(bound, ICModelStatusConstants.INDEX_OUT_OF_BOUNDS);
// }
// }
// return ""; //$NON-NLS-1$
}
/**

54
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Structure.java
View file

@ -17,7 +17,7 @@ import org.eclipse.cdt.core.model.IMethodDeclaration;
import org.eclipse.cdt.core.model.IStructure;
import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
public class Structure extends SourceManipulation implements IStructure {
public class Structure extends StructureDeclaration implements IStructure {
Map superClassesNames = new TreeMap();
@ -66,18 +66,6 @@ public class Structure extends SourceManipulation implements IStructure {
return null;
}
public boolean isUnion() throws CModelException {
return getStructureInfo().isUnion();
}
public boolean isClass() throws CModelException {
return getStructureInfo().isClass();
}
public boolean isStruct() throws CModelException {
return getStructureInfo().isStruct();
}
public boolean isAbstract() throws CModelException {
IMethodDeclaration[] methods = getMethods();
for(int i=0; i<methods.length; i++){
@ -96,42 +84,6 @@ public class Structure extends SourceManipulation implements IStructure {
return (ASTAccessVisibility)superClassesNames.get(name);
}
public String getTypeName() throws CModelException {
return getStructureInfo().getTypeName();
}
public void setTypeName(String type) throws CModelException{
getStructureInfo().setTypeString(type);
}
public boolean isConst() throws CModelException {
return getStructureInfo().isConst();
}
public void setConst(boolean isConst) throws CModelException {
getStructureInfo().setConst(isConst);
}
public boolean isVolatile() throws CModelException {
return getStructureInfo().isVolatile();
}
public void setVolatile(boolean isVolatile) throws CModelException {
getStructureInfo().setVolatile(isVolatile);
}
public boolean isStatic() throws CModelException {
return getStructureInfo().isStatic();
}
public void setStatic(boolean isStatic) throws CModelException {
getStructureInfo().setStatic(isStatic);
}
public StructureInfo getStructureInfo() throws CModelException{
return (StructureInfo) getElementInfo();
}
public void addSuperClass(String name) {
superClassesNames.put(name, ASTAccessVisibility.PUBLIC);
}
@ -140,8 +92,4 @@ public class Structure extends SourceManipulation implements IStructure {
superClassesNames.put(name, access);
}
protected CElementInfo createElementInfo () {
return new StructureInfo(this);
}
}

81
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureDeclaration.java Normal file
View file

@ -0,0 +1,81 @@
/**********************************************************************
* Copyright (c) 2002,2003,2004 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors:
* QNX Software Systems - Initial API and implementation
***********************************************************************/
package org.eclipse.cdt.internal.core.model;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.IStructureDeclaration;
/**
* StructureDeclaration
*/
public class StructureDeclaration extends SourceManipulation implements IStructureDeclaration {
/**
* @param parent
* @param name
* @param type
*/
public StructureDeclaration(ICElement parent, String name, int kind) {
super(parent, name, kind);
}
public String getTypeName() throws CModelException {
return getStructureInfo().getTypeName();
}
public void setTypeName(String type) throws CModelException {
getStructureInfo().setTypeName(type);
}
public boolean isUnion() throws CModelException {
return getStructureInfo().isUnion();
}
public boolean isClass() throws CModelException {
return getStructureInfo().isClass();
}
public boolean isStruct() throws CModelException {
return getStructureInfo().isStruct();
}
public StructureInfo getStructureInfo() throws CModelException{
return (StructureInfo) getElementInfo();
}
protected CElementInfo createElementInfo () {
return new StructureInfo(this);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.IDeclaration#isStatic()
*/
public boolean isStatic() throws CModelException {
return getStructureInfo().isStatic();
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.IDeclaration#isConst()
*/
public boolean isConst() throws CModelException {
return getStructureInfo().isConst();
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.model.IDeclaration#isVolatile()
*/
public boolean isVolatile() throws CModelException {
return getStructureInfo().isVolatile();
}
}

71
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureInfo.java
View file

@ -1,5 +1,3 @@
package org.eclipse.cdt.internal.core.model;
/**********************************************************************
* Copyright (c) 2002,2003 Rational Software Corporation and others.
* All rights reserved. This program and the accompanying materials
@ -10,19 +8,27 @@ package org.eclipse.cdt.internal.core.model;
* Contributors:
* Rational Software - Initial API and implementation
***********************************************************************/
package org.eclipse.cdt.internal.core.model;
import org.eclipse.cdt.core.model.ICElement;
public class StructureInfo extends VariableInfo {
public class StructureInfo extends SourceManipulationInfo {
protected String typeStr;
protected boolean isStatic;
protected boolean isVolatile;
protected boolean isConst;
protected StructureInfo (CElement element) {
super(element);
}
if (element.getElementType() == ICElement.C_CLASS)
this.setTypeName("class"); //$NON-NLS-1$
else if (element.getElementType() == ICElement.C_UNION)
this.setTypeName("union"); //$NON-NLS-1$
else
this.setTypeName("struct"); //$NON-NLS-1$
protected String getTypeName(){
return typeStr;
}
protected void setTypeName(String type){
typeStr = type;
}
public boolean isUnion() {
@ -37,5 +43,52 @@ public class StructureInfo extends VariableInfo {
return element.getElementType() == ICElement.C_STRUCT;
}
/**
* Returns the isStatic.
* @return boolean
*/
public boolean isStatic() {
return isStatic;
}
/**
* Sets the isStatic.
* @param isStatic The isStatic to set
*/
public void setStatic(boolean isStatic) {
this.isStatic = isStatic;
}
/**
* Returns the isVolatile.
* @return boolean
*/
public boolean isVolatile() {
return isVolatile;
}
/**
* Sets the isVolatile.
* @param isVolatile The isVolatile to set
*/
public void setVolatile(boolean isVolatile) {
this.isVolatile = isVolatile;
}
/**
* Returns the isConst.
* @return boolean
*/
public boolean isConst() {
return isConst;
}
/**
* Sets the isConst.
* @param isConst The isConst to set
*/
public void setConst(boolean isConst) {
this.isConst = isConst;
}
}

117
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java
View file

@ -15,6 +15,7 @@ import org.eclipse.cdt.core.ICLogConstants;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICModelStatusConstants;
import org.eclipse.cdt.internal.core.model.IDebugLogConstants.DebugLogConstant;
import org.eclipse.cdt.internal.core.util.CharArrayBuffer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
@ -25,6 +26,8 @@ public class Util implements ICLogConstants {
public static boolean VERBOSE_SCANNER = false;
public static boolean VERBOSE_MODEL = false;
public static String LINE_SEPARATOR = System.getProperty("line.separator"); //$NON-NLS-1$
private Util() {
}
@ -297,4 +300,118 @@ public class Util implements ICLogConstants {
}
return a.equals(b);
}
/**
* Normalizes the cariage returns in the given text.
* They are all changed to use the given buffer's line separator.
*/
public static char[] normalizeCRs(char[] text, char[] buffer) {
CharArrayBuffer result = new CharArrayBuffer();
int lineStart = 0;
int length = text.length;
if (length == 0) return text;
String lineSeparator = getLineSeparator(text, buffer);
char nextChar = text[0];
for (int i = 0; i < length; i++) {
char currentChar = nextChar;
nextChar = i < length-1 ? text[i+1] : ' ';
switch (currentChar) {
case '\n':
int lineLength = i-lineStart;
char[] line = new char[lineLength];
System.arraycopy(text, lineStart, line, 0, lineLength);
result.append(line);
result.append(lineSeparator);
lineStart = i+1;
break;
case '\r':
lineLength = i-lineStart;
if (lineLength >= 0) {
line = new char[lineLength];
System.arraycopy(text, lineStart, line, 0, lineLength);
result.append(line);
result.append(lineSeparator);
if (nextChar == '\n') {
nextChar = ' ';
lineStart = i+2;
} else {
// when line separator are mixed in the same file
// \r might not be followed by a \n. If not, we should increment
// lineStart by one and not by two.
lineStart = i+1;
}
} else {
// when line separator are mixed in the same file
// we need to prevent NegativeArraySizeException
lineStart = i+1;
}
break;
}
}
char[] lastLine;
if (lineStart > 0) {
int lastLineLength = length-lineStart;
if (lastLineLength > 0) {
lastLine = new char[lastLineLength];
System.arraycopy(text, lineStart, lastLine, 0, lastLineLength);
result.append(lastLine);
}
return result.getContents();
}
return text;
}
/**
* Normalizes the cariage returns in the given text.
* They are all changed to use given buffer's line sepatator.
*/
public static String normalizeCRs(String text, String buffer) {
return new String(normalizeCRs(text.toCharArray(), buffer.toCharArray()));
}
/**
* Returns the line separator used by the given buffer.
* Uses the given text if none found.
*
* @return </code>"\n"</code> or </code>"\r"</code> or </code>"\r\n"</code>
*/
private static String getLineSeparator(char[] text, char[] buffer) {
// search in this buffer's contents first
String lineSeparator = findLineSeparator(buffer);
if (lineSeparator == null) {
// search in the given text
lineSeparator = findLineSeparator(text);
if (lineSeparator == null) {
// default to system line separator
return LINE_SEPARATOR;
}
}
return lineSeparator;
}
/**
* Finds the first line separator used by the given text.
*
* @return </code>"\n"</code> or </code>"\r"</code> or </code>"\r\n"</code>,
* or <code>null</code> if none found
*/
public static String findLineSeparator(char[] text) {
// find the first line separator
int length = text.length;
if (length > 0) {
char nextChar = text[0];
for (int i = 0; i < length; i++) {
char currentChar = nextChar;
nextChar = i < length-1 ? text[i+1] : ' ';
switch (currentChar) {
case '\n': return "\n"; //$NON-NLS-1$
case '\r': return nextChar == '\n' ? "\r\n" : "\r"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
}
// not found
return null;
}
}

225
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/CharArrayBuffer.java Normal file
View file

@ -0,0 +1,225 @@
/**********************************************************************
* Copyright (c) 2002,2003,2004 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors:
* QNX Software Systems - Initial API and implementation
***********************************************************************/
package org.eclipse.cdt.internal.core.util;
/**
* The <code>CharArrayBuffer</code> is intended as a lightweight partial
* implementation of the StringBuffer class, but using <code>char[]'s</code>
* instead of Strings.
*
* <p>
* The <code>CharArrayBuffer</code> maintains a list of <code>char[]'s</code>
* which don't get appended until the user asks for them. The following code
* illustrates how to use the class.
*
* <code>
* CharArrayBuffer buffer = new CharArrayBuffer(myCharArray);
* buffer.append(moreBytes, 0, someLength);
* myCharArray = buffer.getContents();
* </code>
*
* <p>
* NOTE: This class is not Thread safe!
*/
public class CharArrayBuffer {
/**
* This is the buffer of char arrays which must be appended together during
* the getContents method.
*/
protected char[][] fBuffer;
/**
* The default buffer size.
*/
public static final int DEFAULT_BUFFER_SIZE = 10;
/**
* The end of the buffer
*/
protected int fEnd;
/**
* The current size of the buffer.
*/
protected int fSize;
/**
* A buffer of ranges which is maintained along with the buffer. Ranges are
* of the form {start, length}. Enables append(char[] array, int start, int
* end).
*/
protected int[][] fRanges;
/**
* Creates a <code>CharArrayBuffer</code> with the default buffer size
* (10).
*/
public CharArrayBuffer() {
this(null, DEFAULT_BUFFER_SIZE);
}
/**
* Creates a <code>CharArrayBuffer</code> with the default buffer size,
* and sets the first element in the buffer to be the given char[].
*
* @param first -
* the first element to be placed in the buffer, ignored if null
*/
public CharArrayBuffer(char[] first) {
this(first, DEFAULT_BUFFER_SIZE);
}
/**
* Creates a <code>CharArrayBuffer</code> with the given buffer size, and
* sets the first element in the buffer to be the given char array.
*
* @param first -
* the first element of the buffer, ignored if null.
* @param size -
* the buffer size, if less than 1, set to the
* DEFAULT_BUFFER_SIZE.
*/
public CharArrayBuffer(char[] first, int size) {
fSize = (size > 0) ? size : DEFAULT_BUFFER_SIZE;
fBuffer = new char[fSize][];
fRanges = new int[fSize][];
fEnd = 0;
if (first != null)
append(first, 0, first.length);
}
/**
* Creates a <code>CharArrayBuffer</code> with the given buffer size.
*
* @param size -
* the size of the buffer.
*/
public CharArrayBuffer(int size) {
this(null, size);
}
/**
* Appends the entire given char array. Given for convenience.
*
* @param src -
* a char array which is appended to the end of the buffer.
*/
public CharArrayBuffer append(char[] src) {
if (src != null)
append(src, 0, src.length);
return this;
}
/**
* Appends a sub array of the given array to the buffer.
*
* @param src -
* the next array of characters to be appended to the buffer,
* ignored if null
* @param start -
* the start index in the src array.
* @param length -
* the number of characters from start to be appended
*
* @throws ArrayIndexOutOfBoundsException -
* if arguments specify an array index out of bounds.
*/
public CharArrayBuffer append(char[] src, int start, int length) {
if (start < 0)
throw new ArrayIndexOutOfBoundsException();
if (length < 0)
throw new ArrayIndexOutOfBoundsException();
if (src != null) {
int srcLength = src.length;
if (start > srcLength)
throw new ArrayIndexOutOfBoundsException();
if (length + start > srcLength)
throw new ArrayIndexOutOfBoundsException();
/** do length check here to allow exceptions to be thrown */
if (length > 0) {
if (fEnd == fSize) {
int size2 = fSize * 2;
System.arraycopy(fBuffer, 0, (fBuffer = new char[size2][]),
0, fSize);
System.arraycopy(fRanges, 0, (fRanges = new int[size2][]),
0, fSize);
fSize *= 2;
}
fBuffer[fEnd] = src;
fRanges[fEnd] = new int[] { start, length };
fEnd++;
}
}
return this;
}
/**
* Appends the given char. Given for convenience.
*
* @param c -
* a char which is appended to the end of the buffer.
*/
public CharArrayBuffer append(char c) {
append(new char[] { c }, 0, 1);
return this;
}
/**
* Appends the given String to the buffer. Given for convenience, use
* #append(char[]) if possible
*
* @param src -
* a char array which is appended to the end of the buffer.
*/
public CharArrayBuffer append(String src) {
if (src != null)
append(src.toCharArray(), 0, src.length());
return this;
}
/**
* Returns the entire contents of the buffer as one char[] or null if
* nothing has been put in the buffer.
*/
public char[] getContents() {
if (fEnd == 0)
return null;
// determine the size of the array
int size = 0;
for (int i = 0; i < fEnd; i++)
size += fRanges[i][1];
if (size > 0) {
char[] result = new char[size];
int current = 0;
// copy the results
for (int i = 0; i < fEnd; i++) {
int[] range = fRanges[i];
int length = range[1];
System.arraycopy(fBuffer[i], range[0], result, current, length);
current += length;
}
return result;
}
return null;
}
/**
* Returns the contents of the buffer as a String, or <code>null</code> if
* the buffer is empty.
*/
public String toString() {
char[] contents = getContents();
return (contents != null) ? new String(contents) : null;
}
}

31
core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CConventions.java
View file

@ -26,6 +26,7 @@ import org.eclipse.cdt.internal.core.Util;
import org.eclipse.cdt.internal.core.model.CModelStatus;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
/**
@ -35,7 +36,7 @@ public class CConventions {
private final static String scopeResolutionOperator= "::"; //$NON-NLS-1$
private final static char fgDot= '.';
private final static String ILLEGAL_FILE_CHARS = "/\\:<>?*|\"";
private final static String ILLEGAL_FILE_CHARS = "/\\:<>?*|\""; //$NON-NLS-1$
private static boolean isLegalIdentifier(String name) {
if (name == null) {
@ -290,6 +291,34 @@ public class CConventions {
return validateIdentifier(name);
}
/**
* Validate the given include name.
* <p>
* The name of an include without the surroounding double quotes or brakets
* For example, <code>stdio.h</code> or <code>iostream</code>.
*
* @param name the include declaration
* @return a status object with code <code>IStatus.OK</code> if
* the given name is valid as an include name, otherwise a status
* object indicating what is wrong with the name
*/
public static IStatus validateIncludeName(IProject project, String name) {
String[] segments = new Path(name).segments();
for (int i = 0; i < segments.length; ++i) {
IStatus status;
if (i == (segments.length - 1)) {
status = validateHeaderFileName(project, segments[i]);
} else {
status = validateFileName(segments[i]);
}
if (!status.isOK()) {
return status;
}
}
return CModelStatus.VERIFIED_OK;
}
public static boolean isValidIdentifier(String name){
// create a scanner and get the type of the token
// assuming that you are given a valid identifier