← Back to branch summary

~ubuntu-branches/debian/experimental/geany/experimental

« back to all changes in this revision

Viewing changes to scintilla/LexPascal.cxx

  • Committer: Bazaar Package Importer
  • Author(s): Damián Viano
  • Date: 2008-05-02 11:37:45 UTC
  • mfrom: (1.2.1 upstream) (3.1.6 hardy)
  • Revision ID: james.westby@ubuntu.com-20080502113745-xzp4g6dmovrpoj17
Tags: 0.14-1
http://bugs.debian.org/478126
New upstream release (Closes: #478126)

Show diffs side-by-side

added added

removed removed

Lines of Context:
scintilla/LexPascal.cxx
21
21
#include "SciLexer.h"
22
22
#include "StyleContext.h"
23
23
 
 
24
#ifdef SCI_NAMESPACE
 
25
using namespace Scintilla;
 
26
#endif
 
27
 
24
28
static void getRange(unsigned int start,
25
29
                unsigned int end,
26
30
                Accessor &styler,
187
191
                        }
188
192
                } else if (state == SCE_C_IDENTIFIER) {
189
193
                        bool bDoublePoint = ((ch == '.') && (chPrev == '.'));
190
 
                        if ((!iswordchar(ch) && ch != '$' && ch != '#' && (ch != '@' || !bInAsm)) || bDoublePoint) {
 
194
                        bool bSinglePoint = (ch == '.');
 
195
 
 
196
                        if ((!iswordchar(ch) && ch != '$' && ch != '#' && (ch != '@' || !bInAsm)) || bDoublePoint || bSinglePoint) {
191
197
                                if (bDoublePoint) i--;
192
198
                                int lStateChange = classifyWordPascal(styler.GetStartSegment(), i - 1, keywordlists, styler, bInClassDefinition, bInAsm);
193
199
 
289
295
                styleNext = styler.StyleAt(i + 1);
290
296
                bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
291
297
 
292
 
                if (stylePrev == SCE_C_DEFAULT && style == SCE_C_WORD)
 
298
                if (stylePrev != SCE_C_WORD && style == SCE_C_WORD)
293
299
                {
294
300
                        // Store last word start point.
295
301
                        lastStart = i;