From a2d082773986785b0b920b01aa155144f21f9d3c Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Tue, 14 Oct 2003 04:50:09 +0000 Subject: [PATCH] use of simple macro to count the brackets. --- .../ui/text/makefile/MakefileSimpleMacroRule.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileSimpleMacroRule.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileSimpleMacroRule.java index a49c1da44b2..fd21cbdef3d 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileSimpleMacroRule.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileSimpleMacroRule.java @@ -21,10 +21,10 @@ public class MakefileSimpleMacroRule extends PatternRule { public MakefileSimpleMacroRule(IToken token) { super("$(", ")", token, (char) 0, true); //$NON-NLS-1$ //$NON-NLS-2$ } - - protected IToken doEvaluate(ICharacterScanner scanner) { + + protected IToken doEvaluate(ICharacterScanner scanner, boolean resume) { nOfBrackets = 1; - return super.doEvaluate(scanner); + return super.doEvaluate(scanner, resume); } protected boolean endSequenceDetected(ICharacterScanner scanner) { @@ -33,6 +33,9 @@ public class MakefileSimpleMacroRule extends PatternRule { while ((c = scanner.read()) != ICharacterScanner.EOF) { if ('(' == (char) c) ++nOfBrackets; + if ('(' == (char)c) + --nOfBrackets; + if (fEndSequence.length > 0 && c == fEndSequence[0]) { // Check if the specified end sequence has been found. if (sequenceDetected(scanner, fEndSequence, true)) {