Commits April 2008

commits@lists.geany.org

3 participants
111 discussions

SF.net SVN: geany: [2532] trunk
by eht16＠users.sourceforge.net 27 Apr '08

27 Apr '08

Revision: 2532 http://geany.svn.sourceforge.net/geany/?rev=2532&view=rev Author: eht16 Date: 2008-04-27 07:33:40 -0700 (Sun, 27 Apr 2008) Log Message: ----------- Add configure option --enable-gnu-regex to implicitly build the included GNU regex library (in case the host system doesn't provide a usable regex library). Rename tagmanger/include/regex.h in tagmanager/include/gnuregex.h to avoid unintended inclusion in source files (this fixes the OpenSolaris crashes). Don't use GNU regex specific regex_t::buffer element to build also without this extension (e.g. on OpenSolaris). Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/src/encodings.c trunk/tagmanager/Makefile.am trunk/tagmanager/include/Makefile.am trunk/tagmanager/lregex.c trunk/tagmanager/regex.c Added Paths: ----------- trunk/tagmanager/include/gnuregex.h Removed Paths: ------------- trunk/tagmanager/include/regex.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-04-25 16:14:29 UTC (rev 2531) +++ trunk/ChangeLog 2008-04-27 14:33:40 UTC (rev 2532) @@ -1,3 +1,19 @@ +2008-04-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * configure.in, tagmanager/lregex.c, tagmanager/include/regex.h, + tagmanager/regex.c,tagmanager/include/Makefile.am, + tagmanager/include/gnuregex.h, tagmanager/Makefile.am : + Add configure option --enable-gnu-regex to implicitly build the + included GNU regex library (in case the host system doesn't provide + a usable regex library). + Rename tagmanger/include/regex.h in tagmanager/include/gnuregex.h + to avoid unintended inclusion in source files (this fixes the + OpenSolaris crashes). + * src/encodings.c: + Don't use GNU regex specific regex_t::buffer element to build also + without this extension (e.g. on OpenSolaris). + + 2008-04-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/document.c: Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2008-04-25 16:14:29 UTC (rev 2531) +++ trunk/configure.in 2008-04-27 14:33:40 UTC (rev 2532) @@ -33,7 +33,7 @@ # autoscan start # Checks for header files. -AC_CHECK_HEADERS([fcntl.h fnmatch.h glob.h libintl.h limits.h stddef.h stdlib.h string.h sys/time.h unistd.h]) +AC_CHECK_HEADERS([fcntl.h fnmatch.h glob.h libintl.h limits.h regex.h stddef.h stdlib.h string.h sys/time.h unistd.h]) # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_OFF_T @@ -125,7 +125,7 @@ [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], []) # Plugins support -AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support [[default=no]]])], , enable_plugins=yes) +AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support [default=no]])], , enable_plugins=yes) if test "x$enable_plugins" = "xyes" ; then AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled.]) @@ -134,6 +134,17 @@ AM_CONDITIONAL(PLUGINS, false) fi +# Use included GNU regex library +AC_ARG_ENABLE(gnu-regex, [AC_HELP_STRING([--enable-gnu-regex], [compile with included GNU regex library [default=no]])], , enable_gnu_regex=no) + +if test "x$enable_gnu_regex" = "xyes" ; then + AC_DEFINE(USE_INCLUDED_REGEX, 1, [Define if included GNU regex code should be used.]) + AC_DEFINE(HAVE_REGCOMP, 1, [Define if you have the `regcomp' function.]) + AM_CONDITIONAL(USE_INCLUDED_REGEX, true) +else + AM_CONDITIONAL(USE_INCLUDED_REGEX, false) +fi + # Check for random number paths (skip when cross compiling) if test "x$build" = "x$host"; then AC_CHECK_FILE([/dev/urandom], AC_DEFINE([HAVE_DEVURANDOM], [1], [Define that you found /dev/urandom])) Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2008-04-25 16:14:29 UTC (rev 2531) +++ trunk/src/encodings.c 2008-04-27 14:33:40 UTC (rev 2532) @@ -43,13 +43,18 @@ #ifdef HAVE_REGCOMP -# include <regex.h> +# ifdef HAVE_REGEX_H +# include <regex.h> +# else +# include "gnuregex.h" +# endif /* <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> */ # define PATTERN_HTMLMETA "<meta[ \t\n\r\f]http-equiv[ \t\n\r\f]*=[ \t\n\r\f]*\"content-type\"[ \t\n\r\f]+content[ \t\n\r\f]*=[ \t\n\r\f]*\"text/x?html;[ \t\n\r\f]*charset=([a-z0-9_-]+)\"[ \t\n\r\f]*/?>" /* " geany_encoding=utf-8 " */ # define PATTERN_GEANY "[\t ]geany_encoding=([a-z0-9-]+)[\t ]" /* precompiled regexps */ static regex_t pregs[2]; +static gboolean pregs_loaded = FALSE; #endif @@ -266,7 +271,7 @@ gchar *encoding = NULL; regmatch_t pmatch[10]; - if (buffer == NULL || preg->buffer == NULL) + if (! pregs_loaded || buffer == NULL) return NULL; if (size > 512) @@ -289,10 +294,10 @@ void encodings_finalize(void) { #ifdef HAVE_REGCOMP - guint i; - for (i = 0; i < G_N_ELEMENTS(pregs); i++) + if (pregs_loaded) { - if (pregs[i].buffer == NULL) + guint i; + for (i = 0; i < G_N_ELEMENTS(pregs); i++) { regfree(&pregs[i]); } @@ -315,8 +320,12 @@ init_encodings(); #ifdef HAVE_REGCOMP - regex_compile(&pregs[0], PATTERN_HTMLMETA); - regex_compile(&pregs[1], PATTERN_GEANY); + if (! pregs_loaded) + { + regex_compile(&pregs[0], PATTERN_HTMLMETA); + regex_compile(&pregs[1], PATTERN_GEANY); + pregs_loaded = TRUE; + } #endif /* create encodings submenu in document menu */ Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2008-04-25 16:14:29 UTC (rev 2531) +++ trunk/tagmanager/Makefile.am 2008-04-27 14:33:40 UTC (rev 2532) @@ -73,3 +73,6 @@ tm_file_entry.c\ tm_tagmanager.c +if USE_INCLUDED_REGEX +libtagmanager_a_SOURCES += regex.c +endif Modified: trunk/tagmanager/include/Makefile.am =================================================================== --- trunk/tagmanager/include/Makefile.am 2008-04-25 16:14:29 UTC (rev 2531) +++ trunk/tagmanager/include/Makefile.am 2008-04-27 14:33:40 UTC (rev 2532) @@ -1,5 +1,5 @@ noinst_HEADERS = \ - regex.h + gnuregex.h tagmanager_includedir = $(includedir)/geany/tagmanager/ tagmanager_include_HEADERS = \ Copied: trunk/tagmanager/include/gnuregex.h (from rev 2531, trunk/tagmanager/include/regex.h) =================================================================== --- trunk/tagmanager/include/gnuregex.h (rev 0) +++ trunk/tagmanager/include/gnuregex.h 2008-04-27 14:33:40 UTC (rev 2532) @@ -0,0 +1,490 @@ +/* Definitions for data structures and routines for the regular + expression library, version 0.12. + + Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef __REGEXP_LIBRARY_H__ +#define __REGEXP_LIBRARY_H__ + +/* POSIX says that <sys/types.h> must be included (by the caller) before + <regex.h>. */ + +#ifdef VMS +/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it + should be there. */ +#include <stddef.h> +#endif + + +/* The following bits are used to determine the regexp syntax we + recognize. The set/not-set meanings are chosen so that Emacs syntax + remains the value 0. The bits are given in alphabetical order, and + the definitions shifted by one from the previous bit; thus, when we + add or remove a bit, only one other definition need change. */ +typedef unsigned reg_syntax_t; + +/* If this bit is not set, then \ inside a bracket expression is literal. + If set, then such a \ quotes the following character. */ +#define RE_BACKSLASH_ESCAPE_IN_LISTS (1) + +/* If this bit is not set, then + and ? are operators, and \+ and \? are + literals. + If set, then \+ and \? are operators and + and ? are literals. */ +#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) + +/* If this bit is set, then character classes are supported. They are: + [:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:], + [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:]. + If not set, then character classes are not supported. */ +#define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1) + +/* If this bit is set, then ^ and $ are always anchors (outside bracket + expressions, of course). + If this bit is not set, then it depends: + ^ is an anchor if it is at the beginning of a regular + expression or after an open-group or an alternation operator; + $ is an anchor if it is at the end of a regular expression, or + before a close-group or an alternation operator. + + This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because + POSIX draft 11.2 says that * etc. in leading positions is undefined. + We already implemented a previous draft which made those constructs + invalid, though, so we haven't changed the code back. */ +#define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1) + +/* If this bit is set, then special characters are always special + regardless of where they are in the pattern. + If this bit is not set, then special characters are special only in + some contexts; otherwise they are ordinary. Specifically, + * + ? and intervals are only special when not after the beginning, + open-group, or alternation operator. */ +#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) + +/* If this bit is set, then *, +, ?, and { cannot be first in an re or + immediately after an alternation or begin-group operator. */ +#define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1) + +/* If this bit is set, then . matches newline. + If not set, then it doesn't. */ +#define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1) + +/* If this bit is set, then . doesn't match NUL. + If not set, then it does. */ +#define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1) + +/* If this bit is set, nonmatching lists [^...] do not match newline. + If not set, they do. */ +#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) + +/* If this bit is set, either \{...\} or {...} defines an + interval, depending on RE_NO_BK_BRACES. + If not set, \{, \}, {, and } are literals. */ +#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) + +/* If this bit is set, +, ? and | aren't recognized as operators. + If not set, they are. */ +#define RE_LIMITED_OPS (RE_INTERVALS << 1) + +/* If this bit is set, newline is an alternation operator. + If not set, newline is literal. */ +#define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1) + +/* If this bit is set, then `{...}' defines an interval, and \{ and \} + are literals. + If not set, then `\{...\}' defines an interval. */ +#define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1) + +/* If this bit is set, (...) defines a group, and $ and $ are literals. + If not set, $...$ defines a group, and ( and ) are literals. */ +#define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1) + +/* If this bit is set, then \<digit> matches <digit>. + If not set, then \<digit> is a back-reference. */ +#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) + +/* If this bit is set, then | is an alternation operator, and \| is literal. + If not set, then \| is an alternation operator, and | is literal. */ +#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) + +/* If this bit is set, then an ending range point collating higher + than the starting range point, as in [z-a], is invalid. + If not set, then when ending range point collates higher than the + starting range point, the range is ignored. */ +#define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1) + +/* If this bit is set, then an unmatched ) is ordinary. + If not set, then an unmatched ) is invalid. */ +#define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1) + +/* This global variable defines the particular regexp syntax to use (for + some interfaces). When a regexp is compiled, the syntax used is + stored in the pattern buffer, so changing this does not affect + already-compiled regexps. */ +extern reg_syntax_t re_syntax_options; + +/* Define combinations of the above bits for the standard possibilities. + (The [[[ comments delimit what gets put into the Texinfo file, so + don't delete them!) */ +/* [[[begin syntaxes]]] */ +#define RE_SYNTAX_EMACS 0 + +#define RE_SYNTAX_AWK \ + (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \ + | RE_NO_BK_PARENS | RE_NO_BK_REFS \ + | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \ + | RE_UNMATCHED_RIGHT_PAREN_ORD) + +#define RE_SYNTAX_POSIX_AWK \ + (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS) + +#define RE_SYNTAX_GREP \ + (RE_BK_PLUS_QM | RE_CHAR_CLASSES \ + | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \ + | RE_NEWLINE_ALT) + +#define RE_SYNTAX_EGREP \ + (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \ + | RE_NEWLINE_ALT | RE_NO_BK_PARENS \ + | RE_NO_BK_VBAR) + +#define RE_SYNTAX_POSIX_EGREP \ + (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES) + +/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */ +#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC + +#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC + +/* Syntax bits common to both basic and extended POSIX regex syntax. */ +#define _RE_SYNTAX_POSIX_COMMON \ + (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ + | RE_INTERVALS | RE_NO_EMPTY_RANGES) + +#define RE_SYNTAX_POSIX_BASIC \ + (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM) + +/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes + RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this + isn't minimal, since other operators, such as \`, aren't disabled. */ +#define RE_SYNTAX_POSIX_MINIMAL_BASIC \ + (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS) + +#define RE_SYNTAX_POSIX_EXTENDED \ + (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \ + | RE_NO_BK_PARENS | RE_NO_BK_VBAR \ + | RE_UNMATCHED_RIGHT_PAREN_ORD) + +/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INVALID_OPS + replaces RE_CONTEXT_INDEP_OPS and RE_NO_BK_REFS is added. */ +#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \ + (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ + | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \ + | RE_NO_BK_PARENS | RE_NO_BK_REFS \ + | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) +/* [[[end syntaxes]]] */ + +/* Maximum number of duplicates an interval can allow. Some systems + (erroneously) define this in other header files, but we want our + value, so remove any previous define. */ +#ifdef RE_DUP_MAX +#undef RE_DUP_MAX +#endif +#define RE_DUP_MAX ((1 << 15) - 1) + + +/* POSIX `cflags' bits (i.e., information for `regcomp'). */ + +/* If this bit is set, then use extended regular expression syntax. + If not set, then use basic regular expression syntax. */ +#define REG_EXTENDED 1 + +/* If this bit is set, then ignore case when matching. + If not set, then case is significant. */ +#define REG_ICASE (REG_EXTENDED << 1) + +/* If this bit is set, then anchors do not match at newline + characters in the string. + If not set, then anchors do match at newlines. */ +#define REG_NEWLINE (REG_ICASE << 1) + +/* If this bit is set, then report only success or fail in regexec. + If not set, then returns differ between not matching and errors. */ +#define REG_NOSUB (REG_NEWLINE << 1) + + +/* POSIX `eflags' bits (i.e., information for regexec). */ + +/* If this bit is set, then the beginning-of-line operator doesn't match + the beginning of the string (presumably because it's not the + beginning of a line). + If not set, then the beginning-of-line operator does match the + beginning of the string. */ +#define REG_NOTBOL 1 + +/* Like REG_NOTBOL, except for the end-of-line. */ +#define REG_NOTEOL (1 << 1) + + +/* If any error codes are removed, changed, or added, update the + `re_error_msg' table in regex.c. */ +typedef enum +{ + REG_NOERROR = 0, /* Success. */ + REG_NOMATCH, /* Didn't find a match (for regexec). */ + + /* POSIX regcomp return error codes. (In the order listed in the + standard.) */ + REG_BADPAT, /* Invalid pattern. */ + REG_ECOLLATE, /* Not implemented. */ + REG_ECTYPE, /* Invalid character class name. */ + REG_EESCAPE, /* Trailing backslash. */ + REG_ESUBREG, /* Invalid back reference. */ + REG_EBRACK, /* Unmatched left bracket. */ + REG_EPAREN, /* Parenthesis imbalance. */ + REG_EBRACE, /* Unmatched \{. */ + REG_BADBR, /* Invalid contents of \{\}. */ + REG_ERANGE, /* Invalid range end. */ + REG_ESPACE, /* Ran out of memory. */ + REG_BADRPT, /* No preceding re for repetition op. */ + + /* Error codes we've added. */ + REG_EEND, /* Premature end. */ + REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ + REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ +} reg_errcode_t; + +/* This data structure represents a compiled pattern. Before calling + the pattern compiler, the fields `buffer', `allocated', `fastmap', + `translate', and `no_sub' can be set. After the pattern has been + compiled, the `re_nsub' field is available. All other fields are + private to the regex routines. */ + +struct re_pattern_buffer +{ +/* [[[begin pattern_buffer]]] */ + /* Space that holds the compiled pattern. It is declared as + `unsigned char *' because its elements are + sometimes used as array indexes. */ + unsigned char *buffer; + + /* Number of bytes to which `buffer' points. */ + unsigned long allocated; + + /* Number of bytes actually used in `buffer'. */ + unsigned long used; + + /* Syntax setting with which the pattern was compiled. */ + reg_syntax_t syntax; + + /* Pointer to a fastmap, if any, otherwise zero. re_search uses + the fastmap, if there is one, to skip over impossible + starting points for matches. */ + char *fastmap; + + /* Either a translate table to apply to all characters before + comparing them, or zero for no translation. The translation + is applied to a pattern when it is compiled and to a string + when it is matched. */ + char *translate; + + /* Number of subexpressions found by the compiler. */ + size_t re_nsub; + + /* Zero if this pattern cannot match the empty string, one else. + Well, in truth it's used only in `re_search_2', to see + whether or not we should use the fastmap, so we don't set + this absolutely perfectly; see `re_compile_fastmap' (the + `duplicate' case). */ + unsigned can_be_null : 1; + + /* If REGS_UNALLOCATED, allocate space in the `regs' structure + for `max (RE_NREGS, re_nsub + 1)' groups. + If REGS_REALLOCATE, reallocate space if necessary. + If REGS_FIXED, use what's there. */ +#define REGS_UNALLOCATED 0 +#define REGS_REALLOCATE 1 +#define REGS_FIXED 2 + unsigned regs_allocated : 2; + + /* Set to zero when `regex_compile' compiles a pattern; set to one + by `re_compile_fastmap' if it updates the fastmap. */ + unsigned fastmap_accurate : 1; + + /* If set, `re_match_2' does not return information about + subexpressions. */ + unsigned no_sub : 1; + + /* If set, a beginning-of-line anchor doesn't match at the + beginning of the string. */ + unsigned not_bol : 1; + + /* Similarly for an end-of-line anchor. */ + unsigned not_eol : 1; + + /* If true, an anchor at a newline matches. */ + unsigned newline_anchor : 1; + +/* [[[end pattern_buffer]]] */ +}; + +typedef struct re_pattern_buffer regex_t; + + +/* search.c (search_buffer) in Emacs needs this one opcode value. It is + defined both in `regex.c' and here. */ +#define RE_EXACTN_VALUE 1 + +/* Type for byte offsets within the string. POSIX mandates this. */ +typedef int regoff_t; + + +/* This is the structure we store register match data in. See + regex.texinfo for a full description of what registers match. */ +struct re_registers +{ + unsigned num_regs; + regoff_t *start; + regoff_t *end; +}; + + +/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer, + `re_match_2' returns information about at least this many registers + the first time a `regs' structure is passed. */ +#ifndef RE_NREGS +#define RE_NREGS 30 +#endif + + +/* POSIX specification for registers. Aside from the different names than + `re_registers', POSIX uses an array of structures, instead of a + structure of arrays. */ +typedef struct +{ + regoff_t rm_so; /* Byte offset from string's start to substring's start. */ + regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ +} regmatch_t; + +/* Declarations for routines. */ + +/* To avoid duplicating every routine declaration -- once with a + prototype (if we are ANSI), and once without (if we aren't) -- we + use the following macro to declare argument types. This + unfortunately clutters up the declarations a bit, but I think it's + worth it. */ + +#if __STDC__ + +#define _RE_ARGS(args) args + +#else /* not __STDC__ */ + +#define _RE_ARGS(args) () + +#endif /* not __STDC__ */ + +/* Sets the current default syntax to SYNTAX, and return the old syntax. + You can also simply assign to the `re_syntax_options' variable. */ +extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax)); + +/* Compile the regular expression PATTERN, with length LENGTH + and syntax given by the global `re_syntax_options', into the buffer + BUFFER. Return NULL if successful, and an error string if not. */ +extern const char *re_compile_pattern + _RE_ARGS ((const char *pattern, int length, + struct re_pattern_buffer *buffer)); + + +/* Compile a fastmap for the compiled pattern in BUFFER; used to + accelerate searches. Return 0 if successful and -2 if was an + internal error. */ +extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer)); + + +/* Search in the string STRING (with length LENGTH) for the pattern + compiled into BUFFER. Start searching at position START, for RANGE + characters. Return the starting position of the match, -1 for no + match, or -2 for an internal error. Also return register + information in REGS (if REGS and BUFFER->no_sub are nonzero). */ +extern int re_search + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, + int length, int start, int range, struct re_registers *regs)); + + +/* Like `re_search', but search in the concatenation of STRING1 and + STRING2. Also, stop searching at index START + STOP. */ +extern int re_search_2 + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, + int length1, const char *string2, int length2, + int start, int range, struct re_registers *regs, int stop)); + + +/* Like `re_search', but return how many characters in STRING the regexp + in BUFFER matched, starting at position START. */ +extern int re_match + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, + int length, int start, struct re_registers *regs)); + + +/* Relates to `re_match' as `re_search_2' relates to `re_search'. */ +extern int re_match_2 + _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, + int length1, const char *string2, int length2, + int start, struct re_registers *regs, int stop)); + + +/* Set REGS to hold NUM_REGS registers, storing them in STARTS and + ENDS. Subsequent matches using BUFFER and REGS will use this memory + for recording register information. STARTS and ENDS must be + allocated with malloc, and must each be at least `NUM_REGS * sizeof + (regoff_t)' bytes long. + + If NUM_REGS == 0, then subsequent matches should allocate their own + register data. + + Unless this function is called, the first search or match using + PATTERN_BUFFER will allocate its own register data, without + freeing the old data. */ +extern void re_set_registers + _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs, + unsigned num_regs, regoff_t *starts, regoff_t *ends)); + +/* 4.2 bsd compatibility. */ +extern char *re_comp _RE_ARGS ((const char *)); +extern int re_exec _RE_ARGS ((const char *)); + +/* POSIX compatibility. */ +extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags)); +extern int regexec + _RE_ARGS ((const regex_t *preg, const char *string, size_t nmatch, + regmatch_t pmatch[], int eflags)); +extern size_t regerror + _RE_ARGS ((int errcode, const regex_t *preg, char *errbuf, + size_t errbuf_size)); +extern void regfree _RE_ARGS ((regex_t *preg)); + +#endif /* not __REGEXP_LIBRARY_H__ */ + +/* +Local variables: +make-backup-files: t +version-control: t +trim-versions-without-asking: nil +End: +*/ Deleted: trunk/tagmanager/include/regex.h =================================================================== --- trunk/tagmanager/include/regex.h 2008-04-25 16:14:29 UTC (rev 2531) +++ trunk/tagmanager/include/regex.h 2008-04-27 14:33:40 UTC (rev 2532) @@ -1,490 +0,0 @@ -/* Definitions for data structures and routines for the regular - expression library, version 0.12. - - Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#ifndef __REGEXP_LIBRARY_H__ -#define __REGEXP_LIBRARY_H__ - -/* POSIX says that <sys/types.h> must be included (by the caller) before - <regex.h>. */ - -#ifdef VMS -/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it - should be there. */ -#include <stddef.h> -#endif - - -/* The following bits are used to determine the regexp syntax we - recognize. The set/not-set meanings are chosen so that Emacs syntax - remains the value 0. The bits are given in alphabetical order, and - the definitions shifted by one from the previous bit; thus, when we - add or remove a bit, only one other definition need change. */ -typedef unsigned reg_syntax_t; - -/* If this bit is not set, then \ inside a bracket expression is literal. - If set, then such a \ quotes the following character. */ -#define RE_BACKSLASH_ESCAPE_IN_LISTS (1) - -/* If this bit is not set, then + and ? are operators, and \+ and \? are - literals. - If set, then \+ and \? are operators and + and ? are literals. */ -#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) - -/* If this bit is set, then character classes are supported. They are: - [:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:], - [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:]. - If not set, then character classes are not supported. */ -#define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1) - -/* If this bit is set, then ^ and $ are always anchors (outside bracket - expressions, of course). - If this bit is not set, then it depends: - ^ is an anchor if it is at the beginning of a regular - expression or after an open-group or an alternation operator; - $ is an anchor if it is at the end of a regular expression, or - before a close-group or an alternation operator. - - This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because - POSIX draft 11.2 says that * etc. in leading positions is undefined. - We already implemented a previous draft which made those constructs - invalid, though, so we haven't changed the code back. */ -#define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1) - -/* If this bit is set, then special characters are always special - regardless of where they are in the pattern. - If this bit is not set, then special characters are special only in - some contexts; otherwise they are ordinary. Specifically, - * + ? and intervals are only special when not after the beginning, - open-group, or alternation operator. */ -#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) - -/* If this bit is set, then *, +, ?, and { cannot be first in an re or - immediately after an alternation or begin-group operator. */ -#define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1) - -/* If this bit is set, then . matches newline. - If not set, then it doesn't. */ -#define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1) - -/* If this bit is set, then . doesn't match NUL. - If not set, then it does. */ -#define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1) - -/* If this bit is set, nonmatching lists [^...] do not match newline. - If not set, they do. */ -#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) - -/* If this bit is set, either \{...\} or {...} defines an - interval, depending on RE_NO_BK_BRACES. - If not set, \{, \}, {, and } are literals. */ -#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) - -/* If this bit is set, +, ? and | aren't recognized as operators. - If not set, they are. */ -#define RE_LIMITED_OPS (RE_INTERVALS << 1) - -/* If this bit is set, newline is an alternation operator. - If not set, newline is literal. */ -#define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1) - -/* If this bit is set, then `{...}' defines an interval, and \{ and \} - are literals. - If not set, then `\{...\}' defines an interval. */ -#define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1) - -/* If this bit is set, (...) defines a group, and $ and $ are literals. - If not set, $...$ defines a group, and ( and ) are literals. */ -#define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1) - -/* If this bit is set, then \<digit> matches <digit>. - If not set, then \<digit> is a back-reference. */ -#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) - -/* If this bit is set, then | is an alternation operator, and \| is literal. - If not set, then \| is an alternation operator, and | is literal. */ -#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) - -/* If this bit is set, then an ending range point collating higher - than the starting range point, as in [z-a], is invalid. - If not set, then when ending range point collates higher than the - starting range point, the range is ignored. */ -#define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1) - -/* If this bit is set, then an unmatched ) is ordinary. - If not set, then an unmatched ) is invalid. */ -#define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1) - -/* This global variable defines the particular regexp syntax to use (for - some interfaces). When a regexp is compiled, the syntax used is - stored in the pattern buffer, so changing this does not affect - already-compiled regexps. */ -extern reg_syntax_t re_syntax_options; - -/* Define combinations of the above bits for the standard possibilities. - (The [[[ comments delimit what gets put into the Texinfo file, so - don't delete them!) */ -/* [[[begin syntaxes]]] */ -#define RE_SYNTAX_EMACS 0 - -#define RE_SYNTAX_AWK \ - (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \ - | RE_NO_BK_PARENS | RE_NO_BK_REFS \ - | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \ - | RE_UNMATCHED_RIGHT_PAREN_ORD) - -#define RE_SYNTAX_POSIX_AWK \ - (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS) - -#define RE_SYNTAX_GREP \ - (RE_BK_PLUS_QM | RE_CHAR_CLASSES \ - | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \ - | RE_NEWLINE_ALT) - -#define RE_SYNTAX_EGREP \ - (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \ - | RE_NEWLINE_ALT | RE_NO_BK_PARENS \ - | RE_NO_BK_VBAR) - -#define RE_SYNTAX_POSIX_EGREP \ - (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES) - -/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */ -#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC - -#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC - -/* Syntax bits common to both basic and extended POSIX regex syntax. */ -#define _RE_SYNTAX_POSIX_COMMON \ - (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ - | RE_INTERVALS | RE_NO_EMPTY_RANGES) - -#define RE_SYNTAX_POSIX_BASIC \ - (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM) - -/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes - RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this - isn't minimal, since other operators, such as \`, aren't disabled. */ -#define RE_SYNTAX_POSIX_MINIMAL_BASIC \ - (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS) - -#define RE_SYNTAX_POSIX_EXTENDED \ - (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \ - | RE_NO_BK_PARENS | RE_NO_BK_VBAR \ - | RE_UNMATCHED_RIGHT_PAREN_ORD) - -/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INVALID_OPS - replaces RE_CONTEXT_INDEP_OPS and RE_NO_BK_REFS is added. */ -#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \ - (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \ - | RE_NO_BK_PARENS | RE_NO_BK_REFS \ - | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) -/* [[[end syntaxes]]] */ - -/* Maximum number of duplicates an interval can allow. Some systems - (erroneously) define this in other header files, but we want our - value, so remove any previous define. */ -#ifdef RE_DUP_MAX -#undef RE_DUP_MAX -#endif -#define RE_DUP_MAX ((1 << 15) - 1) - - -/* POSIX `cflags' bits (i.e., information for `regcomp'). */ - -/* If this bit is set, then use extended regular expression syntax. - If not set, then use basic regular expression syntax. */ -#define REG_EXTENDED 1 - -/* If this bit is set, then ignore case when matching. - If not set, then case is significant. */ -#define REG_ICASE (REG_EXTENDED << 1) - -/* If this bit is set, then anchors do not match at newline - characters in the string. - If not set, then anchors do match at newlines. */ -#define REG_NEWLINE (REG_ICASE << 1) - -/* If this bit is set, then report only success or fail in regexec. - If not set, then returns differ between not matching and errors. */ -#define REG_NOSUB (REG_NEWLINE << 1) - - -/* POSIX `eflags' bits (i.e., information for regexec). */ - -/* If this bit is set, then the beginning-of-line operator doesn't match - the beginning of the string (presumably because it's not the - beginning of a line). - If not set, then the beginning-of-line operator does match the - beginning of the string. */ -#define REG_NOTBOL 1 - -/* Like REG_NOTBOL, except for the end-of-line. */ -#define REG_NOTEOL (1 << 1) - - -/* If any error codes are removed, changed, or added, update the - `re_error_msg' table in regex.c. */ -typedef enum -{ - REG_NOERROR = 0, /* Success. */ - REG_NOMATCH, /* Didn't find a match (for regexec). */ - - /* POSIX regcomp return error codes. (In the order listed in the - standard.) */ - REG_BADPAT, /* Invalid pattern. */ - REG_ECOLLATE, /* Not implemented. */ - REG_ECTYPE, /* Invalid character class name. */ - REG_EESCAPE, /* Trailing backslash. */ - REG_ESUBREG, /* Invalid back reference. */ - REG_EBRACK, /* Unmatched left bracket. */ - REG_EPAREN, /* Parenthesis imbalance. */ - REG_EBRACE, /* Unmatched \{. */ - REG_BADBR, /* Invalid contents of \{\}. */ - REG_ERANGE, /* Invalid range end. */ - REG_ESPACE, /* Ran out of memory. */ - REG_BADRPT, /* No preceding re for repetition op. */ - - /* Error codes we've added. */ - REG_EEND, /* Premature end. */ - REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ - REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ -} reg_errcode_t; - -/* This data structure represents a compiled pattern. Before calling - the pattern compiler, the fields `buffer', `allocated', `fastmap', - `translate', and `no_sub' can be set. After the pattern has been - compiled, the `re_nsub' field is available. All other fields are - private to the regex routines. */ - -struct re_pattern_buffer -{ -/* [[[begin pattern_buffer]]] */ - /* Space that holds the compiled pattern. It is declared as - `unsigned char *' because its elements are - sometimes used as array indexes. */ - unsigned char *buffer; - - /* Number of bytes to which `buffer' points. */ - unsigned long allocated; - - /* Number of bytes actually used in `buffer'. */ - unsigned long used; - - /* Syntax setting with which the pattern was compiled. */ - reg_syntax_t syntax; - - /* Pointer to a fastmap, if any, otherwise zero. re_search uses - the fastmap, if there is one, to skip over impossible - starting points for matches. */ - char *fastmap; - - /* Either a translate table to apply to all characters before - comparing them, or zero for no translation. The translation - is applied to a pattern when it is compiled and to a string - when it is matched. */ - char *translate; - - /* Number of subexpressions found by the compiler. */ - size_t re_nsub; - - /* Zero if this pattern cannot match the empty string, one else. - Well, in truth it's used only in `re_search_2', to see - whether or not we should use the fastmap, so we don't set - this absolutely perfectly; see `re_compile_fastmap' (the - `duplicate' case). */ - unsigned can_be_null : 1; - - /* If REGS_UNALLOCATED, allocate space in the `regs' structure - for `max (RE_NREGS, re_nsub + 1)' groups. - If REGS_REALLOCATE, reallocate space if necessary. - If REGS_FIXED, use what's there. */ -#define REGS_UNALLOCATED 0 -#define REGS_REALLOCATE 1 -#define REGS_FIXED 2 - unsigned regs_allocated : 2; - - /* Set to zero when `regex_compile' compiles a pattern; set to one - by `re_compile_fastmap' if it updates the fastmap. */ - unsigned fastmap_accurate : 1; - - /* If set, `re_match_2' does not return information about - subexpressions. */ - unsigned no_sub : 1; - - /* If set, a beginning-of-line anchor doesn't match at the - beginning of the string. */ - unsigned not_bol : 1; - - /* Similarly for an end-of-line anchor. */ - unsigned not_eol : 1; - - /* If true, an anchor at a newline matches. */ - unsigned newline_anchor : 1; - -/* [[[end pattern_buffer]]] */ -}; - -typedef struct re_pattern_buffer regex_t; - - -/* search.c (search_buffer) in Emacs needs this one opcode value. It is - defined both in `regex.c' and here. */ -#define RE_EXACTN_VALUE 1 - -/* Type for byte offsets within the string. POSIX mandates this. */ -typedef int regoff_t; - - -/* This is the structure we store register match data in. See - regex.texinfo for a full description of what registers match. */ -struct re_registers -{ - unsigned num_regs; - regoff_t *start; - regoff_t *end; -}; - - -/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer, - `re_match_2' returns information about at least this many registers - the first time a `regs' structure is passed. */ -#ifndef RE_NREGS -#define RE_NREGS 30 -#endif - - -/* POSIX specification for registers. Aside from the different names than - `re_registers', POSIX uses an array of structures, instead of a - structure of arrays. */ -typedef struct -{ - regoff_t rm_so; /* Byte offset from string's start to substring's start. */ - regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ -} regmatch_t; - -/* Declarations for routines. */ - -/* To avoid duplicating every routine declaration -- once with a - prototype (if we are ANSI), and once without (if we aren't) -- we - use the following macro to declare argument types. This - unfortunately clutters up the declarations a bit, but I think it's - worth it. */ - -#if __STDC__ - -#define _RE_ARGS(args) args - -#else /* not __STDC__ */ - -#define _RE_ARGS(args) () - -#endif /* not __STDC__ */ - -/* Sets the current default syntax to SYNTAX, and return the old syntax. - You can also simply assign to the `re_syntax_options' variable. */ -extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax)); - -/* Compile the regular expression PATTERN, with length LENGTH - and syntax given by the global `re_syntax_options', into the buffer - BUFFER. Return NULL if successful, and an error string if not. */ -extern const char *re_compile_pattern - _RE_ARGS ((const char *pattern, int length, - struct re_pattern_buffer *buffer)); - - -/* Compile a fastmap for the compiled pattern in BUFFER; used to - accelerate searches. Return 0 if successful and -2 if was an - internal error. */ -extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer)); - - -/* Search in the string STRING (with length LENGTH) for the pattern - compiled into BUFFER. Start searching at position START, for RANGE - characters. Return the starting position of the match, -1 for no - match, or -2 for an internal error. Also return register - information in REGS (if REGS and BUFFER->no_sub are nonzero). */ -extern int re_search - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, - int length, int start, int range, struct re_registers *regs)); - - -/* Like `re_search', but search in the concatenation of STRING1 and - STRING2. Also, stop searching at index START + STOP. */ -extern int re_search_2 - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, - int length1, const char *string2, int length2, - int start, int range, struct re_registers *regs, int stop)); - - -/* Like `re_search', but return how many characters in STRING the regexp - in BUFFER matched, starting at position START. */ -extern int re_match - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, - int length, int start, struct re_registers *regs)); - - -/* Relates to `re_match' as `re_search_2' relates to `re_search'. */ -extern int re_match_2 - _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, - int length1, const char *string2, int length2, - int start, struct re_registers *regs, int stop)); - - -/* Set REGS to hold NUM_REGS registers, storing them in STARTS and - ENDS. Subsequent matches using BUFFER and REGS will use this memory - for recording register information. STARTS and ENDS must be - allocated with malloc, and must each be at least `NUM_REGS * sizeof - (regoff_t)' bytes long. - - If NUM_REGS == 0, then subsequent matches should allocate their own - register data. - - Unless this function is called, the first search or match using - PATTERN_BUFFER will allocate its own register data, without - freeing the old data. */ -extern void re_set_registers - _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs, - unsigned num_regs, regoff_t *starts, regoff_t *ends)); - -/* 4.2 bsd compatibility. */ -extern char *re_comp _RE_ARGS ((const char *)); -extern int re_exec _RE_ARGS ((const char *)); - -/* POSIX compatibility. */ -extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags)); -extern int regexec - _RE_ARGS ((const regex_t *preg, const char *string, size_t nmatch, - regmatch_t pmatch[], int eflags)); -extern size_t regerror - _RE_ARGS ((int errcode, const regex_t *preg, char *errbuf, - size_t errbuf_size)); -extern void regfree _RE_ARGS ((regex_t *preg)); - -#endif /* not __REGEXP_LIBRARY_H__ */ - -/* -Local variables: -make-backup-files: t -version-control: t -trim-versions-without-asking: nil -End: -*/ Modified: trunk/tagmanager/lregex.c =================================================================== --- trunk/tagmanager/lregex.c 2008-04-25 16:14:29 UTC (rev 2531) +++ trunk/tagmanager/lregex.c 2008-04-27 14:33:40 UTC (rev 2532) @@ -27,7 +27,11 @@ # ifdef HAVE_SYS_TYPES_H # include <sys/types.h> /* declare off_t (not known to regex.h on FreeBSD) */ # endif -# include <regex.h> +# ifdef HAVE_REGEX_H +# include <regex.h> +# else +# include "gnuregex.h" +# endif #endif #include "main.h" Modified: trunk/tagmanager/regex.c =================================================================== --- trunk/tagmanager/regex.c 2008-04-25 16:14:29 UTC (rev 2531) +++ trunk/tagmanager/regex.c 2008-04-27 14:33:40 UTC (rev 2532) @@ -120,9 +120,9 @@ #define SYNTAX(c) re_syntax_table[c] #endif /* not emacs */ - + /* Get the interface, including the syntax bits. */ -#include "regex.h" +#include "gnuregex.h" /* isalpha etc. are used for the character classes. */ #include <ctype.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2531] trunk
by eht16＠users.sourceforge.net 25 Apr '08

25 Apr '08

Revision: 2531 http://geany.svn.sourceforge.net/geany/?rev=2531&view=rev Author: eht16 Date: 2008-04-25 09:14:29 -0700 (Fri, 25 Apr 2008) Log Message: ----------- Set ExecutableName to "geany" to prevent possible crashes on Windows and maybe other systems. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/ctags.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-04-25 13:03:33 UTC (rev 2530) +++ trunk/ChangeLog 2008-04-25 16:14:29 UTC (rev 2531) @@ -5,6 +5,9 @@ from document_save_file(). Include missing error string in error message when writing the file failed. + * tagmanager/ctags.c: + Set ExecutableName to "geany" to prevent possible crashes on + Windows and maybe other systems. 2008-04-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/tagmanager/ctags.c =================================================================== --- trunk/tagmanager/ctags.c 2008-04-25 13:03:33 UTC (rev 2530) +++ trunk/tagmanager/ctags.c 2008-04-25 16:14:29 UTC (rev 2531) @@ -219,7 +219,7 @@ #ifdef HAVE_MKSTEMP static const char *ExecutableProgram = NULL; #endif -static const char *ExecutableName = NULL; +static const char *ExecutableName = "geany"; static stringList* Excluded = NULL; static struct { long files, lines, bytes; } Totals = { 0, 0, 0 }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2530] trunk/po
by eht16＠users.sourceforge.net 25 Apr '08

25 Apr '08

Revision: 2530 http://geany.svn.sourceforge.net/geany/?rev=2530&view=rev Author: eht16 Date: 2008-04-25 06:03:33 -0700 (Fri, 25 Apr 2008) Log Message: ----------- Replace "Prochain" with "Suivant" (patch by Roland Baudin, thanks). Modified Paths: -------------- trunk/po/ChangeLog trunk/po/fr.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2008-04-25 12:49:38 UTC (rev 2529) +++ trunk/po/ChangeLog 2008-04-25 13:03:33 UTC (rev 2530) @@ -1,3 +1,9 @@ +2008-04-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * fr.po: + Replace "Prochain" with "Suivant" (patch by Roland Baudin, thanks). + + 2008-04-23 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * sv.po: Update of Swedish translation (Thanks to Tony Mattsson). Modified: trunk/po/fr.po =================================================================== --- trunk/po/fr.po 2008-04-25 12:49:38 UTC (rev 2529) +++ trunk/po/fr.po 2008-04-25 13:03:33 UTC (rev 2530) @@ -8,12 +8,12 @@ "Project-Id-Version: geany 0.14\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-04-05 11:38+0200\n" -"PO-Revision-Date: 2008-04-13 16:02+0100\n" +"PO-Revision-Date: 2008-04-22 11:42+0200\n" "Last-Translator: Moal Jean-Philippe <skateinmars(a)skateinmars.net>\n" "Language-Team: French <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bit" "X-Poedit-Country: FRANCE\n" #: ../geany.desktop.in.h:1 @@ -194,7 +194,7 @@ #. next error #: ../src/build.c:1106 ../src/build.c:1216 msgid "_Next Error" -msgstr "Prochai_ne erreur" +msgstr "Erreur suiva_nte" #: ../src/build.c:1121 ../src/interface.c:1105 msgid "Run or view the current file" @@ -1173,7 +1173,7 @@ #: ../src/interface.c:680 msgid "Next _Message" -msgstr "Prochain _message" +msgstr "_Message suivant" #: ../src/interface.c:689 ../src/interface.c:2310 msgid "_Go to Line" @@ -1698,7 +1698,7 @@ "clicking Find Next/Previous" msgstr "" "Toujours reprendre la recherche en boucle et cacher la fenêtre de recherche " -"après un clic sur Prochain/Précédent" +"après un clic sur Suivant/Précédent" #: ../src/interface.c:2935 msgid "Use the current word under the cursor for Find dialogs" @@ -2806,7 +2806,7 @@ #: ../src/keybindings.c:330 msgid "Next Message" -msgstr "Prochain message" +msgstr "Message suivant" #: ../src/keybindings.c:332 msgid "Find Usage" @@ -2826,7 +2826,7 @@ #: ../src/keybindings.c:350 msgid "Go to next marker" -msgstr "Se rendre au prochain marqueur" +msgstr "Se rendre au marqueur suivant" #: ../src/keybindings.c:353 msgid "Go to previous marker" @@ -2958,7 +2958,7 @@ #: ../src/keybindings.c:431 msgid "Next error" -msgstr "Prochaine erreur" +msgstr "Erreur suivante" #: ../src/keybindings.c:433 msgid "Run" @@ -3480,7 +3480,7 @@ #: ../src/search.c:316 msgid "_Next" -msgstr "Prochai_n" +msgstr "Suiva_nt" #: ../src/search.c:320 ../src/search.c:442 ../src/search.c:601 msgid "_Search for:" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2529] trunk
by eht16＠users.sourceforge.net 25 Apr '08

25 Apr '08

Revision: 2529 http://geany.svn.sourceforge.net/geany/?rev=2529&view=rev Author: eht16 Date: 2008-04-25 05:49:38 -0700 (Fri, 25 Apr 2008) Log Message: ----------- Refactor write_data_to_disk() and save_convert_to_encoding() from document_save_file(). Include missing error string in error message when writing the file failed. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-04-25 11:50:48 UTC (rev 2528) +++ trunk/ChangeLog 2008-04-25 12:49:38 UTC (rev 2529) @@ -1,3 +1,12 @@ +2008-04-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/document.c: + Refactor write_data_to_disk() and save_convert_to_encoding() + from document_save_file(). + Include missing error string in error message when writing the + file failed. + + 2008-04-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/document.c: Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-04-25 11:50:48 UTC (rev 2528) +++ trunk/src/document.c 2008-04-25 12:49:38 UTC (rev 2529) @@ -1315,6 +1315,98 @@ } +static gsize save_convert_to_encoding(gint idx, gchar *data, gsize *len) +{ + GError *conv_error = NULL; + gchar* conv_file_contents = NULL; + gsize bytes_read; + gsize conv_len; + + g_return_val_if_fail(data != NULL, FALSE); + g_return_val_if_fail(len != NULL, FALSE); + + /* try to convert it from UTF-8 to original encoding */ + conv_file_contents = g_convert(data, *len - 1, doc_list[idx].encoding, "UTF-8", + &bytes_read, &conv_len, &conv_error); + + if (conv_error != NULL) + { + gchar *text = g_strdup_printf( +_("An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved."), + doc_list[idx].encoding); + gchar *error_text; + + if (conv_error->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE) + { + gchar *context = NULL; + gint line, column; + gint context_len; + gunichar unic; + /* don't read over the doc length */ + gint max_len = MIN((gint)bytes_read + 6, (gint)*len - 1); + context = g_malloc(7); /* read 6 bytes from Sci + '\0' */ + sci_get_text_range(doc_list[idx].sci, bytes_read, max_len, context); + + /* take only one valid Unicode character from the context and discard the leftover */ + unic = g_utf8_get_char_validated(context, -1); + context_len = g_unichar_to_utf8(unic, context); + context[context_len] = '\0'; + get_line_column_from_pos(idx, bytes_read, &line, &column); + + error_text = g_strdup_printf( + _("Error message: %s\nThe error occurred at \"%s\" (line: %d, column: %d)."), + conv_error->message, context, line + 1, column); + g_free(context); + } + else + error_text = g_strdup_printf(_("Error message: %s."), conv_error->message); + + geany_debug("encoding error: %s", conv_error->message); + dialogs_show_msgbox_with_secondary(GTK_MESSAGE_ERROR, text, error_text); + g_error_free(conv_error); + g_free(text); + g_free(error_text); + return FALSE; + } + else + { + g_free(data); + data = conv_file_contents; + *len = conv_len; + } + + return TRUE; +} + + +static gint write_data_to_disk(gint idx, const gchar *data, gint len) +{ + FILE *fp; + gint bytes_written; + gchar *locale_filename = NULL; + gint err = 0; + + g_return_val_if_fail(data != NULL, EINVAL); + + locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); + fp = g_fopen(locale_filename, "wb"); + if (fp == NULL) + { + g_free(locale_filename); + return errno; + } + + bytes_written = fwrite(data, sizeof(gchar), len, fp); + + if (len != bytes_written) + err = errno; + + fclose(fp); + + return err; +} + + /** * Save the %document specified by @a idx. Saving includes replacing tabs by spaces, * stripping trailing spaces and adding a final new line at the end of the file (all only if @@ -1331,13 +1423,15 @@ gboolean document_save_file(gint idx, gboolean force) { gchar *data; - FILE *fp; - gint bytes_written, len; - gchar *locale_filename = NULL; + gsize len; + gint err; - if (! DOC_IDX_VALID(idx)) return FALSE; + if (! DOC_IDX_VALID(idx)) + return FALSE; + /* the "changed" flag should exclude the "readonly" flag, but check it anyway for safety */ - if (! force && (! doc_list[idx].changed || doc_list[idx].readonly)) return FALSE; + if (! force && (! doc_list[idx].changed || doc_list[idx].readonly)) + return FALSE; if (doc_list[idx].file_name == NULL) { @@ -1375,85 +1469,24 @@ if (doc_list[idx].encoding != NULL && ! utils_str_equal(doc_list[idx].encoding, "UTF-8") && ! utils_str_equal(doc_list[idx].encoding, encodings[GEANY_ENCODING_NONE].charset)) { - GError *conv_error = NULL; - gchar* conv_file_contents = NULL; - gsize bytes_read; - gsize conv_len; - - /* try to convert it from UTF-8 to original encoding */ - conv_file_contents = g_convert(data, len-1, doc_list[idx].encoding, "UTF-8", - &bytes_read, &conv_len, &conv_error); - - if (conv_error != NULL) + if (! save_convert_to_encoding(idx, data, &len)) { - gchar *text = g_strdup_printf( - _("An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved."), - doc_list[idx].encoding); - gchar *error_text; - - if (conv_error->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE) - { - gchar *context = NULL; - gint line, column; - gint context_len; - gunichar unic; - gint max_len = MIN((gint)bytes_read + 6, len - 1); /* don't read over the doc length */ - context = g_malloc(7); /* read 6 bytes from Sci + '\0' */ - sci_get_text_range(doc_list[idx].sci, bytes_read, max_len, context); - - /* take only one valid Unicode character from the context and discard the leftover */ - unic = g_utf8_get_char_validated(context, -1); - context_len = g_unichar_to_utf8(unic, context); - context[context_len] = '\0'; - get_line_column_from_pos(idx, bytes_read, &line, &column); - - error_text = g_strdup_printf( - _("Error message: %s\nThe error occurred at \"%s\" (line: %d, column: %d)."), - conv_error->message, context, line + 1, column); - g_free(context); - } - else - error_text = g_strdup_printf(_("Error message: %s."), conv_error->message); - - geany_debug("encoding error: %s", conv_error->message); - dialogs_show_msgbox_with_secondary(GTK_MESSAGE_ERROR, text, error_text); - g_error_free(conv_error); g_free(data); - g_free(text); - g_free(error_text); return FALSE; } - else - { - g_free(data); - data = conv_file_contents; - len = conv_len; - } } else { len = strlen(data); } - locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); - fp = g_fopen(locale_filename, "wb"); - g_free(locale_filename); - - if (fp == NULL) - { - ui_set_statusbar(TRUE, _("Error saving file (%s)."), g_strerror(errno)); - utils_beep(); - g_free(data); - return FALSE; - } - bytes_written = fwrite(data, sizeof (gchar), len, fp); - fclose (fp); - + /* actually write the content of data to the file on disk */ + err = write_data_to_disk(idx, data, len); g_free(data); - if (len != bytes_written) + if (err != 0) { - ui_set_statusbar(TRUE, _("Error saving file.")); + ui_set_statusbar(TRUE, _("Error saving file (%s)."), g_strerror(err)); utils_beep(); return FALSE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2528] trunk
by ntrel＠users.sourceforge.net 25 Apr '08

25 Apr '08

Revision: 2528 http://geany.svn.sourceforge.net/geany/?rev=2528&view=rev Author: ntrel Date: 2008-04-25 04:50:48 -0700 (Fri, 25 Apr 2008) Log Message: ----------- Make utils_is_absolute_path() a NULL-safe version of g_path_is_absolute(). Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-04-25 11:47:01 UTC (rev 2527) +++ trunk/ChangeLog 2008-04-25 11:50:48 UTC (rev 2528) @@ -2,6 +2,9 @@ * src/document.c: Add/reorder a recent file item when closing a document. + * src/utils.c: + Make utils_is_absolute_path() a NULL-safe version of + g_path_is_absolute(). 2008-04-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-04-25 11:47:01 UTC (rev 2527) +++ trunk/src/utils.c 2008-04-25 11:50:48 UTC (rev 2528) @@ -677,19 +677,13 @@ } +/* NULL-safe version of g_path_is_absolute(). */ gboolean utils_is_absolute_path(const gchar *path) { if (! path || *path == '\0') return FALSE; -#ifdef G_OS_WIN32 - if (path[0] == '\\' || path[1] == ':') - return TRUE; -#else - if (path[0] == '/') - return TRUE; -#endif - return FALSE; + return g_path_is_absolute(path); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2527] trunk
by ntrel＠users.sourceforge.net 25 Apr '08

25 Apr '08

Revision: 2527 http://geany.svn.sourceforge.net/geany/?rev=2527&view=rev Author: ntrel Date: 2008-04-25 04:47:01 -0700 (Fri, 25 Apr 2008) Log Message: ----------- Add/reorder a recent file item when closing a document. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-04-24 14:33:12 UTC (rev 2526) +++ trunk/ChangeLog 2008-04-25 11:47:01 UTC (rev 2527) @@ -1,3 +1,9 @@ +2008-04-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/document.c: + Add/reorder a recent file item when closing a document. + + 2008-04-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * data/filetypes.xml, data/filetypes.javascript, src/highlighting.c: Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-04-24 14:33:12 UTC (rev 2526) +++ trunk/src/document.c 2008-04-25 11:47:01 UTC (rev 2527) @@ -534,6 +534,10 @@ { return FALSE; } + /* TODO: check g_file_test(doc_list[idx].real_name, G_FILE_TEST_EXISTS) */ + if (! main_status.closing_all && g_path_is_absolute(DOC_FILENAME(idx))) + ui_add_recent_file(doc_list[idx].file_name); + notebook_remove_page(page_num); treeviews_remove_document(idx); navqueue_remove_file(doc_list[idx].file_name); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2526] trunk
by ntrel＠users.sourceforge.net 24 Apr '08

24 Apr '08

Revision: 2526 http://geany.svn.sourceforge.net/geany/?rev=2526&view=rev Author: ntrel Date: 2008-04-24 07:33:12 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Move Close All functions to document.c. Add document_account_for_unsaved(). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/document.c trunk/src/document.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-04-24 14:17:11 UTC (rev 2525) +++ trunk/ChangeLog 2008-04-24 14:33:12 UTC (rev 2526) @@ -11,6 +11,11 @@ * src/utils.c: Make utils_get_file_list() use a case-insensitive search so that the file browser lists files and directories in a more intuitive order. + * src/project.c: + Fix build because of wrong document_close_all() usage - oops. + * src/callbacks.c, src/document.c, src/document.h: + Move Close All functions to document.c. + Add document_account_for_unsaved(). 2008-04-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-04-24 14:17:11 UTC (rev 2525) +++ trunk/src/callbacks.c 2008-04-24 14:33:12 UTC (rev 2526) @@ -105,25 +105,6 @@ } -/* @return TRUE if all files were saved or had their changes discarded. */ -static gboolean account_for_unsaved(void) -{ - gint p; - - for (p = 0; p < gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); p++) - { - gint idx = document_get_n_idx(p); - - if (doc_list[idx].changed) - { - if (! dialogs_show_unsaved_file(idx)) - return FALSE; - } - } - return TRUE; -} - - /* set editor_info.click_pos to the current cursor position if insert_callback_from_menu is TRUE * to prevent invalid cursor positions which can cause segfaults */ static void verify_click_pos(gint idx) @@ -136,29 +117,6 @@ } -static void force_close_all() -{ - guint i, len = doc_array->len; - - main_status.closing_all = TRUE; - - /* all documents should be accounted for, so ignore any changes */ - for (i = 0; i < len; i++) - { - if (doc_list[i].is_valid && doc_list[i].changed) - { - doc_list[i].changed = FALSE; - } - } - while (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) > 0) - { - document_remove(0); - } - - main_status.closing_all = FALSE; -} - - /* should only be called from on_exit_clicked */ static void quit_app(void) { @@ -167,7 +125,7 @@ if (app->project != NULL) project_close(FALSE); /* save project session files */ - force_close_all(); + document_close_all(); main_quit(); } @@ -181,7 +139,7 @@ if (! check_no_unsaved()) { - if (account_for_unsaved()) + if (document_account_for_unsaved()) { quit_app(); return FALSE; @@ -267,23 +225,11 @@ } -static gboolean close_all(void) -{ - if (! account_for_unsaved()) - return FALSE; - - force_close_all(); - - tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE); - return TRUE; -} - - void on_close_all1_activate (GtkMenuItem *menuitem, gpointer user_data) { - close_all(); + document_close_all(); } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-04-24 14:17:11 UTC (rev 2525) +++ trunk/src/document.c 2008-04-24 14:33:12 UTC (rev 2526) @@ -516,14 +516,6 @@ } -void document_close_all() -{ - /* the code is in callbacks.c because when quitting, checking for changes - * has to be done before saving the session */ - on_close_all1_activate(NULL, NULL); -} - - /** * Remove the given notebook tab at @a page_num and clear all related information * in the document list. @@ -2724,3 +2716,68 @@ } +/* @note If successful, this should always be followed up with a call to + * document_close_all(). + * @return TRUE if all files were saved or had their changes discarded. */ +gboolean document_account_for_unsaved(void) +{ + gint p; + guint i, len = doc_array->len; + + for (p = 0; p < gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); p++) + { + gint idx = document_get_n_idx(p); + + if (doc_list[idx].changed) + { + if (! dialogs_show_unsaved_file(idx)) + return FALSE; + } + } + /* all documents should now be accounted for, so ignore any changes */ + for (i = 0; i < len; i++) + { + if (doc_list[i].is_valid && doc_list[i].changed) + { + doc_list[i].changed = FALSE; + } + } + return TRUE; +} + + +static void force_close_all(void) +{ + guint i, len = doc_array->len; + + /* check all documents have been accounted for */ + for (i = 0; i < len; i++) + { + if (doc_list[i].is_valid) + { + g_return_if_fail(!doc_list[i].changed); + } + } + main_status.closing_all = TRUE; + + while (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) > 0) + { + document_remove(0); + } + + main_status.closing_all = FALSE; +} + + +gboolean document_close_all(void) +{ + if (! document_account_for_unsaved()) + return FALSE; + + force_close_all(); + + tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE); + return TRUE; +} + + Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2008-04-24 14:17:11 UTC (rev 2525) +++ trunk/src/document.h 2008-04-24 14:33:12 UTC (rev 2526) @@ -151,11 +151,13 @@ void document_apply_update_prefs(gint idx); -void document_close_all(); - gboolean document_remove(guint page_num); +gboolean document_account_for_unsaved(void); +gboolean document_close_all(void); + + gint document_new_file_if_non_open(); gint document_new_file(const gchar *filename, filetype *ft, const gchar *text); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2525] trunk
by eht16＠users.sourceforge.net 24 Apr '08

24 Apr '08

Revision: 2525 http://geany.svn.sourceforge.net/geany/?rev=2525&view=rev Author: eht16 Date: 2008-04-24 07:17:11 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Unify the embedded JavaScript styles with the styles of the JavaScript filetype for a more consistent styling of JavaScript in general. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.javascript trunk/data/filetypes.xml trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-04-24 14:13:06 UTC (rev 2524) +++ trunk/ChangeLog 2008-04-24 14:17:11 UTC (rev 2525) @@ -1,3 +1,11 @@ +2008-04-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/filetypes.xml, data/filetypes.javascript, src/highlighting.c: + Unify the embedded JavaScript styles with the styles of the + JavaScript filetype for a more consistent styling of JavaScript in + general. + + 2008-04-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/utils.c: Modified: trunk/data/filetypes.javascript =================================================================== --- trunk/data/filetypes.javascript 2008-04-24 14:13:06 UTC (rev 2524) +++ trunk/data/filetypes.javascript 2008-04-24 14:17:11 UTC (rev 2525) @@ -24,7 +24,7 @@ [keywords] # all items must be in one line -primary=abstract boolean break byte case catch char class const continue debugger default delete do double else enum export extends final finally float for function goto if implements import in instanceof int interface long native new package private protected public return short static super switch synchronized this throw throws transient try typeof var void volatile while with +primary=abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with [settings] # default extension used when saving files Modified: trunk/data/filetypes.xml =================================================================== --- trunk/data/filetypes.xml 2008-04-24 14:13:06 UTC (rev 2524) +++ trunk/data/filetypes.xml 2008-04-24 14:17:11 UTC (rev 2525) @@ -54,20 +54,21 @@ jscript_start=0x008080;0xffffff;false;false jscript_default=0x000000;0xffffff;false;false -jscript_comment=0x222222;0xffffff;false;false -jscript_commentline=0x808080;0xffffff;false;false -jscript_commentdoc=0x3f5fbf;0xffffff;false;false -jscript_number=0x006060;0xffffff;false;false -jscript_word=0x0000ff;0xffffff;false;false -jscript_keyword=0x501000;0xffffff;false;false +jscript_comment=0xd00000;0xffffff;false;false +jscript_commentline=0xd00000;0xffffff;false;false +jscript_commentdoc=0x3f5fbf;0xffffff;true;false +jscript_number=0x007f00;0xffffff;false;false +jscript_word=0x000000;0xffffff;false;false +jscript_keyword=0x00007f;0xffffff;true;false jscript_doublestring=0xff901e;0xffffff;false;false jscript_singlestring=0xff901e;0xffffff;false;false -jscript_symbols=0x001050;0xffffff;false;false +# same as operators +jscript_symbols=0x301010;0xffffff;false;false jscript_stringeol=0x000000;0xe0c0e0;false;false [keywords] html=a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em embed fieldset font form frame frameset h1 h2 h3 h4 h5 h6 head hr html i iframe img input ins isindex kbd label legend li link map menu meta noframes noscript object ol optgroup option p param pre q quality s samp script select small span strike strong style sub sup table tbody td textarea tfoot th thead title tr tt u ul var xmlns leftmargin topmargin abbr accept-charset accept accesskey action align alink alt archive axis background bgcolor border cellpadding cellspacing char charoff charset checked cite class classid clear codebase codetype color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime declare defer dir disabled enctype face for frame frameborder selected headers height href hreflang hspace http-equiv id ismap label lang language link longdesc marginwidth marginheight maxlength media framespacing method multiple name nohref noresize noshade nowrap object onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup onreset onselect onsubmit onunload profile prompt pluginspage readonly rel rev rows rowspan rules scheme scope scrolling shape size span src standby start style summary tabindex target text title type usemap valign value valuetype version vlink vspace width text password checkbox radio submit reset file hidden image public doctype xml -javascript=break this for while null else var false void new delete typeof if in continue true function with return case super extends do const try debugger catch switch finally enum export default class throw import length concat join pop push reverse shift slice splice sort unshift Date Infinity NaN undefined escape eval isFinite isNaN Number parseFloat parseInt string unescape Math abs acos asin atan atan2 ceil cos exp floor log max min pow random round sin sqrt tan MAX_VALUE MIN_VALUE NEGATIVE_INFINITY POSITIVE_INFINITY toString valueOf String length anchor big bold charAt charCodeAt concat fixed fontcolor fontsize fromCharCode indexOf italics lastIndexOf link slice small split strike sub substr substring sup toLowerCase toUpperCase +javascript=abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with vbscript=and as byref byval case call const continue dim do each else elseif end error exit false for function global goto if in loop me new next not nothing on optional or private public redim rem resume select set sub then to true type while with boolean byte currency date double integer long object single string type variant python=and assert break class continue complex def del elif else except exec finally for from global if import in inherit is int lambda not or pass print raise return tuple try unicode while yield long float str list php=abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function global if implements include include_once int integer interface isset __line__ list __method__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor @@ -95,3 +96,4 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= + Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-04-24 14:13:06 UTC (rev 2524) +++ trunk/src/highlighting.c 2008-04-24 14:17:11 UTC (rev 2525) @@ -1083,20 +1083,20 @@ get_keyfile_hex(config, config_home, "styling", "jscript_start", "0x008080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[43]); get_keyfile_hex(config, config_home, "styling", "jscript_default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[44]); - get_keyfile_hex(config, config_home, "styling", "jscript_comment", "0x222222", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[45]); - get_keyfile_hex(config, config_home, "styling", "jscript_commentline", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[46]); - get_keyfile_hex(config, config_home, "styling", "jscript_commentdoc", "0x3f5fbf", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[47]); - get_keyfile_hex(config, config_home, "styling", "jscript_number", "0x006060", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[48]); - get_keyfile_hex(config, config_home, "styling", "jscript_word", "0x0000ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[49]); - get_keyfile_hex(config, config_home, "styling", "jscript_keyword", "0x501010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[50]); + get_keyfile_hex(config, config_home, "styling", "jscript_comment", "0xd00000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[45]); + get_keyfile_hex(config, config_home, "styling", "jscript_commentline", "0xd00000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[46]); + get_keyfile_hex(config, config_home, "styling", "jscript_commentdoc", "0x3f5fbf", "0xffffff", "true", &style_sets[GEANY_FILETYPES_XML].styling[47]); + get_keyfile_hex(config, config_home, "styling", "jscript_number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[48]); + get_keyfile_hex(config, config_home, "styling", "jscript_word", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[49]); + get_keyfile_hex(config, config_home, "styling", "jscript_keyword", "0x00007f", "0xffffff", "true", &style_sets[GEANY_FILETYPES_XML].styling[50]); get_keyfile_hex(config, config_home, "styling", "jscript_doublestring", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[51]); get_keyfile_hex(config, config_home, "styling", "jscript_singlestring", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[52]); - get_keyfile_hex(config, config_home, "styling", "jscript_symbols", "0x001050", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[53]); + get_keyfile_hex(config, config_home, "styling", "jscript_symbols", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_XML].styling[53]); get_keyfile_hex(config, config_home, "styling", "jscript_stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_XML].styling[54]); style_sets[GEANY_FILETYPES_XML].keywords = g_new(gchar*, 7); get_keyfile_keywords(config, config_home, "keywords", "html", GEANY_FILETYPES_XML, 0, "a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em embed fieldset font form frame frameset h1 h2 h3 h4 h5 h6 head hr html i iframe img input ins isindex kbd label legend li link map menu meta noframes noscript object ol optgroup option p param pre q quality s samp script select small span strike strong style sub sup table tbody td textarea tfoot th thead title tr tt u ul var xmlns leftmargin topmargin abbr accept-charset accept accesskey action align alink alt archive axis background bgcolor border cellpadding cellspacing char charoff charset checked cite class classid clear codebase codetype color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime declare defer dir disabled enctype face for frame frameborder selected headers height href hreflang hspace http-equiv id ismap label lang language link longdesc marginwidth marginheight maxlength media framespacing method multiple name nohref noresize noshade nowrap object onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup onreset onselect onsubmit onunload profile prompt pluginspage readonly rel rev rows rowspan rules scheme scope scrolling shape size span src standby start style summary tabindex target text title type usemap valign value valuetype version vlink vspace width text password checkbox radio submit reset file hidden image public doctype xml"); - get_keyfile_keywords(config, config_home, "keywords", "javascript", GEANY_FILETYPES_XML, 1, "break this for while null else var false void new delete typeof if in continue true function with return case super extends do const try debugger catch switch finally enum export default class throw import length concat join pop push reverse shift slice splice sort unshift Date Infinity NaN undefined escape eval isFinite isNaN Number parseFloat parseInt string unescape Math abs acos asin atan atan2 ceil cos exp floor log max min pow random round sin sqrt tan MAX_VALUE MIN_VALUE NEGATIVE_INFINITY POSITIVE_INFINITY toString valueOf String length anchor big bold charAt charCodeAt concat fixed fontcolor fontsize fromCharCode indexOf italics lastIndexOf link slice small split strike sub substr substring sup toLowerCase toUpperCase"); + get_keyfile_keywords(config, config_home, "keywords", "javascript", GEANY_FILETYPES_XML, 1, "abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with"); get_keyfile_keywords(config, config_home, "keywords", "vbscript", GEANY_FILETYPES_XML, 2, "and as byref byval case call const continue dim do each else elseif end error exit false for function global goto if in loop me new next not nothing on optional or private public redim rem resume select set sub then to true type while with boolean byte currency date double integer long object single string type variant"); get_keyfile_keywords(config, config_home, "keywords", "python", GEANY_FILETYPES_XML, 3, "and assert break class continue complex def del elif else except exec finally for from global if import in inherit is int lambda not or pass print raise return tuple try unicode while yield long float str list"); get_keyfile_keywords(config, config_home, "keywords", "php", GEANY_FILETYPES_XML, 4, "abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function global if implements include include_once int integer interface isset __line__ list __method__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor"); @@ -2662,12 +2662,19 @@ style_sets[GEANY_FILETYPES_JS].keywords = g_new(gchar*, 2); get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_JS, 0, "\ - abstract boolean break byte case catch char class \ - const continue debugger default delete do double else enum export extends \ - final finally float for function goto if implements import in instanceof \ - int interface long native new package private protected public \ - return short static super switch synchronized this throw throws \ - transient try typeof var void volatile while with"); + abs abstract acos anchor asin atan atan2 big bold boolean break byte \ + case catch ceil char charAt charCodeAt class concat const continue cos \ + Date debugger default delete do double else enum escape eval exp export \ + extends false final finally fixed float floor fontcolor fontsize for \ + fromCharCode function goto if implements import in indexOf Infinity \ + instanceof int interface isFinite isNaN italics join lastIndexOf length \ + link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY \ + new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private \ + protected public push random return reverse round shift short sin slice small \ + sort splice split sqrt static strike string String sub substr substring sup \ + super switch synchronized tan this throw throws toLowerCase toString \ + toUpperCase transient true try typeof undefined unescape unshift valueOf \ + var void volatile while with"); style_sets[GEANY_FILETYPES_JS].keywords[1] = NULL; get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_JS].wordchars); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2524] trunk/src/project.c
by ntrel＠users.sourceforge.net 24 Apr '08

24 Apr '08

Revision: 2524 http://geany.svn.sourceforge.net/geany/?rev=2524&view=rev Author: ntrel Date: 2008-04-24 07:13:06 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Fix build because of wrong document_close_all() usage - oops. Modified Paths: -------------- trunk/src/project.c Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2008-04-24 12:16:21 UTC (rev 2523) +++ trunk/src/project.c 2008-04-24 14:13:06 UTC (rev 2524) @@ -324,7 +324,7 @@ if (project_prefs.project_session) { /* close all existing tabs first */ - document_close_all(NULL, NULL); + document_close_all(); /* after closing all tabs let's open the tabs found in the default config */ if (open_default == TRUE && cl_options.load_session) @@ -905,7 +905,7 @@ /* save current (non-project) session (it could has been changed since program startup) */ configuration_save_default_session(); /* now close all open files */ - document_close_all(NULL, NULL); + document_close_all(); /* read session files so they can be opened with configuration_open_files() */ configuration_load_session_files(config); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2523] trunk
by ntrel＠users.sourceforge.net 24 Apr '08

24 Apr '08

Revision: 2523 http://geany.svn.sourceforge.net/geany/?rev=2523&view=rev Author: ntrel Date: 2008-04-24 05:16:21 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Make utils_get_file_list() use a case-insensitive search so that the file browser lists files and directories in a more intuitive order. Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-04-23 21:01:51 UTC (rev 2522) +++ trunk/ChangeLog 2008-04-24 12:16:21 UTC (rev 2523) @@ -1,3 +1,10 @@ +2008-04-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c: + Make utils_get_file_list() use a case-insensitive search so that the + file browser lists files and directories in a more intuitive order. + + 2008-04-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/win32.c, src/project.h, src/geany.h, src/keyfile.c, Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-04-23 21:01:51 UTC (rev 2522) +++ trunk/src/utils.c 2008-04-24 12:16:21 UTC (rev 2523) @@ -1765,7 +1765,7 @@ const gchar *filename = g_dir_read_name(dir); if (filename == NULL) break; - list = g_slist_insert_sorted(list, g_strdup(filename), (GCompareFunc) strcmp); + list = g_slist_insert_sorted(list, g_strdup(filename), (GCompareFunc) g_strcasecmp); len++; } g_dir_close(dir); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2008