mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 21:35:40 +02:00
Code Issues Wiki Activity

Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=58717

Browse source
This commit is contained in:
John Camelon 2004-04-20 20:38:20 +00:00
parent 93c7225abf
commit d72a8b3f5d
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.core/parser/ChangeLog-parser
View file

@ -1,3 +1,6 @@
2004-04-20 John Camelon
Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=58717
2004-04-20 John Camelon 2004-04-20 John Camelon
Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=59134 Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=59134
Partially fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=58858 Partially fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=58858

17
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ScannerUtility.java
View file

@ -36,6 +36,8 @@ public class ScannerUtility {
*/ */
static String reconcilePath(String originalPath ) { static String reconcilePath(String originalPath ) {
if( originalPath == null ) return null; if( originalPath == null ) return null;
originalPath = removeQuotes( originalPath );
String [] segments = originalPath.split( "[/\\\\]" ); //$NON-NLS-1$ String [] segments = originalPath.split( "[/\\\\]" ); //$NON-NLS-1$
if( segments.length == 1 ) return originalPath; if( segments.length == 1 ) return originalPath;
Vector results = new Vector(); Vector results = new Vector();
@ -63,6 +65,21 @@ public class ScannerUtility {
} }
/**
* @param originalPath
* @return
*/
private static String removeQuotes(String originalPath) {
String [] segments = originalPath.split( "\"");
if( segments.length == 1 ) return originalPath;
StringBuffer result = new StringBuffer();
for( int i = 0; i < segments.length; ++ i )
if( segments[i] != null )
result.append( segments[i]);
return result.toString();
}
static CodeReader createReaderDuple( String path, String fileName, ISourceElementRequestor requestor, Iterator workingCopies ) static CodeReader createReaderDuple( String path, String fileName, ISourceElementRequestor requestor, Iterator workingCopies )
{ {
String finalPath = createReconciledPath(path, fileName); String finalPath = createReconciledPath(path, fileName);