SF.net SVN: geany:[5006] trunk

eht16 at users.sourceforge.net eht16 at xxxxx
Sun Jun 6 18:36:23 UTC 2010


Revision: 5006
          http://geany.svn.sourceforge.net/geany/?rev=5006&view=rev
Author:   eht16
Date:     2010-06-06 18:36:23 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Remove unused Crontab lexer.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/scintilla/Makefile.am
    trunk/scintilla/makefile.win32
    trunk/wscript

Removed Paths:
-------------
    trunk/scintilla/LexCrontab.cxx

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-06-06 18:34:26 UTC (rev 5005)
+++ trunk/ChangeLog	2010-06-06 18:36:23 UTC (rev 5006)
@@ -10,6 +10,9 @@
    list (closes #3011986).
  * NEWS, scintilla/*, scintilla/include/*, src/plugindata.h:
    Update Scintilla to version 2.12.
+ * wscript, scintilla/Makefile.am, scintilla/makefile.win32,
+   scintilla/LexCrontab.cxx:
+   Remove unused Crontab lexer.
 
 
 2010-06-04  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Deleted: trunk/scintilla/LexCrontab.cxx
===================================================================
--- trunk/scintilla/LexCrontab.cxx	2010-06-06 18:34:26 UTC (rev 5005)
+++ trunk/scintilla/LexCrontab.cxx	2010-06-06 18:36:23 UTC (rev 5006)
@@ -1,222 +0,0 @@
-// Scintilla source code edit control
-/** @file LexCrontab.cxx
- ** Lexer to use with extended crontab files used by a powerful
- ** Windows scheduler/event monitor/automation manager nnCron.
- ** (http://nemtsev.eserv.ru/)
- **/
-// Copyright 1998-2001 by Neil Hodgson <neilh at scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "Platform.h"
-
-#include "PropSet.h"
-#include "Accessor.h"
-#include "KeyWords.h"
-#include "Scintilla.h"
-#include "SciLexer.h"
-
-#ifdef SCI_NAMESPACE
-using namespace Scintilla;
-#endif
-
-static void ColouriseNncrontabDoc(unsigned int startPos, int length, int, WordList
-*keywordLists[], Accessor &styler)
-{
-	int state = SCE_NNCRONTAB_DEFAULT;
-	char chNext = styler[startPos];
-	int lengthDoc = startPos + length;
-	// create a buffer large enough to take the largest chunk...
-	char *buffer = new char[length];
-	int bufferCount = 0;
-	// used when highliting environment variables inside quoted string:
-	bool insideString = false;
-
-	// this assumes that we have 3 keyword list in conf.properties
-	WordList &section = *keywordLists[0];
-	WordList &keyword = *keywordLists[1];
-	WordList &modifier = *keywordLists[2];
-
-	// go through all provided text segment
-	// using the hand-written state machine shown below
-	styler.StartAt(startPos);
-	styler.StartSegment(startPos);
-	for (int i = startPos; i < lengthDoc; i++) {
-		char ch = chNext;
-		chNext = styler.SafeGetCharAt(i + 1);
-
-		if (styler.IsLeadByte(ch)) {
-			chNext = styler.SafeGetCharAt(i + 2);
-			i++;
-			continue;
-		}
-		switch(state) {
-			case SCE_NNCRONTAB_DEFAULT:
-				if( ch == '\n' || ch == '\r' || ch == '\t' || ch == ' ') {
-					// whitespace is simply ignored here...
-					styler.ColourTo(i,SCE_NNCRONTAB_DEFAULT);
-					break;
-				} else if( ch == '#' && styler.SafeGetCharAt(i+1) == '(') {
-					// signals the start of a task...
-					state = SCE_NNCRONTAB_TASK;
-					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
-				}
-				  else if( ch == '\\' && (styler.SafeGetCharAt(i+1) == ' ' ||
-										 styler.SafeGetCharAt(i+1) == '\t')) {
-					// signals the start of an extended comment...
-					state = SCE_NNCRONTAB_COMMENT;
-					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
-				} else if( ch == '#' ) {
-					// signals the start of a plain comment...
-					state = SCE_NNCRONTAB_COMMENT;
-					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
-				} else if( ch == ')' && styler.SafeGetCharAt(i+1) == '#') {
-					// signals the end of a task...
-					state = SCE_NNCRONTAB_TASK;
-					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
-				} else if( ch == '"') {
-					state = SCE_NNCRONTAB_STRING;
-					styler.ColourTo(i,SCE_NNCRONTAB_STRING);
-				} else if( ch == '%') {
-					// signals environment variables
-					state = SCE_NNCRONTAB_ENVIRONMENT;
-					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
-				} else if( ch == '<' && styler.SafeGetCharAt(i+1) == '%') {
-					// signals environment variables
-					state = SCE_NNCRONTAB_ENVIRONMENT;
-					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
-				} else if( ch == '*' ) {
-					// signals an asterisk
-					// no state jump necessary for this simple case...
-					styler.ColourTo(i,SCE_NNCRONTAB_ASTERISK);
-				} else if( isalpha(ch) || ch == '<' ) {
-					// signals the start of an identifier
-					bufferCount = 0;
-					buffer[bufferCount++] = ch;
-					state = SCE_NNCRONTAB_IDENTIFIER;
-				} else if( isdigit(ch) ) {
-					// signals the start of a number
-					bufferCount = 0;
-					buffer[bufferCount++] = ch;
-					state = SCE_NNCRONTAB_NUMBER;
-				} else {
-					// style it the default style..
-					styler.ColourTo(i,SCE_NNCRONTAB_DEFAULT);
-				}
-				break;
-
-			case SCE_NNCRONTAB_COMMENT:
-				// if we find a newline here,
-				// we simply go to default state
-				// else continue to work on it...
-				if( ch == '\n' || ch == '\r' ) {
-					state = SCE_NNCRONTAB_DEFAULT;
-				} else {
-					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
-				}
-				break;
-
-			case SCE_NNCRONTAB_TASK:
-				// if we find a newline here,
-				// we simply go to default state
-				// else continue to work on it...
-				if( ch == '\n' || ch == '\r' ) {
-					state = SCE_NNCRONTAB_DEFAULT;
-				} else {
-					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
-				}
-				break;
-
-			case SCE_NNCRONTAB_STRING:
-				if( ch == '%' ) {
-					state = SCE_NNCRONTAB_ENVIRONMENT;
-					insideString = true;
-					styler.ColourTo(i-1,SCE_NNCRONTAB_STRING);
-					break;
-				}
-				// if we find the end of a string char, we simply go to default state
-				// else we're still dealing with an string...
-				if( (ch == '"' && styler.SafeGetCharAt(i-1)!='\\') ||
-					(ch == '\n') || (ch == '\r') ) {
-					state = SCE_NNCRONTAB_DEFAULT;
-				}
-				styler.ColourTo(i,SCE_NNCRONTAB_STRING);
-				break;
-
-			case SCE_NNCRONTAB_ENVIRONMENT:
-				// if we find the end of a string char, we simply go to default state
-				// else we're still dealing with an string...
-				if( ch == '%' && insideString ) {
-					state = SCE_NNCRONTAB_STRING;
-					insideString = false;
-					break;
-				}
-				if( (ch == '%' && styler.SafeGetCharAt(i-1)!='\\')
-					|| (ch == '\n') || (ch == '\r') || (ch == '>') ) {
-					state = SCE_NNCRONTAB_DEFAULT;
-					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
-					break;
-				}
-				styler.ColourTo(i+1,SCE_NNCRONTAB_ENVIRONMENT);
-				break;
-
-			case SCE_NNCRONTAB_IDENTIFIER:
-				// stay  in CONF_IDENTIFIER state until we find a non-alphanumeric
-				if( isalnum(ch) || (ch == '_') || (ch == '-') || (ch == '/') ||
-					(ch == '$') || (ch == '.') || (ch == '<') || (ch == '>') ||
-					(ch == '@') ) {
-					buffer[bufferCount++] = ch;
-				} else {
-					state = SCE_NNCRONTAB_DEFAULT;
-					buffer[bufferCount] = '\0';
-
-					// check if the buffer contains a keyword,
-					// and highlight it if it is a keyword...
-					if(section.InList(buffer)) {
-						styler.ColourTo(i,SCE_NNCRONTAB_SECTION );
-					} else if(keyword.InList(buffer)) {
-						styler.ColourTo(i-1,SCE_NNCRONTAB_KEYWORD );
-					} // else if(strchr(buffer,'/') || strchr(buffer,'.')) {
-					//	styler.ColourTo(i-1,SCE_NNCRONTAB_EXTENSION);
-					// }
-					  else if(modifier.InList(buffer)) {
-						styler.ColourTo(i-1,SCE_NNCRONTAB_MODIFIER );
-					  }	else {
-						styler.ColourTo(i-1,SCE_NNCRONTAB_DEFAULT);
-					}
-					// push back the faulty character
-					chNext = styler[i--];
-				}
-				break;
-
-			case SCE_NNCRONTAB_NUMBER:
-				// stay  in CONF_NUMBER state until we find a non-numeric
-				if( isdigit(ch) /* || ch == '.' */ ) {
-					buffer[bufferCount++] = ch;
-				} else {
-					state = SCE_NNCRONTAB_DEFAULT;
-					buffer[bufferCount] = '\0';
-					// Colourize here... (normal number)
-					styler.ColourTo(i-1,SCE_NNCRONTAB_NUMBER);
-					// push back a character
-					chNext = styler[i--];
-				}
-				break;
-		}
-	}
-	delete []buffer;
-}
-
-static const char * const cronWordListDesc[] = {
-	"Section keywords and Forth words",
-	"nnCrontab keywords",
-	"Modifiers",
-	0
-};
-
-LexerModule lmNncrontab(SCLEX_NNCRONTAB, ColouriseNncrontabDoc, "nncrontab", 0, cronWordListDesc);

Modified: trunk/scintilla/Makefile.am
===================================================================
--- trunk/scintilla/Makefile.am	2010-06-06 18:34:26 UTC (rev 5005)
+++ trunk/scintilla/Makefile.am	2010-06-06 18:36:23 UTC (rev 5006)
@@ -13,7 +13,6 @@
 LexCPP.cxx \
 LexCaml.cxx \
 LexCmake.cxx \
-LexCrontab.cxx \
 LexCSS.cxx \
 LexD.cxx \
 LexFortran.cxx \

Modified: trunk/scintilla/makefile.win32
===================================================================
--- trunk/scintilla/makefile.win32	2010-06-06 18:34:26 UTC (rev 5005)
+++ trunk/scintilla/makefile.win32	2010-06-06 18:36:23 UTC (rev 5006)
@@ -60,7 +60,7 @@
 #++Autogenerated -- run src/LexGen.py to regenerate
 #**LEXOBJS=\\\n\(\*.o \)
 LEXOBJS=\
-LexAda.o LexBash.o LexAsm.o LexCSS.o LexCPP.o LexCrontab.o LexHTML.o LexOthers.o LexPascal.o \
+LexAda.o LexBash.o LexAsm.o LexCSS.o LexCPP.o LexHTML.o LexOthers.o LexPascal.o \
 LexPerl.o LexPython.o LexSQL.o LexCaml.o LexTCL.o LexRuby.o LexFortran.o LexVHDL.o LexVerilog.o\
 LexMarkdown.o LexMatlab.o \
 LexD.o LexLua.o LexHaskell.o LexBasic.o LexR.o LexYAML.o LexCmake.o LexNsis.o

Modified: trunk/wscript
===================================================================
--- trunk/wscript	2010-06-06 18:34:26 UTC (rev 5005)
+++ trunk/wscript	2010-06-06 18:36:23 UTC (rev 5006)
@@ -87,7 +87,7 @@
 	'scintilla/KeyWords.cxx',
 	'scintilla/LexAda.cxx', 'scintilla/LexAsm.cxx', 'scintilla/LexBash.cxx',
 	'scintilla/LexBasic.cxx', 'scintilla/LexCaml.cxx', 'scintilla/LexCmake.cxx', 'scintilla/LexCPP.cxx',
-	'scintilla/LexCrontab.cxx', 'scintilla/LexCSS.cxx', 'scintilla/LexD.cxx',
+	'scintilla/LexCSS.cxx', 'scintilla/LexD.cxx',
 	'scintilla/LexFortran.cxx', 'scintilla/LexHaskell.cxx', 'scintilla/LexHTML.cxx',
 	'scintilla/LexLua.cxx', 'scintilla/LexMarkdown.cxx', 'scintilla/LexMatlab.cxx',
 	'scintilla/LexNsis.cxx', 'scintilla/LexOthers.cxx',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the Commits mailing list