~ubuntu-branches/ubuntu/raring/codeblocks/raring-proposed

« back to all changes in this revision

Viewing changes to src/sdk/wxscintilla/src/scintilla/src/LexBasic.cxx

  • Committer: Bazaar Package Importer
  • Author(s): Cosme Domínguez Díaz
  • Date: 2010-08-09 04:38:38 UTC
  • mfrom: (1.1.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20100809043838-a59ygguym4eg0jgw
Tags: 10.05-0ubuntu1
* New upstream release. Closes (LP: #322350)
 - Switch to dpkg-source 3.0 (quilt) format
 - Remove unneeded README.source
 - Add debian/get-source-orig script that removes all
   Windows prebuilt binaries
* Bump Standards-Version to 3.9.1
 - Stop shipping *.la files
* debian/control
 - Add cdbs package as Build-Depend
 - Add libbz2-dev and zlib1g-dev packages as
   Build-Depends (needed by libhelp_plugin.so)
 - Remove dpatch package of Build-Depends
 - Add codeblocks-contrib-debug package
 - Split architecture-independent files of codeblocks
   package in codeblocks-common package
* debian/rules
 - Switch to CDBS rules system
 - Add parallel build support
 - Add a call to debian/get-source-orig script
 - Use lzma compression (saves 23,5 MB of free space)
* debian/patches
 - Refresh 01_codeblocks_plugin_path
 - Add 02_no_Makefiles_in_debian_dir to remove any link
   in codeblocks build system to deleted Makefiles of debian directory
 - Drop 02_ftbfs_gcc44 and 03_ftbfs_glib221 (merged in upstream)
* debian/watch
 - Update to use the new host (berlios.de)

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
#include "Scintilla.h"
32
32
#include "SciLexer.h"
33
33
 
 
34
#ifdef SCI_NAMESPACE
 
35
using namespace Scintilla;
 
36
#endif
 
37
 
34
38
/* Bits:
35
39
 * 1  - whitespace
36
40
 * 2  - operator
147
151
                                sc.ChangeState(SCE_B_ERROR);
148
152
                                sc.SetState(SCE_B_DEFAULT);
149
153
                        }
150
 
                } else if (sc.state == SCE_B_COMMENT) {
 
154
                } else if (sc.state == SCE_B_COMMENT || sc.state == SCE_B_PREPROCESSOR) {
151
155
                        if (sc.atLineEnd) {
152
156
                                sc.SetState(SCE_B_DEFAULT);
153
157
                        }
163
167
                                wasfirst = isfirst;
164
168
                                sc.SetState(SCE_B_IDENTIFIER);
165
169
                        } else if (sc.Match(comment_char)) {
166
 
                                sc.SetState(SCE_B_COMMENT);
 
170
                                // Hack to make deprecated QBASIC '$Include show
 
171
                                // up in freebasic with SCE_B_PREPROCESSOR.
 
172
                                if (comment_char == '\'' && sc.Match(comment_char, '$'))
 
173
                                        sc.SetState(SCE_B_PREPROCESSOR);
 
174
                                else
 
175
                                        sc.SetState(SCE_B_COMMENT);
167
176
                        } else if (sc.Match('"')) {
168
177
                                sc.SetState(SCE_B_STRING);
169
178
                        } else if (IsDigit(sc.ch)) {