From effb8b9fdb22341b2fa554abf1eefabf7dad4915 Mon Sep 17 00:00:00 2001 From: John Camelon Date: Fri, 4 Jun 2004 15:30:09 +0000 Subject: [PATCH] Patch for David Daoust -Optimize the scanner to not tokenize the macro parameters if the expansion is null. --- .../eclipse/cdt/internal/core/parser/scanner/Scanner.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Scanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Scanner.java index e3706590b30..eeb4b1d490a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Scanner.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Scanner.java @@ -3292,11 +3292,15 @@ public final class Scanner implements IScanner, IScannerData { c = getChar( true ); } - // Position of the closing ')' - int endMacroOffset = lastContext.getOffset() - 1; String betweenTheBrackets = strbuff.toString().trim(); + if (expansion.getExpansionSignature() == EMPTY_STRING) { + return; // + } + // Position of the closing ')' + int endMacroOffset = lastContext.getOffset() - 1; + Vector parameterValues = getMacroParameters(betweenTheBrackets, false); Vector parameterValuesForStringizing = null; SimpleToken t = null;