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

2005-01-13 Alain Magloire

Browse source 
PR 82764 Fix the the type parsing.
	* mi/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java
This commit is contained in:
Alain Magloire 2005-01-13 20:23:35 +00:00
parent cfdbde0d64
commit f814de106b
2 changed files with 55 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debug/org.eclipse.cdt.debug.mi.core/ChangeLog
View file

@ -1,3 +1,7 @@
2005-01-13 Alain Magloire
PR 82764 Fix the the type parsing.
* mi/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java
2005-01-10 Mikhail Khodjaiants
PR 82601 changes to the memory block interface
* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/ICDIMemoryBlock.java

58
debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java
View file

@ -301,13 +301,34 @@ public class GDBTypeParser {
//char character = (char) c;
if (c == '(') {
if ((c = getch()) == ')') {
c = getch();
if (c == ')') {
token = "()"; //$NON-NLS-1$
tokenType = PARENS;
} else if (isCIdentifierStart(c)) {
int i = 0;
token += (char)c;
while (i == 0 && c != ')') {
if (c == EOF) {
// Unbalanced parantheses.
break;
}
c = getch();
token += (char)c;
if (c == '(') {
++i;
} else if (c == ')') {
--i;
}
}
tokenType = PARENS;
} else {
ungetch();
tokenType = '(';
}
} else if (c == '[') {
while ((c = getch()) != ']' && c != EOF) {
token += (char) c;
@ -372,8 +393,9 @@ public class GDBTypeParser {
if (tokenType == '(') {
dcl();
if (tokenType != ')') {
// FIXME: Do we throw an exception ? not terminate parenthese
if (tokenType != ')' /*&& name.length() > 0*/) {
// Do we throw an exception on unterminated parentheses
// It should have been handle by getToken()
return;
}
} else if (tokenType == NAME) {
@ -396,12 +418,9 @@ public class GDBTypeParser {
}
while ((type = getToken()) == PARENS || type == BRACKETS) {
if (type == EOF) {
return;
}
if (type == PARENS) {
insertingChild(GDBType.FUNCTION);
} else {
} else { /* BRACKETS */
int len = 0;
if (token.length() > 0) {
try {
@ -483,5 +502,30 @@ public class GDBTypeParser {
System.out.println(GDBTypeParser.unParse(parser.getGDBType()));
System.out.println(parser.getGDBType().verbose());
System.out.println();
System.out.println("int (int, char **)"); //$NON-NLS-1$
parser.parse("int (int, char **)"); //$NON-NLS-1$
System.out.println(GDBTypeParser.unParse(parser.getGDBType()));
System.out.println(parser.getGDBType().verbose());
System.out.println();
System.out.println("int (int)"); //$NON-NLS-1$
parser.parse("int (int)"); //$NON-NLS-1$
System.out.println(GDBTypeParser.unParse(parser.getGDBType()));
System.out.println(parser.getGDBType().verbose());
System.out.println();
System.out.println("int (void)"); //$NON-NLS-1$
parser.parse("int (void)"); //$NON-NLS-1$
System.out.println(GDBTypeParser.unParse(parser.getGDBType()));
System.out.println(parser.getGDBType().verbose());
System.out.println();
System.out.println("int ()"); //$NON-NLS-1$
parser.parse("int ()"); //$NON-NLS-1$
System.out.println(GDBTypeParser.unParse(parser.getGDBType()));
System.out.println(parser.getGDBType().verbose());
System.out.println();
}
}